1 files changed, 142 insertions, 145 deletions
diff --git a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/CustomRouteServiceWrapper.java b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/CustomRouteServiceWrapper.java
index 825a572..3328d70 100644
--- a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/CustomRouteServiceWrapper.java
+++ b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/CustomRouteServiceWrapper.java
@@ -1,17 +1,15 @@
 /*******************************************************************************
  * 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;
 
@@ -28,190 +26,189 @@ import org.slf4j.LoggerFactory;
 public class CustomRouteServiceWrapper {
 
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(CustomRouteServiceWrapper.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CustomRouteServiceWrapper.class);
 
-  private static CustomRouteServiceWrapper instance = new CustomRouteServiceWrapper();
+    private static CustomRouteServiceWrapper instance = new CustomRouteServiceWrapper();
 
-  private CustomRouteServiceWrapper() {}
+    private CustomRouteServiceWrapper() {}
 
-  public static CustomRouteServiceWrapper getInstance() {
-    return instance;
-  }
+    public static CustomRouteServiceWrapper getInstance() {
+        return instance;
+    }
+
+
+    /**
+     * @Title: getAllCustomRouteService
+     * @Description: TODO(get AllCustomRoute Service)
+     * @param: @return
+     * @return: CustomRouteInfo[]
+     */
+    public List<CustomRouteInfo> getAllCustomRouteInstances(String routeWay) {
+
+        RouteUtil.checkRouteWay(routeWay);
 
+        try {
+            String customRedisKey = RouteUtil.getMutiRedisKey(RouteUtil.CUSTOMROUTE, routeWay);
+            return CustomRouteService.getInstance().getMultiCustomRouteInstances(customRedisKey);
 
-  /**
-   * @Title: getAllCustomRouteService
-   * @Description: TODO(get AllCustomRoute Service)
-   * @param: @return
-   * @return: CustomRouteInfo[]
-   */
-  public List<CustomRouteInfo> getAllCustomRouteInstances(String routeWay) {
+        } catch (Exception e) {
+            throw new ExtendedInternalServerErrorException(e.getMessage());
+        }
 
-    RouteUtil.checkRouteWay(routeWay);
-    
-    try {
-      String customRedisKey = RouteUtil.getMutiRedisKey(RouteUtil.CUSTOMROUTE, routeWay);
-      return CustomRouteService.getInstance().getMultiCustomRouteInstances(customRedisKey);
 
-    } catch (Exception e) {
-      throw new ExtendedInternalServerErrorException(e.getMessage());
     }
 
 
-  }
 
+    /**
+     * @Title: getCustomRouteInstance
+     * @Description: TODO(get CustomRouteInstance by serviceName)
+     * @param: @param serviceName
+     * @param: @return
+     * @return: CustomRouteInfo
+     */
+    public CustomRouteInfo getCustomRouteInstance(String serviceName, String host, String publish_port,
+                    String routeWay) {
 
+        RouteUtil.checkRouteWay(routeWay);
 
-  /**
-   * @Title: getCustomRouteInstance
-   * @Description: TODO(get CustomRouteInstance by serviceName)
-   * @param: @param serviceName
-   * @param: @return
-   * @return: CustomRouteInfo
-   */
-  public CustomRouteInfo getCustomRouteInstance(String serviceName, String host,
-      String publish_port, String routeWay) {
+        String customRedisPrefixedKey =
+                        RouteUtil.getRedisPrefixedKey(RouteUtil.CUSTOMROUTE, serviceName, host, publish_port, routeWay);
 
-    RouteUtil.checkRouteWay(routeWay);
+        CustomRouteInfo customRouteInfo;
+        try {
+            customRouteInfo = CustomRouteService.getInstance().getCustomRouteInstance(customRedisPrefixedKey);
+        } catch (Exception e) {
+            LOGGER.error("get customRouteInstance throw exception", e);
+            throw new ExtendedInternalServerErrorException("get customRouteInstance throw exception" + e.getMessage());
+        }
 
-    String customRedisPrefixedKey =
-        RouteUtil.getRedisPrefixedKey(RouteUtil.CUSTOMROUTE, serviceName, host, publish_port,
-            routeWay);
 
-    CustomRouteInfo customRouteInfo;
-    try {
-      customRouteInfo =
-          CustomRouteService.getInstance().getCustomRouteInstance(customRedisPrefixedKey);
-    } catch (Exception e) {
-      LOGGER.error("get customRouteInstance throw exception", e);
-      throw new ExtendedInternalServerErrorException("get customRouteInstance throw exception"+ e.getMessage());
-    }
+        if (null == customRouteInfo) {
+            throw new ExtendedNotFoundException("customRoute Info not found");
 
+        }
 
-    if (null == customRouteInfo) {
-      throw new ExtendedNotFoundException("customRoute Info not found");
+        return customRouteInfo;
 
     }
 
-    return customRouteInfo;
 
-  }
+    /**
+     * @Title updateCustomRouteStatus
+     * @Description TODO(update one CustomRoute Status)
+     * @param serviceName
+     * @param status
+     * @return
+     * @return RouteResult
+     */
+    public synchronized CustomRouteInfo updateCustomRouteStatus(String serviceName, String host, String publish_port,
+                    String status, String routeWay) {
 
+        RouteUtil.checkRouteWay(routeWay);
 
-  /**
-   * @Title updateCustomRouteStatus
-   * @Description TODO(update one CustomRoute Status)
-   * @param serviceName
-   * @param status
-   * @return
-   * @return RouteResult
-   */
-  public synchronized CustomRouteInfo updateCustomRouteStatus(String serviceName, String host,
-      String publish_port, String status, String routeWay) {
+        RouteUtil.checkServiceStatus(status);
 
-    RouteUtil.checkRouteWay(routeWay);
+        String customRedisPrefixedKey =
+                        RouteUtil.getRedisPrefixedKey(RouteUtil.CUSTOMROUTE, serviceName, host, publish_port, routeWay);
 
-    RouteUtil.checkServiceStatus(status);
 
-    String customRedisPrefixedKey =
-        RouteUtil.getRedisPrefixedKey(RouteUtil.CUSTOMROUTE, serviceName, host, publish_port,
-            routeWay);
+        try {
+            CustomRouteService.getInstance().updateCustomRouteStatus2Redis(customRedisPrefixedKey, status);
+        } catch (Exception e) {
+            LOGGER.error("update CustomRoute status  throw exception", e);
+            throw new ExtendedInternalServerErrorException(e.getMessage());
+        }
 
+        CustomRouteInfo new_customRouteInfo = getCustomRouteInstance(serviceName, host, publish_port, routeWay);
 
-    try {
-      CustomRouteService.getInstance()
-          .updateCustomRouteStatus2Redis(customRedisPrefixedKey, status);
-    } catch (Exception e) {
-      LOGGER.error("update CustomRoute status  throw exception", e);
-      throw new ExtendedInternalServerErrorException(e.getMessage());
+        return new_customRouteInfo;
     }
 
-    CustomRouteInfo new_customRouteInfo =
-        getCustomRouteInstance(serviceName, host, publish_port, routeWay);
+    /**
+     * @Title: saveCustomRouteInstance
+     * @Description: TODO(save one CustomRouteInstance)
+     * @param: @param CustomRouteInfo
+     * @param: @return
+     * @return: CustomRouteInfo
+     */
+    public synchronized CustomRouteInfo saveCustomRouteInstance4Rest(CustomRouteInfo customRouteInfo, String routeWay) {
 
-    return new_customRouteInfo;
-  }
+        RouteUtil.checkRouteWay(routeWay);
 
-  /**
-   * @Title: saveCustomRouteInstance
-   * @Description: TODO(save one CustomRouteInstance)
-   * @param: @param CustomRouteInfo
-   * @param: @return
-   * @return: CustomRouteInfo
-   */
-  public synchronized CustomRouteInfo saveCustomRouteInstance4Rest(CustomRouteInfo customRouteInfo,
-      String routeWay) {
+        RouteUtil.checkRouterInfoFormat(customRouteInfo);
 
-    RouteUtil.checkRouteWay(routeWay);
+        try {
+            saveCustomRouteInstance(customRouteInfo, routeWay);
 
-    RouteUtil.checkRouterInfoFormat(customRouteInfo);
+        } catch (Exception e) {
 
-    try {
-      saveCustomRouteInstance(customRouteInfo, routeWay);
+            throw new ExtendedInternalServerErrorException("save CustomRouteInfo  fail: [serviceName]"
+                            + customRouteInfo.getServiceName() + e.getMessage());
+        }
 
-    } catch (Exception e) {
+        return customRouteInfo;
 
-      throw new ExtendedInternalServerErrorException("save CustomRouteInfo  fail: [serviceName]"+customRouteInfo.getServiceName()+e.getMessage());
     }
 
-    return customRouteInfo;
 
-  }
+    public synchronized CustomRouteInfo saveCustomRouteInstance(CustomRouteInfo customRouteInfo, String routeWay)
+                    throws Exception {
+        try {
+            String customRedisPrefixedKey =
+                            RouteUtil.getRedisPrefixedKey(RouteUtil.CUSTOMROUTE, customRouteInfo.getServiceName(),
+                                            customRouteInfo.getHost(), customRouteInfo.getPublish_port(), routeWay);;
 
 
-  public synchronized CustomRouteInfo saveCustomRouteInstance(CustomRouteInfo customRouteInfo,
-      String routeWay) throws Exception {
-    try {
-    String customRedisPrefixedKey =
-        RouteUtil.getRedisPrefixedKey(RouteUtil.CUSTOMROUTE, customRouteInfo.getServiceName(),
-            customRouteInfo.getHost(), customRouteInfo.getPublish_port(), routeWay);;
+            CustomRouteService.getInstance().saveCustomRouteService2Redis(customRouteInfo, customRedisPrefixedKey);
+            LOGGER.info("save CustomRouteInfo [serviceName]" + customRouteInfo.getServiceName() + " [host]"
+                            + customRouteInfo.getHost() + " [publish_port]" + customRouteInfo.getPublish_port()
+                            + " [routeWay]" + routeWay + " success");
 
-  
-      CustomRouteService.getInstance().saveCustomRouteService2Redis(customRouteInfo,
-          customRedisPrefixedKey);
-      LOGGER.info("save CustomRouteInfo [serviceName]"+customRouteInfo.getServiceName()+" [host]"+customRouteInfo.getHost() +" [publish_port]"+customRouteInfo.getPublish_port()+" [routeWay]"+routeWay+" success");
+        } catch (Exception e) {
+            LOGGER.error("save CustomRouteInfo [serviceName]" + customRouteInfo.getServiceName() + " [host]"
+                            + customRouteInfo.getHost() + " [publish_port]" + customRouteInfo.getPublish_port()
+                            + " [routeWay]" + routeWay + " throw exception", e);
 
-    } catch (Exception e) {
-      LOGGER.error("save CustomRouteInfo [serviceName]"+customRouteInfo.getServiceName()+" [host]"+customRouteInfo.getHost() +" [publish_port]"+customRouteInfo.getPublish_port()+" [routeWay]"+routeWay+" throw exception", e);
+            throw e;
+        }
+
+        return customRouteInfo;
 
-      throw e;
-    }
-   
-    return customRouteInfo;
-
-  }
-
-
-  /**
-   * @Title: deleteCustomRoute
-   * @Description: TODO(delete one CustomRoute)
-   * @param: @param type
-   * @param: @param serviceName
-   * @param: @param delKey
-   * @param: @return
-   * @return: void
-   */
-  public synchronized void deleteCustomRoute(String serviceName, String host, String publish_port,
-      String routeWay) {
-
-    RouteUtil.checkRouteWay(routeWay);
-
-    String customRedisPrefixedKey =
-        RouteUtil.getRedisPrefixedKey(RouteUtil.CUSTOMROUTE, serviceName, host, publish_port,
-            routeWay);
-
-    try {
-      CustomRouteService.getInstance().deleteCustomRouteService2Redis(customRedisPrefixedKey);
-      LOGGER.info("delete CustomRouteInfo [serviceName]"+serviceName+" [host]"+host +" [publish_port]"+publish_port+" [routeWay]"+routeWay+" success");
-
-    } catch (ExtendedNotFoundException e) {
-      throw e;
-    } catch (Exception e) {
-      LOGGER.error("delete CustomRouteInfo [serviceName]"+serviceName+" [host]"+host +" [publish_port]"+publish_port+" [routeWay]"+routeWay+" throw exception", e);
-      throw new ExtendedInternalServerErrorException("delete CustomRouteInfo [serviceName]"+serviceName+e.getMessage());
     }
 
 
+    /**
+     * @Title: deleteCustomRoute
+     * @Description: TODO(delete one CustomRoute)
+     * @param: @param type
+     * @param: @param serviceName
+     * @param: @param delKey
+     * @param: @return
+     * @return: void
+     */
+    public synchronized void deleteCustomRoute(String serviceName, String host, String publish_port, String routeWay) {
 
-  }
+        RouteUtil.checkRouteWay(routeWay);
+
+        String customRedisPrefixedKey =
+                        RouteUtil.getRedisPrefixedKey(RouteUtil.CUSTOMROUTE, serviceName, host, publish_port, routeWay);
+
+        try {
+            CustomRouteService.getInstance().deleteCustomRouteService2Redis(customRedisPrefixedKey);
+            LOGGER.info("delete CustomRouteInfo [serviceName]" + serviceName + " [host]" + host + " [publish_port]"
+                            + publish_port + " [routeWay]" + routeWay + " success");
+
+        } catch (ExtendedNotFoundException e) {
+            throw e;
+        } catch (Exception e) {
+            LOGGER.error("delete CustomRouteInfo [serviceName]" + serviceName + " [host]" + host + " [publish_port]"
+                            + publish_port + " [routeWay]" + routeWay + " throw exception", e);
+            throw new ExtendedInternalServerErrorException(
+                            "delete CustomRouteInfo [serviceName]" + serviceName + e.getMessage());
+        }
+
+
+
+    }
 }