Merge remote-tracking branch 'origin/2.6.x' into dubbo-2.6.11

dependencies-bom/pom.xml

@@ -102,7 +102,7 @@
         <xmemcached_version>1.3.6</xmemcached_version>
         <cxf_version>3.1.15</cxf_version>
         <thrift_version>0.8.0</thrift_version>
-        <hessian_version>4.0.38</hessian_version>
+        <hessian_version>4.0.51</hessian_version>
         <servlet_version>3.1.0</servlet_version>
         <jetty_version>6.1.26</jetty_version>
         <validation_version>1.1.0.Final</validation_version>
@@ -127,7 +127,7 @@
 
         <jaxb_version>2.2.7</jaxb_version>
         <activation_version>1.2.0</activation_version>
-        <hessian_lite_version>3.2.8</hessian_lite_version>
+        <hessian_lite_version>3.2.11</hessian_lite_version>
         <alibaba_spring_context_support_version>1.0.2</alibaba_spring_context_support_version>
         <yaml_version>1.17</yaml_version>
     </properties>

dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java

@@ -29,6 +29,8 @@
 import com.alibaba.dubbo.config.model.ApplicationModel;
 import com.alibaba.dubbo.config.model.ConsumerModel;
 import com.alibaba.dubbo.config.support.Parameter;
+import com.alibaba.dubbo.registry.support.ConsumerInvokerWrapper;
+import com.alibaba.dubbo.registry.support.ProviderConsumerRegTable;
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.Protocol;
 import com.alibaba.dubbo.rpc.ProxyFactory;
@@ -47,11 +49,13 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 
 import static com.alibaba.dubbo.common.utils.NetUtils.isInvalidLocalHost;
 
