diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml index bc46ec485c..0e8be699cd 100644 --- a/dubbo-common/pom.xml +++ b/dubbo-common/pom.xml @@ -76,10 +76,6 @@ javax.annotation javax.annotation-api - - org.eclipse.collections - eclipse-collections - com.google.protobuf protobuf-java diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/URLStrParser.java b/dubbo-common/src/main/java/org/apache/dubbo/common/URLStrParser.java index 1b45b1f534..55ca88d7c7 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/URLStrParser.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/URLStrParser.java @@ -21,9 +21,8 @@ import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.url.component.ServiceConfigURL; import org.apache.dubbo.common.url.component.URLItemCache; -import org.eclipse.collections.impl.map.mutable.UnifiedMap; - import java.util.Collections; +import java.util.HashMap; import java.util.Map; import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_KEY_PREFIX; @@ -74,7 +73,7 @@ public final class URLStrParser { } TempBuf tempBuf = DECODE_TEMP_BUF.get(); - Map params = new UnifiedMap<>(); + Map params = new HashMap<>(); int nameStart = from; int valueStart = -1; int i; @@ -240,7 +239,7 @@ public final class URLStrParser { } TempBuf tempBuf = DECODE_TEMP_BUF.get(); - Map params = new UnifiedMap<>(); + Map params = new HashMap<>(); int nameStart = from; int valueStart = -1; int i; diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml index 501d3653ee..665d14deb7 100644 --- a/dubbo-config/dubbo-config-api/pom.xml +++ b/dubbo-config/dubbo-config-api/pom.xml @@ -164,6 +164,12 @@ org.apache.curator curator-test test + + + com.google.guava + guava + + diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java index 229764f935..2b18644a36 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java @@ -16,19 +16,11 @@ */ package org.apache.dubbo.config.spring.beans.factory.config; -import java.io.IOException; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.regex.Pattern; - import org.springframework.beans.factory.config.YamlProcessor; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.PropertySource; import org.springframework.core.io.support.EncodedResource; import org.springframework.core.io.support.PropertySourceFactory; - import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; @@ -38,6 +30,13 @@ import org.yaml.snakeyaml.parser.ParserException; import org.yaml.snakeyaml.representer.Representer; import org.yaml.snakeyaml.resolver.Resolver; +import java.io.IOException; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.regex.Pattern; + /** * YAML {@link PropertySourceFactory} implementation, some source code is copied Spring Boot * org.springframework.boot.env.YamlPropertySourceLoader , see {@link #createYaml()} and {@link #process()} @@ -66,8 +65,8 @@ public class YamlPropertySourceFactory extends YamlProcessor implements Property } @Override - protected Map createDefaultMap() { - final Map delegate = super.createDefaultMap(); + protected Map createDefaultMap(int initSize) { + final Map delegate = super.createDefaultMap(initSize); return new AbstractMap() { @Override public Object put(Object key, Object value) { diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index a0af80b1c6..25e16abb82 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -92,12 +92,11 @@ 5.2.8.RELEASE 3.23.1-GA - 10.4.0 3.2.5.Final 4.1.56.Final 1.1.7 2.4.4 - 4.5.3 + 4.5.13 4.4.6 1.2.70 3.4.13 @@ -114,7 +113,7 @@ 3.11.0 1.3.2 3.1.0 - 9.4.11.v20180605 + 9.4.43.v20210629 1.1.0.Final 5.4.1.Final 3.0.1-b08 @@ -123,17 +122,17 @@ 0.42 2.48-jdk-6 1.8.2 - 1.1.1 - 1.20 + 1.8.0 + 1.29 3.8.1 1.5.9 0.1.23 2.0 3.0.19.Final - 8.5.31 + 8.5.69 0.5.3 - 2.0.0 + 2.0.2 1.31.1 1.7.25 @@ -159,7 +158,7 @@ 1.15.3 0.5.3 3.2.8 - 1.5.19 + 1.5.24 0.9.0 1.68 @@ -171,7 +170,6 @@ 2.0 1.1.0 3.0.2-SNAPSHOT - 20.0 @@ -189,11 +187,6 @@ javassist ${javassist_version} - - org.eclipse.collections - eclipse-collections - ${eclipse_collections_version} - org.jboss.netty netty @@ -748,11 +741,6 @@ test ${fabric8_kubernetes_version} - - com.google.guava - guava - ${guava_version} - diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml index dd5f2f3a9c..be8d15dd71 100644 --- a/dubbo-distribution/dubbo-all/pom.xml +++ b/dubbo-distribution/dubbo-all/pom.xml @@ -340,10 +340,6 @@ org.javassist javassist - - org.eclipse.collections - eclipse-collections - io.netty netty-all diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java index b4908af742..c8a6ffe20b 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java @@ -19,7 +19,6 @@ package org.apache.dubbo.registry.client; import org.apache.dubbo.metadata.MetadataInfo; import com.alibaba.fastjson.JSON; -import org.eclipse.collections.impl.map.mutable.UnifiedMap; import java.util.HashMap; import java.util.List; @@ -52,7 +51,7 @@ public class DefaultServiceInstance implements ServiceInstance { private boolean healthy = true; - private Map metadata = new UnifiedMap<>(); + private Map metadata = new HashMap<>(); private transient String address; private transient MetadataInfo serviceMetadata; diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java index e96ee4f9ee..3e8a6ae38b 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java @@ -36,8 +36,6 @@ import org.apache.dubbo.rpc.cluster.Configurator; import org.apache.dubbo.rpc.cluster.RouterChain; import org.apache.dubbo.rpc.model.ApplicationModel; -import org.eclipse.collections.impl.map.mutable.UnifiedMap; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -258,7 +256,7 @@ public class ServiceDiscoveryRegistryDirectory extends DynamicDirectory { * @return invokers */ private Map> toInvokers(List urls) { - Map> newUrlInvokerMap = new UnifiedMap<>(); + Map> newUrlInvokerMap = new HashMap<>(); if (urls == null || urls.isEmpty()) { return newUrlInvokerMap; }