Provider Interface Support SPI & Optimize ProviderManager SPI

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);
           }
         }
       }

apollo-core/src/main/java/com/ctrip/framework/foundation/internals/DefaultProviderManager.java

@@ -16,35 +16,36 @@
  */
 package com.ctrip.framework.foundation.internals;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import com.ctrip.framework.foundation.internals.provider.DefaultApplicationProvider;
-import com.ctrip.framework.foundation.internals.provider.DefaultNetworkProvider;
-import com.ctrip.framework.foundation.internals.provider.DefaultServerProvider;
+import com.ctrip.framework.apollo.core.spi.Ordered;
 import com.ctrip.framework.foundation.spi.ProviderManager;
+import com.ctrip.framework.foundation.spi.provider.ApplicationProvider;
+import com.ctrip.framework.foundation.spi.provider.NetworkProvider;
 import com.ctrip.framework.foundation.spi.provider.Provider;
+import com.ctrip.framework.foundation.spi.provider.ServerProvider;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DefaultProviderManager implements ProviderManager {
+
   private static final Logger logger = LoggerFactory.getLogger(DefaultProviderManager.class);
   private Map<Class<? extends Provider>, Provider> m_providers = new LinkedHashMap<>();
 
   public DefaultProviderManager() {
     // Load per-application configuration, like app id, from classpath://META-INF/app.properties
-    Provider applicationProvider = new DefaultApplicationProvider();
+    Provider applicationProvider = ServiceBootstrap.loadPrimary(ApplicationProvider.class);
     applicationProvider.initialize();
     register(applicationProvider);
 
     // Load network parameters
-    Provider networkProvider = new DefaultNetworkProvider();
+    Provider networkProvider = ServiceBootstrap.loadPrimary(NetworkProvider.class);
     networkProvider.initialize();
     register(networkProvider);
 
     // Load environment (fat, fws, uat, prod ...) and dc, from /opt/settings/server.properties, JVM property and/or OS
     // environment variables.
-    Provider serverProvider = new DefaultServerProvider();
+    Provider serverProvider = ServiceBootstrap.loadPrimary(ServerProvider.class);
     serverProvider.initialize();
     register(serverProvider);
   }
@@ -79,6 +80,11 @@ public String getProperty(String name, String defaultValue) {
     return defaultValue;
   }
 
+  @Override
+  public int getOrder() {
+    return Ordered.LOWEST_PRECEDENCE;
+  }
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder(512);

apollo-core/src/main/java/com/ctrip/framework/foundation/internals/NullProviderManager.java

@@ -16,10 +16,12 @@
  */
 package com.ctrip.framework.foundation.internals;
 
+import com.ctrip.framework.apollo.core.spi.Ordered;
 import com.ctrip.framework.foundation.internals.provider.NullProvider;
 import com.ctrip.framework.foundation.spi.ProviderManager;
 
 public class NullProviderManager implements ProviderManager {
+
   public static final NullProvider provider = new NullProvider();
 
   @Override
@@ -32,6 +34,11 @@ public NullProvider provider(Class clazz) {
     return provider;
   }
 
+  @Override
+  public int getOrder() {
+    return Ordered.LOWEST_PRECEDENCE;
+  }
+
   @Override
   public String toString() {
     return provider.toString();

apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/DefaultApplicationProvider.java

@@ -17,6 +17,7 @@
 package com.ctrip.framework.foundation.internals.provider;
 
 import com.ctrip.framework.apollo.core.ApolloClientSystemConsts;
+import com.ctrip.framework.apollo.core.spi.Ordered;
 import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
 import com.ctrip.framework.apollo.core.utils.DeprecatedPropertyNotifyUtil;
 import com.ctrip.framework.foundation.internals.Utils;
@@ -116,6 +117,11 @@ public Class<? extends Provider> getType() {
     return ApplicationProvider.class;
   }
 
+  @Override
+  public int getOrder() {
+    return Ordered.LOWEST_PRECEDENCE;
+  }
+
   private void initAppId() {
     // 1. Get app.id from System Property
     m_appId = System.getProperty(ApolloClientSystemConsts.APP_ID);
@@ -173,7 +179,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);
   }

apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/DefaultNetworkProvider.java

@@ -16,11 +16,13 @@
  */
 package com.ctrip.framework.foundation.internals.provider;
 
+import com.ctrip.framework.apollo.core.spi.Ordered;
 import com.ctrip.framework.foundation.internals.NetworkInterfaceManager;
 import com.ctrip.framework.foundation.spi.provider.NetworkProvider;
 import com.ctrip.framework.foundation.spi.provider.Provider;
 
 public class DefaultNetworkProvider implements NetworkProvider {
+
   @Override
   public String getProperty(String name, String defaultValue) {
     if ("host.address".equalsIgnoreCase(name)) {
@@ -54,6 +56,11 @@ public Class<? extends Provider> getType() {
     return NetworkProvider.class;
   }
 
+  @Override
+  public int getOrder() {
+    return Ordered.LOWEST_PRECEDENCE;
+  }
+
   @Override
   public String toString() {
     return "hostName [" + getHostName() + "] hostIP [" + getHostAddress() + "] (DefaultNetworkProvider)";

apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/DefaultServerProvider.java

@@ -34,19 +34,19 @@
 
 package com.ctrip.framework.foundation.internals.provider;
 
+import com.ctrip.framework.apollo.core.spi.Ordered;
 import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
+import com.ctrip.framework.foundation.internals.Utils;
+import com.ctrip.framework.foundation.internals.io.BOMInputStream;
+import com.ctrip.framework.foundation.spi.provider.Provider;
+import com.ctrip.framework.foundation.spi.provider.ServerProvider;
 import com.google.common.base.Strings;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.Properties;
-
-import com.ctrip.framework.foundation.internals.Utils;
-import com.ctrip.framework.foundation.internals.io.BOMInputStream;
-import com.ctrip.framework.foundation.spi.provider.Provider;
-import com.ctrip.framework.foundation.spi.provider.ServerProvider;
 import org.slf4j.Logger;
 
 public class DefaultServerProvider implements ServerProvider {
@@ -146,6 +146,11 @@ public boolean isEnvTypeSet() {
     return m_env != null;
   }
 
+  @Override
+  public int getOrder() {
+    return Ordered.LOWEST_PRECEDENCE;
+  }
+
   @Override
   public String getProperty(String name, String defaultValue) {
     if ("env".equalsIgnoreCase(name)) {

apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/NullProvider.java

@@ -18,6 +18,7 @@
 
 import java.io.InputStream;
 
+import com.ctrip.framework.apollo.core.spi.Ordered;
 import com.ctrip.framework.foundation.spi.provider.ApplicationProvider;
 import com.ctrip.framework.foundation.spi.provider.NetworkProvider;
 import com.ctrip.framework.foundation.spi.provider.Provider;
@@ -94,6 +95,11 @@ public String getHostName() {
     return null;
   }
 
+  @Override
+  public int getOrder() {
+    return Ordered.LOWEST_PRECEDENCE;
+  }
+
   @Override
   public String toString() {
     return "(NullProvider)";

apollo-core/src/main/java/com/ctrip/framework/foundation/spi/ProviderManager.java

@@ -16,9 +16,11 @@
  */
 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);

apollo-core/src/main/java/com/ctrip/framework/foundation/spi/provider/Provider.java

@@ -16,7 +16,9 @@
  */
 package com.ctrip.framework.foundation.spi.provider;
 
-public interface Provider {
+import com.ctrip.framework.apollo.core.spi.Ordered;
+
+public interface Provider extends Ordered {
   /**
    * @return the current provider's type
    */

apollo-core/src/main/resources/META-INF/services/com.ctrip.framework.foundation.spi.provider.ApplicationProvider

@@ -0,0 +1 @@
+com.ctrip.framework.foundation.internals.provider.DefaultApplicationProvider

apollo-core/src/main/resources/META-INF/services/com.ctrip.framework.foundation.spi.provider.NetworkProvider

@@ -0,0 +1 @@
+com.ctrip.framework.foundation.internals.provider.DefaultNetworkProvider

apollo-core/src/main/resources/META-INF/services/com.ctrip.framework.foundation.spi.provider.ServerProvider

@@ -0,0 +1 @@
+com.ctrip.framework.foundation.internals.provider.DefaultServerProvider