aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-06-18 14:12:38 +0000
committerGerrit Code Review <gerrit@onap.org>2021-06-18 14:12:38 +0000
commit0de684d53b9da8889244ddce49e5110d23d30ba8 (patch)
tree61e611f1bde4fabd7c0c1766cb53b5a9350a597c
parent459eca92aba02bd5a890265c5097fc793f917360 (diff)
parent91bbf2b36488c870b625f032220451155d014d20 (diff)
Merge "Fix new checkstyle issues in policy-common"
-rw-r--r--integrity-audit/src/main/java/org/onap/policy/common/ia/DbDao.java1
-rw-r--r--integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTestBase.java3
-rw-r--r--policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyStaticResourceServer.java5
-rw-r--r--policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java2
4 files changed, 5 insertions, 6 deletions
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 27d035f2..e83bbca8 100644
--- 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
@@ -95,7 +95,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 a8e3fbef..13939412 100644
--- 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
@@ -304,8 +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
- * "capture" group of the regular expression is assumed to contain the extracted item
+ * @param app where data has been logged
* @param items items that should be matched by the items extracted from the log, in order
* @throws IOException if an IO error occurs
* @throws AssertionError if the desired items were not all found
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 15d9990b..f0d6ba2c 100644
--- 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) 2021 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.
@@ -84,9 +85,9 @@ public class JettyStaticResourceServer extends JettyServletServer {
*
* @throws IllegalArgumentException if invalid arguments are provided
*/
- protected synchronized ServletHolder getDefaultServlet(String servPath) {
+ protected synchronized ServletHolder getDefaultServlet(String servletPath) {
- return servlets.computeIfAbsent(servPath, key -> context.addServlet(DefaultServlet.class, servPath));
+ return servlets.computeIfAbsent(servletPath, key -> context.addServlet(DefaultServlet.class, servletPath));
}
@Override
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 e4ac6c85..62f86d41 100644
--- 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
@@ -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 list of topic parameters
* @return true if all parameters are not empty (if string) or true (if boolean)
* @throws Exception the exception
*/