Revert "add startup conditions"

This reverts commit 4e2c85d
huangkemingyyds · Nov 1, 2023 · 4225891 · 4225891
1 parent fb70370
commit 4225891
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 32 deletions.
diff --git a/.../java/com/alibaba/nacos/core/remote/grpc/negotiator/tls/DefaultTlsContextBuilderTest.java b/.../java/com/alibaba/nacos/core/remote/grpc/negotiator/tls/DefaultTlsContextBuilderTest.java
@@ -18,23 +18,14 @@
 
 import com.alibaba.nacos.api.exception.runtime.NacosRuntimeException;
 import com.alibaba.nacos.core.remote.tls.RpcServerTlsConfig;
-import com.alibaba.nacos.sys.env.EnvUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.mock.env.MockEnvironment;
-
-import java.lang.reflect.Field;
 
 public class DefaultTlsContextBuilderTest {
 
-    private ConfigurableEnvironment environment;
-
     @Before
     public void setUp() throws Exception {
-        environment = new MockEnvironment();
-        EnvUtil.setEnvironment(environment);
         RpcServerTlsConfig.getInstance().setEnableTls(true);
     }
 
@@ -49,7 +40,6 @@ public void tearDown() throws Exception {
         RpcServerTlsConfig.getInstance().setProtocols(null);
         RpcServerTlsConfig.getInstance().setTrustCollectionCertFile(null);
         RpcServerTlsConfig.getInstance().setSslProvider("");
-        clearRpcServerTlsConfigInstance();
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -111,10 +101,4 @@ public void testGetSslContextForNonExistFile() {
         grpcServerConfig.setCertChainFile("non-exist-cert.pem");
         DefaultTlsContextBuilder.getSslContext(RpcServerTlsConfig.getInstance());
     }
-
-    private static void clearRpcServerTlsConfigInstance() throws Exception {
-        Field instanceField = RpcServerTlsConfig.class.getDeclaredField("instance");
-        instanceField.setAccessible(true);
-        instanceField.set(null, null);
-    }
 }
diff --git a/...libaba/nacos/core/remote/grpc/negotiator/tls/DefaultTlsProtocolNegotiatorBuilderTest.java b/...libaba/nacos/core/remote/grpc/negotiator/tls/DefaultTlsProtocolNegotiatorBuilderTest.java
@@ -17,28 +17,19 @@
 package com.alibaba.nacos.core.remote.grpc.negotiator.tls;
 
 import com.alibaba.nacos.core.remote.tls.RpcServerTlsConfig;
-import com.alibaba.nacos.sys.env.EnvUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.mock.env.MockEnvironment;
-
-import java.lang.reflect.Field;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 public class DefaultTlsProtocolNegotiatorBuilderTest {
 
-    private ConfigurableEnvironment environment;
-
     private DefaultTlsProtocolNegotiatorBuilder builder;
 
     @Before
     public void setUp() throws Exception {
-        environment = new MockEnvironment();
-        EnvUtil.setEnvironment(environment);
         builder = new DefaultTlsProtocolNegotiatorBuilder();
     }
 
@@ -47,7 +38,6 @@ public void tearDown() throws Exception {
         RpcServerTlsConfig.getInstance().setEnableTls(false);
         RpcServerTlsConfig.getInstance().setCertChainFile(null);
         RpcServerTlsConfig.getInstance().setCertPrivateKey(null);
-        clearRpcServerTlsConfigInstance();
     }
 
     @Test
@@ -62,10 +52,4 @@ public void testBuildEnabled() {
         RpcServerTlsConfig.getInstance().setCertChainFile("test-server-cert.pem");
         assertNotNull(builder.build());
     }
-
-    private static void clearRpcServerTlsConfigInstance() throws Exception {
-        Field instanceField = RpcServerTlsConfig.class.getDeclaredField("instance");
-        instanceField.setAccessible(true);
-        instanceField.set(null, null);
-    }
 }