1 files changed, 10 insertions, 20 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentPropertyServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentPropertyServlet.java
index 0edce61bae..79e63c71b5 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentPropertyServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentPropertyServlet.java
@@ -18,11 +18,7 @@ package org.openecomp.sdc.be.servlets;
 
 import com.jcabi.aspects.Loggable;
 import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.impl.PropertyBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -37,15 +33,7 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Singleton;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -59,6 +47,8 @@ import java.util.Map;
 public class ComponentPropertyServlet extends BeGenericServlet {
 
   private static final Logger log = LoggerFactory.getLogger(ComponentPropertyServlet.class);
+  private static final String CREATE_PROPERTY = "Create Property";
+  private static final String DEBUG_MESSAGE = "Start handle request of {} modifier id is {}";
 
   @POST
   @Path("services/{serviceId}/properties")
@@ -236,7 +226,7 @@ public class ComponentPropertyServlet extends BeGenericServlet {
       return buildOkResponse(newPropertyDefinition);
 
     } catch (Exception e) {
-      BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Create Property");
+      BeEcompErrorManager.getInstance().logBeRestApiGeneralError(CREATE_PROPERTY);
       log.debug("create property failed with exception", e);
       ResponseFormat responseFormat =
               getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
@@ -308,7 +298,7 @@ public class ComponentPropertyServlet extends BeGenericServlet {
     ServletContext context = request.getSession().getServletContext();
 
     String url = request.getMethod() + " " + request.getRequestURI();
-    log.debug("Start handle request of {} modifier id is {}", url, userId);
+    log.debug(DEBUG_MESSAGE, url, userId);
 
     try {
       PropertyBusinessLogic propertyBL = getPropertyBL(context);
@@ -322,7 +312,7 @@ public class ComponentPropertyServlet extends BeGenericServlet {
       return buildOkResponse(retrievedPropertyEither.left().value());
 
     } catch (Exception e) {
-      BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Create Property");
+      BeEcompErrorManager.getInstance().logBeRestApiGeneralError(CREATE_PROPERTY);
       log.debug("get property failed with exception", e);
       ResponseFormat responseFormat =
               getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
@@ -333,7 +323,7 @@ public class ComponentPropertyServlet extends BeGenericServlet {
     ServletContext context = request.getSession().getServletContext();
 
     String url = request.getMethod() + " " + request.getRequestURI();
-    log.debug("Start handle request of {} modifier id is {}", url, userId);
+    log.debug(DEBUG_MESSAGE, url, userId);
 
     try {
       PropertyBusinessLogic propertyBL = getPropertyBL(context);
@@ -347,7 +337,7 @@ public class ComponentPropertyServlet extends BeGenericServlet {
       return buildOkResponse(propertiesListEither.left().value());
 
     } catch (Exception e) {
-      BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Create Property");
+      BeEcompErrorManager.getInstance().logBeRestApiGeneralError(CREATE_PROPERTY);
       log.debug("get property failed with exception", e);
       ResponseFormat responseFormat =
               getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
@@ -358,7 +348,7 @@ public class ComponentPropertyServlet extends BeGenericServlet {
     ServletContext context = request.getSession().getServletContext();
 
     String url = request.getMethod() + " " + request.getRequestURI();
-    log.debug("Start handle request of {} modifier id is {}", url, userId);
+    log.debug(DEBUG_MESSAGE, url, userId);
 
     try {