Use FrameworkUtil.asDictionary()

[mdsal.git] / dom / mdsal-dom-schema-osgi / src / main / java / org / opendaylight / mdsal / dom / schema / osgi / impl / OSGiModuleInfoSnapshotImpl.java

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));
     }
 }