JAV-382 Sorted spi services

core/src/main/java/io/servicecomb/core/transport/TransportManager.java

@@ -77,7 +77,7 @@ protected void buildTransportMap() {
 
   protected Transport chooseOneTransport(List<Transport> group) {
     group.sort((t1, t2) -> {
-      return t1.getOrder() - t2.getOrder();
+      return Integer.compare(t1.getOrder(), t2.getOrder());
     });
 
     for (Transport transport : group) {

core/src/test/java/io/servicecomb/core/transport/TestTransportManager.java

@@ -176,21 +176,21 @@ public void testChooseOneTransportSecond(@Mocked Transport t1, @Mocked Transport
     new Expectations() {
       {
         t1.getOrder();
-        result = 1;
+        result = Integer.MAX_VALUE;
         t1.canInit();
-        result = false;
+        result = true;
 
         t2.getOrder();
-        result = 2;
+        result = -1000;
         t2.canInit();
-        result = true;
+        result = false;
       }
     };
 
     TransportManager manager = new TransportManager();
     List<Transport> group = Arrays.asList(t1, t2);
 
-    Assert.assertEquals(t2, manager.chooseOneTransport(group));
+    Assert.assertEquals(t1, manager.chooseOneTransport(group));
   }
 
   @Test

foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/utils/SPIServiceUtils.java

@@ -17,10 +17,13 @@
 package io.servicecomb.foundation.common.utils;
 
 import java.lang.reflect.Method;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.ServiceLoader;
+import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,25 +61,38 @@ public static <T> List<T> getAllService(Class<T> serviceType) {
     ServiceLoader.load(serviceType).forEach(service -> {
       list.add(service);
     });
+
     return list;
   }
 
+  public static <T> List<T> getSortedService(Class<T> serviceType) {
+    List<Entry<Integer, T>> serviceEntries = new ArrayList<>();
+    ServiceLoader<T> serviceLoader = ServiceLoader.load(serviceType);
+    serviceLoader.forEach(service -> {
+      int serviceOrder = 0;
+      Method getOrder = ReflectionUtils.findMethod(service.getClass(), "getOrder");
+      if (getOrder != null) {
+        serviceOrder = (int) ReflectionUtils.invokeMethod(getOrder, service);
+      }
+
+      Entry<Integer, T> entry = new SimpleEntry<>(serviceOrder, service);
+      serviceEntries.add(entry);
+    });
+
+    return serviceEntries.stream()
+        .sorted((e1, e2) -> {
+          return Integer.compare(e1.getKey(), e2.getKey());
+        })
+        .map(e -> e.getValue())
+        .collect(Collectors.toList());
+  }
+
   public static <T> T getPriorityHighestService(Class<T> serviceType) {
-    String methodName = "getOrder";
-    Method getOrder = ReflectionUtils.findMethod(serviceType, methodName);
-    if (getOrder == null) {
-      throw new Error(String.format("method %s not exists in class %s", methodName, serviceType.getName()));
+    List<T> services = getSortedService(serviceType);
+    if (services.isEmpty()) {
+      return null;
     }
 
-    int order = Integer.MAX_VALUE;
-    T highestService = null;
-    for (T service : getAllService(serviceType)) {
-      int serviceOrder = (int) ReflectionUtils.invokeMethod(getOrder, service);
-      if (serviceOrder <= order) {
-        order = serviceOrder;
-        highestService = service;
-      }
-    }
-    return highestService;
+    return services.get(0);
   }
 }

foundations/foundation-common/src/test/java/io/servicecomb/foundation/common/utils/TestSPIServiceUtils.java

@@ -16,8 +16,18 @@
 
 package io.servicecomb.foundation.common.utils;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
+import org.springframework.core.Ordered;
+
+import mockit.Deencapsulation;
+import mockit.Expectations;
+import mockit.Mocked;
 
 /**
  * Test SPIServiceUtils 
@@ -36,4 +46,27 @@ public void testGetTargetServiceNotNull() {
     SPIServiceDef service = SPIServiceUtils.getTargetService(SPIServiceDef.class);
     Assert.assertTrue(SPIServiceDef.class.isInstance(service));
   }
+
+  @Test
+  public void testSort(@Mocked Ordered o1, @Mocked Ordered o2) {
+    Map<String, Ordered> map = new LinkedHashMap<>();
+    map.put("a", o1);
+    map.put("b", o2);
+
+    ServiceLoader<Ordered> serviceLoader = ServiceLoader.load(Ordered.class);
+    Deencapsulation.setField(serviceLoader, "providers", map);
+    new Expectations(ServiceLoader.class) {
+      {
+        o1.getOrder();
+        result = -1;
+        o2.getOrder();
+        result = Integer.MAX_VALUE;
+        ServiceLoader.load(Ordered.class);
+        result = serviceLoader;
+      }
+    };
+
+    Assert.assertThat(SPIServiceUtils.getSortedService(Ordered.class), Matchers.contains(o1, o2));
+    Assert.assertThat(SPIServiceUtils.getPriorityHighestService(Ordered.class), Matchers.is(o1));
+  }
 }

foundations/foundation-config/src/main/java/io/servicecomb/config/archaius/sources/AbstractConfigLoader.java

@@ -126,7 +126,7 @@ private int doSort(ConfigModelWrapper w1, ConfigModelWrapper w2) {
       return 1;
     }
     // min order load first
-    int result = m1.getOrder() - m2.getOrder();
+    int result = Integer.compare(m1.getOrder(), m2.getOrder());
     if (result != 0) {
       return result;
     }
@@ -135,6 +135,6 @@ private int doSort(ConfigModelWrapper w1, ConfigModelWrapper w2) {
   }
 
   private int doFinalSort(ConfigModelWrapper w1, ConfigModelWrapper w2) {
-    return w1.addOrder - w2.addOrder;
+    return Integer.compare(w1.addOrder, w2.addOrder);
   }
 }

foundations/foundation-config/src/test/java/io/servicecomb/config/archaius/sources/TestMicroserviceConfigLoader.java

@@ -53,9 +53,9 @@ public void configsSortedByInsertionOrder() throws MalformedURLException {
 
   @Test
   public void configsSortedBySpecifiedOrder() throws MalformedURLException {
-    loader.getConfigModels().add(createConfigModel("jar", 2, "a"));
     loader.getConfigModels().add(createConfigModel("jar", 1, "b"));
-    loader.getConfigModels().add(createConfigModel("jar", 0, "c"));
+    loader.getConfigModels().add(createConfigModel("jar", -10, "c"));
+    loader.getConfigModels().add(createConfigModel("jar", Integer.MAX_VALUE, "a"));
 
     loader.sort();
 

foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/performance/PerfStatMonitorMgr.java

@@ -57,7 +57,7 @@ public void registerPerfStat(PerfStat perfStat, int index) {
 
         @Override
         public int compare(PerfStatMonitor o1, PerfStatMonitor o2) {
-          return o1.getIndex() - o2.getIndex();
+          return Integer.compare(o1.getIndex(), o2.getIndex());
         }
       });
     }

foundations/foundation-metrics/src/test/java/io/servicecomb/foundation/metrics/performance/TestPerfStatMonitorMgr.java

@@ -16,6 +16,9 @@
 
 package io.servicecomb.foundation.metrics.performance;
 
+import java.util.stream.Collectors;
+
+import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -51,4 +54,14 @@ public void testOnCycle() {
     oPerfStatMonitorMgr.onCycle(System.currentTimeMillis(), 10);
     Assert.assertEquals(1, oPerfStatMonitorMgr.getMonitorPerfStat().size());
   }
+
+  @Test
+  public void testSort() {
+    oPerfStatMonitorMgr.registerPerfStat(new PerfStatSuccFail("a"), -1);
+    oPerfStatMonitorMgr.registerPerfStat(new PerfStatSuccFail("b"), Integer.MAX_VALUE);
+
+    Assert.assertThat(
+        oPerfStatMonitorMgr.getMonitorList().stream().map(ps -> ps.getName()).collect(Collectors.toList()),
+        Matchers.contains("a", "b"));
+  }
 }

swagger/swagger-generator/generator-core/src/main/java/io/servicecomb/swagger/generator/core/CompositeSwaggerGeneratorContext.java

@@ -33,11 +33,7 @@ public class CompositeSwaggerGeneratorContext implements EmbeddedValueResolverAw
   private List<SwaggerGeneratorContext> contextList;
 
   public CompositeSwaggerGeneratorContext() {
-    contextList = SPIServiceUtils.getAllService(SwaggerGeneratorContext.class);
-
-    contextList.sort((context1, context2) -> {
-      return context1.getOrder() - context2.getOrder();
-    });
+    contextList = SPIServiceUtils.getSortedService(SwaggerGeneratorContext.class);
 
     for (SwaggerGeneratorContext context : contextList) {
       LOGGER.info("Found swagger generator context: {}", context.getClass().getName());