1 files changed, 23 insertions, 25 deletions

diff --git a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/service/CustomRouteService.java b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/service/CustomRouteService.java
index 4106ce7..cb8eb50 100644
--- a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/service/CustomRouteService.java
+++ b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/service/CustomRouteService.java
@@ -1,20 +1,22 @@
 /*******************************************************************************
  * Copyright 2016-2017 ZTE, Inc. and others.
  * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  ******************************************************************************/
 package org.onap.msb.apiroute.wrapper.service;
 
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
 import org.onap.msb.apiroute.api.CustomRouteInfo;
 import org.onap.msb.apiroute.api.RouteServer;
 import org.onap.msb.apiroute.wrapper.dao.DAOFactory;
@@ -26,10 +28,6 @@ import org.onap.msb.apiroute.wrapper.dao.route.bean.Spec;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
 
 public class CustomRouteService {
     private static final Logger LOGGER = LoggerFactory.getLogger(CustomRouteService.class);
@@ -37,15 +35,14 @@ public class CustomRouteService {
     private static final CustomRouteService instance = new CustomRouteService();
     private IRouteDAO routeDAO = DAOFactory.getRouteDAO();
 
-    private CustomRouteService() {
-    }
+    private CustomRouteService() {}
 
     public static CustomRouteService getInstance() {
         return instance;
     }
 
     public void saveCustomRouteService2Redis(CustomRouteInfo customRouteInfo, String routeKey) throws Exception {
-        if(customRouteInfo ==null){
+        if (customRouteInfo == null) {
             throw new Exception("input customRouteInfo to be saved is null!");
         }
         RouteInfo routeInfo = CustomRouteAdapter.toRouteInfo(customRouteInfo);
@@ -64,7 +61,7 @@ public class CustomRouteService {
         CustomRouteInfo customRouteInfo = null;
         RouteInfo routeInfo = null;
         routeInfo = routeDAO.queryRoute(routeKey);
-        if(routeInfo!=null) {
+        if (routeInfo != null) {
             customRouteInfo = CustomRouteAdapter.fromRouteInfo(routeInfo);
         }
         return customRouteInfo;
@@ -82,18 +79,19 @@ public class CustomRouteService {
         return customRouteList;
     }
 
-    public void updateCustomRouteStatus2Redis(String routeKey,String status) throws Exception {
+    public void updateCustomRouteStatus2Redis(String routeKey, String status) throws Exception {
         RouteInfo routeInfo = routeDAO.queryRoute(routeKey);
-        if(routeInfo != null){
+        if (routeInfo != null) {
             routeInfo.setStatus(status);
-            routeDAO.saveRoute(routeKey,routeInfo);
-        }else{
+            routeDAO.saveRoute(routeKey, routeInfo);
+        } else {
             throw new Exception("service to be updated is not exist! Update failed");
         }
     }
 
 }
 
+
 class CustomRouteAdapter {
     public static RouteInfo toRouteInfo(CustomRouteInfo customRouteInfo) {
         RouteInfo routeInfo = new RouteInfo();
@@ -112,14 +110,14 @@ class CustomRouteAdapter {
         spec.setControl(customRouteInfo.getControl());
         RouteServer[] routeServers = customRouteInfo.getServers();
         List<Node> nodeList = new ArrayList<>();
-        for (RouteServer server: routeServers){
+        for (RouteServer server : routeServers) {
             Node node = new Node();
             node.setIp(server.getIp());
             node.setPort(Integer.parseInt(server.getPort()));
             node.setWeight(server.getWeight());
             nodeList.add(node);
         }
-        spec.setNodes(nodeList.toArray(new Node[]{}));
+        spec.setNodes(nodeList.toArray(new Node[] {}));
         routeInfo.setSpec(spec);
 
         Metadata metadata = new Metadata();
@@ -149,14 +147,14 @@ class CustomRouteAdapter {
         customRouteInfo.setControl(spec.getControl());
         Node[] nodes = spec.getNodes();
         List<RouteServer> routeServerList = new ArrayList<>();
-        for (Node node: nodes){
+        for (Node node : nodes) {
             RouteServer routeServer = new RouteServer();
             routeServer.setIp(node.getIp());
             routeServer.setPort(String.valueOf(node.getPort()));
             routeServer.setWeight(node.getWeight());
             routeServerList.add(routeServer);
         }
-        customRouteInfo.setServers(routeServerList.toArray(new RouteServer[]{}));
+        customRouteInfo.setServers(routeServerList.toArray(new RouteServer[] {}));
 
         Metadata metadata = routeInfo.getMetadata();
         customRouteInfo.setServiceName(metadata.getName());