Provider Interface Support SPI & Optimize ProviderManager SPI (#4218

) * Provider & ProviderManager support spi * add default implementation for method `com.ctrip.framework.foundation.spi.ProviderManager.getOrder` * rollback * rollback * update CHANGES.md * Update CHANGES.md Co-authored-by: Jason Song <[email protected]>
apolloconfig · Jan 29, 2022 · e3448dd · e3448dd
1 parent ced8ad9
commit e3448dd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -40,6 +40,7 @@ Apollo 2.0.0
 * [Make password check not hardcoded](https://github.com/apolloconfig/apollo/pull/4207)
 * [Fix update user's password failure](https://github.com/apolloconfig/apollo/pull/4212)
 * [Fix bug: associated namespace display incorrect in text view](https://github.com/apolloconfig/apollo/pull/4219)
+* [Add Ordered interface to ProviderManager SPI](https://github.com/apolloconfig/apollo/pull/4218)
 
 ------------------
 All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)
diff --git a/apollo-core/src/main/java/com/ctrip/framework/foundation/Foundation.java b/apollo-core/src/main/java/com/ctrip/framework/foundation/Foundation.java
@@ -26,8 +26,9 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class Foundation {
+
   private static final Logger logger = LoggerFactory.getLogger(Foundation.class);
-  private static Object lock = new Object();
+  private static final Object LOCK = new Object();
 
   private static volatile ProviderManager s_manager;
 
@@ -40,9 +41,9 @@ private static ProviderManager getManager() {
     try {
       if (s_manager == null) {
         // Double locking to make sure only one thread initializes ProviderManager.
-        synchronized (lock) {
+        synchronized (LOCK) {
           if (s_manager == null) {
-            s_manager = ServiceBootstrap.loadFirst(ProviderManager.class);
+            s_manager = ServiceBootstrap.loadPrimary(ProviderManager.class);
           }
         }
       }

diff --git a/...in/java/com/ctrip/framework/foundation/internals/provider/DefaultApplicationProvider.java b/...in/java/com/ctrip/framework/foundation/internals/provider/DefaultApplicationProvider.java
@@ -173,7 +173,7 @@ private void initAppLabel() {
       return;
     }
 
-    m_appLabel=null;
+    m_appLabel = null;
     logger.warn("app.label is not available from System Property and {}. It is set to null",
         APP_PROPERTIES_CLASSPATH);
   }

diff --git a/apollo-core/src/main/java/com/ctrip/framework/foundation/spi/ProviderManager.java b/apollo-core/src/main/java/com/ctrip/framework/foundation/spi/ProviderManager.java
@@ -16,10 +16,17 @@
  */
 package com.ctrip.framework.foundation.spi;
 
+import com.ctrip.framework.apollo.core.spi.Ordered;
 import com.ctrip.framework.foundation.spi.provider.Provider;
 
-public interface ProviderManager {
+public interface ProviderManager extends Ordered {
+
   String getProperty(String name, String defaultValue);
 
   <T extends Provider> T provider(Class<T> clazz);
+
+  @Override
+  default int getOrder() {
+    return Ordered.LOWEST_PRECEDENCE;
+  }
 }