aboutsummaryrefslogtreecommitdiffstats
path: root/models-base
diff options
context:
space:
mode:
authorRam Krishna Verma <ram_krishna.verma@bell.ca>2020-06-19 21:19:30 +0000
committerGerrit Code Review <gerrit@onap.org>2020-06-19 21:19:30 +0000
commitce850be00732359bb04d8dd3666a1293dbf8f1ff (patch)
tree672ebff060b17e1d3f7a1301a987999fe0f8688e /models-base
parentf8da89aa52f2fd39d6f2e9150ff29e4ccf8587b9 (diff)
parent9c5d23395918a739b591667edd77e3ced9cd4bfb (diff)
Merge "Changes for Checkstyle 8.32"
Diffstat (limited to 'models-base')
-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
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/ExceptionsTest.java2
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/PfConceptContainerTest.java1
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/PfConceptFilterTest.java1
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/PfConceptGetterImplTest.java2
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java2
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/PfObjectFilterTest.java1
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/PfReferenceKeyTest.java1
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/PfTimestampKeyTest.java1
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/PfUtilsTest.java6
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyAuthorativeConcept.java1
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyBadPfConcept.java1
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyBadPfConceptContainer.java2
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptContainer.java2
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptKeySub.java2
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptSub.java2
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfKey.java2
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfNameVersion.java1
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfObject.java1
-rw-r--r--models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfObjectFilter.java2
30 files changed, 9 insertions, 59 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;
/**
diff --git a/models-base/src/test/java/org/onap/policy/models/base/ExceptionsTest.java b/models-base/src/test/java/org/onap/policy/models/base/ExceptionsTest.java
index af9e61e2f..112f6a203 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/ExceptionsTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/ExceptionsTest.java
@@ -25,9 +25,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.io.IOException;
-
import javax.ws.rs.core.Response;
-
import org.junit.Test;
import org.onap.policy.models.errors.concepts.ErrorResponse;
diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfConceptContainerTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfConceptContainerTest.java
index e28fa4cdf..3ae3ba8e5 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/PfConceptContainerTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfConceptContainerTest.java
@@ -33,7 +33,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
-
import org.junit.Test;
import org.onap.policy.models.base.testconcepts.DummyAuthorativeConcept;
import org.onap.policy.models.base.testconcepts.DummyBadPfConceptContainer;
diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfConceptFilterTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfConceptFilterTest.java
index e82ab41eb..424293f78 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/PfConceptFilterTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfConceptFilterTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.List;
-
import org.junit.Test;
/**
diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfConceptGetterImplTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfConceptGetterImplTest.java
index b373e419f..54b5f3f9b 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/PfConceptGetterImplTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfConceptGetterImplTest.java
@@ -71,7 +71,7 @@ public class PfConceptGetterImplTest {
assertThatThrownBy(() -> getter.get((String) null, VERSION001)).hasMessage("conceptKeyName may not be null");
assertEquals(keyW002, getter.get("W", VERSION002));
- assertEquals(keyW002, getter.get("W", (String)null));
+ assertEquals(keyW002, getter.get("W", (String) null));
assertEquals(new TreeSet<PfConceptKey>(keyMap.values()), getter.getAll(null));
assertEquals(new TreeSet<PfConceptKey>(keyMap.values()), getter.getAll(null, null));
diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java
index 4210bc607..c756d1e06 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfKeyImplTest.java
@@ -29,12 +29,10 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.Field;
-
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-
import org.junit.Test;
import org.onap.policy.models.base.PfKey.Compatibility;
import org.onap.policy.models.base.testconcepts.DummyPfKey;
diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfObjectFilterTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfObjectFilterTest.java
index d1ba3a418..d6985e949 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/PfObjectFilterTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfObjectFilterTest.java
@@ -31,7 +31,6 @@ import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
import org.junit.Test;
-
import org.onap.policy.models.base.testconcepts.DummyPfObject;
import org.onap.policy.models.base.testconcepts.DummyPfObjectFilter;
diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfReferenceKeyTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfReferenceKeyTest.java
index ba36b9e8f..dd5c205a7 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/PfReferenceKeyTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfReferenceKeyTest.java
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.Field;
-
import org.junit.Test;
public class PfReferenceKeyTest {
diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfTimestampKeyTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfTimestampKeyTest.java
index 1495fca7d..180e8b7a9 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/PfTimestampKeyTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfTimestampKeyTest.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.Date;
-
import org.junit.Test;
public class PfTimestampKeyTest {
diff --git a/models-base/src/test/java/org/onap/policy/models/base/PfUtilsTest.java b/models-base/src/test/java/org/onap/policy/models/base/PfUtilsTest.java
index a66aba2c6..8659b4cea 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/PfUtilsTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/PfUtilsTest.java
@@ -71,15 +71,15 @@ public class PfUtilsTest {
@Test
public void testMapMap() {
- Map<String,String> resultMap = PfUtils.mapMap(null, item -> {
+ Map<String, String> resultMap = PfUtils.mapMap(null, item -> {
throw new RuntimeException("should not be invoked");
});
assertNull(resultMap);
- Map<String,String> origMap = new TreeMap<>();
+ Map<String, String> origMap = new TreeMap<>();
origMap.put("key2A", "xyz2");
origMap.put("key2B", "pdq2");
- Map<String,String> newMap = PfUtils.mapMap(origMap, text -> text + "X");
+ Map<String, String> newMap = PfUtils.mapMap(origMap, text -> text + "X");
assertEquals("{key2A=xyz2X, key2B=pdq2X}", newMap.toString());
diff --git a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyAuthorativeConcept.java b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyAuthorativeConcept.java
index 02ff75061..0734108a4 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyAuthorativeConcept.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyAuthorativeConcept.java
@@ -22,7 +22,6 @@ package org.onap.policy.models.base.testconcepts;
import lombok.Data;
import lombok.NoArgsConstructor;
-
import org.onap.policy.models.base.PfNameVersion;
/**
diff --git a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyBadPfConcept.java b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyBadPfConcept.java
index 05fd5992b..37d97da0f 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyBadPfConcept.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyBadPfConcept.java
@@ -21,7 +21,6 @@
package org.onap.policy.models.base.testconcepts;
import lombok.NonNull;
-
import org.onap.policy.models.base.PfConceptKey;
/**
diff --git a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyBadPfConceptContainer.java b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyBadPfConceptContainer.java
index c328a01aa..498b78ad8 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyBadPfConceptContainer.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyBadPfConceptContainer.java
@@ -21,9 +21,7 @@
package org.onap.policy.models.base.testconcepts;
import java.util.Map;
-
import lombok.NonNull;
-
import org.onap.policy.models.base.PfConceptContainer;
import org.onap.policy.models.base.PfConceptKey;
diff --git a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptContainer.java b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptContainer.java
index 45de69e68..56fb59534 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptContainer.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptContainer.java
@@ -21,9 +21,7 @@
package org.onap.policy.models.base.testconcepts;
import java.util.Map;
-
import lombok.NonNull;
-
import org.onap.policy.models.base.PfConceptContainer;
import org.onap.policy.models.base.PfConceptKey;
diff --git a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptKeySub.java b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptKeySub.java
index 893dc5321..8352697e6 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptKeySub.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptKeySub.java
@@ -22,9 +22,7 @@
package org.onap.policy.models.base.testconcepts;
import javax.ws.rs.core.Response;
-
import lombok.NonNull;
-
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfModelRuntimeException;
diff --git a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptSub.java b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptSub.java
index 12875eaca..2c3fd189e 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptSub.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfConceptSub.java
@@ -21,9 +21,7 @@
package org.onap.policy.models.base.testconcepts;
import javax.ws.rs.core.Response;
-
import lombok.NonNull;
-
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfModelRuntimeException;
diff --git a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfKey.java b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfKey.java
index ed2fb9885..81ebb6e59 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfKey.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfKey.java
@@ -23,9 +23,7 @@ package org.onap.policy.models.base.testconcepts;
import java.util.Arrays;
import java.util.List;
-
import lombok.NonNull;
-
import org.onap.policy.models.base.PfConcept;
import org.onap.policy.models.base.PfKey;
import org.onap.policy.models.base.PfValidationResult;
diff --git a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfNameVersion.java b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfNameVersion.java
index 792ac3c06..1d28573ff 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfNameVersion.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfNameVersion.java
@@ -22,7 +22,6 @@
package org.onap.policy.models.base.testconcepts;
import lombok.Data;
-
import org.onap.policy.models.base.PfNameVersion;
/**
diff --git a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfObject.java b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfObject.java
index fcf4f7790..53009ddc8 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfObject.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfObject.java
@@ -23,7 +23,6 @@ package org.onap.policy.models.base.testconcepts;
import lombok.Data;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
-
import org.apache.commons.lang3.ObjectUtils;
import org.onap.policy.models.base.PfNameVersion;
diff --git a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfObjectFilter.java b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfObjectFilter.java
index a41c9dcdd..489262865 100644
--- a/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfObjectFilter.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/testconcepts/DummyPfObjectFilter.java
@@ -21,9 +21,7 @@
package org.onap.policy.models.base.testconcepts;
import java.util.List;
-
import lombok.Data;
-
import org.onap.policy.models.base.PfObjectFilter;
/**