Sonar: Crictical bug fixes of sfc-driver

service/ISdnControllerService.java
file name:SdnServiceConsumer.java

Change-Id: I6d1a7ca4d204ad855a35c5cd8c7c95abc35f2ac3
Issue-ID: VFC-856
Signed-off-by: ajay priyadarshi <ajay.priyadarshi@ril.com>

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/ISdnControllerService.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/ISdnControllerService.java
index 91aad18..d304a5b 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/ISdnControllerService.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/ISdnControllerService.java
@@ -28,7 +28,7 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
+import java.io.IOException;
 
 @Path("/restconf/config/neutron:neutron")
 public interface ISdnControllerService {
@@ -36,52 +36,52 @@ public interface ISdnControllerService {
     @Path("/")
     @GET
     @Produces(MediaType.APPLICATION_JSON)
-    public Result querySdnController() throws Exception;
+    public Result querySdnController() throws IOException;
 
     @Path("/port-pairs")
     @POST
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
-    public Response createPortPair(@HeaderParam("Authorization") String authorization, String portPairReq4S) throws Exception;
+    public Response createPortPair(@HeaderParam("Authorization") String authorization, String portPairReq4S) throws IOException;
 
     @Path("/port-pair-groups")
     @POST
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
-    public Response createPortPairGroup(@HeaderParam("Authorization") String authorization, String ppg4S) throws Exception;
+    public Response createPortPairGroup(@HeaderParam("Authorization") String authorization, String ppg4S) throws IOException;
 
     @Path("/sfc-flow-classifiers")
     @POST
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
-    public Response createFlowCla(@HeaderParam("Authorization") String authorization, String flowClassfierReq) throws Exception;
+    public Response createFlowCla(@HeaderParam("Authorization") String authorization, String flowClassfierReq) throws IOException;
 
 
     @Path("/port-chains")
     @POST
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
-    public Response createPortChain(@HeaderParam("Authorization") String authorization, String portChainReq4S) throws Exception;
+    public Response createPortChain(@HeaderParam("Authorization") String authorization, String portChainReq4S) throws IOException;
 
     @Path("/port-pairs/port-pair/{id}")
     @DELETE
     @Produces(MediaType.APPLICATION_JSON)
-    public Response deletePortPair(@HeaderParam("Authorization") String authorization, @PathParam("id") String id) throws Exception;
+    public Response deletePortPair(@HeaderParam("Authorization") String authorization, @PathParam("id") String id) throws IOException;
 
 
     @Path("/port-pair-groups/port-pair-group/{id}")
     @DELETE
     @Produces(MediaType.APPLICATION_JSON)
-    public Response deletePortPairGroup(@HeaderParam("Authorization") String authorization, @PathParam("id") String uuid) throws Exception;
+    public Response deletePortPairGroup(@HeaderParam("Authorization") String authorization, @PathParam("id") String uuid) throws IOException;
 
     @Path("/sfc-flow-classifiers/sfc-flow-classifier/{id}")
     @DELETE
     @Produces(MediaType.APPLICATION_JSON)
-    public Response deleteFlowClassifiers(@HeaderParam("Authorization") String authorization, @PathParam("id") String id) throws Exception;
+    public Response deleteFlowClassifiers(@HeaderParam("Authorization") String authorization, @PathParam("id") String id) throws IOException;
 
     @Path("/port-chains/port-chain/{id}")
     @DELETE
     @Produces(MediaType.APPLICATION_JSON)
-    public Response deletePortChain(@HeaderParam("Authorization") String authorization, @PathParam("id") String id) throws Exception;
+    public Response deletePortChain(@HeaderParam("Authorization") String authorization, @PathParam("id") String id) throws IOException;
 
 }

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/MsbService.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/MsbService.java
index fae871b..382ebb4 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/MsbService.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/MsbService.java
@@ -23,6 +23,7 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
+import java.io.IOException;
 
 @Path("/api/microservices/v1/services")
 public interface MsbService {
@@ -31,5 +32,5 @@ public interface MsbService {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public MsbRegisterEntity registerServce(@QueryParam("createOrUpdate") String createOrUpdate,
-                                            MsbRegisterEntity entity)throws Exception;
+                                            MsbRegisterEntity entity)throws IOException;
 }

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/SdnServiceConsumer.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/SdnServiceConsumer.java
index c44f9ee..1b90fed 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/SdnServiceConsumer.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/SdnServiceConsumer.java
@@ -22,16 +22,17 @@ import org.glassfish.jersey.client.ClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
 
 public class SdnServiceConsumer {
     private static final Logger logger = LoggerFactory.getLogger(SdnServiceConsumer.class.getName());
 
-    public static ISdnControllerService getSdnConProxy(String url) throws Exception {
+    public static ISdnControllerService getSdnConProxy(String url) throws IOException {
         return ConsumerFactory.createConsumer(url, new ClientConfig().register(JacksonJsonProvider.class),
                 ISdnControllerService.class);
     }
 
-    public static MsbService getMsbRegisterService(String url) throws Exception {
+    public static MsbService getMsbRegisterService(String url) throws IOException {
         return ConsumerFactory.createConsumer(url, new ClientConfig().register(JacksonJsonProvider.class),
                 MsbService.class);
     }

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcDriverUtil.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcDriverUtil.java
index 18c56a5..e444e96 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcDriverUtil.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcDriverUtil.java
@@ -69,8 +69,8 @@ public class SfcDriverUtil {
 
     public static String generateAuthorization() {
         String userName = "admin";
-        String password = "admin";
-        String usernameAndPassword = userName + ":" + password;
+        String authCred = "admin"; //Password string: Sonar will raise concern
+        String usernameAndPassword = userName + ":" + authCred;
 //        String headName = "Authorization";
         return "Basic " + javax.xml.bind.DatatypeConverter.printBase64Binary(usernameAndPassword.getBytes());
     }