Eliminate usage of Guava

wcm-io-caravan · Mar 18, 2024 · 43b3111 · 43b3111
1 parent df24a3a
commit 43b3111
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/publisher/changes.xml b/publisher/changes.xml
@@ -27,6 +27,9 @@
       <action type="fix" dev="iakulenka" issue="4">
         Fix issue with AEMaaCS: Use bundle ID instead of bundle instance to pass over bundle reference to ServletContainerBridge.
       </action>
+      <action type="update" dev="sseifert">
+        Eliminate usage of Guava.
+      </action>
     </release>
 
     <release version="1.2.0" date="2019-06-03">

diff --git a/publisher/src/main/java/io/wcm/caravan/jaxrs/publisher/impl/JaxRsApplication.java b/publisher/src/main/java/io/wcm/caravan/jaxrs/publisher/impl/JaxRsApplication.java
@@ -28,7 +28,6 @@
 
 import org.glassfish.jersey.server.ServerProperties;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 
 import io.wcm.caravan.jaxrs.publisher.JaxRsClassesProvider;
@@ -39,14 +38,13 @@
  */
 class JaxRsApplication extends Application {
 
-  private static final Map<String, Object> DEFAULT_PROPERTIES = ImmutableMap.<String, Object>builder()
+  private static final Map<String, Object> DEFAULT_PROPERTIES = Map.of(
       // look for implementations described by META-INF/services/*
-      .put(ServerProperties.METAINF_SERVICES_LOOKUP_DISABLE, false)
+      ServerProperties.METAINF_SERVICES_LOOKUP_DISABLE, false,
       // disable auto discovery on server, as it's handled via OSGI
-      .put(ServerProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true)
+      ServerProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true,
       // disable WADL generation by default
-      .put(ServerProperties.WADL_FEATURE_DISABLE, true)
-      .build();
+      ServerProperties.WADL_FEATURE_DISABLE, true);
 
   private final Set<JaxRsComponent> localComponents;
   private final Set<JaxRsComponent> globalComponents;

diff --git a/publisher/src/test/java/io/wcm/caravan/jaxrs/publisher/impl/JaxRsApplicationTest.java b/publisher/src/test/java/io/wcm/caravan/jaxrs/publisher/impl/JaxRsApplicationTest.java
@@ -33,8 +33,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import com.google.common.collect.ImmutableSet;
-
 import io.wcm.caravan.jaxrs.publisher.JaxRsClassesProvider;
 import io.wcm.caravan.jaxrs.publisher.JaxRsComponent;
 
@@ -54,8 +52,8 @@ public class JaxRsApplicationTest {
   @Test
   public void test_getSingletons() throws Exception {
 
-    JaxRsApplication app = new JaxRsApplication(ImmutableSet.of(localComponent), ImmutableSet.of(globalComponent),
-        ImmutableSet.of(localClassesProvider), ImmutableSet.of(globalClassesProvider));
+    JaxRsApplication app = new JaxRsApplication(Set.of(localComponent), Set.of(globalComponent),
+        Set.of(localClassesProvider), Set.of(globalClassesProvider));
     Set<Object> singletons = app.getSingletons();
 
     assertEquals(2, singletons.size());
@@ -67,10 +65,10 @@ public void test_getSingletons() throws Exception {
   public void test_getClasses_from_local_components() throws Exception {
 
     when(localClassesProvider.getClasses())
-        .thenReturn(ImmutableSet.of(AdditionalResource.class));
+        .thenReturn(Set.of(AdditionalResource.class));
 
-    JaxRsApplication app = new JaxRsApplication(ImmutableSet.of(localComponent), ImmutableSet.of(globalComponent),
-        ImmutableSet.of(localClassesProvider), ImmutableSet.of(globalClassesProvider));
+    JaxRsApplication app = new JaxRsApplication(Set.of(localComponent), Set.of(globalComponent),
+        Set.of(localClassesProvider), Set.of(globalClassesProvider));
     Set<Class<?>> additionalClasses = app.getClasses();
 
     assertEquals(1, additionalClasses.size());
@@ -81,10 +79,10 @@ public void test_getClasses_from_local_components() throws Exception {
   public void test_getClasses_from_global_components() throws Exception {
 
     when(globalClassesProvider.getClasses())
-        .thenReturn(ImmutableSet.of(AdditionalResource.class));
+        .thenReturn(Set.of(AdditionalResource.class));
 
-    JaxRsApplication app = new JaxRsApplication(ImmutableSet.of(localComponent), ImmutableSet.of(globalComponent),
-        ImmutableSet.of(localClassesProvider), ImmutableSet.of(globalClassesProvider));
+    JaxRsApplication app = new JaxRsApplication(Set.of(localComponent), Set.of(globalComponent),
+        Set.of(localClassesProvider), Set.of(globalClassesProvider));
     Set<Class<?>> additionalClasses = app.getClasses();
 
     assertEquals(1, additionalClasses.size());