Merge branch 'master' of https://github.com/alibaba/dubbo

dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/ExtensionLoader.java

@@ -108,6 +108,9 @@ private static <T> boolean withExtensionAnnotation(Class<T> type) {
     public static <T> ExtensionLoader<T> getExtensionLoader(Class<T> type) {
         if (type == null)
             throw new IllegalArgumentException("Extension type == null");
+        if(!type.isInterface()) {
+            throw new IllegalArgumentException("Extension type(" + type + ") is not interface!");
+        }
         if(!withExtensionAnnotation(type)) {
             throw new IllegalArgumentException("Extension type(" + type + 
                     ") is not extension, because WITHOUT @" + SPI.class.getSimpleName() + " Annotation!");
@@ -300,9 +303,6 @@ public Set<String> getLoadedExtensions() {
 	public T getExtension(String name) {
 		if (name == null || name.length() == 0)
 		    throw new IllegalArgumentException("Extension name == null");
-		if ("true".equals(name)) {
-		    return getDefaultExtension();
-		}
 		Holder<Object> holder = cachedInstances.get(name);
 		if (holder == null) {
 		    cachedInstances.putIfAbsent(name, new Holder<Object>());
@@ -326,8 +326,7 @@ public T getExtension(String name) {
 	 */
 	public T getDefaultExtension() {
 	    getExtensionClasses();
-        if(null == cachedDefaultName || cachedDefaultName.length() == 0
-                || "true".equals(cachedDefaultName)) {
+        if(null == cachedDefaultName || cachedDefaultName.length() == 0) {
             return null;
         }
         return getExtension(cachedDefaultName);

dubbo-common/src/test/java/com/alibaba/dubbo/common/compiler/support/JdkCompilerTest.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 1999-2012 Alibaba Group.
+ *
+ *   Licensed 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.common.compiler.support;
+
+import org.junit.Test;
+
+/**
+ * @author ding.lid
+ */
+public class JdkCompilerTest {
+    @Test
+    public void test_compileProtocol() throws Exception {
+
+    }
+}

dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoader_Adaptive_Test.java

@@ -0,0 +1,310 @@
+/*
+ * Copyright 1999-2011 Alibaba Group.
+ *  
+ * Licensed 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.common.extensionloader;
+
+import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.extension.ExtensionLoader;
+import com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt;
+import com.alibaba.dubbo.common.extensionloader.ext2.Ext2;
+import com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder;
+import com.alibaba.dubbo.common.extensionloader.ext3.UseProtocolKeyExt;
+import com.alibaba.dubbo.common.extensionloader.ext4.NoUrlParamExt;
+import com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt;
+import com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6;
+import com.alibaba.dubbo.common.extensionloader.ext6_inject.impl.Ext6Impl2;
+import com.alibaba.dubbo.common.utils.LogUtil;
+import junit.framework.Assert;
+import org.junit.Test;
+
+import java.util.*;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.junit.matchers.JUnitMatchers.containsString;
+
+/**
+ * @author ding.lid
+ */
+public class ExtensionLoader_Adaptive_Test {
+    @Test
+    public void test_getAdaptiveExtension_defaultAdaptiveKey() throws Exception {
+        {
+            SimpleExt ext = ExtensionLoader.getExtensionLoader(SimpleExt.class).getAdaptiveExtension();
+
+            Map<String, String> map = new HashMap<String, String>();
+            URL url = new URL("p1", "1.2.3.4", 1010, "path1", map);
+
+            String echo = ext.echo(url, "haha");
+            assertEquals("Ext1Impl1-echo", echo);
+        }
+
+        {
+            SimpleExt ext = ExtensionLoader.getExtensionLoader(SimpleExt.class).getAdaptiveExtension();
+
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("simple.ext", "impl2");
+            URL url = new URL("p1", "1.2.3.4", 1010, "path1", map);
+
+            String echo = ext.echo(url, "haha");
+            assertEquals("Ext1Impl2-echo", echo);
+        }
+    }
+
+
+    @Test
+    public void test_getAdaptiveExtension_customizeAdaptiveKey() throws Exception {
+        SimpleExt ext = ExtensionLoader.getExtensionLoader(SimpleExt.class).getAdaptiveExtension();
+
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("key2", "impl2");
+        URL url = new URL("p1", "1.2.3.4", 1010, "path1", map);
+
+        String echo = ext.yell(url, "haha");
+        assertEquals("Ext1Impl2-yell", echo);
+
+        url = url.addParameter("key1", "impl3"); // 注意： URL是值类型
+        echo = ext.yell(url, "haha");
+        assertEquals("Ext1Impl3-yell", echo);
+    }
+
+    @Test
+    public void test_getAdaptiveExtension_UrlNpe() throws Exception {
+        SimpleExt ext = ExtensionLoader.getExtensionLoader(SimpleExt.class).getAdaptiveExtension();
+
+        try {
+            ext.echo(null, "haha");
+            fail();
+        } catch (IllegalArgumentException e) {
+            assertEquals("url == null", e.getMessage());
+        }
+    }
+
+    @Test
+    public void test_getAdaptiveExtension_ExceptionWhenNoAdaptiveMethodOnInterface() throws Exception {
+        try {
+            ExtensionLoader.getExtensionLoader(NoAdaptiveMethodExt.class).getAdaptiveExtension();
+            fail();
+        } catch (IllegalStateException expected) {
+            assertThat(expected.getMessage(), 
+                    allOf(containsString("Can not create adaptive extenstion interface com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt"),
+                            containsString("No adaptive method on extension com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt, refuse to create the adaptive class")));
+        }
+        // 多次get，都会报错且相同
+        try {
+            ExtensionLoader.getExtensionLoader(NoAdaptiveMethodExt.class).getAdaptiveExtension();
+            fail();
+        } catch (IllegalStateException expected) {
+            assertThat(expected.getMessage(), 
+                    allOf(containsString("Can not create adaptive extenstion interface com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt"),
+                            containsString("No adaptive method on extension com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt, refuse to create the adaptive class")));
+        }
+    }
+
+    @Test
+    public void test_getAdaptiveExtension_ExceptionWhenNotAdaptiveMethod() throws Exception {
+        SimpleExt ext = ExtensionLoader.getExtensionLoader(SimpleExt.class).getAdaptiveExtension();
+
+        Map<String, String> map = new HashMap<String, String>();
+        URL url = new URL("p1", "1.2.3.4", 1010, "path1", map);
+
+        try {
+            ext.bang(url, 33);
+            fail();
+        } catch (UnsupportedOperationException expected) {
+            assertThat(expected.getMessage(), containsString("method "));
+            assertThat(
+                    expected.getMessage(),
+                    containsString("of interface com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt is not adaptive method!"));
+        }
+    }
+
+    @Test
+    public void test_getAdaptiveExtension_ExceptionWhenNoUrlAttrib() throws Exception {
+        try {
+            ExtensionLoader.getExtensionLoader(NoUrlParamExt.class).getAdaptiveExtension();
+            fail();
+        } catch (Exception expected) {
+            assertThat(expected.getMessage(), containsString("fail to create adative class for interface "));
+            assertThat(expected.getMessage(), containsString(": not found url parameter or url attribute in parameters of method "));
+        }
+    }
+
+    @Test
+    public void test_getAdaptiveExtension_protocolKey() throws Exception {
+        UseProtocolKeyExt ext = ExtensionLoader.getExtensionLoader(UseProtocolKeyExt.class).getAdaptiveExtension();
+
+        {
+            String echo = ext.echo(URL.valueOf("1.2.3.4:20880"), "s");
+            assertEquals("Ext3Impl1-echo", echo); // 缺省值
+
+            Map<String, String> map = new HashMap<String, String>();
+            URL url = new URL("impl3", "1.2.3.4", 1010, "path1", map);
+
+            echo = ext.echo(url, "s");
+            assertEquals("Ext3Impl3-echo", echo); // 使用第2Key， Protocol
+
+            url = url.addParameter("key1", "impl2");
+            echo = ext.echo(url, "s");
+            assertEquals("Ext3Impl2-echo", echo); // 使用第1Key， key1
+        }
+
+        {
+
+            Map<String, String> map = new HashMap<String, String>();
+            URL url = new URL(null, "1.2.3.4", 1010, "path1", map);
+            String yell = ext.yell(url, "s");
+            assertEquals("Ext3Impl1-yell", yell); // 缺省值
+
+            url = url.addParameter("key2", "impl2"); // 使用第2Key， key2
+            yell = ext.yell(url, "s");
+            assertEquals("Ext3Impl2-yell", yell);
+
+            url = url.setProtocol("impl3"); // 使用第1Key， Protocol
+            yell = ext.yell(url, "d");
+            assertEquals("Ext3Impl3-yell", yell);
+        }
+    }
+
+    @Test
+    public void test_urlHolder_getAdaptiveExtension() throws Exception {
+        Ext2 ext = ExtensionLoader.getExtensionLoader(Ext2.class).getAdaptiveExtension();
+
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("ext2", "impl1");
+        URL url = new URL("p1", "1.2.3.4", 1010, "path1", map);
+
+        UrlHolder holder = new UrlHolder();
+        holder.setUrl(url);
+
+        String echo = ext.echo(holder, "haha");
+        assertEquals("Ext2Impl1-echo", echo);
+    }
+
+    @Test
+    public void test_urlHolder_getAdaptiveExtension_noExtension() throws Exception {
+        Ext2 ext = ExtensionLoader.getExtensionLoader(Ext2.class).getAdaptiveExtension();
+
+        URL url = new URL("p1", "1.2.3.4", 1010, "path1");
+
+        UrlHolder holder = new UrlHolder();
+        holder.setUrl(url);
+
+        try {
+            ext.echo(holder, "haha");
+            fail();
+        } catch (IllegalStateException expected) {
+            assertThat(expected.getMessage(), containsString("Fail to get extension("));
+        }
+
+        url = url.addParameter("ext2", "XXX");
+        holder.setUrl(url);
+        try {
+            ext.echo(holder, "haha");
+            fail();
+        } catch (IllegalStateException expected) {
+            assertThat(expected.getMessage(), containsString("No such extension"));
+        }
+    }
+
+    @Test
+    public void test_urlHolder_getAdaptiveExtension_UrlNpe() throws Exception {
+        Ext2 ext = ExtensionLoader.getExtensionLoader(Ext2.class).getAdaptiveExtension();
+
+        try {
+            ext.echo(null, "haha");
+            fail();
+        } catch (IllegalArgumentException e) {
+            assertEquals("com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder argument == null", e.getMessage());
+        }
+
+        try {
+            ext.echo(new UrlHolder(), "haha");
+            fail();
+        } catch (IllegalArgumentException e) {
+            assertEquals("com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder argument getUrl() == null", e.getMessage());
+        }
+    }
+
+    @Test
+    public void test_urlHolder_getAdaptiveExtension_ExceptionWhenNotAdativeMethod() throws Exception {
+        Ext2 ext = ExtensionLoader.getExtensionLoader(Ext2.class).getAdaptiveExtension();
+
+        Map<String, String> map = new HashMap<String, String>();
+        URL url = new URL("p1", "1.2.3.4", 1010, "path1", map);
+
+        try {
+            ext.bang(url, 33);
+            fail();
+        } catch (UnsupportedOperationException expected) {
+            assertThat(expected.getMessage(), containsString("method "));
+            assertThat(
+                    expected.getMessage(),
+                    containsString("of interface com.alibaba.dubbo.common.extensionloader.ext2.Ext2 is not adaptive method!"));
+        }
+    }
+
+    @Test
+    public void test_urlHolder_getAdaptiveExtension_ExceptionWhenNameNotProvided() throws Exception {
+        Ext2 ext = ExtensionLoader.getExtensionLoader(Ext2.class).getAdaptiveExtension();
+
+        URL url = new URL("p1", "1.2.3.4", 1010, "path1");
+
+        UrlHolder holder = new UrlHolder();
+        holder.setUrl(url);
+
+        try {
+            ext.echo(holder, "impl1");
+            fail();
+        } catch (IllegalStateException expected) {
+            assertThat(expected.getMessage(), containsString("Fail to get extension("));
+        }
+
+        url = url.addParameter("key1", "impl1");
+        holder.setUrl(url);
+        try {
+            ext.echo(holder, "haha");
+            fail();
+        } catch (IllegalStateException expected) {
+            assertThat(expected.getMessage(), containsString("Fail to get extension(com.alibaba.dubbo.common.extensionloader.ext2.Ext2) name from url"));
+        }
+    }
+
+    @Test
+    public void test_getAdaptiveExtension_inject() throws Exception {
+        LogUtil.start();
+        Ext6 ext = ExtensionLoader.getExtensionLoader(Ext6.class).getAdaptiveExtension();
+
+        URL url = new URL("p1", "1.2.3.4", 1010, "path1");
+        url = url.addParameters("ext6", "impl1");
+
+        assertEquals("Ext6Impl1-echo-Ext1Impl1-echo", ext.echo(url, "ha"));
+
+        Assert.assertTrue("can not find error.", LogUtil.checkNoError());
+        LogUtil.stop();
+
+        url = url.addParameters("simple.ext", "impl2");
+        assertEquals("Ext6Impl1-echo-Ext1Impl2-echo", ext.echo(url, "ha"));
+
+    }
+
+    @Test
+    public void test_getAdaptiveExtension_InjectNotExtFail() throws Exception {
+        Ext6 ext = ExtensionLoader.getExtensionLoader(Ext6.class).getExtension("impl2");
+
+        Ext6Impl2 impl = (Ext6Impl2) ext;
+        assertNull(impl.getList());
+    }
+}