You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/11/18 13:50:04 UTC
[dubbo] branch 3.0 updated: fix wrong class name in package extension/ext6_wrap (#9280)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 4c443d9a fix wrong class name in package extension/ext6_wrap (#9280)
4c443d9a is described below
commit 4c443d9a05cfe2cc12aa91054b26d0987fbf24b0
Author: 王贺涛 <79...@qq.com>
AuthorDate: Thu Nov 18 21:49:50 2021 +0800
fix wrong class name in package extension/ext6_wrap (#9280)
---
.../common/extension/ExtensionLoaderTest.java | 22 +++++++++++-----------
.../impl/{Ext5Impl1.java => Ext6Impl1.java} | 4 ++--
.../impl/{Ext5Impl2.java => Ext6Impl2.java} | 4 ++--
.../impl/{Ext5Wrapper1.java => Ext6Wrapper1.java} | 4 ++--
.../impl/{Ext5Wrapper2.java => Ext6Wrapper2.java} | 4 ++--
...che.dubbo.common.extension.ext6_wrap.WrappedExt | 8 ++++----
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java
index 7a6e18f..1e2aa3c 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java
@@ -43,9 +43,9 @@ import org.apache.dubbo.common.extension.ext11_no_adaptive.NoAdaptiveExtImpl;
import org.apache.dubbo.common.extension.ext2.Ext2;
import org.apache.dubbo.common.extension.ext6_wrap.WrappedExt;
import org.apache.dubbo.common.extension.ext6_wrap.WrappedExtWrapper;
-import org.apache.dubbo.common.extension.ext6_wrap.impl.Ext5Impl1;
-import org.apache.dubbo.common.extension.ext6_wrap.impl.Ext5Wrapper1;
-import org.apache.dubbo.common.extension.ext6_wrap.impl.Ext5Wrapper2;
+import org.apache.dubbo.common.extension.ext6_wrap.impl.Ext6Impl1;
+import org.apache.dubbo.common.extension.ext6_wrap.impl.Ext6Wrapper1;
+import org.apache.dubbo.common.extension.ext6_wrap.impl.Ext6Wrapper2;
import org.apache.dubbo.common.extension.ext7.InitErrorExt;
import org.apache.dubbo.common.extension.ext8_add.AddExt1;
import org.apache.dubbo.common.extension.ext8_add.AddExt2;
@@ -157,7 +157,7 @@ public class ExtensionLoaderTest {
@Test
public void test_getExtension_WithWrapper() {
WrappedExt impl1 = getExtensionLoader(WrappedExt.class).getExtension("impl1");
- assertThat(impl1, anyOf(instanceOf(Ext5Wrapper1.class), instanceOf(Ext5Wrapper2.class)));
+ assertThat(impl1, anyOf(instanceOf(Ext6Wrapper1.class), instanceOf(Ext6Wrapper2.class)));
assertThat(impl1, instanceOf(WrappedExtWrapper.class));
// get origin instance from wrapper
WrappedExt originImpl1 = impl1;
@@ -167,22 +167,22 @@ public class ExtensionLoaderTest {
// test unwrapped instance
WrappedExt unwrappedImpl1 = getExtensionLoader(WrappedExt.class).getExtension("impl1", false);
- assertThat(unwrappedImpl1, instanceOf(Ext5Impl1.class));
+ assertThat(unwrappedImpl1, instanceOf(Ext6Impl1.class));
assertNotSame(unwrappedImpl1, impl1);
assertSame(unwrappedImpl1, originImpl1);
WrappedExt impl2 = getExtensionLoader(WrappedExt.class).getExtension("impl2");
- assertThat(impl2, anyOf(instanceOf(Ext5Wrapper1.class), instanceOf(Ext5Wrapper2.class)));
+ assertThat(impl2, anyOf(instanceOf(Ext6Wrapper1.class), instanceOf(Ext6Wrapper2.class)));
URL url = new ServiceConfigURL("p1", "1.2.3.4", 1010, "path1");
- int echoCount1 = Ext5Wrapper1.echoCount.get();
- int echoCount2 = Ext5Wrapper2.echoCount.get();
+ int echoCount1 = Ext6Wrapper1.echoCount.get();
+ int echoCount2 = Ext6Wrapper2.echoCount.get();
- assertEquals("Ext5Impl1-echo", impl1.echo(url, "ha"));
- assertEquals(echoCount1 + 1, Ext5Wrapper1.echoCount.get());
- assertEquals(echoCount2 + 1, Ext5Wrapper2.echoCount.get());
+ assertEquals("Ext6Impl1-echo", impl1.echo(url, "ha"));
+ assertEquals(echoCount1 + 1, Ext6Wrapper1.echoCount.get());
+ assertEquals(echoCount2 + 1, Ext6Wrapper2.echoCount.get());
}
@Test
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext5Impl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext6Impl1.java
similarity index 92%
rename from dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext5Impl1.java
rename to dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext6Impl1.java
index 29338b8..17d46e2 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext5Impl1.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext6Impl1.java
@@ -19,8 +19,8 @@ package org.apache.dubbo.common.extension.ext6_wrap.impl;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ext6_wrap.WrappedExt;
-public class Ext5Impl1 implements WrappedExt {
+public class Ext6Impl1 implements WrappedExt {
public String echo(URL url, String s) {
- return "Ext5Impl1-echo";
+ return "Ext6Impl1-echo";
}
}
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext5Impl2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext6Impl2.java
similarity index 92%
rename from dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext5Impl2.java
rename to dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext6Impl2.java
index 981d023..420d224 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext5Impl2.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext6Impl2.java
@@ -19,8 +19,8 @@ package org.apache.dubbo.common.extension.ext6_wrap.impl;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ext6_wrap.WrappedExt;
-public class Ext5Impl2 implements WrappedExt {
+public class Ext6Impl2 implements WrappedExt {
public String echo(URL url, String s) {
- return "Ext5Impl2-echo";
+ return "Ext6Impl2-echo";
}
}
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext5Wrapper1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext6Wrapper1.java
similarity index 92%
rename from dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext5Wrapper1.java
rename to dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext6Wrapper1.java
index c505c1a..bcb5f67 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext5Wrapper1.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext6Wrapper1.java
@@ -22,11 +22,11 @@ import org.apache.dubbo.common.extension.ext6_wrap.WrappedExtWrapper;
import java.util.concurrent.atomic.AtomicInteger;
-public class Ext5Wrapper1 implements WrappedExt, WrappedExtWrapper {
+public class Ext6Wrapper1 implements WrappedExt, WrappedExtWrapper {
public static AtomicInteger echoCount = new AtomicInteger();
WrappedExt origin;
- public Ext5Wrapper1(WrappedExt origin) {
+ public Ext6Wrapper1(WrappedExt origin) {
this.origin = origin;
}
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext5Wrapper2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext6Wrapper2.java
similarity index 92%
rename from dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext5Wrapper2.java
rename to dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext6Wrapper2.java
index 5772659..2babe58 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext5Wrapper2.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/impl/Ext6Wrapper2.java
@@ -22,11 +22,11 @@ import org.apache.dubbo.common.extension.ext6_wrap.WrappedExtWrapper;
import java.util.concurrent.atomic.AtomicInteger;
-public class Ext5Wrapper2 implements WrappedExt, WrappedExtWrapper {
+public class Ext6Wrapper2 implements WrappedExt, WrappedExtWrapper {
public static AtomicInteger echoCount = new AtomicInteger();
WrappedExt origin;
- public Ext5Wrapper2(WrappedExt origin) {
+ public Ext6Wrapper2(WrappedExt origin) {
this.origin = origin;
}
diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.ext6_wrap.WrappedExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.ext6_wrap.WrappedExt
index 8a1335d..bc44bf4 100644
--- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.ext6_wrap.WrappedExt
+++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.ext6_wrap.WrappedExt
@@ -1,4 +1,4 @@
-impl1=org.apache.dubbo.common.extension.ext6_wrap.impl.Ext5Impl1
-impl2=org.apache.dubbo.common.extension.ext6_wrap.impl.Ext5Impl2
-wrapper1=org.apache.dubbo.common.extension.ext6_wrap.impl.Ext5Wrapper1
-wrapper2=org.apache.dubbo.common.extension.ext6_wrap.impl.Ext5Wrapper2
\ No newline at end of file
+impl1=org.apache.dubbo.common.extension.ext6_wrap.impl.Ext6Impl1
+impl2=org.apache.dubbo.common.extension.ext6_wrap.impl.Ext6Impl2
+wrapper1=org.apache.dubbo.common.extension.ext6_wrap.impl.Ext6Wrapper1
+wrapper2=org.apache.dubbo.common.extension.ext6_wrap.impl.Ext6Wrapper2