diff options
Diffstat (limited to 'models-interactions')
88 files changed, 71 insertions, 160 deletions
diff --git a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java index abfd2eb41..c6e273d50 100644 --- a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java +++ b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java @@ -212,7 +212,7 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation<Map<String, S verify(webAsync).put(requestCaptor.capture(), any(InvocationCallback.class)); String reqText = requestCaptor.getValue().getEntity(); - Map<String,String> reqMap = coder.decode(reqText, Map.class); + Map<String, String> reqMap = coder.decode(reqText, Map.class); // sort the request fields so they match the order in cq.json Map<String, String> request = new TreeMap<>(reqMap); diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperator.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperator.java index f731a2c84..4918dd7dd 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperator.java +++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperator.java @@ -32,7 +32,7 @@ import org.onap.policy.controlloop.actorserviceprovider.parameters.ParameterVali /** * Operator that uses HTTP. The operator's parameters must be an {@link HttpParams}. */ -public class HttpOperator extends TypedOperator<HttpConfig,HttpOperation<?>> { +public class HttpOperator extends TypedOperator<HttpConfig, HttpOperation<?>> { /** * Constructs the object. diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/TypedOperator.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/TypedOperator.java index 5561a97ef..937776926 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/TypedOperator.java +++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/TypedOperator.java @@ -24,7 +24,6 @@ import java.util.Map; import lombok.Getter; import org.onap.policy.controlloop.actorserviceprovider.Operation; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; -import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpParams; /** * Operator with typed parameter information. diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperatorTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperatorTest.java index 29f507e60..ff59176a1 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperatorTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperatorTest.java @@ -107,7 +107,7 @@ public class BidirectionalTopicOperatorTest { AtomicReference<BidirectionalTopicConfig> configRef = new AtomicReference<>(); // @formatter:off - OperationMaker<BidirectionalTopicConfig, BidirectionalTopicOperation<?,?>> maker = + OperationMaker<BidirectionalTopicConfig, BidirectionalTopicOperation<?, ?>> maker = (params, config) -> { paramsRef.set(params); configRef.set(config); @@ -150,7 +150,7 @@ public class BidirectionalTopicOperatorTest { } @Override - public BidirectionalTopicOperation<?,?> buildOperation(ControlLoopOperationParams params) { + public BidirectionalTopicOperation<?, ?> buildOperation(ControlLoopOperationParams params) { return null; } } diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java index 6d8c60bb6..e2ed2d98f 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java @@ -140,7 +140,7 @@ public class OperationPartialTest { */ @BeforeClass public static void setUpBeforeClass() throws Exception { - /** + /* * Attach appender to the logger. */ appender.setContext(logger.getLoggerContext()); diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpPollingActorParamsTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpPollingActorParamsTest.java index 78240beb6..3202c2e54 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpPollingActorParamsTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpPollingActorParamsTest.java @@ -31,7 +31,6 @@ import org.junit.Before; import org.junit.Test; import org.onap.policy.common.parameters.ValidationResult; import org.onap.policy.controlloop.actorserviceprovider.Util; -import org.onap.policy.controlloop.actorserviceprovider.parameters.ActorParams; public class HttpPollingActorParamsTest { diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpPollingParamsTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpPollingParamsTest.java index e3fef83c5..42a8717bd 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpPollingParamsTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/parameters/HttpPollingParamsTest.java @@ -77,7 +77,7 @@ public class HttpPollingParamsTest { } private void testValidateField(String fieldName, String expected, - Function<HttpPollingParamsBuilder<?,?>, HttpPollingParamsBuilder<?,?>> makeInvalid) { + Function<HttpPollingParamsBuilder<?, ?>, HttpPollingParamsBuilder<?, ?>> makeInvalid) { // original params should be valid ValidationResult result = params.validate(CONTAINER); diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java index 058323412..d48d7250c 100644 --- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java +++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java @@ -22,7 +22,6 @@ package org.onap.policy.appc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.time.Instant; import java.util.ArrayList; diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java index 08cc163c0..c26566fe1 100644 --- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java +++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java @@ -22,7 +22,6 @@ package org.onap.policy.appc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java index 368876f93..3afbd53c7 100644 --- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java +++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java @@ -22,7 +22,6 @@ package org.onap.policy.appc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java index 54589830f..8a2c2cded 100644 --- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java +++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java @@ -22,7 +22,6 @@ package org.onap.policy.appc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java index 30d4fcb0a..008c76944 100644 --- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java +++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java @@ -29,12 +29,10 @@ import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; - import java.lang.reflect.Type; import java.time.Instant; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java index ad8fc1f34..4854e2759 100644 --- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java +++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java @@ -32,7 +32,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.UUID; - import org.junit.Test; public class CommonHeaderTest { diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java index 3e09bec0a..e6fb868b3 100644 --- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java +++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertNotNull; import java.util.HashMap; import java.util.Map; - import org.junit.Test; public class RequestTest { diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseTest.java index 68d3e00bc..72c203f98 100644 --- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseTest.java +++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseTest.java @@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.Map; - import org.junit.Test; public class ResponseTest { diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/util/SerializationTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/util/SerializationTest.java index 5d0d4c538..965a4095c 100644 --- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/util/SerializationTest.java +++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/util/SerializationTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertNull; import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; - import org.junit.Test; public class SerializationTest { diff --git a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmCommonHeader.java b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmCommonHeader.java index 363ea35a5..aea6edea1 100644 --- a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmCommonHeader.java +++ b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmCommonHeader.java @@ -22,7 +22,6 @@ package org.onap.policy.appclcm; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.time.Instant; import java.util.HashMap; diff --git a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmDmaapWrapper.java b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmDmaapWrapper.java index 893678306..525ac622c 100644 --- a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmDmaapWrapper.java +++ b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmDmaapWrapper.java @@ -22,7 +22,6 @@ package org.onap.policy.appclcm; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Data; diff --git a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmInput.java b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmInput.java index 879aea6c2..8621b6771 100644 --- a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmInput.java +++ b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmInput.java @@ -22,7 +22,6 @@ package org.onap.policy.appclcm; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.util.Map; import lombok.AllArgsConstructor; diff --git a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmOutput.java b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmOutput.java index 93e5a008c..6aa93b5d4 100644 --- a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmOutput.java +++ b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmOutput.java @@ -22,7 +22,6 @@ package org.onap.policy.appclcm; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmResponseStatus.java b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmResponseStatus.java index 3d02e8236..6f5d012ea 100644 --- a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmResponseStatus.java +++ b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmResponseStatus.java @@ -22,7 +22,6 @@ package org.onap.policy.appclcm; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Data; diff --git a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java index 11da28a36..54f9782f4 100644 --- a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java +++ b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java @@ -29,7 +29,6 @@ import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; - import java.lang.reflect.Type; import java.time.Instant; diff --git a/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/util/SerializationTest.java b/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/util/SerializationTest.java index c5f7d3086..52c2c54bd 100644 --- a/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/util/SerializationTest.java +++ b/models-interactions/model-impl/appclcm/src/test/java/org/onap/policy/appclcm/util/SerializationTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertEquals; import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; - import org.junit.Test; public class SerializationTest { diff --git a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/CdsResponse.java b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/CdsResponse.java index 499d1a7c9..fd12fbf44 100644 --- a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/CdsResponse.java +++ b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/CdsResponse.java @@ -19,7 +19,6 @@ package org.onap.policy.cds; import java.io.Serializable; - import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopResponse.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopResponse.java index 1067b3ff7..606986ff5 100644 --- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopResponse.java +++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopResponse.java @@ -22,7 +22,6 @@ package org.onap.policy.controlloop; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.util.UUID; import lombok.Data; diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java index 3319105ea..b7622bde2 100644 --- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java +++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java @@ -22,7 +22,6 @@ package org.onap.policy.controlloop; import com.google.gson.annotations.SerializedName; - import java.time.Instant; import java.util.HashMap; import java.util.Map; diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java index 1fcda16d0..072299a0d 100644 --- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java +++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java @@ -22,7 +22,6 @@ package org.onap.policy.controlloop; import com.google.gson.annotations.SerializedName; - import java.time.Instant; import java.util.HashMap; import java.util.Map; diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java index 0b94e854f..5992ce23c 100644 --- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java +++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java @@ -29,12 +29,10 @@ import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; - import java.lang.reflect.Type; import java.time.Instant; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; - import org.onap.policy.controlloop.ControlLoopNotificationType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/RestTest.java b/models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/RestTest.java index 21a971651..8c241c83e 100644 --- a/models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/RestTest.java +++ b/models-interactions/model-impl/rest/src/test/java/org/onap/policy/rest/RestTest.java @@ -29,7 +29,6 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.DefaultValue; @@ -145,55 +144,55 @@ public class RestTest { RestManager mgr = new RestManager(); Pair<Integer, String> result = mgr.get(getUri, null, null, null); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("GOT: " + EXPECT_STRING, result.second); result = mgr.delete(deleteUri, null, null, null, null, null); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("DELETE: " + EXPECT_STRING, result.second); result = mgr.delete(deleteUri, null, null, null); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("DELETE: " + EXPECT_STRING, result.second); result = mgr.put(putUri, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PUT: " + PAYLOAD + EXPECT_STRING, result.second); result = mgr.put(putUriBlank, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PUT: " + PAYLOAD + RETURN_STRING, result.second); result = mgr.post(postUri, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("POST: " + PAYLOAD + EXPECT_STRING, result.second); result = mgr.post(postUriBlank, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("POST: " + PAYLOAD + RETURN_STRING, result.second); result = mgr.patch(patchUri, null, null, null, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PATCH: " + PAYLOAD + EXPECT_STRING, result.second); result = mgr.patch(patchUriBlank, null, null, null, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PATCH: " + PAYLOAD + RETURN_STRING, result.second); @@ -204,49 +203,49 @@ public class RestTest { RestManager mgr = new RestManager(); Pair<Integer, String> result = mgr.get(getUri, "", null, null); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("GOT: " + EXPECT_STRING, result.second); result = mgr.delete(deleteUri, "", null, null, null, null); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("DELETE: " + EXPECT_STRING, result.second); result = mgr.put(putUri, "", null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PUT: " + PAYLOAD + EXPECT_STRING, result.second); result = mgr.put(putUriBlank, "", null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PUT: " + PAYLOAD + RETURN_STRING, result.second); result = mgr.post(postUri, "", null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("POST: " + PAYLOAD + EXPECT_STRING, result.second); result = mgr.post(postUriBlank, "", null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("POST: " + PAYLOAD + RETURN_STRING, result.second); result = mgr.patch(patchUri, "", null, null, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PATCH: " + PAYLOAD + EXPECT_STRING, result.second); result = mgr.patch(patchUriBlank, "", null, null, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PATCH: " + PAYLOAD + RETURN_STRING, result.second); @@ -257,49 +256,49 @@ public class RestTest { RestManager mgr = new RestManager(); Pair<Integer, String> result = mgr.get(getUri, "user", null, null); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("GOT: " + EXPECT_STRING, result.second); result = mgr.delete(deleteUri, "user", null, null, null, null); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("DELETE: " + EXPECT_STRING, result.second); result = mgr.put(putUri, "user", null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PUT: " + PAYLOAD + EXPECT_STRING, result.second); result = mgr.put(putUriBlank, "user", null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PUT: " + PAYLOAD + RETURN_STRING, result.second); result = mgr.post(postUri, "user", null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("POST: " + PAYLOAD + EXPECT_STRING, result.second); result = mgr.post(postUriBlank, "user", null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("POST: " + PAYLOAD + RETURN_STRING, result.second); result = mgr.patch(patchUri, "user", null, null, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PATCH: " + PAYLOAD + EXPECT_STRING, result.second); result = mgr.patch(patchUriBlank, "user", null, null, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PATCH: " + PAYLOAD + RETURN_STRING, result.second); @@ -310,19 +309,19 @@ public class RestTest { RestManager mgr = new RestManager(); Pair<Integer, String> result = mgr.get(baseUri + "RestTest/GetHello/", null, null, null); - assertEquals((Integer)404, result.first); + assertEquals((Integer) 404, result.first); result = mgr.delete(baseUri + "RestTest/DeleteHello/", null, null, null, null, null); - assertEquals((Integer)404, result.first); + assertEquals((Integer) 404, result.first); result = mgr.put(baseUri + "RestTest/PutHello/", null, null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)404, result.first); + assertEquals((Integer) 404, result.first); result = mgr.post(baseUri + "RestTest/PostHello/", null, null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)404, result.first); + assertEquals((Integer) 404, result.first); result = mgr.patch(baseUri + "RestTest/PatchHello/", null, null, null, PAYLOAD); - assertEquals((Integer)404, result.first); + assertEquals((Integer) 404, result.first); } @Test @@ -330,33 +329,33 @@ public class RestTest { RestManager mgr = new RestManager(); Pair<Integer, String> result = mgr.get(baseUri + "RestTest/GetHello/" + NAME_PARAM, null, null, null); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("GOT: " + RETURN_STRING + NAME_PARAM + " aged 90", result.second); result = mgr.delete(baseUri + "RestTest/DeleteHello/" + NAME_PARAM, null, null, null, null, null); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("DELETE: " + RETURN_STRING + NAME_PARAM + " aged 90", result.second); result = mgr.put(baseUri + "RestTest/PutHello/" + NAME_PARAM, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PUT: " + PAYLOAD + RETURN_STRING + NAME_PARAM + " aged 90", result.second); result = mgr.post(baseUri + "RestTest/PostHello/" + NAME_PARAM, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("POST: " + PAYLOAD + RETURN_STRING + NAME_PARAM + " aged 90", result.second); result = mgr.patch(baseUri + "RestTest/PatchHello/" + NAME_PARAM, null, null, null, PAYLOAD); - assertEquals((Integer)200, result.first); + assertEquals((Integer) 200, result.first); assertTrue(result.second != null); assertTrue(result.second.length() > 0); assertEquals("PATCH: " + PAYLOAD + RETURN_STRING + NAME_PARAM + " aged 90", result.second); @@ -367,19 +366,19 @@ public class RestTest { RestManager mgr = new RestManager(); Pair<Integer, String> result = mgr.get(baseUri + "NonExistant/URL/", null, null, null); - assertEquals((Integer)404, result.first); + assertEquals((Integer) 404, result.first); result = mgr.delete(baseUri + "NonExistant/URL/", null, null, null, null, null); - assertEquals((Integer)404, result.first); + assertEquals((Integer) 404, result.first); result = mgr.put(baseUri + "NonExistant/URL/", null, null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)404, result.first); + assertEquals((Integer) 404, result.first); result = mgr.post(baseUri + "NonExistant/URL/", null, null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)404, result.first); + assertEquals((Integer) 404, result.first); result = mgr.patch(baseUri + "NonExistant/URL/", null, null, null, PAYLOAD); - assertEquals((Integer)404, result.first); + assertEquals((Integer) 404, result.first); } @Test @@ -387,35 +386,35 @@ public class RestTest { RestManager mgr = new RestManager(); Pair<Integer, String> result = mgr.get(deleteUri, null, null, null); - assertEquals((Integer)405, result.first); + assertEquals((Integer) 405, result.first); result = mgr.delete(getUri, null, null, null, null, null); - assertEquals((Integer)405, result.first); + assertEquals((Integer) 405, result.first); result = mgr.delete(getUri, null, null, null); - assertEquals((Integer)405, result.first); + assertEquals((Integer) 405, result.first); result = mgr.put(getUri, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)405, result.first); + assertEquals((Integer) 405, result.first); result = mgr.post(getUri, null, null, null, MediaType.TEXT_PLAIN, PAYLOAD); - assertEquals((Integer)405, result.first); + assertEquals((Integer) 405, result.first); result = mgr.patch(getUri, null, null, null, PAYLOAD); - assertEquals((Integer)405, result.first); + assertEquals((Integer) 405, result.first); } @GET @Path("/GetHello/{name}") @Produces(MediaType.TEXT_PLAIN) - public String getIt( @PathParam("name") String name, @DefaultValue("90") @QueryParam("age") String age) { + public String getIt(@PathParam("name") String name, @DefaultValue("90") @QueryParam("age") String age) { return "GOT: " + RETURN_STRING + name + " aged " + age; } @DELETE @Path("/DeleteHello/{name}") @Produces(MediaType.TEXT_PLAIN) - public String deleteIt( @PathParam("name") String name, @DefaultValue("90") @QueryParam("age") String age) { + public String deleteIt(@PathParam("name") String name, @DefaultValue("90") @QueryParam("age") String age) { return "DELETE: " + RETURN_STRING + name + " aged " + age; } @@ -434,7 +433,7 @@ public class RestTest { @PUT @Path("/PutBlank") @Produces(MediaType.TEXT_PLAIN) - public String putIt( String payload) { + public String putIt(String payload) { return "PUT: " + payload + RETURN_STRING; } @@ -453,7 +452,7 @@ public class RestTest { @POST @Path("/PostBlank") @Produces(MediaType.TEXT_PLAIN) - public String postBlank( String payload) { + public String postBlank(String payload) { return "POST: " + payload + RETURN_STRING; } @@ -479,7 +478,7 @@ public class RestTest { @Patch @Path("/PatchBlank") @Produces(MERGE_PATCH_PLUS_JSON) - public String patchBlank( String payload) { + public String patchBlank(String payload) { return "PATCH: " + payload + RETURN_STRING; } } diff --git a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Resource.java b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Resource.java index d5e8b6c2a..79f8161d3 100644 --- a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Resource.java +++ b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Resource.java @@ -23,7 +23,6 @@ package org.onap.policy.sdc; import java.io.Serializable; import java.util.UUID; - import lombok.Data; @Data diff --git a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ResourceInstance.java b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ResourceInstance.java index 0b6068dce..4fbafcae0 100644 --- a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ResourceInstance.java +++ b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ResourceInstance.java @@ -22,10 +22,8 @@ package org.onap.policy.sdc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.util.UUID; - import lombok.Data; @Data diff --git a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java index e1068cb31..91ed1e432 100644 --- a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java +++ b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceInstanceTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.UUID; - import org.junit.Test; public class ResourceInstanceTest { diff --git a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceTest.java b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceTest.java index 6949a36f8..7b76a9de7 100644 --- a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceTest.java +++ b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ResourceTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.UUID; - import org.junit.Test; public class ResourceTest { diff --git a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java index 3e134d67b..336370518 100644 --- a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java +++ b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceInstanceTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.UUID; - import org.junit.Test; public class ServiceInstanceTest { diff --git a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java index 73efbb014..d7913624c 100644 --- a/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java +++ b/models-interactions/model-impl/sdc/src/test/java/org/onap/policy/sdc/ServiceTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.UUID; - import org.junit.Test; public class ServiceTest { diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealNetworkInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealNetworkInfo.java index 99fed29a3..fa3b99a17 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealNetworkInfo.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealNetworkInfo.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequest.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequest.java index 00a6b96f6..03f4d0bb0 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequest.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequest.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestHeaderInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestHeaderInfo.java index a029f115c..1033048f2 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestHeaderInfo.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestHeaderInfo.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestInfo.java index 477c0b32f..33e1b122c 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestInfo.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestInfo.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealServiceInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealServiceInfo.java index cce6c2c5e..d19d3461d 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealServiceInfo.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealServiceInfo.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleInfo.java index 08d3aa2db..9b2ab646b 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleInfo.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleInfo.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParameter.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParameter.java index 16151f628..7c75f837d 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParameter.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParameter.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParametersInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParametersInfo.java index 0152853bd..bea867cb5 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParametersInfo.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParametersInfo.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.util.LinkedList; import java.util.List; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleRequestInput.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleRequestInput.java index 6d61cf272..b71495fcb 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleRequestInput.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleRequestInput.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVnfInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVnfInfo.java index b81c083a4..e8223de68 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVnfInfo.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVnfInfo.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java index fa18cb254..65b655936 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java @@ -23,17 +23,14 @@ package org.onap.policy.sdnc; import com.google.gson.JsonSyntaxException; - import java.util.HashMap; import java.util.Map; - import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.common.endpoints.utils.NetLoggerUtil; import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType; import org.onap.policy.rest.RestManager; import org.onap.policy.rest.RestManager.Pair; import org.onap.policy.sdnc.util.Serialization; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncRequest.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncRequest.java index 7d293d05c..56e69d641 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncRequest.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncRequest.java @@ -21,7 +21,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.util.UUID; import lombok.Getter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponse.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponse.java index 8d28832da..718a469a6 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponse.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponse.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseNetworkInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseNetworkInfo.java index e887c033a..19b4ca537 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseNetworkInfo.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseNetworkInfo.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseOutput.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseOutput.java index c7f4b5f89..270c24142 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseOutput.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseOutput.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseServiceInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseServiceInfo.java index 2ee9201b2..750b9c383 100644 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseServiceInfo.java +++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseServiceInfo.java @@ -20,7 +20,6 @@ package org.onap.policy.sdnc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncRequestTest.java b/models-interactions/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncRequestTest.java index ce3f30559..6dc6fa2d5 100644 --- a/models-interactions/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncRequestTest.java +++ b/models-interactions/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncRequestTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import java.util.UUID; - import org.junit.Test; public class SdncRequestTest { diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java index 0b3e98795..d8555e4a7 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java @@ -23,7 +23,6 @@ package org.onap.policy.sdnr; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.time.Instant; import java.util.HashMap; diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java index 03fdfc1e4..71e4c56e9 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java @@ -23,7 +23,6 @@ package org.onap.policy.sdnr; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java index 5d7697eed..803f126e0 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java @@ -23,7 +23,6 @@ package org.onap.policy.sdnr; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java index a3bffdadd..3f7ca49e8 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java @@ -23,7 +23,6 @@ package org.onap.policy.sdnr; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java index cdbe9dcb0..909e5d883 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java @@ -23,7 +23,6 @@ package org.onap.policy.sdnr; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/Serialization.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/Serialization.java index 7640242e7..429b13118 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/Serialization.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/util/Serialization.java @@ -31,10 +31,8 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; - import java.lang.reflect.Type; import java.time.Instant; - import org.onap.policy.sdnr.PciRequest; import org.onap.policy.sdnr.PciResponse; diff --git a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java index 84178e062..dfd89c0fe 100644 --- a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java +++ b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java @@ -32,7 +32,6 @@ import java.time.Instant; import java.util.HashMap; import java.util.Map; import java.util.UUID; - import org.junit.Test; public class PciCommonHeaderTest { diff --git a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/SdnrTest.java b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/SdnrTest.java index 4cbda52ec..bd5fad494 100644 --- a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/SdnrTest.java +++ b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/SdnrTest.java @@ -27,10 +27,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.UUID; - import org.junit.Test; import org.onap.policy.sdnr.util.Serialization; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/SerializationTest.java b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/SerializationTest.java index 80b39890b..ca2ca0544 100644 --- a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/SerializationTest.java +++ b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/util/SerializationTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertEquals; import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; - import org.junit.Test; public class SerializationTest { diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java index e4085feb0..beb852864 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java @@ -22,7 +22,6 @@ package org.onap.policy.so; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java index 2b2205942..8d0fdb24c 100644 --- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java +++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoAsyncRequestStatusTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.time.LocalDateTime; - import org.junit.Test; public class SoAsyncRequestStatusTest { diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java index eea3044ad..25a89e31e 100644 --- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java +++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestDetailsTest.java @@ -31,7 +31,6 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; - import org.junit.Test; public class SoRequestDetailsTest { diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java index 93b855bd8..4dba63511 100644 --- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java +++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoRequestTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertTrue; import java.time.LocalDateTime; import java.util.UUID; - import org.junit.Test; public class SoRequestTest { diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java index fdc59965a..635e7dd16 100644 --- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java +++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/SoResponseWrapperTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import java.util.UUID; - import org.junit.Test; public class SoResponseWrapperTest { diff --git a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealActionVmInfo.java b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealActionVmInfo.java index c7e44d930..20c5588a1 100644 --- a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealActionVmInfo.java +++ b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealActionVmInfo.java @@ -21,7 +21,6 @@ package org.onap.policy.vfc; import java.io.Serializable; - import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealAdditionalParams.java b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealAdditionalParams.java index 237b827cb..2b06a8f03 100644 --- a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealAdditionalParams.java +++ b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealAdditionalParams.java @@ -21,7 +21,6 @@ package org.onap.policy.vfc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import lombok.Getter; import lombok.Setter; diff --git a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java index 14382f0e9..17f8a58f3 100644 --- a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java +++ b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java @@ -22,10 +22,8 @@ package org.onap.policy.vfc; import com.google.gson.JsonSyntaxException; - import java.util.HashMap; import java.util.Map; - import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.common.endpoints.utils.NetLoggerUtil; import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType; diff --git a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcRequest.java b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcRequest.java index e5f96f4d6..39f5e645c 100644 --- a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcRequest.java +++ b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcRequest.java @@ -21,7 +21,6 @@ package org.onap.policy.vfc; import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.util.UUID; import lombok.Getter; diff --git a/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealAdditionalParamsTest.java b/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealAdditionalParamsTest.java index a66264ed8..acaad2082 100644 --- a/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealAdditionalParamsTest.java +++ b/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcHealAdditionalParamsTest.java @@ -41,7 +41,7 @@ public class VfcHealAdditionalParamsTest { assertEquals(action, additionalParams.getAction()); VfcHealActionVmInfo actionInfo = new VfcHealActionVmInfo(); - additionalParams.setActionInfo(actionInfo ); + additionalParams.setActionInfo(actionInfo); assertEquals(actionInfo, additionalParams.getActionInfo()); assertNotEquals(0, additionalParams.hashCode()); diff --git a/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcRequestTest.java b/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcRequestTest.java index 67720cc16..ec222e9be 100644 --- a/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcRequestTest.java +++ b/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcRequestTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import java.util.UUID; - import org.junit.Test; public class VfcRequestTest { diff --git a/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseDescriptorTest.java b/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseDescriptorTest.java index 571c475c9..e85502d45 100644 --- a/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseDescriptorTest.java +++ b/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcResponseDescriptorTest.java @@ -28,7 +28,6 @@ import static org.junit.Assert.assertNotNull; import java.util.ArrayList; import java.util.List; - import org.junit.Test; public class VfcResponseDescriptorTest { diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java index e726576db..0bfc9062a 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java @@ -200,7 +200,7 @@ public class ControlLoopCompiler implements Serializable { // // They really shouldn't have any policies attached. // - if ((policy.getPolicies() != null || policy.getPolicies().isEmpty()) && callback != null ) { + if ((policy.getPolicies() != null || policy.getPolicies().isEmpty()) && callback != null) { callback.onWarning("Open Loop policy contains policies. The policies will never be invoked."); } } @@ -299,7 +299,7 @@ public class ControlLoopCompiler implements Serializable { if (LOGGER.isDebugEnabled()) { LOGGER.info("Trigger Node {}", node); } - if (graph.inDegreeOf(node) > 0 ) { + if (graph.inDegreeOf(node) > 0) { // // Really should NEVER get here unless someone messed up the code above. // @@ -353,10 +353,10 @@ public class ControlLoopCompiler implements Serializable { if (! isRecipeOk(operPolicy, callback)) { isOk = false; } - if (! isTargetOk(operPolicy, callback) ) { + if (! isTargetOk(operPolicy, callback)) { isOk = false; } - if (! arePolicyResultsOk(operPolicy, callback) ) { + if (! arePolicyResultsOk(operPolicy, callback)) { isOk = false; } return isOk; @@ -434,19 +434,19 @@ public class ControlLoopCompiler implements Serializable { // Check that policy results are connected to either default final * or another policy // boolean isOk = isSuccessPolicyResultOk(operPolicy, callback); - if (! isFailurePolicyResultOk(operPolicy, callback) ) { + if (! isFailurePolicyResultOk(operPolicy, callback)) { isOk = false; } - if (! isFailureRetriesPolicyResultOk(operPolicy, callback) ) { + if (! isFailureRetriesPolicyResultOk(operPolicy, callback)) { isOk = false; } - if (! isFailureTimeoutPolicyResultOk(operPolicy, callback) ) { + if (! isFailureTimeoutPolicyResultOk(operPolicy, callback)) { isOk = false; } - if (! isFailureExceptionPolicyResultOk(operPolicy, callback) ) { + if (! isFailureExceptionPolicyResultOk(operPolicy, callback)) { isOk = false; } - if (! isFailureGuardPolicyResultOk(operPolicy, callback) ) { + if (! isFailureGuardPolicyResultOk(operPolicy, callback)) { isOk = false; } return isOk; diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/guard/compiler/ControlLoopGuardCompiler.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/guard/compiler/ControlLoopGuardCompiler.java index 435963a9e..6f49f6a44 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/guard/compiler/ControlLoopGuardCompiler.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/guard/compiler/ControlLoopGuardCompiler.java @@ -22,11 +22,9 @@ package org.onap.policy.controlloop.guard.compiler; import java.io.InputStream; - import java.util.HashSet; import java.util.List; import java.util.Set; - import org.onap.policy.controlloop.compiler.CompilerException; import org.onap.policy.controlloop.compiler.ControlLoopCompilerCallback; import org.onap.policy.controlloop.policy.guard.Constraint; diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java index 95494d8e9..256f8be4e 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java @@ -24,7 +24,6 @@ package org.onap.policy.controlloop.policy; import java.io.Serializable; import java.util.LinkedList; import java.util.List; - import org.onap.aai.domain.yang.Pnf; import org.onap.policy.sdc.Resource; import org.onap.policy.sdc.Service; diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/Policy.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/Policy.java index 728733d76..7a64f2fae 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/Policy.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/Policy.java @@ -336,7 +336,7 @@ public class Policy implements Serializable { } private boolean equalsMayBeNull(final Object obj1, final Object obj2) { - if ( obj1 == null ) { + if (obj1 == null) { return obj2 == null; } return obj1.equals(obj2); diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java index 47f6f1494..c4b2cd4ca 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java @@ -22,10 +22,8 @@ package org.onap.policy.controlloop.policy.builder.impl; import com.google.common.base.Strings; - import java.util.LinkedList; import java.util.UUID; - import org.onap.aai.domain.yang.Pnf; import org.onap.policy.controlloop.compiler.CompilerException; import org.onap.policy.controlloop.compiler.ControlLoopCompiler; diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ResultsImpl.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ResultsImpl.java index 561f55170..aac4b068f 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ResultsImpl.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ResultsImpl.java @@ -23,7 +23,6 @@ package org.onap.policy.controlloop.policy.builder.impl; import java.util.LinkedList; import java.util.List; - import org.onap.policy.controlloop.policy.builder.Message; import org.onap.policy.controlloop.policy.builder.Results; diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/Constraint.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/Constraint.java index b16ecbb55..ab87b16eb 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/Constraint.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/Constraint.java @@ -29,7 +29,7 @@ import java.util.Map; public class Constraint { private Integer freqLimitPerTarget; - private Map<String,String> timeWindow; + private Map<String, String> timeWindow; private Map<String, String> activeTimeRange; private Integer minVnfCount; private Integer maxVnfCount; diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/GuardPolicy.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/GuardPolicy.java index 55b96e14e..5ad052b3b 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/GuardPolicy.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/GuardPolicy.java @@ -179,7 +179,7 @@ public class GuardPolicy { } private boolean equalsMayBeNull(final Object obj1, final Object obj2) { - if ( obj1 == null ) { + if (obj1 == null) { return obj2 == null; } return obj1.equals(obj2); diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/builder/impl/ControlLoopGuardBuilderImpl.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/builder/impl/ControlLoopGuardBuilderImpl.java index 70d23bcba..50f5086aa 100644 --- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/builder/impl/ControlLoopGuardBuilderImpl.java +++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/builder/impl/ControlLoopGuardBuilderImpl.java @@ -22,7 +22,6 @@ package org.onap.policy.controlloop.policy.guard.builder.impl; import java.util.LinkedList; - import org.onap.policy.controlloop.compiler.CompilerException; import org.onap.policy.controlloop.compiler.ControlLoopCompilerCallback; import org.onap.policy.controlloop.guard.compiler.ControlLoopGuardCompiler; @@ -105,7 +104,7 @@ public class ControlLoopGuardBuilderImpl implements ControlLoopGuardBuilder { if (constraints == null) { throw new BuilderException("Constraint much not be null"); } - if (!addLimitConstraints(id,constraints)) { + if (!addLimitConstraints(id, constraints)) { throw new BuilderException(NO_EXISTING_GUARD_POLICY_MATCHING_THE_ID + id); } return this; diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java index 98c00eb2f..71d67f07b 100644 --- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java +++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java @@ -31,7 +31,6 @@ import java.io.FileInputStream; import java.io.InputStream; import java.util.ArrayList; import java.util.List; - import org.junit.Test; import org.onap.policy.controlloop.policy.ControlLoopPolicy; import org.onap.policy.controlloop.policy.FinalResult; diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java index 81520b578..86823400c 100644 --- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java +++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java @@ -32,7 +32,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.util.UUID; - import org.junit.Ignore; import org.junit.Test; import org.onap.aai.domain.yang.Pnf; diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java index 43428c6f9..71a80dbf7 100644 --- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java +++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertNotNull; import java.io.FileInputStream; import java.io.InputStreamReader; - import org.junit.Test; import org.onap.policy.common.utils.coder.YamlJsonTranslator; import org.slf4j.Logger; diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopTest.java index c0131f506..f247baa0c 100644 --- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopTest.java +++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopTest.java @@ -27,10 +27,8 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.ArrayList; import java.util.List; - import org.junit.Ignore; import org.junit.Test; - import org.onap.aai.domain.yang.Pnf; import org.onap.policy.common.utils.io.Serializer; import org.onap.policy.sdc.Resource; diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ConstraintTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ConstraintTest.java index e0e6e9772..973caf9b4 100644 --- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ConstraintTest.java +++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/ConstraintTest.java @@ -29,7 +29,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.junit.Test; public class ConstraintTest { diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/GuardPolicyTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/GuardPolicyTest.java index 7599dcf31..9bdcd6062 100644 --- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/GuardPolicyTest.java +++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/guard/GuardPolicyTest.java @@ -28,7 +28,6 @@ import static org.junit.Assert.assertTrue; import java.util.LinkedList; import java.util.List; - import org.junit.Test; public class GuardPolicyTest { |