Avoid using Curator's shaded Guava.

codestyle/druid-forbidden-apis.txt

@@ -53,9 +53,11 @@ org.apache.calcite.sql.type.OperandTypes#POSITIVE_INTEGER_LITERAL @ Use org.apac
 org.apache.calcite.sql.type.OperandTypes#UNIT_INTERVAL_NUMERIC_LITERAL @ Create a type checker like org.apache.calcite.sql.type.POSITIVE_INTEGER_LITERAL and use that instead
 org.apache.calcite.sql.type.OperandTypes#NUMERIC_UNIT_INTERVAL_NUMERIC_LITERAL @ Create a type checker like org.apache.calcite.sql.type.POSITIVE_INTEGER_LITERAL and use that instead
 org.apache.calcite.sql.type.OperandTypes#NULLABLE_LITERAL @ Create an instance of org.apache.calcite.sql.type.CastedLiteralOperandTypeChecker that allows nulls and use that instead
+org.apache.commons.io.Charsets @ Use java.nio.charset.StandardCharsets instead
 org.apache.commons.io.FileUtils#getTempDirectory() @ Use org.junit.rules.TemporaryFolder for tests instead
 org.apache.commons.io.FileUtils#deleteDirectory(java.io.File) @ Use org.apache.druid.java.util.common.FileUtils#deleteDirectory()
 org.apache.commons.io.FileUtils#forceMkdir(java.io.File) @ Use org.apache.druid.java.util.common.FileUtils.mkdirp instead
+org.apache.curator.shaded.** @ Use regular classes, not shaded versions
 org.apache.datasketches.memory.Memory#wrap(byte[], int, int, java.nio.ByteOrder) @ The implementation isn't correct in datasketches-memory-2.2.0. Please refer to https://github.com/apache/datasketches-memory/issues/178. Use wrap(byte[]) and modify the offset by the callers instead
 java.lang.Class#getCanonicalName() @ Class.getCanonicalName can return null for anonymous types, use Class.getName instead.
 java.util.concurrent.Executors#newFixedThreadPool(int) @ Executor is non-daemon and can prevent JVM shutdown, use org.apache.druid.java.util.common.concurrent.Execs#multiThreaded(int, java.lang.String) instead.

extensions-contrib/ddsketch/src/main/java/org/apache/druid/query/aggregation/ddsketch/DDSketchAggregatorFactory.java

@@ -24,7 +24,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import org.apache.curator.shaded.com.google.common.math.IntMath;
+import com.google.common.math.IntMath;
 import org.apache.druid.query.aggregation.AggregateCombiner;
 import org.apache.druid.query.aggregation.Aggregator;
 import org.apache.druid.query.aggregation.AggregatorFactory;

extensions-contrib/dropwizard-emitter/src/main/java/org/apache/druid/emitter/dropwizard/DropwizardConverter.java

