aboutsummaryrefslogtreecommitdiffstats
path: root/models-base/src/main/java/org
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2020-06-18 22:36:23 +0100
committerliamfallon <liam.fallon@est.tech>2020-06-18 22:43:11 +0100
commit9c5d23395918a739b591667edd77e3ced9cd4bfb (patch)
tree4e3e4d62f06ddf87563ed34914c6cffa2592946d /models-base/src/main/java/org
parent860a08ffb33bc0ae37e87c7d76ac6633f3ad3bee (diff)
Changes for Checkstyle 8.32
Issue-ID: POLICY-2188 Change-Id: I6db16763c1d2d80ff934302081a8dfc16afa7d9a Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'models-base/src/main/java/org')
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfConcept.java1
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java3
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfConceptFilter.java4
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfConceptGetterImpl.java7
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfKeyImpl.java2
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfModel.java8
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfModelException.java2
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfModelRuntimeException.java2
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfModelService.java2
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfReferenceKey.java3
-rw-r--r--models-base/src/main/java/org/onap/policy/models/base/PfValidationResult.java1
11 files changed, 5 insertions, 30 deletions
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfConcept.java b/models-base/src/main/java/org/onap/policy/models/base/PfConcept.java
index c77c68fd5..5273bd39e 100644
--- a/models-base/src/main/java/org/onap/policy/models/base/PfConcept.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfConcept.java
@@ -23,7 +23,6 @@ package org.onap.policy.models.base;
import java.io.Serializable;
import java.util.List;
-
import lombok.NonNull;
/**
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 97522c4d9..144d6e61d 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
@@ -33,7 +33,6 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.function.Function;
-
import javax.persistence.CascadeType;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -43,11 +42,9 @@ import javax.persistence.ManyToMany;
import javax.persistence.MappedSuperclass;
import javax.persistence.Table;
import javax.ws.rs.core.Response;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
-
import org.apache.commons.lang3.StringUtils;
import org.onap.policy.models.base.PfValidationResult.ValidationResult;
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfConceptFilter.java b/models-base/src/main/java/org/onap/policy/models/base/PfConceptFilter.java
index 8a9fbc414..8cebcdb40 100644
--- a/models-base/src/main/java/org/onap/policy/models/base/PfConceptFilter.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfConceptFilter.java
@@ -23,7 +23,6 @@ package org.onap.policy.models.base;
import java.util.List;
import java.util.stream.Collectors;
-
import lombok.Builder;
import lombok.Data;
import lombok.NonNull;
@@ -60,8 +59,7 @@ public class PfConceptFilter implements PfObjectFilter<PfConcept> {
if (LATEST_VERSION.equals(version)) {
return this.latestVersionFilter(returnList);
- }
- else {
+ } else {
return returnList;
}
}
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfConceptGetterImpl.java b/models-base/src/main/java/org/onap/policy/models/base/PfConceptGetterImpl.java
index 033a7ddb2..7a3e05582 100644
--- a/models-base/src/main/java/org/onap/policy/models/base/PfConceptGetterImpl.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfConceptGetterImpl.java
@@ -23,7 +23,6 @@ package org.onap.policy.models.base;
import java.util.NavigableMap;
import java.util.Set;
import java.util.TreeSet;
-
import org.onap.policy.common.utils.validation.Assertions;
/**
@@ -70,8 +69,7 @@ public class PfConceptGetterImpl<C> implements PfConceptGetter<C> {
break;
}
foundKey = nextkey;
- }
- while (true);
+ } while (true);
return conceptMap.get(foundKey);
}
@@ -121,8 +119,7 @@ public class PfConceptGetterImpl<C> implements PfConceptGetter<C> {
break;
}
returnSet.add(conceptMap.get(foundKey));
- }
- while (true);
+ } while (true);
return returnSet;
}
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfKeyImpl.java b/models-base/src/main/java/org/onap/policy/models/base/PfKeyImpl.java
index 61028f927..81066c37c 100644
--- a/models-base/src/main/java/org/onap/policy/models/base/PfKeyImpl.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfKeyImpl.java
@@ -23,11 +23,9 @@ package org.onap.policy.models.base;
import java.util.ArrayList;
import java.util.List;
-
import lombok.Getter;
import lombok.NonNull;
import lombok.ToString;
-
import org.onap.policy.common.utils.validation.Assertions;
import org.onap.policy.models.base.PfValidationResult.ValidationResult;
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfModel.java b/models-base/src/main/java/org/onap/policy/models/base/PfModel.java
index 83ae71cca..340f4e3b2 100644
--- a/models-base/src/main/java/org/onap/policy/models/base/PfModel.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfModel.java
@@ -24,17 +24,14 @@ package org.onap.policy.models.base;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
-
import org.onap.policy.common.utils.validation.Assertions;
import org.onap.policy.models.base.PfValidationResult.ValidationResult;
@@ -134,9 +131,8 @@ public abstract class PfModel extends PfConcept {
result = validateArtifactKeyInModel((PfConceptKey) pfKey, artifactKeySet, result);
} else if (pfKey instanceof PfReferenceKey) {
result = validateReferenceKeyInModel((PfReferenceKey) pfKey, referenceKeySet, result);
- }
- // It must be a PfKeyUse, nothing else is legal
- else {
+ } else {
+ // It must be a PfKeyUse, nothing else is legal
usedKeySet.add((PfKeyUse) pfKey);
}
}
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfModelException.java b/models-base/src/main/java/org/onap/policy/models/base/PfModelException.java
index 46c5bd311..c25fd17ec 100644
--- a/models-base/src/main/java/org/onap/policy/models/base/PfModelException.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfModelException.java
@@ -21,10 +21,8 @@
package org.onap.policy.models.base;
import javax.ws.rs.core.Response;
-
import lombok.Getter;
import lombok.ToString;
-
import org.onap.policy.models.errors.concepts.ErrorResponse;
import org.onap.policy.models.errors.concepts.ErrorResponseInfo;
import org.onap.policy.models.errors.concepts.ErrorResponseUtils;
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfModelRuntimeException.java b/models-base/src/main/java/org/onap/policy/models/base/PfModelRuntimeException.java
index 472412865..5c317d1d8 100644
--- a/models-base/src/main/java/org/onap/policy/models/base/PfModelRuntimeException.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfModelRuntimeException.java
@@ -21,10 +21,8 @@
package org.onap.policy.models.base;
import javax.ws.rs.core.Response;
-
import lombok.Getter;
import lombok.ToString;
-
import org.onap.policy.models.errors.concepts.ErrorResponse;
import org.onap.policy.models.errors.concepts.ErrorResponseInfo;
import org.onap.policy.models.errors.concepts.ErrorResponseUtils;
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfModelService.java b/models-base/src/main/java/org/onap/policy/models/base/PfModelService.java
index 134b6213e..1f4b8f66b 100644
--- a/models-base/src/main/java/org/onap/policy/models/base/PfModelService.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfModelService.java
@@ -22,9 +22,7 @@ package org.onap.policy.models.base;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-
import javax.ws.rs.core.Response;
-
import lombok.NonNull;
/**
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfReferenceKey.java b/models-base/src/main/java/org/onap/policy/models/base/PfReferenceKey.java
index a5ae6c51e..7984e4297 100644
--- a/models-base/src/main/java/org/onap/policy/models/base/PfReferenceKey.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfReferenceKey.java
@@ -23,14 +23,11 @@ package org.onap.policy.models.base;
import java.util.ArrayList;
import java.util.List;
-
import javax.persistence.Column;
import javax.persistence.Embeddable;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
-
import org.onap.policy.common.utils.validation.Assertions;
import org.onap.policy.models.base.PfValidationResult.ValidationResult;
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfValidationResult.java b/models-base/src/main/java/org/onap/policy/models/base/PfValidationResult.java
index 4f8d06bdc..6f4633612 100644
--- a/models-base/src/main/java/org/onap/policy/models/base/PfValidationResult.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfValidationResult.java
@@ -22,7 +22,6 @@ package org.onap.policy.models.base;
import java.util.LinkedList;
import java.util.List;
-
import lombok.Getter;
/**