From 6279d12fc01c4ded32bca030d82b58d3d786864b Mon Sep 17 00:00:00 2001 From: liamfallon Date: Fri, 7 Sep 2018 13:45:52 +0100 Subject: Parameter Group fields must have getters Parameter handling is changed so that all fields must have a getter following normal naming conventions. This change brings that in. Issue-ID: POLICY-1095 Change-Id: Idc61960347a67c50f33fc272dcd00ceca7553d95 Signed-off-by: liamfallon --- .../parameters/TestDistributionParameterGroup.java | 2 +- .../DummyReceptionHandlerParameterGroup.java | 2 +- packages/policy-distribution-tarball/pom.xml | 40 ------------ .../pdp/XacmlPdpPolicyForwarderParameterGroup.java | 1 - .../reception/handling/sdc/SdcConfiguration.java | 6 +- ...eceptionHandlerConfigurationParameterGroup.java | 74 +++++++++++----------- .../src/test/resources/handling-sdc.json | 8 +-- .../src/test/resources/handling-sdcInvalid.json | 6 +- 8 files changed, 49 insertions(+), 90 deletions(-) diff --git a/main/src/test/java/org/onap/policy/distribution/main/parameters/TestDistributionParameterGroup.java b/main/src/test/java/org/onap/policy/distribution/main/parameters/TestDistributionParameterGroup.java index 2df1cd47..6f6ddd81 100644 --- a/main/src/test/java/org/onap/policy/distribution/main/parameters/TestDistributionParameterGroup.java +++ b/main/src/test/java/org/onap/policy/distribution/main/parameters/TestDistributionParameterGroup.java @@ -87,7 +87,7 @@ public class TestDistributionParameterGroup { assertEquals(CommonTestData.MY_BOOLEAN_PARAMETER_VALUE, ((DummyReceptionHandlerParameterGroup) distributionParameters .getReceptionHandlerConfigurationParameters() - .get(CommonTestData.RECEPTION_CONFIGURATION_PARAMETERS)).getMyBooleanParameter()); + .get(CommonTestData.RECEPTION_CONFIGURATION_PARAMETERS)).isMyBooleanParameter()); assertEquals(CommonTestData.FORWARDER_HOST, ((DummyPolicyForwarderParameterGroup) distributionParameters.getPolicyForwarderConfigurationParameters() .get(CommonTestData.FORWARDER_CONFIGURATION_PARAMETERS)).getHostname()); diff --git a/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyReceptionHandlerParameterGroup.java b/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyReceptionHandlerParameterGroup.java index d452e96c..20f433d0 100644 --- a/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyReceptionHandlerParameterGroup.java +++ b/main/src/test/java/org/onap/policy/distribution/main/testclasses/DummyReceptionHandlerParameterGroup.java @@ -81,7 +81,7 @@ public class DummyReceptionHandlerParameterGroup extends ReceptionHandlerConfigu return myIntegerParameter; } - public boolean getMyBooleanParameter() { + public boolean isMyBooleanParameter() { return myBooleanParameter; } diff --git a/packages/policy-distribution-tarball/pom.xml b/packages/policy-distribution-tarball/pom.xml index 2165a488..0acf197a 100644 --- a/packages/policy-distribution-tarball/pom.xml +++ b/packages/policy-distribution-tarball/pom.xml @@ -85,44 +85,4 @@ - - - only-eclipse - - - m2e.version - - - - - - - org.eclipse.m2e - lifecycle-mapping - - - - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven-dependency-plugin.version} - - unpack - copy - - - - - - - - - - - - - - - diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarderParameterGroup.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarderParameterGroup.java index e72e64ae..0a789904 100644 --- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarderParameterGroup.java +++ b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/xacml/pdp/XacmlPdpPolicyForwarderParameterGroup.java @@ -29,7 +29,6 @@ import org.onap.policy.distribution.main.parameters.PolicyForwarderConfiguration * Holds the parameters for the{@link XacmlPdpPolicyForwarder} */ public class XacmlPdpPolicyForwarderParameterGroup extends PolicyForwarderConfigurationParameterGroup { - public static final String POLICY_FORWARDER_PLUGIN_CLASS = XacmlPdpPolicyForwarder.class.getCanonicalName(); private boolean useHttps; diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java index 99529759..04c978ba 100644 --- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java +++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java @@ -47,7 +47,7 @@ public class SdcConfiguration implements IConfiguration { @Override public List getMsgBusAddress() { - return configParameters.getMsgBusAddress(); + return configParameters.getMessageBusAddress(); } @Override @@ -87,7 +87,7 @@ public class SdcConfiguration implements IConfiguration { @Override public String getConsumerID() { - return configParameters.getConsumerID(); + return configParameters.getConsumerId(); } @Override @@ -102,7 +102,7 @@ public class SdcConfiguration implements IConfiguration { @Override public boolean activateServerTLSAuth() { - return configParameters.activateServerTLSAuth(); + return configParameters.isActiveServerTlsAuth(); } @Override diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java index 5c46049f..ce925bb7 100644 --- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java +++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java @@ -45,17 +45,17 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan private List artifactTypes; private String consumerGroup; private String environmentName; - private String keystorePath; - private String keystorePassword; - private boolean activeserverTlsAuth; - private boolean isFilterinEmptyResources; - private Boolean isUseHttpsWithDmaap; + private String keyStorePath; + private String keyStorePassword; + private boolean activeServerTlsAuth; + private boolean isFilterInEmptyResources; + private boolean isUseHttpsWithDmaap; /** * Inner static class is to used as a Builder. * */ - public static class PssdConfigurationBuilder { + public static class SdcConfigurationBuilder { private String asdcAddress; private List messageBusAddress; private String user; @@ -72,77 +72,77 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan private boolean isFilterinEmptyResources; private Boolean isUseHttpsWithDmaap; - public PssdConfigurationBuilder setAsdcAddress(final String val) { + public SdcConfigurationBuilder setAsdcAddress(final String val) { asdcAddress = val; return this; } - public PssdConfigurationBuilder setMessageBusAddress(final List val) { + public SdcConfigurationBuilder setMessageBusAddress(final List val) { messageBusAddress = val; return this; } - public PssdConfigurationBuilder setUser(final String val) { + public SdcConfigurationBuilder setUser(final String val) { user = val; return this; } - public PssdConfigurationBuilder setPassword(final String val) { + public SdcConfigurationBuilder setPassword(final String val) { password = val; return this; } - public PssdConfigurationBuilder setPollingInterval(final int val) { + public SdcConfigurationBuilder setPollingInterval(final int val) { pollingInterval = val; return this; } - public PssdConfigurationBuilder setPollingTimeout(final int val) { + public SdcConfigurationBuilder setPollingTimeout(final int val) { pollingTimeout = val; return this; } - public PssdConfigurationBuilder setConsumerId(final String val) { + public SdcConfigurationBuilder setConsumerId(final String val) { consumerId = val; return this; } - public PssdConfigurationBuilder setArtifactTypes(final List val) { + public SdcConfigurationBuilder setArtifactTypes(final List val) { artifactTypes = val; return this; } - public PssdConfigurationBuilder setConsumerGroup(final String val) { + public SdcConfigurationBuilder setConsumerGroup(final String val) { consumerGroup = val; return this; } - public PssdConfigurationBuilder setEnvironmentName(final String val) { + public SdcConfigurationBuilder setEnvironmentName(final String val) { environmentName = val; return this; } - public PssdConfigurationBuilder setKeystorePath(final String val) { + public SdcConfigurationBuilder setKeystorePath(final String val) { keystorePath = val; return this; } - public PssdConfigurationBuilder setKeystorePassword(final String val) { + public SdcConfigurationBuilder setKeystorePassword(final String val) { keystorePassword = val; return this; } - public PssdConfigurationBuilder setActiveserverTlsAuth(final boolean val) { + public SdcConfigurationBuilder setActiveserverTlsAuth(final boolean val) { activeserverTlsAuth = val; return this; } - public PssdConfigurationBuilder setIsFilterinEmptyResources(final boolean val) { + public SdcConfigurationBuilder setIsFilterinEmptyResources(final boolean val) { isFilterinEmptyResources = val; return this; } - public PssdConfigurationBuilder setIsUseHttpsWithDmaap(final Boolean val) { + public SdcConfigurationBuilder setIsUseHttpsWithDmaap(final Boolean val) { isUseHttpsWithDmaap = val; return this; } @@ -161,7 +161,7 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan * * @param builder stores all the values used by PssdConfigurationParametersGroup */ - private SdcReceptionHandlerConfigurationParameterGroup(final PssdConfigurationBuilder builder) { + private SdcReceptionHandlerConfigurationParameterGroup(final SdcConfigurationBuilder builder) { asdcAddress = builder.asdcAddress; messageBusAddress = builder.messageBusAddress; user = builder.user; @@ -172,10 +172,10 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan artifactTypes = builder.artifactTypes; consumerGroup = builder.consumerGroup; environmentName = builder.environmentName; - keystorePath = builder.keystorePath; - keystorePassword = builder.keystorePassword; - activeserverTlsAuth = builder.activeserverTlsAuth; - isFilterinEmptyResources = builder.isFilterinEmptyResources; + keyStorePath = builder.keystorePath; + keyStorePassword = builder.keystorePassword; + activeServerTlsAuth = builder.activeserverTlsAuth; + isFilterInEmptyResources = builder.isFilterinEmptyResources; isUseHttpsWithDmaap = builder.isUseHttpsWithDmaap; } @@ -184,7 +184,7 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan return asdcAddress; } - public List getMsgBusAddress() { + public List getMessageBusAddress() { return messageBusAddress; } @@ -204,7 +204,7 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan return pollingTimeout; } - public String getConsumerID() { + public String getConsumerId() { return consumerId; } @@ -221,22 +221,22 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan } public String getKeyStorePassword() { - return keystorePassword; + return keyStorePassword; } - public String getKeyStorePath() { - return keystorePath; + public boolean isActiveServerTlsAuth() { + return activeServerTlsAuth; } - public boolean activateServerTLSAuth() { - return activeserverTlsAuth; + public String getKeyStorePath() { + return keyStorePath; } public boolean isFilterInEmptyResources() { - return isFilterinEmptyResources; + return isFilterInEmptyResources; } - public Boolean isUseHttpsWithDmaap() { + public boolean isUseHttpsWithDmaap() { return isUseHttpsWithDmaap; } @@ -269,8 +269,8 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan validateStringElement(validationResult, user, "user"); validateStringElement(validationResult, consumerId, "consumerId"); validateStringElement(validationResult, consumerGroup, "consumerGroup"); - validateStringElement(validationResult, keystorePath, "keystorePath"); - validateStringElement(validationResult, keystorePassword, "keystorePassword"); + validateStringElement(validationResult, keyStorePath, "keyStorePath"); + validateStringElement(validationResult, keyStorePassword, "keyStorePassword"); validateIntElement(validationResult, pollingInterval, "pollingInterval"); validateIntElement(validationResult, pollingTimeout, "pollingTimeout"); validateStringListElement(validationResult, messageBusAddress, "messageBusAddress"); diff --git a/plugins/reception-plugins/src/test/resources/handling-sdc.json b/plugins/reception-plugins/src/test/resources/handling-sdc.json index b9e63fe0..7e3758de 100644 --- a/plugins/reception-plugins/src/test/resources/handling-sdc.json +++ b/plugins/reception-plugins/src/test/resources/handling-sdc.json @@ -17,10 +17,10 @@ ], "consumerGroup": "policy-group", "environmentName": "TEST", - "keystorePath": "null", - "keystorePassword": "null", - "activeserverTlsAuth": false, - "isFilterinEmptyResources": true, + "keyStorePath": "null", + "keyStorePassword": "null", + "activeServerTlsAuth": false, + "isFilterInEmptyResources": true, "isUseHttpsWithDmaap": false } diff --git a/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json b/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json index ababea48..112879f4 100644 --- a/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json +++ b/plugins/reception-plugins/src/test/resources/handling-sdcInvalid.json @@ -17,10 +17,10 @@ ], "consumerGroup": "policy-group", "environmentName": "environmentName", - "keystorePath": "null", - "keystorePassword": "null", + "keyStorePath": "null", + "keyStorePassword": "null", "activeserverTlsAuth": false, - "isFilterinEmptyResources": true, + "isFilterInEmptyResources": true, "isUseHttpsWithDmaap": false } -- cgit 1.2.3-korg