From d6db04dd524eca3e9ef8f8866e9746f171238a42 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 28 Jun 2023 09:23:49 +0200 Subject: [PATCH] Fixup dom-codec a bit With all the moves we can tighten formatting a bit. Also remove a site with raw types. Change-Id: Id3b13500598a595517dbbfe9f98893517cd77aa2 Signed-off-by: Robert Varga --- .../mdsal/binding/dom/codec/impl/LazyBindingList.java | 6 +++--- .../mdsal/binding/dom/codec/impl/LazyBindingMap.java | 4 ++-- .../mdsal/binding/dom/codec/impl/ListCodecContext.java | 4 ++-- .../mdsal/binding/dom/codec/impl/MapCodecContext.java | 8 ++++---- .../mdsal/binding/dom/codec/impl/MapCodecPrototype.java | 3 +-- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LazyBindingList.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LazyBindingList.java index 66bc4574df..a7ea150f4f 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LazyBindingList.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LazyBindingList.java @@ -72,7 +72,7 @@ final class LazyBindingList extends AbstractList implem objects = entries.toArray(); } - static @NonNull List create(final ListCodecContext codec, final int size, + static @NonNull List of(final ListCodecContext codec, final int size, final Collection entries) { if (size == 1) { // Do not bother with lazy instantiation in case of a singleton @@ -81,8 +81,8 @@ final class LazyBindingList extends AbstractList implem return size > LAZY_CUTOFF ? new LazyBindingList<>(codec, entries) : eagerList(codec, size, entries); } - private static @NonNull List eagerList(final ListCodecContext codec, - final int size, final Collection entries) { + private static @NonNull List eagerList(final ListCodecContext codec, final int size, + final Collection entries) { @SuppressWarnings("unchecked") final E[] objs = (E[]) new DataObject[size]; int offset = 0; diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LazyBindingMap.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LazyBindingMap.java index 14b6946c0a..dc979695e9 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LazyBindingMap.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LazyBindingMap.java @@ -80,8 +80,8 @@ final class LazyBindingMap, V extends DataObject & KeyAware> this.mapNode = requireNonNull(mapNode); } - static , V extends DataObject & KeyAware> @NonNull Map create( - final Unordered codec, final MapNode mapNode, final int size) { + static , V extends DataObject & KeyAware> @NonNull Map of(final Unordered codec, + final MapNode mapNode, final int size) { if (size == 1) { // Do not bother with lazy instantiation in case of a singleton final V entry = codec.createBindingProxy(mapNode.body().iterator().next()); diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ListCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ListCodecContext.java index 1cd594d605..7e3019c4be 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ListCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ListCodecContext.java @@ -64,7 +64,7 @@ sealed class ListCodecContext extends DataObjectCodecConte } @NonNull Object fromMap(final MapNode map, final int size) { - return LazyBindingList.create(this, size, map.body()); + return LazyBindingList.of(this, size, map.body()); } private Object fromMap(final MapNode map) { @@ -76,6 +76,6 @@ sealed class ListCodecContext extends DataObjectCodecConte private List fromUnkeyedList(final UnkeyedListNode node) { final int size; // This should never happen, but we do need to ensure users never see an empty List - return (size = node.size()) == 0 ? null : LazyBindingList.create(this, size, node.body()); + return (size = node.size()) == 0 ? null : LazyBindingList.of(this, size, node.body()); } } diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MapCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MapCodecContext.java index 98ccc705af..b91d8af285 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MapCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MapCodecContext.java @@ -44,7 +44,7 @@ abstract sealed class MapCodecContext, D extends DataObject & K @Override Map fromMap(final MapNode map, final int size) { - return LazyBindingMap.create(this, map, size); + return LazyBindingMap.of(this, map, size); } } @@ -56,9 +56,9 @@ abstract sealed class MapCodecContext, D extends DataObject & K this.codec = requireNonNull(codec); } - static @NonNull MapCodecContext of(final Class cls, - final ListRuntimeType list, final CodecContextFactory factory) { - return of(new MapCodecPrototype(Item.of(cls), list, factory)); + static @NonNull MapCodecContext of(final Class cls, final ListRuntimeType type, + final CodecContextFactory factory) { + return of(new MapCodecPrototype(Item.of(cls), type, factory)); } static @NonNull MapCodecContext of(final MapCodecPrototype prototype) { diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MapCodecPrototype.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MapCodecPrototype.java index da5885f186..1ee41f77eb 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MapCodecPrototype.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MapCodecPrototype.java @@ -24,8 +24,7 @@ final class MapCodecPrototype extends ListCodecPrototype { } @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - ListCodecContext createInstance() { + ListCodecContext createInstance() { return MapCodecContext.of(this); } } -- 2.36.6