Merge "Removed unused CryptoHandler, ICryptoHandler and CryptoHandlerTest classes"

3 files changed, 0 insertions, 159 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/CryptoHandler.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/CryptoHandler.java
deleted file mode 100644
index 5c0406cc9e..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/CryptoHandler.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * 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.so.bpmn.common.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.util.Properties;
-import org.onap.so.utils.CryptoUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CryptoHandler implements ICryptoHandler {
-    private static final Logger logger = LoggerFactory.getLogger(CryptoHandler.class);
-    private static final String GENERAL_SECURITY_EXCEPTION_PREFIX = "GeneralSecurityException :";
-    private static final String MSO_KEY = "aa3871669d893c7fb8abbcda31b88b4f";
-    private static final String PROPERTY_KEY = "mso.AaiEncrypted.Pwd";
-
-    @Override
-    public String getMsoAaiPassword() {
-        Properties keyProp = new Properties();
-        try {
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            InputStream rs = cl.getResourceAsStream("urn.properties");
-            keyProp.load(rs);
-            rs.close();
-            return CryptoUtils.decrypt((String) keyProp.get(PROPERTY_KEY), MSO_KEY);
-        } catch (GeneralSecurityException | IOException e) {
-            logger.error(GENERAL_SECURITY_EXCEPTION_PREFIX + e.getMessage(), e);
-            return null;
-        }
-    }
-
-
-    @Override
-    public String encryptMsoPassword(String plainMsoPwd) {
-        try {
-            return CryptoUtils.encrypt(plainMsoPwd, MSO_KEY);
-        } catch (GeneralSecurityException e) {
-            logger.error(GENERAL_SECURITY_EXCEPTION_PREFIX + e.getMessage(), e);
-            return null;
-        }
-    }
-
-    @Override
-    public String decryptMsoPassword(String encryptedPwd) {
-        try {
-            return CryptoUtils.decrypt(encryptedPwd, MSO_KEY);
-        } catch (GeneralSecurityException e) {
-            logger.error(GENERAL_SECURITY_EXCEPTION_PREFIX + e.getMessage(), e);
-            return null;
-        }
-    }
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/ICryptoHandler.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/ICryptoHandler.java
deleted file mode 100644
index 479d2e82bd..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/ICryptoHandler.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.so.bpmn.common.util;
-
-public interface ICryptoHandler {
-    public String getMsoAaiPassword();
-
-    public String encryptMsoPassword(String plainPwd);
-
-    public String decryptMsoPassword(String encryptedPwd);
-}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/util/CryptoHandlerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/util/CryptoHandlerTest.java
deleted file mode 100644
index 273e9f0e3c..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/util/CryptoHandlerTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. 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.so.bpmn.common.util;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class CryptoHandlerTest {
-    private static final String plainPswd = "mso0206";
-    private CryptoHandler cryptoHandler;
-    private static String encryptPwd;
-
-
-    @Before
-    public void setup() {
-        cryptoHandler = new CryptoHandler();
-        encryptPwd = cryptoHandler.encryptMsoPassword(plainPswd);
-    }
-
-    @Test
-    @Ignore // ignored until we can mock the properties file.
-    public void getMsoAaiPasswordTest() {
-        assertEquals(plainPswd, cryptoHandler.getMsoAaiPassword());
-    }
-
-    @Test
-    public void encryptMsoPasswordTest() {
-        assertEquals(plainPswd, cryptoHandler.decryptMsoPassword(cryptoHandler.encryptMsoPassword(plainPswd)));
-    }
-
-    @Test
-    public void decryptMsoPasswordTest() {
-        assertEquals(plainPswd, cryptoHandler.decryptMsoPassword(encryptPwd));
-    }
-}