[Task 336] merge: Merge with main.

Signed-off-by: Alexander Kantchev <[email protected]>
vmware · Sep 11, 2024 · a26c4c1 · a26c4c1
2 parents f5bf1ec + d7f3ff4
commit a26c4c1
Show file tree

Hide file tree

Showing 442 changed files with 21,604 additions and 21,993 deletions.
diff --git a/.github/linters/sun_checks.xml b/.github/linters/sun_checks.xml
@@ -64,7 +64,9 @@ https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
 
 	<!-- Checks that a package-info.java file exists for each package.     -->
 	<!-- See https://checkstyle.org/config_javadoc.html#JavadocPackage -->
+	<!--
 	<module name="JavadocPackage" />
+	-->
 
 	<!-- Checks whether files end with a new line.                        -->
 	<!-- See https://checkstyle.org/config_misc.html#NewlineAtEndOfFile -->
@@ -105,15 +107,18 @@ https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
 
 		<!-- Checks for Javadoc comments.                     -->
 		<!-- See https://checkstyle.org/config_javadoc.html -->
+		<!--
 		<module name="InvalidJavadocPosition" />
 		<module name="JavadocMethod" />
 		<module name="JavadocType" />
 		<module name="JavadocVariable" />
 		<module name="JavadocStyle" />
 		<module name="MissingJavadocMethod" />
+		-->
 
 		<!-- Checks for Naming Conventions.                  -->
 		<!-- See https://checkstyle.org/config_naming.html -->
+		<!--
 		<module name="ConstantName" />
 		<module name="LocalFinalVariableName" />
 		<module name="LocalVariableName" />
@@ -127,55 +132,69 @@ https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
 		<module name="StaticVariableName" />
 		<module name="TypeName" />
 
+		-->
 		<!-- Checks for imports                              -->
 		<!-- See https://checkstyle.org/config_imports.html -->
 		<!-- <module name="AvoidStarImport" /> -->
 		<module name="IllegalImport" /> <!-- defaults to sun.* packages -->
+		<!--
 		<module name="RedundantImport" />
 		<module name="UnusedImports">
 			<property name="processJavadoc" value="false" />
 		</module>
+		-->
 
 		<!-- Checks for Size Violations.                    -->
 		<!-- See https://checkstyle.org/config_sizes.html -->
+		<!--
 		<module name="MethodLength" />
 		<module name="ParameterNumber">
 			<property name="max" value="10" />
 			<property name="tokens" value="METHOD_DEF" />
 		</module>
+		-->
 
 		<!-- Checks for whitespace                               -->
 		<!-- See https://checkstyle.org/config_whitespace.html -->
+		<!--
 		<module name="EmptyForIteratorPad" />
 		<module name="GenericWhitespace" />
 		<module name="MethodParamPad" />
+		-->
 
 		<!-- Ignore '{' is followed by whitespace. [NoWhitespaceAfter] -->
 		<!-- <module name="NoWhitespaceAfter"/> -->
+		<!--
 		<module name="NoWhitespaceBefore" />
 		<module name="OperatorWrap" />
 		<module name="ParenPad" />
 		<module name="TypecastParenPad" />
 		<module name="WhitespaceAfter" />
 		<module name="WhitespaceAround" />
+		-->
 
 		<!-- Modifier Checks                                    -->
 		<!-- See https://checkstyle.org/config_modifier.html -->
+		<!--
 		<module name="ModifierOrder" />
 		<module name="RedundantModifier" />
+		-->
 
 		<!-- Checks for blocks. You know, those {}'s         -->
 		<!-- See https://checkstyle.org/config_blocks.html -->
+		<!--
 		<module name="AvoidNestedBlocks">
 			<property name="allowInSwitchCase" value="true"/>
 		</module>
 		<module name="EmptyBlock" />
 		<module name="LeftCurly" />
 		<module name="NeedBraces" />
 		<module name="RightCurly" />
+		-->
 
 		<!-- Checks for common coding problems               -->
 		<!-- See https://checkstyle.org/config_coding.html -->
+		<!--
 		<module name="EmptyStatement" />
 		<module name="EqualsHashCode" />
 		<module name="HiddenField" >
@@ -189,31 +208,40 @@ https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
 		<module name="MultipleVariableDeclarations" />
 		<module name="SimplifyBooleanExpression" />
 		<module name="SimplifyBooleanReturn" />
+		-->
 
 		<!-- Checks for class design                         -->
 		<!-- See https://checkstyle.org/config_design.html -->
+		<!--
 		<module name="DesignForExtension" />
 		<module name="FinalClass" />
 		<module name="HideUtilityClassConstructor" />
 		<module name="InterfaceIsType" />
 		<module name="VisibilityModifier" >
 			<property name="protectedAllowed" value="true"/>
 		</module>
+		-->
 
 		<!-- Miscellaneous other checks.                   -->
 		<!-- See https://checkstyle.org/config_misc.html -->
+		<!--
 		<module name="ArrayTypeStyle" />
+		-->
 		<!-- FinalParameters reports False positives -->
 		<!-- <module name="FinalParameters" /> -->
 		<!-- <module name="TodoComment" /> -->
+		<!--
 		<module name="UpperEll" />
+		-->
 
 		<!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
+		<!--
 		<module name="SuppressionXpathFilter">
 			<property name="file" value="${org.checkstyle.sun.suppressionxpathfilter.config}"
 				default="checkstyle-xpath-suppressions.xml" />
 			<property name="optional" value="true" />
 		</module>
+		-->
 
 	</module>
 

