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

Jump to bottom

Jmeter-plugin-for-apache-dubbo v2.7.8 #3

Closed
wants to merge 10 commits into from
Closed

Jmeter-plugin-for-apache-dubbo v2.7.8 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ace048
upgrade dubbo to v2.7.8
ningyu1 Oct 14, 2020
5c33cf1
#122 fixed ReferenceConfigCache get diff Service to same genericServi…
ningyu1 Oct 14, 2020
8a7acd7
#122 fixed ReferenceConfigCache get diffsame genericService.
ningyu1 Oct 15, 2020
bfb43f0
1111
Oct 15, 2020
91ec9c9
remove Useless package
ningyu1 Oct 15, 2020
8edaff3
remove Useless package
ningyu1 Oct 15, 2020
10c24e6
Merge branch 'upgrade-dubbo-2.7.8' of https://github.com/ningyu1/jmet…
ningyu1 Oct 15, 2020
3e9d641
#124 fixed Locale类型问题
ningyu1 Oct 15, 2020
3e9168c
#126 fixed LocalDateTime、LocalDate、LocalTime
ningyu1 Oct 15, 2020
84210e8
fixed Locale、LocalDateTime、LocalDate、LocalTime
ningyu1 Oct 16, 2020
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
93 changes: 63 additions & 30 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<version>${revision}</version>

<properties>
<revision>2.7.7</revision>
<revision>2.7.8</revision>
<java.version>1.8</java.version>
<java.source.version>1.8</java.source.version>
<java.target.version>1.8</java.target.version>
Expand All @@ -31,9 +31,7 @@
<maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<dubbo.version>2.7.7</dubbo.version>
<nacos.version>1.1.3</nacos.version>
<!--<dubbo.version>2.7.2</dubbo.version>-->
<dubbo.version>2.7.8</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>
Expand All @@ -51,10 +49,18 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-bom</artifactId>
<version>${dubbo.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Apache Jmeter Core -->
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
Expand Down Expand Up @@ -85,39 +91,70 @@
<artifactId>dubbo</artifactId>
<version>${dubbo.version}</version>
</dependency>
<!-- Zookeeper -->
<!-- configcenter -->
<!-- apollo -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-apollo</artifactId>
</dependency>
<!-- zookeeper -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
</dependency>
<!-- nacos -->
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
</dependency>
<dependency>
<groupId>de.ruedigermoeller</groupId>
<artifactId>fst</artifactId>
</dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-nacos</artifactId>
</dependency>
<!-- registry -->
<!-- nacos -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-nacos</artifactId>
<version>${dubbo.version}</version>
</dependency>
<!-- zookeeper -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-zookeeper</artifactId>
</dependency>
<!-- redis -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-redis</artifactId>
</dependency>
<!-- serialization -->
<!-- hessian2 -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization-hessian2</artifactId>
</dependency>
<!-- FST -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization-fst</artifactId>
</dependency>
<!-- kryo -->
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-api</artifactId>
<version>${nacos.version}</version>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization-kryo</artifactId>
</dependency>
<!-- fastjson -->
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-client</artifactId>
<version>${nacos.version}</version>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization-fastjson</artifactId>
</dependency>
<!-- gson -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization-gson</artifactId>
</dependency>
<!-- avro -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization-avro</artifactId>
</dependency>
<!-- Log -->
<!-- slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -128,10 +165,6 @@
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down Expand Up @@ -176,7 +209,7 @@
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
<excludeTransitive>true</excludeTransitive>
<excludeTransitive>false</excludeTransitive>
</configuration>
</execution>
</executions>
Expand Down
9 changes: 1 addition & 8 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 @@ -24,7 +24,6 @@
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ConfigCenterConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.ReferenceConfigBase;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.utils.ReferenceConfigCache;
import org.apache.dubbo.rpc.RpcContext;
Expand Down Expand Up @@ -270,13 +269,7 @@ private Object callDubbo(SampleResult res) {
}

// The registry's address is to generate the ReferenceConfigCache key
ReferenceConfigCache cache = ReferenceConfigCache.getCache(Constants.getAddress(this), new ReferenceConfigCache.KeyGenerator() {

@Override
public String generateKey(ReferenceConfigBase<?> referenceConfig) {
return referenceConfig.toString();
}
});
ReferenceConfigCache cache = ReferenceConfigCache.getCache(Constants.getAddress(this));
GenericService genericService = (GenericService) cache.get(reference);
if (genericService == null) {
setResponseError(res, ErrorCode.GENERIC_SERVICE_IS_NULL);
Expand Down
9 changes: 1 addition & 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 @@ -20,7 +20,6 @@
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.ReferenceConfigBase;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.utils.ReferenceConfigCache;
import org.apache.dubbo.registry.RegistryService;
Expand Down Expand Up @@ -103,13 +102,7 @@ private List<String> executeRegistry(String protocol, String address, String gro
}
reference.setInterface("org.apache.dubbo.registry.RegistryService");
try {
ReferenceConfigCache cache = ReferenceConfigCache.getCache(address + "_" + group, new ReferenceConfigCache.KeyGenerator() {

@Override
public String generateKey(ReferenceConfigBase<?> referenceConfig) {
return referenceConfig.toString();
}
});
ReferenceConfigCache cache = ReferenceConfigCache.getCache(address + "_" + group);
RegistryService registryService = (RegistryService) cache.get(reference);
if (registryService == null) {
throw new RuntimeException("Can't get the interface list, please check if the address is wrong!");
Expand Down
6 changes: 1 addition & 5 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 @@ -27,11 +27,7 @@
import org.apache.dubbo.registry.NotifyListener;

import java.io.Serializable;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

Expand Down
Loading