From ed703551dd3eb2fb6c74e7623801e0eb43e1a603 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 11 Jul 2022 23:08:59 +0200 Subject: [PATCH] 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 --- .../src/main/java/module-info.java | 1 - .../impl/OSGiBindingDOMCodecServicesImpl.java | 16 ++++++---------- .../osgi/impl/OSGiBindingRuntimeContextImpl.java | 14 +++++--------- .../osgi/impl/EffectiveModelContextImpl.java | 9 ++------- .../osgi/impl/OSGiModuleInfoSnapshotImpl.java | 14 +++++--------- 5 files changed, 18 insertions(+), 36 deletions(-) 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 b30d3c947c..7d0783cefd 100644 --- 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 3ecca42830..64ed5cd9d0 100644 --- 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 props(final @NonNull UnsignedLong generation, final @NonNull Integer ranking, - final BindingDOMCodecServices delegate) { - final Dictionary 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 b0c179faa3..dfc55065e0 100644 --- 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 props(final @NonNull UnsignedLong generation, final @NonNull Integer ranking, final BindingRuntimeContext delegate) { - final Dictionary 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 753f718065..c790345e2a 100644 --- 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 props(final EffectiveModelContextListener delegate) { - final Dictionary 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 014da22078..dabe2878a9 100644 --- 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 props(final long generation, final ModuleInfoSnapshot delegate) { - final Dictionary 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)); } } -- 2.36.6