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 <robert.varga@pantheon.tech>

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 66bc4574df7e133fc173b2b018844e449b418269..a7ea150f4f3afa8fd788b90301cf1c98f798bddb 100644 (file)
--- 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<E extends DataObject> extends AbstractList<E> implem
         objects = entries.toArray();
     }
 
-    static <E extends DataObject> @NonNull List<E> create(final ListCodecContext<E> codec, final int size,
+    static <E extends DataObject> @NonNull List<E> of(final ListCodecContext<E> codec, final int size,
             final Collection<? extends DataContainerNode> entries) {
         if (size == 1) {
             // Do not bother with lazy instantiation in case of a singleton
@@ -81,8 +81,8 @@ final class LazyBindingList<E extends DataObject> extends AbstractList<E> implem
         return size > LAZY_CUTOFF ? new LazyBindingList<>(codec, entries) : eagerList(codec, size, entries);
     }
 
-    private static <E extends DataObject> @NonNull List<E> eagerList(final ListCodecContext<E> codec,
-            final int size, final Collection<? extends DataContainerNode> entries) {
+    private static <E extends DataObject> @NonNull List<E> eagerList(final ListCodecContext<E> codec, final int size,
+            final Collection<? extends DataContainerNode> 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 14b6946c0af59d38550b3945d3f1d2ac65ac6b01..dc979695e94d9e117d66298f976959e0ddeb79a0 100644 (file)
--- 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<K extends Key<V>, V extends DataObject & KeyAware<K>>
         this.mapNode = requireNonNull(mapNode);
     }
 
-    static <K extends Key<V>, V extends DataObject & KeyAware<K>> @NonNull Map<K, V> create(
-            final Unordered<K, V> codec, final MapNode mapNode, final int size) {
+    static <K extends Key<V>, V extends DataObject & KeyAware<K>> @NonNull Map<K, V> of(final Unordered<K, V> 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 1cd594d605d94678d99f05c99f03d267a20e98cb..7e3019c4be16e5ad98f801aeaa390a7280af6cf9 100644 (file)
--- 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<D extends DataObject> 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<D extends DataObject> extends DataObjectCodecConte
     private List<D> 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 98ccc705afb52592a9d6ff6629118f59c9a1d2e0..b91d8af2858f3cde42b21074a8a1274f60f9bcc1 100644 (file)
--- 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<I extends Key<D>, D extends DataObject & K
 
         @Override
         Map<I, D> 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<I extends Key<D>, D extends DataObject & K
         this.codec = requireNonNull(codec);
     }
 
-    static @NonNull MapCodecContext<?, ?>  of(final Class<? extends DataObject> cls,
-            final ListRuntimeType list, final CodecContextFactory factory) {
-        return of(new MapCodecPrototype(Item.of(cls), list, factory));
+    static @NonNull MapCodecContext<?, ?>  of(final Class<? extends DataObject> 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 da5885f1865dd55f544c5db4564bf67616253847..1ee41f77eb16b97f8d63087ba65d0f4ea65a2c98 100644 (file)
--- 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);
     }
 }