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 --- .../apex/tools/model/generator/SchemaUtils.java | 1 - .../tools/model/generator/model2cli/Model2Cli.java | 1 - .../model/generator/model2cli/Model2CliMain.java | 1 - .../model/generator/model2event/Model2EventMain.java | 1 - .../generator/model2event/Model2JsonEventSchema.java | 1 - .../apex/tools/model/generator/SchemaUtilsTest.java | 1 - .../model/generator/model2cli/Model2CliTest.java | 1 - .../model/generator/model2event/Model2EventTest.java | 1 - .../apex/tools/simple/wsclient/SimpleConsole.java | 1 - .../apex/tools/simple/wsclient/SimpleEcho.java | 1 - .../apex/tools/simple/wsclient/WsClientMain.java | 1 - .../apex/tools/simple/wsclient/WsClientTest.java | 1 - .../org/onap/policy/apex/tools/common/CliParser.java | 1 - .../org/onap/policy/apex/tools/common/Console.java | 1 - .../onap/policy/apex/tools/common/OutputFile.java | 2 -- .../policy/apex/tools/common/OutputFileTest.java | 20 +++++++++++--------- .../apex/tools/common/docs/ExampleCliParserTest.java | 2 -- 17 files changed, 11 insertions(+), 27 deletions(-) (limited to 'tools') diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java index 0a119cdc7..9d0e83c3e 100644 --- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java +++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/SchemaUtils.java @@ -25,7 +25,6 @@ import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; - import org.apache.avro.AvroRuntimeException; import org.apache.avro.Schema; import org.apache.avro.Schema.Field; diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java index d9616fda0..321f64993 100644 --- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java +++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2Cli.java @@ -30,7 +30,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; - import org.apache.commons.lang3.Validate; import org.onap.policy.apex.auth.clicodegen.CodeGenCliEditorBuilder; import org.onap.policy.apex.auth.clicodegen.CodeGeneratorCliEditor; diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliMain.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliMain.java index 1fd96b9ea..f9ae2b3d1 100644 --- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliMain.java +++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliMain.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.tools.model.generator.model2cli; import java.io.PrintStream; import java.io.PrintWriter; import java.io.StringWriter; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; import org.onap.policy.apex.tools.common.CliOptions; diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2EventMain.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2EventMain.java index ca49b5394..3ccf3b156 100644 --- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2EventMain.java +++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2EventMain.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.tools.model.generator.model2event; import java.io.PrintStream; import java.io.PrintWriter; import java.io.StringWriter; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; import org.onap.policy.apex.context.parameters.SchemaParameters; diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java index 9041a8067..46fba872b 100644 --- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java +++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.tools.model.generator.model2event; import java.util.HashSet; import java.util.Properties; import java.util.Set; - import org.apache.avro.Schema; import org.apache.avro.Schema.Field; import org.apache.avro.Schema.Type; diff --git a/tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/SchemaUtilsTest.java b/tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/SchemaUtilsTest.java index c3214d304..3d6519a65 100644 --- a/tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/SchemaUtilsTest.java +++ b/tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/SchemaUtilsTest.java @@ -29,7 +29,6 @@ import java.io.IOException; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; - import org.apache.avro.Schema; import org.apache.avro.Schema.Field; import org.junit.BeforeClass; diff --git a/tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliTest.java b/tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliTest.java index 606cb6874..a109e47da 100644 --- a/tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliTest.java +++ b/tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/model2cli/Model2CliTest.java @@ -28,7 +28,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.PrintStream; - import org.junit.Test; /** diff --git a/tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/model2event/Model2EventTest.java b/tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/model2event/Model2EventTest.java index 1804aca30..f7c913054 100644 --- a/tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/model2event/Model2EventTest.java +++ b/tools/model-generator/src/test/java/org/onap/policy/apex/tools/model/generator/model2event/Model2EventTest.java @@ -27,7 +27,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.PrintStream; - import org.junit.Test; import org.onap.policy.apex.model.basicmodel.concepts.ApexRuntimeException; diff --git a/tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/SimpleConsole.java b/tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/SimpleConsole.java index edad2ebb6..9931c1292 100644 --- a/tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/SimpleConsole.java +++ b/tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/SimpleConsole.java @@ -27,7 +27,6 @@ import java.io.PrintStream; import java.net.URI; import java.net.URISyntaxException; import java.nio.channels.NotYetConnectedException; - import org.apache.commons.lang3.Validate; import org.java_websocket.client.WebSocketClient; import org.java_websocket.framing.CloseFrame; diff --git a/tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/SimpleEcho.java b/tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/SimpleEcho.java index 659dd77eb..672594c52 100644 --- a/tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/SimpleEcho.java +++ b/tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/SimpleEcho.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.tools.simple.wsclient; import java.io.PrintStream; import java.net.URI; import java.net.URISyntaxException; - import org.apache.commons.lang3.Validate; import org.java_websocket.client.WebSocketClient; import org.java_websocket.framing.CloseFrame; diff --git a/tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/WsClientMain.java b/tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/WsClientMain.java index 29a5de08f..9b0674df9 100644 --- a/tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/WsClientMain.java +++ b/tools/simple-wsclient/src/main/java/org/onap/policy/apex/tools/simple/wsclient/WsClientMain.java @@ -26,7 +26,6 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.net.URISyntaxException; import java.nio.channels.NotYetConnectedException; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.lang3.Validate; diff --git a/tools/simple-wsclient/src/test/java/org/onap/policy/apex/tools/simple/wsclient/WsClientTest.java b/tools/simple-wsclient/src/test/java/org/onap/policy/apex/tools/simple/wsclient/WsClientTest.java index 0b097a0d0..9ca7e9296 100644 --- a/tools/simple-wsclient/src/test/java/org/onap/policy/apex/tools/simple/wsclient/WsClientTest.java +++ b/tools/simple-wsclient/src/test/java/org/onap/policy/apex/tools/simple/wsclient/WsClientTest.java @@ -27,7 +27,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.PrintStream; - import org.junit.Test; /** diff --git a/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/CliParser.java b/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/CliParser.java index dfaafbd25..67ef7d7dd 100644 --- a/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/CliParser.java +++ b/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/CliParser.java @@ -28,7 +28,6 @@ package org.onap.policy.apex.tools.common; //// import java.util.Scanner; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.DefaultParser; diff --git a/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/Console.java b/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/Console.java index 1b4ef06c4..5c79fa4bc 100644 --- a/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/Console.java +++ b/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/Console.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.tools.common; import java.io.PrintStream; import java.util.ArrayList; import java.util.List; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StrBuilder; import org.slf4j.ext.XLoggerFactory; diff --git a/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/OutputFile.java b/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/OutputFile.java index 5b386861a..0aa85df5d 100644 --- a/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/OutputFile.java +++ b/tools/tools-common/src/main/java/org/onap/policy/apex/tools/common/OutputFile.java @@ -30,8 +30,6 @@ import java.io.OutputStream; import java.io.Writer; import java.nio.file.FileSystems; import java.nio.file.Path; - -import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/OutputFileTest.java b/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/OutputFileTest.java index 36c64e517..abc01b5e3 100644 --- a/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/OutputFileTest.java +++ b/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/OutputFileTest.java @@ -17,14 +17,16 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ + package org.onap.policy.apex.tools.common; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import java.io.File; import java.nio.file.FileSystems; import java.nio.file.Path; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -36,15 +38,15 @@ public class OutputFileTest { File file = fp.toFile(); @Before - public void setUp() { - if (file.exists()){ + public void beforeSetUp() { + if (file.exists()) { file.delete(); } } @Test public void testToWriter() { - OutputFile testFile = new OutputFile(testFileName,false); + OutputFile testFile = new OutputFile(testFileName, false); testFile.validate(); file.setReadable(false); file.setWritable(false); @@ -55,19 +57,19 @@ public class OutputFileTest { @Test public void testValidate() { - OutputFile testFile = new OutputFile(testFileName,true); + OutputFile testFile = new OutputFile(testFileName, true); assertNull(testFile.validate()); file.setReadable(false); file.setWritable(false); assertNotNull(testFile.validate()); OutputFile testFile2 = new OutputFile(testFileName); assertNotNull(testFile2.validate()); - assertEquals("file already exists",testFile2.validate()); + assertEquals("file already exists", testFile2.validate()); } @Test public void testToOutputStream() { - OutputFile testFile = new OutputFile(testFileName,true); + OutputFile testFile = new OutputFile(testFileName, true); assertNotNull(testFile.toOutputStream()); file.setReadable(false); file.setWritable(false); @@ -76,7 +78,7 @@ public class OutputFileTest { @After public void testDown() { - if (file.exists()){ + if (file.exists()) { file.delete(); } } diff --git a/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleCliParserTest.java b/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleCliParserTest.java index 723ad8739..797c7c1e8 100644 --- a/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleCliParserTest.java +++ b/tools/tools-common/src/test/java/org/onap/policy/apex/tools/common/docs/ExampleCliParserTest.java @@ -32,12 +32,10 @@ package org.onap.policy.apex.tools.common.docs; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; import org.junit.Test; - //tag::import[] import org.onap.policy.apex.tools.common.CliOptions; import org.onap.policy.apex.tools.common.CliParser; //end::import[] - import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; -- cgit 1.2.3-korg