Code Review
/
mdsal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Map identities to proper objects
[mdsal.git]
/
binding
/
mdsal-binding-dom-codec
/
src
/
main
/
java
/
org
/
opendaylight
/
mdsal
/
binding
/
dom
/
codec
/
impl
/
DataObjectStreamer.java
diff --git
a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectStreamer.java
b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectStreamer.java
index 94b1a4c44ce298b55f684f1e3d689cce3a4e40a5..96e346eab35a02601397d838aec46faacf8fcd0f 100644
(file)
--- a/
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectStreamer.java
+++ b/
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectStreamer.java
@@
-14,9
+14,8
@@
import java.io.IOException;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.
Map.Entry
;
+import java.util.
Set
;
import org.opendaylight.mdsal.binding.dom.codec.api.BindingStreamEventWriter;
import org.opendaylight.mdsal.binding.dom.codec.api.BindingStreamEventWriter;
-import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections;
import org.opendaylight.yangtools.yang.binding.Augmentable;
import org.opendaylight.yangtools.yang.binding.Augmentation;
import org.opendaylight.yangtools.yang.binding.DataContainer;
import org.opendaylight.yangtools.yang.binding.Augmentable;
import org.opendaylight.yangtools.yang.binding.Augmentation;
import org.opendaylight.yangtools.yang.binding.DataContainer;
@@
-57,9
+56,7
@@
public abstract class DataObjectStreamer<T extends DataObject> implements DataOb
protected static final void streamAugmentations(final DataObjectSerializerRegistry registry,
final BindingStreamEventWriter writer, final Augmentable<?> obj) throws IOException {
protected static final void streamAugmentations(final DataObjectSerializerRegistry registry,
final BindingStreamEventWriter writer, final Augmentable<?> obj) throws IOException {
- final Map<Class<? extends Augmentation<?>>, Augmentation<?>> augmentations =
- BindingReflections.getAugmentations(obj);
- for (final Entry<Class<? extends Augmentation<?>>, Augmentation<?>> aug : augmentations.entrySet()) {
+ for (final var aug : obj.augmentations().entrySet()) {
emitAugmentation(aug.getKey(), aug.getValue(), writer, registry);
}
}
emitAugmentation(aug.getKey(), aug.getValue(), writer, registry);
}
}
@@
-99,7
+96,7
@@
public abstract class DataObjectStreamer<T extends DataObject> implements DataOb
}
protected static final void streamLeafList(final BindingStreamEventWriter writer, final String localName,
}
protected static final void streamLeafList(final BindingStreamEventWriter writer, final String localName,
- final
Lis
t<?> value) throws IOException {
+ final
Se
t<?> value) throws IOException {
if (value != null) {
writer.startLeafSet(localName, value.size());
commonStreamLeafset(writer, value);
if (value != null) {
writer.startLeafSet(localName, value.size());
commonStreamLeafset(writer, value);
@@
-156,7
+153,7
@@
public abstract class DataObjectStreamer<T extends DataObject> implements DataOb
writer.endNode();
}
writer.endNode();
}
- private static void commonStreamLeafset(final BindingStreamEventWriter writer, final
List
<?> value)
+ private static void commonStreamLeafset(final BindingStreamEventWriter writer, final
Collection
<?> value)
throws IOException {
for (Object entry : value) {
writer.leafSetEntryNode(entry);
throws IOException {
for (Object entry : value) {
writer.leafSetEntryNode(entry);
@@
-186,7
+183,7
@@
public abstract class DataObjectStreamer<T extends DataObject> implements DataOb
return !(writer instanceof BindingSerializer) || ((BindingSerializer<?, T>) writer).serialize(value) == null;
}
return !(writer instanceof BindingSerializer) || ((BindingSerializer<?, T>) writer).serialize(value) == null;
}
- private static int nullSize(final
List
<?> list) {
+ private static int nullSize(final
Collection
<?> list) {
return list == null ? 0 : list.size();
}
return list == null ? 0 : list.size();
}