Repository: incubator-edgent Updated Branches: refs/heads/develop d2e471040 -> 17bcbb2c7
- Addressed the SonarQube issues reported for ConsoleJobServlet.java Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/98bc09f8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/98bc09f8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/98bc09f8 Branch: refs/heads/develop Commit: 98bc09f8a81b28c8f852691c3c45edcdf11ab85d Parents: ab1f04a Author: Christofer Dutz <christofer.d...@c-ware.de> Authored: Sun Nov 5 17:55:13 2017 +0100 Committer: Christofer Dutz <christofer.d...@c-ware.de> Committed: Sun Nov 5 17:55:13 2017 +0100 ---------------------------------------------------------------------- .../console/servlets/ConsoleJobServlet.java | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/98bc09f8/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java ---------------------------------------------------------------------- diff --git a/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java b/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java index d1b1fb9..94bc913 100644 --- a/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java +++ b/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java @@ -50,32 +50,31 @@ public class ConsoleJobServlet extends HttpServlet { boolean jobsInfo = false; boolean jobGraph = false; for(Map.Entry<String,String[]> entry : parameterMap.entrySet()) { - if (entry.getKey().equals("jobsInfo")) { + if ("jobsInfo".equals(entry.getKey())) { String[] vals = entry.getValue(); - if (vals[0].equals("true")) { + if ("true".equals(vals[0])) { jobsInfo = true; } - } else if (entry.getKey().equals("jobgraph")) { + } else if ("jobgraph".equals(entry.getKey())) { String[] vals = entry.getValue(); - if (vals[0].equals("true")) { + if ("true".equals(vals[0])) { jobGraph = true; } - } else if (entry.getKey().equals("jobId")) { + } else if ("jobId".equals(entry.getKey())) { String[] ids = entry.getValue(); if (ids.length == 1) { jobId = ids[0]; } } } - - StringBuffer sbuf = new StringBuffer(); + StringBuilder sbuf = new StringBuilder(); sbuf.append("*:interface="); sbuf.append(ObjectName.quote("org.apache.edgent.execution.mbeans.JobMXBean")); sbuf.append(",type="); sbuf.append(ObjectName.quote("job")); - if (!jobId.equals("")) { + if (!jobId.isEmpty()) { sbuf.append(",id="); sbuf.append(ObjectName.quote(jobId)); } @@ -90,13 +89,16 @@ public class ConsoleJobServlet extends HttpServlet { String jsonString = ""; if (jobsInfo) { jsonString = JobUtil.getJobsInfo(jobObjName); - } else if (jobGraph && !(jobId.equals("")) && !(jobId.equals("undefined"))) { + } else if (jobGraph && !(jobId.isEmpty()) && !("undefined".equals(jobId))) { jsonString = JobUtil.getJobGraph(jobObjName); } response.setContentType("application/json"); response.setCharacterEncoding("UTF-8"); - response.getWriter().write(jsonString); - + try { + response.getWriter().write(jsonString); + } catch (IOException e) { + throw new ServletException(e); + } } }
