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

feat:remove old zookeeper #14028

Merged
merged 13 commits into from
May 15, 2024
Merged

feat:remove old zookeeper #14028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
729e83c
feat:remove old zookeeper (#13960)
Stellar1999 Apr 2, 2024
cb220be
Merge branch '3.3' into feat/remove_old_zookeeper
Stellar1999 Apr 7, 2024
2d2ad85
feat:remove ZookeeperTransporter SPI (#13960)
Stellar1999 Apr 8, 2024
114dad8
feat:merge dubbo-remoting-zookeeper-curator5 and dubbo-remoting-zooke…
Stellar1999 Apr 9, 2024
7fa4b7f
feat:merge dubbo-remoting-zookeeper-curator5 and dubbo-remoting-zooke…
Stellar1999 Apr 11, 2024
6b06312
Merge branch '3.3' into feat/remove_old_zookeeper
Stellar1999 Apr 11, 2024
b7219a9
Merge branch '3.3' into feat/remove_old_zookeeper
Stellar1999 Apr 14, 2024
f3f52ba
Merge branch '3.3' into feat/remove_old_zookeeper
Stellar1999 May 7, 2024
9919bc1
Merge branch '3.3' into feat/remove_old_zookeeper
AlbumenJ May 8, 2024
32740f8
Merge branch '3.3' into feat/remove_old_zookeeper
AlbumenJ May 8, 2024
edd01c8
Merge branch '3.3' into feat/remove_old_zookeeper
AlbumenJ May 8, 2024
fa493fb
Merge remote-tracking branch 'refs/remotes/origin/3.3' into feat/remo…
May 11, 2024
a2989ea
Merge branch 'refs/heads/3.3' into feat/remove_old_zookeeper
Stellar1999 May 14, 2024
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
3 changes: 0 additions & 3 deletions .artifacts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ dubbo-core-spi
dubbo-dependencies
dubbo-dependencies-all
dubbo-dependencies-bom
dubbo-dependencies-zookeeper
dubbo-dependencies-zookeeper-curator5
dubbo-distribution
dubbo-filter-cache
Expand Down Expand Up @@ -78,8 +77,6 @@ dubbo-remoting-api
dubbo-remoting-http12
dubbo-remoting-netty
dubbo-remoting-netty4
dubbo-remoting-zookeeper-api
dubbo-remoting-zookeeper
dubbo-remoting-zookeeper-curator5
dubbo-rpc
dubbo-rpc-api
Expand Down
2 changes: 1 addition & 1 deletion dubbo-compatible/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting-zookeeper</artifactId>
<artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
Expand Down
20 changes: 0 additions & 20 deletions ...o-compatible/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperTransporter.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .../src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.metrics.config.event.ConfigCenterEvent;
import org.apache.dubbo.metrics.event.MetricsEventBus;
import org.apache.dubbo.remoting.zookeeper.DataListener;
import org.apache.dubbo.remoting.zookeeper.EventType;
import org.apache.dubbo.remoting.zookeeper.curator5.DataListener;
import org.apache.dubbo.remoting.zookeeper.curator5.EventType;
import org.apache.dubbo.rpc.model.ApplicationModel;

import java.util.Set;
Expand Down
8 changes: 4 additions & 4 deletions ...n/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.NamedThreadFactory;
import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter;
import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClient;
import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClientManager;
import org.apache.dubbo.rpc.model.ApplicationModel;

import java.util.Collection;
Expand All @@ -51,7 +51,7 @@ public class ZookeeperDynamicConfiguration extends TreePathDynamicConfiguration
private final ApplicationModel applicationModel;

ZookeeperDynamicConfiguration(
URL url, ZookeeperTransporter zookeeperTransporter, ApplicationModel applicationModel) {
URL url, ZookeeperClientManager zookeeperClientManager, ApplicationModel applicationModel) {
super(url);

this.cacheListener = new CacheListener();
Expand All @@ -67,7 +67,7 @@ public class ZookeeperDynamicConfiguration extends TreePathDynamicConfiguration
new NamedThreadFactory(threadName, true),
new AbortPolicyWithReport(threadName, url));

zkClient = zookeeperTransporter.connect(url);
zkClient = zookeeperClientManager.connect(url);
boolean isConnected = zkClient.isConnected();
if (!isConnected) {

Expand Down
8 changes: 4 additions & 4 deletions ...org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.config.configcenter.AbstractDynamicConfigurationFactory;
import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter;
import org.apache.dubbo.remoting.zookeeper.curator5.ZookeeperClientManager;
import org.apache.dubbo.rpc.model.ApplicationModel;

public class ZookeeperDynamicConfigurationFactory extends AbstractDynamicConfigurationFactory {

private final ZookeeperTransporter zookeeperTransporter;
private final ZookeeperClientManager zookeeperClientManager;

private final ApplicationModel applicationModel;

public ZookeeperDynamicConfigurationFactory(ApplicationModel applicationModel) {
this.applicationModel = applicationModel;
this.zookeeperTransporter = ZookeeperTransporter.getExtension(applicationModel);
this.zookeeperClientManager = ZookeeperClientManager.getInstance(applicationModel);
}

@Override
protected DynamicConfiguration createDynamicConfiguration(URL url) {
return new ZookeeperDynamicConfiguration(url, zookeeperTransporter, applicationModel);
return new ZookeeperDynamicConfiguration(url, zookeeperClientManager, applicationModel);
}
}
212 changes: 0 additions & 212 deletions dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dubbo-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<artifactId>dubbo-dependencies</artifactId>
<packaging>pom</packaging>
<modules>
<module>dubbo-dependencies-zookeeper</module>
<module>dubbo-dependencies-zookeeper-curator5</module>
</modules>

Expand Down
11 changes: 0 additions & 11 deletions dubbo-distribution/dubbo-all-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,6 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting-zookeeper</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
Expand Down Expand Up @@ -495,7 +488,6 @@
<include>org.apache.dubbo:dubbo-remoting-http</include>
<include>org.apache.dubbo:dubbo-remoting-netty4</include>
<include>org.apache.dubbo:dubbo-remoting-netty</include>
<include>org.apache.dubbo:dubbo-remoting-zookeeper</include>
<include>org.apache.dubbo:dubbo-remoting-zookeeper-curator5</include>
<include>org.apache.dubbo:dubbo-rpc-api</include>
<include>org.apache.dubbo:dubbo-rpc-dubbo</include>
Expand Down Expand Up @@ -733,9 +725,6 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.ExporterListener</resource>
</transformer>
Expand Down
Loading
Loading