diff options
Diffstat (limited to 'ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample')
7 files changed, 27 insertions, 24 deletions
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/AngularSinglePageController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/AngularSinglePageController.java index 96b602c3..98f1db84 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/AngularSinglePageController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/AngularSinglePageController.java @@ -45,7 +45,7 @@ import javax.servlet.http.HttpServletRequest; import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; /** @@ -57,7 +57,7 @@ import org.springframework.web.servlet.ModelAndView; @RequestMapping("/") public class AngularSinglePageController extends RestrictedBaseController { - @RequestMapping(value = { "/singlePageSample" }, method = RequestMethod.GET) + @GetMapping(value = { "/singlePageSample" }) public ModelAndView view(HttpServletRequest request) { Map<String, Object> model = new HashMap<>(); return new ModelAndView("single_page_sample", "model", model); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/BroadcastController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/BroadcastController.java index 4392aeb5..0cbcd2ed 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/BroadcastController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/BroadcastController.java @@ -12,7 +12,7 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software + * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and @@ -56,7 +56,8 @@ import org.onap.portalsdk.core.web.support.JsonMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.ModelAndView; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -76,7 +77,7 @@ public class BroadcastController extends RestrictedBaseController { @Autowired private BroadcastService broadcastService; - @RequestMapping(value = { "/broadcast" }, method = RequestMethod.GET) + @GetMapping(value = { "/broadcast" }) public ModelAndView broadcast(HttpServletRequest request) { Map<String, Object> model = new HashMap<>(); ObjectMapper mapper = new ObjectMapper(); @@ -90,7 +91,7 @@ public class BroadcastController extends RestrictedBaseController { return new ModelAndView(getViewName(), model); } - @RequestMapping(value = { "/get_broadcast" }, method = RequestMethod.GET) + @GetMapping(value = { "/get_broadcast" }) public void getBroadcast(HttpServletRequest request, HttpServletResponse response) { Map<String, Object> model = new HashMap<>(); ObjectMapper mapper = new ObjectMapper(); @@ -121,7 +122,7 @@ public class BroadcastController extends RestrictedBaseController { return lookupData; } - @RequestMapping(value = { "/broadcast/save" }, method = RequestMethod.POST) + @PostMapping(value = { "/broadcast/save" }) public ModelAndView save(HttpServletRequest request, HttpServletResponse response) throws IOException { try { diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/BroadcastListController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/BroadcastListController.java index c9c666fb..4e66743e 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/BroadcastListController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/BroadcastListController.java @@ -54,7 +54,8 @@ import org.onap.portalsdk.core.web.support.JsonMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.ModelAndView; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -71,7 +72,7 @@ public class BroadcastListController extends RestrictedBaseController { @Autowired private BroadcastService broadcastService; - @RequestMapping(value = { "/broadcast_list" }, method = RequestMethod.GET) + @GetMapping(value = { "/broadcast_list" }) public ModelAndView broadcastList(HttpServletRequest request) { Map<String, Object> model = new HashMap<>(); @@ -79,7 +80,7 @@ public class BroadcastListController extends RestrictedBaseController { return new ModelAndView(getViewName(), model); } - @RequestMapping(value = { "/get_broadcast_list" }, method = RequestMethod.GET) + @GetMapping(value = { "/get_broadcast_list" }) public void getBroadcast(HttpServletRequest request, HttpServletResponse response) { Map<String, Object> model = new HashMap<>(); ObjectMapper mapper = new ObjectMapper(); @@ -96,7 +97,7 @@ public class BroadcastListController extends RestrictedBaseController { } - @RequestMapping(value = { "/broadcast_list/remove" }, method = RequestMethod.POST) + @PostMapping(value = { "/broadcast_list/remove" }) public ModelAndView remove(HttpServletRequest request, HttpServletResponse response) throws IOException { try { @@ -131,7 +132,7 @@ public class BroadcastListController extends RestrictedBaseController { } - @RequestMapping(value = { "/broadcast_list/toggleActive" }, method = RequestMethod.POST) + @PostMapping(value = { "/broadcast_list/toggleActive" }) public ModelAndView toggleActive(HttpServletRequest request, HttpServletResponse response) throws IOException { try { diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CallflowController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CallflowController.java index 09b28dc1..34c777cd 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CallflowController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CallflowController.java @@ -40,7 +40,7 @@ package org.onap.portalapp.controller.sample; import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; @@ -54,7 +54,7 @@ import org.springframework.web.servlet.ModelAndView; @RequestMapping("/") public class CallflowController extends RestrictedBaseController { - @RequestMapping(value = { "/callflow" }, method = RequestMethod.GET) + @GetMapping(value = { "/callflow" }) public ModelAndView plot() { final String defaultViewName = null; return new ModelAndView(defaultViewName); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/LeafletMapContoller.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/LeafletMapContoller.java index bc9e2667..65e2c7aa 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/LeafletMapContoller.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/LeafletMapContoller.java @@ -40,7 +40,7 @@ package org.onap.portalapp.controller.sample; import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; /** @@ -52,7 +52,7 @@ import org.springframework.web.servlet.ModelAndView; @RequestMapping("/") public class LeafletMapContoller extends RestrictedBaseController { - @RequestMapping(value = { "/leafletMap" }, method = RequestMethod.GET) + @GetMapping(value = { "/leafletMap" }) public ModelAndView plot() { final String defaultViewName = null; return new ModelAndView(defaultViewName); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/NetMapController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/NetMapController.java index f3f739f4..d8c9d8ab 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/NetMapController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/NetMapController.java @@ -45,7 +45,7 @@ import javax.servlet.http.HttpServletRequest; import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; /** @@ -56,7 +56,7 @@ import org.springframework.web.servlet.ModelAndView; @RequestMapping("/") public class NetMapController extends RestrictedBaseController { - @RequestMapping(value = { "/net_map" }, method = RequestMethod.GET) + @GetMapping(value = { "/net_map" }) public ModelAndView plot(HttpServletRequest request) { Map<String, Object> model = new HashMap<>(); model.put("frame_int", "net_map_int"); @@ -64,7 +64,7 @@ public class NetMapController extends RestrictedBaseController { return new ModelAndView("frame_insert", model); } - @RequestMapping(value = { "/net_map_int" }, method = RequestMethod.GET) + @GetMapping(value = { "/net_map_int" }) public ModelAndView plot2() { // The view name defaults to the request without any suffix. final String defaultViewName = null; diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/PostDroolsController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/PostDroolsController.java index cf7fa06a..e0a2fdba 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/PostDroolsController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/PostDroolsController.java @@ -52,7 +52,8 @@ import org.onap.portalsdk.core.web.support.JsonMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.ModelAndView; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -68,12 +69,12 @@ public class PostDroolsController extends RestrictedBaseController { @Autowired private PostDroolsService postDroolsService; - @RequestMapping(value = { "/drools" }, method = RequestMethod.GET) + @GetMapping(value = { "/drools" }) public ModelAndView drools(HttpServletRequest request) { return new ModelAndView(getViewName()); } - @RequestMapping(value = { "/getDrools" }, method = RequestMethod.GET) + @GetMapping(value = { "/getDrools" }) public void getDrools(HttpServletRequest request, HttpServletResponse response) { @@ -88,7 +89,7 @@ public class PostDroolsController extends RestrictedBaseController { } } - @RequestMapping(value = { "/getDroolDetails" }, method = RequestMethod.GET) + @GetMapping(value = { "/getDroolDetails" }) public void getDroolDetails(HttpServletRequest request, HttpServletResponse response) { ObjectMapper mapper = new ObjectMapper(); @@ -108,7 +109,7 @@ public class PostDroolsController extends RestrictedBaseController { } } - @RequestMapping(value = { "/post_drools/execute" }, method = RequestMethod.POST) + @PostMapping(value = { "/post_drools/execute" }) public ModelAndView search(HttpServletRequest request, HttpServletResponse response) { try { ObjectMapper mapper = new ObjectMapper(); |