aboutsummaryrefslogtreecommitdiffstats
path: root/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model
diff options
context:
space:
mode:
authorbaniewsk <pawel.baniewski@nokia.com>2020-07-29 16:01:27 +0200
committerPawel <pawel.kasperkiewicz@nokia.com>2020-08-05 14:18:54 +0200
commitb8c4e6867d6b26652f4382e93665c220769cdc9f (patch)
treebb60a44b012731e3ee6fdffe2466f5ed7d6b5c7b /certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model
parentfc31c9e47b3e08f8914dcd1f0c5b6d18aa625567 (diff)
Removing AAF references from Cert-Service in OOM repo.
Certificates regenerated External files (from legacy AAF) removed Still left: * Sonar link, * Link to documentation, * Names of K8s resources in RTD documentation, * Link to CSITs Issue-ID: OOM-2526 Signed-off-by: Pawel Baniewski <pawel.baniewski@nokia.com> Change-Id: I675f7485160b9b8e46e9ea573550e62ed28ca607
Diffstat (limited to 'certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model')
-rw-r--r--certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java99
-rw-r--r--certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ConfigurationModel.java24
-rw-r--r--certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/CsrConfiguration.java111
3 files changed, 0 insertions, 234 deletions
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java
deleted file mode 100644
index 78fa1b4b..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ClientConfiguration.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
- * ================================================================================
- * 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.onap.aaf.certservice.client.configuration.model;
-
-import org.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs;
-
-public class ClientConfiguration implements ConfigurationModel {
-
- private static final Integer DEFAULT_TIMEOUT_MS = 30000;
- private static final String DEFAULT_REQUEST_URL = "https://aaf-cert-service:8443/v1/certificate/";
- private static final String DEFAULT_OUTPUT_TYPE = "P12";
-
- private String urlToCertService;
- private Integer requestTimeout;
- private String certsOutputPath;
- private String caName;
- private String outputType;
-
-
- public ClientConfiguration() {
- urlToCertService = DEFAULT_REQUEST_URL;
- requestTimeout = DEFAULT_TIMEOUT_MS;
- outputType = DEFAULT_OUTPUT_TYPE;
- }
-
-
- public String getUrlToCertService() {
- return urlToCertService;
- }
-
- public ClientConfiguration setUrlToCertService(String urlToCertService) {
- this.urlToCertService = urlToCertService;
- return this;
- }
-
- public Integer getRequestTimeout() {
- return requestTimeout;
- }
-
- public ClientConfiguration setRequestTimeout(Integer requestTimeout) {
- this.requestTimeout = requestTimeout;
- return this;
- }
-
- public String getCertsOutputPath() {
- return certsOutputPath;
- }
-
- public ClientConfiguration setCertsOutputPath(String certsOutputPath) {
- this.certsOutputPath = certsOutputPath;
- return this;
- }
-
- public String getCaName() {
- return caName;
- }
-
- public ClientConfiguration setCaName(String caName) {
- this.caName = caName;
- return this;
- }
-
- public String getOutputType() {
- return outputType;
- }
-
- public ClientConfiguration setOutputType(String outputType) {
- this.outputType = outputType;
- return this;
- }
-
- @Override
- public String toString() {
- return String.format("%s: %s, %s: %s, %s: %s, %s: %s, %s: %s",
- ClientConfigurationEnvs.REQUEST_URL, urlToCertService,
- ClientConfigurationEnvs.REQUEST_TIMEOUT, requestTimeout,
- ClientConfigurationEnvs.OUTPUT_PATH, certsOutputPath,
- ClientConfigurationEnvs.CA_NAME, caName,
- ClientConfigurationEnvs.OUTPUT_TYPE, outputType);
- }
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ConfigurationModel.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ConfigurationModel.java
deleted file mode 100644
index 15c22233..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/ConfigurationModel.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
- * ================================================================================
- * 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.onap.aaf.certservice.client.configuration.model;
-
-public interface ConfigurationModel {
-}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/CsrConfiguration.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/CsrConfiguration.java
deleted file mode 100644
index 55f33c9f..00000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/model/CsrConfiguration.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * aaf-certservice-client
- * ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
- * ================================================================================
- * 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.onap.aaf.certservice.client.configuration.model;
-
-
-import org.onap.aaf.certservice.client.configuration.CsrConfigurationEnvs;
-
-public class CsrConfiguration implements ConfigurationModel {
-
- private String commonName;
- private String organization;
- private String state;
- private String country;
- private String organizationUnit;
- private String location;
- private String sans;
-
-
- public String getCommonName() {
- return commonName;
- }
-
- public CsrConfiguration setCommonName(String commonName) {
- this.commonName = commonName;
- return this;
- }
-
- public String getOrganization() {
- return organization;
- }
-
- public CsrConfiguration setOrganization(String organization) {
- this.organization = organization;
- return this;
- }
-
- public String getState() {
- return state;
- }
-
- public CsrConfiguration setState(String state) {
- this.state = state;
- return this;
- }
-
- public String getCountry() {
- return country;
- }
-
- public CsrConfiguration setCountry(String country) {
- this.country = country;
- return this;
- }
-
- public String getOrganizationUnit() {
- return organizationUnit;
- }
-
- public CsrConfiguration setOrganizationUnit(String organizationUnit) {
- this.organizationUnit = organizationUnit;
- return this;
- }
-
- public String getLocation() {
- return location;
- }
-
- public CsrConfiguration setLocation(String location) {
- this.location = location;
- return this;
- }
-
- public String getSans() {
- return sans;
- }
-
- public CsrConfiguration setSubjectAlternativeNames(String subjectAlternativeNames) {
- this.sans = subjectAlternativeNames;
- return this;
- }
-
- @Override
- public String toString() {
- return String.format("%s: %s, %s: %s, %s: %s, %s: %s, %s: %s, %s: %s, %s: %s",
- CsrConfigurationEnvs.COMMON_NAME, commonName,
- CsrConfigurationEnvs.COUNTRY, country,
- CsrConfigurationEnvs.STATE, state,
- CsrConfigurationEnvs.ORGANIZATION, organization,
- CsrConfigurationEnvs.ORGANIZATION_UNIT, organizationUnit,
- CsrConfigurationEnvs.LOCATION, location,
- CsrConfigurationEnvs.SANS, sans);
- }
-}