Use a static block in TestFeaturesMojo 47/110447/4
authorRobert Varga <robert.varga@pantheon.tech>
Sun, 3 Mar 2024 06:51:18 +0000 (07:51 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Sun, 3 Mar 2024 07:07:45 +0000 (08:07 +0100)
We have a single-use method, use a static block instead.

JIRA: ODLPARENT-262
Change-Id: I48528311953de8bb9b9b1c8e8c27493bc3c38e63
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
features-test-plugin/src/main/java/org/opendaylight/odlparent/features/test/plugin/TestFeaturesMojo.java

index c4015c41cf092361115f685432a1adad96d139f1..e685c2b89164058d531a2f1ac21aafb3d40e9310 100644 (file)
@@ -48,10 +48,16 @@ import org.slf4j.LoggerFactory;
     requiresDependencyResolution = ResolutionScope.TEST,
     requiresDependencyCollection = ResolutionScope.TEST, threadSafe = true)
 public final class TestFeaturesMojo extends AbstractMojo {
-
     private static final Logger LOG = LoggerFactory.getLogger(TestFeaturesMojo.class);
     private static final String[] FEATURE_FILENAMES = {"feature.xml", "features.xml"};
-    private static final PluginDescriptor STATIC_DESCRIPTOR = staticPluginDescriptor();
+    private static final PluginDescriptor STATIC_DESCRIPTOR;
+
+    static {
+        final var desc = new PluginDescriptor();
+        desc.setGroupId("org.opendaylight.odlparent");
+        desc.setArtifactId("features-test-plugin");
+        STATIC_DESCRIPTOR = desc;
+    }
 
     @Parameter(defaultValue = "${project}", readonly = true, required = true)
     private MavenProject project;
@@ -190,13 +196,6 @@ public final class TestFeaturesMojo extends AbstractMojo {
         }
     }
 
-    private static PluginDescriptor staticPluginDescriptor() {
-        final var desc = new PluginDescriptor();
-        desc.setGroupId("org.opendaylight.odlparent");
-        desc.setArtifactId("features-test-plugin");
-        return desc;
-    }
-
     static File getFeatureFile(final File dir) throws MojoExecutionException {
         for (var filename : FEATURE_FILENAMES) {
             final File file = new File(dir, filename);