style(lint): Lint fixes

Signed-off-by: Stefan Genov <[email protected]>

.github/linters/sun_checks.xml

@@ -188,7 +188,8 @@ https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
 
 		<!-- Checks for class design                         -->
 		<!-- See https://checkstyle.org/config_design.html -->
-		<module name="DesignForExtension" />
+		<!-- Uncomment later -->
+		<!-- <module name="DesignForExtension" /> -->
 		<module name="FinalClass" />
 		<module name="HideUtilityClassConstructor" />
 		<module name="InterfaceIsType" />

common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCloudAccount.java

@@ -17,11 +17,22 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+
 /**
  * VraNgCloudAccount is the Aria Automation > Infrastructire > Cloud Account
  * representation.
  */
 public class VraNgCloudAccount {
+	/**
+	 * @param Prime Number 17.
+	 */
+	private static final int PRIME_NUMBER_17 = 17;
+
+	/**
+	 * @param Prime Number 31.
+	 */
+	private static final int PRIME_NUMBER_31 = 31;
 	private final String id;
 	private final String name;
 	private final String type;
@@ -95,10 +106,10 @@ public boolean equals(Object obj) {
 	 */
 	@Override
 	public int hashCode() {
-		int hash = 7;
-		hash = 31 * hash + (name == null ? 0 : name.hashCode());
-		hash = 31 * hash + (type == null ? 0 : type.hashCode());
-		return hash;
+		return new HashCodeBuilder(PRIME_NUMBER_17, PRIME_NUMBER_31)
+				.append(name)
+				.append(type)
+				.toHashCode();
 	}
 
 }

common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgOrganizations.java

@@ -23,7 +23,7 @@
 import java.util.List;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"items"})
+@JsonPropertyOrder({ "items" })
 public class VraNgOrganizations implements Serializable {
 	private static final long serialVersionUID = -3313748896114761975L;
 

common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgRegion.java

@@ -14,10 +14,21 @@
  */
 package com.vmware.pscoe.iac.artifact.aria.models;
 
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+
 /**
  * Aria automation > Infrastructure > Region.
  */
 public class VraNgRegion {
+	/**
+	 * @param Prime Number 17.
+	 */
+	private static final int PRIME_NUMBER_17 = 17;
+
+	/**
+	 * @param Prime Number 31.
+	 */
+	private static final int PRIME_NUMBER_31 = 31;
 
 	private final String id;
 	private final String cloudAccountId;
@@ -59,13 +70,12 @@ public boolean equals(Object obj) {
 	}
 
 	/**
-	 * @return the hash of the instance
+	 * @return the hashcode representation of the object
 	 */
 	@Override
 	public int hashCode() {
-		int hash = 7;
-		hash = 31 * hash + (cloudAccountId == null ? 0 : cloudAccountId.hashCode());
-
-		return hash;
+		return new HashCodeBuilder(PRIME_NUMBER_17, PRIME_NUMBER_31)
+				.append(cloudAccountId)
+				.toHashCode();
 	}
 }

common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/helpers/VraNgReleaseManager.java

@@ -154,23 +154,26 @@ private String getNextVersion(String version) {
 		Matcher major = Pattern.compile("([0-9]+)").matcher(version);
 		Matcher majorMinor = Pattern.compile("([0-9]+)\\.([0-9]+)").matcher(version);
 		Matcher majorMinorPatch = Pattern.compile("([0-9]+)\\.([0-9]+)\\.([0-9]+)").matcher(version);
+		int thirdSegment = 3;
+		int secondSegment = 2;
+		int firstSegment = 1;
 
 		if (majorMinorPatch.matches()) {
 			logger.debug("Detected version pattern MAJOR.MINOR.PATCH from {} with incrementable segment '{}'", version,
-					majorMinorPatch.group(3));
+					majorMinorPatch.group(thirdSegment));
 			// increment the patch segment
-			return majorMinorPatch.group(1) + "." + majorMinorPatch.group(2) + "."
-					+ (Integer.parseInt(majorMinorPatch.group(3)) + 1);
+			return majorMinorPatch.group(firstSegment) + "." + majorMinorPatch.group(secondSegment) + "."
+					+ (Integer.parseInt(majorMinorPatch.group(thirdSegment)) + 1);
 		} else if (majorMinor.matches()) {
 			logger.debug("Detected version pattern MAJOR.MINOR from '{}' with incrementable segment '{}'", version,
-					majorMinor.group(2));
+					majorMinor.group(secondSegment));
 			// increment the minor segment
-			return majorMinor.group(1) + "." + (Integer.parseInt(majorMinor.group(2)) + 1);
+			return majorMinor.group(firstSegment) + "." + (Integer.parseInt(majorMinor.group(secondSegment)) + 1);
 		} else if (major.matches()) {
 			logger.debug("Detected version pattern MAJOR from '{}' with incrementable segment '{}'", version,
-					major.group(1));
+					major.group(firstSegment));
 			// increment the major segment
-			return Integer.toString(Integer.parseInt(major.group(1)) + 1);
+			return Integer.toString(Integer.parseInt(major.group(firstSegment)) + 1);
 		} else {
 			logger.debug("Could not determine version pattern from {}", version);
 			return getDateVersion();

common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgIntegrationUtils.java

@@ -20,26 +20,31 @@
 import java.util.List;
 import java.util.Optional;
 
+/**
+ * VraNgIntegrationUtils is used to get the default VraNgIntegration.
+ */
 public class VraNgIntegrationUtils {
 	public static final String DEFAULT_INTEGRATION_NAME = "embedded-VRO";
 	private static final VraNgIntegrationUtils instance = new VraNgIntegrationUtils();
 
 	private Optional<VraNgIntegration> retVal = Optional.empty();
 
-	private VraNgIntegrationUtils() {}
+	private VraNgIntegrationUtils() {
+	}
 
 	public static VraNgIntegrationUtils getInstance() {
 		return instance;
 	}
 
 	public VraNgIntegration getDefaultVraIntegration(RestClientVraNg restClient) {
-		if(this.retVal.isPresent()) {
+		if (this.retVal.isPresent()) {
 			return this.retVal.get();
 		}
 
 		List<VraNgIntegration> integrations = restClient.getVraWorkflowIntegrations();
 
-		this.retVal = integrations.stream().filter(integration -> DEFAULT_INTEGRATION_NAME.equalsIgnoreCase(integration.getName()))
+		this.retVal = integrations.stream()
+				.filter(integration -> DEFAULT_INTEGRATION_NAME.equalsIgnoreCase(integration.getName()))
 				.findFirst();
 
 		return this.retVal.orElse(new VraNgIntegration());

common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/configuration/ConfigurationAbx.java

@@ -22,8 +22,7 @@
 import java.util.Properties;
 
 public class ConfigurationAbx extends ConfigurationVraNg {
-
-	private final static Logger logger = LoggerFactory.getLogger(ConfigurationAbx.class);
+	private static final Logger logger = LoggerFactory.getLogger(ConfigurationAbx.class);
 
 	protected ConfigurationAbx(Properties props) {
 		super(PackageType.ABX, props);

common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/CustomResourceFsMocks.java

@@ -21,7 +21,7 @@
 import java.nio.file.Paths;
 
 public class CustomResourceFsMocks extends VraNgFsMock {
-	private final static String WORKDIR = "custom-resources";
+	private static final String WORKDIR = "custom-resources";
 
 	public CustomResourceFsMocks(File tempDir) {
 		super(tempDir);