diff options
Diffstat (limited to 'aai-schema-ingest')
4 files changed, 1 insertions, 59 deletions
diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index f8ffe0c7..c9d19d12 100644 --- a/aai-schema-ingest/pom.xml +++ b/aai-schema-ingest/pom.xml @@ -106,10 +106,6 @@ limitations under the License. <artifactId>spring-webmvc</artifactId> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </dependency> diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceOneWayClient.java b/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceOneWayClient.java index 1f04bff1..33a50c44 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceOneWayClient.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceOneWayClient.java @@ -24,8 +24,6 @@ import java.util.Collections; import java.util.Map; import java.util.UUID; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -33,33 +31,15 @@ import org.springframework.util.MultiValueMap; public class SchemaServiceOneWayClient extends OneWaySSLRestClient { - private static Logger logger = LoggerFactory.getLogger(SchemaServiceOneWayClient.class); - @Value("${schema.service.base.url}") private String baseUrl; - @Value("${schema.service.ssl.trust-store}") - private String truststorePath; - - @Value("${schema.service.ssl.trust-store-password}") - private String truststorePassword; - @Override public String getBaseUrl() { return baseUrl; } @Override - protected String getTruststorePath() { - return truststorePath; - } - - @Override - protected char[] getTruststorePassword() { - return truststorePassword.toCharArray(); - } - - @Override public MultiValueMap<String, String> getHeaders(Map<String, String> headers) { HttpHeaders httpHeaders = new HttpHeaders(); diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceRestClient.java b/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceRestClient.java index f7bdf6d7..44ad9a37 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceRestClient.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceRestClient.java @@ -34,49 +34,16 @@ import org.springframework.http.MediaType; import org.springframework.util.MultiValueMap; public class SchemaServiceRestClient extends TwoWaySSLRestClient { - private static Logger logger = LoggerFactory.getLogger(SchemaServiceRestClient.class); @Value("${schema.service.base.url}") private String baseUrl; - @Value("${schema.service.ssl.key-store}") - private String keystorePath; - - @Value("${schema.service.ssl.trust-store}") - private String truststorePath; - - @Value("${schema.service.ssl.key-store-password}") - private String keystorePassword; - - @Value("${schema.service.ssl.trust-store-password}") - private String truststorePassword; - @Override public String getBaseUrl() { return baseUrl; } @Override - protected String getKeystorePath() { - return keystorePath; - } - - @Override - protected String getTruststorePath() { - return truststorePath; - } - - @Override - protected char[] getKeystorePassword() { - return keystorePassword.toCharArray(); - } - - @Override - protected char[] getTruststorePassword() { - return truststorePassword.toCharArray(); - } - - @Override public MultiValueMap<String, String> getHeaders(Map<String, String> headers) { HttpHeaders httpHeaders = new HttpHeaders(); diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/SchemaRestClientTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/SchemaRestClientTest.java index 743fe70d..96627c2c 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/SchemaRestClientTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/SchemaRestClientTest.java @@ -35,8 +35,7 @@ import org.springframework.test.context.TestPropertySource; @Disabled @TestPropertySource(locations = "/schemaService/schema-service-rest.properties") @ContextConfiguration( - classes = {RestClientFactoryConfiguration.class, SchemaServiceRestClient.class, RestClientFactory.class, - PropertyPasswordConfiguration.class}) + classes = {RestClientFactoryConfiguration.class, SchemaServiceRestClient.class, RestClientFactory.class}) @SpringBootTest public class SchemaRestClientTest { |