This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.3-dev-xds
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3-dev-xds by this push:
new 14efe3527b delete XdsRawResourceListener.java
14efe3527b is described below
commit 14efe3527b47246085bb34009eaf18d1969d9e40
Author: chickenlj <[email protected]>
AuthorDate: Mon Sep 2 17:32:44 2024 +0800
delete XdsRawResourceListener.java
---
.../java/org/apache/dubbo/xds/AdsObserver.java | 14 ++++++-------
.../java/org/apache/dubbo/xds/PilotExchanger.java | 1 +
.../apache/dubbo/xds/XdsRawResourceListener.java | 23 ----------------------
.../apache/dubbo/xds/XdsRawResourceProtocol.java | 4 ++--
.../apache/dubbo/xds/directory/XdsDirectory.java | 1 -
.../xds/{ => directory}/XdsResourceListener.java | 2 +-
6 files changed, 11 insertions(+), 34 deletions(-)
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/xds/AdsObserver.java
b/dubbo-xds/src/main/java/org/apache/dubbo/xds/AdsObserver.java
index f4758e78df..fc76fa12f7 100644
--- a/dubbo-xds/src/main/java/org/apache/dubbo/xds/AdsObserver.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/xds/AdsObserver.java
@@ -54,7 +54,7 @@ public class AdsObserver {
private final Node node;
private volatile XdsChannel xdsChannel;
- private final Map<XdsResourceType<?>, ConcurrentMap<String,
XdsRawResourceListener>> rawResourceListeners =
+ private final Map<XdsResourceType<?>, ConcurrentMap<String,
XdsRawResourceProtocol>> rawResourceListeners =
new ConcurrentHashMap<>();
protected StreamObserver<DiscoveryRequest> requestObserver;
@@ -81,7 +81,7 @@ public class AdsObserver {
@SuppressWarnings("unchecked")
public <T extends ResourceUpdate> XdsRawResourceProtocol<T> addListener(
String resourceName, XdsResourceType<T> clusterResourceType) {
- ConcurrentMap<String, XdsRawResourceListener> resourceListeners =
+ ConcurrentMap<String, XdsRawResourceProtocol> resourceListeners =
rawResourceListeners.computeIfAbsent(clusterResourceType, k ->
new ConcurrentHashMap<>());
return (XdsRawResourceProtocol<T>) resourceListeners.computeIfAbsent(
resourceName,
@@ -93,10 +93,10 @@ public class AdsObserver {
}
public Set<String> getResourcesToObserve(XdsResourceType<?> resourceType) {
- Map<String, XdsRawResourceListener> listenerMap =
+ Map<String, XdsRawResourceProtocol> listenerMap =
rawResourceListeners.getOrDefault(resourceType, new
ConcurrentHashMap<>());
Set<String> resourceNames = new HashSet<>();
- for (Map.Entry<String, XdsRawResourceListener> entry :
listenerMap.entrySet()) {
+ for (Map.Entry<String, XdsRawResourceProtocol> entry :
listenerMap.entrySet()) {
resourceNames.add(entry.getKey());
}
return resourceNames;
@@ -115,11 +115,11 @@ public class AdsObserver {
.collect(Collectors.toConcurrentMap(
Entry::getKey, e -> e.getValue().getResourceUpdate()));
- Map<String, XdsRawResourceListener> resourceListenerMap =
+ Map<String, XdsRawResourceProtocol> resourceListenerMap =
rawResourceListeners.getOrDefault(resourceTypeInstance, new
ConcurrentHashMap<>());
- for (Map.Entry<String, XdsRawResourceListener> entry :
resourceListenerMap.entrySet()) {
+ for (Map.Entry<String, XdsRawResourceProtocol> entry :
resourceListenerMap.entrySet()) {
String resourceName = entry.getKey();
- XdsRawResourceListener rawResourceListener = entry.getValue();
+ XdsRawResourceProtocol rawResourceListener = entry.getValue();
if (parsedResources.containsKey(resourceName)) {
rawResourceListener.onResourceUpdate(parsedResources.get(resourceName));
}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/xds/PilotExchanger.java
b/dubbo-xds/src/main/java/org/apache/dubbo/xds/PilotExchanger.java
index ad341f0d25..e66738ba8d 100644
--- a/dubbo-xds/src/main/java/org/apache/dubbo/xds/PilotExchanger.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/xds/PilotExchanger.java
@@ -20,6 +20,7 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.xds.directory.XdsDirectory;
+import org.apache.dubbo.xds.directory.XdsResourceListener;
import org.apache.dubbo.xds.resource.XdsResourceType;
import org.apache.dubbo.xds.resource.update.ResourceUpdate;
diff --git
a/dubbo-xds/src/main/java/org/apache/dubbo/xds/XdsRawResourceListener.java
b/dubbo-xds/src/main/java/org/apache/dubbo/xds/XdsRawResourceListener.java
deleted file mode 100644
index 95549f0efa..0000000000
--- a/dubbo-xds/src/main/java/org/apache/dubbo/xds/XdsRawResourceListener.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dubbo.xds;
-
-import org.apache.dubbo.xds.resource.update.ResourceUpdate;
-
-public interface XdsRawResourceListener<T extends ResourceUpdate> {
- void onResourceUpdate(T resourceUpdate);
-}
diff --git
a/dubbo-xds/src/main/java/org/apache/dubbo/xds/XdsRawResourceProtocol.java
b/dubbo-xds/src/main/java/org/apache/dubbo/xds/XdsRawResourceProtocol.java
index 7cd7bbb47f..d7c926d419 100644
--- a/dubbo-xds/src/main/java/org/apache/dubbo/xds/XdsRawResourceProtocol.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/xds/XdsRawResourceProtocol.java
@@ -19,6 +19,7 @@ package org.apache.dubbo.xds;
import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.xds.directory.XdsResourceListener;
import org.apache.dubbo.xds.resource.XdsResourceType;
import org.apache.dubbo.xds.resource.update.ResourceUpdate;
@@ -35,7 +36,7 @@ import java.util.stream.Collectors;
import io.envoyproxy.envoy.config.core.v3.Node;
-public class XdsRawResourceProtocol<T extends ResourceUpdate> implements
XdsRawResourceListener<T> {
+public class XdsRawResourceProtocol<T extends ResourceUpdate> {
private static final ErrorTypeAwareLogger logger =
LoggerFactory.getErrorTypeAwareLogger(XdsRawResourceProtocol.class);
@@ -118,7 +119,6 @@ public class XdsRawResourceProtocol<T extends
ResourceUpdate> implements XdsRawR
}
}
- @Override
public void onResourceUpdate(T resourceUpdate) {
if (resourceUpdate == null) {
return;
diff --git
a/dubbo-xds/src/main/java/org/apache/dubbo/xds/directory/XdsDirectory.java
b/dubbo-xds/src/main/java/org/apache/dubbo/xds/directory/XdsDirectory.java
index 441b8080db..8ed38b5814 100644
--- a/dubbo-xds/src/main/java/org/apache/dubbo/xds/directory/XdsDirectory.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/xds/directory/XdsDirectory.java
@@ -29,7 +29,6 @@ import org.apache.dubbo.rpc.cluster.SingleRouterChain;
import org.apache.dubbo.rpc.cluster.directory.AbstractDirectory;
import org.apache.dubbo.rpc.cluster.router.state.BitList;
import org.apache.dubbo.xds.PilotExchanger;
-import org.apache.dubbo.xds.XdsResourceListener;
import
org.apache.dubbo.xds.directory.XdsDirectory.LdsUpdateWatcher.RdsUpdateWatcher;
import org.apache.dubbo.xds.resource.XdsClusterResource;
import org.apache.dubbo.xds.resource.XdsListenerResource;
diff --git
a/dubbo-xds/src/main/java/org/apache/dubbo/xds/XdsResourceListener.java
b/dubbo-xds/src/main/java/org/apache/dubbo/xds/directory/XdsResourceListener.java
similarity index 95%
rename from
dubbo-xds/src/main/java/org/apache/dubbo/xds/XdsResourceListener.java
rename to
dubbo-xds/src/main/java/org/apache/dubbo/xds/directory/XdsResourceListener.java
index 5dd7aa0123..2c202952b4 100644
--- a/dubbo-xds/src/main/java/org/apache/dubbo/xds/XdsResourceListener.java
+++
b/dubbo-xds/src/main/java/org/apache/dubbo/xds/directory/XdsResourceListener.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.xds;
+package org.apache.dubbo.xds.directory;
public interface XdsResourceListener<T> {
void onResourceUpdate(T resource);
