Skip to content

Commit c23d2f7

Browse files
ningyu1ningyu1
authoredApr 18, 2019
upgrade dubbo 2.7.1 (#64)
·
2.7.82.7.1
1 parent c181cf3 commit c23d2f7

8 files changed

+76
-72
lines changed
 

‎.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
.project
77
.classpath
88
/target/
9-
10-
.settings/*
9+
.settings/*
10+
/.idea
11+
/*.iml

‎dist/jmeter-plugins-dubbo-2.7.1-jar-with-dependencies.jar

18.5 MB
Binary file not shown.

‎dist/jmeter-plugins-dubbo-2.7.1.jar

58.1 KB
Binary file not shown.

‎pom.xml

+41-33
Original file line numberDiff line numberDiff line change
@@ -19,92 +19,100 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<groupId>io.github.ningyu</groupId>
2121
<artifactId>jmeter-plugins-dubbo</artifactId>
22-
<version>1.3.8</version>
22+
<version>${revision}</version>
2323

2424
<properties>
25-
<maven.compiler.source>1.7</maven.compiler.source>
26-
<maven.compiler.target>1.7</maven.compiler.target>
27-
<maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
28-
<dubbo_version>2.6.4</dubbo_version>
29-
<gson_version>2.8.2</gson_version>
30-
<zookeeper_version>3.4.9</zookeeper_version>
31-
<zkclient_version>0.2</zkclient_version>
32-
<curator_version>2.12.0</curator_version>
33-
<fst_version>2.48-jdk-6</fst_version>
34-
<slf4j_version>1.7.25</slf4j_version>
35-
<jorphan_version>3.0</jorphan_version>
36-
<avalon_framework_version>4.1.4</avalon_framework_version>
37-
<jmeter_core_version>3.0</jmeter_core_version>
38-
<avalon_logkit_version>2.0</avalon_logkit_version>
25+
<revision>2.7.1</revision>
26+
<java.version>1.8</java.version>
27+
<java.source.version>1.8</java.source.version>
28+
<java.target.version>1.8</java.target.version>
29+
<maven.compiler.source>1.8</maven.compiler.source>
30+
<maven.compiler.target>1.8</maven.compiler.target>
31+
<maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
32+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33+
34+
<dubbo.version>${revision}</dubbo.version>
35+
<jorphan.version>3.0</jorphan.version>
36+
<avalon.framework.version>4.1.4</avalon.framework.version>
37+
<jmeter.core.version>3.0</jmeter.core.version>
38+
<avalon.logkit.version>2.0</avalon.logkit.version>
39+
<slf4j.version>1.7.25</slf4j.version>
3940
</properties>
4041

42+
<dependencyManagement>
43+
<dependencies>
44+
<!-- Aapche Dubbo -->
45+
<dependency>
46+
<groupId>org.apache.dubbo</groupId>
47+
<artifactId>dubbo-dependencies-bom</artifactId>
48+
<version>${dubbo.version}</version>
49+
<type>pom</type>
50+
<scope>import</scope>
51+
</dependency>
52+
</dependencies>
53+
</dependencyManagement>
54+
4155
<dependencies>
4256
<dependency>
4357
<groupId>avalon-framework</groupId>
4458
<artifactId>avalon-framework</artifactId>
45-
<version>${avalon_framework_version}</version>
59+
<version>${avalon.framework.version}</version>
4660
<scope>provided</scope>
4761
</dependency>
4862
<dependency>
4963
<groupId>org.apache.jmeter</groupId>
5064
<artifactId>ApacheJMeter_core</artifactId>
51-
<version>${jmeter_core_version}</version>
65+
<version>${jmeter.core.version}</version>
5266
<scope>provided</scope>
5367
</dependency>
5468
<dependency>
5569
<groupId>avalon-logkit</groupId>
5670
<artifactId>avalon-logkit</artifactId>
57-
<version>${avalon_logkit_version}</version>
71+
<version>${avalon.logkit.version}</version>
5872
<scope>provided</scope>
5973
</dependency>
6074
<dependency>
6175
<groupId>org.apache.jmeter</groupId>
6276
<artifactId>jorphan</artifactId>
63-
<version>${jorphan_version}</version>
77+
<version>${jorphan.version}</version>
6478
<scope>provided</scope>
6579
</dependency>
66-
<!-- Dubbo -->
80+
<!-- Aapche Dubbo -->
6781
<dependency>
68-
<groupId>com.alibaba</groupId>
82+
<groupId>org.apache.dubbo</groupId>
6983
<artifactId>dubbo</artifactId>
70-
<version>${dubbo_version}</version>
84+
<version>${dubbo.version}</version>
7185
</dependency>
7286
<!-- Zookeeper -->
7387
<dependency>
7488
<groupId>org.apache.zookeeper</groupId>
7589
<artifactId>zookeeper</artifactId>
76-
<version>${zookeeper_version}</version>
7790
</dependency>
7891
<dependency>
79-
<groupId>com.101tec</groupId>
80-
<artifactId>zkclient</artifactId>
81-
<version>${zkclient_version}</version>
82-
</dependency>
83-
<dependency>
8492
<groupId>org.apache.curator</groupId>
8593
<artifactId>curator-framework</artifactId>
86-
<version>${curator_version}</version>
94+
</dependency>
95+
<dependency>
96+
<groupId>org.apache.curator</groupId>
97+
<artifactId>curator-recipes</artifactId>
8798
</dependency>
8899
<dependency>
89100
<groupId>de.ruedigermoeller</groupId>
90101
<artifactId>fst</artifactId>
91-
<version>${fst_version}</version>
92102
</dependency>
93103
<!-- slf4j -->
94104
<dependency>
95105
<groupId>org.slf4j</groupId>
96106
<artifactId>slf4j-api</artifactId>
97-
<version>${slf4j_version}</version>
98107
</dependency>
99108
<dependency>
100109
<groupId>org.slf4j</groupId>
101110
<artifactId>log4j-over-slf4j</artifactId>
102-
<version>${slf4j_version}</version>
111+
<version>${slf4j.version}</version>
103112
</dependency>
104113
<dependency>
105114
<groupId>com.google.code.gson</groupId>
106115
<artifactId>gson</artifactId>
107-
<version>${gson_version}</version>
108116
</dependency>
109117
</dependencies>
110118
<build>

‎src/main/java/io/github/ningyu/jmeter/plugin/dubbo/gui/DubboSampleGui.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package io.github.ningyu.jmeter.plugin.dubbo.gui;
1818

19-
import com.alibaba.dubbo.common.URL;
19+
import org.apache.dubbo.common.URL;
2020

2121
import io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample;
2222
import io.github.ningyu.jmeter.plugin.dubbo.sample.MethodArgument;
@@ -471,12 +471,12 @@ private void doChange(String key) {
471471
Map<String, URL> provider = providerService.findByService(key);
472472
if (provider != null && !provider.isEmpty()) {
473473
URL url = new ArrayList<URL>(provider.values()).get(0);
474-
String group = url.getParameter(com.alibaba.dubbo.common.Constants.GROUP_KEY);
475-
String version = url.getParameter(com.alibaba.dubbo.common.Constants.VERSION_KEY);
476-
String timeout = url.getParameter(com.alibaba.dubbo.common.Constants.TIMEOUT_KEY);
474+
String group = url.getParameter(org.apache.dubbo.common.Constants.GROUP_KEY);
475+
String version = url.getParameter(org.apache.dubbo.common.Constants.VERSION_KEY);
476+
String timeout = url.getParameter(org.apache.dubbo.common.Constants.TIMEOUT_KEY);
477477
String protocol = url.getProtocol() + "://";
478478
String interfaceName = url.getServiceInterface();
479-
String method = url.getParameter(com.alibaba.dubbo.common.Constants.METHODS_KEY);
479+
String method = url.getParameter(org.apache.dubbo.common.Constants.METHODS_KEY);
480480
groupText.setText(group);
481481
versionText.setText(version);
482482
timeoutText.setText(timeout);

‎src/main/java/io/github/ningyu/jmeter/plugin/dubbo/sample/DubboSample.java

+14-18
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020
import io.github.ningyu.jmeter.plugin.util.Constants;
2121
import io.github.ningyu.jmeter.plugin.util.ErrorCode;
2222
import io.github.ningyu.jmeter.plugin.util.JsonUtils;
23-
24-
import java.text.MessageFormat;
25-
import java.util.ArrayList;
26-
import java.util.List;
27-
23+
import org.apache.dubbo.common.utils.StringUtils;
24+
import org.apache.dubbo.config.ApplicationConfig;
25+
import org.apache.dubbo.config.ReferenceConfig;
26+
import org.apache.dubbo.config.RegistryConfig;
27+
import org.apache.dubbo.config.utils.ReferenceConfigCache;
28+
import org.apache.dubbo.rpc.service.GenericService;
2829
import org.apache.jmeter.samplers.AbstractSampler;
2930
import org.apache.jmeter.samplers.Entry;
3031
import org.apache.jmeter.samplers.SampleResult;
@@ -33,15 +34,9 @@
3334
import org.apache.jorphan.logging.LoggingManager;
3435
import org.apache.log.Logger;
3536

36-
import com.alibaba.dubbo.common.utils.StringUtils;
37-
import com.alibaba.dubbo.config.ApplicationConfig;
38-
import com.alibaba.dubbo.config.ReferenceConfig;
39-
import com.alibaba.dubbo.config.RegistryConfig;
40-
import com.alibaba.dubbo.config.utils.ReferenceConfigCache;
41-
import com.alibaba.dubbo.config.utils.ReferenceConfigCache.KeyGenerator;
42-
import com.alibaba.dubbo.rpc.service.GenericService;
43-
44-
import javax.swing.*;
37+
import java.text.MessageFormat;
38+
import java.util.ArrayList;
39+
import java.util.List;
4540

4641
/**
4742
* DubboSample
@@ -523,10 +518,11 @@ private Object callDubbo(SampleResult res) {
523518
}
524519

525520
// The registry's address is to generate the ReferenceConfigCache key
526-
ReferenceConfigCache cache = ReferenceConfigCache.getCache(getAddress(), new KeyGenerator() {
527-
public String generateKey(ReferenceConfig<?> referenceConfig) {
528-
return referenceConfig.toString();
529-
}
521+
ReferenceConfigCache cache = ReferenceConfigCache.getCache(getAddress(), new ReferenceConfigCache.KeyGenerator() {
522+
@Override
523+
public String generateKey(org.apache.dubbo.config.ReferenceConfig<?> referenceConfig) {
524+
return referenceConfig.toString();
525+
}
530526
});
531527
GenericService genericService = (GenericService) cache.get(reference);
532528
if (genericService == null) {

‎src/main/java/io/github/ningyu/jmeter/plugin/dubbo/sample/ProviderService.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717

1818
package io.github.ningyu.jmeter.plugin.dubbo.sample;
1919

20-
import com.alibaba.dubbo.common.URL;
21-
import com.alibaba.dubbo.config.ReferenceConfig;
22-
import com.alibaba.dubbo.config.RegistryConfig;
23-
import com.alibaba.dubbo.config.utils.ReferenceConfigCache;
24-
import com.alibaba.dubbo.registry.RegistryService;
25-
2620
import io.github.ningyu.jmeter.plugin.util.Constants;
21+
import org.apache.dubbo.common.URL;
22+
import org.apache.dubbo.config.ReferenceConfig;
23+
import org.apache.dubbo.config.RegistryConfig;
24+
import org.apache.dubbo.config.utils.ReferenceConfigCache;
25+
import org.apache.dubbo.registry.RegistryService;
2726
import org.apache.jorphan.logging.LoggingManager;
2827
import org.apache.log.Logger;
2928

@@ -94,9 +93,10 @@ private List<String> executeRegistry(String protocol, String address, String gro
9493
reference.setRegistry(registry);
9594
break;
9695
}
97-
reference.setInterface("com.alibaba.dubbo.registry.RegistryService");
96+
reference.setInterface("org.apache.dubbo.registry.RegistryService");
9897
try {
9998
ReferenceConfigCache cache = ReferenceConfigCache.getCache(address + "_" + group, new ReferenceConfigCache.KeyGenerator() {
99+
@Override
100100
public String generateKey(ReferenceConfig<?> referenceConfig) {
101101
return referenceConfig.toString();
102102
}
@@ -108,7 +108,7 @@ public String generateKey(ReferenceConfig<?> referenceConfig) {
108108
RegistryServerSync registryServerSync = RegistryServerSync.get(address + "_" + group);
109109
registryService.subscribe(RegistryServerSync.SUBSCRIBE, registryServerSync);
110110
List<String> ret = new ArrayList<String>();
111-
providerUrls = registryServerSync.getRegistryCache().get(com.alibaba.dubbo.common.Constants.PROVIDERS_CATEGORY);
111+
providerUrls = registryServerSync.getRegistryCache().get(org.apache.dubbo.common.Constants.PROVIDERS_CATEGORY);
112112
if (providerUrls != null) ret.addAll(providerUrls.keySet());
113113
return ret;
114114
} catch (Exception e) {

‎src/main/java/io/github/ningyu/jmeter/plugin/dubbo/sample/RegistryServerSync.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717

1818
package io.github.ningyu.jmeter.plugin.dubbo.sample;
1919

20-
import com.alibaba.dubbo.common.Constants;
21-
import com.alibaba.dubbo.common.URL;
22-
import com.alibaba.dubbo.common.utils.NetUtils;
23-
import com.alibaba.dubbo.common.utils.StringUtils;
24-
import com.alibaba.dubbo.registry.NotifyListener;
25-
2620
import io.github.ningyu.jmeter.plugin.util.MD5Util;
21+
import org.apache.dubbo.common.Constants;
22+
import org.apache.dubbo.common.URL;
23+
import org.apache.dubbo.common.utils.NetUtils;
24+
import org.apache.dubbo.common.utils.StringUtils;
25+
import org.apache.dubbo.registry.NotifyListener;
2726

2827
import java.io.Serializable;
2928
import java.util.HashMap;

0 commit comments

Comments
 (0)
Please sign in to comment.