Sync Integ to Master

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / servlets / ConfigMgrServlet.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConfigMgrServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConfigMgrServlet.java
index 164b1d7..f8aa39c 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConfigMgrServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConfigMgrServlet.java
@@ -20,18 +20,7 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
+import com.jcabi.aspects.Loggable;
 import org.openecomp.sdc.be.config.Configuration;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.common.api.Constants;
@@ -39,7 +28,11 @@ import org.openecomp.sdc.common.servlets.BasicServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.jcabi.aspects.Loggable;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
 
 /**
  * Root resource (exposed at "/" path)
@@ -48,78 +41,78 @@ import com.jcabi.aspects.Loggable;
 @Path("/configmgr")
 public class ConfigMgrServlet extends BasicServlet {
 
-       private static Logger log = LoggerFactory.getLogger(ConfigMgrServlet.class.getName());
+    private static final Logger log = LoggerFactory.getLogger(ConfigMgrServlet.class);
 
-       @GET
-       @Path("/get")
-       @Produces(MediaType.APPLICATION_JSON)
-       public String getConfig(@Context final HttpServletRequest request, @QueryParam("type") String type) {
+    @GET
+    @Path("/get")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getConfig(@Context final HttpServletRequest request, @QueryParam("type") String type) {
 
-               String result = null;
+        String result = null;
 
-               ServletContext context = request.getSession().getServletContext();
+        ServletContext context = request.getSession().getServletContext();
 
-               ConfigurationManager configurationManager = (ConfigurationManager) context.getAttribute(Constants.CONFIGURATION_MANAGER_ATTR);
+        ConfigurationManager configurationManager = (ConfigurationManager) context.getAttribute(Constants.CONFIGURATION_MANAGER_ATTR);
 
-               if (type == null || type.equals("configuration")) {
+        if (type == null || type.equals("configuration")) {
 
-                       Configuration configuration = configurationManager.getConfiguration();
-                       if (configuration == null) {
-                               log.warn("Configuration of type {} was not found", Configuration.class);
-                       } else {
-                               log.info("The value returned from getConfig is {}", configuration);
+            Configuration configuration = configurationManager.getConfiguration();
+            if (configuration == null) {
+                log.warn("Configuration of type {} was not found", Configuration.class);
+            } else {
+                log.info("The value returned from getConfig is {}", configuration);
 
-                               result = gson.toJson(configuration);
+                result = gson.toJson(configuration);
 
-                       }
-               }
+            }
+        }
 
-               return result;
+        return result;
 
-       }
+    }
 
-       @POST
-       @Path("/set1")
-       @Produces(MediaType.TEXT_PLAIN)
-       @Consumes(MediaType.APPLICATION_JSON)
-       public String setConfig1(@Context final HttpServletRequest request, Configuration configuration) {
+    @POST
+    @Path("/set1")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String setConfig1(@Context final HttpServletRequest request, Configuration configuration) {
 
-               log.debug("{}", configuration);
+        log.debug("{}", configuration);
 
-               return "ok";
+        return "ok";
 
-       }
+    }
 
-       @POST
-       @Path("/set2")
-       @Produces(MediaType.TEXT_PLAIN)
-       @Consumes(MediaType.APPLICATION_JSON)
-       public void setConfig2(@Context final HttpServletRequest request, Configuration configuration) {
+    @POST
+    @Path("/set2")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public void setConfig2(@Context final HttpServletRequest request, Configuration configuration) {
 
-               log.debug("{}", configuration);
+        log.debug("{}", configuration);
 
-       }
+    }
 
-       @PUT
-       @Path("/setput1")
-       @Produces(MediaType.TEXT_PLAIN)
-       @Consumes(MediaType.APPLICATION_JSON)
-       public String setConfig3(@Context final HttpServletRequest request, Configuration configuration) {
+    @PUT
+    @Path("/setput1")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String setConfig3(@Context final HttpServletRequest request, Configuration configuration) {
 
-               log.debug("{}", configuration);
+        log.debug("{}", configuration);
 
-               return "ok";
+        return "ok";
 
-       }
+    }
 
-       @PUT
-       @Path("/setput2")
-       @Produces(MediaType.TEXT_PLAIN)
-       @Consumes(MediaType.APPLICATION_JSON)
-       public void setConfig4(@Context final HttpServletRequest request, Configuration configuration) {
+    @PUT
+    @Path("/setput2")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public void setConfig4(@Context final HttpServletRequest request, Configuration configuration) {
 
-               log.debug("{}", configuration);
+        log.debug("{}", configuration);
 
-       }
+    }
 
 }