summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-04-08 13:10:50 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-08 13:10:50 +0000
commit528dd61499765478af180922ed48f687b361f58e (patch)
treefed08efd551f8f847e59e641ddfaa73edd2d8c8e
parent7ba409e998ee824e2e485a7688c171b5fb5b712c (diff)
parent2385c44c949a28233ce5446b041e9a20f3241380 (diff)
Merge "Address sonar issues in PAP"
-rw-r--r--main/src/main/java/org/onap/policy/pap/main/comm/Publisher.java4
-rw-r--r--main/src/main/java/org/onap/policy/pap/main/comm/TimerManager.java6
-rw-r--r--main/src/main/java/org/onap/policy/pap/main/rest/SessionData.java11
3 files changed, 14 insertions, 7 deletions
diff --git a/main/src/main/java/org/onap/policy/pap/main/comm/Publisher.java b/main/src/main/java/org/onap/policy/pap/main/comm/Publisher.java
index 6d2d8358..3fbaa99b 100644
--- a/main/src/main/java/org/onap/policy/pap/main/comm/Publisher.java
+++ b/main/src/main/java/org/onap/policy/pap/main/comm/Publisher.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2020 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.
@@ -103,7 +103,7 @@ public class Publisher<T> implements Runnable {
if (stopNow) {
// unblock any other publisher threads
- queue.offer(new QueueToken<>(null));
+ queue.add(new QueueToken<>(null));
break;
}
diff --git a/main/src/main/java/org/onap/policy/pap/main/comm/TimerManager.java b/main/src/main/java/org/onap/policy/pap/main/comm/TimerManager.java
index 0565e90a..f64c2694 100644
--- a/main/src/main/java/org/onap/policy/pap/main/comm/TimerManager.java
+++ b/main/src/main/java/org/onap/policy/pap/main/comm/TimerManager.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2020 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.
@@ -303,6 +303,8 @@ public class TimerManager implements Runnable {
* @throws InterruptedException if this thread is interrupted while sleeping
*/
protected void sleep(long timeMs) throws InterruptedException {
- stopper.await(timeMs, TimeUnit.MILLISECONDS);
+ if (stopper.await(timeMs, TimeUnit.MILLISECONDS)) {
+ logger.info("sleep finishing due to stop()");
+ }
}
}
diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/SessionData.java b/main/src/main/java/org/onap/policy/pap/main/rest/SessionData.java
index 22da5392..0d8f7033 100644
--- a/main/src/main/java/org/onap/policy/pap/main/rest/SessionData.java
+++ b/main/src/main/java/org/onap/policy/pap/main/rest/SessionData.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2020 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.
@@ -20,6 +20,7 @@
package org.onap.policy.pap.main.rest;
+import com.google.re2j.Pattern;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -27,7 +28,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.apache.commons.lang3.tuple.Pair;
import org.onap.policy.models.base.PfModelException;
@@ -347,7 +347,12 @@ public class SessionData {
* @throws PfModelException if an error occurred
*/
public List<PdpGroup> getActivePdpGroupsByPolicyType(ToscaPolicyTypeIdentifier type) throws PfModelException {
- List<GroupData> data = type2groups.get(type);
+ /*
+ * Cannot use computeIfAbsent() because the enclosed code throws an unchecked
+ * exception and handling that would obfuscate the code too much, thus disabling
+ * the sonar.
+ */
+ List<GroupData> data = type2groups.get(type); // NOSONAR
if (data == null) {
PdpGroupFilter filter = PdpGroupFilter.builder().policyTypeList(Collections.singletonList(type))
.groupState(PdpState.ACTIVE).build();