From 9c5d23395918a739b591667edd77e3ced9cd4bfb Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 18 Jun 2020 22:36:23 +0100 Subject: Changes for Checkstyle 8.32 Issue-ID: POLICY-2188 Change-Id: I6db16763c1d2d80ff934302081a8dfc16afa7d9a Signed-off-by: liamfallon --- .../policy/models/sim/dmaap/parameters/DmaapSimParameterHandler.java | 1 - .../onap/policy/models/sim/dmaap/parameters/RestServerParameters.java | 1 - .../main/java/org/onap/policy/models/sim/dmaap/provider/TopicData.java | 3 +-- .../org/onap/policy/models/sim/dmaap/rest/BaseRestControllerV1.java | 1 - .../onap/policy/models/sim/dmaap/rest/CambriaMessageBodyHandler.java | 3 +-- .../java/org/onap/policy/models/sim/dmaap/provider/TopicDataTest.java | 2 +- 6 files changed, 3 insertions(+), 8 deletions(-) (limited to 'models-sim/models-sim-dmaap/src') diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/DmaapSimParameterHandler.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/DmaapSimParameterHandler.java index 0b06de5cf..2ade27d83 100644 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/DmaapSimParameterHandler.java +++ b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/DmaapSimParameterHandler.java @@ -22,7 +22,6 @@ package org.onap.policy.models.sim.dmaap.parameters; import java.io.File; - import org.onap.policy.common.parameters.GroupValidationResult; import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.CoderException; diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/RestServerParameters.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/RestServerParameters.java index 8fb2cffa3..41451eb2f 100644 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/RestServerParameters.java +++ b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/parameters/RestServerParameters.java @@ -22,7 +22,6 @@ package org.onap.policy.models.sim.dmaap.parameters; import lombok.Getter; - import org.onap.policy.common.parameters.ParameterGroupImpl; import org.onap.policy.common.parameters.annotations.Min; import org.onap.policy.common.parameters.annotations.NotBlank; diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/TopicData.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/TopicData.java index 2737f455b..5da2adca0 100644 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/TopicData.java +++ b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/TopicData.java @@ -112,8 +112,7 @@ public class TopicData { do { result = group2data.computeIfAbsent(consumerGroup, maker).read(maxRead, waitMs); - } - while (result == ConsumerGroupData.UNREADABLE_LIST); + } while (result == ConsumerGroupData.UNREADABLE_LIST); // @formatter:on diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/BaseRestControllerV1.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/BaseRestControllerV1.java index bcde4b522..ed8909b80 100644 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/BaseRestControllerV1.java +++ b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/BaseRestControllerV1.java @@ -28,7 +28,6 @@ import io.swagger.annotations.SwaggerDefinition; import io.swagger.annotations.Tag; import java.net.HttpURLConnection; import java.util.UUID; - import javax.ws.rs.Consumes; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/CambriaMessageBodyHandler.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/CambriaMessageBodyHandler.java index dbd9422ef..b468e34c3 100644 --- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/CambriaMessageBodyHandler.java +++ b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/CambriaMessageBodyHandler.java @@ -121,8 +121,7 @@ public class CambriaMessageBodyHandler implements MessageBodyReader { if ((chr = reader.read()) < 0) { return false; } - } - while (Character.isWhitespace(chr)); + } while (Character.isWhitespace(chr)); // push the last character back onto the reader reader.reset(); diff --git a/models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/provider/TopicDataTest.java b/models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/provider/TopicDataTest.java index 02131dd19..b731a6fce 100644 --- a/models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/provider/TopicDataTest.java +++ b/models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/provider/TopicDataTest.java @@ -185,7 +185,7 @@ public class TopicDataTest { coder = mock(Coder.class); when(coder.encode(any())).thenThrow(new CoderException(EXPECTED_EXCEPTION)); - assertNull(data.convertMessageToString(new TreeMap(), coder)); + assertNull(data.convertMessageToString(new TreeMap(), coder)); } @Test -- cgit 1.2.3-korg