Tidy up naming in AbstractGenerateMojoTest

ascopes · Apr 14, 2024 · 7677db0 · 7677db0
1 parent 2f61a53
commit 7677db0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojo.java b/src/main/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojo.java
@@ -481,7 +481,6 @@ public void execute() throws MojoExecutionException, MojoFailureException {
       throw new MojoExecutionException(ex.getMessage(), ex);
     }
 
-    //noinspection DataFlowIssue
     var request = ImmutableGenerationRequest.builder()
         .binaryMavenPlugins(nonNullList(binaryMavenPlugins))
         .binaryPathPlugins(nonNullList(binaryPathPlugins))

diff --git a/src/test/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojoTestTemplate.java b/src/test/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojoTestTemplate.java
@@ -31,7 +31,7 @@
 
 abstract class AbstractGenerateMojoTestTemplate<A extends AbstractGenerateMojo> {
 
-  abstract A getInstance();
+  abstract A newInstance();
 
   abstract SourceRootRegistrar expectedSourceRootRegistrar();
 
@@ -43,7 +43,7 @@ abstract class AbstractGenerateMojoTestTemplate<A extends AbstractGenerateMojo>
   @Test
   void sourceRootRegistrarIsTheExpectedValue() {
     // Then
-    assertThat(getInstance().sourceRootRegistrar())
+    assertThat(newInstance().sourceRootRegistrar())
         .isEqualTo(expectedSourceRootRegistrar());
   }
 
@@ -60,7 +60,7 @@ void defaultSourceDirectoryIsTheExpectedPath(@TempDir Path tempDir) {
         .thenReturn(mockCurrentProject);
 
     // Then
-    assertThat(getInstance().defaultSourceDirectory(mockMavenSession))
+    assertThat(newInstance().defaultSourceDirectory(mockMavenSession))
         .isEqualTo(expectedDefaultSourceDirectory(mockMavenSession));
   }
 
@@ -81,7 +81,7 @@ void defaultOutputDirectoryIsTheExpectedPath(@TempDir Path tempDir) {
         .thenReturn(mockCurrentProject);
 
     // Then
-    assertThat(getInstance().defaultOutputDirectory(mockMavenSession))
+    assertThat(newInstance().defaultOutputDirectory(mockMavenSession))
         .isEqualTo(expectedDefaultOutputDirectory(mockMavenSession));
   }
 }
diff --git a/src/test/java/io/github/ascopes/protobufmavenplugin/MainGenerateMojoTest.java b/src/test/java/io/github/ascopes/protobufmavenplugin/MainGenerateMojoTest.java
@@ -23,7 +23,7 @@
 class MainGenerateMojoTest extends AbstractGenerateMojoTestTemplate<MainGenerateMojo> {
 
   @Override
-  MainGenerateMojo getInstance() {
+  MainGenerateMojo newInstance() {
     return new MainGenerateMojo();
   }
 

diff --git a/src/test/java/io/github/ascopes/protobufmavenplugin/TestGenerateMojoTest.java b/src/test/java/io/github/ascopes/protobufmavenplugin/TestGenerateMojoTest.java
@@ -23,7 +23,7 @@
 class TestGenerateMojoTest extends AbstractGenerateMojoTestTemplate<TestGenerateMojo> {
 
   @Override
-  TestGenerateMojo getInstance() {
+  TestGenerateMojo newInstance() {
     return new TestGenerateMojo();
   }