Remove legacy certificate handling

[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..90c04b7 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
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file 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
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.servlets;
 
+import com.jcabi.aspects.Loggable;
+import io.swagger.v3.oas.annotations.servers.Server;
+import io.swagger.v3.oas.annotations.servers.Servers;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.tags.Tags;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -31,95 +35,73 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
-
 import org.openecomp.sdc.be.config.Configuration;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.servlets.BasicServlet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.jcabi.aspects.Loggable;
 
 /**
  * Root resource (exposed at "/" path)
  */
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
+@Tags({@Tag(name = "SDCE-2 APIs")})
+@Servers({@Server(url = "/sdc2/rest")})
 @Path("/configmgr")
 public class ConfigMgrServlet extends BasicServlet {
 
-       private static Logger log = LoggerFactory.getLogger(ConfigMgrServlet.class.getName());
-
-       @GET
-       @Path("/get")
-       @Produces(MediaType.APPLICATION_JSON)
-       public String getConfig(@Context final HttpServletRequest request, @QueryParam("type") String type) {
-
-               String result = null;
-
-               ServletContext context = request.getSession().getServletContext();
-
-               ConfigurationManager configurationManager = (ConfigurationManager) context.getAttribute(Constants.CONFIGURATION_MANAGER_ATTR);
-
-               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);
-
-                               result = gson.toJson(configuration);
-
-                       }
-               }
-
-               return result;
-
-       }
-
-       @POST
-       @Path("/set1")
-       @Produces(MediaType.TEXT_PLAIN)
-       @Consumes(MediaType.APPLICATION_JSON)
-       public String setConfig1(@Context final HttpServletRequest request, Configuration configuration) {
-
-               log.debug("{}", configuration);
-
-               return "ok";
-
-       }
-
-       @POST
-       @Path("/set2")
-       @Produces(MediaType.TEXT_PLAIN)
-       @Consumes(MediaType.APPLICATION_JSON)
-       public void setConfig2(@Context final HttpServletRequest request, Configuration configuration) {
-
-               log.debug("{}", configuration);
-
-       }
-
-       @PUT
-       @Path("/setput1")
-       @Produces(MediaType.TEXT_PLAIN)
-       @Consumes(MediaType.APPLICATION_JSON)
-       public String setConfig3(@Context final HttpServletRequest request, Configuration configuration) {
-
-               log.debug("{}", configuration);
-
-               return "ok";
-
-       }
-
-       @PUT
-       @Path("/setput2")
-       @Produces(MediaType.TEXT_PLAIN)
-       @Consumes(MediaType.APPLICATION_JSON)
-       public void setConfig4(@Context final HttpServletRequest request, Configuration configuration) {
-
-               log.debug("{}", configuration);
-
-       }
-
+    private static final Logger log = Logger.getLogger(ConfigMgrServlet.class);
+
+    @GET
+    @Path("/get")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getConfig(@Context final HttpServletRequest request, @QueryParam("type") String type) {
+        String result = null;
+        ServletContext context = request.getSession().getServletContext();
+        ConfigurationManager configurationManager = (ConfigurationManager) context.getAttribute(Constants.CONFIGURATION_MANAGER_ATTR);
+        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);
+                result = gson.toJson(configuration);
+            }
+        }
+        return result;
+    }
+
+    @POST
+    @Path("/set1")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String setConfig1(@Context final HttpServletRequest request, Configuration configuration) {
+        log.debug("{}", configuration);
+        return "ok";
+    }
+
+    @POST
+    @Path("/set2")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public void setConfig2(@Context final HttpServletRequest request, Configuration configuration) {
+        log.debug("{}", configuration);
+    }
+
+    @PUT
+    @Path("/setput1")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String setConfig3(@Context final HttpServletRequest request, Configuration configuration) {
+        log.debug("{}", configuration);
+        return "ok";
+    }
+
+    @PUT
+    @Path("/setput2")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public void setConfig4(@Context final HttpServletRequest request, Configuration configuration) {
+        log.debug("{}", configuration);
+    }
 }