1 files changed, 11 insertions, 30 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpoint.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpoint.java
index d440ca6872..48a41cf83b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpoint.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpoint.java
@@ -1,30 +1,18 @@
 package org.openecomp.sdc.be.servlets;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.impl.PolicyTypeBusinessLogic;
 import org.openecomp.sdc.be.mixin.PolicyTypeMixin;
 import org.openecomp.sdc.be.model.PolicyTypeDefinition;
 import org.openecomp.sdc.be.view.ResponseView;
 import org.openecomp.sdc.common.api.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Controller;
 
-import com.jcabi.aspects.Loggable;
-
-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 javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
@@ -32,9 +20,9 @@ import io.swagger.annotations.ApiResponses;
 @Controller
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
-public class PolicyTypesEndpoint extends BeGenericServlet{
+public class PolicyTypesEndpoint {
 
-    private static final Logger log = LoggerFactory.getLogger(PolicyTypesEndpoint.class);
+    private static final Logger log = Logger.getLogger(PolicyTypesEndpoint.class);
 
     private final PolicyTypeBusinessLogic policyTypeBusinessLogic;
 
@@ -49,18 +37,11 @@ public class PolicyTypesEndpoint extends BeGenericServlet{
                             @ApiResponse(code = 403, message = "Restricted operation"),
                             @ApiResponse(code = 500, message = "The GET request failed due to internal SDC problem.")})
     @ResponseView(mixin = {PolicyTypeMixin.class})
-    public Response getPolicyTypes(@ApiParam(value = "An optional parameter to indicate the type of the container from where this call is executed")
+    public List<PolicyTypeDefinition> getPolicyTypes(@ApiParam(value = "An optional parameter to indicate the type of the container from where this call is executed")
                                    @QueryParam("internalComponentType") String internalComponentType,
-                                   @ApiParam(value = "The user id", required = true) @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+                                                     @ApiParam(value = "The user id", required = true) @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
         log.debug("(get) Start handle request of GET policyTypes");
-        try {
-            return policyTypeBusinessLogic.getAllPolicyTypes(userId, internalComponentType)
-                    .either(this::buildOkResponse,
-                            this::buildErrorResponse);
-        } catch (Exception e) {
-            log.error("#getPolicyTypes - Exception occurred during get policy types", e);
-            return buildGeneralErrorResponse();
-        }
+        return policyTypeBusinessLogic.getAllPolicyTypes(userId, internalComponentType);
     }
 
 }