From 690495d32c6033741d7a7c2413476f7ba88e2825 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 11 Mar 2020 21:29:17 +0000 Subject: Fix minor checkstyle/eclipse warnings Some minor checkstyle and eclipse warnings have crept into the code in the last few weeks. This review cleams them up. Issue-ID: POLICY-1913 Change-Id: Ib5f103bc28c71a6c4db05ea05719eff41bb38914 Signed-off-by: liamfallon --- .../onap/policy/apex/core/deployment/DummyDeploymentClient.java | 4 ++-- .../infrastructure/messaging/EndToEndStringMessagingTest.java | 4 ++-- .../apex/core/infrastructure/threading/ThreadingTestThread.java | 8 ++------ 3 files changed, 6 insertions(+), 10 deletions(-) (limited to 'core') diff --git a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java index 965013acb..4eda2eeba 100644 --- a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java +++ b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java @@ -21,6 +21,8 @@ package org.onap.policy.apex.core.deployment; +import static org.awaitility.Awaitility.await; + import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -42,8 +44,6 @@ import org.onap.policy.apex.core.protocols.engdep.messages.UpdateModel; import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; import org.onap.policy.common.utils.resources.TextFileUtils; -import static org.awaitility.Awaitility.await; - /** * Dummy deployment client. */ diff --git a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/EndToEndStringMessagingTest.java b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/EndToEndStringMessagingTest.java index d9691f17e..5a1390163 100644 --- a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/EndToEndStringMessagingTest.java +++ b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/EndToEndStringMessagingTest.java @@ -25,6 +25,8 @@ import static org.awaitility.Awaitility.await; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import java.util.concurrent.TimeUnit; + import org.junit.Test; import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageClient; import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener; @@ -32,8 +34,6 @@ import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStri import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; -import java.util.concurrent.TimeUnit; - /** * The Class EndToEndMessagingTest. * diff --git a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/threading/ThreadingTestThread.java b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/threading/ThreadingTestThread.java index a2c51539f..ee2212159 100644 --- a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/threading/ThreadingTestThread.java +++ b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/threading/ThreadingTestThread.java @@ -24,8 +24,6 @@ package org.onap.policy.apex.core.infrastructure.threading; import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; -import java.util.concurrent.CountDownLatch; - /** * The Class ThreadingTestThread. * @@ -42,9 +40,7 @@ public class ThreadingTestThread implements Runnable { private String threadName; - private CountDownLatch latch = new CountDownLatch(1); - - /** + /** * {@inheritDoc}. */ @Override @@ -59,7 +55,7 @@ public class ThreadingTestThread implements Runnable { if (logger.isDebugEnabled()) { logger.debug("in threading test thread \"" + threadName + "\", counter=" + counter + " . . ."); } - if(!ThreadUtilities.sleep(50)) { + if (!ThreadUtilities.sleep(50)) { interrupted = true; } } -- cgit 1.2.3-korg