Skip to content

Commit

Permalink
Fixes #9913, rmi protocol supoort group and version (#9951)
Browse files Browse the repository at this point in the history
  • Loading branch information
xielongfei authored Sep 8, 2022
1 parent 81fabc7 commit bcf9764
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import static org.apache.dubbo.common.Version.isRelease270OrHigher;
import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_VERSION_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.RELEASE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
import static org.apache.dubbo.rpc.Constants.GENERIC_KEY;

/**
Expand Down Expand Up @@ -102,7 +104,14 @@ protected <T> T doRefer(final Class<T> serviceType, final URL url) throws RpcExc
return invocation;
});
}
String serviceUrl = url.toIdentityString();

String pathKey = URL.buildKey(url.getPath(), url.getParameter(GROUP_KEY), url.getParameter(VERSION_KEY));
//The format is 'rmi://{host}:{ip}/{group}/{interfaceName}:{version}'
StringBuilder buf = new StringBuilder();
buf.append(url.getProtocol()).append("://")
.append(url.getHost()).append(":").append(url.getPort())
.append("/").append(pathKey);
String serviceUrl = buf.toString();
if (isGeneric) {
serviceUrl = serviceUrl + "/" + GENERIC_KEY;
}
Expand Down Expand Up @@ -137,9 +146,9 @@ private <T> RmiServiceExporter createExporter(T impl, Class<?> type, URL url, bo
final RmiServiceExporter rmiServiceExporter = new RmiServiceExporter();
rmiServiceExporter.setRegistryPort(url.getPort());
if (isGeneric) {
rmiServiceExporter.setServiceName(url.getPath() + "/" + GENERIC_KEY);
rmiServiceExporter.setServiceName(url.getServiceKey() + "/" + GENERIC_KEY);
} else {
rmiServiceExporter.setServiceName(url.getPath());
rmiServiceExporter.setServiceName(url.getServiceKey());
}
rmiServiceExporter.setServiceInterface(type);
rmiServiceExporter.setService(impl);
Expand Down
Original file line number Diff line number Diff line change
@@ -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 org.apache.dubbo.rpc.protocol.rmi;

import org.apache.dubbo.rpc.RpcContext;

import java.rmi.RemoteException;

/**
* analog multi-implementation
*/
public class RemoteService2Impl implements RemoteService {

public String getThreadName() throws RemoteException {
System.out.println("RpcContext.getContext().getRemoteHost()=" + RpcContext.getContext().getRemoteHost());
return Thread.currentThread().getName();
}

public String sayHello(String name) throws RemoteException {
return "hello " + name + "@" + RemoteService2Impl.class.getName();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,30 @@ public void testRemoteApplicationName() throws Exception {

}

@Test
public void testRmiProtocalGroupAndVersion() throws Exception {
int port = NetUtils.getAvailablePort();
RemoteService remoteService = new RemoteServiceImpl();
RemoteService remoteService2 = new RemoteService2Impl();

URL url = URL.valueOf("rmi://127.0.0.1:" + port + "/" + DemoService.class.getName() + "?version=v1&group=g1");
URL url2 = URL.valueOf("rmi://127.0.0.1:" + port + "/" + DemoService.class.getName() + "?version=v2&group=g2");
Exporter<?> rpcExporter = protocol.export(proxy.getInvoker(remoteService, RemoteService.class, url));
Exporter<?> rpcExporter2 = protocol.export(proxy.getInvoker(remoteService2, RemoteService.class, url2));

remoteService = proxy.getProxy(protocol.refer(RemoteService.class, url));
remoteService2 = proxy.getProxy(protocol.refer(RemoteService.class, url2));
for (int i = 0; i < 1; i++) {
String say = remoteService.sayHello("abcd");
assertEquals("hello abcd@" + RemoteServiceImpl.class.getName(), say);
String say2 = remoteService2.sayHello("group");
assertEquals("hello group@" + RemoteService2Impl.class.getName(), say2);
}
rpcExporter.unexport();
rpcExporter2.unexport();

}

public interface NonStdRmiInterface {
void bark();
}
Expand Down

0 comments on commit bcf9764

Please sign in to comment.