Use FrameworkUtil.asDictionary()

We do not need a Hashtable, use FrameworkUtil to give us what we need.

Change-Id: If6a590a2651e92b89e349b41a6ab4e10b0f73db8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-codec-osgi/src/main/java/module-info.java b/binding/mdsal-binding-dom-codec-osgi/src/main/java/module-info.java
index b30d3c947c40f9826a729deee145ac711c22ee78..7d0783cefdb97ac4785a9c40b2e3a89b6fc4cc37 100644 (file)
--- a/binding/mdsal-binding-dom-codec-osgi/src/main/java/module-info.java
+++ b/binding/mdsal-binding-dom-codec-osgi/src/main/java/module-info.java
@@ -20,6 +20,5 @@ module org.opendaylight.mdsal.binding.dom.codec.osgi {
 
     // Annotations
     requires static org.checkerframework.checker.qual;
-    requires static org.gaul.modernizer_maven_annotations;
     requires static org.osgi.service.component.annotations;
 }

diff --git a/binding/mdsal-binding-dom-codec-osgi/src/main/java/org/opendaylight/mdsal/binding/dom/codec/osgi/impl/OSGiBindingDOMCodecServicesImpl.java b/binding/mdsal-binding-dom-codec-osgi/src/main/java/org/opendaylight/mdsal/binding/dom/codec/osgi/impl/OSGiBindingDOMCodecServicesImpl.java
index 3ecca42830151f4f62f0b90b1c5c8ca809b526b2..64ed5cd9d002841e393d2e9d53c06fcc2c5cde80 100644 (file)
--- a/binding/mdsal-binding-dom-codec-osgi/src/main/java/org/opendaylight/mdsal/binding/dom/codec/osgi/impl/OSGiBindingDOMCodecServicesImpl.java
+++ b/binding/mdsal-binding-dom-codec-osgi/src/main/java/org/opendaylight/mdsal/binding/dom/codec/osgi/impl/OSGiBindingDOMCodecServicesImpl.java
@@ -8,19 +8,17 @@
 package org.opendaylight.mdsal.binding.dom.codec.osgi.impl;
 
 import static com.google.common.base.Verify.verifyNotNull;
-import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.UnsignedLong;
 import java.util.Dictionary;
-import java.util.Hashtable;
 import java.util.Map;
 import org.eclipse.jdt.annotation.NonNull;
-import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 import org.opendaylight.mdsal.binding.dom.codec.osgi.OSGiBindingDOMCodecServices;
 import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices;
 import org.osgi.framework.Constants;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -71,13 +69,11 @@ public final class OSGiBindingDOMCodecServicesImpl implements OSGiBindingDOMCode
         LOG.info("Binding/DOM Codec generation {} deactivated", generation);
     }
 
-    @SuppressModernizer
     static Dictionary<String, ?> props(final @NonNull UnsignedLong generation, final @NonNull Integer ranking,
-            final BindingDOMCodecServices delegate) {
-        final Dictionary<String, Object> ret = new Hashtable<>(4);
-        ret.put(Constants.SERVICE_RANKING, ranking);
-        ret.put(GENERATION, generation);
-        ret.put(DELEGATE, requireNonNull(delegate));
-        return ret;
+            final @NonNull BindingDOMCodecServices delegate) {
+        return FrameworkUtil.asDictionary(Map.of(
+            Constants.SERVICE_RANKING, ranking,
+            GENERATION, generation,
+            DELEGATE, delegate));
     }
 }

diff --git a/binding/mdsal-binding-runtime-osgi/src/main/java/org/opendaylight/mdsal/binding/runtime/osgi/impl/OSGiBindingRuntimeContextImpl.java b/binding/mdsal-binding-runtime-osgi/src/main/java/org/opendaylight/mdsal/binding/runtime/osgi/impl/OSGiBindingRuntimeContextImpl.java
index b0c179faa307922af143de2f11b01ab1252f7b14..dfc55065e0ce832c8d6953faf1ef7317d74940f1 100644 (file)
--- a/binding/mdsal-binding-runtime-osgi/src/main/java/org/opendaylight/mdsal/binding/runtime/osgi/impl/OSGiBindingRuntimeContextImpl.java
+++ b/binding/mdsal-binding-runtime-osgi/src/main/java/org/opendaylight/mdsal/binding/runtime/osgi/impl/OSGiBindingRuntimeContextImpl.java
@@ -8,19 +8,17 @@
 package org.opendaylight.mdsal.binding.runtime.osgi.impl;
 
 import static com.google.common.base.Verify.verifyNotNull;
