X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=enrichment-coordinator-service%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fenrichment%2Fconfiguration%2FApplicationConfig.java;fp=enrichment-coordinator-service%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fenrichment%2Fconfiguration%2FApplicationConfig.java;h=0000000000000000000000000000000000000000;hb=c6916032d124066c6009e0db070a0cebb9c1ea5f;hp=5493fd80476681fb46c4e9485eab03e79891cc03;hpb=a28a4ad261601976c345425692116e5d7250b810;p=nonrtric.git

diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/configuration/ApplicationConfig.java b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/configuration/ApplicationConfig.java
deleted file mode 100644
index 5493fd80..00000000
--- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/configuration/ApplicationConfig.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * O-RAN-SC
- * %%
- * Copyright (C) 2020 Nordix Foundation
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================LICENSE_END===================================
- */
-
-package org.oransc.enrichment.configuration;
-
-import lombok.Getter;
-
-import org.oransc.enrichment.configuration.WebClientConfig.HttpProxyConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-
-@EnableConfigurationProperties
-@ConfigurationProperties()
-public class ApplicationConfig {
-
-    private static final Logger logger = LoggerFactory.getLogger(ApplicationConfig.class);
-
-    @Getter
-    @Value("${app.vardata-directory}")
-    private String vardataDirectory;
-
-    @Value("${server.ssl.key-store-type}")
-    private String sslKeyStoreType = "";
-
-    @Value("${server.ssl.key-store-password}")
-    private String sslKeyStorePassword = "";
-
-    @Value("${server.ssl.key-store}")
-    private String sslKeyStore = "";
-
-    @Value("${server.ssl.key-password}")
-    private String sslKeyPassword = "";
-
-    @Value("${app.webclient.trust-store-used}")
-    private boolean sslTrustStoreUsed = false;
-
-    @Value("${app.webclient.trust-store-password}")
-    private String sslTrustStorePassword = "";
-
-    @Value("${app.webclient.trust-store}")
-    private String sslTrustStore = "";
-
-    @Value("${app.webclient.http.proxy-host:\"\"}")
-    private String httpProxyHost = "";
-
-    @Value("${app.webclient.http.proxy-port:0}")
-    private int httpProxyPort = 0;
-
-    private WebClientConfig webClientConfig = null;
-
-    public WebClientConfig getWebClientConfig() {
-        if (this.webClientConfig == null) {
-            if (this.httpProxyPort == 0) {
-                logger.info("Http proxy is not used");
-            } else {
-                logger.info("Http proxy is used for RAN access {}:{}", httpProxyHost, httpProxyPort);
-            }
-            HttpProxyConfig httpProxyConfig = ImmutableHttpProxyConfig.builder() //
-                .httpProxyHost(this.httpProxyHost) //
-                .httpProxyPort(this.httpProxyPort) //
-                .build();
-            this.webClientConfig = ImmutableWebClientConfig.builder() //
-                .keyStoreType(this.sslKeyStoreType) //
-                .keyStorePassword(this.sslKeyStorePassword) //
-                .keyStore(this.sslKeyStore) //
-                .keyPassword(this.sslKeyPassword) //
-                .isTrustStoreUsed(this.sslTrustStoreUsed) //
-                .trustStore(this.sslTrustStore) //
-                .trustStorePassword(this.sslTrustStorePassword) //
-                .httpProxyConfig(httpProxyConfig) //
-                .build();
-        }
-        return this.webClientConfig;
-    }
-
-}