Remove unnecessary exceptions

Issue-ID: AAF-1152

Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: Ie343cd2e3006f9217db5b8454c060eb8c1d3e9e3

diff --git a/certServiceClient/README.md b/certServiceClient/README.md
index 5a1d2ad..849db4f 100644 (file)
--- a/certServiceClient/README.md
+++ b/certServiceClient/README.md
@@ -71,5 +71,3 @@ docker logs aaf-certservice-client
 7      Fail in PKCS12 conversion
 8      Fail in Private Key to PEM Encoding
 9      Wrong TLS configuration
-10     Invalid value of the OUTPUT_TYPE parameter
-11     Certificate creation type is not supported

diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitStatus.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitStatus.java
index 0005782..78ecc77 100644 (file)
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitStatus.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/api/ExitStatus.java
@@ -29,9 +29,7 @@ public enum ExitStatus {
     HTTP_CLIENT_EXCEPTION(6,"Internal HTTP Client connection problem"),
     PKCS12_CONVERSION_EXCEPTION(7,"Fail in PKCS12 conversion"),
     PK_TO_PEM_ENCODING_EXCEPTION(8,"Fail in Private Key to PEM Encoding"),
-    TLS_CONFIGURATION_EXCEPTION(9, "Invalid TLS configuration"),
-    OUTPUT_TYPE_PARAMETER_VALIDATION_EXCEPTION(10, "Invalid value of the OUTPUT_TYPE parameter"),
-    CERT_OUTPUT_TYPE_NOT_SUPPORTED_EXCEPTION(11, "Certificate creation type is not supported");
+    TLS_CONFIGURATION_EXCEPTION(9, "Invalid TLS configuration");
 
     private final int value;
     private final String message;

diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreatorProvider.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreatorProvider.java
index 6fbf373..ac1eda1 100644 (file)
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreatorProvider.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreatorProvider.java
@@ -18,12 +18,6 @@
  */
 package org.onap.aaf.certservice.client.certification.conversion;
 
-import org.onap.aaf.certservice.client.certification.exception.CertOutputTypeNotSupportedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-
 public enum ArtifactsCreatorProvider {
 
     P12 {
@@ -48,18 +42,8 @@ public enum ArtifactsCreatorProvider {
         }
     };
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ArtifactsCreatorProvider.class);
-
-    public static ArtifactsCreator getCreator(String outputType, String outputPath)
-            throws CertOutputTypeNotSupportedException {
-        try {
-            LOGGER.info("Artifact creation type selected: {}", outputType);
+    public static ArtifactsCreator getCreator(String outputType, String outputPath) {
             return valueOf(outputType).create(outputPath);
-        } catch (IllegalArgumentException e) {
-            LOGGER.error("Artifact creation type: {} is not supported. Supported types: {}",
-                    outputType, Arrays.toString(values()));
-            throw new CertOutputTypeNotSupportedException(e);
-        }
     }
 
     abstract ArtifactsCreator create(String outputPath);

diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CertOutputTypeNotSupportedException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CertOutputTypeNotSupportedException.java
deleted file mode 100644 (file)
index 3c9581a..0000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/CertOutputTypeNotSupportedException.java
+++ /dev/null
@@ -1,35 +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.certification.exception;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-public class CertOutputTypeNotSupportedException extends ExitableException {
-    private static final ExitStatus EXIT_STATUS = ExitStatus.CERT_OUTPUT_TYPE_NOT_SUPPORTED_EXCEPTION;
-
-    public CertOutputTypeNotSupportedException(Throwable e) {
-        super(e);
-    }
-
-    public ExitStatus applicationExitStatus() {
-        return EXIT_STATUS;
-    }
-}

diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/OutputTypeParameterValidationException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/OutputTypeParameterValidationException.java
deleted file mode 100644 (file)
index 2a80fda..0000000
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/certification/exception/OutputTypeParameterValidationException.java
+++ /dev/null
@@ -1,34 +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.certification.exception;
-
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
-
-public class OutputTypeParameterValidationException extends ExitableException {
-
-    public OutputTypeParameterValidationException(String paramValue) {
-        super(String.format("Invalid value of the OUTPUT_TYPE parameter : '%s'", paramValue));
-    }
-
-    @Override
-    public ExitStatus applicationExitStatus() {
-        return ExitStatus.OUTPUT_TYPE_PARAMETER_VALIDATION_EXCEPTION;
-    }
-}

diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreatorProviderTest.java b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreatorProviderTest.java
index eb57265..be00003 100644 (file)
--- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreatorProviderTest.java
+++ b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/certification/conversion/ArtifactsCreatorProviderTest.java
@@ -20,20 +20,17 @@
 package org.onap.aaf.certservice.client.certification.conversion;
 
 import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.client.certification.exception.CertOutputTypeNotSupportedException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 
 class ArtifactsCreatorProviderTest {
 
     private static final String STRATEGY_P12 = "P12";
     private static final String TEST_PATH = "testPath";
-    private static final String NOT_SUPPORTED_STRATEGY = "notSupported";
 
     @Test
-    void getStrategyOfStringShouldReturnCorrectCreator() throws Exception {
+    void getStrategyOfStringShouldReturnCorrectCreator(){
 
         // when
         ArtifactsCreator artifactsCreator =
@@ -41,12 +38,4 @@ class ArtifactsCreatorProviderTest {
         // then
         assertThat(artifactsCreator).isInstanceOf(PKCS12ArtifactsCreator.class);
     }
-
-    @Test
-    void notSupportedStrategyShouldThrowException() {
-        // when// then
-        assertThatExceptionOfType(CertOutputTypeNotSupportedException.class)
-                .isThrownBy(() -> ArtifactsCreatorProvider.getCreator(NOT_SUPPORTED_STRATEGY, TEST_PATH));
-
-    }
 }