From 7677db0bc3006bc6444505d182e2b46153cc1079 Mon Sep 17 00:00:00 2001
From: Ashley Scopes <73482956+ascopes@users.noreply.github.com>
Date: Sun, 14 Apr 2024 13:46:05 +0100
Subject: [PATCH] Tidy up naming in AbstractGenerateMojoTest
---
.../ascopes/protobufmavenplugin/AbstractGenerateMojo.java | 1 -
.../AbstractGenerateMojoTestTemplate.java | 8 ++++----
.../ascopes/protobufmavenplugin/MainGenerateMojoTest.java | 2 +-
.../ascopes/protobufmavenplugin/TestGenerateMojoTest.java | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojo.java b/src/main/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojo.java
index 8a16d87d..5a6ac4ad 100644
--- 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
index 56ce829b..27bcf6fb 100644
--- 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 {
- abstract A getInstance();
+ abstract A newInstance();
abstract SourceRootRegistrar expectedSourceRootRegistrar();
@@ -43,7 +43,7 @@ abstract class AbstractGenerateMojoTestTemplate
@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
index 58890eff..2047803f 100644
--- 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 {
@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
index d018e9cc..69dfc706 100644
--- 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 {
@Override
- TestGenerateMojo getInstance() {
+ TestGenerateMojo newInstance() {
return new TestGenerateMojo();
}