Changes for Checkstyle 8.32 38/109338/1
authorliamfallon <liam.fallon@est.tech>
Fri, 19 Jun 2020 09:14:45 +0000 (10:14 +0100)
committerliamfallon <liam.fallon@est.tech>
Fri, 19 Jun 2020 09:17:21 +0000 (10:17 +0100)
Issue-ID: POLICY-2188
Change-Id: I8765849462cd866f2a3049a5a4a02bce17330e66
Signed-off-by: liamfallon <liam.fallon@est.tech>
14 files changed:
main/src/main/java/org/onap/policy/api/main/rest/ApiRestController.java
main/src/main/java/org/onap/policy/api/main/rest/LegacyApiRestController.java
main/src/main/java/org/onap/policy/api/main/rest/provider/CommonModelProvider.java
main/src/main/java/org/onap/policy/api/main/rest/provider/LegacyOperationalPolicyProvider.java
main/src/main/java/org/onap/policy/api/main/startstop/ApiCommandLineArguments.java
main/src/test/java/org/onap/policy/api/main/parameters/TestApiParameterGroup.java
main/src/test/java/org/onap/policy/api/main/parameters/TestApiParameterHandler.java
main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
main/src/test/java/org/onap/policy/api/main/rest/TestCommonRestController.java
main/src/test/java/org/onap/policy/api/main/rest/TestStatisticsReport.java
main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java
main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyProvider.java
main/src/test/java/org/onap/policy/api/main/rest/provider/TestPolicyTypeProvider.java
pom.xml

index 7661c27..79d8a64 100644 (file)
@@ -37,9 +37,7 @@ import io.swagger.annotations.Info;
 import io.swagger.annotations.ResponseHeader;\r
 import io.swagger.annotations.SecurityDefinition;\r
 import io.swagger.annotations.SwaggerDefinition;\r
-\r
 import java.util.UUID;\r
-\r
 import javax.ws.rs.Consumes;\r
 import javax.ws.rs.DELETE;\r
 import javax.ws.rs.DefaultValue;\r
@@ -51,7 +49,6 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;\r
 import javax.ws.rs.QueryParam;\r
 import javax.ws.rs.core.Response;\r
-\r
 import org.onap.policy.api.main.rest.provider.HealthCheckProvider;\r
 import org.onap.policy.api.main.rest.provider.PolicyProvider;\r
 import org.onap.policy.api.main.rest.provider.PolicyTypeProvider;\r
