Code Review / aai / esr-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: d0d4860)
Change the usage of Exception in external system. 21/14921/1
authorlizi00164331 <li.zi30@zte.com.cn>
Mon, 25 Sep 2017 02:57:52 +0000 (10:57 +0800)
committerlizi00164331 <li.zi30@zte.com.cn>
Mon, 25 Sep 2017 02:57:52 +0000 (10:57 +0800)
Do not use Exception directly according to sonar.

Change-Id: I580ce22a7cde5eebfa18f4813a9754b066866031
Issue-ID: AAI-282
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java patch | blob | history
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ICloudRegion.java patch | blob | history
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IExternalSystem.java patch | blob | history

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
index c8033ad..6fca0e6 100644 (file)
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
@@ -20,6 +20,7 @@ import org.onap.aai.esr.common.MsbConfig;
 import org.onap.aai.esr.entity.aai.EsrEmsDetail;
 import org.onap.aai.esr.entity.aai.EsrThirdpartySdncDetail;
 import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
+import org.onap.aai.esr.exception.ExtsysException;
 
 import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 
@@ -36,63 +37,111 @@ public class ExternalSystemProxy {
         config, IExternalSystem.class);
   }
 
-  public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws Exception {
+  public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
     ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
     IExternalSystem registerVnfmServiceproxy = ConsumerFactory
         .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-    registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId,
-        esrVnfmDetail);
+    try {
+      registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId,
+          esrVnfmDetail);
+    } catch (Exception e) {
+      throw new ExtsysException("PUT VNFM to A&AI failed.", e);
+    }
   }
   
