Change the property name prefixes

microsphere-projects · Jan 16, 2025 · ae858d3 · ae858d3
1 parent 5b8d97b
commit ae858d3
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/...main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/EnableFeignAutoRefresh.java b/...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/...rc/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/AutoRefreshCapability.java b/...rc/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/...crosphere/spring/cloud/openfeign/autorefresh/FeignClientConfigurationChangedListener.java b/...crosphere/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/...t.autoconfigure.AutoConfiguration.imports → ...t.autoconfigure.AutoConfiguration.imports b/...t.autoconfigure.AutoConfiguration.imports → ...t.autoconfigure.AutoConfiguration.imports
diff --git a/...feign/src/test/java/io/microsphere/spring/cloud/openfeign/encoder/EncoderChangedTest.java b/...feign/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/...test/java/io/microsphere/spring/cloud/openfeign/errordecoder/ErrorDecoderChangedTest.java b/...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/...ava/io/microsphere/spring/cloud/openfeign/querymapencoder/QueryMapEncoderChangedTest.java b/...ava/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/requestInterceptor/RequestInterceptorChangedTest.java b/.../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/...feign/src/test/java/io/microsphere/spring/cloud/openfeign/retryer/RetryerChangedTest.java b/...feign/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