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 --- .../testsuites/performance/benchmark/eventgenerator/EventBatch.java | 4 +--- .../performance/benchmark/eventgenerator/EventBatchStats.java | 5 ++--- .../performance/benchmark/eventgenerator/EventGenerator.java | 1 - .../performance/benchmark/eventgenerator/EventGeneratorEndpoint.java | 3 --- .../benchmark/eventgenerator/EventGeneratorParameterHandler.java | 2 -- .../performance/benchmark/eventgenerator/EventGeneratorStats.java | 1 - .../performance/benchmark/eventgenerator/events/InputEvent.java | 1 - .../performance/benchmark/eventgenerator/EventBatchStatsTest.java | 1 - .../benchmark/eventgenerator/EventGeneratorEndpointTest.java | 1 - .../eventgenerator/EventGeneratorParametersHandlerTest.java | 3 --- .../benchmark/eventgenerator/EventGeneratorParametersTest.java | 1 - .../benchmark/eventgenerator/EventGeneratorStatsTest.java | 3 +-- .../performance/benchmark/eventgenerator/EventGeneratorTest.java | 4 +--- .../performance/benchmark/eventgenerator/events/InputEventTest.java | 2 +- 14 files changed, 6 insertions(+), 26 deletions(-) (limited to 'testsuites/performance/performance-benchmark-test/src') diff --git a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatch.java b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatch.java index abf0c993f..95d3ad8d5 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatch.java +++ b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatch.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; - import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.events.InputEvent; import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.events.OutputEvent; @@ -74,8 +73,7 @@ public class EventBatch { for (InputEvent inputEvent : inputEventMap.values()) { if (first) { first = false; - } - else { + } else { jsonBuilder.append(",\n"); } jsonBuilder.append(inputEvent.asJson()); diff --git a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatchStats.java b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatchStats.java index 60732972a..930e2af95 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatchStats.java +++ b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatchStats.java @@ -71,7 +71,7 @@ public class EventBatchStats { calcutateStats(eventBatchStatsList); - this.batchSize = (int)(eventsNotSent + eventsSent); + this.batchSize = (int) (eventsNotSent + eventsSent); } /** @@ -157,8 +157,7 @@ public class EventBatchStats { eventsNotReceived++; return null; - } - else { + } else { eventsReceived++; } diff --git a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGenerator.java b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGenerator.java index 3f6cad8e7..5bdcb7a64 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGenerator.java +++ b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGenerator.java @@ -25,7 +25,6 @@ import java.io.IOException; import java.net.URI; import java.nio.file.InvalidPathException; import java.util.Arrays; - import org.apache.commons.cli.ParseException; import org.glassfish.grizzly.http.server.HttpServer; import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; diff --git a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorEndpoint.java b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorEndpoint.java index 3d5adfc09..1b3558730 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorEndpoint.java +++ b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorEndpoint.java @@ -22,9 +22,7 @@ package org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator; import com.google.gson.Gson; - import java.util.concurrent.ConcurrentHashMap; - import java.util.concurrent.atomic.AtomicReference; import javax.inject.Inject; import javax.inject.Provider; @@ -32,7 +30,6 @@ import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.core.Response; - import org.glassfish.grizzly.http.server.Request; import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.events.OutputEvent; diff --git a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParameterHandler.java b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParameterHandler.java index 5a2f2384f..912290097 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParameterHandler.java +++ b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParameterHandler.java @@ -22,12 +22,10 @@ package org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator; import com.google.gson.Gson; - import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Arrays; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; diff --git a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorStats.java b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorStats.java index f3a5372bf..9d926e2ad 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorStats.java +++ b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorStats.java @@ -21,7 +21,6 @@ package org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator; import com.google.gson.GsonBuilder; - import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/events/InputEvent.java b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/events/InputEvent.java index cf70ea2f1..71c3d797a 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/events/InputEvent.java +++ b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/events/InputEvent.java @@ -22,7 +22,6 @@ package org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.eve import com.google.gson.GsonBuilder; import com.google.gson.annotations.SerializedName; - import java.util.Random; /** diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatchStatsTest.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatchStatsTest.java index b53eb7ace..747e9d6fa 100644 --- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatchStatsTest.java +++ b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventBatchStatsTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; - import org.junit.Test; /** diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorEndpointTest.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorEndpointTest.java index 2add69857..44a06ee54 100644 --- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorEndpointTest.java +++ b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorEndpointTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertNotNull; import javax.inject.Provider; import javax.ws.rs.core.Response; - import org.glassfish.grizzly.http.server.Request; import org.junit.Before; import org.junit.Test; diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersHandlerTest.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersHandlerTest.java index 2e70b7b3f..9a099b54e 100644 --- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersHandlerTest.java +++ b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersHandlerTest.java @@ -28,9 +28,6 @@ import static org.junit.Assert.fail; import org.apache.commons.cli.ParseException; import org.junit.Test; -import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGenerator; -import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGeneratorParameterHandler; -import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGeneratorParameters; /** * Test event generator parameters. diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersTest.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersTest.java index 1071c2f8e..8d97bb7c5 100644 --- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersTest.java +++ b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGeneratorParameters; /** * Test event generator parameters. diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorStatsTest.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorStatsTest.java index a40bcb5f1..f8854b8c7 100644 --- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorStatsTest.java +++ b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorStatsTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertNotNull; import java.util.LinkedHashMap; import java.util.Map; - import org.junit.Test; /** @@ -36,7 +35,7 @@ public class EventGeneratorStatsTest { @Test public void testEventGeneratorStats() { Map batchMap = new LinkedHashMap<>(); - EventGeneratorStats egs = new EventGeneratorStats(batchMap ); + EventGeneratorStats egs = new EventGeneratorStats(batchMap); assertNotNull(egs); assertEquals(-1, egs.getTotalStats().getBatchNumber()); diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorTest.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorTest.java index dcbafba07..97b950869 100644 --- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorTest.java +++ b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorTest.java @@ -26,13 +26,11 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.PrintStream; - import org.junit.Test; import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.service.engine.main.ApexMain; -import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGenerator; -import org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGeneratorParameters; + /** * This class tests the event generator. diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/events/InputEventTest.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/events/InputEventTest.java index 82b4cca88..6a3a8cc85 100644 --- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/events/InputEventTest.java +++ b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/events/InputEventTest.java @@ -55,7 +55,7 @@ public class InputEventTest { assertEquals("A Slogan", ie.getTestSlogan()); ie.setTestTemperature(123.45); - assertEquals((Double)123.45, (Double)ie.getTestTemperature()); + assertEquals((Double) 123.45, (Double) ie.getTestTemperature()); ie.setTestTimestamp(1234567879); assertEquals(1234567879, ie.getTestTimestamp()); -- cgit 1.2.3-korg