Merge pull request #325 from lepdou/history

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Cluster.java

@@ -16,7 +16,7 @@ import org.hibernate.annotations.Where;
 @Table(name = "Cluster")
 @SQLDelete(sql = "Update Cluster set isDeleted = 1 where id = ?")
 @Where(clause = "isDeleted = 0")
-public class Cluster extends BaseEntity {
+public class Cluster extends BaseEntity implements Comparable<Cluster> {
 
   @Column(name = "Name", nullable = false)
   private String name;
@@ -43,4 +43,17 @@ public class Cluster extends BaseEntity {
   public String toString() {
     return toStringHelper().add("name", name).add("appId", appId).toString();
   }
+
+  @Override
+  public int compareTo(Cluster o) {
+    if (o == null || getId() > o.getId()) {
+      return 1;
+    }
+
+    if (getId() == o.getId()) {
+      return 0;
+    }
+
+    return -1;
+  }
 }

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ClusterService.java

@@ -46,6 +46,7 @@ public class ClusterService {
     }
 
     List<Cluster> clusters = clusterRepository.findByAppId(appId);
+    Collections.sort(clusters);
     if (clusters == null) {
       return Collections.emptyList();
     }