lowered code smells

Issue-ID: USECASEUI-423
Change-Id: I33d359e1ec96198a70c118e781cf010c556e3229
Signed-off-by: Rupinder <rupinsi1@in.ibm.com>

diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EService.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EService.java
index 4b0b98c..10b480e 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EService.java
@@ -17,7 +17,6 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.onap.usecaseui.server.bean.lcm.sotne2eservice.E2EParameters;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequest.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequest.java
index d4642fe..3341a89 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequest.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequest.java
@@ -17,7 +17,6 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.onap.usecaseui.server.bean.lcm.sotne2eservice.E2EService;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequest.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequest.java
index 9ecc290..46ee211 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequest.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequest.java
@@ -17,7 +17,6 @@ package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.onap.usecaseui.server.bean.lcm.sotne2eservice.E2EParameters;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java
index 2134aa7..68f9fc6 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java
@@ -92,7 +92,7 @@ public class AlarmController
     private ObjectMapper omAlarm = new ObjectMapper();\r
 \r
 \r
-    @RequestMapping(value = {"/usecase-ui"}, method = RequestMethod.GET)\r
+    @GetMapping(value = {"/usecase-ui"})\r
     public ModelAndView index(){\r
         return new ModelAndView("index");\r
     }\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java b/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java
index 9651a2d..5366e4b 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java
@@ -41,7 +41,6 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 

diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java
index f3f938c..2b455d6 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java
@@ -22,11 +22,9 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 

diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/OrchestratorController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/OrchestratorController.java
index 2d0eecc..1d4b127 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/OrchestratorController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/OrchestratorController.java
@@ -20,6 +20,7 @@ import org.onap.usecaseui.server.service.lcm.domain.aai.bean.AAIEsrNfvo;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -39,7 +40,7 @@ public class OrchestratorController {
     }
 
     @ResponseBody
-    @RequestMapping(value = {"/uui-lcm/orchestrators"}, method = RequestMethod.GET , produces = "application/json")
+    @GetMapping(value = {"/uui-lcm/orchestrators"}, produces = "application/json")
     public List<AAIEsrNfvo> getOrchestrators(){
         return orchestratorService.listOrchestrator();
     }