Upgrade to oparent 3.2.1

Fixed new checkstyle issues.

Issue-ID: POLICY-4211
Change-Id: Id4567c7d416dcb92a96521793dd6dcad4035cd72
Signed-off-by: pdragosh <pd1248@att.com>

diff --git a/common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java b/common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java
index 1fe560d..3438bb0 100644 (file)
--- a/common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java
+++ b/common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
+ *  Modifications Copyright (C) 2018-2019,2022 AT&T Intellectual Property. 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.
@@ -77,7 +77,7 @@ public class GroupValidationResult extends CommonGroupValidationResult {
      * Construct a validation result for a field, updating "this" status.
      *
      * @param field The parameter field
-     * @param ParameterGroup The parameter group containing the field
+     * @param parameterGroup The parameter group containing the field
      * @return the validation result
      * @throws Exception on accessing private fields
      */
@@ -92,7 +92,7 @@ public class GroupValidationResult extends CommonGroupValidationResult {
      * Construct a validation result for a field.
      *
      * @param field The parameter field
-     * @param ParameterGroup The parameter group containing the field
+     * @param parameterGroup The parameter group containing the field
      * @return the validation result
      * @throws Exception on accessing private fields
      */
@@ -136,7 +136,7 @@ public class GroupValidationResult extends CommonGroupValidationResult {
      * Get the value of a field in an object using a getter found with reflection.
      *
      * @param targetObject The object on which to read the field value
-     * @param fieldName The name of the field
+     * @param field The name of the field
      * @return The field value
      */
     private Object getObjectField(final Object targetObject, final Field field) {

diff --git a/integrity-audit/src/main/java/org/onap/policy/common/ia/DbDao.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/DbDao.java
index ff4d297..faf9c52 100644 (file)
--- a/integrity-audit/src/main/java/org/onap/policy/common/ia/DbDao.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/DbDao.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * Integrity Audit
  * ================================================================================
- * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020,2022 AT&T Intellectual Property. 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.
@@ -98,7 +98,6 @@ public class DbDao {
      * @param resourceName the resource name
      * @param persistenceUnit the persistence unit
      * @param properties the properties
-     * @param lastUpdateDate may be {@code null}
      * @param altDbUrl may be {@code null}
      * @throws IntegrityAuditException if an error occurs
      */

diff --git a/integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTestBase.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTestBase.java
index 1866bba..dfb0f04 100644 (file)
--- a/integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTestBase.java
+++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTestBase.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * Integrity Audit
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019,2022 AT&T Intellectual Property. 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.
@@ -304,7 +304,7 @@ public class IntegrityAuditTestBase {
      * Verifies that items appear within the log, in order. A given item may appear more than once.
      * In addition, the log may contain extra items; those are ignored.
      *
-     * @param textre regular expression used to extract an item from a line in the log. The first
+     * @param app regular expression used to extract an item from a line in the log. The first
      *        "capture" group of the regular expression is assumed to contain the extracted item
      * @param items items that should be matched by the items extracted from the log, in order
      * @throws IOException if an IO error occurs

diff --git a/integrity-audit/src/test/java/org/onap/policy/common/ia/jpa/IaTestEntity.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/jpa/IaTestEntity.java
index 2ca8305..62b2f22 100644 (file)
--- a/integrity-audit/src/test/java/org/onap/policy/common/ia/jpa/IaTestEntity.java
+++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/jpa/IaTestEntity.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * Integrity Audit
  * ================================================================================
- * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020,2022 AT&T Intellectual Property. 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.
@@ -38,7 +38,7 @@ import javax.persistence.TemporalType;
 @Entity
 @Table(name = "IaTestEntity")
 @NamedQueries({@NamedQuery(name = " IaTestEntity.findAll", query = "SELECT e FROM IaTestEntity e "),
-        @NamedQuery(name = "IaTestEntity.deleteAll", query = "DELETE FROM IaTestEntity WHERE 1=1")})
+    @NamedQuery(name = "IaTestEntity.deleteAll", query = "DELETE FROM IaTestEntity WHERE 1=1")})
 
 public class IaTestEntity implements Serializable {
     private static final long serialVersionUID = 1L;

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyStaticResourceServer.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyStaticResourceServer.java
index 15d9990..18af825 100644 (file)
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyStaticResourceServer.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyStaticResourceServer.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2022 AT&T Intellectual Property.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,7 +80,7 @@ public class JettyStaticResourceServer extends JettyServletServer {
     /**
      * Retrieves cached default servlet based on servlet path.
      *
-     * @param servletPath servlet path
+     * @param servPath servlet path
      * @return the jetty servlet holder
      *
      * @throws IllegalArgumentException if invalid arguments are provided

diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java
index 98b3d84..2cfc2d1 100644 (file)
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Nordix Foundation.
- *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ *  Modifications Copyright (C) 2019,2022 AT&T Intellectual Property. 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.
@@ -120,7 +120,7 @@ public class TopicParameterGroupTest {
      * Any parameters added to @link TopicParameters or @link BusTopicParams must be added to
      * TopicParameters_all_params.json.
      *
-     * @param topicParameters topic parameters
+     * @param topicParametersList topic parameters
      * @return true if all parameters are not empty (if string) or true (if boolean)
      * @throws Exception the exception
      */

diff --git a/utils/src/test/java/org/onap/policy/common/utils/resources/ResourceUtilsTest.java b/utils/src/test/java/org/onap/policy/common/utils/resources/ResourceUtilsTest.java
index 2e12218..335d841 100644 (file)
--- a/utils/src/test/java/org/onap/policy/common/utils/resources/ResourceUtilsTest.java
+++ b/utils/src/test/java/org/onap/policy/common/utils/resources/ResourceUtilsTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ *  Modifications Copyright (C) 2019-2020,2022 AT&T Intellectual Property. All rights reserved.
  *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -309,7 +309,7 @@ public class ResourceUtilsTest {
         assertNull(ResourceUtils.getFilePath4Resource(null));
         assertEquals("/something/else", ResourceUtils.getFilePath4Resource("/something/else"));
         assertTrue(ResourceUtils.getFilePath4Resource("xml/example.xml").endsWith("xml/example.xml"));
-        assertTrue(ResourceUtils.getFilePath4Resource("com/google").endsWith("com/google"));
+        assertTrue(ResourceUtils.getFilePath4Resource("com/google").contains("com/google"));
     }
 
     @Test
@@ -329,10 +329,10 @@ public class ResourceUtilsTest {
         Set<String> resultD2 = ResourceUtils.getDirectoryContents("org/onap/policy/common/utils/coder");
         assertTrue(resultD2.size() >= 15);
         assertEquals("org/onap/policy/common/utils/coder/CoderExceptionTest.class",
-                        normalizePath(resultD2.iterator().next()));
+                normalizePath(resultD2.iterator().next()));
 
         Set<String> resultJ0 = ResourceUtils.getDirectoryContents("com");
-        assertEquals(189, resultJ0.size());
+        assertTrue(resultJ0.contains("com/google/gson/"));
         assertEquals("com/google/", normalizePath(resultJ0.iterator().next()));
 
         Set<String> resultJ1 = ResourceUtils.getDirectoryContents("com/google/gson");
@@ -346,6 +346,7 @@ public class ResourceUtilsTest {
 
     /**
      * Normalizes a path name, replacing OS-specific separators with "/".
+     *
      * @param pathName path name to be normalized
      * @return the normalized path name
      */