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 ++++++-- .../read/ReflexiveListReaderCustomizerTest.java | 96 ++++++++++++++-------- 2 files changed, 90 insertions(+), 41 deletions(-) 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 diff --git a/infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/read/ReflexiveListReaderCustomizerTest.java b/infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/read/ReflexiveListReaderCustomizerTest.java index fe12ff699..2cc934546 100644 --- a/infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/read/ReflexiveListReaderCustomizerTest.java +++ b/infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/read/ReflexiveListReaderCustomizerTest.java @@ -15,23 +15,71 @@ */ package io.fd.honeycomb.translate.util.read; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.hasSize; +import static org.junit.Assert.assertEquals; + import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opendaylight.yangtools.concepts.Builder; -import org.opendaylight.yangtools.yang.binding.*; +import org.opendaylight.yangtools.yang.binding.DataContainer; +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 java.util.Arrays; -import java.util.List; +public class ReflexiveListReaderCustomizerTest { -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.hasSize; + @Mock + private ReadContext readContext; -public class ReflexiveListReaderCustomizerTest { + @Before + public void init() { + MockitoAnnotations.initMocks(this); + } + + @Test + @SuppressWarnings("unchecked") + public void testReadCurrentAttributes() throws ReadFailedException { + final TestingListObject.TestingListKey keyOne = new TestingListObject.TestingListKey("1"); + final TestingListObject.TestingListKey keyTwo = new TestingListObject.TestingListKey("2"); + final List staticKeys = Arrays.asList(keyOne, keyTwo); + + final ReflexiveListReaderCustomizer customizer + = new ReflexiveListReaderCustomizer<>(TestingListObject.class, TestingListObjectBuilder.class, staticKeys); + + final TestingListObjectBuilder builder = new TestingListObjectBuilder(); + final InstanceIdentifier id = + (InstanceIdentifier) InstanceIdentifier.create( + Collections.singletonList(new InstanceIdentifier.IdentifiableItem<>(TestingListObject.class, keyOne))); + customizer.readCurrentAttributes(id, builder, readContext); + + assertEquals(keyOne, builder.getKey()); + } + + @Test + public void testGetAllIds() throws ReadFailedException { + final TestingListObject.TestingListKey keyOne = new TestingListObject.TestingListKey("1"); + final TestingListObject.TestingListKey keyTwo = new TestingListObject.TestingListKey("2"); + final List staticKeys = Arrays.asList(keyOne, keyTwo); + + final ReflexiveListReaderCustomizer customizer + = new ReflexiveListReaderCustomizer<>(TestingListObject.class, TestingListObjectBuilder.class, staticKeys); + + final List allIds = + customizer.getAllIds(InstanceIdentifier.create(TestingListObject.class), readContext); + + assertThat(allIds, hasSize(2)); + assertThat(allIds, contains(keyOne, keyTwo)); + } static class TestingListObject implements DataObject, Identifiable { @@ -78,38 +126,20 @@ public class ReflexiveListReaderCustomizerTest { static class TestingListObjectBuilder implements Builder { - private final TestingListObject.TestingListKey key; - - TestingListObjectBuilder(final TestingListObject.TestingListKey key) { - this.key = key; - } + private TestingListObject.TestingListKey key; @Override public TestingListObject build() { return new TestingListObject(key); } - } - - @Mock - private ReadContext readContext; - @Before - public void init() { - MockitoAnnotations.initMocks(this); - } - - @Test - public void testStaticKeys() throws ReadFailedException { - final TestingListObject.TestingListKey keyOne = new TestingListObject.TestingListKey("1"); - final TestingListObject.TestingListKey keyTwo = new TestingListObject.TestingListKey("2"); - final List staticKeys = Arrays.asList(keyOne, keyTwo); - - final ReflexiveListReaderCustomizer customizer - = new ReflexiveListReaderCustomizer<>(TestingListObject.class, TestingListObjectBuilder.class, staticKeys); - - final List allIds = customizer.getAllIds(InstanceIdentifier.create(TestingListObject.class), readContext); + public TestingListObjectBuilder setKey(final TestingListObject.TestingListKey key) { + this.key = key; + return this; + } - assertThat(allIds, hasSize(2)); - assertThat(allIds, contains(keyOne, keyTwo)); + public TestingListObject.TestingListKey getKey() { + return key; + } } } -- cgit 1.2.3-korg