We have some long-winded instantiation here, which amounts to getting an
EncapsulatedValueCodec. Specialize two constructors for
identityref/instance-identifier to make things a bit more clear and
direct.
JIRA: MDSAL-704
Change-Id: I766d4437ff51a8c32c872f6a3bfe66aec68caa14
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
private IllegalArgumentCodec<Object, Object> getCodecForBindingClass(final Class<?> valueType,
final TypeDefinition<?> typeDef) {
if (typeDef instanceof IdentityrefTypeDefinition) {
private IllegalArgumentCodec<Object, Object> getCodecForBindingClass(final Class<?> valueType,
final TypeDefinition<?> typeDef) {
if (typeDef instanceof IdentityrefTypeDefinition) {
- return new CompositeValueCodec(SchemaUnawareCodec.of(valueType, typeDef), identityCodec);
+ return new CompositeValueCodec(valueType, identityCodec);
} else if (typeDef instanceof InstanceIdentifierTypeDefinition) {
} else if (typeDef instanceof InstanceIdentifierTypeDefinition) {
- return new CompositeValueCodec(SchemaUnawareCodec.of(valueType, typeDef), instanceIdentifierCodec);
+ return new CompositeValueCodec(valueType, instanceIdentifierCodec);
} else if (typeDef instanceof UnionTypeDefinition) {
try {
return UnionTypeCodec.of(valueType, (UnionTypeDefinition) typeDef, this);
} else if (typeDef instanceof UnionTypeDefinition) {
try {
return UnionTypeCodec.of(valueType, (UnionTypeDefinition) typeDef, this);
*/
package org.opendaylight.mdsal.binding.dom.codec.impl;
*/
package org.opendaylight.mdsal.binding.dom.codec.impl;
+import static java.util.Objects.requireNonNull;
+
import org.opendaylight.yangtools.concepts.IllegalArgumentCodec;
final class CompositeValueCodec extends ValueTypeCodec {
import org.opendaylight.yangtools.concepts.IllegalArgumentCodec;
final class CompositeValueCodec extends ValueTypeCodec {
- private final SchemaUnawareCodec bindingToSimpleType;
+ private final EncapsulatedValueCodec typeObjectCodec;
@SuppressWarnings("rawtypes")
@SuppressWarnings("rawtypes")
- // FIXME: this is probably not right w.r.t. null
- private final IllegalArgumentCodec bindingToDom;
+ // FIXME: specialize for the two possibilities
+ private final IllegalArgumentCodec valueCodec;
+
+ CompositeValueCodec(final Class<?> valueType, final IdentityCodec codec) {
+ typeObjectCodec = EncapsulatedValueCodec.ofUnchecked(valueType);
+ valueCodec = requireNonNull(codec);
+ }
- CompositeValueCodec(final SchemaUnawareCodec extractor,
- @SuppressWarnings("rawtypes") final IllegalArgumentCodec delegate) {
- this.bindingToSimpleType = extractor;
- this.bindingToDom = delegate;
+ CompositeValueCodec(final Class<?> valueType, final InstanceIdentifierCodec codec) {
+ typeObjectCodec = EncapsulatedValueCodec.ofUnchecked(valueType);
+ valueCodec = requireNonNull(codec);
}
@SuppressWarnings("unchecked")
@Override
public Object deserialize(final Object input) {
}
@SuppressWarnings("unchecked")
@Override
public Object deserialize(final Object input) {
- return bindingToSimpleType.deserialize(bindingToDom.deserialize(input));
+ return typeObjectCodec.deserialize(valueCodec.deserialize(input));
}
@SuppressWarnings("unchecked")
@Override
public Object serialize(final Object input) {
}
@SuppressWarnings("unchecked")
@Override
public Object serialize(final Object input) {
- return bindingToDom.serialize(bindingToSimpleType.serialize(input));
+ return valueCodec.serialize(typeObjectCodec.serialize(input));
return CACHE.get(typeClz);
}
return CACHE.get(typeClz);
}
+ static @NonNull EncapsulatedValueCodec ofUnchecked(final Class<?> typeClz) {
+ // FIXME: require base class to be ScalarTypeObject
+ return CACHE.getUnchecked(typeClz);
+ }
+
/**
* Quick check if a value object has a chance to deserialize using {@link #deserialize(Object)}.
*
/**
* Quick check if a value object has a chance to deserialize using {@link #deserialize(Object)}.
*