From 5c68a5e95f542694129639f173d1572694987040 Mon Sep 17 00:00:00 2001 From: sebdet Date: Wed, 11 Sep 2019 15:08:34 +0200 Subject: [PATCH] Remove dead code Removal of useless code related to v1 model Issue-ID: CLAMP-487 Change-Id: Ia12f21b30e3d81e475a65e507ee02291548dd7f8 Signed-off-by: sebdet --- .../sdc/BlueprintParserFilesConfiguration.java | 52 ---------------- .../sdc/BlueprintParserMappingConfiguration.java | 71 ---------------------- .../clamp/clds/exception/ModelBpmnException.java | 62 ------------------- .../clds/exception/ModelPropertiesException.java | 61 ------------------- .../exception/TcaRequestFormatterException.java | 63 ------------------- .../exception/policy/PolicyClientException.java | 61 ------------------- .../exception/sdc/SdcCommunicationException.java | 61 ------------------- 7 files changed, 431 deletions(-) delete mode 100644 src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java delete mode 100644 src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java delete mode 100644 src/main/java/org/onap/clamp/clds/exception/ModelBpmnException.java delete mode 100644 src/main/java/org/onap/clamp/clds/exception/ModelPropertiesException.java delete mode 100644 src/main/java/org/onap/clamp/clds/exception/TcaRequestFormatterException.java delete mode 100644 src/main/java/org/onap/clamp/clds/exception/policy/PolicyClientException.java delete mode 100644 src/main/java/org/onap/clamp/clds/exception/sdc/SdcCommunicationException.java diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java b/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java deleted file mode 100644 index 380d10f8..00000000 --- a/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java +++ /dev/null @@ -1,52 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * 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.clamp.clds.config.sdc; - -/** - * This class is used to decode the configuration found in - * application.properties, this is related to the blueprint mapping - * configuration that is used to create data in database, according to the - * blueprint content coming from SDC. - */ -public class BlueprintParserFilesConfiguration { - - private String svgXmlFilePath; - private String bpmnXmlFilePath; - - public String getBpmnXmlFilePath() { - return bpmnXmlFilePath; - } - - public void setBpmnXmlFilePath(String bpmnXmlFilePath) { - this.bpmnXmlFilePath = bpmnXmlFilePath; - } - - public String getSvgXmlFilePath() { - return svgXmlFilePath; - } - - public void setSvgXmlFilePath(String svgXmlFilePath) { - this.svgXmlFilePath = svgXmlFilePath; - } -} diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java b/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java deleted file mode 100644 index 20d5d697..00000000 --- a/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java +++ /dev/null @@ -1,71 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * 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.clamp.clds.config.sdc; - -import com.google.gson.reflect.TypeToken; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.lang.reflect.Type; -import java.nio.charset.StandardCharsets; -import java.util.List; -import org.onap.clamp.clds.util.JsonUtils; - -/** - * This class is used to decode the configuration found in - * application.properties, this is related to the blueprint mapping - * configuration that is used to create data in database, according to the - * blueprint content coming from SDC. - */ -public class BlueprintParserMappingConfiguration { - - private static final Type BLUEPRINT_MAP_CONF_TYPE = new TypeToken>() { - }.getType(); - private String blueprintKey; - private boolean dcaeDeployable; - private BlueprintParserFilesConfiguration files; - - public String getBlueprintKey() { - return blueprintKey; - } - - public void setBlueprintKey(String blueprintKey) { - this.blueprintKey = blueprintKey; - } - - public BlueprintParserFilesConfiguration getFiles() { - return files; - } - - public void setFiles(BlueprintParserFilesConfiguration filesConfig) { - this.files = filesConfig; - } - - public boolean isDcaeDeployable() { - return dcaeDeployable; - } - - public static List createFromJson(InputStream json) { - return JsonUtils.GSON.fromJson(new InputStreamReader(json, StandardCharsets.UTF_8), BLUEPRINT_MAP_CONF_TYPE); - } -} diff --git a/src/main/java/org/onap/clamp/clds/exception/ModelBpmnException.java b/src/main/java/org/onap/clamp/clds/exception/ModelBpmnException.java deleted file mode 100644 index 5892dfc5..00000000 --- a/src/main/java/org/onap/clamp/clds/exception/ModelBpmnException.java +++ /dev/null @@ -1,62 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * 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.clamp.clds.exception; - -/** - * The exception used in case of issues when decoding the ModelBpmn JSON - * generated by the Designer UI (Converted from XML to JSON by XSLT in the - * code). - * - * - */ -public class ModelBpmnException extends RuntimeException { - /** - * Generated ID. - */ - private static final long serialVersionUID = 8452294782552680244L; - - /** - * This constructor can be used to create a new ModelBpmnException. - * - * @param message - * A string message detailing the problem - * @param ex - * The exception sent by the code - */ - public ModelBpmnException(String message, Throwable ex) { - super(message, ex); - } - - /** - * This constructor can be used to create a new ModelBpmnException. Use this - * constructor only if you are creating a new exception stack, not if an - * exception was already raised by another code. - * - * @param message - * A string message detailing the problem - */ - public ModelBpmnException(String message) { - super(message); - } -} diff --git a/src/main/java/org/onap/clamp/clds/exception/ModelPropertiesException.java b/src/main/java/org/onap/clamp/clds/exception/ModelPropertiesException.java deleted file mode 100644 index 8d474fc0..00000000 --- a/src/main/java/org/onap/clamp/clds/exception/ModelPropertiesException.java +++ /dev/null @@ -1,61 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * 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.clamp.clds.exception; - -/** - * The exception used in case of issues when decoding the ModelProperties JSON - * generated by the Designer UI. - * - * - */ -public class ModelPropertiesException extends RuntimeException { - /** - * Generated ID. - */ - private static final long serialVersionUID = 8452294782552680344L; - - /** - * This constructor can be used to create a new ModelPropertiesException. - * - * @param message - * A string message detailing the problem - * @param ex - * The exception sent by the code - */ - public ModelPropertiesException(String message, Throwable ex) { - super(message, ex); - } - - /** - * This constructor can be used to create a new ModelPropertiesException. - * Use this constructor only if you are creating a new exception stack, not - * if an exception was already raised by another code. - * - * @param message - * A string message detailing the problem - */ - public ModelPropertiesException(String message) { - super(message); - } -} diff --git a/src/main/java/org/onap/clamp/clds/exception/TcaRequestFormatterException.java b/src/main/java/org/onap/clamp/clds/exception/TcaRequestFormatterException.java deleted file mode 100644 index 3bfb5ea7..00000000 --- a/src/main/java/org/onap/clamp/clds/exception/TcaRequestFormatterException.java +++ /dev/null @@ -1,63 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * 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.clamp.clds.exception; - -/** - * New exception to capture TcaRequestFormatterException errors. - * - */ -public class TcaRequestFormatterException extends RuntimeException { - - /** - * The serial version ID. - */ - private static final long serialVersionUID = 169875373143236667L; - - /** - * This constructor can be used to create a new - * TcaRequestFormatterException. - * - * @param message - * A string message detailing the problem - * @param ex - * The exception sent by the code - */ - public TcaRequestFormatterException(String message, Throwable ex) { - super(message, ex); - } - - /** - * This constructor can be used to create a new - * TcaRequestFormatterException. Use this constructor only if you are - * creating a new exception stack, not if an exception was already raised by - * another code. - * - * @param message - * A string message detailing the problem - */ - public TcaRequestFormatterException(String message) { - super(message); - } - -} diff --git a/src/main/java/org/onap/clamp/clds/exception/policy/PolicyClientException.java b/src/main/java/org/onap/clamp/clds/exception/policy/PolicyClientException.java deleted file mode 100644 index 06dcdbf0..00000000 --- a/src/main/java/org/onap/clamp/clds/exception/policy/PolicyClientException.java +++ /dev/null @@ -1,61 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * 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.clamp.clds.exception.policy; - -/** - * New exception to Policy Client errors. - * - */ -public class PolicyClientException extends RuntimeException { - - /** - * Serial ID. - */ - private static final long serialVersionUID = -8379167975420213634L; - - /** - * This constructor can be used to create a new PolicyClientException. - * - * @param message - * A string message detailing the problem - * @param ex - * The exception sent by the code - */ - public PolicyClientException(String message, Throwable ex) { - super(message, ex); - } - - /** - * This constructor can be used to create a new PolicyClientException. Use - * this constructor only if you are creating a new exception stack, not if - * an exception was already raised by another code. - * - * @param message - * A string message detailing the problem - */ - public PolicyClientException(String message) { - super(message); - } - -} diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/SdcCommunicationException.java b/src/main/java/org/onap/clamp/clds/exception/sdc/SdcCommunicationException.java deleted file mode 100644 index b70b1140..00000000 --- a/src/main/java/org/onap/clamp/clds/exception/sdc/SdcCommunicationException.java +++ /dev/null @@ -1,61 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * 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.clamp.clds.exception.sdc; - -/** - * New exception to capture SDC communication errors. - * - */ -public class SdcCommunicationException extends RuntimeException { - - /** - * Generated ID. - */ - private static final long serialVersionUID = 8452294782552680243L; - - /** - * This constructor can be used to create a new SdcCommunicationException. - * - * @param message - * A string message detailing the problem - * @param ex - * The exception sent by the code - */ - public SdcCommunicationException(String message, Throwable ex) { - super(message, ex); - } - - /** - * This constructor can be used to create a new SdcCommunicationException. - * Use this constructor only if you are creating a new exception stack, not - * if an exception was already raised by another code. - * - * @param message - * A string message detailing the problem - */ - public SdcCommunicationException(String message) { - super(message); - } - -} -- 2.16.6