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.

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

upgrade dubbo 2.7.1 #63 #64

Merged
merged 1 commit into from
Apr 18, 2019
Merged

upgrade dubbo 2.7.1 #63 #64

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
5 changes: 3 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
.project
.classpath
/target/

.settings/*
.settings/*
/.idea
/*.iml
Binary file added dist/jmeter-plugins-dubbo-2.7.1-jar-with-dependencies.jar
View file
Open in desktop
Binary file not shown.
Binary file added dist/jmeter-plugins-dubbo-2.7.1.jar
View file
Open in desktop
Binary file not shown.
74 changes: 41 additions & 33 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,92 +19,100 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.ningyu</groupId>
<artifactId>jmeter-plugins-dubbo</artifactId>
<version>1.3.8</version>
<version>${revision}</version>

<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
<dubbo_version>2.6.4</dubbo_version>
<gson_version>2.8.2</gson_version>
<zookeeper_version>3.4.9</zookeeper_version>
<zkclient_version>0.2</zkclient_version>
<curator_version>2.12.0</curator_version>
<fst_version>2.48-jdk-6</fst_version>
<slf4j_version>1.7.25</slf4j_version>
<jorphan_version>3.0</jorphan_version>
<avalon_framework_version>4.1.4</avalon_framework_version>
<jmeter_core_version>3.0</jmeter_core_version>
<avalon_logkit_version>2.0</avalon_logkit_version>
<revision>2.7.1</revision>
<java.version>1.8</java.version>
<java.source.version>1.8</java.source.version>
<java.target.version>1.8</java.target.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<dubbo.version>${revision}</dubbo.version>
<jorphan.version>3.0</jorphan.version>
<avalon.framework.version>4.1.4</avalon.framework.version>
<jmeter.core.version>3.0</jmeter.core.version>
<avalon.logkit.version>2.0</avalon.logkit.version>
<slf4j.version>1.7.25</slf4j.version>
</properties>

<dependencyManagement>
<dependencies>
<!-- Aapche Dubbo -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-bom</artifactId>
<version>${dubbo.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
<version>${avalon_framework_version}</version>
<version>${avalon.framework.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jmeter</groupId>
<artifactId>ApacheJMeter_core</artifactId>
<version>${jmeter_core_version}</version>
<version>${jmeter.core.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>avalon-logkit</groupId>
<artifactId>avalon-logkit</artifactId>
<version>${avalon_logkit_version}</version>
<version>${avalon.logkit.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jmeter</groupId>
<artifactId>jorphan</artifactId>
<version>${jorphan_version}</version>
<version>${jorphan.version}</version>
<scope>provided</scope>
</dependency>
<!-- Dubbo -->
<!-- Aapche Dubbo -->
<dependency>
<groupId>com.alibaba</groupId>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>${dubbo_version}</version>
<version>${dubbo.version}</version>
</dependency>
<!-- Zookeeper -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper_version}</version>
</dependency>
<dependency>
<groupId>com.101tec</groupId>
<artifactId>zkclient</artifactId>
<version>${zkclient_version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${curator_version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
</dependency>
<dependency>
<groupId>de.ruedigermoeller</groupId>
<artifactId>fst</artifactId>
<version>${fst_version}</version>
</dependency>
<!-- slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j_version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j_version}</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson_version}</version>
</dependency>
</dependencies>
<build>
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/io/github/ningyu/jmeter/plugin/dubbo/gui/DubboSampleGui.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package io.github.ningyu.jmeter.plugin.dubbo.gui;

import com.alibaba.dubbo.common.URL;
import org.apache.dubbo.common.URL;

import io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample;
import io.github.ningyu.jmeter.plugin.dubbo.sample.MethodArgument;
Expand Down Expand Up @@ -471,12 +471,12 @@ private void doChange(String key) {
Map<String, URL> provider = providerService.findByService(key);
if (provider != null && !provider.isEmpty()) {
URL url = new ArrayList<URL>(provider.values()).get(0);
String group = url.getParameter(com.alibaba.dubbo.common.Constants.GROUP_KEY);
String version = url.getParameter(com.alibaba.dubbo.common.Constants.VERSION_KEY);
String timeout = url.getParameter(com.alibaba.dubbo.common.Constants.TIMEOUT_KEY);
String group = url.getParameter(org.apache.dubbo.common.Constants.GROUP_KEY);
String version = url.getParameter(org.apache.dubbo.common.Constants.VERSION_KEY);
String timeout = url.getParameter(org.apache.dubbo.common.Constants.TIMEOUT_KEY);
String protocol = url.getProtocol() + "://";
String interfaceName = url.getServiceInterface();
String method = url.getParameter(com.alibaba.dubbo.common.Constants.METHODS_KEY);
String method = url.getParameter(org.apache.dubbo.common.Constants.METHODS_KEY);
groupText.setText(group);
versionText.setText(version);
timeoutText.setText(timeout);
Expand Down
32 changes: 14 additions & 18 deletions src/main/java/io/github/ningyu/jmeter/plugin/dubbo/sample/DubboSample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
import io.github.ningyu.jmeter.plugin.util.Constants;
import io.github.ningyu.jmeter.plugin.util.ErrorCode;
import io.github.ningyu.jmeter.plugin.util.JsonUtils;

import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;

import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.utils.ReferenceConfigCache;
import org.apache.dubbo.rpc.service.GenericService;
import org.apache.jmeter.samplers.AbstractSampler;
import org.apache.jmeter.samplers.Entry;
import org.apache.jmeter.samplers.SampleResult;
Expand All @@ -33,15 +34,9 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;

import com.alibaba.dubbo.common.utils.StringUtils;
import com.alibaba.dubbo.config.ApplicationConfig;
import com.alibaba.dubbo.config.ReferenceConfig;
import com.alibaba.dubbo.config.RegistryConfig;
import com.alibaba.dubbo.config.utils.ReferenceConfigCache;
import com.alibaba.dubbo.config.utils.ReferenceConfigCache.KeyGenerator;
import com.alibaba.dubbo.rpc.service.GenericService;

import javax.swing.*;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;

/**
* DubboSample
Expand Down Expand Up @@ -523,10 +518,11 @@ private Object callDubbo(SampleResult res) {
}

// The registry's address is to generate the ReferenceConfigCache key
ReferenceConfigCache cache = ReferenceConfigCache.getCache(getAddress(), new KeyGenerator() {
public String generateKey(ReferenceConfig<?> referenceConfig) {
return referenceConfig.toString();
}
ReferenceConfigCache cache = ReferenceConfigCache.getCache(getAddress(), new ReferenceConfigCache.KeyGenerator() {
@Override
public String generateKey(org.apache.dubbo.config.ReferenceConfig<?> referenceConfig) {
return referenceConfig.toString();
}
});
GenericService genericService = (GenericService) cache.get(reference);
if (genericService == null) {
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/io/github/ningyu/jmeter/plugin/dubbo/sample/ProviderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@

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

import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.config.ReferenceConfig;
import com.alibaba.dubbo.config.RegistryConfig;
import com.alibaba.dubbo.config.utils.ReferenceConfigCache;
import com.alibaba.dubbo.registry.RegistryService;

import io.github.ningyu.jmeter.plugin.util.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.utils.ReferenceConfigCache;
import org.apache.dubbo.registry.RegistryService;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;

Expand Down Expand Up @@ -94,9 +93,10 @@ private List<String> executeRegistry(String protocol, String address, String gro
reference.setRegistry(registry);
break;
}
reference.setInterface("com.alibaba.dubbo.registry.RegistryService");
reference.setInterface("org.apache.dubbo.registry.RegistryService");
try {
ReferenceConfigCache cache = ReferenceConfigCache.getCache(address + "_" + group, new ReferenceConfigCache.KeyGenerator() {
@Override
public String generateKey(ReferenceConfig<?> referenceConfig) {
return referenceConfig.toString();
}
Expand All @@ -108,7 +108,7 @@ public String generateKey(ReferenceConfig<?> referenceConfig) {
RegistryServerSync registryServerSync = RegistryServerSync.get(address + "_" + group);
registryService.subscribe(RegistryServerSync.SUBSCRIBE, registryServerSync);
List<String> ret = new ArrayList<String>();
providerUrls = registryServerSync.getRegistryCache().get(com.alibaba.dubbo.common.Constants.PROVIDERS_CATEGORY);
providerUrls = registryServerSync.getRegistryCache().get(org.apache.dubbo.common.Constants.PROVIDERS_CATEGORY);
if (providerUrls != null) ret.addAll(providerUrls.keySet());
return ret;
} catch (Exception e) {
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/io/github/ningyu/jmeter/plugin/dubbo/sample/RegistryServerSync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@

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

import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.common.utils.NetUtils;
import com.alibaba.dubbo.common.utils.StringUtils;
import com.alibaba.dubbo.registry.NotifyListener;

import io.github.ningyu.jmeter.plugin.util.MD5Util;
import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.registry.NotifyListener;

import java.io.Serializable;
import java.util.HashMap;
Expand Down