From 868cfb4a0ae7212a6d252cb607946c1cd3b37cb0 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Fri, 24 Jan 2020 12:01:21 +0100 Subject: [PATCH] Fix class name --- .../src/main/java/sonia/scm/plugin/PluginInstaller.java | 8 ++++---- ...scriptorExtractor.java => SmpDescriptorExtractor.java} | 2 +- .../test/java/sonia/scm/plugin/PluginInstallerTest.java | 2 +- ...ExtractorTest.java => SmpDescriptorExtractorTest.java} | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) rename scm-webapp/src/main/java/sonia/scm/plugin/{SmpDDescriptorExtractor.java => SmpDescriptorExtractor.java} (97%) rename scm-webapp/src/test/java/sonia/scm/plugin/{SmpDDescriptorExtractorTest.java => SmpDescriptorExtractorTest.java} (88%) diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/PluginInstaller.java b/scm-webapp/src/main/java/sonia/scm/plugin/PluginInstaller.java index 1fc7ac5011..082058d663 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/PluginInstaller.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/PluginInstaller.java @@ -19,13 +19,13 @@ class PluginInstaller { private final SCMContextProvider context; private final AdvancedHttpClient client; - private final SmpDDescriptorExtractor smpDDescriptorExtractor; + private final SmpDescriptorExtractor smpDescriptorExtractor; @Inject - public PluginInstaller(SCMContextProvider context, AdvancedHttpClient client, SmpDDescriptorExtractor smpDDescriptorExtractor) { + public PluginInstaller(SCMContextProvider context, AdvancedHttpClient client, SmpDescriptorExtractor smpDescriptorExtractor) { this.context = context; this.client = client; - this.smpDDescriptorExtractor = smpDDescriptorExtractor; + this.smpDescriptorExtractor = smpDescriptorExtractor; } @SuppressWarnings("squid:S4790") // hashing should be safe @@ -68,7 +68,7 @@ class PluginInstaller { } private void verifyConditions(AvailablePlugin plugin, Path file) throws IOException { - InstalledPluginDescriptor pluginDescriptor = smpDDescriptorExtractor.extractPluginDescriptor(file); + InstalledPluginDescriptor pluginDescriptor = smpDescriptorExtractor.extractPluginDescriptor(file); if (!pluginDescriptor.getCondition().isSupported()) { cleanup(file); throw new PluginConditionFailedException( diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/SmpDDescriptorExtractor.java b/scm-webapp/src/main/java/sonia/scm/plugin/SmpDescriptorExtractor.java similarity index 97% rename from scm-webapp/src/main/java/sonia/scm/plugin/SmpDDescriptorExtractor.java rename to scm-webapp/src/main/java/sonia/scm/plugin/SmpDescriptorExtractor.java index b218acf157..b8e9cddabd 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/SmpDDescriptorExtractor.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/SmpDescriptorExtractor.java @@ -9,7 +9,7 @@ import java.nio.file.Path; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -class SmpDDescriptorExtractor { +class SmpDescriptorExtractor { InstalledPluginDescriptor extractPluginDescriptor(Path file) throws IOException { try (ZipInputStream zipInputStream = new ZipInputStream(Files.newInputStream(file), StandardCharsets.UTF_8)) { diff --git a/scm-webapp/src/test/java/sonia/scm/plugin/PluginInstallerTest.java b/scm-webapp/src/test/java/sonia/scm/plugin/PluginInstallerTest.java index b71fec5bc6..fbc22e1ebd 100644 --- a/scm-webapp/src/test/java/sonia/scm/plugin/PluginInstallerTest.java +++ b/scm-webapp/src/test/java/sonia/scm/plugin/PluginInstallerTest.java @@ -33,7 +33,7 @@ class PluginInstallerTest { private AdvancedHttpClient client; @Mock - private SmpDDescriptorExtractor extractor; + private SmpDescriptorExtractor extractor; @InjectMocks private PluginInstaller installer; diff --git a/scm-webapp/src/test/java/sonia/scm/plugin/SmpDDescriptorExtractorTest.java b/scm-webapp/src/test/java/sonia/scm/plugin/SmpDescriptorExtractorTest.java similarity index 88% rename from scm-webapp/src/test/java/sonia/scm/plugin/SmpDDescriptorExtractorTest.java rename to scm-webapp/src/test/java/sonia/scm/plugin/SmpDescriptorExtractorTest.java index 51d9005cc0..6ca19a3692 100644 --- a/scm-webapp/src/test/java/sonia/scm/plugin/SmpDDescriptorExtractorTest.java +++ b/scm-webapp/src/test/java/sonia/scm/plugin/SmpDescriptorExtractorTest.java @@ -15,7 +15,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.jupiter.api.Assertions.assertThrows; @ExtendWith(TempDirectory.class) -class SmpDDescriptorExtractorTest { +class SmpDescriptorExtractorTest { private static final String PLUGIN_XML = "\n" + "\n" + @@ -45,7 +45,7 @@ class SmpDDescriptorExtractorTest { void shouldExtractPluginXml(@TempDirectory.TempDir Path tempDir) throws IOException { Path pluginFile = createZipFile(tempDir, "META-INF/scm/plugin.xml", PLUGIN_XML); - InstalledPluginDescriptor installedPluginDescriptor = new SmpDDescriptorExtractor().extractPluginDescriptor(pluginFile); + InstalledPluginDescriptor installedPluginDescriptor = new SmpDescriptorExtractor().extractPluginDescriptor(pluginFile); Assertions.assertThat(installedPluginDescriptor.getInformation().getName()).isEqualTo("scm-test-plugin"); } @@ -54,14 +54,14 @@ class SmpDDescriptorExtractorTest { void shouldFailWithoutPluginXml(@TempDirectory.TempDir Path tempDir) throws IOException { Path pluginFile = createZipFile(tempDir, "META-INF/wrong/plugin.xml", PLUGIN_XML); - assertThrows(IOException.class, () -> new SmpDDescriptorExtractor().extractPluginDescriptor(pluginFile)); + assertThrows(IOException.class, () -> new SmpDescriptorExtractor().extractPluginDescriptor(pluginFile)); } @Test void shouldFailWithIllegalPluginXml(@TempDirectory.TempDir Path tempDir) throws IOException { Path pluginFile = createZipFile(tempDir, "META-INF/scm/plugin.xml", "content"); - assertThrows(IOException.class, () -> new SmpDDescriptorExtractor().extractPluginDescriptor(pluginFile)); + assertThrows(IOException.class, () -> new SmpDescriptorExtractor().extractPluginDescriptor(pluginFile)); } Path createZipFile(Path tempDir, String internalFileName, String content) throws IOException {