diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2020-08-26 11:13:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-08-26 11:13:19 +0000 |
| commit | 68a60a45f27287a4a523c82ef466cbeec655f641 (patch) | |
| tree | cf52bf9fd0610d27f5d0aadcc5e3a8cd81ba5a50 /models-base/src/main/java/org | |
| parent | 8ec1942774a2f26225d116ffba5b9b48e90ba15a (diff) | |
| parent | 59f4f54cdf4c1a5c155360239272da690e8c4a72 (diff) | |
Merge "Address more sonar issues in policy-models"
Diffstat (limited to 'models-base/src/main/java/org')
| -rw-r--r-- | models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java | 2 | ||||
| -rw-r--r-- | models-base/src/main/java/org/onap/policy/models/base/Validated.java | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java b/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java index 144d6e61d..b8f2ed6cb 100644 --- a/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java +++ b/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java @@ -106,7 +106,7 @@ public class PfConceptContainer<C extends PfConcept, A extends PfNameVersion> ex * @param key the concept key */ public PfConceptContainer(@NonNull final PfConceptKey key) { - this(key, new TreeMap<PfConceptKey, C>()); + this(key, new TreeMap<>()); } /** 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 26a8a5260..d79d58f13 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 @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * 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. @@ -70,14 +70,13 @@ 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())) { + if (PfKey.NULL_KEY_NAME.equals(value.getName())) { addError(value, "name", result, "null"); } - if (PfConceptKey.NULL_KEY_VERSION.equals(value.getVersion())) { + if (PfKey.NULL_KEY_VERSION.equals(value.getVersion())) { addError(value, "version", result, "null"); } |