X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FGroupServlet.java;h=432ea3c0bb7dcae0a190ed514942e611253751c3;hb=0ad65c47b4fbddd5d1b653c5e38dcdf84884de9f;hp=484d54b57391bf0d5f11d7adf6b66eacfd3d2e4e;hpb=0645ccf674f388cc989ef43d2ce24f359915e453;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/GroupServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/GroupServlet.java
index 484d54b5..432ea3c0 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/GroupServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/GroupServlet.java
@@ -24,17 +24,18 @@
 
 package org.onap.dmaap.datarouter.provisioning;
 
+import static org.onap.dmaap.datarouter.provisioning.utils.HttpServletUtils.sendResponseError;
+
 import java.io.IOException;
 import java.io.InvalidObjectException;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.json.JSONObject;
+
 import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;
 import org.onap.dmaap.datarouter.provisioning.beans.Group;
 
-import static org.onap.dmaap.datarouter.provisioning.utils.HttpServletUtils.sendResponseError;
+
 
 /**
  * This servlet handles provisioning for the <groups> which is generated by the provisioning
@@ -61,6 +62,7 @@ public class GroupServlet extends ProxyServlet {
         eventlogger.error(elr.toString());
         sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);
     }
+
     /**
      * GET on the the list of groups to a feed/sub.
      * See the <i>Groups Collection Query</i> section in the <b>Provisioning API</b>
@@ -113,6 +115,7 @@ public class GroupServlet extends ProxyServlet {
         }
 
     }
+
     /**
      * PUT on the &lt;GROUPS&gt; -- not supported.
      */
@@ -178,8 +181,6 @@ public class GroupServlet extends ProxyServlet {
             sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
             return;
         }
-        if (intlogger.isDebugEnabled())
-            intlogger.debug(jo.toString());
         Group gup;
         try {
             gup = new Group(jo);
@@ -194,9 +195,9 @@ public class GroupServlet extends ProxyServlet {
         gup.setGroupid(oldgup.getGroupid());
         Group gb2 = Group.getGroupMatching(gup, oldgup.getGroupid());
         if (gb2 != null) {
-            eventlogger.warn("PROV0011 Creating a duplicate Group: "+gup.getName());
+            eventlogger.warn("PROV0011 Creating a duplicate Group: " + gup.getName());
             elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
-            sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Duplicate Group:"+gup.getName(), eventlogger);
+            sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST,"Duplicate Group:" + gup.getName(), eventlogger);
             return;
         }
 
@@ -220,6 +221,7 @@ public class GroupServlet extends ProxyServlet {
             sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, eventlogger);
         }
     }
+
     /**
      * POST on the &lt;groups&gt; -- create a new GROUPS to a feed.
      * See the <i>Creating a GROUPS</i> section in the <b>Provisioning API</b>
@@ -252,8 +254,8 @@ public class GroupServlet extends ProxyServlet {
         // check content type is SUB_CONTENT_TYPE, version 1.0
         ContentHeader ch = getContentHeader(req);
         String ver = ch.getAttribute("version");
-        if (!ch.getType().equals(GROUP_BASECONTENT_TYPE) || !(ver.equals("1.0") || ver.equals("2.0"))) {
-            intlogger.debug("Content-type is: "+req.getHeader("Content-Type"));
+        if (!ch.getType().equals(GROUP_BASECONTENT_TYPE) || !("1.0".equals(ver) || "2.0".equals(ver))) {
+            intlogger.debug("Content-type is: " + req.getHeader("Content-Type"));
             message = "Incorrect content-type";
             elr.setMessage(message);
             elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
@@ -270,9 +272,6 @@ public class GroupServlet extends ProxyServlet {
             sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
             return;
         }
-        if (intlogger.isDebugEnabled())
-            intlogger.debug(jo.toString());
-
         Group gup;
         try {
             gup = new Group(jo);
@@ -288,9 +287,9 @@ public class GroupServlet extends ProxyServlet {
         // Check if this group already exists; not an error (yet), just warn
         Group gb2 = Group.getGroupMatching(gup);
         if (gb2 != null) {
-            eventlogger.warn("PROV0011 Creating a duplicate Group: "+gup.getName());
+            eventlogger.warn("PROV0011 Creating a duplicate Group: " + gup.getName());
             elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
-            sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Duplicate Group:"+gup.getName(), eventlogger);
+            sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST,"Duplicate Group:" + gup.getName(), eventlogger);
             return;
         }