diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java index 80a779f905f..28b302aecb8 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java @@ -574,7 +574,7 @@ public class Constants { public static final String EXECUTOR_SERVICE_COMPONENT_KEY = ExecutorService.class.getName(); - public static final String GENERIC_SERIALIZATION_JAVA = "java"; + public static final String GENERIC_SERIALIZATION_NATIVE_JAVA = "nativejava"; public static final String GENERIC_SERIALIZATION_DEFAULT = "true"; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/GenericServiceTest.java b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/GenericServiceTest.java index 0c0f4928ad0..c17c93a93c7 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/GenericServiceTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/GenericServiceTest.java @@ -143,7 +143,7 @@ public void testGenericSerializationJava() throws Exception { reference.setApplication(new ApplicationConfig("generic-consumer")); reference.setInterface(DemoService.class); reference.setUrl("dubbo://127.0.0.1:29581?scope=remote"); - reference.setGeneric(Constants.GENERIC_SERIALIZATION_JAVA); + reference.setGeneric(Constants.GENERIC_SERIALIZATION_NATIVE_JAVA); GenericService genericService = reference.get(); try { String name = "kimi"; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java index af916f6fe73..b2aedb048cc 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java @@ -69,7 +69,7 @@ public Result invoke(Invoker invoker, Invocation inv) throws RpcException { try { UnsafeByteArrayInputStream is = new UnsafeByteArrayInputStream((byte[])args[i]); args[i] = ExtensionLoader.getExtensionLoader(Serialization.class) - .getExtension(getSerializationExtension(Constants.GENERIC_SERIALIZATION_JAVA)) + .getExtension(Constants.GENERIC_SERIALIZATION_NATIVE_JAVA) .deserialize(null, is).readObject(); } catch (Exception e) { throw new RpcException("Deserialize argument [" + (i + 1) + "] failed.", e); @@ -77,7 +77,7 @@ public Result invoke(Invoker invoker, Invocation inv) throws RpcException { } else { throw new RpcException( new StringBuilder(32).append("Generic serialization [") - .append(Constants.GENERIC_SERIALIZATION_JAVA) + .append(Constants.GENERIC_SERIALIZATION_NATIVE_JAVA) .append("] only support message type ") .append(byte[].class) .append(" and your message type is ") @@ -94,7 +94,7 @@ public Result invoke(Invoker invoker, Invocation inv) throws RpcException { try { UnsafeByteArrayOutputStream os = new UnsafeByteArrayOutputStream(512); ExtensionLoader.getExtensionLoader(Serialization.class) - .getExtension(getSerializationExtension(Constants.GENERIC_SERIALIZATION_JAVA)) + .getExtension(Constants.GENERIC_SERIALIZATION_NATIVE_JAVA) .serialize(null, os).writeObject(result.getValue()); return new RpcResult(os.toByteArray()); } catch (IOException e) { @@ -112,7 +112,4 @@ public Result invoke(Invoker invoker, Invocation inv) throws RpcException { return invoker.invoke(inv); } - private String getSerializationExtension(String generic) { - return "nativejava"; - } } \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java index 630d648f7cb..44015dba5a9 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java @@ -142,7 +142,7 @@ private void error(String type) throws RpcException { throw new RpcException( new StringBuilder(32) .append("Generic serialization [") - .append(Constants.GENERIC_SERIALIZATION_JAVA) + .append(Constants.GENERIC_SERIALIZATION_NATIVE_JAVA) .append("] only support message type ") .append(byte[].class) .append(" and your message type is ") diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/ProtocolUtils.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/ProtocolUtils.java index 5d5bc23cb09..f0440f02c02 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/ProtocolUtils.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/ProtocolUtils.java @@ -36,7 +36,7 @@ public static boolean isGeneric(String generic) { return generic != null && !"".equals(generic) && (Constants.GENERIC_SERIALIZATION_DEFAULT.equalsIgnoreCase(generic) /* 正常的泛化调用 */ - || Constants.GENERIC_SERIALIZATION_JAVA.equalsIgnoreCase(generic)); /* 支持java序列化的流式泛化调用 */ + || Constants.GENERIC_SERIALIZATION_NATIVE_JAVA.equalsIgnoreCase(generic)); /* 支持java序列化的流式泛化调用 */ } public static boolean isDefaultGenericSerialization(String generic) { @@ -46,6 +46,6 @@ public static boolean isDefaultGenericSerialization(String generic) { public static boolean isJavaGenericSerialization(String generic) { return isGeneric(generic) - && Constants.GENERIC_SERIALIZATION_JAVA.equalsIgnoreCase(generic); + && Constants.GENERIC_SERIALIZATION_NATIVE_JAVA.equalsIgnoreCase(generic); } }