From 280f8015d06af1f41a3ef12e8300801c7a5e0d54 Mon Sep 17 00:00:00 2001 From: AviZi Date: Fri, 9 Jun 2017 02:39:56 +0300 Subject: [SDC-29] Amdocs OnBoard 1707 initial commit. Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370 Signed-off-by: AviZi --- .../lib/openecomp-sdc-datatypes-lib/pom.xml | 22 ++++---- .../pom.xml.versionsBackup | 39 ++++++++++++++ .../configuration/ImplementationConfiguration.java | 63 ++++++++++++++++++++++ .../openecomp/sdc/datatypes/error/ErrorLevel.java | 1 + .../sdc/datatypes/error/ErrorMessage.java | 15 +++--- .../model/heat/ForbiddenHeatResourceTypes.java | 1 + 6 files changed, 125 insertions(+), 16 deletions(-) create mode 100644 openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml.versionsBackup create mode 100644 openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/configuration/ImplementationConfiguration.java (limited to 'openecomp-be/lib/openecomp-sdc-datatypes-lib') diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml index ba4bb19b94..b713a10721 100644 --- a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml @@ -2,37 +2,41 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + openecomp-sdc-datatypes-lib + openecomp-sdc-datatypes-lib + openecomp-sdc-lib org.openecomp.sdc 1.1.0-SNAPSHOT + .. - openecomp-sdc-datatypes-lib - openecomp-sdc-datatypes-lib - org.apache.commons commons-collections4 - 4.1 + ${commons.collections.version} org.codehaus.jackson jackson-mapper-asl - 1.9.13 + ${jackson.mapper.version} io.swagger swagger-annotations - 1.5.3 + ${swagger.version} commons-lang commons-lang ${commons.lang.version} + + org.openecomp.sdc.common + openecomp-configuration-management-api + ${openecomp.sdc.common.version} + - - - \ No newline at end of file + diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml.versionsBackup b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml.versionsBackup new file mode 100644 index 0000000000..9e29da0ee6 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml.versionsBackup @@ -0,0 +1,39 @@ + + 4.0.0 + + openecomp-sdc-datatypes-lib + + + org.apache.commons + commons-collections4 + 4.1 + + + org.codehaus.jackson + jackson-mapper-asl + 1.9.13 + + + io.swagger + swagger-annotations + 1.5.3 + + + commons-lang + commons-lang + 2.5 + + + org.openecomp.sdc.common + openecomp-configuration-management-api + 1707.0.0-SNAPSHOT + + + openecomp-sdc-datatypes-lib + + openecomp-sdc-lib + org.openecomp.sdc + 1.0-SNAPSHOT + + \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/configuration/ImplementationConfiguration.java b/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/configuration/ImplementationConfiguration.java new file mode 100644 index 0000000000..89917fc73f --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/configuration/ImplementationConfiguration.java @@ -0,0 +1,63 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * 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.sdc.datatypes.configuration; + +import org.openecomp.config.api.Config; + +import java.util.Map; + +/** + * @author shiria + * @since November 30, 2016. + */ +@Config +public class ImplementationConfiguration { + @Config(key = "enable") + Boolean enable = true; + @Config(key = "implementationClass") + String implementationClass; + @Config(key = "properties") + Map properties; + + public Boolean isEnable() { + return enable; + } + + public void setEnable(Boolean enable) { + this.enable = enable; + } + + public String getImplementationClass() { + return implementationClass; + } + + public void setImplementationClass(String implementationClass) { + this.implementationClass = implementationClass; + } + + public Map getProperties() { + return properties; + } + + public void setProperties(Map properties) { + this.properties = properties; + } +} diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/error/ErrorLevel.java b/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/error/ErrorLevel.java index 44b0733388..5477a35d8f 100644 --- a/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/error/ErrorLevel.java +++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/error/ErrorLevel.java @@ -20,6 +20,7 @@ package org.openecomp.sdc.datatypes.error; + public enum ErrorLevel { ERROR, WARNING, INFO } diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/error/ErrorMessage.java b/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/error/ErrorMessage.java index 29a443c1a0..3ec5f8436b 100644 --- a/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/error/ErrorMessage.java +++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/error/ErrorMessage.java @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; + public class ErrorMessage { private final ErrorLevel level; private final String message; @@ -43,6 +44,13 @@ public class ErrorMessage { return message; } + @Override + public int hashCode() { + int result = level.hashCode(); + result = 31 * result + message.hashCode(); + return result; + } + @Override public boolean equals(Object object) { if (this == object) { @@ -58,13 +66,6 @@ public class ErrorMessage { } - @Override - public int hashCode() { - int result = level.hashCode(); - result = 31 * result + message.hashCode(); - return result; - } - public static class ErrorMessageUtil { /** diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/model/heat/ForbiddenHeatResourceTypes.java b/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/model/heat/ForbiddenHeatResourceTypes.java index a8df6bbbe4..f0310ba68a 100644 --- a/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/model/heat/ForbiddenHeatResourceTypes.java +++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/src/main/java/org/openecomp/sdc/datatypes/model/heat/ForbiddenHeatResourceTypes.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; + public enum ForbiddenHeatResourceTypes { HEAT_FLOATING_IP_TYPE("OS::Neutron::FloatingIP"); -- cgit 1.2.3-korg