From dea26601bb63731c35675366849c40960e48992a Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 16 May 2018 10:30:28 +0200 Subject: HONEYCOMB-437: implement ReflexiveListReaderCustomizer.readCurrentAttributes ReflexiveListReaderCustomizer used default NOOP implementation, which caused issues during serialization, because BindingNormalizedNodeCodecRegistry.toNormalizedNode requrires key to be set. Change-Id: I7822e07efe57cbdee2c539583776f8cc677ddab7 Signed-off-by: Marek Gradzki --- .../util/read/ReflexiveListReaderCustomizer.java | 35 +++++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'infra/translate-utils/src/main/java/io/fd/honeycomb/translate') diff --git a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/read/ReflexiveListReaderCustomizer.java b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/read/ReflexiveListReaderCustomizer.java index b6430a355..e058964a0 100644 --- a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/read/ReflexiveListReaderCustomizer.java +++ b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/read/ReflexiveListReaderCustomizer.java @@ -16,24 +16,26 @@ package io.fd.honeycomb.translate.util.read; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; + import com.google.common.base.Optional; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; import io.fd.honeycomb.translate.util.ReflectionUtils; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Collections; +import java.util.List; +import javax.annotation.Nonnull; import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.Identifiable; import org.opendaylight.yangtools.yang.binding.Identifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -import javax.annotation.Nonnull; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Collections; -import java.util.List; - -import static com.google.common.base.Preconditions.*; +import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; /** * Might be slow. @@ -43,12 +45,29 @@ public class ReflexiveListReaderCustomizer { private final List staticKeys; + private final Class keyType; public ReflexiveListReaderCustomizer(@Nonnull final Class typeClass, @Nonnull final Class builderClass, @Nonnull final List staticKeys) { super(typeClass, builderClass); this.staticKeys = checkNotNull(staticKeys, "Static keys cannot be null"); checkState(!this.staticKeys.isEmpty(), "No static keys provided"); + keyType = staticKeys.get(0).getClass(); + } + + @Override + public void readCurrentAttributes(final InstanceIdentifier id, final B builder, final ReadContext context) + throws ReadFailedException { + final Optional method = + ReflectionUtils.findMethodReflex(builder.getClass(), "setKey", + Collections.singletonList(keyType), builder.getClass()); + checkArgument(method.isPresent(), "Unable to setKey to %s", builder); + + try { + method.get().invoke(builder, ((KeyedInstanceIdentifier)id).getKey()); + } catch (IllegalAccessException | InvocationTargetException e) { + throw new IllegalArgumentException("Unable to setKey to " + builder, e); + } } @Override -- cgit 1.2.3-korg