From ae858d3741c6688ff38a9ff241af1f615493b822 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 16 Jan 2025 20:57:59 +0800
Subject: [PATCH] Change the property name prefixes

---
 .../cloud/openfeign/autoconfigure/EnableFeignAutoRefresh.java  | 2 ++
 .../cloud/openfeign/autorefresh/AutoRefreshCapability.java     | 2 +-
 .../autorefresh/FeignClientConfigurationChangedListener.java   | 3 +--
 ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 0
 .../spring/cloud/openfeign/encoder/EncoderChangedTest.java     | 2 +-
 .../cloud/openfeign/errordecoder/ErrorDecoderChangedTest.java  | 2 +-
 .../openfeign/querymapencoder/QueryMapEncoderChangedTest.java  | 2 +-
 .../requestInterceptor/RequestInterceptorChangedTest.java      | 2 +-
 .../spring/cloud/openfeign/retryer/RetryerChangedTest.java     | 2 +-
 9 files changed, 9 insertions(+), 8 deletions(-)
 rename microsphere-spring-cloud-openfeign/src/main/resources/META-INF/{ => spring}/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)

diff --git a/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/EnableFeignAutoRefresh.java b/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/EnableFeignAutoRefresh.java
index 7433fb0..da5ab51 100644
--- a/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/EnableFeignAutoRefresh.java
+++ b/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/EnableFeignAutoRefresh.java
@@ -4,6 +4,7 @@
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -19,6 +20,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 @Documented
+@Inherited
 @Import(EnableFeignAutoRefresh.Marker.class)
 public @interface EnableFeignAutoRefresh {
 
diff --git a/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/AutoRefreshCapability.java b/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/AutoRefreshCapability.java
index 599ea4d..495ee28 100644
--- a/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/AutoRefreshCapability.java
+++ b/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/AutoRefreshCapability.java
@@ -33,7 +33,7 @@ public class AutoRefreshCapability implements Capability, ApplicationContextAwar
 
     private String contextId;
 
-    private static final String CONTEXT_ID_PROPERTY_NAME = "feign.client.name";
+    private static final String CONTEXT_ID_PROPERTY_NAME = "spring.cloud.openfeign.client.name";
 
     public AutoRefreshCapability(FeignClientProperties clientProperties, FeignClientFactory feignClientFactory, FeignComponentRegistry componentRegistry) {
         this.clientProperties = clientProperties;
diff --git a/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/FeignClientConfigurationChangedListener.java b/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/FeignClientConfigurationChangedListener.java
index c4cede8..b685826 100644
--- a/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/FeignClientConfigurationChangedListener.java
+++ b/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/FeignClientConfigurationChangedListener.java
@@ -19,13 +19,12 @@ public FeignClientConfigurationChangedListener(FeignComponentRegistry registry)
         this.registry = registry;
     }
 
-    private final String PREFIX = "feign.client.config.";
+    private final String PREFIX = "spring.cloud.openfeign.client.config.";
 
     @Override
     public void onApplicationEvent(EnvironmentChangeEvent event) {
         Map<String, Set<String>> effectiveClients = resolveChangedClient(event);
         effectiveClients.forEach(registry::refresh);
-
     }
 
     protected Map<String, Set<String>> resolveChangedClient(EnvironmentChangeEvent event) {
diff --git a/microsphere-spring-cloud-openfeign/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/microsphere-spring-cloud-openfeign/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from microsphere-spring-cloud-openfeign/src/main/resources/META-INF/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to microsphere-spring-cloud-openfeign/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/encoder/EncoderChangedTest.java b/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/encoder/EncoderChangedTest.java
index 938ea9f..7989641 100644
--- a/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/encoder/EncoderChangedTest.java
+++ b/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/encoder/EncoderChangedTest.java
@@ -15,7 +15,7 @@ public class EncoderChangedTest extends BaseTest<Encoder> {
 
     @Override
     protected String afterTestComponentConfigKey() {
-        return "feign.client.config.my-client.encoder";
+        return "spring.cloud.openfeign.client.config.my-client.encoder";
     }
 
     @Override
diff --git a/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/errordecoder/ErrorDecoderChangedTest.java b/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/errordecoder/ErrorDecoderChangedTest.java
index e431c1f..79a2e1b 100644
--- a/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/errordecoder/ErrorDecoderChangedTest.java
+++ b/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/errordecoder/ErrorDecoderChangedTest.java
@@ -15,7 +15,7 @@ public class ErrorDecoderChangedTest extends BaseTest<ErrorDecoder> {
 
     @Override
     protected String afterTestComponentConfigKey() {
-        return "feign.client.config.my-client.error-decoder";
+        return "spring.cloud.openfeign.client.config.my-client.error-decoder";
     }
 
     @Override
diff --git a/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/querymapencoder/QueryMapEncoderChangedTest.java b/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/querymapencoder/QueryMapEncoderChangedTest.java
index 69928a6..14f9ba8 100644
--- a/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/querymapencoder/QueryMapEncoderChangedTest.java
+++ b/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/querymapencoder/QueryMapEncoderChangedTest.java
@@ -15,7 +15,7 @@ public class QueryMapEncoderChangedTest extends BaseTest<QueryMapEncoder> {
 
     @Override
     protected String afterTestComponentConfigKey() {
-        return "feign.client.config.my-client.query-map-encoder";
+        return "spring.cloud.openfeign.client.config.my-client.query-map-encoder";
     }
 
     @Override
diff --git a/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/requestInterceptor/RequestInterceptorChangedTest.java b/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/requestInterceptor/RequestInterceptorChangedTest.java
index 870b94a..0b47980 100644
--- a/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/requestInterceptor/RequestInterceptorChangedTest.java
+++ b/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/requestInterceptor/RequestInterceptorChangedTest.java
@@ -18,7 +18,7 @@ public class RequestInterceptorChangedTest extends BaseTest<RequestInterceptor>
 
     @Override
     protected String afterTestComponentConfigKey() {
-        return "feign.client.config.my-client.request-interceptors[0]";
+        return "spring.cloud.openfeign.client.config.my-client.request-interceptors[0]";
     }
 
     @Override
diff --git a/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/retryer/RetryerChangedTest.java b/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/retryer/RetryerChangedTest.java
index 5c66d25..5139dfc 100644
--- a/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/retryer/RetryerChangedTest.java
+++ b/microsphere-spring-cloud-openfeign/src/test/java/io/microsphere/spring/cloud/openfeign/retryer/RetryerChangedTest.java
@@ -15,7 +15,7 @@ public class RetryerChangedTest extends BaseTest<Retryer> {
 
     @Override
     protected String afterTestComponentConfigKey() {
-        return "feign.client.config.my-client.retryer";
+        return "spring.cloud.openfeign.client.config.my-client.retryer";
     }
 
     @Override