From bba2e5aa9a58ef5ae1f1c1cbaae2f6480e83db9d Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Wed, 3 Aug 2022 13:09:36 -0500 Subject: [PATCH] Upgrade to oparent 3.2.1 Issue-ID: POLICY-4211 Change-Id: Ie00f470ed1ce5676b9233f88bd9bd699f506d7a5 Signed-off-by: Pamela Dragosh --- .../std/StdCombinedPolicyResultsTranslator.java | 2 +- .../common/std/StdMatchableTranslator.java | 6 +-- .../pdpx/main/rest/XacmlPdpRestController.java | 62 +++++++++++----------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java index 8db9948d..30f98ec4 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java @@ -158,7 +158,7 @@ public class StdCombinedPolicyResultsTranslator extends StdBaseTranslator { * scanAdvice - not implemented in this class. * * @param advice Collection of advice objects - * @param DecisionResponse DecisionResponse object + * @param decisionResponse DecisionResponse object */ @Override protected void scanAdvice(Collection advice, DecisionResponse decisionResponse) { diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java index f2cfe37d..56722950 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java @@ -167,7 +167,7 @@ public class StdMatchableTranslator extends StdBaseTranslator implements Matcha * contents and their details. * * @param closestMatches Map holding the current set of highest weight policy types - * @param Obligation Obligation object + * @param obligation Obligation object */ protected void scanClosestMatchObligation( Map>>>> closestMatches, Obligation obligation) { @@ -371,8 +371,8 @@ public class StdMatchableTranslator extends StdBaseTranslator implements Matcha * For generating target type, we scan for matchable properties * and use those to build the policy. * - * @param properties Properties section of policy - * @param policyTypes Collection of policy Type to find matchable metadata + * @param policy Tosca Policy to generate Target Type + * @param template Toca Template * @return {@code Pair} Returns a TargetType and a Total Weight of matchables. */ protected Pair generateTargetType(ToscaPolicy policy, ToscaServiceTemplate template) { diff --git a/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestController.java b/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestController.java index fad1d3df..a6b64481 100644 --- a/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestController.java +++ b/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestController.java @@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory; @Consumes({MediaType.APPLICATION_JSON, XacmlPdpRestController.APPLICATION_YAML}) @SwaggerDefinition(info = @Info(description = "Policy Xacml PDP Service", version = "1.0.0", title = "Policy Xacml PDP", extensions = {@Extension(properties = {@ExtensionProperty(name = "planned-retirement-date", value = "tbd"), - @ExtensionProperty(name = "component", value = "Policy Framework")})}), + @ExtensionProperty(name = "component", value = "Policy Framework")})}), schemes = {SwaggerDefinition.Scheme.HTTP, SwaggerDefinition.Scheme.HTTPS}, securityDefinition = @SecurityDefinition(basicAuthDefinitions = {@BasicAuthDefinition(key = "basicAuth")})) public class XacmlPdpRestController { @@ -82,27 +82,27 @@ public class XacmlPdpRestController { @ApiOperation(value = "Perform a system healthcheck", notes = "Provides healthy status of the Policy Xacml PDP component", response = HealthCheckReport.class, responseHeaders = { - @ResponseHeader(name = "X-MinorVersion", + @ResponseHeader(name = "X-MinorVersion", description = "Used to request or communicate a MINOR version back from the client" + " to the server, and from the server back to the client", response = String.class), - @ResponseHeader(name = "X-PatchVersion", + @ResponseHeader(name = "X-PatchVersion", description = "Used only to communicate a PATCH version in a response for" + " troubleshooting purposes only, and will not be provided by" + " the client on request", response = String.class), - @ResponseHeader(name = "X-LatestVersion", + @ResponseHeader(name = "X-LatestVersion", description = "Used only to communicate an API's latest version", response = String.class), - @ResponseHeader(name = "X-ONAP-RequestID", + @ResponseHeader(name = "X-ONAP-RequestID", description = "Used to track REST transactions for logging purpose", response = UUID.class)}, authorizations = @Authorization(value = "basicAuth"), tags = {"HealthCheck", }, extensions = {@Extension(name = "interface info", properties = {@ExtensionProperty(name = "pdpx-version", value = "1.0.0"), - @ExtensionProperty(name = "last-mod-release", value = "Dublin")})}) + @ExtensionProperty(name = "last-mod-release", value = "Dublin")})}) @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"), - @ApiResponse(code = 403, message = "Authorization Error"), - @ApiResponse(code = 500, message = "Internal Server Error")}) + @ApiResponse(code = 403, message = "Authorization Error"), + @ApiResponse(code = 500, message = "Internal Server Error")}) public Response healthcheck( @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) { return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId) @@ -114,27 +114,27 @@ public class XacmlPdpRestController { @ApiOperation(value = "Fetch current statistics", notes = "Provides current statistics of the Policy Xacml PDP component", response = StatisticsReport.class, responseHeaders = { - @ResponseHeader(name = "X-MinorVersion", + @ResponseHeader(name = "X-MinorVersion", description = "Used to request or communicate a MINOR version back from the client" + " to the server, and from the server back to the client", response = String.class), - @ResponseHeader(name = "X-PatchVersion", + @ResponseHeader(name = "X-PatchVersion", description = "Used only to communicate a PATCH version in a response for" + " troubleshooting purposes only, and will not be provided by" + " the client on request", response = String.class), - @ResponseHeader(name = "X-LatestVersion", + @ResponseHeader(name = "X-LatestVersion", description = "Used only to communicate an API's latest version", response = String.class), - @ResponseHeader(name = "X-ONAP-RequestID", + @ResponseHeader(name = "X-ONAP-RequestID", description = "Used to track REST transactions for logging purpose", response = UUID.class)}, authorizations = @Authorization(value = "basicAuth"), tags = {"Statistics", }, extensions = {@Extension(name = "interface info", properties = {@ExtensionProperty(name = "pdpx-version", value = "1.0.0"), - @ExtensionProperty(name = "last-mod-release", value = "Dublin")})}) + @ExtensionProperty(name = "last-mod-release", value = "Dublin")})}) @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"), - @ApiResponse(code = 403, message = "Authorization Error"), - @ApiResponse(code = 500, message = "Internal Server Error")}) + @ApiResponse(code = 403, message = "Authorization Error"), + @ApiResponse(code = 500, message = "Internal Server Error")}) public Response statistics( @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) { return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId) @@ -153,28 +153,28 @@ public class XacmlPdpRestController { @ApiOperation(value = "Fetch the decision using specified decision parameters", notes = "Returns the policy decision from Policy Xacml PDP", response = DecisionResponse.class, responseHeaders = { - @ResponseHeader(name = "X-MinorVersion", + @ResponseHeader(name = "X-MinorVersion", description = "Used to request or communicate a MINOR version back from the client" + " to the server, and from the server back to the client", response = String.class), - @ResponseHeader(name = "X-PatchVersion", + @ResponseHeader(name = "X-PatchVersion", description = "Used only to communicate a PATCH version in a response for" + " troubleshooting purposes only, and will not be provided by" + " the client on request", response = String.class), - @ResponseHeader(name = "X-LatestVersion", + @ResponseHeader(name = "X-LatestVersion", description = "Used only to communicate an API's latest version", response = String.class), - @ResponseHeader(name = "X-ONAP-RequestID", + @ResponseHeader(name = "X-ONAP-RequestID", description = "Used to track REST transactions for logging purpose", response = UUID.class)}, authorizations = @Authorization(value = "basicAuth"), tags = {"Decision", }, extensions = {@Extension(name = "interface info", properties = {@ExtensionProperty(name = "pdpx-version", value = "1.0.0"), - @ExtensionProperty(name = "last-mod-release", value = "Dublin")})}) + @ExtensionProperty(name = "last-mod-release", value = "Dublin")})}) @ApiResponses(value = {@ApiResponse(code = 400, message = "Bad Request", response = ErrorResponse.class), - @ApiResponse(code = 401, message = "Authentication Error"), - @ApiResponse(code = 403, message = "Authorization Error"), - @ApiResponse(code = 500, message = "Internal Server Error")}) + @ApiResponse(code = 401, message = "Authentication Error"), + @ApiResponse(code = 403, message = "Authorization Error"), + @ApiResponse(code = 500, message = "Internal Server Error")}) public Response decision(DecisionRequest body, @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId, @Context HttpServletRequest request) { @@ -205,28 +205,28 @@ public class XacmlPdpRestController { notes = "Returns the policy decision from Policy Xacml PDP", response = com.att.research.xacml.api.Response.class, responseHeaders = { - @ResponseHeader(name = "X-MinorVersion", + @ResponseHeader(name = "X-MinorVersion", description = "Used to request or communicate a MINOR version back from the client" + " to the server, and from the server back to the client", response = String.class), - @ResponseHeader(name = "X-PatchVersion", + @ResponseHeader(name = "X-PatchVersion", description = "Used only to communicate a PATCH version in a response for" + " troubleshooting purposes only, and will not be provided by" + " the client on request", response = String.class), - @ResponseHeader(name = "X-LatestVersion", + @ResponseHeader(name = "X-LatestVersion", description = "Used only to communicate an API's latest version", response = String.class), - @ResponseHeader(name = "X-ONAP-RequestID", + @ResponseHeader(name = "X-ONAP-RequestID", description = "Used to track REST transactions for logging purpose", response = UUID.class)}, authorizations = @Authorization(value = "basicAuth"), tags = {"Decision", }, extensions = {@Extension(name = "interface info", properties = {@ExtensionProperty(name = "pdpx-version", value = "1.0.0"), - @ExtensionProperty(name = "last-mod-release", value = "Frankfurt")})}) + @ExtensionProperty(name = "last-mod-release", value = "Frankfurt")})}) @ApiResponses(value = {@ApiResponse(code = 400, message = "Bad Request", response = ErrorResponse.class), - @ApiResponse(code = 401, message = "Authentication Error"), - @ApiResponse(code = 403, message = "Authorization Error"), - @ApiResponse(code = 500, message = "Internal Server Error")}) + @ApiResponse(code = 401, message = "Authentication Error"), + @ApiResponse(code = 403, message = "Authorization Error"), + @ApiResponse(code = 500, message = "Internal Server Error")}) public Response xacml(Request body, @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) { try { -- 2.16.6