-  public static String queryVnfmDetail(String vnfmId) throws Exception {
-    return externalSystemproxy.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
+  public static String queryVnfmDetail(String vnfmId) throws ExtsysException {
+    try {
+      return externalSystemproxy.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
+    } catch (Exception e) {
+      throw new ExtsysException("Query VNFM detail from A&AI failed.", e);
+    }
   }
   
-  public static String queryVnfmList() throws Exception {
-    return externalSystemproxy.queryVNFMList(transactionId, fromAppId, authorization);
+  public static String queryVnfmList() throws ExtsysException {
+    try {
+      return externalSystemproxy.queryVNFMList(transactionId, fromAppId, authorization);
+    } catch (Exception e) {
+      throw new ExtsysException("Query VNFM list from A&AI failed.", e);
+    }
   }
   
-  public static void deleteVnfm(String vnfmId, String resourceVersion) throws Exception {
-    externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
+  public static void deleteVnfm(String vnfmId, String resourceVersion) throws ExtsysException {
+    try {
+      externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
+    } catch (Exception e) {
+      throw new ExtsysException("Delete VNFM from A&AI failed.", e);
+    }
   }
   
-  public static void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail) throws Exception {
+  public static void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail) throws ExtsysException {
     ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider());
     IExternalSystem registerSdncServiceproxy = ConsumerFactory
         .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-    registerSdncServiceproxy.registerThirdpartySdnc(transactionId, fromAppId, authorization, thirdpartySdncId,
-        esrSdncDetail);
+    try {
+      registerSdncServiceproxy.registerThirdpartySdnc(transactionId, fromAppId, authorization, thirdpartySdncId,
+          esrSdncDetail);
+    } catch (Exception e) {
+      throw new ExtsysException("PUT thirdparty SDNC to A&AI failed.", e);
+    }
   }
   
-  public static String queryThirdpartySdncDetail(String thirdpartySdncId) throws Exception{
-    return externalSystemproxy.queryThirdpartySdncDetail(transactionId, fromAppId, authorization, thirdpartySdncId);
+  public static String queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException {
+    try {
+      return externalSystemproxy.queryThirdpartySdncDetail(transactionId, fromAppId, authorization, thirdpartySdncId);
+    } catch (Exception e) {
+      throw new ExtsysException("Query thirdparty SDNC detail from A&AI failed.", e);
+    }
   }
   
-  public static String querySdncList() throws Exception {
-    return externalSystemproxy.queryThirdpartySdncList(transactionId, fromAppId, authorization);
+  public static String querySdncList() throws ExtsysException {
+    try {
+      return externalSystemproxy.queryThirdpartySdncList(transactionId, fromAppId, authorization);
+    } catch (Exception e) {
+      throw new ExtsysException("Query thirdparty SDNC list from A&AI failed.", e);
+    }
   }
   
-  public static void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws Exception {
-    externalSystemproxy.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, resourceVersion);
+  public static void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
+    try {
+      externalSystemproxy.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, resourceVersion);
+    } catch (Exception e) {
+      throw new ExtsysException("Delete thirdparty SDNC from A&AI failed.", e);
+    }
   }
   
-  public static void registerEms(String emsId, EsrEmsDetail emsDetail) throws Exception {
+  public static void registerEms(String emsId, EsrEmsDetail emsDetail) throws ExtsysException {
     ClientConfig config = new ClientConfig(new EmsRegisterProvider());
     IExternalSystem registerEmsServiceproxy = ConsumerFactory
         .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-    registerEmsServiceproxy.registerEMS(transactionId, fromAppId, authorization, emsId,
-        emsDetail);
+    try {
+      registerEmsServiceproxy.registerEMS(transactionId, fromAppId, authorization, emsId,
+          emsDetail);
+    } catch (Exception e) {
+      throw new ExtsysException("PUT EMS to A&AI failed.", e);
+    }
   }
   
-  public static String queryEmsDetail(String emsId) throws Exception {
-    return externalSystemproxy.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
+  public static String queryEmsDetail(String emsId) throws ExtsysException {
+    try {
+      return externalSystemproxy.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
+    } catch (Exception e) {
+      throw new ExtsysException("Query EMS detail from A&AI failed.", e);
+    }
   }
   
-  public static String queryEmsList() throws Exception {
-    return externalSystemproxy.queryEMSList(transactionId, fromAppId, authorization);
+  public static String queryEmsList() throws ExtsysException {
+    try {
+      return externalSystemproxy.queryEMSList(transactionId, fromAppId, authorization);
+    } catch (Exception e) {
+      throw new ExtsysException("Query EMS list from A&AI failed.", e);
+    }
   }
   
-  public static void deleteEms(String emsId, String resourceVersion) throws Exception {
-    externalSystemproxy.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
+  public static void deleteEms(String emsId, String resourceVersion) throws ExtsysException {
+    try {
+      externalSystemproxy.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
+    } catch (Exception e) {
+      throw new ExtsysException("Delete EMS from A&AI failed.", e);
+    }
   }
 }
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ICloudRegion.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ICloudRegion.java
index 3b51e29..8f38619 100644 (file)
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ICloudRegion.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ICloudRegion.java
@@ -27,6 +27,7 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
 import org.onap.aai.esr.entity.aai.CloudRegionDetail;
+import org.onap.aai.esr.exception.ExtsysException;
 
 
 @Path("/cloud-regions")
@@ -40,7 +41,7 @@ public interface ICloudRegion {
       @HeaderParam("X-FromAppId") String fromApp,
       @HeaderParam("Authorization") String authorization,
       @PathParam("cloud_owner") String cloud_owner,
-      @PathParam("cloud_region_id") String cloud_region_id, CloudRegionDetail cloudRegion) throws Exception;
+      @PathParam("cloud_region_id") String cloud_region_id, CloudRegionDetail cloudRegion) throws ExtsysException;
 
   @GET
   @Path("/cloud-region/{cloud_owner}/{cloud_region_id}?depth=all")
@@ -50,14 +51,14 @@ public interface ICloudRegion {
       @HeaderParam("X-FromAppId") String fromApp,
       @HeaderParam("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) throws ExtsysException;
   
   @GET
   @Consumes(MediaType.APPLICATION_JSON)
   @Produces(MediaType.APPLICATION_JSON)
   public String queryVIMList(@HeaderParam("X-TransactionId") String transactionId,
       @HeaderParam("X-FromAppId") String fromApp,
-      @HeaderParam("Authorization") String authorization) throws Exception;
+      @HeaderParam("Authorization") String authorization) throws ExtsysException;
 
   @DELETE
   @Path("/cloud-region/{cloud_owner}/{cloud_region_id}")
@@ -68,5 +69,5 @@ public interface ICloudRegion {
       @HeaderParam("Authorization") String authorization,
       @PathParam("cloud_owner") String cloud_owner,
       @PathParam("cloud_region_id") String cloud_region_id,
-      @QueryParam("resource-version") String resourceVersion) throws Exception;
+      @QueryParam("resource-version") String resourceVersion) throws ExtsysException;
 }
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IExternalSystem.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IExternalSystem.java
index 859120d..037b077 100644 (file)
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IExternalSystem.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IExternalSystem.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.MediaType;
 import org.onap.aai.esr.entity.aai.EsrEmsDetail;
 import org.onap.aai.esr.entity.aai.EsrThirdpartySdncDetail;
 import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
+import org.onap.aai.esr.exception.ExtsysException;
 
 @Path("/")
 public interface IExternalSystem {
@@ -40,7 +41,7 @@ public interface IExternalSystem {
   public void registerVNFM(@HeaderParam("X-TransactionId") String transactionId,
       @HeaderParam("X-FromAppId") String fromApp,
       @HeaderParam("Authorization") String authorization, @PathParam("vnfm_id") String vnfmId,
-      EsrVnfmDetail esrVnfmDetail) throws Exception;
+      EsrVnfmDetail esrVnfmDetail) throws ExtsysException;
 
   @GET
   @Path("/esr-vnfm-list/esr-vnfm/{vnfm_id}?depth=all")
@@ -49,7 +50,7 @@ public interface IExternalSystem {
   public String queryVNFMDetail(@HeaderParam("X-TransactionId") String transactionId,
       @HeaderParam("X-FromAppId") String fromApp,
       @HeaderParam("Authorization") String authorization, @PathParam("vnfm_id") String vnfmId)
-      throws Exception;
+      throws ExtsysException;
 
   @GET
   @Path("/esr-vnfm-list")
@@ -57,7 +58,7 @@ public interface IExternalSystem {
   @Produces(MediaType.APPLICATION_JSON)
   public String queryVNFMList(@HeaderParam("X-TransactionId") String transactionId,
       @HeaderParam("X-FromAppId") String fromApp,
-      @HeaderParam("Authorization") String authorization) throws Exception;
+      @HeaderParam("Authorization") String authorization) throws ExtsysException;
 
   @DELETE
   @Path("/esr-vnfm-list/esr-vnfm/{vnfm_id}")
@@ -67,7 +68,7 @@ public interface IExternalSystem {
       @HeaderParam("X-FromAppId") String fromApp,
       @HeaderParam("Authorization") String authorization,
       @PathParam("vnfm_id") String vnfmId,
-      @QueryParam("resource-version") String resourceVersion) throws Exception;
+      @QueryParam("resource-version") String resourceVersion) throws ExtsysException;
 
   @PUT
   @Path("/esr-ems-list/esr-ems/{ems_id}")
@@ -76,7 +77,7 @@ public interface IExternalSystem {
   public void registerEMS(@HeaderParam("X-TransactionId") String transactionId,
       @HeaderParam("X-FromAppId") String fromApp,
       @HeaderParam("Authorization") String authorization, @PathParam("ems_id") String emsId,
-      EsrEmsDetail esrEmsDetail) throws Exception;
+      EsrEmsDetail esrEmsDetail) throws ExtsysException;
 
   @GET
   @Path("/esr-ems-list/esr-ems/{ems_id}?depth=all")
@@ -85,7 +86,7 @@ public interface IExternalSystem {
   public String queryEMSDetail(@HeaderParam("X-TransactionId") String transactionId,
       @HeaderParam("X-FromAppId") String fromApp,
       @HeaderParam("Authorization") String authorization, @PathParam("ems_id") String emsId)
-      throws Exception;
+      throws ExtsysException;
 
   @GET
   @Path("/esr-ems-list")
@@ -93,7 +94,7 @@ public interface IExternalSystem {
   @Produces(MediaType.APPLICATION_JSON)
   public String queryEMSList(@HeaderParam("X-TransactionId") String transactionId,
       @HeaderParam("X-FromAppId") String fromApp,
-      @HeaderParam("Authorization") String authorization) throws Exception;
+      @HeaderParam("Authorization") String authorization) throws ExtsysException;
 
   @DELETE
   @Path("/esr-ems-list/esr-ems/{ems_id}")
@@ -103,7 +104,7 @@ public interface IExternalSystem {
       @HeaderParam("X-FromAppId") String fromApp,
       @HeaderParam("Authorization") String authorization,
       @PathParam("ems_id") String emsId,
-      @QueryParam("resource-version") String resourceVersion) throws Exception;
+      @QueryParam("resource-version") String resourceVersion) throws ExtsysException;
   
   @PUT
   @Path("/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")
@@ -112,7 +113,7 @@ public interface IExternalSystem {
   public void registerThirdpartySdnc(@HeaderParam("X-TransactionId") String transactionId,
       @HeaderParam("X-FromAppId") String fromApp,
       @HeaderParam("Authorization") String authorization, @PathParam("thirdparty-sdnc-id") String thirdpartySdncId,
-      EsrThirdpartySdncDetail esrThirdpartySdncDetail) throws Exception;
+      EsrThirdpartySdncDetail esrThirdpartySdncDetail) throws ExtsysException;
 
   @GET
   @Path("/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}?depth=all")
@@ -121,7 +122,7 @@ public interface IExternalSystem {
   public String queryThirdpartySdncDetail(@HeaderParam("X-TransactionId") String transactionId,
       @HeaderParam("X-FromAppId") String fromApp,
       @HeaderParam("Authorization") String authorization, @PathParam("thirdparty-sdnc-id") String thirdpartySdncId)
-      throws Exception;
+      throws ExtsysException;
 
   @GET
   @Path("/esr-thirdparty-sdnc-list")
@@ -129,7 +130,7 @@ public interface IExternalSystem {
   @Produces(MediaType.APPLICATION_JSON)
   public String queryThirdpartySdncList(@HeaderParam("X-TransactionId") String transactionId,
       @HeaderParam("X-FromAppId") String fromApp,
-      @HeaderParam("Authorization") String authorization) throws Exception;
+      @HeaderParam("Authorization") String authorization) throws ExtsysException;
 
   @DELETE
   @Path("/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")
@@ -139,5 +140,5 @@ public interface IExternalSystem {
       @HeaderParam("X-FromAppId") String fromApp,
       @HeaderParam("Authorization") String authorization,
       @PathParam("thirdparty-sdnc-id") String thirdpartySdncId,
-      @QueryParam("resource-version") String resourceVersion) throws Exception;
+      @QueryParam("resource-version") String resourceVersion) throws ExtsysException;
 }
ESR backend, mainly include the function of external system reachable check and data pretreatment