Fix accidental dependencies to shaded packages (#1243)

stargate · Jul 9, 2024 · 30c7ae0 · 30c7ae0
1 parent 35ecb00
commit 30c7ae0
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/CustomTaggingMetricIdGenerator.java b/src/main/java/io/stargate/sgv2/jsonapi/service/cqldriver/CustomTaggingMetricIdGenerator.java
@@ -8,7 +8,7 @@
 import com.datastax.oss.driver.internal.core.metrics.DefaultMetricId;
 import com.datastax.oss.driver.internal.core.metrics.MetricId;
 import com.datastax.oss.driver.internal.core.metrics.MetricIdGenerator;
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Objects;
 

diff --git a/...test/java/io/stargate/sgv2/jsonapi/api/model/command/impl/CreateNamespaceCommandTest.java b/...test/java/io/stargate/sgv2/jsonapi/api/model/command/impl/CreateNamespaceCommandTest.java
@@ -10,9 +10,9 @@
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Validator;
 import java.util.Set;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
 
 @QuarkusTest
 @TestProfile(NoGlobalResourcesTestProfile.Impl.class)

diff --git a/src/test/java/io/stargate/sgv2/jsonapi/api/model/command/impl/DropNamespaceCommandTest.java b/src/test/java/io/stargate/sgv2/jsonapi/api/model/command/impl/DropNamespaceCommandTest.java
@@ -10,9 +10,9 @@
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Validator;
 import java.util.Set;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
 
 @QuarkusTest
 @TestProfile(NoGlobalResourcesTestProfile.Impl.class)

diff --git a/src/test/java/io/stargate/sgv2/jsonapi/service/cqldriver/FixedTokenOverrideProfile.java b/src/test/java/io/stargate/sgv2/jsonapi/service/cqldriver/FixedTokenOverrideProfile.java
@@ -1,8 +1,8 @@
 package io.stargate.sgv2.jsonapi.service.cqldriver;
 
+import com.google.common.collect.ImmutableMap;
 import io.quarkus.test.junit.QuarkusTestProfile;
 import java.util.Map;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 
 public class FixedTokenOverrideProfile implements QuarkusTestProfile {
 

diff --git a/src/test/java/io/stargate/sgv2/jsonapi/service/cqldriver/FixedTokenTimingTestProfile.java b/src/test/java/io/stargate/sgv2/jsonapi/service/cqldriver/FixedTokenTimingTestProfile.java
@@ -1,8 +1,8 @@
 package io.stargate.sgv2.jsonapi.service.cqldriver;
 
+import com.google.common.collect.ImmutableMap;
 import io.quarkus.test.junit.QuarkusTestProfile;
 import java.util.Map;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 
 public class FixedTokenTimingTestProfile implements QuarkusTestProfile {
 

diff --git a/src/test/java/io/stargate/sgv2/jsonapi/service/cqldriver/InvalidCredentialsProfile.java b/src/test/java/io/stargate/sgv2/jsonapi/service/cqldriver/InvalidCredentialsProfile.java
@@ -1,8 +1,8 @@
 package io.stargate.sgv2.jsonapi.service.cqldriver;
 
+import com.google.common.collect.ImmutableMap;
 import io.quarkus.test.junit.QuarkusTestProfile;
 import java.util.Map;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 
 public class InvalidCredentialsProfile implements QuarkusTestProfile {
 

diff --git a/src/test/java/io/stargate/sgv2/jsonapi/testresource/DseTestResource.java b/src/test/java/io/stargate/sgv2/jsonapi/testresource/DseTestResource.java
@@ -1,8 +1,8 @@
 package io.stargate.sgv2.jsonapi.testresource;
 
+import com.google.common.collect.ImmutableMap;
 import io.stargate.sgv2.jsonapi.api.v1.util.IntegrationTestUtils;
 import java.util.Map;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 
 public class DseTestResource extends StargateTestResource {
   // set default props if not set, so we launch DSE

diff --git a/src/test/java/io/stargate/sgv2/jsonapi/testresource/StargateTestResource.java b/src/test/java/io/stargate/sgv2/jsonapi/testresource/StargateTestResource.java
@@ -6,6 +6,7 @@
 package io.stargate.sgv2.jsonapi.testresource;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableMap;
 import io.quarkus.test.common.DevServicesContext;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 import java.net.URI;
@@ -24,7 +25,6 @@
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 import org.testcontainers.utility.MountableFile;
 
 public abstract class StargateTestResource