From 85b99d2011f5e77c87311b03701b4b1748088fd4 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Mon, 28 Sep 2015 01:49:46 +0200 Subject: [PATCH] Finish banning ImmutableSet Ban ImmutableSet$Builder because that let you sneak some `ImmutableSet`s in. Remove all remaining imports of ImmutableSet. --- .../elasticsearch/cluster/ClusterState.java | 15 ++++++++++++--- .../common/inject/ConstructorBindingImpl.java | 18 ++++++++++++------ .../common/inject/InjectorShell.java | 18 +++++++++++++++--- .../common/inject/spi/InjectionPoint.java | 2 -- .../gateway/GatewayMetaStateTests.java | 6 ++++-- .../resources/forbidden/all-signatures.txt | 1 + 6 files changed, 44 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterState.java b/core/src/main/java/org/elasticsearch/cluster/ClusterState.java index d1196372065..8167ecc4e81 100644 --- a/core/src/main/java/org/elasticsearch/cluster/ClusterState.java +++ b/core/src/main/java/org/elasticsearch/cluster/ClusterState.java @@ -21,7 +21,7 @@ package org.elasticsearch.cluster; import com.carrotsearch.hppc.cursors.ObjectCursor; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; -import com.google.common.collect.ImmutableSet; + import org.elasticsearch.cluster.DiffableUtils.KeyedReader; import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.block.ClusterBlocks; @@ -31,7 +31,12 @@ import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.node.DiscoveryNodes; -import org.elasticsearch.cluster.routing.*; +import org.elasticsearch.cluster.routing.IndexRoutingTable; +import org.elasticsearch.cluster.routing.IndexShardRoutingTable; +import org.elasticsearch.cluster.routing.RoutingNode; +import org.elasticsearch.cluster.routing.RoutingNodes; +import org.elasticsearch.cluster.routing.RoutingTable; +import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.cluster.service.InternalClusterService; import org.elasticsearch.common.Nullable; @@ -52,7 +57,11 @@ import org.elasticsearch.discovery.local.LocalDiscovery; import org.elasticsearch.discovery.zen.publish.PublishClusterStateAction; import java.io.IOException; -import java.util.*; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Set; /** * Represents the current state of the cluster. diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java b/core/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java index 0b5cec87d4b..90bd38f3050 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java +++ b/core/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java @@ -16,13 +16,19 @@ package org.elasticsearch.common.inject; -import com.google.common.collect.ImmutableSet; -import org.elasticsearch.common.inject.internal.*; +import org.elasticsearch.common.inject.internal.BindingImpl; +import org.elasticsearch.common.inject.internal.Errors; +import org.elasticsearch.common.inject.internal.ErrorsException; +import org.elasticsearch.common.inject.internal.InternalContext; +import org.elasticsearch.common.inject.internal.InternalFactory; +import org.elasticsearch.common.inject.internal.Scoping; +import org.elasticsearch.common.inject.internal.ToStringBuilder; import org.elasticsearch.common.inject.spi.BindingTargetVisitor; import org.elasticsearch.common.inject.spi.ConstructorBinding; import org.elasticsearch.common.inject.spi.Dependency; import org.elasticsearch.common.inject.spi.InjectionPoint; +import java.util.HashSet; import java.util.Set; class ConstructorBindingImpl extends BindingImpl implements ConstructorBinding { @@ -74,10 +80,10 @@ class ConstructorBindingImpl extends BindingImpl implements ConstructorBin @Override public Set> getDependencies() { - return Dependency.forInjectionPoints(new ImmutableSet.Builder() - .add(getConstructor()) - .addAll(getInjectableMembers()) - .build()); + Set dependencies = new HashSet<>(); + dependencies.add(getConstructor()); + dependencies.addAll(getInjectableMembers()); + return Dependency.forInjectionPoints(dependencies); } @Override diff --git a/core/src/main/java/org/elasticsearch/common/inject/InjectorShell.java b/core/src/main/java/org/elasticsearch/common/inject/InjectorShell.java index 8368ec1dfd7..7307fb4a6fe 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/InjectorShell.java +++ b/core/src/main/java/org/elasticsearch/common/inject/InjectorShell.java @@ -16,9 +16,21 @@ package org.elasticsearch.common.inject; -import com.google.common.collect.ImmutableSet; -import org.elasticsearch.common.inject.internal.*; -import org.elasticsearch.common.inject.spi.*; +import org.elasticsearch.common.inject.internal.Errors; +import org.elasticsearch.common.inject.internal.ErrorsException; +import org.elasticsearch.common.inject.internal.InternalContext; +import org.elasticsearch.common.inject.internal.InternalFactory; +import org.elasticsearch.common.inject.internal.PrivateElementsImpl; +import org.elasticsearch.common.inject.internal.ProviderInstanceBindingImpl; +import org.elasticsearch.common.inject.internal.Scoping; +import org.elasticsearch.common.inject.internal.SourceProvider; +import org.elasticsearch.common.inject.internal.Stopwatch; +import org.elasticsearch.common.inject.spi.Dependency; +import org.elasticsearch.common.inject.spi.Element; +import org.elasticsearch.common.inject.spi.Elements; +import org.elasticsearch.common.inject.spi.InjectionPoint; +import org.elasticsearch.common.inject.spi.PrivateElements; +import org.elasticsearch.common.inject.spi.TypeListenerBinding; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java b/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java index 53e0cb04263..17497d5f429 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java +++ b/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java @@ -16,8 +16,6 @@ package org.elasticsearch.common.inject.spi; -import com.google.common.collect.ImmutableSet; - import org.elasticsearch.common.inject.ConfigurationException; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Key; diff --git a/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java b/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java index 6e71b94fe90..d5cb28c385c 100644 --- a/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.gateway; -import com.google.common.collect.ImmutableSet; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterState; @@ -32,7 +31,10 @@ import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllo import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; import static java.util.Collections.emptySet; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; diff --git a/dev-tools/src/main/resources/forbidden/all-signatures.txt b/dev-tools/src/main/resources/forbidden/all-signatures.txt index 49bf0c8fad9..c70ab262d07 100644 --- a/dev-tools/src/main/resources/forbidden/all-signatures.txt +++ b/dev-tools/src/main/resources/forbidden/all-signatures.txt @@ -128,6 +128,7 @@ com.google.common.collect.FluentIterable com.google.common.io.Files com.google.common.primitives.Ints com.google.common.collect.ImmutableSet +com.google.common.collect.ImmutableSet$Builder @defaultMessage Do not violate java's access system java.lang.reflect.AccessibleObject#setAccessible(boolean)