summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2023-03-22 23:14:29 +0000
committerVasyl Razinkov <vasyl.razinkov@est.tech>2023-03-23 10:05:13 +0000
commit1e7e19b4d1ddf05309e3e43d5ecb9138902b19b8 (patch)
tree002f5d119eba60240b1ddcc32243bc9117190122 /common
parent30e99b484fcc96d2304a05db5d8972d2250f0756 (diff)
Upgrade vulnerable dependencies
Fix missing default no-args constructor Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: Icfcbe0ec577b2d629179fa46e42141c196e08970 Issue-ID: SDC-4287 Issue-ID: SDC-4446
Diffstat (limited to 'common')
-rw-r--r--common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMap.java55
-rw-r--r--common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMapAppenderConstructor.java19
2 files changed, 57 insertions, 17 deletions
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMap.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMap.java
new file mode 100644
index 0000000000..52cda7651a
--- /dev/null
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMap.java
@@ -0,0 +1,55 @@
+/*
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2023 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.onap.sdc.tosca.services;
+
+import java.util.AbstractMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+public class StrictMap extends AbstractMap {
+
+ private Map<Object, Object> delegate;
+
+ public StrictMap(Map<Object, Object> delegate) {
+ this.delegate = delegate;
+ }
+
+ @Override
+ public Object put(Object key, Object value) {
+ if (delegate == null) {
+ delegate = new LinkedHashMap<>();
+ }
+ if (delegate.containsKey(key)) {
+ throw new IllegalStateException("duplicate key: " + key);
+ }
+ return delegate.put(key, value);
+ }
+
+ @Override
+ public Set<Entry<Object, Object>> entrySet() {
+ if (delegate == null) {
+ delegate = new LinkedHashMap<>();
+ }
+ return delegate.entrySet();
+ }
+}
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());
}
}
+
}