summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/MapInterfaceDataDefinition.java25
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/MapInterfaceInstanceDataDefinition.java31
-rw-r--r--catalog-model/src/test/java/org/openecomp/sdc/be/model/MapInterfaceDataDefinitionTest.java43
-rw-r--r--catalog-model/src/test/java/org/openecomp/sdc/be/model/MapInterfaceInstanceDataDefinitionTest.java44
4 files changed, 110 insertions, 33 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/MapInterfaceDataDefinition.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/MapInterfaceDataDefinition.java
index c58131f542..4d25ad3743 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/MapInterfaceDataDefinition.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/MapInterfaceDataDefinition.java
@@ -18,25 +18,20 @@ package org.openecomp.sdc.be.model;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Map;
import org.openecomp.sdc.be.datatypes.elements.InterfaceDataDefinition;
import org.openecomp.sdc.be.datatypes.elements.MapDataDefinition;
-import java.util.Map;
-
public class MapInterfaceDataDefinition extends MapDataDefinition<InterfaceDataDefinition> {
- public MapInterfaceDataDefinition() {
-
- }
-
- @JsonCreator
- public MapInterfaceDataDefinition(Map<String, InterfaceDataDefinition > mapToscaDataDefinition) {
- super(mapToscaDataDefinition);
- }
+ @JsonCreator
+ public MapInterfaceDataDefinition(Map<String, InterfaceDataDefinition> mapToscaDataDefinition) {
+ super(mapToscaDataDefinition);
+ }
- @JsonValue
- @Override
- public Map<String, InterfaceDataDefinition> getMapToscaDataDefinition() {
- return mapToscaDataDefinition;
- }
+ @JsonValue
+ @Override
+ public Map<String, InterfaceDataDefinition> getMapToscaDataDefinition() {
+ return mapToscaDataDefinition;
+ }
}
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/MapInterfaceInstanceDataDefinition.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/MapInterfaceInstanceDataDefinition.java
index 6efa0ed404..47db902319 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/MapInterfaceInstanceDataDefinition.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/MapInterfaceInstanceDataDefinition.java
@@ -18,26 +18,21 @@ package org.openecomp.sdc.be.model;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Map;
import org.openecomp.sdc.be.datatypes.elements.InterfaceInstanceDataDefinition;
import org.openecomp.sdc.be.datatypes.elements.MapDataDefinition;
-import java.util.Map;
-
public class MapInterfaceInstanceDataDefinition extends
- MapDataDefinition<InterfaceInstanceDataDefinition> {
-
- public MapInterfaceInstanceDataDefinition() {
-
- }
-
- @JsonCreator
- public MapInterfaceInstanceDataDefinition(Map<String, InterfaceInstanceDataDefinition> mapToscaDataDefinition) {
- super(mapToscaDataDefinition);
- }
-
- @JsonValue
- @Override
- public Map<String, InterfaceInstanceDataDefinition> getMapToscaDataDefinition() {
- return mapToscaDataDefinition;
- }
+ MapDataDefinition<InterfaceInstanceDataDefinition> {
+
+ @JsonCreator
+ public MapInterfaceInstanceDataDefinition(Map<String, InterfaceInstanceDataDefinition> mapToscaDataDefinition) {
+ super(mapToscaDataDefinition);
+ }
+
+ @JsonValue
+ @Override
+ public Map<String, InterfaceInstanceDataDefinition> getMapToscaDataDefinition() {
+ return mapToscaDataDefinition;
+ }
}
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/MapInterfaceDataDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/MapInterfaceDataDefinitionTest.java
new file mode 100644
index 0000000000..888e5905d7
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/MapInterfaceDataDefinitionTest.java
@@ -0,0 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2020, Nordix Foundation. 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.be.model;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.InterfaceDataDefinition;
+
+public class MapInterfaceDataDefinitionTest {
+
+ @Test
+ public void getMapToscaDataDefinition() {
+ final Map<String, InterfaceDataDefinition> mapToscaDataDefinition = new HashMap<>();
+ mapToscaDataDefinition.put("One", new InterfaceDataDefinition());
+ final MapInterfaceDataDefinition testSubject = new MapInterfaceDataDefinition(mapToscaDataDefinition);
+ final Map<String, InterfaceDataDefinition> result = testSubject.getMapToscaDataDefinition();
+ assertThat(result).isNotNull().isInstanceOf(Map.class);
+ result.forEach((s, interfaceDataDefinition) ->
+ assertThat(interfaceDataDefinition).isNotNull().isInstanceOf(InterfaceDataDefinition.class));
+
+ }
+}
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/MapInterfaceInstanceDataDefinitionTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/MapInterfaceInstanceDataDefinitionTest.java
new file mode 100644
index 0000000000..998bbe3fd9
--- /dev/null
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/MapInterfaceInstanceDataDefinitionTest.java
@@ -0,0 +1,44 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2020, Nordix Foundation. 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.be.model;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import org.openecomp.sdc.be.datatypes.elements.InterfaceInstanceDataDefinition;
+
+public class MapInterfaceInstanceDataDefinitionTest {
+
+ @Test
+ public void getMapToscaDataDefinition() {
+ final Map<String, InterfaceInstanceDataDefinition> mapToscaDataDefinition = new HashMap<>();
+ mapToscaDataDefinition.put("One", new InterfaceInstanceDataDefinition());
+ final MapInterfaceInstanceDataDefinition testSubject = new MapInterfaceInstanceDataDefinition(
+ mapToscaDataDefinition);
+ final Map<String, InterfaceInstanceDataDefinition> result = testSubject.getMapToscaDataDefinition();
+ assertThat(result).isNotNull().isInstanceOf(Map.class);
+ result.forEach((s, interfaceDataDefinition) ->
+ assertThat(interfaceDataDefinition).isNotNull().isInstanceOf(InterfaceInstanceDataDefinition.class));
+
+ }
+}