@@ -115,7 +112,7 @@ public class ApiRestController extends CommonRestController {
                 response = String.class),\r
             @ResponseHeader(name = "X-ONAP-RequestID",\r
                 description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"HealthCheck",},\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"HealthCheck", },\r
         extensions = {\r
             @Extension(name = "interface info", properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
                 @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
@@ -152,7 +149,7 @@ public class ApiRestController extends CommonRestController {
                 response = String.class),\r
             @ResponseHeader(name = "X-ONAP-RequestID",\r
                 description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"Statistics",},\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"Statistics", },\r
         extensions = {\r
             @Extension(name = "interface info", properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
                 @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
@@ -190,7 +187,7 @@ public class ApiRestController extends CommonRestController {
                 response = String.class),\r
             @ResponseHeader(name = "X-ONAP-RequestID",\r
                 description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType",},\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType", },\r
         extensions = {\r
             @Extension(name = "interface info", properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
                 @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
@@ -236,7 +233,7 @@ public class ApiRestController extends CommonRestController {
                 response = String.class),\r
             @ResponseHeader(name = "X-ONAP-RequestID",\r
                 description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType",},\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType", },\r
         extensions = {\r
             @Extension(name = "interface info", properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
                 @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
@@ -284,7 +281,7 @@ public class ApiRestController extends CommonRestController {
                 response = String.class),\r
             @ResponseHeader(name = "X-ONAP-RequestID",\r
                 description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType",},\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType", },\r
         extensions = {\r
             @Extension(name = "interface info", properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
                 @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
@@ -332,7 +329,7 @@ public class ApiRestController extends CommonRestController {
                 response = String.class),\r
             @ResponseHeader(name = "X-ONAP-RequestID",\r
                 description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType",},\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType", },\r
         extensions = {\r
             @Extension(name = "interface info", properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
                 @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
@@ -365,7 +362,7 @@ public class ApiRestController extends CommonRestController {
     @POST\r
     @Path("/policytypes")\r
     @ApiOperation(value = "Create a new policy type", notes = "Client should provide TOSCA body of the new policy type",\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType",},\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType", },\r
         response = ToscaServiceTemplate.class,\r
         responseHeaders = {\r
             @ResponseHeader(name = "X-MinorVersion",\r
@@ -421,7 +418,7 @@ public class ApiRestController extends CommonRestController {
         notes = "Rule 1: pre-defined policy types cannot be deleted;"\r
             + "Rule 2: policy types that are in use (parameterized by a TOSCA policy) cannot be deleted."\r
             + "The parameterizing TOSCA policies must be deleted first;",\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType",},\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType", },\r
         response = ToscaServiceTemplate.class,\r
         responseHeaders = {\r
             @ResponseHeader(name = "X-MinorVersion",\r
@@ -549,7 +546,7 @@ public class ApiRestController extends CommonRestController {
                 response = String.class),\r
             @ResponseHeader(name = "X-ONAP-RequestID",\r
                 description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",},\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"Policy", },\r
         extensions = {\r
             @Extension(name = "interface info", properties = {\r
                 @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
@@ -614,7 +611,7 @@ public class ApiRestController extends CommonRestController {
                 response = String.class),\r
             @ResponseHeader(name = "X-ONAP-RequestID",\r
                 description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",},\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"Policy", },\r
         extensions = {\r
             @Extension(name = "interface info", properties = {\r
                 @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
@@ -678,7 +675,7 @@ public class ApiRestController extends CommonRestController {
                 response = String.class),\r
             @ResponseHeader(name = "X-ONAP-RequestID",\r
                 description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",},\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"Policy", },\r
         extensions = {\r
             @Extension(name = "interface info", properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
                 @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
@@ -721,7 +718,8 @@ public class ApiRestController extends CommonRestController {
     @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies")\r
     @ApiOperation(value = "Create a new policy for a policy type version",\r
         notes = "Client should provide TOSCA body of the new policy",\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",}, response = ToscaServiceTemplate.class,\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"Policy", },\r
+            response = ToscaServiceTemplate.class,\r
         responseHeaders = {\r
             @ResponseHeader(name = "X-MinorVersion",\r
                 description = "Used to request or communicate a MINOR version back from the client"\r
@@ -778,7 +776,8 @@ public class ApiRestController extends CommonRestController {
     @Path("/policies")\r
     @ApiOperation(value = "Create one or more new policies",\r
         notes = "Client should provide TOSCA body of the new polic(ies)",\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",}, response = ToscaServiceTemplate.class,\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"Policy", },\r
+            response = ToscaServiceTemplate.class,\r
         responseHeaders = {\r
             @ResponseHeader(name = "X-MinorVersion",\r
                 description = "Used to request or communicate a MINOR version back from the client"\r
@@ -834,7 +833,8 @@ public class ApiRestController extends CommonRestController {
     @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}")\r
     @ApiOperation(value = "Delete a particular version of a policy",\r
         notes = "Rule: the version that has been deployed in PDP group(s) cannot be deleted",\r
-        authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",}, response = ToscaServiceTemplate.class,\r
+        authorizations = @Authorization(value = "basicAuth"), tags = {"Policy", },\r
+            response = ToscaServiceTemplate.class,\r
         responseHeaders = {\r
             @ResponseHeader(name = "X-MinorVersion",\r
                 description = "Used to request or communicate a MINOR version back from the client"\r
index 0fcf985..ccbe3b4 100644 (file)
@@ -93,7 +93,7 @@ public class LegacyApiRestController extends CommonRestController {
                         description = "Used only to communicate an API's latest version", response = String.class),
                 @ResponseHeader(name = "X-ONAP-RequestID",
                         description = "Used to track REST transactions for logging purpose", response = UUID.class)},
-            authorizations = @Authorization(value = "basicAuth"), tags = {"Legacy Operational Policy",},
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Legacy Operational Policy", },
             extensions = {@Extension(name = "interface info",
                     properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),
                         @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})
@@ -143,7 +143,7 @@ public class LegacyApiRestController extends CommonRestController {
                         description = "Used only to communicate an API's latest version", response = String.class),
                 @ResponseHeader(name = "X-ONAP-RequestID",
                         description = "Used to track REST transactions for logging purpose", response = UUID.class)},
-            authorizations = @Authorization(value = "basicAuth"), tags = {"Legacy Operational Policy",},
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Legacy Operational Policy", },
             extensions = {@Extension(name = "interface info",
                     properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),
                         @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})
@@ -193,7 +193,7 @@ public class LegacyApiRestController extends CommonRestController {
                         description = "Used only to communicate an API's latest version", response = String.class),
                 @ResponseHeader(name = "X-ONAP-RequestID",
                         description = "Used to track REST transactions for logging purpose", response = UUID.class)},
-            authorizations = @Authorization(value = "basicAuth"), tags = {"Legacy Operational Policy",},
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Legacy Operational Policy", },
             extensions = {@Extension(name = "interface info",
                     properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),
                         @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})
@@ -227,7 +227,7 @@ public class LegacyApiRestController extends CommonRestController {
     @Path("/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies")
     @ApiOperation(value = "Create a new operational policy",
             notes = "Client should provide entity body of the new operational policy",
-            authorizations = @Authorization(value = "basicAuth"), tags = {"Legacy Operational Policy",},
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Legacy Operational Policy", },
             response = LegacyOperationalPolicy.class,
             responseHeaders = {
                     @ResponseHeader(name = "X-MinorVersion",
@@ -290,7 +290,7 @@ public class LegacyApiRestController extends CommonRestController {
             + "policies/{policyId}/versions/{policyVersion}")
     @ApiOperation(value = "Delete a particular version of a specified operational policy",
             notes = "Rule: the version that has been deployed in PDP group(s) cannot be deleted",
-            authorizations = @Authorization(value = "basicAuth"), tags = {"Legacy Operational Policy",},
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Legacy Operational Policy", },
             response = LegacyOperationalPolicy.class,
             responseHeaders = {
                 @ResponseHeader(name = "X-MinorVersion",
index db864d7..03f46b9 100644 (file)
@@ -28,9 +28,7 @@ import java.util.HashMap;
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.function.BiConsumer;\r
-\r
 import javax.ws.rs.core.Response;\r
-\r
 import org.apache.commons.lang3.tuple.Pair;\r
 import org.onap.policy.api.main.parameters.ApiParameterGroup;\r
 import org.onap.policy.common.parameters.ParameterService;\r
index a433e02..11a6f2d 100644 (file)
@@ -26,7 +26,6 @@ package org.onap.policy.api.main.rest.provider;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.commons.lang3.tuple.Pair;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfModelException;
index a7c3600..8073f7c 100644 (file)
@@ -25,7 +25,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.URL;
 import java.util.Arrays;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
index 4565388..7456226 100644 (file)
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Collections;
-
 import org.junit.Test;
 import org.onap.policy.common.endpoints.parameters.RestServerParameters;
 import org.onap.policy.common.parameters.GroupValidationResult;
index 9cc09f6..3437908 100644 (file)
@@ -28,7 +28,6 @@ import static org.junit.Assert.fail;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-
 import org.junit.Test;
 import org.onap.policy.api.main.exception.PolicyApiException;
 import org.onap.policy.api.main.startstop.ApiCommandLineArguments;
index c3c81f6..2f794fd 100644 (file)
@@ -39,7 +39,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.ws.rs.client.Client;
@@ -48,7 +47,6 @@ import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Response;
-
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
 import org.junit.AfterClass;
index 62bd0c3..6837700 100644 (file)
@@ -27,10 +27,8 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.UUID;
-
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.ResponseBuilder;
-
 import org.junit.Test;
 
 /**
index e65a8c8..01d5a9c 100644 (file)
@@ -28,7 +28,6 @@ import com.openpojo.validation.ValidatorBuilder;
 import com.openpojo.validation.rule.impl.SetterMustExistRule;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
-
 import org.junit.Test;
 import org.onap.policy.common.utils.test.ToStringTester;
 
index 0fcedbe..23257e3 100644 (file)
@@ -34,7 +34,6 @@ import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
index 58d4230..73daf95 100644 (file)
@@ -30,7 +30,6 @@ import static org.junit.Assert.assertNotNull;
 
 import java.util.Base64;
 import java.util.Collections;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/pom.xml b/pom.xml
index 713f0b0..d1ed71d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
   ================================================================================
   Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved.
   Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
-  Modifications Copyright (C) 2019 Nordix Foundation.
+  Modifications Copyright (C) 2019-2020 Nordix Foundation.
   ================================================================================
   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.
     </distributionManagement>
 
     <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>onap-java-style</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-                                with minor changes -->
-                            <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-                            <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
-                            <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
-                            <includeResources>true</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>true</includeTestResources>
-                            <excludes>
-                            </excludes>
-                            <consoleOutput>true</consoleOutput>
-                            <failOnViolation>true</failOnViolation>
-                            <violationSeverity>warning</violationSeverity>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.onap.oparent</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>${oparent.version}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
         <pluginManagement>
             <plugins>
                 <plugin>