From 5a6a6de6f1a26a1897e4917a0df613e25a24eb70 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Mon, 30 Jul 2018 15:56:09 -0400 Subject: Containerization feature of SO Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18 Issue-ID: SO-670 Signed-off-by: Benjamin, Max (mb388a) --- .../java/org/openecomp/mso/utils/CheckResults.java | 118 --------------------- .../java/org/openecomp/mso/utils/CryptoUtils.java | 95 ----------------- .../mso/utils/RootIgnoringJsonDeserializer.java | 67 ------------ .../mso/utils/RootIgnoringObjectMapper.java | 39 ------- .../java/org/openecomp/mso/utils/UUIDChecker.java | 80 -------------- 5 files changed, 399 deletions(-) delete mode 100644 common/src/main/java/org/openecomp/mso/utils/CheckResults.java delete mode 100644 common/src/main/java/org/openecomp/mso/utils/CryptoUtils.java delete mode 100644 common/src/main/java/org/openecomp/mso/utils/RootIgnoringJsonDeserializer.java delete mode 100644 common/src/main/java/org/openecomp/mso/utils/RootIgnoringObjectMapper.java delete mode 100644 common/src/main/java/org/openecomp/mso/utils/UUIDChecker.java (limited to 'common/src/main/java/org/openecomp/mso/utils') diff --git a/common/src/main/java/org/openecomp/mso/utils/CheckResults.java b/common/src/main/java/org/openecomp/mso/utils/CheckResults.java deleted file mode 100644 index ad0344d028..0000000000 --- a/common/src/main/java/org/openecomp/mso/utils/CheckResults.java +++ /dev/null @@ -1,118 +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.openecomp.mso.utils; - - - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "checkresults") -public class CheckResults { - - @XmlElement(name = "checkresult") - private List results; - - public CheckResults () { - results = new ArrayList<>(); - } - - public List getResults () { - return results; - } - - public void addHostCheckResult (String hostname, int state, String output) { - CheckResult newResult = new CheckResult (); - newResult.setType ("host"); - newResult.setHostname (hostname); - newResult.setState (state); - newResult.setOutput (output); - results.add (newResult); - } - - public void addServiceCheckResult (String hostname, String servicename, int state, String output) { - CheckResult newResult = new CheckResult (); - newResult.setType ("service"); - newResult.setHostname (hostname); - newResult.setServicename (servicename); - newResult.setState (state); - newResult.setOutput (output); - results.add (newResult); - } - - public static class CheckResult { - - private String type; - private String hostname; - private String servicename; - private int state; - private String output; - - @XmlAttribute(required = true) - public String getType () { - return type; - } - - public void setType (String type) { - this.type = type; - } - - @XmlElement(required = true) - public String getHostname () { - return hostname; - } - - public void setHostname (String hostname) { - this.hostname = hostname; - } - - @XmlElement(required = false) - public String getServicename () { - return servicename; - } - - public void setServicename (String servicename) { - this.servicename = servicename; - } - - @XmlElement(required = true) - public int getState () { - return state; - } - - public void setState (int state) { - this.state = state; - } - - @XmlElement(required = true) - public String getOutput () { - return output; - } - - public void setOutput (String output) { - this.output = output; - } - } -} diff --git a/common/src/main/java/org/openecomp/mso/utils/CryptoUtils.java b/common/src/main/java/org/openecomp/mso/utils/CryptoUtils.java deleted file mode 100644 index 5d0ff5b79e..0000000000 --- a/common/src/main/java/org/openecomp/mso/utils/CryptoUtils.java +++ /dev/null @@ -1,95 +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.openecomp.mso.utils; - - - -import java.io.IOException; -import java.security.GeneralSecurityException; -import java.security.NoSuchAlgorithmException; - -import javax.crypto.Cipher; -import javax.crypto.spec.SecretKeySpec; - - -/** - * CryptoUtils adapted from RTTP client. - * - */ -public final class CryptoUtils { - - public static final String AES = "AES"; - - /** - * encrypt a value and generate a keyfile - * if the keyfile is not found then a new one is created - * - * @throws GeneralSecurityException - */ - public static String encrypt (String value, String keyString) throws GeneralSecurityException { - SecretKeySpec sks = getSecretKeySpec (keyString); - Cipher cipher = Cipher.getInstance (CryptoUtils.AES); - cipher.init (Cipher.ENCRYPT_MODE, sks, cipher.getParameters ()); - byte[] encrypted = cipher.doFinal (value.getBytes ()); - return byteArrayToHexString (encrypted); - } - - /** - * decrypt a value - * - * @throws GeneralSecurityException - */ - public static String decrypt (String message, String keyString) throws GeneralSecurityException { - SecretKeySpec sks = getSecretKeySpec (keyString); - Cipher cipher = Cipher.getInstance (CryptoUtils.AES); - cipher.init (Cipher.DECRYPT_MODE, sks); - byte[] decrypted = cipher.doFinal (hexStringToByteArray (message)); - return new String (decrypted); - } - - private static SecretKeySpec getSecretKeySpec (String keyString) throws NoSuchAlgorithmException { - byte[] key = hexStringToByteArray (keyString); - SecretKeySpec sks = new SecretKeySpec (key, CryptoUtils.AES); - return sks; - } - - public static String byteArrayToHexString (byte[] b) { - StringBuilder sb = new StringBuilder(b.length * 2); - for (byte aB : b) { - int v = aB & 0xff; - if (v < 16) { - sb.append('0'); - } - sb.append(Integer.toHexString(v)); - } - return sb.toString ().toUpperCase (); - } - - private static byte[] hexStringToByteArray (String s) { - byte[] b = new byte[s.length () / 2]; - for (int i = 0; i < b.length; i++) { - int index = i * 2; - int v = Integer.parseInt (s.substring (index, index + 2), 16); - b[i] = (byte) v; - } - return b; - } -} diff --git a/common/src/main/java/org/openecomp/mso/utils/RootIgnoringJsonDeserializer.java b/common/src/main/java/org/openecomp/mso/utils/RootIgnoringJsonDeserializer.java deleted file mode 100644 index 95f72c4dd4..0000000000 --- a/common/src/main/java/org/openecomp/mso/utils/RootIgnoringJsonDeserializer.java +++ /dev/null @@ -1,67 +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.openecomp.mso.utils; - -import java.io.IOException; -import java.util.Map; - -import com.fasterxml.jackson.annotation.JsonRootName; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; - -/** - * A JSON deserializer that ignores the root element if it is present. - */ -public class RootIgnoringJsonDeserializer extends JsonDeserializer { - - private final ObjectMapper mapper = new ObjectMapper(); - private final Class clazz; - private final String jsonRootName; - - public RootIgnoringJsonDeserializer(Class clazz) { - this.clazz = clazz; - - JsonRootName annotation = clazz.getAnnotation(JsonRootName.class); - - if (annotation == null || annotation.value() == null || annotation.value().equals("")) { - jsonRootName = clazz.getSimpleName(); - } else { - jsonRootName = annotation.value(); - } - } - - @Override - public T deserialize(JsonParser jp, DeserializationContext dc) - throws IOException, JsonProcessingException { - JsonNode rootNode = jp.getCodec().readTree(jp); - Map.Entry field = rootNode.fields().next(); - - if (jsonRootName.equals(field.getKey())) { - rootNode = field.getValue(); - } - - return mapper.convertValue(rootNode, clazz); - } -} \ No newline at end of file diff --git a/common/src/main/java/org/openecomp/mso/utils/RootIgnoringObjectMapper.java b/common/src/main/java/org/openecomp/mso/utils/RootIgnoringObjectMapper.java deleted file mode 100644 index 6f3c5b7d99..0000000000 --- a/common/src/main/java/org/openecomp/mso/utils/RootIgnoringObjectMapper.java +++ /dev/null @@ -1,39 +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.openecomp.mso.utils; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; - -/** - * An ObjectMapper for a specific class that ignores the root element - * if it is present. - */ -public class RootIgnoringObjectMapper extends ObjectMapper { - - private static final long serialVersionUID = 6812584067195377395L; - - public RootIgnoringObjectMapper(Class clazz) { - SimpleModule module = new SimpleModule(); - module.addDeserializer(clazz, new RootIgnoringJsonDeserializer(clazz)); - registerModule(module); - } -} \ No newline at end of file diff --git a/common/src/main/java/org/openecomp/mso/utils/UUIDChecker.java b/common/src/main/java/org/openecomp/mso/utils/UUIDChecker.java deleted file mode 100644 index b715717924..0000000000 --- a/common/src/main/java/org/openecomp/mso/utils/UUIDChecker.java +++ /dev/null @@ -1,80 +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. - * ================================================================================ - * 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.openecomp.mso.utils; - -import org.openecomp.mso.logger.MessageEnum; -import org.openecomp.mso.logger.MsoLogger; - -import java.util.UUID; - -/** - */ -public class UUIDChecker { - - private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.GENERAL); - - private UUIDChecker() { - - } - - public static boolean isValidUUID (String id) { - try { - if (null == id) { - return false; - } - UUID uuid = UUID.fromString(id); - return uuid.toString().equalsIgnoreCase(id); - } catch (IllegalArgumentException iae) { - LOGGER.debug("IllegalArgumentException", iae); - return false; - } - } - - private static String getUUID () { - return UUID.randomUUID().toString(); - } - - public static String verifyOldUUID (String oldId, MsoLogger msoLogger) { - if (!UUIDChecker.isValidUUID(oldId)) { - String newId = UUIDChecker.getUUID(); - MsoLogger.setLogContext(newId, null); - msoLogger.info(MessageEnum.APIH_REPLACE_REQUEST_ID, oldId, "", ""); - return newId; - } - MsoLogger.setLogContext(oldId, null); - return oldId; - } - - public static String generateUUID (MsoLogger msoLogger) { - String newId = UUIDChecker.getUUID(); - MsoLogger.setLogContext(newId, null); - msoLogger.info(MessageEnum.APIH_GENERATED_REQUEST_ID, newId, "", ""); - return newId; - } - - public static String generateServiceInstanceID (MsoLogger msoLogger) { - String newId = UUIDChecker.getUUID(); - MsoLogger.setLogContext(null, newId); - msoLogger.info(MessageEnum.APIH_GENERATED_SERVICE_INSTANCE_ID, newId, "", ""); - return newId; - } -} -- cgit 1.2.3-korg