diff options
Diffstat (limited to 'ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample')
3 files changed, 38 insertions, 27 deletions
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 ba90f46f..600deeb3 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 @@ -37,7 +37,9 @@ */ package org.onap.portalapp.controller.sample; +import java.io.IOException; import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.Map; @@ -67,6 +69,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class BroadcastController extends RestrictedBaseController { private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(BroadcastController.class); + + private static final String BROADCAST_MESSAGE = "broadcastMessage"; + private static final String BROADCAST_SITIES = "broadcastSites"; + private static final String UTF8 = "UTF-8"; @Autowired private BroadcastService broadcastService; @@ -77,8 +83,8 @@ public class BroadcastController extends RestrictedBaseController { ObjectMapper mapper = new ObjectMapper(); try { - model.put("broadcastMessage", mapper.writeValueAsString(broadcastService.getBroadcastMessage(request))); - model.put("broadcastSites", mapper.writeValueAsString(referenceData(request).get("broadcastSites"))); + model.put(BROADCAST_MESSAGE, mapper.writeValueAsString(broadcastService.getBroadcastMessage(request))); + model.put(BROADCAST_SITIES, mapper.writeValueAsString(referenceData(request).get(BROADCAST_SITIES))); } catch (Exception e) { logger.error(EELFLoggerDelegate.errorLogger, "broadcast() failed", e); } @@ -92,8 +98,8 @@ public class BroadcastController extends RestrictedBaseController { try { - model.put("broadcastMessage", mapper.writeValueAsString(broadcastService.getBroadcastMessage(request))); - model.put("broadcastSites", mapper.writeValueAsString(referenceData(request).get("broadcastSites"))); + model.put(BROADCAST_MESSAGE, mapper.writeValueAsString(broadcastService.getBroadcastMessage(request))); + model.put(BROADCAST_SITIES, mapper.writeValueAsString(referenceData(request).get(BROADCAST_SITIES))); JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); JSONObject j = new JSONObject(msg); response.getWriter().write(j.toString()); @@ -109,7 +115,7 @@ public class BroadcastController extends RestrictedBaseController { Map lookupData = new HashMap(); if ("true".equals(SystemProperties.getProperty(SystemProperties.CLUSTERED))) { - lookupData.put("broadcastSites", AppUtils.getLookupList("fn_lu_broadcast_site", "broadcast_site_cd", + lookupData.put(BROADCAST_SITIES, AppUtils.getLookupList("fn_lu_broadcast_site", "broadcast_site_cd", "broadcast_site_descr", "", "broadcast_site_descr")); } @@ -117,21 +123,21 @@ public class BroadcastController extends RestrictedBaseController { } @RequestMapping(value = { "/broadcast/save" }, method = RequestMethod.POST) - public ModelAndView save(HttpServletRequest request, HttpServletResponse response) throws Exception { + public ModelAndView save(HttpServletRequest request, HttpServletResponse response) throws IOException { try { ObjectMapper mapper = new ObjectMapper(); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); JsonNode root = mapper.readTree(request.getReader()); - BroadcastMessage broadcastMessage = mapper.readValue(root.get("broadcastMessage").toString(), + BroadcastMessage broadcastMessage = mapper.readValue(root.get(BROADCAST_MESSAGE).toString(), BroadcastMessage.class); broadcastService.saveBroadcastMessage(broadcastMessage); - response.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding(UTF8); response.setContentType("application / json"); - request.setCharacterEncoding("UTF-8"); + request.setCharacterEncoding(UTF8); PrintWriter out = response.getWriter(); String responseString = mapper.writeValueAsString(broadcastMessage); @@ -141,8 +147,8 @@ public class BroadcastController extends RestrictedBaseController { return null; } catch (Exception e) { - response.setCharacterEncoding("UTF-8"); - request.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding(UTF8); + request.setCharacterEncoding(UTF8); PrintWriter out = response.getWriter(); out.write("An error occurred while saving the BroadcastMessage in the save () mapping-/broadcast/save "); logger.error(EELFLoggerDelegate.errorLogger, "save() failed", e); 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 8b740d0b..c9c666fb 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 @@ -37,6 +37,7 @@ */ package org.onap.portalapp.controller.sample; +import java.io.IOException; import java.io.PrintWriter; import java.util.HashMap; import java.util.Map; @@ -65,6 +66,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class BroadcastListController extends RestrictedBaseController { private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(BroadcastListController.class); + private static final String UTF8 = "UTF-8"; + @Autowired private BroadcastService broadcastService; @@ -78,7 +81,7 @@ public class BroadcastListController extends RestrictedBaseController { @RequestMapping(value = { "/get_broadcast_list" }, method = RequestMethod.GET) public void getBroadcast(HttpServletRequest request, HttpServletResponse response) { - Map<String, Object> model = new HashMap<String, Object>(); + Map<String, Object> model = new HashMap<>(); ObjectMapper mapper = new ObjectMapper(); try { model.put("model", broadcastService.getBcModel(request)); @@ -94,7 +97,7 @@ public class BroadcastListController extends RestrictedBaseController { } @RequestMapping(value = { "/broadcast_list/remove" }, method = RequestMethod.POST) - public ModelAndView remove(HttpServletRequest request, HttpServletResponse response) throws Exception { + public ModelAndView remove(HttpServletRequest request, HttpServletResponse response) throws IOException { try { @@ -106,9 +109,9 @@ public class BroadcastListController extends RestrictedBaseController { broadcastService.removeBroadcastMessage(broadcastMessage); - response.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding(UTF8); response.setContentType("application / json"); - request.setCharacterEncoding("UTF-8"); + request.setCharacterEncoding(UTF8); PrintWriter out = response.getWriter(); String responseString = mapper.writeValueAsString(broadcastMessage); @@ -118,8 +121,8 @@ public class BroadcastListController extends RestrictedBaseController { return null; } catch (Exception e) { - response.setCharacterEncoding("UTF-8"); - request.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding(UTF8); + request.setCharacterEncoding(UTF8); PrintWriter out = response.getWriter(); out.write("An error occurred while removing the BroadcastMessage in the remove ()"); logger.error(EELFLoggerDelegate.errorLogger, "remove() failed", e); @@ -129,7 +132,7 @@ public class BroadcastListController extends RestrictedBaseController { } @RequestMapping(value = { "/broadcast_list/toggleActive" }, method = RequestMethod.POST) - public ModelAndView toggleActive(HttpServletRequest request, HttpServletResponse response) throws Exception { + public ModelAndView toggleActive(HttpServletRequest request, HttpServletResponse response) throws IOException { try { @@ -141,9 +144,9 @@ public class BroadcastListController extends RestrictedBaseController { broadcastService.saveBroadcastMessage(broadcastMessage); - response.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding(UTF8); response.setContentType("application / json"); - request.setCharacterEncoding("UTF-8"); + request.setCharacterEncoding(UTF8); PrintWriter out = response.getWriter(); String responseString = mapper.writeValueAsString(broadcastMessage); @@ -153,8 +156,8 @@ public class BroadcastListController extends RestrictedBaseController { return null; } catch (Exception e) { - response.setCharacterEncoding("UTF-8"); - request.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding(UTF8); + request.setCharacterEncoding(UTF8); PrintWriter out = response.getWriter(); out.write("An error occurred while saving the BroadcastMessage in the toggleActive () "); logger.error(EELFLoggerDelegate.errorLogger, "toggleActive() failed", e); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CamundaCockpitController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CamundaCockpitController.java index c43b4acc..4c32b964 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CamundaCockpitController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CamundaCockpitController.java @@ -59,20 +59,22 @@ import org.springframework.web.bind.annotation.ResponseBody; @Controller @RequestMapping("/") -public class CamundaCockpitController extends RestrictedBaseController { +public class CamundaCockpitController extends RestrictedBaseController { + + private static final String CAMUNDA_COCKPIT_LINK = "camunda_cockpit_link"; @SuppressWarnings("rawtypes") @RequestMapping(value = {"/get_camunda_cockpit_link" }, method = RequestMethod.GET, produces = "application/json") @ResponseBody public Map getCamundaCockpitLink(HttpServletRequest request,HttpServletResponse response) { - Map<String,String> map = new HashMap<String,String>(); + Map<String,String> map = new HashMap<>(); String camundaCockpitUrl = ""; String camundaCockpitlinkDefined = "false"; - if (SystemProperties.containsProperty("camunda_cockpit_link")){ - camundaCockpitUrl = SystemProperties.getProperty("camunda_cockpit_link"); + if (SystemProperties.containsProperty(CAMUNDA_COCKPIT_LINK)){ + camundaCockpitUrl = SystemProperties.getProperty(CAMUNDA_COCKPIT_LINK); camundaCockpitlinkDefined = "true"; }; map.put("link_defined", camundaCockpitlinkDefined); - map.put("camunda_cockpit_link", camundaCockpitUrl); + map.put(CAMUNDA_COCKPIT_LINK, camundaCockpitUrl); return map; }; } |