diff options
17 files changed, 32 insertions, 50 deletions
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtils.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtils.java index c8457091..1babe30c 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtils.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtils.java @@ -25,7 +25,6 @@ package org.onap.policy.pdp.xacml.application.common; import com.att.research.xacml.api.Identifier; import com.att.research.xacml.util.XACMLPolicyWriter; import com.att.research.xacml.util.XACMLProperties; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -40,13 +39,11 @@ import java.util.Properties; import java.util.Set; import java.util.StringJoiner; import java.util.stream.Collectors; - import oasis.names.tc.xacml._3_0.core.schema.wd_17.IdReferenceType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObjectFactory; import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicySetType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyRequest.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyRequest.java index d7cf3f2d..4b50e724 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyRequest.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyRequest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,11 +30,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; - import lombok.Getter; import lombok.Setter; import lombok.ToString; - import org.onap.policy.models.decisions.concepts.DecisionRequest; @Getter diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java index 11a45e0d..1a5e9dd8 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java @@ -446,7 +446,7 @@ public class StdMatchableTranslator extends StdBaseTranslator implements Matcha // contain potential matchables // if (propertyValue instanceof List) { - for (Object listValue : ((List<?>)propertyValue)) { + for (Object listValue : ((List<?>) propertyValue)) { if (listValue instanceof Map) { fillTargetTypeWithMatchables(target, matchablePolicyType, (Map<String, Object>) listValue); } diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdOnapPip.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdOnapPip.java index 5c99932e..244c4bc7 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdOnapPip.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdOnapPip.java @@ -34,14 +34,12 @@ import com.att.research.xacml.std.datatypes.DataTypes; import com.att.research.xacml.std.pip.StdMutablePIPResponse; import com.att.research.xacml.std.pip.StdPIPRequest; import com.att.research.xacml.std.pip.engines.StdConfigurableEngine; - import java.math.BigInteger; import java.util.Base64; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.Properties; - import javax.persistence.EntityManager; import javax.persistence.Persistence; import org.onap.policy.pdp.xacml.application.common.ToscaDictionary; diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionaryTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionaryTest.java index b6a7ae20..251c9710 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionaryTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionaryTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ import static org.junit.Assert.assertTrue; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; - import org.junit.Test; public class ToscaDictionaryTest { diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtilsTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtilsTest.java index 05d796ea..fbfde1a4 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtilsTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtilsTest.java @@ -48,7 +48,6 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicySetType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.RuleType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType; - import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyTypeTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyTypeTest.java index c23f7028..cd28bddc 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyTypeTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyTypeTest.java @@ -286,7 +286,7 @@ public class MatchablePolicyTypeTest implements MatchableCallback { // contain potential matchables // if (propertyValue instanceof List) { - for (Object listValue : ((List<?>)propertyValue)) { + for (Object listValue : ((List<?>) propertyValue)) { if (listValue instanceof Map) { generateTargetType(target, matchablePolicyType, (Map<String, Object>) listValue); } diff --git a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationDirective.java b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationDirective.java index 91f8ed2d..0a583d49 100644 --- a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationDirective.java +++ b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationDirective.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * guard * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,6 @@ package org.onap.policy.xacml.pdp.application.guard; import java.io.Serializable; import java.util.List; - import lombok.Data; @Data diff --git a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationGuardTranslator.java b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationGuardTranslator.java index 19291312..d20a25f0 100644 --- a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationGuardTranslator.java +++ b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationGuardTranslator.java @@ -25,7 +25,6 @@ package org.onap.policy.xacml.pdp.application.guard; import com.att.research.xacml.api.Request; import com.att.research.xacml.api.Response; import com.att.research.xacml.util.XACMLPolicyScanner; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; diff --git a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplication.java b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplication.java index b4e431c4..9f954766 100644 --- a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplication.java +++ b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplication.java @@ -25,7 +25,6 @@ package org.onap.policy.xacml.pdp.application.guard; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier; import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslator; import org.onap.policy.pdp.xacml.application.common.std.StdXacmlApplicationServiceProvider; @@ -96,7 +95,7 @@ public class GuardPdpApplication extends StdXacmlApplicationServiceProvider { @Override protected ToscaPolicyTranslator getTranslator(String type) { LOGGER.debug("Policy type {}", type); - if ( type.contains("coordination") ) { + if (type.contains("coordination")) { LOGGER.debug("returning coordinationTranslator"); return coordinationTranslator; } else { diff --git a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPolicyRequest.java b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPolicyRequest.java index 66a34b92..c516877a 100644 --- a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPolicyRequest.java +++ b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPolicyRequest.java @@ -26,13 +26,10 @@ import com.att.research.xacml.std.annotations.XACMLAction; import com.att.research.xacml.std.annotations.XACMLRequest; import com.att.research.xacml.std.annotations.XACMLResource; import com.att.research.xacml.std.annotations.XACMLSubject; - import java.util.Map; - import lombok.Getter; import lombok.Setter; import lombok.ToString; - import org.onap.policy.models.decisions.concepts.DecisionRequest; import org.onap.policy.pdp.xacml.application.common.ToscaPolicyConversionException; diff --git a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslatorTest.java b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslatorTest.java index d5dd16bf..6f7edac4 100644 --- a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslatorTest.java +++ b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslatorTest.java @@ -260,8 +260,8 @@ public class GuardTranslatorTest { if (! (rule instanceof RuleType)) { continue; } - assertThat(((RuleType)rule).getCondition()).isNotNull(); - assertThat(((RuleType)rule).getCondition().getExpression()).isNotNull(); + assertThat(((RuleType) rule).getCondition()).isNotNull(); + assertThat(((RuleType) rule).getCondition().getExpression()).isNotNull(); } } @@ -272,7 +272,7 @@ public class GuardTranslatorTest { if (! (rule instanceof RuleType)) { continue; } - for (AnyOfType anyOf : ((RuleType)rule).getTarget().getAnyOf()) { + for (AnyOfType anyOf : ((RuleType) rule).getTarget().getAnyOf()) { assertThat(anyOf.getAllOf()).isNotEmpty(); for (AllOfType allOf : anyOf.getAllOf()) { assertThat(allOf.getMatch()).isNotEmpty(); @@ -302,7 +302,7 @@ public class GuardTranslatorTest { } assertThat(((RuleType) rule).getTarget()).isNotNull(); assertThat(((RuleType) rule).getTarget().getAnyOf()).hasSize(1); - for (AnyOfType anyOf : ((RuleType)rule).getTarget().getAnyOf()) { + for (AnyOfType anyOf : ((RuleType) rule).getTarget().getAnyOf()) { assertThat(anyOf.getAllOf()).isNotEmpty(); for (AllOfType allOf : anyOf.getAllOf()) { assertThat(allOf.getMatch()).isNotEmpty(); diff --git a/applications/monitoring/src/test/java/cucumber/Stepdefs.java b/applications/monitoring/src/test/java/cucumber/Stepdefs.java index 3c099323..0a1d333a 100644 --- a/applications/monitoring/src/test/java/cucumber/Stepdefs.java +++ b/applications/monitoring/src/test/java/cucumber/Stepdefs.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,11 +26,9 @@ import com.att.research.xacml.std.annotations.XACMLAction; import com.att.research.xacml.std.annotations.XACMLRequest; import com.att.research.xacml.std.annotations.XACMLResource; import com.att.research.xacml.std.annotations.XACMLSubject; - import io.cucumber.java.en.Given; import io.cucumber.java.en.Then; import io.cucumber.java.en.When; - import org.junit.ClassRule; import org.junit.rules.TemporaryFolder; @@ -222,4 +220,4 @@ public class Stepdefs { }).doesNotThrowAnyException(); */ } -}
\ No newline at end of file +} diff --git a/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java b/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java index 031ef33c..8886af21 100644 --- a/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java +++ b/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java @@ -279,7 +279,7 @@ public class OptimizationPdpApplicationTest { // // Add US to the geography list // - ((List<String>)baseRequest.getResource().get("geography")).add("US"); + ((List<String>) baseRequest.getResource().get("geography")).add("US"); // // Ask for a decision for default US Policy // @@ -301,7 +301,7 @@ public class OptimizationPdpApplicationTest { // // Add vCPE to the service list // - ((List<String>)baseRequest.getResource().get("services")).add("vCPE"); + ((List<String>) baseRequest.getResource().get("services")).add("vCPE"); // // Ask for a decision for default US policy for vCPE service // @@ -324,7 +324,7 @@ public class OptimizationPdpApplicationTest { // // Add vG to the resource list // - ((List<String>)baseRequest.getResource().get("resources")).add("vG"); + ((List<String>) baseRequest.getResource().get("resources")).add("vG"); // // Ask for a decision for default US service vCPE resource vG policy // @@ -347,7 +347,7 @@ public class OptimizationPdpApplicationTest { // // Add gold as a scope // - ((List<String>)baseRequest.getContext().get("subscriberName")).add("subscriber_a"); + ((List<String>) baseRequest.getContext().get("subscriberName")).add("subscriber_a"); // // Ask for a decision for specific US vCPE vG gold // @@ -371,8 +371,8 @@ public class OptimizationPdpApplicationTest { // // Add platinum to the scope list: this is now gold OR platinum // - ((List<String>)baseRequest.getResource().get("scope")).remove("gold"); - ((List<String>)baseRequest.getContext().get("subscriberName")).add("subscriber_x"); + ((List<String>) baseRequest.getResource().get("scope")).remove("gold"); + ((List<String>) baseRequest.getContext().get("subscriberName")).add("subscriber_x"); // // Ask for a decision for specific US vCPE vG (gold or platinum) // @@ -396,9 +396,9 @@ public class OptimizationPdpApplicationTest { // // Add gold as a scope // - ((List<String>)baseRequest.getResource().get("scope")).remove("gold"); - ((List<String>)baseRequest.getResource().get("scope")).remove("platinum"); - ((List<String>)baseRequest.getContext().get("subscriberName")).remove("subscriber_a"); + ((List<String>) baseRequest.getResource().get("scope")).remove("gold"); + ((List<String>) baseRequest.getResource().get("scope")).remove("platinum"); + ((List<String>) baseRequest.getContext().get("subscriberName")).remove("subscriber_a"); // // Ask for a decision for specific US vCPE vG gold // @@ -552,11 +552,11 @@ public class OptimizationPdpApplicationTest { @SuppressWarnings("unchecked") private void cleanOutResources() { - ((List<String>)baseRequest.getResource().get("scope")).clear(); - ((List<String>)baseRequest.getResource().get("services")).clear(); - ((List<String>)baseRequest.getResource().get("resources")).clear(); - ((List<String>)baseRequest.getResource().get("geography")).clear(); - if (((List<String>)baseRequest.getResource().get("policy-type")) != null) { + ((List<String>) baseRequest.getResource().get("scope")).clear(); + ((List<String>) baseRequest.getResource().get("services")).clear(); + ((List<String>) baseRequest.getResource().get("resources")).clear(); + ((List<String>) baseRequest.getResource().get("geography")).clear(); + if (((List<String>) baseRequest.getResource().get("policy-type")) != null) { baseRequest.getResource().remove("policy-type"); } } diff --git a/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestController.java b/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestController.java index ad6784b3..fad1d3df 100644 --- a/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestController.java +++ b/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestController.java @@ -96,7 +96,7 @@ public class XacmlPdpRestController { @ResponseHeader(name = "X-ONAP-RequestID", description = "Used to track REST transactions for logging purpose", response = UUID.class)}, - authorizations = @Authorization(value = "basicAuth"), tags = {"HealthCheck",}, + authorizations = @Authorization(value = "basicAuth"), tags = {"HealthCheck", }, extensions = {@Extension(name = "interface info", properties = {@ExtensionProperty(name = "pdpx-version", value = "1.0.0"), @ExtensionProperty(name = "last-mod-release", value = "Dublin")})}) @@ -128,7 +128,7 @@ public class XacmlPdpRestController { @ResponseHeader(name = "X-ONAP-RequestID", description = "Used to track REST transactions for logging purpose", response = UUID.class)}, - authorizations = @Authorization(value = "basicAuth"), tags = {"Statistics",}, + authorizations = @Authorization(value = "basicAuth"), tags = {"Statistics", }, extensions = {@Extension(name = "interface info", properties = {@ExtensionProperty(name = "pdpx-version", value = "1.0.0"), @ExtensionProperty(name = "last-mod-release", value = "Dublin")})}) @@ -167,7 +167,7 @@ public class XacmlPdpRestController { @ResponseHeader(name = "X-ONAP-RequestID", description = "Used to track REST transactions for logging purpose", response = UUID.class)}, - authorizations = @Authorization(value = "basicAuth"), tags = {"Decision",}, + authorizations = @Authorization(value = "basicAuth"), tags = {"Decision", }, extensions = {@Extension(name = "interface info", properties = {@ExtensionProperty(name = "pdpx-version", value = "1.0.0"), @ExtensionProperty(name = "last-mod-release", value = "Dublin")})}) @@ -219,7 +219,7 @@ public class XacmlPdpRestController { @ResponseHeader(name = "X-ONAP-RequestID", description = "Used to track REST transactions for logging purpose", response = UUID.class)}, - authorizations = @Authorization(value = "basicAuth"), tags = {"Decision",}, + authorizations = @Authorization(value = "basicAuth"), tags = {"Decision", }, extensions = {@Extension(name = "interface info", properties = {@ExtensionProperty(name = "pdpx-version", value = "1.0.0"), @ExtensionProperty(name = "last-mod-release", value = "Frankfurt")})}) diff --git a/main/src/test/java/org/onap/policy/pdpx/main/comm/XacmlPdpHearbeatPublisherTest.java b/main/src/test/java/org/onap/policy/pdpx/main/comm/XacmlPdpHearbeatPublisherTest.java index f391605a..550091fa 100644 --- a/main/src/test/java/org/onap/policy/pdpx/main/comm/XacmlPdpHearbeatPublisherTest.java +++ b/main/src/test/java/org/onap/policy/pdpx/main/comm/XacmlPdpHearbeatPublisherTest.java @@ -170,7 +170,7 @@ public class XacmlPdpHearbeatPublisherTest { // create a plain listener to test the "real" makeTimer() method publisher = new XacmlPdpHearbeatPublisher(client, state); - assertThatCode( () -> { + assertThatCode(() -> { publisher.start(); publisher.restart(100L); publisher.terminate(); diff --git a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestStatisticsReport.java b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestStatisticsReport.java index d26d08d1..550248b9 100644 --- a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestStatisticsReport.java +++ b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestStatisticsReport.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ import com.openpojo.validation.rule.impl.GetterMustExistRule; import com.openpojo.validation.rule.impl.SetterMustExistRule; import com.openpojo.validation.test.impl.GetterTester; import com.openpojo.validation.test.impl.SetterTester; - import org.junit.Test; import org.onap.policy.common.utils.test.ToStringTester; import org.onap.policy.pdpx.main.rest.model.StatisticsReport; |