Eliminate usage of Guava (#61)

Author: stefanseifert

changes.xml

@@ -27,6 +27,9 @@
       <action type="update" dev="sseifert">
         Switch to latest Maven APIs to handle build output timestamp.
       </action>
+      <action type="update" dev="sseifert">
+        Eliminate usage of Guava.
+      </action>
     </release>
 
     <release version="2.19.4" date="2023-03-27">

conga-aem-plugin/pom.xml

@@ -67,12 +67,6 @@
       <scope>compile</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>compile</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>filevault-package-maven-plugin</artifactId>

parent/pom.xml

@@ -88,12 +88,6 @@
         <version>2.1.6</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>32.1.1-jre</version>
-      </dependency>
-  
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>filevault-package-maven-plugin</artifactId>

tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/AbstractCloudManagerMojo.java

@@ -32,8 +32,6 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Parameter;
 
-import com.google.common.collect.ImmutableSet;
-
 /**
  * Common functionality for mojos that generate configuration ZIP files for Adobe Cloud Manager.
  */
@@ -128,10 +126,10 @@ protected List<File> getNodeDirs(File environmentDir) {
 
   private static Set<String> toSet(String[] values) {
     if (values != null) {
-      return ImmutableSet.copyOf(values);
+      return Set.of(values);
     }
     else {
-      return ImmutableSet.of();
+      return Set.of();
     }
   }
 

tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/AbstractContentPackageMojo.java

@@ -22,6 +22,8 @@
 import static io.wcm.tooling.commons.packmgr.install.VendorInstallerFactory.COMPOSUM_URL;
 import static io.wcm.tooling.commons.packmgr.install.VendorInstallerFactory.CRX_URL;
 
+import java.util.List;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
@@ -30,8 +32,6 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.settings.crypto.SettingsDecrypter;
 
-import com.google.common.collect.ImmutableList;
-
 import io.wcm.tooling.commons.packmgr.PackageManagerProperties;
 import io.wcm.tooling.commons.packmgr.install.VendorInstallerFactory;
 import io.wcm.tooling.commons.packmgr.install.VendorInstallerFactory.Service;
@@ -237,8 +237,8 @@ protected PackageManagerProperties getPackageManagerProperties() throws MojoExec
     props.setRetryDelaySec(this.retryDelay);
     props.setBundleStatusUrl(buildBundleStatusUrl());
     props.setBundleStatusWaitLimitSec(this.bundleStatusWaitLimit);
-    props.setBundleStatusBlacklistBundleNames(ImmutableList.copyOf(this.bundleStatusBlacklistBundleNames));
-    props.setBundleStatusWhitelistBundleNames(ImmutableList.copyOf(this.bundleStatusWhitelistBundleNames));
+    props.setBundleStatusBlacklistBundleNames(List.of(this.bundleStatusBlacklistBundleNames));
+    props.setBundleStatusWhitelistBundleNames(List.of(this.bundleStatusWhitelistBundleNames));
     props.setPackageManagerInstallStatusURL(buildPackageManagerInstallStatusUrl());
     props.setPackageManagerInstallStatusWaitLimitSec(this.packageManagerInstallStatusWaitLimit);
     props.setRelaxedSSLCheck(this.relaxedSSLCheck);

tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java

@@ -64,8 +64,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import com.google.common.collect.ImmutableSet;
-
 import io.wcm.devops.conga.plugins.aem.maven.AutoDependenciesMode;
 import io.wcm.devops.conga.plugins.aem.maven.BuildOutputTimestamp;
 import io.wcm.devops.conga.plugins.aem.maven.PackageTypeValidation;
@@ -113,7 +111,7 @@ public final class AllPackageBuilder {
   private BuildOutputTimestamp buildOutputTimestamp;
 
   private static final String RUNMODE_DEFAULT = "$default$";
-  private static final Set<String> ALLOWED_PACKAGE_TYPES = ImmutableSet.of(
+  private static final Set<String> ALLOWED_PACKAGE_TYPES = Set.of(
       PackageType.APPLICATION.name().toLowerCase(),
       PackageType.CONTAINER.name().toLowerCase(),
       PackageType.CONTENT.name().toLowerCase());

tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilderTest.java

@@ -29,6 +29,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
 
@@ -40,10 +41,6 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.zeroturnaround.zip.ZipUtil;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-
 import io.wcm.devops.conga.plugins.aem.maven.AutoDependenciesMode;
 import io.wcm.devops.conga.plugins.aem.maven.model.InstallableFile;
 import io.wcm.devops.conga.plugins.aem.maven.model.ModelParser;
@@ -69,9 +66,9 @@ void setUp(TestInfo testInfo) throws IOException {
   private static Stream<Arguments> cloudManagerTargetVariants() {
     return Stream.of(
         // test with no environment (=all environments)
-        Arguments.of(ImmutableSet.of(), ImmutableList.of(".author")),
+        Arguments.of(Set.of(), List.of(".author")),
         // test with two environments
-        Arguments.of(ImmutableSet.of("stage", "prod"), ImmutableList.of(".author.stage", ".author.prod")));
+        Arguments.of(Set.of("stage", "prod"), List.of(".author.stage", ".author.prod")));
   }
 
   @ParameterizedTest
@@ -82,7 +79,7 @@ void testBuild_AUTODEPENDENCIES_OFF(Set<String> cloudManagerTarget, List<String>
 
     AllPackageBuilder builder = new AllPackageBuilder(targetFile, "test-group", "test-pkg");
     builder.add(files, cloudManagerTarget);
-    assertTrue(builder.build(ImmutableMap.of("prop1", "value1")));
+    assertTrue(builder.build(Map.of("prop1", "value1")));
 
     ZipUtil.unpack(targetFile, targetUnpackDir);
 

tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/FileTestUtil.java

@@ -36,9 +36,6 @@
 import org.jetbrains.annotations.Nullable;
 import org.w3c.dom.Document;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedSet;
-
 public final class FileTestUtil {
 
   private FileTestUtil() {
@@ -78,7 +75,7 @@ public static void assertFiles(File dir, String runmodeSuffix, ExpectedFile... e
         .map(file -> file.getFileName(runmodeSuffix))
         .collect(Collectors.toCollection(TreeSet::new));
     String[] fileNames = dir.list();
-    Set<String> actualFileNames = fileNames != null ? ImmutableSortedSet.copyOf(fileNames) : ImmutableSet.of();
+    Set<String> actualFileNames = fileNames != null ? new TreeSet<>(Set.of(fileNames)) : Set.of();
     assertEquals(expectedFileNames, actualFileNames, "files in " + dir.getPath());
 
     // extra check for content packages
@@ -118,7 +115,7 @@ public static void assertFiles(File dir, String runmodeSuffix, ExpectedFile... e
   public static void assertDirectories(File dir, String... fileNames) {
     assertTrue(dir.exists(), "directory exists: " + dir.getPath());
     assertTrue(dir.isDirectory(), "is directory: " + dir.getPath());
-    Set<String> expectedDirectoryNames = ImmutableSet.copyOf(fileNames);
+    Set<String> expectedDirectoryNames = Set.of(fileNames);
     Set<String> actualDirectoryNames = Collections.emptySet();
     File[] files = dir.listFiles();
     if (files != null) {

tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/model/ModelParserTest.java

@@ -26,13 +26,12 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import com.google.common.collect.ImmutableSet;
-
 class ModelParserTest {
 
   private File nodeDir;
@@ -69,7 +68,7 @@ void testGetContentPackagesForNode() {
     assertBundle(files.get(12), "bundles/io.wcm.wcm.ui.granite-1.9.2.jar");
 
     ModelContentPackageFile pkg6 = (ModelContentPackageFile)files.get(6);
-    assertEquals(ImmutableSet.of("aem-author"), pkg6.getVariants());
+    assertEquals(Set.of("aem-author"), pkg6.getVariants());
     assertEquals(false, pkg6.getInstall());
     assertEquals(true, pkg6.getRecursive());
     assertEquals(30, pkg6.getDelayAfterInstallSec());
@@ -79,7 +78,7 @@ void testGetContentPackagesForNode() {
     assertEquals("1.3.1-SNAPSHOT", pkg6.getVersion());
 
     BundleFile bundle12 = (BundleFile)files.get(12);
-    assertEquals(ImmutableSet.of("aem-author"), bundle12.getVariants());
+    assertEquals(Set.of("aem-author"), bundle12.getVariants());
     assertEquals(false, bundle12.getInstall());
   }
 
@@ -110,7 +109,7 @@ void testHasRole() {
 
   @Test
   void testGetCloudManagerTarget() {
-    assertEquals(ImmutableSet.of("stage", "prod"), nodeModelParser.getCloudManagerTarget());
+    assertEquals(Set.of("stage", "prod"), nodeModelParser.getCloudManagerTarget());
     assertTrue(dispatcherNodeModelParser.getCloudManagerTarget().isEmpty());
   }