aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EService.java1
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequest.java1
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequest.java1
-rwxr-xr-xserver/src/main/java/org/onap/usecaseui/server/controller/AlarmController.java2
-rwxr-xr-xserver/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java1
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/controller/lcm/CustomerController.java2
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/controller/lcm/OrchestratorController.java3
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java3
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java2
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java2
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java2
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMgtController.java1
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMonitorController.java1
13 files changed, 3 insertions, 19 deletions
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 4b0b98cb..10b480e3 100644
--- 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 d4642fe1..3341a895 100644
--- 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 9ecc2904..46ee211b 100644
--- 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 2134aa74..68f9fc67 100755
--- 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();
- @RequestMapping(value = {"/usecase-ui"}, method = RequestMethod.GET)
+ @GetMapping(value = {"/usecase-ui"})
public ModelAndView index(){
return new ModelAndView("index");
}
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 9651a2d6..5366e4ba 100755
--- 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 f3f938c3..2b455d60 100644
--- 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 2d0eecc7..1d4b127b 100644
--- 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();
}
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java
index 47ff54ef..8b7bc923 100644
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java
@@ -41,12 +41,9 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
-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.PostMapping;
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;
import org.springframework.web.bind.annotation.RestController;
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java
index 22f8ca61..9ac0d3d2 100644
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceInstanceController.java
@@ -30,9 +30,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.stereotype.Controller;
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.ResponseBody;
import com.alibaba.fastjson.JSONArray;
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java
index f3c16fa9..f53a510a 100644
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java
@@ -31,12 +31,10 @@ 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.PostMapping;
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.ResponseBody;
import java.text.ParseException;
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java
index 9c68a65d..c91f28be 100644
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java
@@ -23,9 +23,7 @@ import org.springframework.stereotype.Controller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.ResponseBody;
import javax.annotation.Resource;
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMgtController.java b/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMgtController.java
index 4187fc1a..bfe22296 100644
--- a/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMgtController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMgtController.java
@@ -26,7 +26,6 @@ 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.ResponseBody;
@Controller
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMonitorController.java b/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMonitorController.java
index 24ef506d..2819b115 100644
--- a/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMonitorController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/nsmf/ResourceMonitorController.java
@@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
@Controller