Issue-ID: PORTAL-865
Change-Id: Ied1d101cb246b9e433c7cc968fa95ca4bcdbfcb5
Signed-off-by: Rupinder <rupinsi1@in.ibm.com>
* under the Apache License, Version 2.0 (the "License");
* you may not use this software except in compliance with the License.
* You may obtain a copy of the License at
* under the Apache License, Version 2.0 (the "License");
* you may not use this software except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ExceptionHandler;
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.RestController;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@Autowired
AdminRolesService adminRolesService;
@Autowired
AdminRolesService adminRolesService;
- @RequestMapping(value={"/getFavorites"}, method = RequestMethod.GET,produces = "application/json")
+ @GetMapping(value={"/getFavorites"}, produces = "application/json")
public List<FavoritesFunctionalMenuItemJson> getFavoritesForUser(HttpServletRequest request, HttpServletResponse response) throws Exception {
String loginId = "";
String userAgent = "";
public List<FavoritesFunctionalMenuItemJson> getFavoritesForUser(HttpServletRequest request, HttpServletResponse response) throws Exception {
String loginId = "";
String userAgent = "";
- @RequestMapping(value={"/functionalMenuItemsForUser"}, method = RequestMethod.GET,produces = "application/json")
+ @GetMapping(value={"/functionalMenuItemsForUser"}, produces = "application/json")
public List<FunctionalMenuItem> getFunctionalMenuItemsForUser(HttpServletRequest request, HttpServletResponse response) throws Exception {
String loginId = "";
String userAgent = "";
public List<FunctionalMenuItem> getFunctionalMenuItemsForUser(HttpServletRequest request, HttpServletResponse response) throws Exception {
String loginId = "";
String userAgent = "";
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
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 org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
private static final Logger logger = LoggerFactory.getLogger(DatabaseFileUploadController.class);
@ResponseBody
private static final Logger logger = LoggerFactory.getLogger(DatabaseFileUploadController.class);
@ResponseBody
- @RequestMapping(value = "/microservices/markup/{widgetId}", method = RequestMethod.GET)
+ @GetMapping(value = "/microservices/markup/{widgetId}")
public String getWidgetMarkup(HttpServletRequest request, HttpServletResponse response, @PathVariable("widgetId") long widgetId){
String markup = null;
try{
public String getWidgetMarkup(HttpServletRequest request, HttpServletResponse response, @PathVariable("widgetId") long widgetId){
String markup = null;
try{
- @RequestMapping(value = "/microservices/{widgetId}/controller.js", method = RequestMethod.GET)
+ @GetMapping(value = "/microservices/{widgetId}/controller.js")
public String getWidgetController(HttpServletRequest request, HttpServletResponse response, @PathVariable("widgetId") long widgetId){
String controller = null;
try{
public String getWidgetController(HttpServletRequest request, HttpServletResponse response, @PathVariable("widgetId") long widgetId){
String controller = null;
try{
- @RequestMapping(value = "/microservices/{widgetId}/framework.js", method = RequestMethod.GET)
+ @GetMapping(value = "/microservices/{widgetId}/framework.js")
public String getWidgetFramework(HttpServletRequest request, HttpServletResponse response,
@PathVariable("widgetId") long widgetId){
String framework = null;
public String getWidgetFramework(HttpServletRequest request, HttpServletResponse response,
@PathVariable("widgetId") long widgetId){
String framework = null;
- @RequestMapping(value = "/microservices/{widgetId}/styles.css", method = RequestMethod.GET)
+ @GetMapping(value = "/microservices/{widgetId}/styles.css")
public String getWidgetCSS(HttpServletRequest request, HttpServletResponse response,
@PathVariable("widgetId") long widgetId){
String css = null;
public String getWidgetCSS(HttpServletRequest request, HttpServletResponse response,
@PathVariable("widgetId") long widgetId){
String css = null;
import javax.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletResponse;
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.RestController;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class HealthController {
@RestController
public class HealthController {
- @RequestMapping(value = { "/health" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/health" }, produces = "application/json")
public HealthStatus getWidgetCatalog(HttpServletRequest request, HttpServletResponse response) {
return new HealthStatus("ok");
}
public HealthStatus getWidgetCatalog(HttpServletRequest request, HttpServletResponse response) {
return new HealthStatus("ok");
}