IdentifiableItemCodec is only used by KeyedListNodeCodecContext
and it is used directly. Detach it from IllegalArgumentCodec, making
peeling off one possibility from the class tree.
JIRA: MDSAL-704
Change-Id: I25a818eabe80d5bb3f6b4ff2d152e7ca002a93a1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
import java.util.Set;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
-import org.opendaylight.yangtools.concepts.AbstractIllegalArgumentCodec;
import org.opendaylight.yangtools.util.ImmutableOffsetMap;
import org.opendaylight.yangtools.util.ImmutableOffsetMapTemplate;
import org.opendaylight.yangtools.yang.binding.Identifiable;
import org.opendaylight.yangtools.util.ImmutableOffsetMap;
import org.opendaylight.yangtools.util.ImmutableOffsetMapTemplate;
import org.opendaylight.yangtools.yang.binding.Identifiable;
/**
* Codec support for extracting the {@link Identifiable#key()} method return from a MapEntryNode.
*/
/**
* Codec support for extracting the {@link Identifiable#key()} method return from a MapEntryNode.
*/
-abstract class IdentifiableItemCodec
- extends AbstractIllegalArgumentCodec<NodeIdentifierWithPredicates, IdentifiableItem<?, ?>> {
+// FIXME: sealed class when we have JDK17+
+abstract class IdentifiableItemCodec {
private static final class SingleKey extends IdentifiableItemCodec {
private static final MethodType CTOR_TYPE = MethodType.methodType(Identifier.class, Object.class);
private static final class SingleKey extends IdentifiableItemCodec {
private static final MethodType CTOR_TYPE = MethodType.methodType(Identifier.class, Object.class);
@SuppressWarnings({ "rawtypes", "unchecked" })
@SuppressWarnings({ "rawtypes", "unchecked" })
- protected final IdentifiableItem<?, ?> deserializeImpl(final NodeIdentifierWithPredicates input) {
- final Identifier<?> identifier = deserializeIdentifier(input);
- return IdentifiableItem.of((Class) identifiable, (Identifier) identifier);
+ final @NonNull IdentifiableItem<?, ?> domToBinding(final NodeIdentifierWithPredicates input) {
+ return IdentifiableItem.of((Class) identifiable, (Identifier) deserializeIdentifier(requireNonNull(input)));
- @Override
- protected final NodeIdentifierWithPredicates serializeImpl(final IdentifiableItem<?, ?> input) {
+ final @NonNull NodeIdentifierWithPredicates bindingToDom(final IdentifiableItem<?, ?> input) {
return serializeIdentifier(qname, input.getKey());
}
@SuppressWarnings("checkstyle:illegalCatch")
return serializeIdentifier(qname, input.getKey());
}
@SuppressWarnings("checkstyle:illegalCatch")
- final @NonNull Identifier<?> deserializeIdentifier(final NodeIdentifierWithPredicates input) {
+ final @NonNull Identifier<?> deserializeIdentifier(final @NonNull NodeIdentifierWithPredicates input) {
try {
return deserializeIdentifierImpl(input);
} catch (Throwable e) {
try {
return deserializeIdentifierImpl(input);
} catch (Throwable e) {
super.addYangPathArgument(arg, builder);
if (arg instanceof IdentifiableItem) {
super.addYangPathArgument(arg, builder);
if (arg instanceof IdentifiableItem) {
- builder.add(codec.serialize((IdentifiableItem<?, ?>) arg));
+ builder.add(codec.bindingToDom((IdentifiableItem<?, ?>) arg));
} else {
// Adding wildcarded
super.addYangPathArgument(arg, builder);
} else {
// Adding wildcarded
super.addYangPathArgument(arg, builder);
@Override
protected InstanceIdentifier.PathArgument getBindingPathArgument(final YangInstanceIdentifier.PathArgument domArg) {
@Override
protected InstanceIdentifier.PathArgument getBindingPathArgument(final YangInstanceIdentifier.PathArgument domArg) {
- if (domArg instanceof NodeIdentifierWithPredicates) {
- return codec.deserialize((NodeIdentifierWithPredicates) domArg);
- }
- return super.getBindingPathArgument(domArg);
+ return domArg instanceof NodeIdentifierWithPredicates
+ ? codec.domToBinding((NodeIdentifierWithPredicates) domArg) : super.getBindingPathArgument(domArg);
}
@SuppressWarnings({ "rawtypes", "unchecked" })
NodeIdentifierWithPredicates serialize(final Identifier<?> key) {
}
@SuppressWarnings({ "rawtypes", "unchecked" })
NodeIdentifierWithPredicates serialize(final Identifier<?> key) {
- return codec.serialize(IdentifiableItem.of((Class)getBindingClass(), (Identifier)key));
+ return codec.bindingToDom(IdentifiableItem.of((Class)getBindingClass(), (Identifier)key));
}
@NonNull Identifier<?> deserialize(final NodeIdentifierWithPredicates arg) {
}
@NonNull Identifier<?> deserialize(final NodeIdentifierWithPredicates arg) {
@Override
public YangInstanceIdentifier.PathArgument serializePathArgument(final InstanceIdentifier.PathArgument arg) {
@Override
public YangInstanceIdentifier.PathArgument serializePathArgument(final InstanceIdentifier.PathArgument arg) {
- if (arg instanceof IdentifiableItem) {
- return codec.serialize((IdentifiableItem<?, ?>) arg);
- }
- return super.serializePathArgument(arg);
+ return arg instanceof IdentifiableItem
+ ? codec.bindingToDom((IdentifiableItem<?, ?>) arg) : super.serializePathArgument(arg);
}
@Override
public InstanceIdentifier.PathArgument deserializePathArgument(final YangInstanceIdentifier.PathArgument arg) {
}
@Override
public InstanceIdentifier.PathArgument deserializePathArgument(final YangInstanceIdentifier.PathArgument arg) {
- if (arg instanceof NodeIdentifierWithPredicates) {
- return codec.deserialize((NodeIdentifierWithPredicates) arg);
- }
- return super.deserializePathArgument(arg);
+ return arg instanceof NodeIdentifierWithPredicates
+ ? codec.domToBinding((NodeIdentifierWithPredicates) arg) : super.deserializePathArgument(arg);