@@ -423,7 +427,14 @@ private T createProxy(Map<String, String> map) {
         if (c && !invoker.isAvailable()) {
             // make it possible for consumer to retry later if provider is temporarily unavailable
             initialized = false;
-            throw new IllegalStateException("Failed to check the status of the service " + interfaceName + ". No provider available for the service " + (group == null ? "" : group + "/") + interfaceName + (version == null ? "" : ":" + version) + " from the url " + invoker.getUrl() + " to the consumer " + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion());
+            final String serviceKey = (group == null ? "" : group + "/") + interfaceName + (version == null ? "" :
+                    ":" + version);
+            Set<ConsumerInvokerWrapper> consumerInvoker = ProviderConsumerRegTable.getConsumerInvoker(serviceKey);
+            if (consumerInvoker != Collections.<ConsumerInvokerWrapper>emptySet()) {
+                //since create proxy error , so we must be the first consumer. Simply clear ConcurrentHashSet
+                consumerInvoker.clear();
+            }
+            throw new IllegalStateException("Failed to check the status of the service " + interfaceName + ". No provider available for the service " + serviceKey + " from the url " + invoker.getUrl() + " to the consumer " + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion());
         }
         if (logger.isInfoEnabled()) {
             logger.info("Refer dubbo service " + interfaceClass.getName() + " from url " + invoker.getUrl());

dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockInvoker.java

@@ -147,14 +147,15 @@ public static Throwable getThrowable(String throwstr) {
     }
 
     @SuppressWarnings("unchecked")
-    private Invoker<T> getInvoker(String mockService) {
+    private Invoker<T> getInvoker(String mock) {
+        Class<T> serviceType = (Class<T>) ReflectUtils.forName(url.getServiceInterface());
+        String mockService = ConfigUtils.isDefault(mock) ? serviceType.getName() + "Mock" : mock;
         Invoker<T> invoker = (Invoker<T>) mocks.get(mockService);
         if (invoker != null) {
             return invoker;
         }
 
-        Class<T> serviceType = (Class<T>) ReflectUtils.forName(url.getServiceInterface());
-        T mockObject = (T) getMockObject(mockService, serviceType);
+        T mockObject = (T) getMockObject(mock, serviceType);
         invoker = proxyFactory.getInvoker(mockObject, serviceType, url);
         if (mocks.size() < 10000) {
             mocks.put(mockService, invoker);

dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/DemoServiceA.java

@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.dubbo.rpc.support;
+
+public interface DemoServiceA {
+    String methodA();
+}

dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/DemoServiceAMock.java

@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.dubbo.rpc.support;
+
+/**
+ * default mock service for DemoServiceA
+ */
+public class DemoServiceAMock implements DemoServiceA{
+    public static final String MOCK_VALUE = "mockA";
+    @Override
+    public String methodA() {
+        return MOCK_VALUE;
+    }
+}

dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/DemoServiceB.java

@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.dubbo.rpc.support;
+
+public interface DemoServiceB {
+    String methodB();
+}

dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/DemoServiceBMock.java

@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.dubbo.rpc.support;
+
+/**
+ * default mock service for DemoServiceA
+ */
+public class DemoServiceBMock implements DemoServiceB {
+    public static final String MOCK_VALUE = "mockB";
+
+    @Override
+    public String methodB() {
+        return MOCK_VALUE;
+    }
+}

dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/MockInvokerTest.java

@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.dubbo.rpc.support;
+
+import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.rpc.RpcInvocation;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import static com.alibaba.dubbo.common.Constants.MOCK_KEY;
+
+
+public class MockInvokerTest {
+
+    @Test
+    public void testParseMockValue() throws Exception {
+        Assert.assertNull(MockInvoker.parseMockValue("null"));
+        Assert.assertNull(MockInvoker.parseMockValue("empty"));
+
+        Assert.assertTrue((Boolean) MockInvoker.parseMockValue("true"));
+        Assert.assertFalse((Boolean) MockInvoker.parseMockValue("false"));
+
+        Assert.assertEquals(123, MockInvoker.parseMockValue("123"));
+        Assert.assertEquals("foo", MockInvoker.parseMockValue("foo"));
+        Assert.assertEquals("foo", MockInvoker.parseMockValue("\"foo\""));
+        Assert.assertEquals("foo", MockInvoker.parseMockValue("\'foo\'"));
+
+        Assert.assertEquals(
+                new HashMap<Object, Object>(), MockInvoker.parseMockValue("{}"));
+        Assert.assertEquals(
+                new ArrayList<Object>(), MockInvoker.parseMockValue("[]"));
+        Assert.assertEquals("foo",
+                MockInvoker.parseMockValue("foo", new Type[]{String.class}));
+    }
+
+    @Test
+    public void testInvoke() {
+        URL url = URL.valueOf("remote://1.2.3.4/" + String.class.getName());
+        url = url.addParameter(MOCK_KEY, "return ");
+        MockInvoker mockInvoker = new MockInvoker(url);
+
+        RpcInvocation invocation = new RpcInvocation();
+        invocation.setMethodName("getSomething");
+        Assert.assertEquals(new HashMap<Object, Object>(),
+                mockInvoker.invoke(invocation).getAttachments());
+    }
+
+    @Test
+    public void testGetDefaultObject() {
+        // test methodA in DemoServiceAMock
+        final Class<DemoServiceA> demoServiceAClass = DemoServiceA.class;
+        URL url = URL.valueOf("remote://1.2.3.4/" + demoServiceAClass.getName());
+        url = url.addParameter(MOCK_KEY, "force:true");
+        MockInvoker mockInvoker = new MockInvoker(url);
+
+        RpcInvocation invocation = new RpcInvocation();
+        invocation.setMethodName("methodA");
+        Assert.assertEquals(new HashMap<Object, Object>(),
+                mockInvoker.invoke(invocation).getAttachments());
+
+        // test methodB in DemoServiceBMock
+        final Class<DemoServiceB> demoServiceBClass = DemoServiceB.class;
+        url = URL.valueOf("remote://1.2.3.4/" + demoServiceBClass.getName());
+        url = url.addParameter(MOCK_KEY, "force:true");
+        mockInvoker = new MockInvoker(url);
+        invocation = new RpcInvocation();
+        invocation.setMethodName("methodB");
+        Assert.assertEquals(new HashMap<Object, Object>(),
+                mockInvoker.invoke(invocation).getAttachments());
+    }
+
+    @Test
+    public void testNormalizeMock() {
+        Assert.assertNull(MockInvoker.normalizeMock(null));
+
+        Assert.assertEquals("", MockInvoker.normalizeMock(""));
+        Assert.assertEquals("", MockInvoker.normalizeMock("fail:"));
+        Assert.assertEquals("", MockInvoker.normalizeMock("force:"));
+        Assert.assertEquals("throw", MockInvoker.normalizeMock("throw"));
+        Assert.assertEquals("default", MockInvoker.normalizeMock("fail"));
+        Assert.assertEquals("default", MockInvoker.normalizeMock("force"));
+        Assert.assertEquals("default", MockInvoker.normalizeMock("true"));
+        Assert.assertEquals("default",
+                MockInvoker.normalizeMock("default"));
+        Assert.assertEquals("return null",
+                MockInvoker.normalizeMock("return"));
+        Assert.assertEquals("return null",
+                MockInvoker.normalizeMock("return null"));
+    }
+}

dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocol.java

@@ -24,7 +24,7 @@
 import com.alibaba.dubbo.rpc.RpcContext;
 import com.alibaba.dubbo.rpc.RpcException;
 import com.alibaba.dubbo.rpc.protocol.AbstractProxyProtocol;
-
+import com.alibaba.dubbo.rpc.protocol.hessian.serialization.Hessian2FactoryUtil;
 import com.alibaba.dubbo.rpc.service.GenericService;
 import com.alibaba.dubbo.rpc.support.ProtocolUtils;
 import com.caucho.hessian.HessianException;
@@ -122,6 +122,7 @@ protected <T> T doRefer(Class<T> serviceType, URL url) throws RpcException {
         int timeout = url.getParameter(Constants.TIMEOUT_KEY, Constants.DEFAULT_TIMEOUT);
         hessianProxyFactory.setConnectTimeout(timeout);
         hessianProxyFactory.setReadTimeout(timeout);
+        hessianProxyFactory.setSerializerFactory(Hessian2FactoryUtil.getInstance().getSerializerFactory());
         return (T) hessianProxyFactory.create(serviceType, url.setProtocol("http").toJavaURL(), Thread.currentThread().getContextClassLoader());
     }
 
@@ -181,7 +182,7 @@ public void handle(HttpServletRequest request, HttpServletResponse response)
                 }
 
                 try {
-                    skeleton.invoke(request.getInputStream(), response.getOutputStream());
+                    skeleton.invoke(request.getInputStream(), response.getOutputStream(), Hessian2FactoryUtil.getInstance().getSerializerFactory());
                 } catch (Throwable e) {
                     throw new ServletException(e);
                 }

dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/serialization/AbstractHessian2FactoryInitializer.java

@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.dubbo.rpc.protocol.hessian.serialization;
+
+import com.caucho.hessian.io.SerializerFactory;
+
+public abstract class AbstractHessian2FactoryInitializer implements Hessian2FactoryInitializer {
+    private static SerializerFactory SERIALIZER_FACTORY;
+
+    @Override
+    public SerializerFactory getSerializerFactory() {
+        if (SERIALIZER_FACTORY != null) {
+            return SERIALIZER_FACTORY;
+        }
+        synchronized (this) {
+            SERIALIZER_FACTORY = createSerializerFactory();
+        }
+        return SERIALIZER_FACTORY;
+    }
+
+    protected abstract SerializerFactory createSerializerFactory();
+}

dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/serialization/DefaultHessian2FactoryInitializer.java

@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.dubbo.rpc.protocol.hessian.serialization;
+
+import com.caucho.hessian.io.SerializerFactory;
+
+public class DefaultHessian2FactoryInitializer extends AbstractHessian2FactoryInitializer {
+    @Override
+    protected SerializerFactory createSerializerFactory() {
+        return new SerializerFactory();
+    }
+}