Fix the sonar issue of esr-server.

Change-Id: Ib89680523893aaf5c0bbcb1c3bf24204dfe59563
Issue-ID: AAI-282
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>

11 files changed, 37 insertions, 52 deletions

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java
index d77722a..12d1d61 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java
@@ -30,15 +30,15 @@ import org.xml.sax.SAXException;
 
 public class AaiCommon {
 
-  private static String AAI_AUTHENTICATION_USER = "AAI";
-  private static String AAI_AUTHENTICATION_PAASWORD = "AAI";
+//  private static String AAI_AUTHENTICATION_USER = "AAI";
+//  private static String AAI_AUTHENTICATION_PAASWORD = "AAI";
   private static String RESOURCE_VERSION_PARAM = "resource-version";
   
-  public String getAuthenticationCredentials() {
-    String usernameAndPassword = AAI_AUTHENTICATION_USER + ":"
-        + AAI_AUTHENTICATION_PAASWORD;
-    return "Basic " + java.util.Base64.getEncoder().encodeToString("AAI:AAI".getBytes());
-  }
+//  public String getAuthenticationCredentials() {
+//    String usernameAndPassword = AAI_AUTHENTICATION_USER + ":"
+//        + AAI_AUTHENTICATION_PAASWORD;
+//    return "Basic " + java.util.Base64.getEncoder().encodeToString("AAI:AAI".getBytes());
+//  }
   
   public String getResourceVersion(ClientResponse response)
       throws ParserConfigurationException, SAXException, IOException {
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiServiceConsumer.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiServiceConsumer.java
index cbb65ad..6d7b10d 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiServiceConsumer.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiServiceConsumer.java
@@ -15,18 +15,18 @@
  */
 package org.onap.aai.esr.externalservice.aai;
 
-import org.glassfish.jersey.client.ClientConfig;
-
-import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
+//import org.glassfish.jersey.client.ClientConfig;
+//
+//import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 
 public class AaiServiceConsumer {
-  private static IEsrVimRest aaiAdapterProxy;
-
-  static {
-      ClientConfig config = new ClientConfig();
-      aaiAdapterProxy =
-              ConsumerFactory.createConsumer(AaiAdapterConfig.getAaiAdapterAddr(),
-                      config, IEsrVimRest.class);
-  }
+//  private static IEsrVimRest aaiAdapterProxy;
+//
+//  static {
+//      ClientConfig config = new ClientConfig();
+//      aaiAdapterProxy =
+//              ConsumerFactory.createConsumer(AaiAdapterConfig.getAaiAdapterAddr(),
+//                      config, IEsrVimRest.class);
+//  }
 
 }
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java
index b01c6ef..1ecd6d1 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java
@@ -44,7 +44,7 @@ public interface IEsrVimRest {
   @Consumes(MediaType.APPLICATION_JSON)
 
   public ClientResponse registerVIMServce(@Header("Authorization") String authorization, @PathParam("cloud_owner") String cloud_owner,
-      CloudRegion entity) throws Exception;
+      CloudRegion entity);
 
   @Headers({  
     "X-TransactionId: 9999",
@@ -55,7 +55,7 @@ public interface IEsrVimRest {
   @GET
   @Produces(MediaType.APPLICATION_JSON)
   public ClientResponse queryVIMDetail(@Header("Authorization") String authorization, @PathParam("cloud_owner") String cloud_owner,
-      @PathParam("cloud_region_id") String cloud_region_id) throws Exception;
+      @PathParam("cloud_region_id") String cloud_region_id);
   
   @Headers({  
     "X-TransactionId: 9999",
@@ -65,7 +65,7 @@ public interface IEsrVimRest {
   @Path("/")
   @GET
   @Produces(MediaType.APPLICATION_JSON)
-  public ClientResponse queryVIMList(@Header("Authorization") String authorization) throws Exception;
+  public ClientResponse queryVIMList(@Header("Authorization") String authorization);
   
 
   @Headers({  
@@ -76,6 +76,6 @@ public interface IEsrVimRest {
   @Path("/cloud-region/{cloud_owner}/{cloud_region_id}/esr-system-info/{esr_system_info_id}")
   @GET
   public ClientResponse delVIMAuthInfo(@Header("Authorization") String authorization, @PathParam("cloud_owner") String cloud_owner,
-      @PathParam("cloud_region_id") String cloud_region_id, @PathParam("esr_system_info_id") String esr_system_info_id) throws Exception;
+      @PathParam("cloud_region_id") String cloud_region_id, @PathParam("esr_system_info_id") String esr_system_info_id);
   
 }
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java
index 368a0c3..9ab9c44 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java
@@ -23,17 +23,13 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 
 import org.eclipse.jetty.http.HttpStatus;
-import org.onap.aai.esr.entity.aai.EmsData;
 import org.onap.aai.esr.entity.rest.EmsRestData;
-import org.onap.aai.esr.exception.ExtsysException;
 import org.onap.aai.esr.util.ExtsysUtil;
 import org.onap.aai.esr.util.RestResponseUtil;
 import org.onap.aai.esr.wrapper.EmsManagerWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;  
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java
index f31140b..059a1ed 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java
@@ -22,17 +22,12 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.eclipse.jetty.http.HttpStatus;
-import org.onap.aai.esr.entity.aai.VimData;
 import org.onap.aai.esr.entity.rest.VimRestData;
-import org.onap.aai.esr.exception.ExtsysException;
 import org.onap.aai.esr.util.ExtsysUtil;
-import org.onap.aai.esr.util.RestResponseUtil;
 import org.onap.aai.esr.wrapper.VimManagerWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java
index f7e7097..690421e 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java
@@ -22,17 +22,12 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.eclipse.jetty.http.HttpStatus;
-import org.onap.aai.esr.entity.aai.VnfmData;
 import org.onap.aai.esr.entity.rest.VnfmRestData;
-import org.onap.aai.esr.exception.ExtsysException;
 import org.onap.aai.esr.util.ExtsysUtil;
-import org.onap.aai.esr.util.RestResponseUtil;
 import org.onap.aai.esr.wrapper.VnfmManagerWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java
index 72f8bd7..2d120de 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java
@@ -17,15 +17,15 @@ package org.onap.aai.esr.util;
 
 import com.google.gson.Gson;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.UUID;
 
 public class ExtsysUtil {
-  private final static Logger logger = LoggerFactory.getLogger(ExtsysUtil.class);
+//  private final static Logger logger = LoggerFactory.getLogger(ExtsysUtil.class);
 
   public static String generateId() {
     return UUID.randomUUID().toString();
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
index 842feb2..491d9c9 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
@@ -21,13 +21,12 @@ import javax.ws.rs.core.Response;
 
 import org.onap.aai.esr.entity.rest.EmsRestData;
 import org.onap.aai.esr.entity.rest.RegisterResponse;
-import org.onap.aai.esr.entity.rest.VnfmRestData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
 
 public class EmsManagerWrapper {
   private static EmsManagerWrapper emsManagerWrapper;
-  private static final Logger LOG = LoggerFactory.getLogger(EmsManagerWrapper.class);
+//  private static final Logger LOG = LoggerFactory.getLogger(EmsManagerWrapper.class);
 
   /**
    * get VnfmManagerWrapper instance.
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java
index d88c9ae..bfbae7b 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java
@@ -21,13 +21,13 @@ import javax.ws.rs.core.Response;
 
 import org.onap.aai.esr.entity.rest.RegisterResponse;
 import org.onap.aai.esr.entity.rest.ThirdPartySdncRestData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
 
 public class ThirdpatySdncWrapper {
 
   private static ThirdpatySdncWrapper thirdpatySdncWrapper;
-  private static final Logger LOG = LoggerFactory.getLogger(ThirdpatySdncWrapper.class);
+//  private static final Logger LOG = LoggerFactory.getLogger(ThirdpatySdncWrapper.class);
 
   /**
    * get ThirdpatySdncWrapper instance.
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
index 75cc4fc..5d82822 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
@@ -21,13 +21,13 @@ import javax.ws.rs.core.Response;
 
 import org.onap.aai.esr.entity.rest.RegisterResponse;
 import org.onap.aai.esr.entity.rest.VimRestData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
 
 public class VimManagerWrapper {
 
   private static VimManagerWrapper vimManagerWrapper;
-  private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class);
+//  private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class);
 
   /**
    * get VimManagerWrapper instance.
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java
index a1ac53c..6868ca2 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java
@@ -21,12 +21,12 @@ import javax.ws.rs.core.Response;
 
 import org.onap.aai.esr.entity.rest.RegisterResponse;
 import org.onap.aai.esr.entity.rest.VnfmRestData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
 
 public class VnfmManagerWrapper {
   private static VnfmManagerWrapper vnfmManagerWrapper;
-  private static final Logger LOG = LoggerFactory.getLogger(VnfmManagerWrapper.class);
+//  private static final Logger LOG = LoggerFactory.getLogger(VnfmManagerWrapper.class);
 
   /**
    * get VnfmManagerWrapper instance.