fix conflicts and optimize cloud refresher

dromara · Dec 16, 2023 · 1f803cd · 1f803cd
1 parent 633d9ca
commit 1f803cd
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 26 deletions.
diff --git a/...pc/src/main/java/org/dromara/dynamictp/apapter/brpc/server/StarlightServerDtpAdapter.java b/...pc/src/main/java/org/dromara/dynamictp/apapter/brpc/server/StarlightServerDtpAdapter.java
@@ -67,9 +67,10 @@ protected void initialize() {
         super.initialize();
 
         val bean = JVMTI.getInstance(StarlightServer.class);
-        if (!(bean instanceof DefaultStarlightServer starlightServer)) {
+        if (!(bean instanceof DefaultStarlightServer)) {
             return;
         }
+        val starlightServer = (DefaultStarlightServer) bean;
         val uri = (URI) ReflectionUtil.getFieldValue(DefaultStarlightServer.class, URI_FIELD, starlightServer);
         val serverPeer = (ServerPeer) ReflectionUtil.getFieldValue(DefaultStarlightServer.class,
                 SERVER_PEER_FIELD, starlightServer);

diff --git a/...adapter-common/src/main/java/org/dromara/dynamictp/adapter/common/DtpAdapterListener.java b/...adapter-common/src/main/java/org/dromara/dynamictp/adapter/common/DtpAdapterListener.java
@@ -58,12 +58,12 @@ public boolean supportsEventType(ResolvableType resolvableType) {
     @Override
     public void onApplicationEvent(@NonNull ApplicationEvent event) {
         try {
-            if (event instanceof RefreshEvent refreshEvent) {
-                doRefresh(refreshEvent.getDtpProperties());
-            } else if (event instanceof CollectEvent collectEvent) {
-                doCollect(collectEvent.getDtpProperties());
-            } else if (event instanceof AlarmCheckEvent alarmCheckEvent) {
-                doAlarmCheck(alarmCheckEvent.getDtpProperties());
+            if (event instanceof RefreshEvent) {
+                doRefresh(((RefreshEvent) event).getDtpProperties());
+            } else if (event instanceof CollectEvent) {
+                doCollect(((CollectEvent) event).getDtpProperties());
+            } else if (event instanceof AlarmCheckEvent) {
+                doAlarmCheck(((AlarmCheckEvent) event).getDtpProperties());
             }
         } catch (Exception e) {
             log.error("DynamicTp adapter, event handle failed.", e);

diff --git a/adapter/adapter-grpc/src/main/java/org/dromara/dynamictp/adapter/grpc/GrpcDtpAdapter.java b/adapter/adapter-grpc/src/main/java/org/dromara/dynamictp/adapter/grpc/GrpcDtpAdapter.java
@@ -68,19 +68,19 @@ protected void initialize() {
             String key = Optional.ofNullable(internalServer)
                     .map(server -> {
                         final SocketAddress address = server.getListenSocketAddress();
-                        if (address instanceof InetSocketAddress inetSocketAddress) {
-                            return String.valueOf(inetSocketAddress.getPort());
-                        } else if (address instanceof InProcessSocketAddress inProcessSocketAddress) {
-                            return inProcessSocketAddress.getName();
+                        if (address instanceof InetSocketAddress) {
+                            return String.valueOf(((InetSocketAddress) address).getPort());
+                        } else if (address instanceof InProcessSocketAddress) {
+                            return ((InProcessSocketAddress) address).getName();
                         }
                         return null;
                     }).orElse(null);
             if (Objects.isNull(key)) {
                 continue;
             }
             val executor = (Executor) ReflectionUtil.getFieldValue(ServerImpl.class, EXECUTOR_FIELD, serverImpl);
-            if (Objects.nonNull(executor) && executor instanceof ThreadPoolExecutor threadPoolExecutor) {
-                enhanceOriginExecutor(genTpName(key), threadPoolExecutor, EXECUTOR_FIELD, serverImpl);
+            if (Objects.nonNull(executor) && executor instanceof ThreadPoolExecutor) {
+                enhanceOriginExecutor(genTpName(key), (ThreadPoolExecutor) executor, EXECUTOR_FIELD, serverImpl);
             }
         }
     }

diff --git a/...dapter-okhttp3/src/main/java/org/dromara/dynamictp/adapter/okhttp3/Okhttp3DtpAdapter.java b/...dapter-okhttp3/src/main/java/org/dromara/dynamictp/adapter/okhttp3/Okhttp3DtpAdapter.java
@@ -60,8 +60,8 @@ protected void initialize() {
         }
         beans.forEach((k, v) -> {
             val executor = v.dispatcher().executorService();
-            if (executor instanceof ThreadPoolExecutor threadPoolExecutor) {
-                enhanceOriginExecutor(genTpName(k), threadPoolExecutor, EXECUTOR_SERVICE_FIELD, v.dispatcher());
+            if (executor instanceof ThreadPoolExecutor) {
+                enhanceOriginExecutor(genTpName(k), (ThreadPoolExecutor) executor, EXECUTOR_SERVICE_FIELD, v.dispatcher());
             }
         });
     }

diff --git a/adapter/adapter-sofa/src/main/java/org/dromara/dynamictp/adapter/sofa/SofaDtpAdapter.java b/adapter/adapter-sofa/src/main/java/org/dromara/dynamictp/adapter/sofa/SofaDtpAdapter.java
@@ -81,14 +81,16 @@ protected void initialize() {
         servers.forEach(v -> {
             ThreadPoolExecutor executor = null;
             ServerConfig serverConfig = null;
-            if (v instanceof BoltServer boltServer) {
-                executor = boltServer.getBizThreadPool();
+            if (v instanceof BoltServer) {
+                BoltServer server = (BoltServer) v;
+                executor = server.getBizThreadPool();
                 serverConfig = (ServerConfig) ReflectionUtil.getFieldValue(BoltServer.class,
-                        SERVER_CONFIG_FIELD, boltServer);
-            } else if (v instanceof AbstractHttpServer httpServer) {
-                executor = httpServer.getBizThreadPool();
+                        SERVER_CONFIG_FIELD, server);
+            } else if (v instanceof AbstractHttpServer) {
+                AbstractHttpServer server = (AbstractHttpServer) v;
+                executor = server.getBizThreadPool();
                 serverConfig = (ServerConfig) ReflectionUtil.getFieldValue(AbstractHttpServer.class,
-                        SERVER_CONFIG_FIELD, httpServer);
+                        SERVER_CONFIG_FIELD, server);
             }
             if (Objects.isNull(executor) || Objects.isNull(serverConfig)) {
                 return;

diff --git a/.../main/java/org/dromara/dynamictp/starter/cloud/consul/refresher/CloudConsulRefresher.java b/.../main/java/org/dromara/dynamictp/starter/cloud/consul/refresher/CloudConsulRefresher.java
@@ -42,7 +42,7 @@ public boolean supportsEventType(@NonNull Class<? extends ApplicationEvent> even
 
     @Override
     public void onApplicationEvent(@NonNull ApplicationEvent event) {
-        if (event instanceof EnvironmentChangeEvent ece && needRefresh(ece.getKeys())) {
+        if (needRefresh(((EnvironmentChangeEvent) event).getKeys())) {
             refresh(environment);
         }
     }

diff --git a/.../main/java/org/dromara/dynamictp/starter/cloud/huawei/refresher/CloudHuaweiRefresher.java b/.../main/java/org/dromara/dynamictp/starter/cloud/huawei/refresher/CloudHuaweiRefresher.java
@@ -42,7 +42,7 @@ public boolean supportsEventType(@NonNull Class<? extends ApplicationEvent> even
 
     @Override
     public void onApplicationEvent(@NonNull ApplicationEvent event) {
-        if (event instanceof EnvironmentChangeEvent ece && needRefresh(ece.getKeys())) {
+        if (needRefresh(((EnvironmentChangeEvent) event).getKeys())) {
             refresh(environment);
         }
     }

diff --git a/...rc/main/java/org/dromara/dynamictp/starter/cloud/nacos/refresher/CloudNacosRefresher.java b/...rc/main/java/org/dromara/dynamictp/starter/cloud/nacos/refresher/CloudNacosRefresher.java
@@ -45,7 +45,7 @@ public boolean supportsEventType(@NonNull Class<? extends ApplicationEvent> even
 
     @Override
     public void onApplicationEvent(@NonNull ApplicationEvent event) {
-        if (event instanceof EnvironmentChangeEvent ece && needRefresh(ece.getKeys())) {
+        if (needRefresh(((EnvironmentChangeEvent) event).getKeys())) {
             refresh(environment);
         }
     }

diff --git a/...ain/java/org/dromara/dynamictp/starter/cloud/polaris/refresher/CloudPolarisRefresher.java b/...ain/java/org/dromara/dynamictp/starter/cloud/polaris/refresher/CloudPolarisRefresher.java
@@ -45,7 +45,7 @@ public boolean supportsEventType(@NonNull Class<? extends ApplicationEvent> even
 
     @Override
     public void onApplicationEvent(@NonNull ApplicationEvent event) {
-        if (event instanceof EnvironmentChangeEvent ece && needRefresh(ece.getKeys())) {
+        if (needRefresh(((EnvironmentChangeEvent) event).getKeys())) {
             refresh(environment);
         }
     }

diff --git a/...java/org/dromara/dynamictp/starter/cloud/zookeeper/refresher/CloudZookeeperRefresher.java b/...java/org/dromara/dynamictp/starter/cloud/zookeeper/refresher/CloudZookeeperRefresher.java
@@ -42,7 +42,7 @@ public boolean supportsEventType(@NonNull Class<? extends ApplicationEvent> even
 
     @Override
     public void onApplicationEvent(@NonNull ApplicationEvent event) {
-        if (event instanceof EnvironmentChangeEvent ece && needRefresh(ece.getKeys())) {
+        if (needRefresh(((EnvironmentChangeEvent) event).getKeys())) {
             refresh(environment);
         }
     }