Fix java check style issue

[msb/discovery.git] / sdclient / discovery-service / src / main / java / org / onap / msb / sdclient / wrapper / ConsulCatalogServiceWrapper.java

diff --git a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/ConsulCatalogServiceWrapper.java b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/ConsulCatalogServiceWrapper.java
index d14c51e..d3b0bf4 100644 (file)
--- a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/ConsulCatalogServiceWrapper.java
+++ b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/ConsulCatalogServiceWrapper.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.sdclient.wrapper;
 
@@ -27,58 +25,57 @@ import org.slf4j.LoggerFactory;
 
 public class ConsulCatalogServiceWrapper {
 
-  private static ConsulCatalogServiceWrapper instance = new ConsulCatalogServiceWrapper();
-
-  private ConsulCatalogServiceWrapper() {}
-
-  public static ConsulCatalogServiceWrapper getInstance() {
-    return instance;
-  }
-  private static final Logger LOGGER = LoggerFactory.getLogger(ConsulAgentServiceWrapper.class);
-  
-
-  public synchronized int  saveService(AgentService agentService) throws Exception{
-    String consulRegisterurl =
-        (new StringBuilder().append("http://").append(ConfigUtil.getInstance().getConsulAddress())
-            .append(DiscoverUtil.CONSUL_CATALOG_URL).append("/register")).toString();
-
-    CatalogNode catalogNode=transformCatalogNode(agentService);   
-    
-    
-    int registerResult =
-        HttpClientUtil.httpPostWithJSON(consulRegisterurl,
-            JacksonJsonUtil.beanToJson(catalogNode));
-    
-    return registerResult;
-   
-  }
-  
-  public synchronized int deleteService(String serviceId) throws Exception{
-    String consulDelurl =
-        (new StringBuilder().append("http://").append(ConfigUtil.getInstance().getConsulAddress())
-            .append(DiscoverUtil.CONSUL_CATALOG_URL).append("/deregister"))
-            .toString();
-    
-    String nodeJson="{\"Node\": \""+DiscoverUtil.EXTERNAL_NODE_NAME+"\",\"ServiceID\": \""+serviceId+"\"}";
-
-    int delResult = HttpClientUtil.httpPostWithJSON(consulDelurl, nodeJson);
-    
-    return delResult;
-  }
-  
-  
-  private CatalogNode transformCatalogNode(AgentService agentService){
-    ConsulService consulService=new ConsulService();  
-    
-    consulService.setAddress(agentService.getAddress());
-    consulService.setId(agentService.getId());
-    consulService.setPort(agentService.getPort());
-    consulService.setService(agentService.getName());
-    consulService.setTags(agentService.getTags());
-    
-    CatalogNode catalogNode=new CatalogNode(consulService);
-    
-    return catalogNode;
-  }
+    private static ConsulCatalogServiceWrapper instance = new ConsulCatalogServiceWrapper();
+
+    private ConsulCatalogServiceWrapper() {}
+
+    public static ConsulCatalogServiceWrapper getInstance() {
+        return instance;
+    }
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConsulAgentServiceWrapper.class);
+
+
+    public synchronized int saveService(AgentService agentService) throws Exception {
+        String consulRegisterurl =
+                        (new StringBuilder().append("http://").append(ConfigUtil.getInstance().getConsulAddress())
+                                        .append(DiscoverUtil.CONSUL_CATALOG_URL).append("/register")).toString();
+
+        CatalogNode catalogNode = transformCatalogNode(agentService);
+
+
+        int registerResult =
+                        HttpClientUtil.httpPostWithJSON(consulRegisterurl, JacksonJsonUtil.beanToJson(catalogNode));
+
+        return registerResult;
+
+    }
+
+    public synchronized int deleteService(String serviceId) throws Exception {
+        String consulDelurl = (new StringBuilder().append("http://").append(ConfigUtil.getInstance().getConsulAddress())
+                        .append(DiscoverUtil.CONSUL_CATALOG_URL).append("/deregister")).toString();
+
+        String nodeJson =
+                        "{\"Node\": \"" + DiscoverUtil.EXTERNAL_NODE_NAME + "\",\"ServiceID\": \"" + serviceId + "\"}";
+
+        int delResult = HttpClientUtil.httpPostWithJSON(consulDelurl, nodeJson);
+
+        return delResult;
+    }
+
+
+    private CatalogNode transformCatalogNode(AgentService agentService) {
+        ConsulService consulService = new ConsulService();
+
+        consulService.setAddress(agentService.getAddress());
+        consulService.setId(agentService.getId());
+        consulService.setPort(agentService.getPort());
+        consulService.setService(agentService.getName());
+        consulService.setTags(agentService.getTags());
+
+        CatalogNode catalogNode = new CatalogNode(consulService);
+
+        return catalogNode;
+    }
 
 }