diff --git a/.github/workflows/codeql-java.yml b/.github/workflows/codeql-java.yml
@@ -67,5 +67,5 @@ jobs:
       - name: Build 'typescript-project-all'
         run: mvn -T 1C clean install -f maven/typescript-project-all/pom.xml -s $PWD/.m2/settings.xml
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+      # - name: Perform CodeQL Analysis
+      #   uses: github/codeql-action/analyze@v2
diff --git a/...rtifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbstractVrliPackageStore.java b/...rtifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbstractVrliPackageStore.java
@@ -1,5 +1,3 @@
-package com.vmware.pscoe.iac.artifact;
-
 /*-
  * #%L
  * artifact-manager
@@ -14,6 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
+package com.vmware.pscoe.iac.artifact;
 
 import com.vmware.pscoe.iac.artifact.model.Package;
 import com.vmware.pscoe.iac.artifact.model.PackageContent;

diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbxPackageStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbxPackageStore.java
@@ -1,5 +1,3 @@
-package com.vmware.pscoe.iac.artifact;
-
 /*
  * #%L
  * artifact-manager
@@ -14,6 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
+package com.vmware.pscoe.iac.artifact;
 
 import com.vmware.pscoe.iac.artifact.configuration.ConfigurationAbx;
 import com.vmware.pscoe.iac.artifact.model.Package;
@@ -69,16 +68,16 @@ protected AbxPackageStore(final RestClientVraNg restClientVraNg, final Configura
 	 * @return abx package content to return
 	 */
 	@Override
-    protected final AbxPackageContent getPackageContent(final Package pkg) {
+	protected final AbxPackageContent getPackageContent(final Package pkg) {
 		throw new NotImplementedException("Not implemented");
 	}
 
 	/**
 	 *
 	 * @return received packages
 	 */
-    @Override
-    public final List<Package> getPackages() {
+	@Override
+	public final List<Package> getPackages() {
 		throw new NotImplementedException("Not implemented");
 	}
 
@@ -90,19 +89,19 @@ public final List<Package> getPackages() {
 	 * @return the deleted package
 	 */
 	@Override
-    protected final Package deletePackage(final Package pkg, final boolean withContent, final boolean dryrun) {
-        throw new NotImplementedException("Not implemented");
-    }
+	protected final Package deletePackage(final Package pkg, final boolean withContent, final boolean dryrun) {
+		throw new NotImplementedException("Not implemented");
+	}
 
 	/**
 	 *
 	 * @param content the content to delete
 	 * @param dryrun whether it should be dry run
 	 */
 	@Override
-    protected final void deleteContent(final Content content, final boolean dryrun) {
-        throw new NotImplementedException("Not implemented");
-    }
+	protected final void deleteContent(final Content content, final boolean dryrun) {
+		throw new NotImplementedException("Not implemented");
+	}
 
 	/**
 	 *
@@ -175,7 +174,7 @@ public final List<Package> importAllPackages(final List<Package> abxPackages, fi
 	 */
 	@Override
 	public final Package exportPackage(final Package abxPackage, final boolean dryrun) {
-	    File abxPackageFile = new File(abxPackage.getFilesystemPath());
+		File abxPackageFile = new File(abxPackage.getFilesystemPath());
 		return this.exportPackage(abxPackage, abxPackageFile, dryrun);
 	}
 
@@ -189,24 +188,24 @@ public final Package exportPackage(final Package abxPackage, final boolean dryru
 	@Override
 	public final Package exportPackage(final Package abxPackage, final File abxPackageDescriptorParent, final boolean dryrun) {
 		AbxPackageDescriptor abxPackageDescriptor = AbxPackageDescriptor.getInstance(abxPackageDescriptorParent);
-        return exportPackage(abxPackage, abxPackageDescriptor, dryrun);
+		return exportPackage(abxPackage, abxPackageDescriptor, dryrun);
 	}
 
-    /**
-     * Main handler for exporting abx package based on package.json file.
-     * @param pkg abx package
-     * @param packageDescriptor abx package descriptor file
-     * @param dryrun whether it should be dry run
-     * @return package
-     */
-    @Override
-    public final Package exportPackage(final Package pkg, final AbxPackageDescriptor packageDescriptor, final boolean dryrun) {
-        logger.info(String.format(PackageStore.PACKAGE_EXPORT, pkg));
+	/**
+	 * Main handler for exporting abx package based on package.json file.
+	 * @param pkg abx package
+	 * @param packageDescriptor abx package descriptor file
+	 * @param dryrun whether it should be dry run
+	 * @return package
+	 */
+	@Override
+	public final Package exportPackage(final Package pkg, final AbxPackageDescriptor packageDescriptor, final boolean dryrun) {
+		logger.info(String.format(PackageStore.PACKAGE_EXPORT, pkg));
 
 		logger.warn("ABX content pull is not supported yet");
 
-        return pkg;
-    }
+		return pkg;
+	}
 
 	/**
 	 * Main handler for importing abx package.
@@ -221,7 +220,7 @@ public final Package importPackage(final Package abxPackage, final boolean dryru
 		File tmp;
 		try {
 			tmp = Files.createTempDirectory("iac-package-import").toFile();
-            logger.info("Created temp dir {}", tmp.getAbsolutePath());
+			logger.info("Created temp dir {}", tmp.getAbsolutePath());
 			new PackageManager(abxPackage).unpack(tmp);
 		} catch (IOException e) {
 			logger.error("Unable to extract package '{}' in temporary directory.", abxPackage.getFQName());