From 9c0c0c8f61a08aec5c95ebb90647a0aae445e129 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Fri, 19 Jun 2020 17:04:51 +0100 Subject: Changes for checkstyle 8.32 Issue-ID: POLICY-2188 Change-Id: I56bbf3aa3bd9e1ef433cc93ad2be0c54d141a2a5 Signed-off-by: liamfallon --- .../policy/apex/examples/aadm/AadmUseCaseTest.java | 1 - ...alyDetectionPolicyDecideTaskSelectionLogic.java | 2 -- .../AutoLearnPolicyDecideTaskSelectionLogic.java | 1 - .../adaptive/AnomalyDetectionConceptTest.java | 23 ++++++++++++---------- .../adaptive/AnomalyDetectionTslUseCaseTest.java | 1 - .../examples/adaptive/AutoLearnTslUseCaseTest.java | 1 - .../examples/adaptive/TestApexActionListener.java | 1 - .../examples/grpc/GrpcTestDummyGrpcServer.java | 3 --- .../apex/examples/grpc/TestApexGrpcExample.java | 2 -- .../apex/examples/myfirstpolicy/MfpLogicTest.java | 1 - .../examples/myfirstpolicy/MfpModelCliTest.java | 1 - .../examples/myfirstpolicy/MfpUseCaseTest.java | 2 -- .../myfirstpolicy/TestSaleAuthListener.java | 1 - .../onap/policy/apex/examples/bbs/WebClient.java | 1 - .../policy/apex/examples/bbs/WebClientTest.java | 2 -- .../domains/onap/vcpe/AppcResponseCreator.java | 2 -- .../domains/onap/vcpe/OnapVCpeSimEndpoint.java | 6 +----- .../apex/examples/servlet/ApexServletListener.java | 2 -- 18 files changed, 14 insertions(+), 39 deletions(-) (limited to 'examples') diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java index 97f0aeaaa..8e05aff51 100644 --- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java +++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.IOException; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AnomalyDetectionPolicyDecideTaskSelectionLogic.java b/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AnomalyDetectionPolicyDecideTaskSelectionLogic.java index 99dd28dd8..6c1998108 100644 --- a/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AnomalyDetectionPolicyDecideTaskSelectionLogic.java +++ b/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AnomalyDetectionPolicyDecideTaskSelectionLogic.java @@ -26,13 +26,11 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; - import org.apache.commons.math3.distribution.TDistribution; import org.apache.commons.math3.util.FastMath; import org.onap.policy.apex.core.engine.executor.context.TaskSelectionExecutionContext; import org.onap.policy.apex.examples.adaptive.concepts.AnomalyDetection; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; -import org.slf4j.Logger; /** * The Class AnomalyDetectionPolicyDecideTaskSelectionLogic. diff --git a/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AutoLearnPolicyDecideTaskSelectionLogic.java b/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AutoLearnPolicyDecideTaskSelectionLogic.java index ef697b077..c0aa620ac 100644 --- a/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AutoLearnPolicyDecideTaskSelectionLogic.java +++ b/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/model/java/AutoLearnPolicyDecideTaskSelectionLogic.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.examples.adaptive.model.java; import java.util.Arrays; import java.util.List; import java.util.Random; - import org.onap.policy.apex.context.ContextException; import org.onap.policy.apex.core.engine.executor.context.TaskSelectionExecutionContext; import org.onap.policy.apex.examples.adaptive.concepts.AutoLearn; diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java index 623588267..f1c8d7dca 100644 --- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java +++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java @@ -20,18 +20,20 @@ package org.onap.policy.apex.examples.adaptive; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; import java.util.LinkedList; import java.util.List; - import org.junit.Test; import org.onap.policy.apex.examples.adaptive.concepts.AnomalyDetection; public class AnomalyDetectionConceptTest { @Test - public void testToString(){ + public void testToString() { AnomalyDetection anomalyDetection = new AnomalyDetection(); List newAnomalyScores = new LinkedList<>(); newAnomalyScores.add((double) 55); @@ -39,13 +41,14 @@ public class AnomalyDetectionConceptTest { anomalyDetection.setFrequency(55); assertEquals(newAnomalyScores, anomalyDetection.getAnomalyScores()); assertTrue(anomalyDetection.checkSetAnomalyScores()); - assertEquals(55,anomalyDetection.getFrequency()); - assertEquals(true,anomalyDetection.getFirstRound()); - assertEquals("AnomalyDetection [firstRound=true, frequency=55, anomalyScores=[55.0], frequencyForecasted=null]", anomalyDetection.toString()); + assertEquals(55, anomalyDetection.getFrequency()); + assertEquals(true, anomalyDetection.getFirstRound()); + assertEquals("AnomalyDetection [firstRound=true, frequency=55, anomalyScores=[55.0], frequencyForecasted=null]", + anomalyDetection.toString()); } @Test - public void testHashCode(){ + public void testHashCode() { AnomalyDetection detection = new AnomalyDetection(); AnomalyDetection compareDetection = new AnomalyDetection(); assertEquals(detection.hashCode(), compareDetection.hashCode()); @@ -99,13 +102,13 @@ public class AnomalyDetectionConceptTest { } @Test - public void testCheckSets(){ + public void testCheckSets() { AnomalyDetection anomalyDetection = new AnomalyDetection(); assertFalse(anomalyDetection.checkSetAnomalyScores()); List anomalyScores = new LinkedList<>(); anomalyDetection.setAnomalyScores(anomalyScores); assertFalse(anomalyDetection.checkSetAnomalyScores()); - anomalyScores.add((double)2); + anomalyScores.add((double) 2); anomalyDetection.setAnomalyScores(anomalyScores); assertTrue(anomalyDetection.checkSetAnomalyScores()); anomalyDetection.unsetAnomalyScores(); @@ -115,7 +118,7 @@ public class AnomalyDetectionConceptTest { List frequencyForecasted = new LinkedList<>(); anomalyDetection.setFrequencyForecasted(frequencyForecasted); assertFalse(anomalyDetection.checkSetFrequencyForecasted()); - frequencyForecasted.add((double)2); + frequencyForecasted.add((double) 2); anomalyDetection.setFrequencyForecasted(frequencyForecasted); assertTrue(anomalyDetection.checkSetFrequencyForecasted()); anomalyDetection.unsetFrequencyForecasted(); diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionTslUseCaseTest.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionTslUseCaseTest.java index d1b2aaae7..5beab7724 100644 --- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionTslUseCaseTest.java +++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionTslUseCaseTest.java @@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.Random; import java.util.concurrent.TimeUnit; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnTslUseCaseTest.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnTslUseCaseTest.java index ab0bf303f..52d1b7ff8 100644 --- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnTslUseCaseTest.java +++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnTslUseCaseTest.java @@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.Random; import java.util.concurrent.TimeUnit; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestApexActionListener.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestApexActionListener.java index b06908da2..702b050fd 100644 --- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestApexActionListener.java +++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestApexActionListener.java @@ -26,7 +26,6 @@ import static org.awaitility.Awaitility.await; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; - import org.onap.policy.apex.core.engine.engine.EnEventListener; import org.onap.policy.apex.core.engine.event.EnEvent; diff --git a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestDummyGrpcServer.java b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestDummyGrpcServer.java index c8e38bc54..da9b8e3d1 100644 --- a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestDummyGrpcServer.java +++ b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestDummyGrpcServer.java @@ -22,16 +22,13 @@ package org.onap.policy.apex.examples.grpc; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; - import io.grpc.Server; import io.grpc.netty.NettyServerBuilder; import io.grpc.stub.StreamObserver; - import java.io.IOException; import java.net.InetSocketAddress; import java.nio.file.Files; import java.nio.file.Paths; - import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc.BluePrintProcessingServiceImplBase; import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput; import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput; diff --git a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java index 05d6e4ce5..35c21d669 100644 --- a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java +++ b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java @@ -26,11 +26,9 @@ import static org.junit.Assert.assertEquals; import java.nio.file.Files; import java.nio.file.Paths; import java.util.concurrent.TimeUnit; - import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Response; - import org.junit.Test; import org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain; import org.onap.policy.apex.service.engine.main.ApexMain; diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpLogicTest.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpLogicTest.java index c470e9356..b3c35a310 100644 --- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpLogicTest.java +++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpLogicTest.java @@ -28,7 +28,6 @@ import static org.junit.Assert.assertTrue; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; - import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelCliTest.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelCliTest.java index 90859794e..45281524c 100644 --- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelCliTest.java +++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelCliTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertEquals; import java.io.File; import java.io.IOException; - import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain; diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java index fb4103c99..c495bd32b 100644 --- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java +++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java @@ -27,12 +27,10 @@ import static org.junit.Assert.assertTrue; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; - import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.Map; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestSaleAuthListener.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestSaleAuthListener.java index 44c4306b9..1281c515d 100644 --- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestSaleAuthListener.java +++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestSaleAuthListener.java @@ -26,7 +26,6 @@ import static org.awaitility.Awaitility.await; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; - import org.onap.policy.apex.core.engine.engine.EnEventListener; import org.onap.policy.apex.core.engine.event.EnEvent; diff --git a/examples/examples-onap-bbs/src/main/java/org/onap/policy/apex/examples/bbs/WebClient.java b/examples/examples-onap-bbs/src/main/java/org/onap/policy/apex/examples/bbs/WebClient.java index 884708d03..f3ea15935 100644 --- a/examples/examples-onap-bbs/src/main/java/org/onap/policy/apex/examples/bbs/WebClient.java +++ b/examples/examples-onap-bbs/src/main/java/org/onap/policy/apex/examples/bbs/WebClient.java @@ -43,7 +43,6 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; - import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException; import org.onap.policy.common.utils.network.NetworkUtil; import org.slf4j.ext.XLogger; diff --git a/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java b/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java index ba1481c0b..5fb74a307 100644 --- a/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java +++ b/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java @@ -28,9 +28,7 @@ import static org.mockito.Mockito.when; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; - import javax.net.ssl.HttpsURLConnection; - import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; diff --git a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java index 63ca3cd26..afbc3f280 100644 --- a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java +++ b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java @@ -23,12 +23,10 @@ package org.onap.policy.apex.domains.onap.vcpe; import com.google.gson.Gson; import com.google.gson.GsonBuilder; - import java.time.Instant; import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.BlockingQueue; - import org.onap.policy.appclcm.AppcLcmBody; import org.onap.policy.appclcm.AppcLcmDmaapWrapper; import org.onap.policy.appclcm.AppcLcmInput; diff --git a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java index f228ccd76..c275df18f 100644 --- a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java +++ b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java @@ -28,7 +28,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; import com.google.gson.JsonParser; - import java.io.IOException; import java.time.Instant; import java.util.Map; @@ -37,14 +36,12 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; - import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; - import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; import org.onap.policy.common.utils.resources.TextFileUtils; import org.onap.policy.controlloop.util.Serialization; @@ -243,8 +240,7 @@ public class OnapVCpeSimEndpoint { return Response.status(200).entity(appcResponse).build(); } timeLeft -= 100; - } - while (timeLeft > 0); + } while (timeLeft > 0); return Response.status(200).build(); } diff --git a/examples/examples-servlet/src/main/java/org/onap/policy/apex/examples/servlet/ApexServletListener.java b/examples/examples-servlet/src/main/java/org/onap/policy/apex/examples/servlet/ApexServletListener.java index 859d1b00f..80ef7354b 100644 --- a/examples/examples-servlet/src/main/java/org/onap/policy/apex/examples/servlet/ApexServletListener.java +++ b/examples/examples-servlet/src/main/java/org/onap/policy/apex/examples/servlet/ApexServletListener.java @@ -22,11 +22,9 @@ package org.onap.policy.apex.examples.servlet; import java.util.ArrayList; import java.util.List; - import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.annotation.WebListener; - import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException; import org.onap.policy.apex.service.engine.main.ApexMain; -- cgit 1.2.3-korg