Code Review
/
mdsal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Retain protype in DataContainerCodecContext
[mdsal.git]
/
binding
/
mdsal-binding-dom-codec
/
src
/
main
/
java
/
org
/
opendaylight
/
mdsal
/
binding
/
dom
/
codec
/
impl
/
CommonDataObjectCodecContext.java
diff --git
a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CommonDataObjectCodecContext.java
b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CommonDataObjectCodecContext.java
index 5c5fa04e63a9ee763bf1d9088375efaade44ac9d..f5416d24f54fbebefb5ef001f3cd5238d2c195f7 100644
(file)
--- a/
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CommonDataObjectCodecContext.java
+++ b/
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CommonDataObjectCodecContext.java
@@
-7,9
+7,6
@@
*/
package org.opendaylight.mdsal.binding.dom.codec.impl;
*/
package org.opendaylight.mdsal.binding.dom.codec.impl;
-import static java.util.Objects.requireNonNull;
-
-import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.mdsal.binding.dom.codec.api.CommonDataObjectCodecTreeNode;
import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.mdsal.binding.dom.codec.api.CommonDataObjectCodecTreeNode;
import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType;
import org.opendaylight.yangtools.yang.binding.DataObject;
@@
-21,34
+18,22
@@
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent
* Base implementation of {@link CommonDataObjectCodecTreeNode}.
*/
abstract sealed class CommonDataObjectCodecContext<D extends DataObject, T extends CompositeRuntimeType>
* Base implementation of {@link CommonDataObjectCodecTreeNode}.
*/
abstract sealed class CommonDataObjectCodecContext<D extends DataObject, T extends CompositeRuntimeType>
- extends DataContainerCodecContext<D, T> implements CommonDataObjectCodecTreeNode<D>
+ extends DataContainerCodecContext<D, T, CommonDataObjectCodecPrototype<T>>
+ implements CommonDataObjectCodecTreeNode<D>
permits AbstractDataObjectCodecContext, ChoiceCodecContext {
permits AbstractDataObjectCodecContext, ChoiceCodecContext {
- final @NonNull CommonDataObjectCodecPrototype<T> prototype;
-
CommonDataObjectCodecContext(final CommonDataObjectCodecPrototype<T> prototype) {
CommonDataObjectCodecContext(final CommonDataObjectCodecPrototype<T> prototype) {
- super(prototype.getType());
- this.prototype = requireNonNull(prototype);
+ super(prototype);
}
@SuppressWarnings("unchecked")
@Override
public final Class<D> getBindingClass() {
}
@SuppressWarnings("unchecked")
@Override
public final Class<D> getBindingClass() {
- return Class.class.cast(prototype.getBindingClass());
- }
-
- @Override
- protected final CodecContextFactory factory() {
- return prototype.getFactory();
- }
-
- @Override
- protected final T type() {
- return prototype.getType();
+ return Class.class.cast(prototype().javaClass());
}
@Override
protected NodeIdentifier getDomPathArgument() {
}
@Override
protected NodeIdentifier getDomPathArgument() {
- return prototype.getYangArg();
+ return prototype
()
.getYangArg();
}
/**
}
/**
@@
-59,6
+44,6
@@
abstract sealed class CommonDataObjectCodecContext<D extends DataObject, T exten
}
protected final PathArgument bindingArg() {
}
protected final PathArgument bindingArg() {
- return prototype.getBindingArg();
+ return prototype
()
.getBindingArg();
}
}
}
}