From 36f5d08e1e7fb2838d88133140f5dab53f8d9882 Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Tue, 1 Aug 2017 10:11:42 +0200 Subject: HC2VPP-187 - Naming context improvements Adds option to throw specific exception on non existing mapping Change-Id: I1903ad8d0d660380680f99f0252e7ec6d9c8862d Signed-off-by: Jan Srnicek --- .../hc2vpp/common/translate/util/NamingContext.java | 21 +++++++++++++++++++++ .../common/translate/util/NamingContextTest.java | 8 ++++++++ 2 files changed, 29 insertions(+) diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/NamingContext.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/NamingContext.java index 5e0eea71b..8e5c31a14 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/NamingContext.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/NamingContext.java @@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkState; import com.google.common.base.Optional; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.util.RWUtils; +import java.util.function.Supplier; import java.util.stream.Collector; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.Contexts; @@ -168,6 +169,26 @@ public final class NamingContext implements AutoCloseable { } + /** + * Returns index value associated with the given name. + * + * @param name the name whose associated index value is to be returned + * @param mappingContext mapping context providing context data for current transaction + * @param throwIfNonExisting if mapping was not found, supplied exception will be thrown + * @return integer index value matching supplied name + * @throws T if name was not found + */ + public synchronized int getIndex(final String name, + final MappingContext mappingContext, + final Supplier throwIfNonExisting) throws T { + // supplier is used to not instantiate exception if not needed + final Optional read = mappingContext.read(getMappingIid(name)); + if (!read.isPresent()) { + throw throwIfNonExisting.get(); + } + return read.get().getIndex(); + } + /** * Check whether mapping is present for name. * diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/NamingContextTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/NamingContextTest.java index 4e66315e1..c85a874c3 100644 --- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/NamingContextTest.java +++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/NamingContextTest.java @@ -17,6 +17,7 @@ package io.fd.hc2vpp.common.translate.util; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -104,6 +105,13 @@ public class NamingContextTest implements InjectablesProcessor { .build()); } + @Test(expected = IllegalArgumentException.class) + public void getAndThrow() { + when(mappingContext.read(any())).thenReturn(Optional.absent()); + namingContext + .getIndex("non-existing", mappingContext, () -> new IllegalArgumentException("Non existing index")); + } + private Mapping filterForParent(final String parent) { return mappings.getMapping().stream() .filter(mapping -> mapping.getName().equals(parent)) -- cgit 1.2.3-korg