Modernize yang-data-impl

[yangtools.git] / data / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / schema / nodes / UnmodifiableChildrenMap.java

diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/UnmodifiableChildrenMap.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/UnmodifiableChildrenMap.java
index be92269ce10fa4cf8a04258f66554a65c336d4c5..02b355ea7529c0e57a1376bf7fdd4c2da6617f80 100644 (file)
--- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/UnmodifiableChildrenMap.java
+++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/UnmodifiableChildrenMap.java
@@ -49,10 +49,7 @@ final class UnmodifiableChildrenMap implements CloneableMap<PathArgument, DataCo
      * @return Unmodifiable view
      */
     static Map<PathArgument, DataContainerChild> create(final Map<PathArgument, DataContainerChild> map) {
-        if (map instanceof UnmodifiableChildrenMap) {
-            return map;
-        }
-        if (map instanceof ImmutableMap) {
+        if (map instanceof UnmodifiableChildrenMap || map instanceof ImmutableMap) {
             return map;
         }
         if (map.isEmpty()) {
@@ -61,7 +58,6 @@ final class UnmodifiableChildrenMap implements CloneableMap<PathArgument, DataCo
         if (map.size() < WRAP_THRESHOLD) {
             return ImmutableMap.copyOf(map);
         }
-
         return new UnmodifiableChildrenMap(map);
     }
 
@@ -154,8 +150,8 @@ final class UnmodifiableChildrenMap implements CloneableMap<PathArgument, DataCo
     @Override
     @SuppressWarnings("unchecked")
     public Map<PathArgument, DataContainerChild> createMutableClone() {
-        if (delegate instanceof HashMap) {
-            return (Map<PathArgument, DataContainerChild>) ((HashMap<?, ?>) delegate).clone();
+        if (delegate instanceof HashMap<?, ?> hashMap) {
+            return (Map<PathArgument, DataContainerChild>) hashMap.clone();
         }
         return new HashMap<>(delegate);
     }