@@ -22,12 +22,10 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Strings;
-import org.apache.curator.shaded.com.google.common.io.Closeables;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.logger.Logger;
 
 import javax.annotation.Nullable;
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -83,24 +81,22 @@ public DropwizardMetricSpec addFilteredUserDims(
 
   private Map<String, DropwizardMetricSpec> readMap(ObjectMapper mapper, String dimensionMapPath)
   {
-    InputStream is = null;
-    try {
-      if (Strings.isNullOrEmpty(dimensionMapPath)) {
-        log.info("Using default metric dimension and types");
-        is = this.getClass().getClassLoader().getResourceAsStream("defaultMetricDimensions.json");
-      } else {
-        log.info("Using metric dimensions at types at [%s]", dimensionMapPath);
-        is = new FileInputStream(new File(dimensionMapPath));
-      }
-      return mapper.readerFor(new TypeReference<Map<String, DropwizardMetricSpec>>()
-      {
-      }).readValue(is);
+    try (final InputStream is = openDimensionMapFile(dimensionMapPath)) {
+      return mapper.readerFor(new TypeReference<Map<String, DropwizardMetricSpec>>() {}).readValue(is);
     }
     catch (IOException e) {
       throw new ISE(e, "Failed to parse metric dimensions and types");
     }
-    finally {
-      Closeables.closeQuietly(is);
+  }
+
+  private InputStream openDimensionMapFile(@Nullable String dimensionMapPath) throws IOException
+  {
+    if (Strings.isNullOrEmpty(dimensionMapPath)) {
+      log.info("Using default metric dimension and types");
+      return this.getClass().getClassLoader().getResourceAsStream("defaultMetricDimensions.json");
+    } else {
+      log.info("Using metric dimensions at types at [%s]", dimensionMapPath);
+      return new FileInputStream(dimensionMapPath);
     }
   }
 }

extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/http/CatalogResource.java

@@ -21,7 +21,7 @@
 
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
-import org.apache.curator.shaded.com.google.common.collect.Lists;
+import com.google.common.collect.Lists;
 import org.apache.druid.catalog.CatalogException;
 import org.apache.druid.catalog.CatalogException.DuplicateKeyException;
 import org.apache.druid.catalog.CatalogException.NotFoundException;

extensions-core/druid-catalog/src/test/java/org/apache/druid/server/http/catalog/EditorTest.java

@@ -21,7 +21,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
-import org.apache.curator.shaded.com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap;
 import org.apache.druid.catalog.CatalogException;
 import org.apache.druid.catalog.http.TableEditRequest;
 import org.apache.druid.catalog.http.TableEditRequest.DropColumns;

indexing-service/src/main/java/org/apache/druid/indexing/common/task/CompactionTask.java

@@ -27,13 +27,13 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import org.apache.curator.shaded.com.google.common.base.Verify;
 import org.apache.druid.client.indexing.ClientCompactionTaskGranularitySpec;
 import org.apache.druid.client.indexing.ClientCompactionTaskQuery;
 import org.apache.druid.collections.ResourceHolder;

indexing-service/src/main/java/org/apache/druid/indexing/common/task/Tasks.java

@@ -19,7 +19,7 @@
 
 package org.apache.druid.indexing.common.task;
 
-import org.apache.curator.shaded.com.google.common.base.Verify;
+import com.google.common.base.Verify;
 import org.apache.druid.indexing.common.TaskLockType;
 import org.apache.druid.server.coordinator.DataSourceCompactionConfig;
 import org.apache.druid.server.coordinator.duty.CompactSegments;

integration-tests-ex/cases/pom.xml

@@ -291,11 +291,6 @@
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-client</artifactId>
-            <version>${apache.curator.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-storage</artifactId>

integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/ITMSQReindexTest.java

@@ -19,10 +19,10 @@
 
 package org.apache.druid.testsEx.msq;
 
+import com.google.common.collect.ImmutableMap;
 import junitparams.Parameters;
 import junitparams.naming.TestCaseName;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.curator.shaded.com.google.common.collect.ImmutableMap;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.msq.util.MultiStageQueryContext;
 import org.apache.druid.query.groupby.GroupByQueryConfig;

integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/ITSQLBasedBatchIngestionTest.java

@@ -19,10 +19,10 @@
 
 package org.apache.druid.testsEx.msq;
 
+import com.google.common.collect.ImmutableMap;
 import junitparams.Parameters;
 import junitparams.naming.TestCaseName;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.curator.shaded.com.google.common.collect.ImmutableMap;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.testsEx.categories.MultiStageQuery;
 import org.apache.druid.testsEx.config.DruidTestRunner;

server/src/main/java/org/apache/druid/curator/CuratorModule.java

@@ -19,6 +19,7 @@
 
 package org.apache.druid.curator;
 
+import com.google.common.base.Strings;
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Provides;
@@ -29,7 +30,6 @@
 import org.apache.curator.framework.api.ACLProvider;
 import org.apache.curator.framework.imps.DefaultACLProvider;
 import org.apache.curator.retry.BoundedExponentialBackoffRetry;
-import org.apache.curator.shaded.com.google.common.base.Strings;
 import org.apache.druid.concurrent.Threads;
 import org.apache.druid.guice.JsonConfigProvider;
 import org.apache.druid.guice.LazySingleton;

server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java

@@ -30,6 +30,7 @@
 import com.google.inject.TypeLiteral;
 import com.google.inject.name.Named;
 import com.google.inject.name.Names;
+import io.netty.util.SuppressForbidden;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.utils.ZKPaths;
 import org.apache.curator.x.discovery.DownInstancePolicy;
@@ -495,6 +496,7 @@ public ServiceProviderBuilder<T> downInstancePolicy(DownInstancePolicy downInsta
     }
 
     @Override
+    @SuppressForbidden(reason = "org.apache.curator.shaded.com.google.common.base.Predicate")
     public ServiceProviderBuilder<T> additionalFilter(InstanceFilter<T> tInstanceFilter)
     {
       return this;

server/src/test/java/org/apache/druid/guice/QueryableModuleTest.java

@@ -22,10 +22,10 @@
 
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableList;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Key;
-import org.apache.curator.shaded.com.google.common.collect.ImmutableList;
 import org.apache.druid.guice.annotations.Json;
 import org.apache.druid.jackson.JacksonModule;
 import org.apache.druid.java.util.emitter.service.ServiceEmitter;

server/src/test/java/org/apache/druid/server/SpecificSegmentsQuerySegmentWalker.java

@@ -20,10 +20,10 @@
 package org.apache.druid.server;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
 import com.google.common.io.Closeables;
 import com.google.inject.Injector;
-import org.apache.curator.shaded.com.google.common.collect.Lists;
 import org.apache.druid.error.DruidException;
 import org.apache.druid.query.DataSource;
 import org.apache.druid.query.FrameBasedInlineDataSource;

server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java

@@ -29,7 +29,6 @@
 import com.google.common.util.concurrent.Futures;
 import it.unimi.dsi.fastutil.objects.Object2LongMap;
 import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
-import org.apache.curator.shaded.com.google.common.base.Charsets;
 import org.apache.druid.audit.AuditManager;
 import org.apache.druid.client.CoordinatorServerView;
 import org.apache.druid.client.DataSourcesSnapshot;
@@ -87,6 +86,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.Response;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -737,7 +737,7 @@ public void testMarkSegmentAsUsedWhenOverlordIsOnOldVersion()
 
     final StringFullResponseHolder responseHolder = new StringFullResponseHolder(
         new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.NOT_FOUND),
-        Charsets.UTF_8
+        StandardCharsets.UTF_8
     );
     EasyMock.expect(overlordClient.markSegmentAsUsed(segment.getId()))
             .andThrow(new RuntimeException(new HttpResponseException(responseHolder))).once();