From 8d35a8d8d5125d28b85b3199459601ecdfc02299 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 29 Jun 2023 16:39:19 +0200 Subject: [PATCH] Reduce unchecked warnings We do not need DataObject specialization, which solves a few warnings around casting. JIRA: MDSAL-805 Change-Id: I1d4ef9938ae75bff182e4f1bfad8d7caaae4a313 Signed-off-by: Robert Varga --- .../dom/codec/impl/CodecDataObjectAnalysis.java | 3 +-- .../dom/codec/impl/CodecDataObjectGenerator.java | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObjectAnalysis.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObjectAnalysis.java index 98bdbaf81f..dcc4e13a26 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObjectAnalysis.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObjectAnalysis.java @@ -60,8 +60,7 @@ final class CodecDataObjectAnalysis { CodecDataObjectAnalysis(final CommonDataObjectCodecPrototype prototype, final CodecItemFactory itemFactory, final Method keyMethod) { // Preliminaries from prototype - @SuppressWarnings("unchecked") - final Class bindingClass = Class.class.cast(prototype.getBindingClass()); + final var bindingClass = prototype.getBindingClass(); final var runtimeType = prototype.getType(); final var factory = prototype.getFactory(); final var leafContexts = factory.getLeafNodes(bindingClass, runtimeType.statement()); diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObjectGenerator.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObjectGenerator.java index f224471e5e..19f31386fa 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObjectGenerator.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObjectGenerator.java @@ -46,7 +46,6 @@ import org.opendaylight.mdsal.binding.dom.codec.impl.ClassGeneratorBridge.LocalN import org.opendaylight.mdsal.binding.loader.BindingClassLoader; import org.opendaylight.mdsal.binding.loader.BindingClassLoader.ClassGenerator; import org.opendaylight.mdsal.binding.loader.BindingClassLoader.GeneratorResult; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.contract.Naming; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -260,16 +259,15 @@ abstract class CodecDataObjectGenerator> implements this.keyMethod = keyMethod; } - static > Class generate(final BindingClassLoader loader, - final Class bindingInterface, final ImmutableMap simpleProperties, + static > Class generate(final BindingClassLoader loader, + final Class bindingInterface, final ImmutableMap simpleProperties, final Map, PropertyInfo> daoProperties, final Method keyMethod) { return CodecPackage.CODEC.generateClass(loader, bindingInterface, new Reusable<>(BB_CDO, simpleProperties, daoProperties, keyMethod)); } - static > Class generateAugmentable( - final BindingClassLoader loader, final Class bindingInterface, - final ImmutableMap simpleProperties, + static > Class generateAugmentable(final BindingClassLoader loader, + final Class bindingInterface, final ImmutableMap simpleProperties, final Map, PropertyInfo> daoProperties, final Method keyMethod) { return CodecPackage.CODEC.generateClass(loader, bindingInterface, new Reusable<>(BB_ACDO, simpleProperties, daoProperties, keyMethod)); -- 2.36.6