From dd8e93b4d33b288f45e3396ed01376827d3530ab Mon Sep 17 00:00:00 2001 From: "Tait,Trevor(rt0435)" Date: Tue, 9 Oct 2018 11:54:38 -0400 Subject: Remove pact-jvm-provider-junit-2.11 artifact POMBA SDC Context Builder uses pact-jvm-provider-junit-2.11 artifact (bad license). Removed this unused artifact from the pom.xml and other unused code from the project. Issue-ID: LOG-747 Change-Id: If33cd95d5a16ae8a8c6ddf0f297e74ebbd4b2528 Signed-off-by: Tait,Trevor(rt0435) --- pom.xml | 6 ------ .../pomba/contextbuilder/sdc/SDCContextConfig.java | 20 -------------------- .../sdc/exception/ToscaCsarException.java | 11 ----------- .../sdc/model/handlers/ToscaCsarArtifactHandler.java | 2 -- 4 files changed, 39 deletions(-) diff --git a/pom.xml b/pom.xml index b81acaa..36af36a 100644 --- a/pom.xml +++ b/pom.xml @@ -104,12 +104,6 @@ org.eclipse.jetty jetty-security - - au.com.dius - pact-jvm-provider-junit_2.11 - 3.5.11 - - io.swagger swagger-core diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java index e44ab0a..a5ec9bc 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java @@ -44,10 +44,6 @@ public class SDCContextConfig implements IConfiguration { return msgBusAddress; } - public void setMsgBusAddress(List msgBusAddress) { - this.msgBusAddress = msgBusAddress; - } - @Override public String getAsdcAddress() { @@ -116,19 +112,11 @@ public class SDCContextConfig implements IConfiguration { return relevantArtifactTypes; } - public void setRelevantArtifactTypes(List relevantArtifactTypes) { - this.relevantArtifactTypes = relevantArtifactTypes; - } - @Override public int getPollingInterval() { return pollingInterval; } - public void setPollingInterval(int pollingInterval) { - this.pollingInterval = pollingInterval; - } - @Override public String getConsumerGroup() { return consumerGroup; @@ -143,10 +131,6 @@ public class SDCContextConfig implements IConfiguration { return keyStorePath; } - public void setKeyStorePath(String keyStorePath) { - this.keyStorePath = keyStorePath; - } - public boolean activateServerTLSAuth() { return activateServerTLSAuth; } @@ -160,10 +144,6 @@ public class SDCContextConfig implements IConfiguration { return isFilterInEmptyResources; } - public void setFilterInEmptyResources(boolean filterInEmptyResources) { - isFilterInEmptyResources = filterInEmptyResources; - } - @Override public Boolean isUseHttpsWithDmaap() { return useHttpsWithDmaap; diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/exception/ToscaCsarException.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/exception/ToscaCsarException.java index 624ee58..bdfcb4c 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdc/exception/ToscaCsarException.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/exception/ToscaCsarException.java @@ -59,17 +59,6 @@ public class ToscaCsarException extends Exception { httpStatus = Status.INTERNAL_SERVER_ERROR; } - /** - * Constructor for an instance of this exception with a message, status and actual exception encountered. - * @param httpStatus - * @param message - * @param cause - */ - public ToscaCsarException(Status httpStatus, String message, Throwable cause) { - super(message, cause); - this.errorMessage = message; - this.httpStatus = httpStatus; - } public Status getStatus() { return httpStatus; diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java index 14079a8..bea574f 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java @@ -20,7 +20,6 @@ package org.onap.pomba.contextbuilder.sdc.model.handlers; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import groovy.util.logging.Slf4j; import java.io.IOException; import java.io.OutputStream; import java.nio.file.Files; @@ -45,7 +44,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -@Slf4j @Component("ToscaCsarArtifactHandler") public class ToscaCsarArtifactHandler { -- cgit 1.2.3-korg