Make aai-common agnostic of the embedded server (remove jetty-specific code)HEADmaster

- remove spring-boot-starter-[web,tomcat,jetty,jersey] in aai-rest
- remove spring-boot-starter-web in aai-schema-ingest
- remove keystore and certificate related leftovers
- this prepares the move to tomcat for the spring boot 3 upgrade (details in the ticket)

Issue-ID: AAI-4100
Change-Id: I04194c636f0548f7a832e430a40e48710ea4c00f
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

2 files changed, 0 insertions, 53 deletions

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();