diff options
Diffstat (limited to 'artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling')
3 files changed, 33 insertions, 96 deletions
diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java index d65f9d6..cc30f40 100644 --- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java +++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcConfiguration.java @@ -41,13 +41,8 @@ public class SdcConfiguration implements IConfiguration { } @Override - public String getAsdcAddress() { - return configParameters.getAsdcAddress(); - } - - @Override - public List<String> getMsgBusAddress() { - return configParameters.getMessageBusAddress(); + public String getSdcAddress() { + return configParameters.getSdcAddress(); } @Override @@ -111,11 +106,6 @@ public class SdcConfiguration implements IConfiguration { } @Override - public Boolean isUseHttpsWithDmaap() { - return configParameters.isUseHttpsWithDmaap(); - } - - @Override public Boolean isUseHttpsWithSDC() { return configParameters.isUseHttpsWithSDC(); } diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java index 2476b07..24a27c9 100644 --- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java +++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterBuilder.java @@ -31,7 +31,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { private boolean activeserverTlsAuth; private boolean filterinEmptyResources; - private boolean useHttpsWithDmaap; private boolean useHttpsWithSDC; private int pollingTimeout; private int pollingInterval; @@ -39,7 +38,7 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { private String password; private String consumerId; private String consumerGroup; - private String asdcAddress; + private String sdcAddress; private String environmentName; private String keystorePath; private String keystorePassword; @@ -47,7 +46,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { private int httpproxyPort; private String httpsproxyHost; private String httpproxyHost; - private List<String> messageBusAddress; private List<String> artifactTypes; private int retryDelay; @@ -73,16 +71,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { } /** - * Set useHttpsWithDmaap to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. - * - * @param useHttpsWithDmaap the useHttpsWithDmaap - */ - public SdcReceptionHandlerConfigurationParameterBuilder setUseHttpsWithDmaap(final Boolean useHttpsWithDmaap) { - this.useHttpsWithDmaap = useHttpsWithDmaap; - return this; - } - - /** * Set pollingInterval to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * * @param pollingInterval the pollingInterval @@ -103,12 +91,12 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { } /** - * Set asdcAddress to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. + * Set sdcAddress to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * - * @param asdcAddress the asdcAddress + * @param sdcAddress the sdcAddress */ - public SdcReceptionHandlerConfigurationParameterBuilder setAsdcAddress(final String asdcAddress) { - this.asdcAddress = asdcAddress; + public SdcReceptionHandlerConfigurationParameterBuilder setSdcAddress(final String sdcAddress) { + this.sdcAddress = sdcAddress; return this; } @@ -183,16 +171,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { } /** - * Set messageBusAddress to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. - * - * @param messageBusAddress the messageBusAddress - */ - public SdcReceptionHandlerConfigurationParameterBuilder setMessageBusAddress(final List<String> messageBusAddress) { - this.messageBusAddress = messageBusAddress; - return this; - } - - /** * Set artifactTypes to this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * * @param artifactTypes the artifactTypes @@ -232,15 +210,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { } /** - * Returns the isUseHttpsWithDmaap flag of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. - * - * @return the isUseHttpsWithDmaap - */ - public Boolean getIsUseHttpsWithDmaap() { - return useHttpsWithDmaap; - } - - /** * Returns the isUseHttpsWithSDC flag of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * * @return the isUseHttpsWithSDC @@ -270,10 +239,10 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { /** * Returns the asdc address of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * - * @return the asdcAddress + * @return the sdcAddress */ - public String getAsdcAddress() { - return asdcAddress; + public String getSdcAddress() { + return sdcAddress; } /** @@ -340,15 +309,6 @@ public class SdcReceptionHandlerConfigurationParameterBuilder { } /** - * Returns the message bus address of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. - * - * @return the messageBusAddress - */ - public List<String> getMessageBusAddress() { - return messageBusAddress; - } - - /** * Returns the artifact types of this {@link SdcReceptionHandlerConfigurationParameterBuilder} instance. * * @return the artifactTypes diff --git a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java index c204d75..16cb612 100644 --- a/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java +++ b/artifactbroker/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/SdcReceptionHandlerConfigurationParameterGroup.java @@ -33,27 +33,25 @@ import org.onap.policy.distribution.reception.parameters.ReceptionHandlerConfigu */ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHandlerConfigurationParameterGroup { - private String asdcAddress; - private List<String> messageBusAddress; - private String user; - private String password; - private int pollingInterval; - private int pollingTimeout; - private int retryDelay; - private int httpsProxyPort; - private int httpProxyPort; - private String httpsProxyHost; - private String httpProxyHost; - private String consumerId; - private List<String> artifactTypes; - private String consumerGroup; - private String environmentName; - private String keyStorePath; - private String keyStorePassword; - private boolean activeServerTlsAuth; - private boolean isFilterInEmptyResources; - private boolean isUseHttpsWithDmaap; - private boolean isUseHttpsWithSDC; + private final String sdcAddress; + private final String user; + private final String password; + private final int pollingInterval; + private final int pollingTimeout; + private final int retryDelay; + private final int httpsProxyPort; + private final int httpProxyPort; + private final String httpsProxyHost; + private final String httpProxyHost; + private final String consumerId; + private final List<String> artifactTypes; + private final String consumerGroup; + private final String environmentName; + private final String keyStorePath; + private final String keyStorePassword; + private final boolean activeServerTlsAuth; + private final boolean isFilterInEmptyResources; + private final boolean isUseHttpsWithSDC; /** * The constructor for instantiating {@link SdcReceptionHandlerConfigurationParameterGroup} class. @@ -62,8 +60,7 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan */ public SdcReceptionHandlerConfigurationParameterGroup( final SdcReceptionHandlerConfigurationParameterBuilder builder) { - asdcAddress = builder.getAsdcAddress(); - messageBusAddress = builder.getMessageBusAddress(); + sdcAddress = builder.getSdcAddress(); user = builder.getUser(); password = builder.getPassword(); pollingInterval = builder.getPollingInterval(); @@ -81,17 +78,12 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan keyStorePassword = builder.getKeystorePassword(); activeServerTlsAuth = builder.isActiveserverTlsAuth(); isFilterInEmptyResources = builder.isFilterinEmptyResources(); - isUseHttpsWithDmaap = builder.getIsUseHttpsWithDmaap(); isUseHttpsWithSDC = builder.getIsUseHttpsWithSDC(); } - public String getAsdcAddress() { - return asdcAddress; - } - - public List<String> getMessageBusAddress() { - return messageBusAddress; + public String getSdcAddress() { + return sdcAddress; } public String getUser() { @@ -146,10 +138,6 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan return isFilterInEmptyResources; } - public boolean isUseHttpsWithDmaap() { - return isUseHttpsWithDmaap; - } - public boolean isUseHttpsWithSDC() { return isUseHttpsWithSDC; } @@ -176,7 +164,7 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan @Override public GroupValidationResult validate() { final GroupValidationResult validationResult = new GroupValidationResult(this); - validateStringElement(validationResult, asdcAddress, "asdcAddress"); + validateStringElement(validationResult, sdcAddress, "sdcAddress"); validateStringElement(validationResult, user, "user"); validateStringElement(validationResult, consumerId, "consumerId"); validateStringElement(validationResult, consumerGroup, "consumerGroup"); @@ -185,7 +173,6 @@ public class SdcReceptionHandlerConfigurationParameterGroup extends ReceptionHan validateIntElement(validationResult, pollingInterval, "pollingInterval"); validateIntElement(validationResult, pollingTimeout, "pollingTimeout"); validateIntElement(validationResult, retryDelay, "retryDelay"); - validateStringListElement(validationResult, messageBusAddress, "messageBusAddress"); validateStringListElement(validationResult, artifactTypes, "artifactTypes"); return validationResult; } |