1 files changed, 2 insertions, 17 deletions
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMapAppenderConstructor.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMapAppenderConstructor.java
index 678ba00724..08af90a768 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMapAppenderConstructor.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMapAppenderConstructor.java
@@ -19,9 +19,7 @@
  */
 package org.onap.sdc.tosca.services;
 
-import java.util.AbstractMap;
 import java.util.Map;
-import java.util.Set;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.nodes.MappingNode;
 import org.yaml.snakeyaml.parser.ParserException;
@@ -39,21 +37,7 @@ public class StrictMapAppenderConstructor extends Constructor {
 
     @Override
     protected Map<Object, Object> createDefaultMap(int initSize) {
-        final Map<Object, Object> delegate = super.createDefaultMap(initSize);
-        return new AbstractMap<>() {
-            @Override
-            public Object put(Object key, Object value) {
-                if (delegate.containsKey(key)) {
-                    throw new IllegalStateException("duplicate key: " + key);
-                }
-                return delegate.put(key, value);
-            }
-
-            @Override
-            public Set<Entry<Object, Object>> entrySet() {
-                return delegate.entrySet();
-            }
-        };
+        return new StrictMap(super.createDefaultMap(initSize));
     }
 
     @Override
@@ -64,4 +48,5 @@ public class StrictMapAppenderConstructor extends Constructor {
             throw new ParserException("while parsing MappingNode", node.getStartMark(), exception.getMessage(), node.getEndMark());
         }
     }
+
 }