You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by vi...@apache.org on 2019/09/24 08:08:25 UTC
[dubbo] branch 2.7.4-release updated: Simplify dubbo-common
transitive dependencies (#5107)
This is an automated email from the ASF dual-hosted git repository.
victory pushed a commit to branch 2.7.4-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.7.4-release by this push:
new 96e7c65 Simplify dubbo-common transitive dependencies (#5107)
96e7c65 is described below
commit 96e7c65e70d0dc4cf09cf05a3eb337c406e5929e
Author: ken.lj <ke...@gmail.com>
AuthorDate: Tue Sep 24 16:08:00 2019 +0800
Simplify dubbo-common transitive dependencies (#5107)
---
dubbo-common/pom.xml | 16 ----------------
.../support/apollo/ApolloDynamicConfiguration.java | 2 +-
dubbo-rpc/dubbo-rpc-api/pom.xml | 5 +++++
.../serialize/support/SerializableClassRegistry.java | 4 +---
4 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml
index 98ecc9b..fc9e705 100644
--- a/dubbo-common/pom.xml
+++ b/dubbo-common/pom.xml
@@ -59,23 +59,7 @@
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
- <artifactId>hessian-lite</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
- <dependency>
- <groupId>com.esotericsoftware</groupId>
- <artifactId>kryo</artifactId>
- </dependency>
- <dependency>
- <groupId>de.javakaffee</groupId>
- <artifactId>kryo-serializers</artifactId>
- </dependency>
- <dependency>
- <groupId>de.ruedigermoeller</groupId>
- <artifactId>fst</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
index 4433412..bcc9a38 100644
--- a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
+++ b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
@@ -148,7 +148,7 @@ public class ApolloDynamicConfiguration implements DynamicConfiguration {
@Override
public String getProperties(String key, String group, long timeout) throws IllegalStateException {
- if(StringUtils.isEmpty(group)) {
+ if (StringUtils.isEmpty(group)) {
return dubboConfigFile.getContent();
}
if (group.equals(url.getParameter(APPLICATION_KEY))) {
diff --git a/dubbo-rpc/dubbo-rpc-api/pom.xml b/dubbo-rpc/dubbo-rpc-api/pom.xml
index aae1c05..c0d7971 100644
--- a/dubbo-rpc/dubbo-rpc-api/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-api/pom.xml
@@ -44,5 +44,10 @@
<artifactId>dubbo-remoting-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>hessian-lite</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistry.java b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistry.java
index 1a8fb69..7e1ad6e 100644
--- a/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistry.java
+++ b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistry.java
@@ -16,8 +16,6 @@
*/
package org.apache.dubbo.common.serialize.support;
-import com.esotericsoftware.kryo.Serializer;
-
import java.util.LinkedHashMap;
import java.util.Map;
@@ -45,7 +43,7 @@ public abstract class SerializableClassRegistry {
* @param clazz object type
* @param serializer object serializer
*/
- public static void registerClass(Class clazz, Serializer serializer) {
+ public static void registerClass(Class clazz, Object serializer) {
if (clazz == null) {
throw new IllegalArgumentException("Class registered to kryo cannot be null!");
}