Merge "Clean up CLAMP Sonar and checkstyle issues"

3 files changed, 16 insertions, 11 deletions

diff --git a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/PolicyParticipantApplication.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/PolicyParticipantApplication.java
index bdc09c8b9..4869b7c2f 100644
--- a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/PolicyParticipantApplication.java
+++ b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/PolicyParticipantApplication.java
@@ -30,8 +30,9 @@ import org.springframework.context.annotation.ComponentScan;
  *
  */
 @SpringBootApplication
-@ComponentScan({"org.onap.policy.clamp.controlloop.participant.policy",
-        "org.onap.policy.clamp.controlloop.participant.intermediary"})
+@ComponentScan({
+    "org.onap.policy.clamp.controlloop.participant.policy",
+    "org.onap.policy.clamp.controlloop.participant.intermediary"})
 @ConfigurationPropertiesScan("org.onap.policy.clamp.controlloop.participant.policy.main.parameters")
 public class PolicyParticipantApplication {
 
diff --git a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/client/AbstractHttpClient.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/client/AbstractHttpClient.java
index 4b6686156..2579585e5 100644
--- a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/client/AbstractHttpClient.java
+++ b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/client/AbstractHttpClient.java
@@ -41,25 +41,26 @@ public abstract class AbstractHttpClient implements Closeable {
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractHttpClient.class);
     private final HttpClient httpclient;
 
-
     /**
      * Constructor.
+     *
+     * @param policyParticipantParameters the parameters for the policy participant
+     * @throws ControlLoopRuntimeException on client start errors
      */
-    protected AbstractHttpClient(BusTopicParams policyApiParameters) {
+    protected AbstractHttpClient(BusTopicParams policyParticipantParameters) {
         try {
-            httpclient = HttpClientFactoryInstance.getClientFactory().build(policyApiParameters);
+            httpclient = HttpClientFactoryInstance.getClientFactory().build(policyParticipantParameters);
         } catch (final Exception e) {
             throw new ControlLoopRuntimeException(Status.INTERNAL_SERVER_ERROR, " Client failed to start", e);
         }
     }
 
     protected Response executePost(String path, final Entity<?> entity) {
-        Response response = httpclient.post(path, entity, Map.of(HttpHeaders.ACCEPT,
-                MediaType.APPLICATION_JSON, HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON));
+        var response = httpclient.post(path, entity, Map.of(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON,
+            HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON));
         if (response.getStatus() / 100 != 2) {
-            LOGGER.error(
-                    "Invocation of path {} failed for entity {}. Response status: {}, Response status info: {}",
-                    path, entity, response.getStatus(), response.getStatusInfo());
+            LOGGER.error("Invocation of path {} failed for entity {}. Response status: {}, Response status info: {}",
+                path, entity, response.getStatus(), response.getStatusInfo());
         }
         return response;
     }
@@ -72,4 +73,4 @@ public abstract class AbstractHttpClient implements Closeable {
     public void close() throws IOException {
         httpclient.shutdown();
     }
-}
\ No newline at end of file
+}
diff --git a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/client/PolicyApiHttpClient.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/client/PolicyApiHttpClient.java
index 3d1047ce4..38a79f7f6 100644
--- a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/client/PolicyApiHttpClient.java
+++ b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/client/PolicyApiHttpClient.java
@@ -35,6 +35,8 @@ public class PolicyApiHttpClient extends AbstractHttpClient {
 
     /**
      * Constructor.
+     *
+     * @param parameters the policy participant parameters
      */
     public PolicyApiHttpClient(ParticipantPolicyParameters parameters) {
         super(parameters.getPolicyApiParameters());
@@ -45,6 +47,7 @@ public class PolicyApiHttpClient extends AbstractHttpClient {
      *
      * @param toscaServiceTemplate the whole ToscaServiceTemplate
      * @return Response
+     * @throws PfModelException on errors creating the policy type
      */
     public Response createPolicyType(ToscaServiceTemplate toscaServiceTemplate) throws PfModelException {
         return executePost(POLICY_URI + "policytypes", Entity.entity(toscaServiceTemplate, MediaType.APPLICATION_JSON));