Removed guava immutable map

Author: wolpert

feature-flag-test/build.gradle.kts

@@ -9,7 +9,6 @@ dependencies {
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
     implementation(project(":feature-flag"))
     implementation(libs.slf4j.api)
-    implementation(libs.guava)
 
     implementation(libs.bundles.logback)
     implementation(libs.bundles.testing)

oop-mock-common/build.gradle.kts

@@ -6,7 +6,6 @@ dependencies {
     implementation(libs.slf4j.api)
     implementation(libs.jackson.annotations)
     implementation(libs.jackson.datatype.jdk8)
-    implementation(libs.guava)
     implementation(libs.commons.io)
 
     implementation(libs.dagger)

oop-mock-common/src/main/java/com/codeheadsystems/oop/mock/dagger/ResolverModule.java

@@ -22,13 +22,13 @@
 import com.codeheadsystems.oop.mock.converter.JsonConverter;
 import com.codeheadsystems.oop.mock.manager.ResourceLookupManager;
 import com.codeheadsystems.oop.mock.translator.Translator;
-import com.google.common.collect.ImmutableMap;
 import dagger.Binds;
 import dagger.BindsOptionalOf;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.ClassKey;
 import dagger.multibindings.IntoMap;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import javax.inject.Named;
@@ -144,7 +144,7 @@ class ResolverConfigModule {
      * Instantiates a new Resolver config module.
      */
     public ResolverConfigModule() {
-      this(ImmutableMap.of());
+      this(Map.of());
     }
 
     /**
@@ -170,11 +170,11 @@ public ResolverConfigModule(final Map<Class<?>, Object> additionalDependencies)
     public Map<Class<?>, Object> fullDependencies(@Named(RESOLVER_ADDITIONAL_DEPS) final Map<Class<?>, Object> addition,
                                                   @Named(RESOLVER_INTERNAL_MAP) final Map<Class<?>, Object> internal,
                                                   final OopMockConfiguration configuration) {
-      final ImmutableMap.Builder<Class<?>, Object> builder = ImmutableMap.builder();
+      final HashMap<Class<?>, Object> builder = new HashMap<>();
       builder.putAll(internal);
       builder.putAll(addition);
       configuration.resolverConfiguration().ifPresent(rc -> builder.put(ResolverConfiguration.class, rc));
-      return builder.build();
+      return Map.copyOf(builder);
     }
 
     /**

oop-mock-common/src/test/java/com/codeheadsystems/oop/mock/model/InMemoryMockedDataStoreTest.java

@@ -17,7 +17,7 @@
 package com.codeheadsystems.oop.mock.model;
 
 import com.codeheadsystems.test.model.BaseJacksonTest;
-import com.google.common.collect.ImmutableMap;
+import java.util.Map;
 
 /**
  * The type In memory mocked data store test.
@@ -33,7 +33,7 @@ protected Class<InMemoryMockedDataStore> getBaseClass() {
   protected InMemoryMockedDataStore getInstance() {
     return ImmutableInMemoryMockedDataStore.builder()
         .putDatastore("key",
-            ImmutableMap.of("otherkey",
+            Map.of("otherkey",
                 ImmutableMockedData.builder().marshalledData("marshalled").build()))
         .build();
   }

oop-mock-common/src/test/java/com/codeheadsystems/oop/mock/resolver/InMemoryResolverTest.java

@@ -26,8 +26,8 @@
 import com.codeheadsystems.oop.mock.model.ImmutableInMemoryMockedDataStore;
 import com.codeheadsystems.oop.mock.model.ImmutableMockedData;
 import com.codeheadsystems.oop.mock.model.InMemoryMockedDataStore;
-import com.google.common.collect.ImmutableMap;
 import java.io.InputStream;
+import java.util.Map;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -60,7 +60,7 @@ class InMemoryResolverTest {
   private static final String FILENAME = "filename";
   private static final Hasher HASHER = new Hasher("blah");
   private static final InMemoryMockedDataStore datastore = ImmutableInMemoryMockedDataStore.builder()
-      .putDatastore(NAMESPACE, ImmutableMap.of(HASHER.hash(LOOKUP, DISCRIMINATOR),
+      .putDatastore(NAMESPACE, Map.of(HASHER.hash(LOOKUP, DISCRIMINATOR),
           ImmutableMockedData.builder().marshalledData(MARSHALLED_DATA).build()))
       .build();
 

oop-mock-common/src/test/java/com/codeheadsystems/oop/mock/resolver/ResolverFactoryTest.java

@@ -26,7 +26,6 @@
 import com.codeheadsystems.oop.mock.manager.ResourceLookupManager;
 import com.codeheadsystems.oop.mock.model.MockedData;
 import com.codeheadsystems.oop.mock.translator.Translator;
-import com.google.common.collect.ImmutableMap;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Date;
 import java.util.Map;
@@ -57,7 +56,7 @@ class ResolverFactoryTest {
    */
   @BeforeEach
   void setup() {
-    instanceMap = ImmutableMap.of(
+    instanceMap = Map.of(
         OopMockConfiguration.class, configuration,
         JsonConverter.class, converter,
         ResourceLookupManager.class, manager,

oop-mock-dynamodb/build.gradle.kts

@@ -10,7 +10,6 @@ dependencies {
     implementation(libs.slf4j.api)
     implementation(libs.jackson.annotations)
     implementation(libs.jackson.datatype.jdk8)
-    implementation(libs.guava)
     implementation(libs.commons.io)
     implementation(libs.aws.sdk.ddb)
 

oop-mock-dynamodb/src/test/java/com/codeheadsystems/oop/dao/ddb/FullDdbDaoTest.java

@@ -25,7 +25,6 @@
 import com.codeheadsystems.oop.test.FullDaoTest;
 import com.codeheadsystems.test.datastore.DataStore;
 import com.codeheadsystems.test.datastore.DynamoDbExtension;
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -67,6 +66,6 @@ protected ResolverConfiguration resolverConfiguration() {
 
   @Override
   protected Map<Class<?>, Object> resolverDeps() {
-    return ImmutableMap.of(DynamoDBMapper.class, mapper);
+    return Map.of(DynamoDBMapper.class, mapper);
   }
 }

oop-mock-tests/build.gradle.kts

@@ -12,7 +12,6 @@ dependencies {
     implementation(libs.slf4j.api)
     implementation(libs.jackson.annotations)
     implementation(libs.jackson.datatype.jdk8)
-    implementation(libs.guava)
     implementation(libs.commons.io)
 
     implementation(libs.dagger)