From 68cdd3fe41fe7fa101d0d2331bd493a67e16203f Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 19 Jun 2020 16:44:04 -0400 Subject: Changes for checkstyle 8.32 Issue-ID: POLICY-2188 Change-Id: Ib90222c537c5440e0de52fa0acbaa99bbcc4772a Signed-off-by: Jim Hahn --- .../src/main/java/org/onap/policy/coordination/Util.java | 1 - .../policy/controlloop/eventmanager/ControlLoopOperationManager.java | 3 +-- .../main/java/org/onap/policy/drools/impl/PolicyEngineJUnitImpl.java | 1 - .../java/org/onap/policy/controlloop/ControlLoopExceptionTest.java | 5 ++--- .../onap/policy/drools/server/restful/RestControlLoopManager.java | 2 +- .../src/test/java/org/onap/policy/guard/PolicyGuardRequestTest.java | 1 - .../src/test/java/org/onap/policy/guard/PolicyGuardResponseTest.java | 1 - .../test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java | 2 +- .../org/onap/policy/guard/PolicyGuardXacmlRequestAttributesTest.java | 1 - .../test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java | 1 - .../org/onap/policy/controlloop/common/rules/test/RulesTest.java | 2 +- 11 files changed, 6 insertions(+), 14 deletions(-) (limited to 'controlloop') diff --git a/controlloop/common/coordination/src/main/java/org/onap/policy/coordination/Util.java b/controlloop/common/coordination/src/main/java/org/onap/policy/coordination/Util.java index a47854736..03b041a59 100644 --- a/controlloop/common/coordination/src/main/java/org/onap/policy/coordination/Util.java +++ b/controlloop/common/coordination/src/main/java/org/onap/policy/coordination/Util.java @@ -30,7 +30,6 @@ import java.nio.file.Paths; import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java index d0c19ba67..d3937c9c5 100644 --- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java +++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java @@ -36,7 +36,6 @@ import java.util.Optional; import java.util.Properties; import javax.persistence.EntityManager; import javax.persistence.Persistence; - import org.apache.commons.lang3.tuple.Pair; import org.eclipse.persistence.config.PersistenceUnitProperties; import org.onap.aai.domain.yang.GenericVnf; @@ -103,7 +102,7 @@ public class ControlLoopOperationManager implements Serializable { private PolicyResult policyResult = null; private ControlLoopEventManager eventManager = null; private String targetEntity; - private String guardApprovalStatus = "NONE";// "NONE", "PERMIT", "DENY" + private String guardApprovalStatus = "NONE"; // "NONE", "PERMIT", "DENY" private AaiCqResponse aaiCqResponse; private transient Object operationRequest; diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/drools/impl/PolicyEngineJUnitImpl.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/drools/impl/PolicyEngineJUnitImpl.java index 6a3be2d6a..85fc13c9e 100644 --- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/drools/impl/PolicyEngineJUnitImpl.java +++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/drools/impl/PolicyEngineJUnitImpl.java @@ -26,7 +26,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Queue; - import org.onap.policy.appc.Request; import org.onap.policy.appclcm.AppcLcmDmaapWrapper; import org.onap.policy.controlloop.ControlLoopNotification; diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopExceptionTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopExceptionTest.java index e33b260f9..ab86a5341 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopExceptionTest.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopExceptionTest.java @@ -8,9 +8,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,7 +24,6 @@ package org.onap.policy.controlloop; import static org.junit.Assert.assertNotNull; import java.io.IOException; - import org.junit.Test; public class ControlLoopExceptionTest { diff --git a/controlloop/common/feature-controlloop-management/src/main/java/org/onap/policy/drools/server/restful/RestControlLoopManager.java b/controlloop/common/feature-controlloop-management/src/main/java/org/onap/policy/drools/server/restful/RestControlLoopManager.java index 0f35b733b..b733b01ba 100644 --- a/controlloop/common/feature-controlloop-management/src/main/java/org/onap/policy/drools/server/restful/RestControlLoopManager.java +++ b/controlloop/common/feature-controlloop-management/src/main/java/org/onap/policy/drools/server/restful/RestControlLoopManager.java @@ -94,7 +94,7 @@ public class RestControlLoopManager { */ @GET @Path("engine/controllers/{controller}/drools/facts/{session}/controlloops/{controlLoopName}") - @ApiOperation( value = "Control Loop", notes = "Control Loop Parameters", responseContainer = "List") + @ApiOperation(value = "Control Loop", notes = "Control Loop Parameters", responseContainer = "List") @ApiResponses(value = {@ApiResponse(code = 404, message = "The Control Loop cannot be found")}) public Response controlLoop( @ApiParam(value = "Policy Controller Name", required = true) @PathParam("controller") String controllerName, diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardRequestTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardRequestTest.java index 3d64e90d0..cdc862acb 100644 --- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardRequestTest.java +++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardRequestTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.util.UUID; - import org.junit.Test; public class PolicyGuardRequestTest { diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardResponseTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardResponseTest.java index 32ca7a240..629555297 100644 --- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardResponseTest.java +++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardResponseTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.util.UUID; - import org.junit.Test; public class PolicyGuardResponseTest { diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java index d0194da38..47af1fbc6 100644 --- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java +++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java @@ -82,7 +82,7 @@ public class PolicyGuardXacmlHelperTest { } @Test - /** + /* * Tests PolicyGuardXacmlHelper.callPdp method to determine if it returns DENY, PERMIT, or * INDETERMINATE as expected. */ diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlRequestAttributesTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlRequestAttributesTest.java index 79e52e761..3d49d99c1 100644 --- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlRequestAttributesTest.java +++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlRequestAttributesTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.util.UUID; - import org.junit.Test; public class PolicyGuardXacmlRequestAttributesTest { diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java index e15ae920d..a8110ed04 100644 --- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java +++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; - import org.junit.Before; import org.junit.Test; import org.onap.policy.controlloop.policy.guard.Constraint; diff --git a/controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/RulesTest.java b/controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/RulesTest.java index 89b1a1b69..3f1cc2550 100644 --- a/controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/RulesTest.java +++ b/controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/RulesTest.java @@ -113,7 +113,7 @@ public class RulesTest { */ @BeforeClass public static void setUpBeforeClass() throws Exception { - /** + /* * Attach appender to the logger. */ appender.setContext(logger.getLoggerContext()); -- cgit 1.2.3-korg