-import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.UnsignedLong;
 import java.util.Dictionary;
-import java.util.Hashtable;
 import java.util.Map;
 import org.eclipse.jdt.annotation.NonNull;
-import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext;
 import org.opendaylight.mdsal.binding.runtime.osgi.OSGiBindingRuntimeContext;
 import org.osgi.framework.Constants;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -70,13 +68,11 @@ public final class OSGiBindingRuntimeContextImpl implements OSGiBindingRuntimeCo
         LOG.info("BindingRuntimeContext generation {} deactivated", generation);
     }
 
-    @SuppressModernizer
     static Dictionary<String, ?> props(final @NonNull UnsignedLong generation, final @NonNull Integer ranking,
             final BindingRuntimeContext delegate) {
-        final Dictionary<String, Object> ret = new Hashtable<>(4);
-        ret.put(Constants.SERVICE_RANKING, ranking);
-        ret.put(GENERATION, generation);
-        ret.put(DELEGATE, requireNonNull(delegate));
-        return ret;
+        return FrameworkUtil.asDictionary(Map.of(
+            Constants.SERVICE_RANKING, ranking,
+            GENERATION, generation,
+            DELEGATE, delegate));
     }
 }

diff --git a/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/EffectiveModelContextImpl.java b/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/EffectiveModelContextImpl.java
index 753f7180653e84d53b85e4557f4b4d72bd5c173d..c790345e2a9dc00c4f90496baf26392fb8adbe4f 100644 (file)
--- a/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/EffectiveModelContextImpl.java
+++ b/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/EffectiveModelContextImpl.java
@@ -8,15 +8,13 @@
 package org.opendaylight.mdsal.dom.schema.osgi.impl;
 
 import static com.google.common.base.Verify.verifyNotNull;
-import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.VisibleForTesting;
 import java.util.Dictionary;
-import java.util.Hashtable;
 import java.util.Map;
-import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -49,10 +47,7 @@ public final class EffectiveModelContextImpl implements EffectiveModelContextLis
         delegate = null;
     }
 
-    @SuppressModernizer
     static Dictionary<String, ?> props(final EffectiveModelContextListener delegate) {
-        final Dictionary<String, Object> ret = new Hashtable<>(2);
-        ret.put(DELEGATE, requireNonNull(delegate));
-        return ret;
+        return FrameworkUtil.asDictionary(Map.of(DELEGATE, delegate));
     }
 }

diff --git a/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/OSGiModuleInfoSnapshotImpl.java b/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/OSGiModuleInfoSnapshotImpl.java
index 014da220782c0b2b625303f62ddd2f74c4555a43..dabe2878a95e167fe5fa97ae9c18e0d13571b1d0 100644 (file)
--- a/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/OSGiModuleInfoSnapshotImpl.java
+++ b/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/OSGiModuleInfoSnapshotImpl.java
@@ -8,19 +8,17 @@
 package org.opendaylight.mdsal.dom.schema.osgi.impl;
 
 import static com.google.common.base.Verify.verifyNotNull;
-import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.UnsignedLong;
 import java.util.Dictionary;
-import java.util.Hashtable;
 import java.util.Map;
-import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 import org.opendaylight.mdsal.binding.runtime.api.ModuleInfoSnapshot;
 import org.opendaylight.mdsal.dom.schema.osgi.ModelGenerationAware;
 import org.opendaylight.mdsal.dom.schema.osgi.OSGiModuleInfoSnapshot;
 import org.osgi.framework.Constants;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -67,12 +65,10 @@ public final class OSGiModuleInfoSnapshotImpl implements OSGiModuleInfoSnapshot
         LOG.info("EffectiveModelContext generation {} deactivated", generation);
     }
 
-    @SuppressModernizer
     static Dictionary<String, ?> props(final long generation, final ModuleInfoSnapshot delegate) {
-        final Dictionary<String, Object> ret = new Hashtable<>(4);
-        ret.put(Constants.SERVICE_RANKING, ModelGenerationAware.computeServiceRanking(generation));
-        ret.put(GENERATION, UnsignedLong.fromLongBits(generation));
-        ret.put(DELEGATE, requireNonNull(delegate));
-        return ret;
+        return FrameworkUtil.asDictionary(Map.of(
+            Constants.SERVICE_RANKING, ModelGenerationAware.computeServiceRanking(generation),
+            GENERATION, UnsignedLong.fromLongBits(generation),
+            DELEGATE, delegate));
     }
 }