diff options
25 files changed, 64 insertions, 210 deletions
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/OnapPolicyFinderFactory.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/OnapPolicyFinderFactory.java index a4fc03fd..0e2a5326 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/OnapPolicyFinderFactory.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/OnapPolicyFinderFactory.java @@ -68,16 +68,6 @@ public class OnapPolicyFinderFactory extends PolicyFinderFactory { private Properties properties; /** - * Empty private constructor. We do not want to create - * an instance of this without giving Properties object. - * - * @throws OnapPolicyFinderFactoryException Exception will be thrown - */ - public OnapPolicyFinderFactory() throws OnapPolicyFinderFactoryException { - throw new OnapPolicyFinderFactoryException("Please use the constructor with Properties object."); - } - - /** * Constructor with properties passed. This will be preferred. * * @param properties Properties object 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 860189f9..596a3cc6 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 @@ -47,7 +47,7 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class XacmlPolicyUtils { +public final class XacmlPolicyUtils { private static final Logger LOGGER = LoggerFactory.getLogger(XacmlPolicyUtils.class); diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyType.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyType.java index fe79e861..ca29c96a 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyType.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePolicyType.java @@ -69,8 +69,8 @@ public class MatchablePolicyType { ); //@formatter:on - ToscaConceptIdentifier policyId; - Map<String, MatchableProperty> matchables = new HashMap<>(); + private ToscaConceptIdentifier policyId; + private Map<String, MatchableProperty> matchables = new HashMap<>(); public MatchablePolicyType(@NonNull ToscaPolicyType policyType, @NonNull MatchableCallback callback) { this.policyId = new ToscaConceptIdentifier(policyType.getName(), policyType.getVersion()); diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchableProperty.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchableProperty.java index 9b5de5c8..6e9c4559 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchableProperty.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchableProperty.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020-2021 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,7 +30,7 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public class MatchableProperty { @NonNull - String property; + private String property; @NonNull - MatchablePropertyType<?> type; + private MatchablePropertyType<?> type; } diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePropertyTypeList.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePropertyTypeList.java index 52f4ae11..0c42d357 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePropertyTypeList.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePropertyTypeList.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,7 +33,7 @@ import org.onap.policy.pdp.xacml.application.common.ToscaPolicyConversionExcepti import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslatorUtils; public class MatchablePropertyTypeList extends MatchablePropertyTypeBase<List<MatchablePropertyType<?>>> { - MatchableProperty primitiveProperty; + private MatchableProperty primitiveProperty; /** * constructor. diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePropertyTypeMap.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePropertyTypeMap.java index f6d8414a..79b34529 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePropertyTypeMap.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/matchable/MatchablePropertyTypeMap.java @@ -36,7 +36,7 @@ import org.onap.policy.pdp.xacml.application.common.ToscaPolicyConversionExcepti import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslatorUtils; public class MatchablePropertyTypeMap extends MatchablePropertyTypeBase<Map<String, MatchablePropertyType<?>>> { - MatchableProperty primitiveProperty; + private MatchableProperty primitiveProperty; /** * constructor. 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 9618d5b7..3e7c10af 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 @@ -31,6 +31,7 @@ import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; import org.onap.policy.models.decisions.concepts.DecisionRequest; @@ -38,6 +39,7 @@ import org.onap.policy.models.decisions.concepts.DecisionRequest; @Getter @Setter @ToString +@NoArgsConstructor @XACMLRequest(ReturnPolicyIdList = true) public class StdCombinedPolicyRequest { @@ -62,10 +64,6 @@ public class StdCombinedPolicyRequest { @XACMLResource(attributeId = "urn:org:onap:policy-type", includeInResults = true) private Collection<String> resourcePolicyType = new ArrayList<>(); - public StdCombinedPolicyRequest() { - super(); - } - /** * Parses the DecisionRequest into a MonitoringRequest. * diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java index 57560715..5bf9151e 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java @@ -32,6 +32,7 @@ import com.att.research.xacml.std.annotations.RequestParser; import com.google.common.base.Strings; import java.util.Collection; import java.util.Map; +import lombok.NoArgsConstructor; import oasis.names.tc.xacml._3_0.core.schema.wd_17.AnyOfType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.EffectType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType; @@ -49,14 +50,11 @@ import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslatorUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@NoArgsConstructor public class StdCombinedPolicyResultsTranslator extends StdBaseTranslator { private static final Logger LOGGER = LoggerFactory.getLogger(StdCombinedPolicyResultsTranslator.class); - public StdCombinedPolicyResultsTranslator() { - super(); - } - @Override public Object convertPolicy(ToscaPolicy toscaPolicy) throws ToscaPolicyConversionException { // diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchablePolicyRequest.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchablePolicyRequest.java index c038f383..42e3d43e 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchablePolicyRequest.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchablePolicyRequest.java @@ -43,6 +43,7 @@ import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; import org.onap.policy.models.decisions.concepts.DecisionRequest; @@ -54,6 +55,7 @@ import org.slf4j.LoggerFactory; @Getter @Setter @ToString +@NoArgsConstructor @XACMLRequest(ReturnPolicyIdList = true) public class StdMatchablePolicyRequest { @@ -75,10 +77,6 @@ public class StdMatchablePolicyRequest { protected static DataTypeFactory dataTypeFactory = null; - public StdMatchablePolicyRequest() { - super(); - } - protected static synchronized DataTypeFactory getDataTypeFactory() { try { if (dataTypeFactory != null) { 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 8d712768..cca2d218 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 @@ -43,6 +43,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import lombok.NoArgsConstructor; import lombok.Setter; import oasis.names.tc.xacml._3_0.core.schema.wd_17.AllOfType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.AnyOfType; @@ -83,6 +84,7 @@ import org.slf4j.LoggerFactory; * @author pameladragosh * */ +@NoArgsConstructor public class StdMatchableTranslator extends StdBaseTranslator implements MatchableCallback { private static final Logger LOGGER = LoggerFactory.getLogger(StdMatchableTranslator.class); @@ -96,10 +98,6 @@ public class StdMatchableTranslator extends StdBaseTranslator implements Matcha @Setter private Path pathForData; - public StdMatchableTranslator() { - super(); - } - @Override public Request convertRequest(DecisionRequest request) throws ToscaPolicyConversionException { LOGGER.info("Converting Request {}", request); 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 e8839ecb..d57da301 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 @@ -42,11 +42,13 @@ import java.util.Iterator; import java.util.Properties; import javax.persistence.EntityManager; import javax.persistence.Persistence; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import org.onap.policy.pdp.xacml.application.common.ToscaDictionary; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +@NoArgsConstructor(access = AccessLevel.PROTECTED) public abstract class StdOnapPip extends StdConfigurableEngine { protected static Logger logger = LoggerFactory.getLogger(StdOnapPip.class); @@ -70,10 +72,6 @@ public abstract class StdOnapPip extends StdConfigurableEngine { protected String issuer; protected boolean shutdown = false; - protected StdOnapPip() { - super(); - } - @Override public Collection<PIPRequest> attributesProvided() { return Collections.emptyList(); diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java index f29c4e76..40968758 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java @@ -39,7 +39,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; +import lombok.AccessLevel; import lombok.Getter; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.tuple.Pair; import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams; import org.onap.policy.models.decisions.concepts.DecisionRequest; @@ -54,6 +56,7 @@ import org.onap.policy.pdp.xacml.application.common.XacmlPolicyUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@NoArgsConstructor(access = AccessLevel.PROTECTED) public abstract class StdXacmlApplicationServiceProvider implements XacmlApplicationServiceProvider { private static final Logger LOGGER = LoggerFactory.getLogger(StdXacmlApplicationServiceProvider.class); @@ -69,10 +72,6 @@ public abstract class StdXacmlApplicationServiceProvider implements XacmlApplica private PDPEngine pdpEngine = null; private Map<ToscaPolicy, Path> mapLoadedPolicies = new HashMap<>(); - protected StdXacmlApplicationServiceProvider() { - super(); - } - @Override public String applicationName() { return applicationName; diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/OnapPolicyFinderFactoryTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/OnapPolicyFinderFactoryTest.java index b5b8f7b1..5df2552d 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/OnapPolicyFinderFactoryTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/OnapPolicyFinderFactoryTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2021 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. @@ -23,7 +23,6 @@ package org.onap.policy.pdp.xacml.application.common; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.io.FileInputStream; import java.util.Properties; @@ -32,13 +31,6 @@ import org.junit.Test; public class OnapPolicyFinderFactoryTest { @Test - public void testNoUseConstructor() throws Exception { - assertThatExceptionOfType(OnapPolicyFinderFactoryException.class).isThrownBy(() -> { - new OnapPolicyFinderFactory(); - }).withMessageContaining("Please use the constructor with Properties object."); - } - - @Test public void testFinder() throws Exception { // // Load our test properties to use 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 90f56a90..162b0626 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 @@ -34,6 +34,7 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.UUID; +import lombok.NoArgsConstructor; import org.apache.commons.io.IOUtils; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardYamlCoder; @@ -46,14 +47,11 @@ import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@NoArgsConstructor public class CoordinationGuardTranslator implements ToscaPolicyTranslator { private static final Logger LOGGER = LoggerFactory.getLogger(CoordinationGuardTranslator.class); - public CoordinationGuardTranslator() { - super(); - } - @Override public Object convertPolicy(ToscaPolicy toscaPolicy) throws ToscaPolicyConversionException { LOGGER.debug("Using CoordinationGuardTranslator.convertPolicy"); 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 8a77449c..58fe00b7 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 @@ -33,6 +33,7 @@ import java.time.OffsetTime; import java.time.ZoneOffset; import java.util.Map; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; import org.onap.policy.models.decisions.concepts.DecisionRequest; @@ -41,6 +42,7 @@ import org.onap.policy.pdp.xacml.application.common.ToscaPolicyConversionExcepti @Getter @Setter @ToString +@NoArgsConstructor @XACMLRequest(ReturnPolicyIdList = true) public class GuardPolicyRequest { private static final String STR_GUARD = "guard"; @@ -109,10 +111,6 @@ public class GuardPolicyRequest { public static final String PREFIX_RESOURCE_ATTRIBUTE_ID = "urn:org:onap:guard:target:"; - public GuardPolicyRequest() { - super(); - } - /** * Parses the DecisionRequest into a StdMetadataPolicyRequest. * diff --git a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslator.java b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslator.java index df5fe43e..3aae5fc4 100644 --- a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslator.java +++ b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslator.java @@ -39,6 +39,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; import lombok.Getter; +import lombok.NoArgsConstructor; import oasis.names.tc.xacml._3_0.core.schema.wd_17.AllOfType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.AnyOfType; import oasis.names.tc.xacml._3_0.core.schema.wd_17.ApplyType; @@ -67,6 +68,7 @@ import org.onap.policy.pdp.xacml.application.common.operationshistory.CountRecen import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@NoArgsConstructor public class GuardTranslator implements ToscaPolicyTranslator { private static final Logger LOGGER = LoggerFactory.getLogger(GuardTranslator.class); @@ -118,9 +120,6 @@ public class GuardTranslator implements ToscaPolicyTranslator { // private static final String VARIABLE_TIMEINRANGE = "timeInRange"; - public GuardTranslator() { - super(); - } /** * Convert the policy. diff --git a/applications/native/src/main/java/org/onap/policy/xacml/pdp/application/nativ/NativePdpApplicationTranslator.java b/applications/native/src/main/java/org/onap/policy/xacml/pdp/application/nativ/NativePdpApplicationTranslator.java index 06e324d2..3caf28f2 100644 --- a/applications/native/src/main/java/org/onap/policy/xacml/pdp/application/nativ/NativePdpApplicationTranslator.java +++ b/applications/native/src/main/java/org/onap/policy/xacml/pdp/application/nativ/NativePdpApplicationTranslator.java @@ -31,6 +31,7 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Base64; import lombok.Getter; +import lombok.NoArgsConstructor; import org.onap.policy.common.parameters.annotations.NotBlank; import org.onap.policy.common.parameters.annotations.NotNull; import org.onap.policy.models.decisions.concepts.DecisionRequest; @@ -48,14 +49,11 @@ import org.slf4j.LoggerFactory; * @author Chenfei Gao (cgao@research.att.com) * */ +@NoArgsConstructor public class NativePdpApplicationTranslator implements ToscaPolicyTranslator { private static final Logger LOGGER = LoggerFactory.getLogger(NativePdpApplicationTranslator.class); - public NativePdpApplicationTranslator() { - super(); - } - @Override public Object convertPolicy(ToscaPolicy toscaPolicy) throws ToscaPolicyConversionException { // diff --git a/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationSubscriberRequest.java b/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationSubscriberRequest.java index 5eda7678..6d86bdb4 100644 --- a/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationSubscriberRequest.java +++ b/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationSubscriberRequest.java @@ -46,7 +46,7 @@ import org.onap.policy.pdp.xacml.application.common.std.StdMatchablePolicyReques public class OptimizationSubscriberRequest extends StdMatchablePolicyRequest { @XACMLSubject(attributeId = "urn:org:onap:optimization:subscriber:name", includeInResults = true) - List<String> subscriberRoles; + private List<String> subscriberRoles; /** * Create an instance of xacml request. diff --git a/main/src/main/java/org/onap/policy/pdpx/main/comm/XacmlPdpPapRegistration.java b/main/src/main/java/org/onap/policy/pdpx/main/comm/XacmlPdpPapRegistration.java index a848f523..d477ed0b 100644 --- a/main/src/main/java/org/onap/policy/pdpx/main/comm/XacmlPdpPapRegistration.java +++ b/main/src/main/java/org/onap/policy/pdpx/main/comm/XacmlPdpPapRegistration.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019, 2021 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,26 +22,20 @@ package org.onap.policy.pdpx.main.comm; +import lombok.AllArgsConstructor; import org.onap.policy.common.endpoints.event.comm.client.TopicSinkClient; import org.onap.policy.common.endpoints.event.comm.client.TopicSinkClientException; import org.onap.policy.models.pdp.concepts.PdpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@AllArgsConstructor public class XacmlPdpPapRegistration { private static final Logger LOGGER = LoggerFactory.getLogger(XacmlPdpPapRegistration.class); private final TopicSinkClient client; /** - * Constructs the object. - * @param client name of the TopickSinkClient - */ - public XacmlPdpPapRegistration(TopicSinkClient client) { - this.client = client; - } - - /** * Sends PDP register and unregister message to the PAP. * @param status of the PDP * @throws TopicSinkClientException if the topic sink does not exist diff --git a/main/src/main/java/org/onap/policy/pdpx/main/comm/XacmlPdpUpdatePublisher.java b/main/src/main/java/org/onap/policy/pdpx/main/comm/XacmlPdpUpdatePublisher.java index 39af6fd6..da6fdb2c 100644 --- a/main/src/main/java/org/onap/policy/pdpx/main/comm/XacmlPdpUpdatePublisher.java +++ b/main/src/main/java/org/onap/policy/pdpx/main/comm/XacmlPdpUpdatePublisher.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; +import lombok.AllArgsConstructor; import org.onap.policy.common.endpoints.event.comm.client.TopicSinkClient; import org.onap.policy.models.pdp.concepts.PdpStatus; import org.onap.policy.models.pdp.concepts.PdpUpdate; @@ -39,6 +40,7 @@ import org.onap.policy.pdpx.main.rest.XacmlPdpStatisticsManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@AllArgsConstructor public class XacmlPdpUpdatePublisher { private static final Logger LOGGER = LoggerFactory.getLogger(XacmlPdpUpdatePublisher.class); @@ -48,18 +50,6 @@ public class XacmlPdpUpdatePublisher { private final XacmlPdpApplicationManager appManager; /** - * Constructs the object. - * @param client messages are published to this client - * @param state tracks the state of this PDP - * @param appManager application manager - */ - public XacmlPdpUpdatePublisher(TopicSinkClient client, XacmlState state, XacmlPdpApplicationManager appManager) { - this.client = client; - this.state = state; - this.appManager = appManager; - } - - /** * Handle the PDP Update message. * * @param message Incoming message diff --git a/main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterHandler.java b/main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterHandler.java index aac05752..539716b8 100644 --- a/main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterHandler.java +++ b/main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterHandler.java @@ -20,10 +20,10 @@ package org.onap.policy.pdpx.main.parameters; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import java.io.FileReader; +import java.io.File; import org.onap.policy.common.parameters.ValidationResult; +import org.onap.policy.common.utils.coder.Coder; +import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.pdpx.main.PolicyXacmlPdpException; import org.onap.policy.pdpx.main.startstop.XacmlPdpCommandLineArguments; import org.slf4j.Logger; @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; */ public class XacmlPdpParameterHandler { private static final Logger LOGGER = LoggerFactory.getLogger(XacmlPdpParameterHandler.class); - private static final Gson gson = new GsonBuilder().create(); + private static final Coder CODER = new StandardCoder(); /** * Read the parameters from the parameter file. @@ -51,8 +51,8 @@ public class XacmlPdpParameterHandler { XacmlPdpParameterGroup xacmlPdpParameterGroup = null; try { - // Read the parameters from JSON using Gson - xacmlPdpParameterGroup = gson.fromJson(new FileReader(arguments.getFullConfigurationFilePath()), + // Read the parameters from JSON + xacmlPdpParameterGroup = CODER.decode(new File(arguments.getFullConfigurationFilePath()), XacmlPdpParameterGroup.class); } catch (final Exception e) { final String errorMessage = "error reading parameters from \"" + arguments.getConfigurationFilePath() diff --git a/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpStatisticsManager.java b/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpStatisticsManager.java index a696ea43..63d9f513 100644 --- a/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpStatisticsManager.java +++ b/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpStatisticsManager.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019, 2021 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,6 +27,7 @@ import lombok.Setter; * Class to hold statistical data for xacmlPdp component. * */ +@Getter public class XacmlPdpStatisticsManager { @Getter @Setter @@ -34,7 +35,7 @@ public class XacmlPdpStatisticsManager { private long totalPolicyTypesCount; private long totalPoliciesCount; - private long errorsCount; + private long errorCount; private long permitDecisionsCount; private long denyDecisionsCount; private long indeterminantDecisionsCount; @@ -70,7 +71,7 @@ public class XacmlPdpStatisticsManager { * @return the errorDecisionsCount */ public long updateErrorCount() { - return ++errorsCount; + return ++errorCount; } /** @@ -110,75 +111,12 @@ public class XacmlPdpStatisticsManager { } /** - * Returns the current value of totalPolicyTypesCount. - - * @return the totalPolicyTypesCount - */ - public long getTotalPolicyTypesCount() { - return totalPolicyTypesCount; - } - - /** - * Returns the current value of totalPoliciesCount. - - * @return the totalPoliciesCount - */ - public long getTotalPoliciesCount() { - return totalPoliciesCount; - } - - /** - * Returns the current value of errorDecisionsCount. - - * @return the permitDecisionsCount - */ - public long getErrorCount() { - return errorsCount; - } - - /** - * Returns the current value of permitDecisionsCount. - - * @return the permitDecisionsCount - */ - public long getPermitDecisionsCount() { - return permitDecisionsCount; - } - - /** - * Returns the current value of denyDecisionsCount. - - * @return the denyDecisionsCount - */ - public long getDenyDecisionsCount() { - return denyDecisionsCount; - } - - /** - * Returns the current value of indeterminantDecisionsCount. - - * @return the indeterminantDecisionsCount - */ - public long getIndeterminantDecisionsCount() { - return indeterminantDecisionsCount; - } - - /** - * Returns the current value of notApplicableDecisionsCount. - - * @return the notApplicableDecisionsCount - */ - public long getNotApplicableDecisionsCount() { - return notApplicableDecisionsCount; - } - - /** * Reset all the statistics counts to 0. */ public void resetAllStatistics() { totalPolicyTypesCount = 0L; totalPoliciesCount = 0L; - errorsCount = 0L; + errorCount = 0L; permitDecisionsCount = 0L; denyDecisionsCount = 0L; indeterminantDecisionsCount = 0L; diff --git a/main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlExceptionMapper.java b/main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlExceptionMapper.java index 4112e64e..a2a78a89 100644 --- a/main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlExceptionMapper.java +++ b/main/src/main/java/org/onap/policy/pdpx/main/rest/serialization/XacmlExceptionMapper.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020-2021 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. @@ -36,9 +36,9 @@ public abstract class XacmlExceptionMapper implements ExceptionMapper<IOExceptio private static final Logger LOGGER = LoggerFactory.getLogger(XacmlExceptionMapper.class); @Getter - String invalidRequest; + protected String invalidRequest; @Getter - String invalidResponse; + protected String invalidResponse; public abstract boolean isInvalidRequest(String message); diff --git a/main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpCommandLineArguments.java b/main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpCommandLineArguments.java index 1267d858..24545d30 100644 --- a/main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpCommandLineArguments.java +++ b/main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpCommandLineArguments.java @@ -24,6 +24,8 @@ import java.io.File; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Arrays; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; @@ -46,7 +48,11 @@ public class XacmlPdpCommandLineArguments { private final Options options; // The command line options + @Getter + @Setter private String configurationFilePath = null; + @Getter + @Setter private String propertyFilePath = null; /** @@ -190,15 +196,6 @@ public class XacmlPdpCommandLineArguments { } /** - * Gets the configuration file path. - * - * @return the configuration file path - */ - public String getConfigurationFilePath() { - return configurationFilePath; - } - - /** * Gets the full expanded configuration file path. * * @return the configuration file path @@ -208,16 +205,6 @@ public class XacmlPdpCommandLineArguments { } /** - * Sets the configuration file path. - * - * @param configurationFilePath the configuration file path - */ - public void setConfigurationFilePath(final String configurationFilePath) { - this.configurationFilePath = configurationFilePath; - - } - - /** * Check set configuration file path. * * @return true, if check set configuration file path @@ -227,15 +214,6 @@ public class XacmlPdpCommandLineArguments { } /** - * Gets the property file path. - * - * @return the property file path - */ - public String getPropertyFilePath() { - return propertyFilePath; - } - - /** * Gets the full expanded property file path. * * @return the property file path @@ -245,16 +223,6 @@ public class XacmlPdpCommandLineArguments { } /** - * Sets the property file path. - * - * @param propertyFilePath the property file path - */ - public void setPropertyFilePath(final String propertyFilePath) { - this.propertyFilePath = propertyFilePath; - - } - - /** * Validate readable file. * * @param fileTag the file tag diff --git a/main/src/test/java/org/onap/policy/pdpx/main/parameters/TestXacmlPdpParameterHandler.java b/main/src/test/java/org/onap/policy/pdpx/main/parameters/TestXacmlPdpParameterHandler.java index 570b4319..1e86fee7 100644 --- a/main/src/test/java/org/onap/policy/pdpx/main/parameters/TestXacmlPdpParameterHandler.java +++ b/main/src/test/java/org/onap/policy/pdpx/main/parameters/TestXacmlPdpParameterHandler.java @@ -67,9 +67,9 @@ public class TestXacmlPdpParameterHandler { badArguments.parse(badArgumentString); assertThatThrownBy(() -> new XacmlPdpParameterHandler().getParameters(badArguments)) - .hasMessage("error reading parameters from \"parameters/BadParameters.json\"\n" - + "(JsonSyntaxException):java.lang.IllegalStateException: " - + "Expected a string but was BEGIN_ARRAY at line 2 column 14 path $.name"); + .hasMessageContaining("error reading parameters from", "parameters/BadParameters.json", + "JsonSyntaxException", "java.lang.IllegalStateException", + "Expected a string but was BEGIN_ARRAY at line 2 column 14 path $.name"); } @@ -81,9 +81,9 @@ public class TestXacmlPdpParameterHandler { invalidArguments.parse(invalidArgumentString); assertThatThrownBy(() -> new XacmlPdpParameterHandler().getParameters(invalidArguments)) - .hasMessage("error reading parameters from \"parameters/InvalidParameters.json\"\n" - + "(JsonSyntaxException):java.lang.IllegalStateException: " - + "Expected a string but was BEGIN_ARRAY at line 2 column 14 path $.name"); + .hasMessageContaining("error reading parameters from", "parameters/InvalidParameters.json", + "JsonSyntaxException", "java.lang.IllegalStateException", + "Expected a string but was BEGIN_ARRAY at line 2 column 14 path $.name"); } @Test |