Merge branch 'master' into keepalive

README.md

@@ -137,3 +137,5 @@ The project is licensed under the [Apache 2 license](https://github.com/ctripcor
 ![现金巴士](https://github.com/ctripcorp/apollo/blob/master/doc/images/known-users/cash-bus.png) 
 ![锤子科技](https://github.com/ctripcorp/apollo/blob/master/doc/images/known-users/smartisan.png) 
 ![头等仓](https://github.com/ctripcorp/apollo/blob/master/doc/images/known-users/toodc.png) 
+![吉祥航空](https://github.com/ctripcorp/apollo/blob/master/doc/images/known-users/juneyaoair.png) 
+![263移动通信](https://github.com/ctripcorp/apollo/blob/master/doc/images/known-users/263mobile.png) 

apollo-common/src/main/java/com/ctrip/framework/apollo/common/entity/App.java

@@ -86,4 +86,53 @@ public class App extends BaseEntity {
         .add("ownerName", ownerName)
         .add("ownerEmail", ownerEmail).toString();
   }
+
+  public static class Builder {
+
+    public Builder() {
+    }
+
+    private App app = new App();
+
+    public Builder name(String name) {
+      app.setName(name);
+      return this;
+    }
+
+    public Builder appId(String appId) {
+      app.setAppId(appId);
+      return this;
+    }
+
+    public Builder orgId(String orgId) {
+      app.setOrgId(orgId);
+      return this;
+    }
+
+    public Builder orgName(String orgName) {
+      app.setOrgName(orgName);
+      return this;
+    }
+
+    public Builder ownerName(String ownerName) {
+      app.setOrgName(ownerName);
+      return this;
+    }
+
+    public Builder ownerEmail(String ownerEmail) {
+      app.setOwnerEmail(ownerEmail);
+      return this;
+    }
+
+    public App build() {
+      return app;
+    }
+
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+
 }

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/AppController.java

@@ -178,13 +178,13 @@ public class AppController {
       throw new BadRequestException(String.format("AppId格式错误: %s", InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE));
     }
 
-    App app = new App();
-    app.setAppId(appId);
-    app.setName(appName);
-    app.setOwnerName(ownerName);
-    app.setOrgId(orgId);
-    app.setOrgName(orgName);
-
-    return app;
+    return App.builder()
+            .appId(appId)
+            .name(appName)
+            .ownerName(ownerName)
+            .orgId(orgId)
+            .orgName(orgName)
+            .build();
+
   }
 }

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ClusterController.java

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Objects;
+
 import static com.ctrip.framework.apollo.common.utils.RequestPrecondition.checkModel;
 
 @RestController
@@ -32,7 +34,7 @@ public class ClusterController {
   public ClusterDTO createCluster(@PathVariable String appId, @PathVariable String env,
                                   @RequestBody ClusterDTO cluster) {
 
-    checkModel(cluster != null);
+    checkModel(Objects.nonNull(cluster));
     RequestPrecondition.checkArgumentsNotEmpty(cluster.getAppId(), cluster.getName());
 
     if (!InputValidator.isValidClusterNamespace(cluster.getName())) {

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ConsumerController.java

@@ -53,7 +53,7 @@ public class ConsumerController {
 
     Consumer createdConsumer = consumerService.createConsumer(consumer);
 
-    if (expires == null) {
+    if (Objects.isNull(expires)) {
       expires = DEFAULT_EXPIRES;
     }
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import static com.ctrip.framework.apollo.common.utils.RequestPrecondition.checkModel;
 
@@ -128,7 +129,7 @@ public class ItemController {
   @RequestMapping(value = "/namespaces/{namespaceName}/diff", method = RequestMethod.POST, consumes = {
       "application/json"})
   public List<ItemDiffs> diff(@RequestBody NamespaceSyncModel model) {
-    checkModel(model != null && !model.isInvalid());
+    checkModel(Objects.nonNull(model) && !model.isInvalid());
 
     return configService.compare(model.getSyncToNamespaces(), model.getSyncItems());
   }
@@ -138,14 +139,14 @@ public class ItemController {
       "application/json"})
   public ResponseEntity<Void> update(@PathVariable String appId, @PathVariable String namespaceName,
                                      @RequestBody NamespaceSyncModel model) {
-    checkModel(model != null && !model.isInvalid());
+    checkModel(Objects.nonNull(model) && !model.isInvalid());
 
     configService.syncItems(model.getSyncToNamespaces(), model.getSyncItems());
     return ResponseEntity.status(HttpStatus.OK).build();
   }
 
   private boolean isValidItem(ItemDTO item) {
-    return item != null && !StringUtils.isContainEmpty(item.getKey());
+    return Objects.nonNull(item) && !StringUtils.isContainEmpty(item.getKey());
   }
 
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ReleaseController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Objects;
 
 import static com.ctrip.framework.apollo.common.utils.RequestPrecondition.checkModel;
 
@@ -41,7 +42,7 @@ public class ReleaseController {
                                   @PathVariable String env, @PathVariable String clusterName,
                                   @PathVariable String namespaceName, @RequestBody NamespaceReleaseModel model) {
 
-    checkModel(model != null);
+    checkModel(Objects.nonNull(model));
     model.setAppId(appId);
     model.setEnv(env);
     model.setClusterName(clusterName);
@@ -74,7 +75,7 @@ public class ReleaseController {
                                       @PathVariable String namespaceName, @PathVariable String branchName,
                                       @RequestBody NamespaceReleaseModel model) {
 
-    checkModel(model != null);
+    checkModel(Objects.nonNull(model));
     model.setAppId(appId);
     model.setEnv(env);
     model.setClusterName(branchName);
@@ -142,7 +143,7 @@ public class ReleaseController {
                        @PathVariable long releaseId) {
     releaseService.rollback(Env.valueOf(env), releaseId);
     ReleaseDTO release = releaseService.findReleaseById(Env.valueOf(env), releaseId);
-    if (release == null) {
+    if (Objects.isNull(release)) {
       return;
     }
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ServerConfigController.java

@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Objects;
+
 import static com.ctrip.framework.apollo.common.utils.RequestPrecondition.checkModel;
 
 /**
@@ -31,14 +33,14 @@ public class ServerConfigController {
   @RequestMapping(value = "/server/config", method = RequestMethod.POST)
   public ServerConfig createOrUpdate(@RequestBody ServerConfig serverConfig) {
 
-    checkModel(serverConfig != null);
+    checkModel(Objects.nonNull(serverConfig));
     RequestPrecondition.checkArgumentsNotEmpty(serverConfig.getKey(), serverConfig.getValue());
 
     String modifiedBy = userInfoHolder.getUser().getUserId();
 
     ServerConfig storedConfig = serverConfigRepository.findByKey(serverConfig.getKey());
 
-    if (storedConfig == null) {//create
+    if (Objects.isNull(storedConfig)) {//create
       serverConfig.setDataChangeCreatedBy(modifiedBy);
       serverConfig.setDataChangeLastModifiedBy(modifiedBy);
       return serverConfigRepository.save(serverConfig);