1 files changed, 20 insertions, 26 deletions

diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupQueryControllerV1.java b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupQueryControllerV1.java
index 576eb8d8..03a853ba 100644
--- a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupQueryControllerV1.java
+++ b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupQueryControllerV1.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019,2021 Nordix Foundation.
  *  Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property.
+ *  Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,38 +31,38 @@ import io.swagger.annotations.Extension;
 import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.ResponseHeader;
 import java.util.UUID;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.tuple.Pair;
 import org.onap.policy.models.base.PfModelException;
-import org.onap.policy.models.base.PfModelRuntimeException;
 import org.onap.policy.models.pdp.concepts.PdpGroups;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Class to provide REST end points for PAP component to query details of all PDP groups.
  *
  * @author Ram Krishna Verma (ram.krishna.verma@est.tech)
  */
+@RestController
+@RequestMapping(path = "/policy/pap/v1")
+@RequiredArgsConstructor
 public class PdpGroupQueryControllerV1 extends PapRestControllerV1 {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PdpGroupQueryControllerV1.class);
-
-    private final PdpGroupQueryProvider provider = new PdpGroupQueryProvider();
+    private final PdpGroupQueryProvider provider;
 
     /**
      * Queries details of all PDP groups.
      *
      * @param requestId request ID used in ONAP logging
      * @return a response
+     * @throws PfModelException the exception
      */
     // @formatter:off
-    @GET
-    @Path("pdps")
+    @GetMapping("pdps")
     @ApiOperation(value = "Query details of all PDP groups",
         notes = "Queries details of all PDP groups, returning all group details",
         response = PdpGroups.class,
@@ -89,19 +90,12 @@ public class PdpGroupQueryControllerV1 extends PapRestControllerV1 {
         @ApiResponse(code = SERVER_ERROR_CODE, message = SERVER_ERROR_MESSAGE)
     })
     // @formatter:on
+    public ResponseEntity<PdpGroups> queryGroupDetails(@ApiParam(REQUEST_ID_PARAM_DESCRIPTION) @RequestHeader(
+        required = false,
+        value = REQUEST_ID_NAME) final UUID requestId) throws PfModelException {
 
-    public Response queryGroupDetails(
-            @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) final UUID requestId) {
-
-        try {
-            final Pair<Status, PdpGroups> pair = provider.fetchPdpGroupDetails();
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(pair.getLeft())), requestId)
-                    .entity(pair.getRight()).build();
-        } catch (final PfModelException | PfModelRuntimeException exp) {
-            LOGGER.info("group query failed", exp);
-            return addLoggingHeaders(
-                    addVersionControlHeaders(Response.status(exp.getErrorResponse().getResponseCode())), requestId)
-                            .entity(exp.getErrorResponse()).build();
-        }
+        final Pair<HttpStatus, PdpGroups> pair = provider.fetchPdpGroupDetails();
+        return addLoggingHeaders(addVersionControlHeaders(ResponseEntity.status(pair.getLeft())), requestId)
+            .body(pair.getRight());
     }
 }