Skip to content
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.

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

Dubbo cloud native #4799

Merged
merged 41 commits into from
Aug 12, 2019
Merged
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
f51b394
Polish apache/dubbo#4542 : [Enhancement] Adapt the Java standard Even…
mercyblitz Jul 11, 2019
9e58caa
Polish apache/dubbo#4541 : [Feature] Add local File System DynamicCon…
mercyblitz Jul 15, 2019
9252be1
Polish apache#4541 : Bugfix
mercyblitz Jul 15, 2019
08089b6
Polish apache/dubbo#4541 : Optimization
mercyblitz Jul 15, 2019
cdd9338
Polish apache/dubbo#4541 : Add the compatibility for PollingWatchServ…
mercyblitz Jul 16, 2019
f0408f7
Polish apache/dubbo#4541 : Add delay publish without ThreadPoolExecutor
mercyblitz Jul 16, 2019
5f354a0
Polish apache/dubbo#4541 : Refactor the extension name
mercyblitz Jul 17, 2019
8152a75
Polish apache/dubbo#4541 : Add remove ops
mercyblitz Jul 17, 2019
df1a258
Polish apache/dubbo#4541 : Add testable constructor
mercyblitz Jul 17, 2019
52c0205
Polish apache/dubbo#4541 : Add getConfigGroups method
mercyblitz Jul 17, 2019
293a70d
Polish apache/dubbo#4610 : [Refactor] Refactor the bootstrap module
mercyblitz Jul 20, 2019
3218a1f
Polish apache/dubbo#4541 : Fix the nulling URL issue
mercyblitz Jul 20, 2019
d5c78ac
Polish apache/dubbo#4622 : [Refactor] Refactor ConfigManager
mercyblitz Jul 25, 2019
1d54a1d
Polish apache/dubbo#4622 : [Refactor] Refactor ConfigManager
mercyblitz Jul 25, 2019
5071a04
Polish apache/dubbo#4622 : Support multiple configcenters
mercyblitz Jul 26, 2019
ccf614c
Polish apache/dubbo#4671 : ServiceNameMapping will not map the group,…
mercyblitz Jul 26, 2019
87e88e2
update referenceCount log (#4683)
haiyang1985 Jul 29, 2019
5d299af
Polish /apache/dubbo#4687 : Remove the duplicated test code in dubbo-…
mercyblitz Jul 29, 2019
25ec31e
#4685 修改代码if判断false问题 if (hasException == false)修改成if (!hasException…
smipo Jul 30, 2019
c3132b8
Fixed Service annotation method parameters are not in effect (#4598)
Leishunyu Jul 31, 2019
f490df8
keep demo simple, and switch to use zookeeper as registry center (#4705)
beiwei30 Jul 31, 2019
c8dbd7d
@Reference auto-wires the instance of generic interface #4594 (#4677)
CodingSinger Jul 31, 2019
65a0140
try to shorten maven output to make travis build pass (#4710)
beiwei30 Aug 1, 2019
5b38331
use CountDownLatch to check zk registry if establish connection (#4589)
tswstarplanet Aug 1, 2019
a646874
Minor change
mercyblitz Aug 1, 2019
b8e601a
Merge remote-tracking branch 'upstream/master' into dubbo-cloud-native
mercyblitz Aug 2, 2019
0644fe1
Rename the extension name of WritableMetadataService
mercyblitz Aug 5, 2019
9f405d7
Polish apache/dubbo#4759 : [Refactor] Change the signature of methods…
mercyblitz Aug 7, 2019
a344121
Merge remote-tracking branch 'upstream/master' into dubbo-cloud-native
mercyblitz Aug 7, 2019
8c7f37a
Polish apache/dubbo#3984 : Add the implementation of Page<ServiceInst…
mercyblitz Aug 7, 2019
2a88323
Code merge
mercyblitz Aug 7, 2019
240c456
Code merge
mercyblitz Aug 8, 2019
391d053
Fix the cases
mercyblitz Aug 8, 2019
3e57a0a
Merge remote-tracking branch 'upstream/cloud-native' into dubbo-cloud…
mercyblitz Aug 8, 2019
83fc425
Merge remote-tracking branch 'upstream/cloud-native' into dubbo-cloud…
mercyblitz Aug 8, 2019
a147829
Refactor ConfigManager
mercyblitz Aug 12, 2019
eea35ce
Merge remote-tracking branch 'upstream/cloud-native' into dubbo-cloud…
mercyblitz Aug 12, 2019
e307e98
Refactor ConfigManager
mercyblitz Aug 12, 2019
f84a33d
Merge remote-tracking branch 'upstream/cloud-native' into dubbo-cloud…
mercyblitz Aug 12, 2019
ad3e638
Resolve the issues on ConfigManager
mercyblitz Aug 12, 2019
19f1474
Resolve conflict
mercyblitz Aug 12, 2019
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
Prev Previous commit
Next Next commit
Polish #4671 : ServiceNameMapping will not map the group, version and…
… protocol
mercyblitz committed Jul 26, 2019
commit ccf614cdadf23940112617f58efc09eb13e61a54
Original file line number Diff line number Diff line change
@@ -70,7 +70,6 @@ public Set<String> get(String serviceInterface, String group, String version, St

DynamicConfiguration dynamicConfiguration = DynamicConfiguration.getDynamicConfiguration();

String key = ApplicationModel.getApplication();
Set<String> serviceNames = new LinkedHashSet<>();
execute(() -> {
Set<String> keys = dynamicConfiguration.getConfigKeys(buildGroup(serviceInterface, group, version, protocol));
@@ -80,11 +79,13 @@ public Set<String> get(String serviceInterface, String group, String version, St
}

protected static String buildGroup(String serviceInterface, String group, String version, String protocol) {
StringBuilder groupBuilder = new StringBuilder(serviceInterface)
.append(SEPARATOR).append(defaultString(group))
.append(SEPARATOR).append(defaultString(version))
.append(SEPARATOR).append(defaultString(protocol));
return groupBuilder.toString();
// the issue : https://github.com/apache/dubbo/issues/4671
// StringBuilder groupBuilder = new StringBuilder(serviceInterface)
// .append(SEPARATOR).append(defaultString(group))
// .append(SEPARATOR).append(defaultString(version))
// .append(SEPARATOR).append(defaultString(protocol));
// return groupBuilder.toString();
return serviceInterface;
}

private static String defaultString(String value) {
Original file line number Diff line number Diff line change
@@ -16,18 +16,11 @@
*/
package org.apache.dubbo.metadata;

import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.config.Environment;
import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
import org.apache.dubbo.common.config.configcenter.DynamicConfigurationFactory;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.rpc.model.ApplicationModel;

import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.curator.test.TestingServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

@@ -47,44 +40,25 @@
*/
public class DynamicConfigurationServiceNameMappingTest {

private static CuratorFramework client;

private static URL configUrl;
private static int zkServerPort = NetUtils.getAvailablePort();
private static TestingServer zkServer;

private final ServiceNameMapping serviceNameMapping = getDefaultExtension();

@BeforeAll
public static void setUp() throws Exception {

zkServer = new TestingServer(zkServerPort, true);

client = CuratorFrameworkFactory.newClient("localhost:" + zkServerPort, 60 * 1000, 60 * 1000,
new ExponentialBackoffRetry(1000, 3));

client.start();

configUrl = URL.valueOf("zookeeper://localhost:" + zkServerPort);

DynamicConfiguration configuration = getExtensionLoader(DynamicConfigurationFactory.class)
.getExtension(configUrl.getProtocol())
.getDynamicConfiguration(configUrl);
.getDefaultExtension()
.getDynamicConfiguration(null);

Environment.getInstance().setDynamicConfiguration(configuration);
}

@AfterAll
public static void tearDown() throws Exception {
zkServer.stop();
}

@Test
public void testBuildGroup() {
assertEquals("test:::", buildGroup("test", null, null, null));
assertEquals("test:default::", buildGroup("test", "default", null, null));
assertEquals("test:default:1.0.0:", buildGroup("test", "default", "1.0.0", null));
assertEquals("test:default:1.0.0:dubbo", buildGroup("test", "default", "1.0.0", "dubbo"));
assertEquals("test", buildGroup("test", null, null, null));
assertEquals("test", buildGroup("test", "default", null, null));
assertEquals("test", buildGroup("test", "default", "1.0.0", null));
assertEquals("test", buildGroup("test", "default", "1.0.0", "dubbo"));
}

@Test