[ISSUE alibaba#11456]Remove supportCommunicationTypes.

stone-98 · Dec 24, 2023 · 0eb0159 · 0eb0159
1 parent 57f9d40
commit 0eb0159
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 49 deletions.
diff --git a/...rc/main/java/com/alibaba/nacos/core/remote/grpc/negotiator/ProtocolNegotiatorBuilder.java b/...rc/main/java/com/alibaba/nacos/core/remote/grpc/negotiator/ProtocolNegotiatorBuilder.java
@@ -16,10 +16,6 @@
 
 package com.alibaba.nacos.core.remote.grpc.negotiator;
 
-import com.alibaba.nacos.core.remote.CommunicationType;
-
-import java.util.List;
-
 /**
  * Protocol negotiator builder.
  *
@@ -40,14 +36,4 @@ public interface ProtocolNegotiatorBuilder {
      * @return type
      */
     String type();
-
-    /**
-     * Get a list of supported communication types by the ProtocolNegotiator.
-     *
-     * <p>The communication types represent the different types of communication
-     * scenarios that the ProtocolNegotiator can handle.</p>
-     *
-     * @return List of supported CommunicationType values.
-     */
-    List<CommunicationType> supportCommunicationTypes();
 }
diff --git a/...aba/nacos/core/remote/grpc/negotiator/tls/ClusterDefaultTlsProtocolNegotiatorBuilder.java b/...aba/nacos/core/remote/grpc/negotiator/tls/ClusterDefaultTlsProtocolNegotiatorBuilder.java
@@ -16,19 +16,15 @@
 
 package com.alibaba.nacos.core.remote.grpc.negotiator.tls;
 
-import com.alibaba.nacos.core.remote.CommunicationType;
 import com.alibaba.nacos.core.remote.grpc.negotiator.NacosGrpcProtocolNegotiator;
 import com.alibaba.nacos.core.remote.grpc.negotiator.ProtocolNegotiatorBuilder;
 import com.alibaba.nacos.core.remote.tls.RpcClusterServerTlsConfig;
 import com.alibaba.nacos.core.remote.tls.RpcServerTlsConfig;
 import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
- * The {@code ClusterDefaultTlsProtocolNegotiatorBuilder} class is an implementation of the
- * {@link ProtocolNegotiatorBuilder} interface for constructing a ProtocolNegotiator specifically for cluster-to-cluster
+ * The {@code ClusterDefaultTlsProtocolNegotiatorBuilder} class is an implementation of the {@link
+ * ProtocolNegotiatorBuilder} interface for constructing a ProtocolNegotiator specifically for cluster-to-cluster
  * communication with TLS encryption.
  *
  * <p>It defines the type as {@code CLUSTER_DEFAULT_TLS} and supports communication types for clusters.
@@ -44,10 +40,6 @@
  * builder.
  * </p>
  *
- * <p>The {@code supportCommunicationTypes()} method returns a list containing the supported communication type
- * {@link CommunicationType#CLUSTER} for cluster communication.
- * </p>
- *
  * <p>Example Usage:
  * <pre>{@code
  * ProtocolNegotiatorBuilder builder = new ClusterDefaultTlsProtocolNegotiatorBuilder();
@@ -93,16 +85,5 @@ public NacosGrpcProtocolNegotiator build() {
     public String type() {
         return CLUSTER_TYPE_DEFAULT_TLS;
     }
-
-    /**
-     * Returns a list containing the supported communication type {@link CommunicationType#CLUSTER} for cluster
-     * communication.
-     *
-     * @return List of supported communication types.
-     */
-    @Override
-    public List<CommunicationType> supportCommunicationTypes() {
-        return Collections.singletonList(CommunicationType.CLUSTER);
-    }
 }
 
diff --git a/...java/com/alibaba/nacos/core/remote/grpc/negotiator/tls/OptionalTlsProtocolNegotiator.java b/...java/com/alibaba/nacos/core/remote/grpc/negotiator/tls/OptionalTlsProtocolNegotiator.java
@@ -47,7 +47,7 @@ public class OptionalTlsProtocolNegotiator implements NacosGrpcProtocolNegotiato
 
     private SslContext sslContext;
 
-    public OptionalTlsProtocolNegotiator(SslContext sslContext,RpcServerTlsConfig config) {
+    public OptionalTlsProtocolNegotiator(SslContext sslContext, RpcServerTlsConfig config) {
         this.sslContext = sslContext;
         this.config = config;
         this.supportPlainText = config.getCompatibility();
@@ -82,20 +82,19 @@ public void reloadNegotiator() {
     }
 
     private ProtocolNegotiationEvent getDefPne() {
-        ProtocolNegotiationEvent protocolNegotiationEvent = null;
         try {
             Field aDefault = ProtocolNegotiationEvent.class.getDeclaredField("DEFAULT");
             aDefault.setAccessible(true);
-            return (ProtocolNegotiationEvent) aDefault.get(protocolNegotiationEvent);
+            return (ProtocolNegotiationEvent) aDefault.get(null);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return protocolNegotiationEvent;
+        return null;
     }
 
     public class PortUnificationServerHandler extends ByteToMessageDecoder {
 
-        private ProtocolNegotiationEvent pne;
+        private final ProtocolNegotiationEvent pne;
 
         private final ChannelHandler ssl;
 

diff --git a/...alibaba/nacos/core/remote/grpc/negotiator/tls/SdkDefaultTlsProtocolNegotiatorBuilder.java b/...alibaba/nacos/core/remote/grpc/negotiator/tls/SdkDefaultTlsProtocolNegotiatorBuilder.java
@@ -16,16 +16,12 @@
 
 package com.alibaba.nacos.core.remote.grpc.negotiator.tls;
 
-import com.alibaba.nacos.core.remote.CommunicationType;
 import com.alibaba.nacos.core.remote.grpc.negotiator.NacosGrpcProtocolNegotiator;
 import com.alibaba.nacos.core.remote.grpc.negotiator.ProtocolNegotiatorBuilder;
 import com.alibaba.nacos.core.remote.tls.RpcSdkServerTlsConfig;
 import com.alibaba.nacos.core.remote.tls.RpcServerTlsConfig;
 import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  * Default optional tls protocol negotiator builder.
  *
@@ -49,9 +45,4 @@ public NacosGrpcProtocolNegotiator build() {
     public String type() {
         return SDK_TYPE_DEFAULT_TLS;
     }
-
-    @Override
-    public List<CommunicationType> supportCommunicationTypes() {
-        return Collections.singletonList(CommunicationType.SDK);
-    }
 }