Skip to content

fix org.apache.dubbo replace com.alibaba.dubbo #3338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carryxyh merged 1 commit into from
Jan 25, 2019
Merged

fix org.apache.dubbo replace com.alibaba.dubbo #3338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbb-provider.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dubbo Provider Properties as an alternative for
# Spring XML Bean definition : META-INF/spring/dubbo-annotation-provider.xml

## Service Providers' Placeholders for com.alibaba.dubbo.config.spring.context.annotation.provider.DemoServiceImpl
## Service Providers' Placeholders for org.apache.dubbo.config.spring.context.annotation.provider.DemoServiceImpl

demo.service.application = dubbo-demo-application
demo.service.protocol = dubbo
Expand Down
8 changes: 4 additions & 4 deletions dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/GenericFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void testInvokeWithDefault() throws Exception {
RpcInvocation invocation = new RpcInvocation(Constants.$INVOKE, genericInvoke.getParameterTypes(),
new Object[]{"getPerson", new String[]{Person.class.getCanonicalName()}, new Object[]{person}});

URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" +
URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" +
"accesslog=true&group=dubbo&version=1.1");
Invoker invoker = Mockito.mock(Invoker.class);
when(invoker.invoke(any(Invocation.class))).thenReturn(new RpcResult(new Person("person", 10)));
Expand All @@ -76,7 +76,7 @@ public void testInvokeWithJavaException() throws Exception {
new Object[]{"getPerson", new String[]{Person.class.getCanonicalName()}, new Object[]{person}});
invocation.setAttachment(Constants.GENERIC_KEY, Constants.GENERIC_SERIALIZATION_NATIVE_JAVA);

URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" +
URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" +
"accesslog=true&group=dubbo&version=1.1");
Invoker invoker = Mockito.mock(Invoker.class);
when(invoker.invoke(any(Invocation.class))).thenReturn(new RpcResult(new Person("person", 10)));
Expand All @@ -99,7 +99,7 @@ public void testInvokeWithJavaException() throws Exception {
RpcInvocation invocation = new RpcInvocation("sayHi", genericInvoke.getParameterTypes()
, new Object[]{"getPerson", new String[]{Person.class.getCanonicalName()}, new Object[]{person}});

URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" +
URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" +
"accesslog=true&group=dubbo&version=1.1");
Invoker invoker = Mockito.mock(Invoker.class);
when(invoker.invoke(any(Invocation.class))).thenReturn(new RpcResult(new Person("person", 10)));
Expand All @@ -123,7 +123,7 @@ public void testInvokeWithMethodArgumentSizeIsNot3() {
RpcInvocation invocation = new RpcInvocation(Constants.$INVOKE, genericInvoke.getParameterTypes()
, new Object[]{"getPerson", new String[]{Person.class.getCanonicalName()}});

URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" +
URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" +
"accesslog=true&group=dubbo&version=1.1");
Invoker invoker = Mockito.mock(Invoker.class);
when(invoker.invoke(any(Invocation.class))).thenReturn(new RpcResult(new Person("person", 10)));
Expand Down
6 changes: 3 additions & 3 deletions dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/GenericImplFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void testInvoke() throws Exception {
new Class[]{Person.class}, new Object[]{new Person("dubbo", 10)});


URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" +
URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" +
"accesslog=true&group=dubbo&version=1.1&generic=true");
Invoker invoker = Mockito.mock(Invoker.class);

Expand All @@ -74,7 +74,7 @@ public void testInvokeWithException() throws Exception {
RpcInvocation invocation = new RpcInvocation("getPerson",
new Class[]{Person.class}, new Object[]{new Person("dubbo", 10)});

URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" +
URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" +
"accesslog=true&group=dubbo&version=1.1&generic=true");
Invoker invoker = Mockito.mock(Invoker.class);

Expand All @@ -100,7 +100,7 @@ public void testInvokeWithException() throws Exception {
RpcInvocation invocation = new RpcInvocation(Constants.$INVOKE, genericInvoke.getParameterTypes(),
new Object[]{"getPerson", new String[]{Person.class.getCanonicalName()}, new Object[]{person}});

URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.rpc.support.DemoService?" +
URL url = URL.valueOf("test://test:11/org.apache.dubbo.rpc.support.DemoService?" +
"accesslog=true&group=dubbo&version=1.1&generic=true");
Invoker invoker = Mockito.mock(Invoker.class);
when(invoker.invoke(any(Invocation.class))).thenReturn(new RpcResult(new Person("person", 10)));
Expand Down
⚡