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/client/deployment/rest/ApexDeploymentRestMain.java | 4 +--- .../client/deployment/rest/ApexDeploymentRestParameterParser.java | 1 - .../policy/apex/client/deployment/rest/DeploymentRestMainTest.java | 1 - .../java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java | 4 +--- .../policy/apex/client/editor/rest/ApexEditorParameterParser.java | 1 - .../org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java | 1 - .../apex/client/editor/rest/handling/ApexEditorRestResource.java | 2 -- .../onap/policy/apex/client/editor/rest/handling/KeyInfoHandler.java | 3 +-- .../onap/policy/apex/client/editor/rest/handling/PolicyHandler.java | 1 - .../org/onap/policy/apex/client/editor/rest/handling/RestSession.java | 3 +-- .../policy/apex/client/editor/rest/handling/RestSessionHandler.java | 1 - .../org/onap/policy/apex/client/editor/rest/handling/RestUtils.java | 3 --- .../org/onap/policy/apex/client/editor/rest/handling/TaskHandler.java | 1 - .../onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java | 1 - .../onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java | 1 - .../onap/policy/apex/client/editor/rest/handling/bean/BeanState.java | 1 - .../onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java | 1 - .../onap/policy/apex/client/editor/rest/ApexEditorStartupTest.java | 1 - .../java/org/onap/policy/apex/client/editor/rest/ExceptionsTest.java | 1 - .../org/onap/policy/apex/client/editor/rest/RestInterfaceTest.java | 2 -- .../apex/client/editor/rest/handling/ApexEditorRestResourceTest.java | 2 -- .../org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java | 4 +--- .../policy/apex/client/full/rest/ApexServicesRestParameterParser.java | 1 - .../org/onap/policy/apex/client/full/rest/ServicesRestMainTest.java | 1 - .../policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java | 4 +--- .../client/monitoring/rest/ApexMonitoringRestParameterParser.java | 1 - .../apex/client/monitoring/rest/ApexMonitoringRestResource.java | 3 --- .../org/onap/policy/apex/client/monitoring/rest/ParameterCheck.java | 4 +--- .../policy/apex/client/monitoring/rest/MonitoringRestMainTest.java | 1 - .../onap/policy/apex/client/monitoring/rest/ParameterCheckTest.java | 1 - .../org/onap/policy/apex/client/monitoring/rest/RestResourceTest.java | 1 - 31 files changed, 7 insertions(+), 50 deletions(-) (limited to 'client') diff --git a/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestMain.java b/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestMain.java index 6ba8d832c..093c35258 100644 --- a/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestMain.java +++ b/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestMain.java @@ -22,7 +22,6 @@ package org.onap.policy.apex.client.deployment.rest; import java.io.PrintStream; - import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; @@ -135,8 +134,7 @@ public class ApexDeploymentRestMain { String message = REST_ENDPOINT_PREFIX + this.toString() + ") failed at with error: " + e.getMessage(); outStream.println(message); LOGGER.warn(message, e); - } - finally { + } finally { if (apexDeploymentRest != null) { apexDeploymentRest.shutdown(); apexDeploymentRest = null; diff --git a/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestParameterParser.java b/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestParameterParser.java index d56e05d29..1249bddba 100644 --- a/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestParameterParser.java +++ b/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestParameterParser.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.client.deployment.rest; 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/client/client-deployment/src/test/java/org/onap/policy/apex/client/deployment/rest/DeploymentRestMainTest.java b/client/client-deployment/src/test/java/org/onap/policy/apex/client/deployment/rest/DeploymentRestMainTest.java index 91b5480b6..1ab6cc1d9 100644 --- a/client/client-deployment/src/test/java/org/onap/policy/apex/client/deployment/rest/DeploymentRestMainTest.java +++ b/client/client-deployment/src/test/java/org/onap/policy/apex/client/deployment/rest/DeploymentRestMainTest.java @@ -30,7 +30,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.PrintStream; import java.util.concurrent.TimeUnit; - import org.junit.After; import org.junit.Test; diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java index 558cbadc7..3f728827e 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java @@ -22,7 +22,6 @@ package org.onap.policy.apex.client.editor.rest; import java.io.PrintStream; - import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; @@ -140,8 +139,7 @@ public class ApexEditorMain { String message = REST_ENDPOINT_PREFIX + this.toString() + ") failed at with error: " + e.getMessage(); outStream.println(message); LOGGER.warn(message, e); - } - finally { + } finally { if (apexEditor != null) { apexEditor.shutdown(); apexEditor = null; diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameterParser.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameterParser.java index d67c6b1c6..ef89945aa 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameterParser.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameterParser.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.client.editor.rest; 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/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java index d220d85c4..1687c01e0 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java @@ -22,7 +22,6 @@ package org.onap.policy.apex.client.editor.rest; import java.net.URI; import java.net.URISyntaxException; - import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResource.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResource.java index 51dcf0987..9c3a3de26 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResource.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResource.java @@ -22,7 +22,6 @@ package org.onap.policy.apex.client.editor.rest.handling; import java.io.IOException; - import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -33,7 +32,6 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; - import org.onap.policy.apex.model.modelapi.ApexApiResult; import org.onap.policy.apex.model.modelapi.ApexApiResult.Result; import org.onap.policy.common.utils.resources.TextFileUtils; diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/KeyInfoHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/KeyInfoHandler.java index f4ff4cd93..ddf1db35d 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/KeyInfoHandler.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/KeyInfoHandler.java @@ -53,8 +53,7 @@ public class KeyInfoHandler implements RestCommandHandler { if (RestCommandType.KEY_INFO.equals(commandType) && RestCommand.LIST.equals(command)) { return listKeyInformation(session, name, version); - } - else { + } else { return getUnsupportedCommandResultMessage(session, commandType, command); } } diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/PolicyHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/PolicyHandler.java index ee6164468..7de16b044 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/PolicyHandler.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/PolicyHandler.java @@ -21,7 +21,6 @@ package org.onap.policy.apex.client.editor.rest.handling; import java.util.Map; - import org.onap.policy.apex.client.editor.rest.handling.bean.BeanKeyRef; import org.onap.policy.apex.client.editor.rest.handling.bean.BeanLogic; import org.onap.policy.apex.client.editor.rest.handling.bean.BeanPolicy; diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSession.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSession.java index 3e616ef3a..46d57fd01 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSession.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSession.java @@ -93,8 +93,7 @@ public class RestSession { public void finishSession(boolean commitFlag) { if (commitFlag) { commitChanges(); - } - else { + } else { discardChanges(); } } diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSessionHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSessionHandler.java index b717944ed..c6cfca845 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSessionHandler.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSessionHandler.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.client.editor.rest.handling; import java.util.Map; import java.util.TreeMap; import java.util.concurrent.atomic.AtomicInteger; - import org.onap.policy.apex.model.modelapi.ApexApiResult; import org.onap.policy.apex.model.modelapi.ApexApiResult.Result; import org.slf4j.ext.XLogger; diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestUtils.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestUtils.java index 738f33cb1..55a07a30f 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestUtils.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestUtils.java @@ -26,19 +26,16 @@ import com.google.gson.JsonElement; import com.google.gson.JsonNull; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; - import java.io.StringReader; import java.util.Map; import java.util.Map.Entry; import java.util.TreeMap; - import javax.ws.rs.core.MediaType; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; - import org.eclipse.persistence.jaxb.MarshallerProperties; import org.onap.policy.apex.client.editor.rest.handling.bean.BeanBase; import org.onap.policy.apex.model.basicmodel.concepts.AxConcept; diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/TaskHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/TaskHandler.java index 2b90282d3..87f5fca26 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/TaskHandler.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/TaskHandler.java @@ -21,7 +21,6 @@ package org.onap.policy.apex.client.editor.rest.handling; import java.util.Map.Entry; - import org.onap.policy.apex.client.editor.rest.handling.bean.BeanField; import org.onap.policy.apex.client.editor.rest.handling.bean.BeanKeyRef; import org.onap.policy.apex.client.editor.rest.handling.bean.BeanLogic; diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java index c96e43c29..0d2ad737b 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java @@ -21,7 +21,6 @@ package org.onap.policy.apex.client.editor.rest.handling.bean; import java.util.Map; - import javax.xml.bind.annotation.XmlType; /** diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java index da2f721e7..a3a4194f9 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java @@ -21,7 +21,6 @@ package org.onap.policy.apex.client.editor.rest.handling.bean; import java.util.Map; - import javax.xml.bind.annotation.XmlType; /** diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanState.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanState.java index 8ca5912fa..575511be6 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanState.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanState.java @@ -22,7 +22,6 @@ package org.onap.policy.apex.client.editor.rest.handling.bean; import java.util.Arrays; import java.util.Map; - import javax.xml.bind.annotation.XmlType; /** diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java index b5a231bcd..6c023e89f 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java @@ -22,7 +22,6 @@ package org.onap.policy.apex.client.editor.rest.handling.bean; import java.util.Arrays; import java.util.Map; - import javax.xml.bind.annotation.XmlType; /** diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ApexEditorStartupTest.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ApexEditorStartupTest.java index ac1c60553..fdf1e804a 100644 --- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ApexEditorStartupTest.java +++ b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ApexEditorStartupTest.java @@ -29,7 +29,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; import java.util.concurrent.TimeUnit; - import org.junit.Test; import org.onap.policy.apex.client.editor.rest.ApexEditorMain.EditorState; diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ExceptionsTest.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ExceptionsTest.java index 987076fd1..cbe0e4b58 100644 --- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ExceptionsTest.java +++ b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ExceptionsTest.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.client.editor.rest; import static org.junit.Assert.assertNotNull; import java.io.IOException; - import org.junit.Test; /** diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/RestInterfaceTest.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/RestInterfaceTest.java index c95a04a76..a1d0a7b3f 100644 --- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/RestInterfaceTest.java +++ b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/RestInterfaceTest.java @@ -30,14 +30,12 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.util.concurrent.TimeUnit; - import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.Entity; import javax.ws.rs.client.Invocation.Builder; import javax.ws.rs.client.WebTarget; import javax.xml.bind.JAXBException; - import org.eclipse.persistence.jpa.jpql.Assert; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResourceTest.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResourceTest.java index 346376d22..642628f97 100644 --- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResourceTest.java +++ b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResourceTest.java @@ -25,11 +25,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.io.IOException; - import javax.ws.rs.client.Entity; import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; - import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.JerseyTest; import org.junit.Test; diff --git a/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java b/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java index 856aa6b0c..8343189a0 100644 --- a/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java +++ b/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java @@ -22,7 +22,6 @@ package org.onap.policy.apex.client.full.rest; import java.io.PrintStream; - import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; @@ -141,8 +140,7 @@ public class ApexServicesRestMain { String message = REST_ENDPOINT_PREFIX + this.toString() + ") failed at with error: " + e.getMessage(); outStream.println(message); LOGGER.warn(message, e); - } - finally { + } finally { if (apexServices != null) { apexServices.shutdown(); apexServices = null; diff --git a/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestParameterParser.java b/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestParameterParser.java index 5812ebdb3..6535379f8 100644 --- a/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestParameterParser.java +++ b/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestParameterParser.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.client.full.rest; 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/client/client-full/src/test/java/org/onap/policy/apex/client/full/rest/ServicesRestMainTest.java b/client/client-full/src/test/java/org/onap/policy/apex/client/full/rest/ServicesRestMainTest.java index 5b01e04fa..55c0c8fa9 100644 --- a/client/client-full/src/test/java/org/onap/policy/apex/client/full/rest/ServicesRestMainTest.java +++ b/client/client-full/src/test/java/org/onap/policy/apex/client/full/rest/ServicesRestMainTest.java @@ -30,7 +30,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.PrintStream; import java.util.concurrent.TimeUnit; - import org.junit.After; import org.junit.Test; diff --git a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java index abc30ce8f..6b9531462 100644 --- a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java +++ b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java @@ -22,7 +22,6 @@ package org.onap.policy.apex.client.monitoring.rest; import java.io.PrintStream; - import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; @@ -135,8 +134,7 @@ public class ApexMonitoringRestMain { String message = REST_ENDPOINT_PREFIX + this.toString() + ") failed at with error: " + e.getMessage(); outStream.println(message); LOGGER.warn(message, e); - } - finally { + } finally { if (apexMonitoringRest != null) { apexMonitoringRest.shutdown(); apexMonitoringRest = null; diff --git a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestParameterParser.java b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestParameterParser.java index a72fbe0a7..5902ef0ce 100644 --- a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestParameterParser.java +++ b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestParameterParser.java @@ -23,7 +23,6 @@ package org.onap.policy.apex.client.monitoring.rest; 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/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestResource.java b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestResource.java index c5c4b1291..dd9d8b2c6 100644 --- a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestResource.java +++ b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestResource.java @@ -23,14 +23,12 @@ package org.onap.policy.apex.client.monitoring.rest; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; - import java.io.PrintWriter; import java.io.StringWriter; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; - import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -38,7 +36,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; - import org.onap.policy.apex.core.deployment.ApexDeploymentException; import org.onap.policy.apex.core.deployment.EngineServiceFacade; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; diff --git a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ParameterCheck.java b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ParameterCheck.java index 34bacb974..703731333 100644 --- a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ParameterCheck.java +++ b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ParameterCheck.java @@ -21,7 +21,6 @@ package org.onap.policy.apex.client.monitoring.rest; import java.util.Map; - import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; @@ -169,8 +168,7 @@ public final class ParameterCheck { try { return new AxArtifactKey(axArtifactKeyArray[1]); - } - catch (Exception apEx) { + } catch (Exception apEx) { LOGGER.trace("invalid artifact key ID {}", axArtifactKeyArray[1], apEx); return null; } diff --git a/client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/MonitoringRestMainTest.java b/client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/MonitoringRestMainTest.java index f27a53adc..688d29b37 100644 --- a/client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/MonitoringRestMainTest.java +++ b/client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/MonitoringRestMainTest.java @@ -30,7 +30,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.PrintStream; import java.util.concurrent.TimeUnit; - import org.junit.Test; /** diff --git a/client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/ParameterCheckTest.java b/client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/ParameterCheckTest.java index 026f4d3dd..bea15eb87 100644 --- a/client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/ParameterCheckTest.java +++ b/client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/ParameterCheckTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertNull; import java.util.LinkedHashMap; import java.util.Map; - import org.junit.Test; import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; diff --git a/client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/RestResourceTest.java b/client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/RestResourceTest.java index 7345dece0..a63224590 100644 --- a/client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/RestResourceTest.java +++ b/client/client-monitoring/src/test/java/org/onap/policy/apex/client/monitoring/rest/RestResourceTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import javax.ws.rs.core.Response; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -- cgit