From 55dfcd2f18f767e4a70f80188fd38970395b1492 Mon Sep 17 00:00:00 2001 From: ascopes <73482956+ascopes@users.noreply.github.com> Date: Sun, 7 Apr 2024 09:38:17 +0100 Subject: [PATCH] Rename 'platform' package to 'utils' --- .../ascopes/protobufmavenplugin/AbstractGenerateMojo.java | 2 +- .../dependency/PlatformClassifierFactory.java | 2 +- .../dependency/SystemPathBinaryResolver.java | 4 ++-- .../dependency/UrlResourceFetcher.java | 2 +- .../protobufmavenplugin/execute/CommandLineExecutor.java | 2 +- .../protobufmavenplugin/plugin/BinaryPluginResolver.java | 4 ++-- .../protobufmavenplugin/plugin/JvmPluginResolver.java | 8 ++++---- .../protobufmavenplugin/protoc/ProtocResolver.java | 4 ++-- .../protobufmavenplugin/source/ProtoArchiveExtractor.java | 4 ++-- .../protobufmavenplugin/source/ProtoFilePredicates.java | 2 +- .../protobufmavenplugin/source/ProtoSourceResolver.java | 2 +- .../protobufmavenplugin/{platform => utils}/Digests.java | 2 +- .../{platform => utils}/FileUtils.java | 2 +- .../{platform => utils}/HostSystem.java | 2 +- .../protobufmavenplugin/{platform => utils}/Shlex.java | 2 +- .../protobufmavenplugin/fixtures/HostSystemFixtures.java | 2 +- .../{platform => utils}/DigestsTest.java | 2 +- .../{platform => utils}/FileUtilsTest.java | 2 +- .../{platform => utils}/HostSystemTest.java | 2 +- .../{platform => utils}/ShlexTest.java | 2 +- 20 files changed, 27 insertions(+), 27 deletions(-) rename src/main/java/io/github/ascopes/protobufmavenplugin/{platform => utils}/Digests.java (95%) rename src/main/java/io/github/ascopes/protobufmavenplugin/{platform => utils}/FileUtils.java (98%) rename src/main/java/io/github/ascopes/protobufmavenplugin/{platform => utils}/HostSystem.java (98%) rename src/main/java/io/github/ascopes/protobufmavenplugin/{platform => utils}/Shlex.java (98%) rename src/test/java/io/github/ascopes/protobufmavenplugin/{platform => utils}/DigestsTest.java (97%) rename src/test/java/io/github/ascopes/protobufmavenplugin/{platform => utils}/FileUtilsTest.java (99%) rename src/test/java/io/github/ascopes/protobufmavenplugin/{platform => utils}/HostSystemTest.java (99%) rename src/test/java/io/github/ascopes/protobufmavenplugin/{platform => utils}/ShlexTest.java (98%) diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojo.java b/src/main/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojo.java index bb54db22..695d3f68 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojo.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojo.java @@ -23,7 +23,7 @@ import io.github.ascopes.protobufmavenplugin.generate.ImmutableGenerationRequest; import io.github.ascopes.protobufmavenplugin.generate.SourceCodeGenerator; import io.github.ascopes.protobufmavenplugin.generate.SourceRootRegistrar; -import io.github.ascopes.protobufmavenplugin.platform.FileUtils; +import io.github.ascopes.protobufmavenplugin.utils.FileUtils; import java.io.File; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/dependency/PlatformClassifierFactory.java b/src/main/java/io/github/ascopes/protobufmavenplugin/dependency/PlatformClassifierFactory.java index 1509ccb3..592eaf8a 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/dependency/PlatformClassifierFactory.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/dependency/PlatformClassifierFactory.java @@ -16,7 +16,7 @@ package io.github.ascopes.protobufmavenplugin.dependency; -import io.github.ascopes.protobufmavenplugin.platform.HostSystem; +import io.github.ascopes.protobufmavenplugin.utils.HostSystem; import javax.inject.Inject; import javax.inject.Named; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/dependency/SystemPathBinaryResolver.java b/src/main/java/io/github/ascopes/protobufmavenplugin/dependency/SystemPathBinaryResolver.java index 60d4bcdc..4cab285d 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/dependency/SystemPathBinaryResolver.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/dependency/SystemPathBinaryResolver.java @@ -16,8 +16,8 @@ package io.github.ascopes.protobufmavenplugin.dependency; -import io.github.ascopes.protobufmavenplugin.platform.FileUtils; -import io.github.ascopes.protobufmavenplugin.platform.HostSystem; +import io.github.ascopes.protobufmavenplugin.utils.FileUtils; +import io.github.ascopes.protobufmavenplugin.utils.HostSystem; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/dependency/UrlResourceFetcher.java b/src/main/java/io/github/ascopes/protobufmavenplugin/dependency/UrlResourceFetcher.java index 644350bb..57315141 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/dependency/UrlResourceFetcher.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/dependency/UrlResourceFetcher.java @@ -17,7 +17,7 @@ package io.github.ascopes.protobufmavenplugin.dependency; import io.github.ascopes.protobufmavenplugin.generate.TemporarySpace; -import io.github.ascopes.protobufmavenplugin.platform.Digests; +import io.github.ascopes.protobufmavenplugin.utils.Digests; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/execute/CommandLineExecutor.java b/src/main/java/io/github/ascopes/protobufmavenplugin/execute/CommandLineExecutor.java index c49e978e..29b85f57 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/execute/CommandLineExecutor.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/execute/CommandLineExecutor.java @@ -16,7 +16,7 @@ package io.github.ascopes.protobufmavenplugin.execute; -import io.github.ascopes.protobufmavenplugin.platform.Shlex; +import io.github.ascopes.protobufmavenplugin.utils.Shlex; import java.io.IOException; import java.io.InterruptedIOException; import java.util.List; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/plugin/BinaryPluginResolver.java b/src/main/java/io/github/ascopes/protobufmavenplugin/plugin/BinaryPluginResolver.java index 7615e7c5..9cefc676 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/plugin/BinaryPluginResolver.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/plugin/BinaryPluginResolver.java @@ -23,8 +23,8 @@ import io.github.ascopes.protobufmavenplugin.dependency.ResolutionException; import io.github.ascopes.protobufmavenplugin.dependency.SystemPathBinaryResolver; import io.github.ascopes.protobufmavenplugin.dependency.UrlResourceFetcher; -import io.github.ascopes.protobufmavenplugin.platform.Digests; -import io.github.ascopes.protobufmavenplugin.platform.FileUtils; +import io.github.ascopes.protobufmavenplugin.utils.Digests; +import io.github.ascopes.protobufmavenplugin.utils.FileUtils; import java.io.IOException; import java.net.URL; import java.nio.file.Path; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/plugin/JvmPluginResolver.java b/src/main/java/io/github/ascopes/protobufmavenplugin/plugin/JvmPluginResolver.java index f2fd94f0..fdefa41a 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/plugin/JvmPluginResolver.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/plugin/JvmPluginResolver.java @@ -21,10 +21,10 @@ import io.github.ascopes.protobufmavenplugin.dependency.MavenDependencyPathResolver; import io.github.ascopes.protobufmavenplugin.dependency.ResolutionException; import io.github.ascopes.protobufmavenplugin.generate.TemporarySpace; -import io.github.ascopes.protobufmavenplugin.platform.Digests; -import io.github.ascopes.protobufmavenplugin.platform.FileUtils; -import io.github.ascopes.protobufmavenplugin.platform.HostSystem; -import io.github.ascopes.protobufmavenplugin.platform.Shlex; +import io.github.ascopes.protobufmavenplugin.utils.Digests; +import io.github.ascopes.protobufmavenplugin.utils.FileUtils; +import io.github.ascopes.protobufmavenplugin.utils.HostSystem; +import io.github.ascopes.protobufmavenplugin.utils.Shlex; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/protoc/ProtocResolver.java b/src/main/java/io/github/ascopes/protobufmavenplugin/protoc/ProtocResolver.java index 70808e7c..118ae592 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/protoc/ProtocResolver.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/protoc/ProtocResolver.java @@ -23,8 +23,8 @@ import io.github.ascopes.protobufmavenplugin.dependency.ResolutionException; import io.github.ascopes.protobufmavenplugin.dependency.SystemPathBinaryResolver; import io.github.ascopes.protobufmavenplugin.dependency.UrlResourceFetcher; -import io.github.ascopes.protobufmavenplugin.platform.FileUtils; -import io.github.ascopes.protobufmavenplugin.platform.HostSystem; +import io.github.ascopes.protobufmavenplugin.utils.FileUtils; +import io.github.ascopes.protobufmavenplugin.utils.HostSystem; import java.io.IOException; import java.net.URL; import java.nio.file.Path; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/source/ProtoArchiveExtractor.java b/src/main/java/io/github/ascopes/protobufmavenplugin/source/ProtoArchiveExtractor.java index 2a39fe6f..4f25052e 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/source/ProtoArchiveExtractor.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/source/ProtoArchiveExtractor.java @@ -17,8 +17,8 @@ package io.github.ascopes.protobufmavenplugin.source; import io.github.ascopes.protobufmavenplugin.generate.TemporarySpace; -import io.github.ascopes.protobufmavenplugin.platform.Digests; -import io.github.ascopes.protobufmavenplugin.platform.FileUtils; +import io.github.ascopes.protobufmavenplugin.utils.Digests; +import io.github.ascopes.protobufmavenplugin.utils.FileUtils; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/source/ProtoFilePredicates.java b/src/main/java/io/github/ascopes/protobufmavenplugin/source/ProtoFilePredicates.java index 05d26d60..1369b96e 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/source/ProtoFilePredicates.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/source/ProtoFilePredicates.java @@ -16,7 +16,7 @@ package io.github.ascopes.protobufmavenplugin.source; -import io.github.ascopes.protobufmavenplugin.platform.FileUtils; +import io.github.ascopes.protobufmavenplugin.utils.FileUtils; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/source/ProtoSourceResolver.java b/src/main/java/io/github/ascopes/protobufmavenplugin/source/ProtoSourceResolver.java index aeb327df..aff5b5a6 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/source/ProtoSourceResolver.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/source/ProtoSourceResolver.java @@ -18,7 +18,7 @@ import static java.util.function.Predicate.not; -import io.github.ascopes.protobufmavenplugin.platform.FileUtils; +import io.github.ascopes.protobufmavenplugin.utils.FileUtils; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/platform/Digests.java b/src/main/java/io/github/ascopes/protobufmavenplugin/utils/Digests.java similarity index 95% rename from src/main/java/io/github/ascopes/protobufmavenplugin/platform/Digests.java rename to src/main/java/io/github/ascopes/protobufmavenplugin/utils/Digests.java index c0ca4fe4..9ec88f2b 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/platform/Digests.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/utils/Digests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.ascopes.protobufmavenplugin.platform; +package io.github.ascopes.protobufmavenplugin.utils; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/platform/FileUtils.java b/src/main/java/io/github/ascopes/protobufmavenplugin/utils/FileUtils.java similarity index 98% rename from src/main/java/io/github/ascopes/protobufmavenplugin/platform/FileUtils.java rename to src/main/java/io/github/ascopes/protobufmavenplugin/utils/FileUtils.java index ab1a2228..305dbd8d 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/platform/FileUtils.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/utils/FileUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.ascopes.protobufmavenplugin.platform; +package io.github.ascopes.protobufmavenplugin.utils; import java.io.IOException; import java.nio.file.FileSystemNotFoundException; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/platform/HostSystem.java b/src/main/java/io/github/ascopes/protobufmavenplugin/utils/HostSystem.java similarity index 98% rename from src/main/java/io/github/ascopes/protobufmavenplugin/platform/HostSystem.java rename to src/main/java/io/github/ascopes/protobufmavenplugin/utils/HostSystem.java index 9824cea8..c0d040a2 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/platform/HostSystem.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/utils/HostSystem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.ascopes.protobufmavenplugin.platform; +package io.github.ascopes.protobufmavenplugin.utils; import static java.util.function.Predicate.not; diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/platform/Shlex.java b/src/main/java/io/github/ascopes/protobufmavenplugin/utils/Shlex.java similarity index 98% rename from src/main/java/io/github/ascopes/protobufmavenplugin/platform/Shlex.java rename to src/main/java/io/github/ascopes/protobufmavenplugin/utils/Shlex.java index 9b25f02b..bfeef36d 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/platform/Shlex.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/utils/Shlex.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.ascopes.protobufmavenplugin.platform; +package io.github.ascopes.protobufmavenplugin.utils; import java.util.function.BiConsumer; diff --git a/src/test/java/io/github/ascopes/protobufmavenplugin/fixtures/HostSystemFixtures.java b/src/test/java/io/github/ascopes/protobufmavenplugin/fixtures/HostSystemFixtures.java index 12a998c3..52d33272 100644 --- a/src/test/java/io/github/ascopes/protobufmavenplugin/fixtures/HostSystemFixtures.java +++ b/src/test/java/io/github/ascopes/protobufmavenplugin/fixtures/HostSystemFixtures.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.when; import static org.mockito.Mockito.withSettings; -import io.github.ascopes.protobufmavenplugin.platform.HostSystem; +import io.github.ascopes.protobufmavenplugin.utils.HostSystem; import org.mockito.quality.Strictness; /** diff --git a/src/test/java/io/github/ascopes/protobufmavenplugin/platform/DigestsTest.java b/src/test/java/io/github/ascopes/protobufmavenplugin/utils/DigestsTest.java similarity index 97% rename from src/test/java/io/github/ascopes/protobufmavenplugin/platform/DigestsTest.java rename to src/test/java/io/github/ascopes/protobufmavenplugin/utils/DigestsTest.java index 9f701e3b..3ecc8e82 100644 --- a/src/test/java/io/github/ascopes/protobufmavenplugin/platform/DigestsTest.java +++ b/src/test/java/io/github/ascopes/protobufmavenplugin/utils/DigestsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.ascopes.protobufmavenplugin.platform; +package io.github.ascopes.protobufmavenplugin.utils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/src/test/java/io/github/ascopes/protobufmavenplugin/platform/FileUtilsTest.java b/src/test/java/io/github/ascopes/protobufmavenplugin/utils/FileUtilsTest.java similarity index 99% rename from src/test/java/io/github/ascopes/protobufmavenplugin/platform/FileUtilsTest.java rename to src/test/java/io/github/ascopes/protobufmavenplugin/utils/FileUtilsTest.java index 58a21b96..0ef80690 100644 --- a/src/test/java/io/github/ascopes/protobufmavenplugin/platform/FileUtilsTest.java +++ b/src/test/java/io/github/ascopes/protobufmavenplugin/utils/FileUtilsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.ascopes.protobufmavenplugin.platform; +package io.github.ascopes.protobufmavenplugin.utils; import static io.github.ascopes.protobufmavenplugin.fixtures.RandomFixtures.someText; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/io/github/ascopes/protobufmavenplugin/platform/HostSystemTest.java b/src/test/java/io/github/ascopes/protobufmavenplugin/utils/HostSystemTest.java similarity index 99% rename from src/test/java/io/github/ascopes/protobufmavenplugin/platform/HostSystemTest.java rename to src/test/java/io/github/ascopes/protobufmavenplugin/utils/HostSystemTest.java index 56f5f421..47203a5d 100644 --- a/src/test/java/io/github/ascopes/protobufmavenplugin/platform/HostSystemTest.java +++ b/src/test/java/io/github/ascopes/protobufmavenplugin/utils/HostSystemTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.ascopes.protobufmavenplugin.platform; +package io.github.ascopes.protobufmavenplugin.utils; import static io.github.ascopes.protobufmavenplugin.fixtures.RandomFixtures.someText; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/io/github/ascopes/protobufmavenplugin/platform/ShlexTest.java b/src/test/java/io/github/ascopes/protobufmavenplugin/utils/ShlexTest.java similarity index 98% rename from src/test/java/io/github/ascopes/protobufmavenplugin/platform/ShlexTest.java rename to src/test/java/io/github/ascopes/protobufmavenplugin/utils/ShlexTest.java index de3d651b..33e47db6 100644 --- a/src/test/java/io/github/ascopes/protobufmavenplugin/platform/ShlexTest.java +++ b/src/test/java/io/github/ascopes/protobufmavenplugin/utils/ShlexTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.ascopes.protobufmavenplugin.platform; +package io.github.ascopes.protobufmavenplugin.utils; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.params.provider.Arguments.arguments;