summaryrefslogtreecommitdiffstats
path: root/models-base/src/main
diff options
context:
space:
mode:
authorChris Ramstad <cramstad@ciena.com>2020-03-17 11:52:02 -0700
committerChris Ramstad <cramstad@ciena.com>2020-03-19 11:46:58 -0700
commit8fdfe4bdac025f450d6b9ea70d7c48afa98fc37e (patch)
tree8ad040f7dddde9474290b9b916ed1a3b64df178c /models-base/src/main
parentc2e24def7c1de97838af00560bdb0bf84f3abc4b (diff)
Misc simple sonar issue fixes
Issue-ID: POLICY-2389 Signed-off-by: Chris Ramstad <cramstad@ciena.com> Change-Id: I7ce91e331a128aaadaab5ac837e19873a3388164
Diffstat (limited to 'models-base/src/main')
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfUtils.java10
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/Validated.java1
2 files changed, 6 insertions, 5 deletions
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfUtils.java b/models-base/src/main/java/org/onap/policy/models/base/PfUtils.java
index 8f1040bfe..fa7d21f9d 100644
--- a/models-base/src/main/java/org/onap/policy/models/base/PfUtils.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfUtils.java
@@ -26,7 +26,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
import java.util.stream.Collectors;
import javax.ws.rs.core.Response;
@@ -76,7 +76,7 @@ public final class PfUtils {
* @param defaultValue value to be returned if source is {@code null}
* @return a new list, containing mappings of all of the items in the original list
*/
- public static <T> List<T> mapList(List<T> source, Function<T, T> mapFunc, List<T> defaultValue) {
+ public static <T> List<T> mapList(List<T> source, UnaryOperator<T> mapFunc, List<T> defaultValue) {
if (source == null) {
return defaultValue;
}
@@ -93,7 +93,7 @@ public final class PfUtils {
* @return a new list, containing mappings of all of the items in the original list,
* or {@code null} if the source is {@code null}
*/
- public static <T> List<T> mapList(List<T> source, Function<T, T> mapFunc) {
+ public static <T> List<T> mapList(List<T> source, UnaryOperator<T> mapFunc) {
return mapList(source, mapFunc, null);
}
@@ -106,7 +106,7 @@ public final class PfUtils {
* @param defaultValue value to be returned if source is {@code null}
* @return a new map, containing mappings of all of the items in the original map
*/
- public static <T> Map<String, T> mapMap(Map<String, T> source, Function<T, T> mapFunc,
+ public static <T> Map<String, T> mapMap(Map<String, T> source, UnaryOperator<T> mapFunc,
Map<String, T> defaultValue) {
if (source == null) {
return defaultValue;
@@ -129,7 +129,7 @@ public final class PfUtils {
* @return a new map, containing mappings of all of the items in the original map,
* or {@code null} if the source is {@code null}
*/
- public static <T> Map<String, T> mapMap(Map<String, T> source, Function<T, T> mapFunc) {
+ public static <T> Map<String, T> mapMap(Map<String, T> source, UnaryOperator<T> mapFunc) {
return mapMap(source, mapFunc, null);
}
diff --git a/models-base/src/main/java/org/onap/policy/models/base/Validated.java b/models-base/src/main/java/org/onap/policy/models/base/Validated.java
index 7a0a8377b..26a8a5260 100644
--- a/models-base/src/main/java/org/onap/policy/models/base/Validated.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/Validated.java
@@ -70,6 +70,7 @@ public class Validated {
* @param result where to place the result
* @return the result
*/
+ @SuppressWarnings("java:S3252") // squelch sonar warning for using PkConceptKey instead of PfKeyImpl
public PfValidationResult validateNotNull(@NonNull PfConceptKey value, @NonNull PfValidationResult result) {
if (PfConceptKey.NULL_KEY_NAME.equals(value.getName())) {