aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpdragosh <pd1248@att.com>2022-08-03 14:41:44 -0500
committerpdragosh <pd1248@att.com>2022-08-03 14:41:52 -0500
commite25648313f6e138b257b4481310e0de016264fa5 (patch)
treef70af6e636254495e4c2c20a0d9756251a9bf643
parentf6b04f0d866ae1868d44f564f40c533553e8c335 (diff)
Upgrade oparent 3.2.1
Issue-ID: POLICY-4211 Change-Id: I9ab11a85bb31e273a2745e8361d9363df60277af Signed-off-by: pdragosh <pd1248@att.com>
-rw-r--r--controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java4
-rw-r--r--controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/BaseTest.java6
2 files changed, 3 insertions, 7 deletions
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java
index 52a869597..7f58a80b0 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP
* ================================================================================
- * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 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.
@@ -250,7 +250,7 @@ public class OperationHistoryDataManagerImpl implements OperationHistoryDataMana
/**
* Stores a record.
*
- * @param entityManager entity manager
+ * @param entityMgr entity manager
* @param record record to be stored
*/
private void storeRecord(EntityManager entityMgr, Record record) {
diff --git a/controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/BaseTest.java b/controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/BaseTest.java
index 9a82389be..8b412c97e 100644
--- a/controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/BaseTest.java
+++ b/controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/BaseTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP
* ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 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.
@@ -467,8 +467,6 @@ public abstract class BaseTest {
* @param policyFile file containing the ToscaPolicy to be loaded
* @param onsetFile file containing the ONSET to be injected
* @param operation expected APPC operation request
- * @param checkOperation flag to determine whether or not to wait for operation
- * timeout
*/
protected void appcLegacyRainyDay(String policyFile, String onsetFile, String operation) {
policyClMgt = createNoficationTopicListener();
@@ -581,7 +579,6 @@ public abstract class BaseTest {
*
* @param policyFile file containing the ToscaPolicy to be loaded
* @param onsetFile file containing the ONSET to be injected
- * @param operation expected APPC operation request
*/
protected void httpSunnyDay(String policyFile, String onsetFile) {
policyClMgt = createNoficationTopicListener();
@@ -609,7 +606,6 @@ public abstract class BaseTest {
*
* @param policyFile file containing the ToscaPolicy to be loaded
* @param onsetFile file containing the ONSET to be injected
- * @param operation expected APPC operation request
*/
protected void httpRainyDay(String policyFile, String onsetFile) {
policyClMgt = createNoficationTopicListener();