Fix PMD violations

wildfly-extras · Aug 23, 2023 · 09a584f · 09a584f
1 parent 066f78d
commit 09a584f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/prospero-cli/src/main/java/org/wildfly/prospero/cli/commands/FeaturesCommand.java b/prospero-cli/src/main/java/org/wildfly/prospero/cli/commands/FeaturesCommand.java
@@ -33,7 +33,6 @@
 import java.util.List;
 import java.util.Set;
 
-import static org.wildfly.prospero.cli.commands.CliConstants.Commands.FEATURE_PACKS;
 import static org.wildfly.prospero.cli.commands.CliConstants.Commands.FEATURE_PACKS_ALIAS;
 
 @CommandLine.Command(name = CliConstants.Commands.FEATURE_PACKS, aliases = {FEATURE_PACKS_ALIAS})
@@ -134,6 +133,6 @@ private ConfigId parseConfigName() {
 
 
     public FeaturesCommand(CliConsole console, ActionFactory actionFactory) {
-        super(console, actionFactory, FEATURE_PACKS, List.of(new AddCommand(console, actionFactory)));
+        super(console, actionFactory, CliConstants.Commands.FEATURE_PACKS, List.of(new AddCommand(console, actionFactory)));
     }
 }
diff --git a/prospero-common/src/main/java/org/wildfly/prospero/actions/FeaturesAddAction.java b/prospero-common/src/main/java/org/wildfly/prospero/actions/FeaturesAddAction.java
@@ -481,6 +481,7 @@ public static class ModelNotDefinedException extends OperationException {
 
         public ModelNotDefinedException(String msg, Set<String> supportedModels) {
             super(msg);
+            this.supportedModels = supportedModels;
         }
 
         public ModelNotDefinedException(String msg, String model, Set<String> supportedModels) {

diff --git a/prospero-common/src/main/java/org/wildfly/prospero/api/InstallationMetadata.java b/prospero-common/src/main/java/org/wildfly/prospero/api/InstallationMetadata.java
@@ -54,8 +54,6 @@
 import java.util.zip.ZipOutputStream;
 
 import static org.wildfly.prospero.metadata.ProsperoMetadataUtils.CURRENT_VERSION_FILE;
-import static org.wildfly.prospero.metadata.ProsperoMetadataUtils.METADATA_DIR;
-import static org.wildfly.prospero.metadata.ProsperoMetadataUtils.PROVISIONING_RECORD_XML;
 
 public class InstallationMetadata implements AutoCloseable {
 
@@ -103,7 +101,7 @@ public static InstallationMetadata loadInstallation(Path base) throws MetadataEx
             throw ProsperoLogger.ROOT_LOGGER.unableToReadFile(versionsFile, e);
         }
 
-        final Path provisioningRecordPath = base.resolve(METADATA_DIR).resolve(ProsperoMetadataUtils.PROVISIONING_RECORD_XML);
+        final Path provisioningRecordPath = base.resolve(ProsperoMetadataUtils.METADATA_DIR).resolve(ProsperoMetadataUtils.PROVISIONING_RECORD_XML);
         ProvisioningConfig provisioningConfig = null;
         if (Files.exists(provisioningRecordPath)) {
             try {
@@ -315,10 +313,10 @@ public void recordProvision(boolean overrideProsperoConfig, boolean gitRecord) t
      */
     public void updateProvisioningConfiguration() throws MetadataException {
         try {
-            if (!Files.exists(base.resolve(METADATA_DIR).resolve(PROVISIONING_RECORD_XML))) {
+            if (!Files.exists(base.resolve(ProsperoMetadataUtils.METADATA_DIR).resolve(ProsperoMetadataUtils.PROVISIONING_RECORD_XML))) {
                 ProsperoMetadataUtils.recordProvisioningDefinition(base);
 
-                gitStorage.recordChange(SavedState.Type.INTERNAL_UPDATE, PROVISIONING_RECORD_XML);
+                gitStorage.recordChange(SavedState.Type.INTERNAL_UPDATE, ProsperoMetadataUtils.PROVISIONING_RECORD_XML);
             }
 
             // persist in history

diff --git a/prospero-common/src/main/java/org/wildfly/prospero/installation/git/FeatureChangeParser.java b/prospero-common/src/main/java/org/wildfly/prospero/installation/git/FeatureChangeParser.java
@@ -121,8 +121,8 @@ private static Optional<FeatureChange> createConfigModelDiff(ProvisioningConfig
             return Optional.empty();
         }
 
-        final String oldConfigId = oldCfgModel==null?null:(oldCfgModel.getModel()+":"+oldCfgModel.getName());
-        final String newConfigId = newCfgModel==null?null:(newCfgModel.getModel()+":"+newCfgModel.getName());
+        final String oldConfigId = oldCfgModel==null ? null : oldCfgModel.getModel()+":"+oldCfgModel.getName();
+        final String newConfigId = newCfgModel==null ? null : newCfgModel.getModel()+":"+newCfgModel.getName();
 
         configChanges.add(new FeatureChange(LAYERS, serialize(oldLayers), serialize(newLayers)));