From: Robert Varga Date: Wed, 22 Apr 2020 22:13:54 +0000 (+0200) Subject: Update BindingRuntime{Context,Generator,Types} X-Git-Tag: v6.0.0~14 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=3864bb29b44cb0a67a3beb00f43d36e12994c1f5;p=mdsal.git Update BindingRuntime{Context,Generator,Types} These interfaces should be operating on EffectiveModelContext to provide smooth transition to downstreams. Fix that, along with implementation and tests. JIRA: MDSAL-435 Change-Id: Idfb155984d1261203d225c8293189941d5d345e9 Signed-off-by: Robert Varga --- diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/CurrentAdapterSerializerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/CurrentAdapterSerializerTest.java index 599d959cf8..5b47b74520 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/CurrentAdapterSerializerTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/CurrentAdapterSerializerTest.java @@ -33,8 +33,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class CurrentAdapterSerializerTest { @@ -50,7 +50,7 @@ public class CurrentAdapterSerializerTest { */ @Test public void fromNormalizedNodeTest() throws Exception { - final SchemaContext schemaCtx = YangParserTestUtils.parseYangResource("/test.yang"); + final EffectiveModelContext schemaCtx = YangParserTestUtils.parseYangResource("/test.yang"); final NormalizedNode data = prepareData(schemaCtx, Uint16.valueOf(42)); final Entry, DataObject> fromNormalizedNode = fromNormalizedNode(data, schemaCtx); @@ -81,7 +81,7 @@ public class CurrentAdapterSerializerTest { */ @Test public void fromNormalizedNodeWithAnotherInputDataTest() throws Exception { - final SchemaContext schemaCtx = YangParserTestUtils.parseYangResource("/test.yang"); + final EffectiveModelContext schemaCtx = YangParserTestUtils.parseYangResource("/test.yang"); final NormalizedNode data = prepareData(schemaCtx, "42"); final Entry, DataObject> fromNormalizedNode = fromNormalizedNode(data, schemaCtx); @@ -96,7 +96,7 @@ public class CurrentAdapterSerializerTest { assertThat(ex.getCause(), instanceOf(IllegalArgumentException.class)); } - private static NormalizedNode prepareData(final SchemaContext schemaCtx, final Object value) { + private static NormalizedNode prepareData(final EffectiveModelContext schemaCtx, final Object value) { final DataSchemaNode dataChildByName = schemaCtx.getDataChildByName(QName.create("urn:test", "2017-01-01", "cont")); final DataSchemaNode leaf = ((ContainerSchemaNode) dataChildByName) @@ -109,7 +109,7 @@ public class CurrentAdapterSerializerTest { } private static Entry, DataObject> fromNormalizedNode(final NormalizedNode data, - final SchemaContext schemaCtx) { + final EffectiveModelContext schemaCtx) { final CurrentAdapterSerializer codec = new CurrentAdapterSerializer(new BindingCodecContext( DefaultBindingRuntimeContext.create(new DefaultBindingRuntimeGenerator().generateTypeMapping(schemaCtx), GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy()))); diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/BindingGenerator.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/BindingGenerator.java index 1e61293e6c..0cc1242eb4 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/BindingGenerator.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/BindingGenerator.java @@ -11,8 +11,8 @@ import java.util.Collection; import java.util.List; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** * Transform Schema Context to Generated types. @@ -20,14 +20,14 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; public interface BindingGenerator { /** * Generate Types from whole Schema Context. The method will return List of All Generated Types that could be - * Generated from Schema Context. + * Generated from EffectiveModelContext. * - * @param context Schema Context + * @param context EffectiveModelContext * @return List of Generated Types * - * @see SchemaContext + * @see EffectiveModelContext */ - default @NonNull List generateTypes(final SchemaContext context) { + default @NonNull List generateTypes(final EffectiveModelContext context) { return generateTypes(context, context.getModules()); } @@ -41,7 +41,7 @@ public interface BindingGenerator { * @return List of Generated Types restricted by sub set of Modules * * @see Module - * @see SchemaContext + * @see EffectiveModelContext */ - @NonNull List generateTypes(SchemaContext context, Collection modules); + @NonNull List generateTypes(EffectiveModelContext context, Collection modules); } diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java index 90d6ccf396..c5e74c586a 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java @@ -105,6 +105,7 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; import org.opendaylight.yangtools.yang.model.api.DocumentedNode; import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; @@ -115,7 +116,6 @@ import org.opendaylight.yangtools.yang.model.api.ModuleImport; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import org.opendaylight.yangtools.yang.model.api.NotificationNodeContainer; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; @@ -187,14 +187,14 @@ abstract class AbstractTypeGenerator { /** * Holds reference to schema context to resolve data of augmented element when creating augmentation builder. */ - private final @NonNull SchemaContext schemaContext; + private final @NonNull EffectiveModelContext schemaContext; /** * Holds renamed elements. */ private final Map renames; - AbstractTypeGenerator(final SchemaContext context, final AbstractTypeProvider typeProvider, + AbstractTypeGenerator(final EffectiveModelContext context, final AbstractTypeProvider typeProvider, final Map renames) { this.schemaContext = requireNonNull(context); this.typeProvider = requireNonNull(typeProvider); @@ -209,7 +209,7 @@ abstract class AbstractTypeGenerator { contexts.forEach(this::allAugmentsToGenTypes); } - final @NonNull SchemaContext schemaContext() { + final @NonNull EffectiveModelContext schemaContext() { return schemaContext; } diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/CodegenTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/CodegenTypeGenerator.java index 31339498e3..2365033583 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/CodegenTypeGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/CodegenTypeGenerator.java @@ -24,12 +24,12 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.TypeMemberBuilder; import org.opendaylight.mdsal.binding.model.util.TypeComments; import org.opendaylight.mdsal.binding.yang.types.CodegenTypeProvider; import org.opendaylight.yangtools.yang.model.api.DocumentedNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; final class CodegenTypeGenerator extends AbstractTypeGenerator { - CodegenTypeGenerator(final SchemaContext context, final Map renames) { + CodegenTypeGenerator(final EffectiveModelContext context, final Map renames) { super(context, new CodegenTypeProvider(context, renames), renames); } diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGenerator.java index 84c4abc47d..c55f7f76df 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGenerator.java @@ -21,8 +21,8 @@ import org.kohsuke.MetaInfServices; import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; /** @@ -34,12 +34,12 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode; // Note: not exposed in OSGi on purpose, as this should only be needed at compile-time public final class DefaultBindingGenerator implements BindingGenerator { @Override - public List generateTypes(final SchemaContext context, final Collection modules) { + public List generateTypes(final EffectiveModelContext context, final Collection modules) { return generateFor(context, modules); } @VisibleForTesting - static @NonNull List generateFor(final SchemaContext context) { + static @NonNull List generateFor(final EffectiveModelContext context) { return generateFor(context, context.getModules()); } @@ -66,7 +66,8 @@ public final class DefaultBindingGenerator implements BindingGenerator { * if context contain no modules */ @VisibleForTesting - static @NonNull List generateFor(final SchemaContext context, final Collection modules) { + static @NonNull List generateFor(final EffectiveModelContext context, + final Collection modules) { GeneratorUtils.checkContext(context); checkArgument(modules != null, "Set of Modules cannot be NULL."); diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingRuntimeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingRuntimeGenerator.java index 30cca455ca..6223c8a4bf 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingRuntimeGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingRuntimeGenerator.java @@ -15,7 +15,7 @@ import org.kohsuke.MetaInfServices; import org.opendaylight.binding.runtime.api.BindingRuntimeGenerator; import org.opendaylight.binding.runtime.api.BindingRuntimeTypes; import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -34,7 +34,7 @@ public final class DefaultBindingRuntimeGenerator implements BindingRuntimeGener private static final Logger LOG = LoggerFactory.getLogger(DefaultBindingRuntimeGenerator.class); @Override - public BindingRuntimeTypes generateTypeMapping(final SchemaContext context) { + public BindingRuntimeTypes generateTypeMapping(final EffectiveModelContext context) { GeneratorUtils.checkContext(context); final Map renames = new IdentityHashMap<>(); diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java index 1402fda037..0f78dbca92 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java @@ -29,12 +29,12 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.DocumentedNode; import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; final class RuntimeTypeGenerator extends AbstractTypeGenerator { - RuntimeTypeGenerator(final SchemaContext context, final Map renames) { + RuntimeTypeGenerator(final EffectiveModelContext context, final Map renames) { super(context, new RuntimeTypeProvider(context, renames), renames); } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ActionsTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ActionsTest.java index 7dfd8f3abf..4981408077 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ActionsTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ActionsTest.java @@ -13,13 +13,13 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class ActionsTest { @Test public void actionsTypeTest() { - SchemaContext context = YangParserTestUtils.parseYangResource("/actions.yang"); + EffectiveModelContext context = YangParserTestUtils.parseYangResource("/actions.yang"); List generateTypes = DefaultBindingGenerator.generateFor(context); assertNotNull(generateTypes); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java index 812b0f2e92..c53cc7de94 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java @@ -19,7 +19,7 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.spec.naming.BindingMapping; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class AugmentRelativeXPathTest extends AbstractTypesTest { @@ -31,7 +31,7 @@ public class AugmentRelativeXPathTest extends AbstractTypesTest { @Test public void testAugmentationWithRelativeXPath() { - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); + final EffectiveModelContext context = YangParserTestUtils.parseYangFiles(testModels); assertNotNull("context is null", context); final List genTypes = DefaultBindingGenerator.generateFor(context); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java index faf840d85d..a7d658ac82 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java @@ -19,14 +19,14 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.spec.naming.BindingMapping; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class AugmentedTypeTest { @Test public void augmentedAbstractTopologyTest() { - final SchemaContext context = YangParserTestUtils.parseYangResources(AugmentedTypeTest.class, + final EffectiveModelContext context = YangParserTestUtils.parseYangResources(AugmentedTypeTest.class, "/augment-test-models/abstract-topology@2013-02-08.yang", "/augment-test-models/augment-abstract-topology@2013-05-03.yang", "/augment-test-models/augment-network-link-attributes@2013-05-03.yang", diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BinaryTypeTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BinaryTypeTest.java index ab50acd53e..926892b5da 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BinaryTypeTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BinaryTypeTest.java @@ -18,7 +18,7 @@ import java.util.List; import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class BinaryTypeTest { @@ -37,7 +37,7 @@ public class BinaryTypeTest { @Test public void binaryTypeTest() { - final SchemaContext context = YangParserTestUtils.parseYangFiles(YANG_MODELS); + final EffectiveModelContext context = YangParserTestUtils.parseYangFiles(YANG_MODELS); assertNotNull("context is null", context); final List genTypes = DefaultBindingGenerator.generateFor(context); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java index 48a1a74a7d..4c157a2a22 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java @@ -17,27 +17,23 @@ import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class BindingGeneratorImplTest { @Test public void isisTotpologyStatementParserTest() { - SchemaContext context = YangParserTestUtils.parseYangResources(BindingGeneratorImplTest.class, + List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources( + BindingGeneratorImplTest.class, "/isis-topology/network-topology@2013-10-21.yang", "/isis-topology/isis-topology@2013-10-21.yang", - "/isis-topology/l3-unicast-igp-topology@2013-10-21.yang"); - assertNotNull(context); - - List generateTypes = DefaultBindingGenerator.generateFor(context); + "/isis-topology/l3-unicast-igp-topology@2013-10-21.yang")); assertFalse(generateTypes.isEmpty()); } @Test public void choiceNodeGenerationTest() { - SchemaContext context = YangParserTestUtils.parseYangResource("/binding-generator-impl-test/choice-test.yang"); - - List generateTypes = DefaultBindingGenerator.generateFor(context); + List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/binding-generator-impl-test/choice-test.yang")); GeneratedType choiceTestData = null; GeneratedType myRootContainer = null; @@ -130,10 +126,8 @@ public class BindingGeneratorImplTest { @Test public void notificationGenerationTest() { - SchemaContext context = YangParserTestUtils.parseYangResource( - "/binding-generator-impl-test/notification-test.yang"); - - List generateTypes = DefaultBindingGenerator.generateFor(context); + List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/binding-generator-impl-test/notification-test.yang")); GeneratedType foo = null; for (Type type : generateTypes) { diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java index 319197c988..578a9cc1aa 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java @@ -19,7 +19,6 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class BitAndUnionTOEnclosingTest { @@ -29,10 +28,7 @@ public class BitAndUnionTOEnclosingTest { @BeforeClass public static void loadTestResources() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/bit_and_union.yang"); - - assertNotNull(context); - genTypes = DefaultBindingGenerator.generateFor(context); + genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource("/bit_and_union.yang")); for (Type type : genTypes) { if (type instanceof GeneratedType) { diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java index 54a9a46b3b..2863c7f0c7 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java @@ -13,15 +13,13 @@ import static org.junit.Assert.assertTrue; import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Bug4145Test { @Test public void bug4145Test() { - SchemaContext context = YangParserTestUtils.parseYangResource("/bug-4145/foo.yang"); - - List generateTypes = DefaultBindingGenerator.generateFor(context); + List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/bug-4145/foo.yang")); assertNotNull(generateTypes); assertTrue(generateTypes.size() > 0); } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java index 786bd09982..eea340e6a7 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java @@ -16,17 +16,13 @@ import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Enumeration; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Bug6135Test { - @Test public void bug6135Test() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/bug-6135/foo.yang"); - assertNotNull(context); - - final List generateTypes = DefaultBindingGenerator.generateFor(context); + final List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/bug-6135/foo.yang")); assertFalse(generateTypes.isEmpty()); GeneratedType genInterface = null; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java index be704dbee2..c1940cb40e 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java @@ -18,7 +18,6 @@ import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class ChoiceCaseGenTypesTest extends AbstractTypesTest { @@ -54,10 +53,7 @@ public class ChoiceCaseGenTypesTest extends AbstractTypesTest { @Test public void choiceCaseResolvingTypeTest() { - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); - - assertNotNull("context is null", context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangFiles(testModels)); assertNotNull("genTypes is null", genTypes); assertFalse("genTypes is empty", genTypes.isEmpty()); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ControllerTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ControllerTest.java index c9fa922b3a..149902089a 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ControllerTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ControllerTest.java @@ -13,19 +13,15 @@ import static org.junit.Assert.assertTrue; import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class ControllerTest { - @Test public void controllerAugmentationTest() { - final SchemaContext context = YangParserTestUtils.parseYangResources(ControllerTest.class, + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources( + ControllerTest.class, "/controller-models/controller-network.yang", "/controller-models/controller-openflow.yang", - "/ietf/ietf-inet-types.yang"); - assertNotNull("Schema Context is null", context); - - final List genTypes = DefaultBindingGenerator.generateFor(context); + "/ietf/ietf-inet-types.yang")); assertNotNull(genTypes); assertTrue(!genTypes.isEmpty()); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java index e138deb257..3b0dfc2689 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java @@ -18,18 +18,14 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.util.BaseYangTypes; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class ExtendedTypedefTest { - @Test public void constantGenerationTest() { - final SchemaContext context = YangParserTestUtils.parseYangResources(ExtendedTypedefTest.class, - "/typedef-of-typedef/typedef_of_typedef.yang", "/ietf/ietf-inet-types.yang"); - assertNotNull("Schema Context is null", context); - - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources( + ExtendedTypedefTest.class, + "/typedef-of-typedef/typedef_of_typedef.yang", "/ietf/ietf-inet-types.yang")); GeneratedTransferObject simpleTypedef4 = null; GeneratedTransferObject extendedTypedefUnion = null; @@ -126,5 +122,4 @@ public class ExtendedTypedefTest { assertEquals("Incorrect type for property typedefEnumFruit.", "TypedefEnumFruit", typedefEnumFruitProperty .getReturnType().getName()); } - } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java index 8a5ec25ec3..ae0b74ea7c 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java @@ -17,18 +17,14 @@ import org.opendaylight.mdsal.binding.model.api.Enumeration; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GenEnumResolvingTest { - @Test public void testLeafEnumResolving() { - final SchemaContext context = YangParserTestUtils.parseYangResources(GenEnumResolvingTest.class, - "/enum-test-models/ietf-interfaces@2012-11-15.yang", "/ietf/iana-if-type.yang"); - assertTrue(context != null); - - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources( + GenEnumResolvingTest.class, + "/enum-test-models/ietf-interfaces@2012-11-15.yang", "/ietf/iana-if-type.yang")); assertTrue(genTypes != null); assertEquals("Expected count of all Generated Types", 6, genTypes.size()); @@ -85,9 +81,8 @@ public class GenEnumResolvingTest { @Test public void testTypedefEnumResolving() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/ietf/iana-if-type.yang"); - assertTrue(context != null); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/ietf/iana-if-type.yang")); assertTrue(genTypes != null); assertEquals(1, genTypes.size()); @@ -100,11 +95,10 @@ public class GenEnumResolvingTest { @Test public void testLeafrefEnumResolving() { - final SchemaContext context = YangParserTestUtils.parseYangResources(GenEnumResolvingTest.class, + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources( + GenEnumResolvingTest.class, "/enum-test-models/abstract-topology@2013-02-08.yang", "/enum-test-models/ietf-interfaces@2012-11-15.yang", - "/ietf/iana-if-type.yang"); - assertNotNull(context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + "/ietf/iana-if-type.yang")); assertNotNull(genTypes); assertTrue(!genTypes.isEmpty()); @@ -145,5 +139,4 @@ public class GenEnumResolvingTest { "org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev121115.interfaces.Interface", operStatus.getIdentifier().immediatelyEnclosingClass().get().toString()); } - } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java index cf94952c2d..806fb76bda 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java @@ -16,15 +16,15 @@ import java.util.List; import java.util.Set; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GenTypesSubSetTest { @Test public void genTypesFromSubsetOfTwoModulesTest() { - final SchemaContext context = YangParserTestUtils.parseYangResources(GenTypesSubSetTest.class, + final EffectiveModelContext context = YangParserTestUtils.parseYangResources(GenTypesSubSetTest.class, "/leafref-test-models/abstract-topology@2013-02-08.yang", "/ietf/ietf-interfaces.yang", "/ietf/ietf-inet-types.yang", "/ietf/ietf-yang-types.yang"); final Set toGenModules = new HashSet<>(); @@ -47,7 +47,7 @@ public class GenTypesSubSetTest { @Test public void genTypesFromSubsetOfThreeModulesTest() { - final SchemaContext context = YangParserTestUtils.parseYangResources(GenTypesSubSetTest.class, + final EffectiveModelContext context = YangParserTestUtils.parseYangResources(GenTypesSubSetTest.class, "/leafref-test-models/abstract-topology@2013-02-08.yang", "/ietf/ietf-interfaces.yang", "/ietf/ietf-inet-types.yang", "/ietf/ietf-yang-types.yang", "/ietf/iana-if-type.yang"); assertNotNull("Schema Context is null", context); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java index 1093f9b963..76656dcc01 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java @@ -15,17 +15,13 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GenerateInnerClassForBitsAndUnionInLeavesTest { - @Test public void testInnerClassCreationForBitsAndUnionsInLeafes() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/bit_and_union_in_leaf.yang"); - assertTrue(context != null); - - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/bit_and_union_in_leaf.yang")); assertTrue(genTypes != null); boolean parentContainerFound = false; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java index 28781e997f..a6d4751014 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java @@ -20,17 +20,13 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.MethodSignature.Parameter; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GeneratedTypesBitsTest { - @Test public void testGeneretedTypesBitsTest() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/simple-bits-demo.yang"); - assertTrue(context != null); - - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/simple-bits-demo.yang")); assertTrue(genTypes != null); List methodSignaturesList = null; @@ -111,5 +107,4 @@ public class GeneratedTypesBitsTest { assertFalse(setByteLeafMethodFound); assertEquals(0, setByteLeafMethodParamNum); } - } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java index ec18861b0f..87e5fc1b57 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java @@ -21,17 +21,16 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.spec.naming.BindingMapping; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GeneratedTypesLeafrefTest { @Test public void testLeafrefResolving() { - final SchemaContext context = YangParserTestUtils.parseYangResources(GeneratedTypesLeafrefTest.class, + final EffectiveModelContext context = YangParserTestUtils.parseYangResources(GeneratedTypesLeafrefTest.class, "/leafref-test-models/abstract-topology@2013-02-08.yang", "/ietf/ietf-interfaces.yang", "/ietf/ietf-inet-types.yang", "/ietf/ietf-yang-types.yang"); - assertNotNull(context); assertEquals(4, context.getModules().size()); final List genTypes = DefaultBindingGenerator.generateFor(context); @@ -213,8 +212,8 @@ public class GeneratedTypesLeafrefTest { @Test public void testLeafrefInvalidPathResolving() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/leafref-test-invalid-model/foo.yang"); - assertNotNull(context); + final EffectiveModelContext context = YangParserTestUtils.parseYangResource( + "/leafref-test-invalid-model/foo.yang"); assertEquals(1, context.getModules().size()); try { diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java index d0b33b462e..5115bdae8e 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java @@ -7,7 +7,6 @@ */ package org.opendaylight.mdsal.binding.generator.impl; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.List; @@ -18,17 +17,13 @@ import org.opendaylight.mdsal.binding.model.api.Constant; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GeneratedTypesStringTest { - @Test public void constantGenerationTest() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/simple-string-demo.yang"); - - assertNotNull(context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/simple-string-demo.yang")); boolean typedefStringFound = false; boolean constantRegExListFound = false; @@ -104,7 +99,5 @@ public class GeneratedTypesStringTest { assertTrue("Constant PATTERN_CONSTANTS doesn't have correct generic type", constantRegExListTypeGeneric); assertTrue("Constant PATTERN_CONSTANTS doesn't contain List object", constantRegExListValueOK); assertTrue("In list found other type than String", !noStringInReqExListFound); - } - } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java index 825596abc8..3fc45f4c95 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java @@ -19,18 +19,13 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.spec.naming.BindingMapping; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GeneratedTypesTest { - @Test public void testMultipleModulesResolving() { - final SchemaContext context = YangParserTestUtils.parseYangResources(GeneratedTypesTest.class, - "/abstract-topology.yang", "/ietf/ietf-inet-types.yang"); - assertNotNull(context); - - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources( + GeneratedTypesTest.class, "/abstract-topology.yang", "/ietf/ietf-inet-types.yang")); assertNotNull(genTypes); assertEquals(29, genTypes.size()); @@ -38,10 +33,8 @@ public class GeneratedTypesTest { @Test public void testContainerResolving() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/simple-container-demo.yang"); - assertNotNull(context); - - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/simple-container-demo.yang")); assertNotNull(genTypes); assertEquals(3, genTypes.size()); @@ -121,10 +114,8 @@ public class GeneratedTypesTest { @Test public void testLeafListResolving() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/simple-leaf-list-demo.yang"); - assertNotNull(context); - - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/simple-leaf-list-demo.yang")); assertNotNull(genTypes); assertEquals(3, genTypes.size()); @@ -206,10 +197,8 @@ public class GeneratedTypesTest { @Test public void testListResolving() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/simple-list-demo.yang"); - assertNotNull(context); - - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/simple-list-demo.yang")); assertNotNull(genTypes); assertEquals(5, genTypes.size()); @@ -336,10 +325,8 @@ public class GeneratedTypesTest { @Test public void testListCompositeKeyResolving() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/list-composite-key.yang"); - assertNotNull(context); - - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/list-composite-key.yang")); assertNotNull(genTypes); assertEquals(7, genTypes.size()); @@ -386,10 +373,8 @@ public class GeneratedTypesTest { @Test public void testGeneratedTypes() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/demo-topology.yang"); - assertNotNull(context); - - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/demo-topology.yang")); assertNotNull(genTypes); assertEquals(14, genTypes.size()); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java index 6ba3cd8b31..40e86f1700 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java @@ -21,7 +21,6 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class IdentityrefTypeTest { @@ -51,10 +50,7 @@ public class IdentityrefTypeTest { */ @Test public void testIdentityrefYangBuiltInType() { - final SchemaContext context = YangParserTestUtils.parseYangFiles(testModels); - - assertNotNull(context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangFiles(testModels)); GeneratedType moduleGenType = null; for (Type type : genTypes) { diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java index e87d7980c4..ad589b0c16 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java @@ -16,7 +16,6 @@ import java.util.Optional; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal161Test { @@ -25,8 +24,8 @@ public class Mdsal161Test { */ @Test public void mdsal161Test() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal161.yang"); - final Collection types = DefaultBindingGenerator.generateFor(context); + final Collection types = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/mdsal161.yang")); assertNotNull(types); assertEquals(24, types.size()); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal182Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal182Test.java index 7eccb3bcff..67156ad9ee 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal182Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal182Test.java @@ -13,7 +13,6 @@ import static org.junit.Assert.assertNotNull; import java.util.Collection; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** @@ -22,15 +21,15 @@ import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal182Test { @Test public void testOneUpLeafref() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal-182/good-leafref.yang"); - final Collection types = DefaultBindingGenerator.generateFor(context); + final Collection types = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/mdsal-182/good-leafref.yang")); assertEquals(6, types.size()); } @Test public void testTwoUpLeafref() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal-182/grouping-leafref.yang"); - final Collection types = DefaultBindingGenerator.generateFor(context); + final Collection types = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/mdsal-182/grouping-leafref.yang")); assertNotNull(types); assertEquals(4, types.size()); } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java index 52871322e1..02de4d4d46 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java @@ -18,15 +18,13 @@ import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal269Test { @Test public void mdsal269Test() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal269.yang"); - - final List generateTypes = DefaultBindingGenerator.generateFor(context); + final List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/mdsal269.yang")); assertNotNull(generateTypes); assertEquals(4, generateTypes.size()); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal300Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal300Test.java index 19f6e0773d..332cc59c00 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal300Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal300Test.java @@ -13,15 +13,13 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal300Test { @Test public void testActionsAndAugmentsTest() { - SchemaContext context = YangParserTestUtils.parseYangResourceDirectory("/mdsal-300"); - - List generateTypes = DefaultBindingGenerator.generateFor(context); + List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResourceDirectory( + "/mdsal-300")); assertNotNull(generateTypes); assertEquals(18, generateTypes.size()); } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal302Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal302Test.java index 0aeb0bbbf1..f08e6460fd 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal302Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal302Test.java @@ -13,15 +13,13 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal302Test { @Test public void bug4145Test() { - SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal-302/mdsal-302.yang"); - - List generateTypes = DefaultBindingGenerator.generateFor(context); + List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/mdsal-302/mdsal-302.yang")); assertNotNull(generateTypes); assertEquals(15, generateTypes.size()); } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java index ed7b95b017..ce7ea28b8d 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java @@ -20,15 +20,13 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal320Test { @Test public void mdsal320Test() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal320.yang"); - - final List generateTypes = DefaultBindingGenerator.generateFor(context); + final List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/mdsal320.yang")); assertNotNull(generateTypes); assertEquals(4, generateTypes.size()); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal324Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal324Test.java index 291e43ae0c..4fee03e208 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal324Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal324Test.java @@ -13,14 +13,13 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal324Test { @Test public void mdsal324Test() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal324.yang"); - final List generateTypes = DefaultBindingGenerator.generateFor(context); + final List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/mdsal324.yang")); assertNotNull(generateTypes); assertEquals(6, generateTypes.size()); } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal332Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal332Test.java index 862a163d8c..c8880670af 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal332Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal332Test.java @@ -17,15 +17,13 @@ import java.util.Set; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal332Test { @Test public void mdsal332Test() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal332.yang"); - - final List generateTypes = DefaultBindingGenerator.generateFor(context); + final List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/mdsal332.yang")); assertNotNull(generateTypes); assertEquals(5, generateTypes.size()); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal335Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal335Test.java index d9787d55b1..0184738fea 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal335Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal335Test.java @@ -15,15 +15,13 @@ import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal335Test { @Test public void mdsal335Test() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal335.yang"); - - final List generateTypes = DefaultBindingGenerator.generateFor(context); + final List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/mdsal335.yang")); assertNotNull(generateTypes); assertEquals(2, generateTypes.size()); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal352Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal352Test.java index a3bc9b4ac4..de01e1f077 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal352Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal352Test.java @@ -13,14 +13,13 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal352Test { @Test public void mdsal352Test() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal352.yang"); - final List generateTypes = DefaultBindingGenerator.generateFor(context); + final List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/mdsal352.yang")); assertNotNull(generateTypes); assertEquals(6, generateTypes.size()); } diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java index 074b7cdc9e..a281edcb1b 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java @@ -18,16 +18,13 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.util.BindingTypes; import org.opendaylight.mdsal.binding.model.util.Types; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal406TypeObjectTest { @Test public void typeObjectTest() { - final SchemaContext context = YangParserTestUtils.parseYangResources(ExtendedTypedefTest.class, - "/type-provider/test.yang", "/ietf/ietf-inet-types.yang"); - - final List generateTypes = DefaultBindingGenerator.generateFor(context); + final List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources( + ExtendedTypedefTest.class, "/type-provider/test.yang", "/ietf/ietf-inet-types.yang")); assertNotNull(generateTypes); final Type typedefType = generateTypes.stream().filter(type -> type.getFullyQualifiedName() @@ -43,10 +40,8 @@ public class Mdsal406TypeObjectTest { @Test public void typeObjectForBitsTypedefTest() { - final SchemaContext context = YangParserTestUtils.parseYangResources(ExtendedTypedefTest.class, - "/type-provider/test.yang", "/ietf/ietf-inet-types.yang"); - - final List generateTypes = DefaultBindingGenerator.generateFor(context); + final List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources( + ExtendedTypedefTest.class, "/type-provider/test.yang", "/ietf/ietf-inet-types.yang")); assertNotNull(generateTypes); final Type typedefType = generateTypes.stream().filter(type -> type.getFullyQualifiedName() @@ -62,10 +57,8 @@ public class Mdsal406TypeObjectTest { @Test public void typeObjectForUnionTypedefTest() { - final SchemaContext context = YangParserTestUtils.parseYangResources(ExtendedTypedefTest.class, - "/type-provider/test.yang", "/ietf/ietf-inet-types.yang"); - - final List generateTypes = DefaultBindingGenerator.generateFor(context); + final List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources( + ExtendedTypedefTest.class, "/type-provider/test.yang", "/ietf/ietf-inet-types.yang")); assertNotNull(generateTypes); final Type typedefType = generateTypes.stream().filter(type -> type.getFullyQualifiedName() diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal437Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal437Test.java index 759974ea2d..e5f4e80407 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal437Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal437Test.java @@ -13,15 +13,13 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal437Test extends AbstractOpaqueTest { @Test public void generateAnyxmlTest() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal437.yang"); - - final List types = DefaultBindingGenerator.generateFor(context); + final List types = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/mdsal437.yang")); assertNotNull(types); assertEquals(7, types.size()); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal438Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal438Test.java index b5ccc4f055..8ba8262d17 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal438Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal438Test.java @@ -13,15 +13,13 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal438Test extends AbstractOpaqueTest { @Test public void generateAnydataTest() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal438.yang"); - - final List types = DefaultBindingGenerator.generateFor(context); + final List types = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/mdsal438.yang")); assertNotNull(types); assertEquals(7, types.size()); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal448Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal448Test.java index f1a41c5274..e6a8ddc94c 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal448Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal448Test.java @@ -17,14 +17,14 @@ import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.yang.types.GroupingDefinitionDependencySort; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal448Test { @Test public void groupingSortIncludesActions() { - final SchemaContext context = YangParserTestUtils.parseYangResource("/mdsal448.yang"); + final EffectiveModelContext context = YangParserTestUtils.parseYangResource("/mdsal448.yang"); final Collection groupings = context.findModule("mdsal448").get().getGroupings(); assertEquals(2, groupings.size()); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java index b642c2cdd5..70fcb183f4 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java @@ -17,18 +17,13 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.util.Types; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class UnionTypeDefTest { - @Test public void unionTypeResolvingTest() { - final SchemaContext context = YangParserTestUtils.parseYangResources(UnionTypeDefTest.class, - "/union-test-models/abstract-topology.yang", "/ietf/ietf-inet-types.yang"); - - assertNotNull("context is null", context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResources( + UnionTypeDefTest.class, "/union-test-models/abstract-topology.yang", "/ietf/ietf-inet-types.yang")); assertNotNull("genTypes is null", genTypes); assertFalse("genTypes is empty", genTypes.isEmpty()); @@ -38,10 +33,8 @@ public class UnionTypeDefTest { @Test public void unionTypedefLeafrefTest() { - final SchemaContext schemaContext = YangParserTestUtils.parseYangResource( - "/leafref_typedef_union/bug8449.yang"); - assertNotNull(schemaContext); - final List generateTypes = DefaultBindingGenerator.generateFor(schemaContext); + final List generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/leafref_typedef_union/bug8449.yang")); assertNotNull(generateTypes); for (final Type type : generateTypes) { if (type.getName().equals("Cont")) { diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java index 638e842ea9..533a33c3c4 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java @@ -17,18 +17,13 @@ import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class UsesTest { - @Test public void usesInGroupingDependenciesTest() { - final SchemaContext context = YangParserTestUtils.parseYangResource( - "/uses-of-grouping/uses-of-grouping-dependencies.yang"); - - assertNotNull(context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/uses-of-grouping/uses-of-grouping-dependencies.yang")); GeneratedType groupingU = null; GeneratedType groupingX = null; GeneratedType groupingV = null; @@ -77,11 +72,8 @@ public class UsesTest { @Test public void usesInCaseTest() { - final SchemaContext context = YangParserTestUtils.parseYangResource( - "/uses-of-grouping/uses-of-grouping-case.yang"); - - assertNotNull(context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/uses-of-grouping/uses-of-grouping-case.yang")); GeneratedType groupingCaseTest = null; int groupingCaseTestCounter = 0; @@ -123,11 +115,8 @@ public class UsesTest { @Test public void usesInContainerTest() { - final SchemaContext context = YangParserTestUtils.parseYangResource( - "/uses-of-grouping/uses-of-grouping-container.yang"); - - assertNotNull(context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/uses-of-grouping/uses-of-grouping-container.yang")); int containerTestCount = 0; int groupingContainerTestCounter = 0; @@ -174,11 +163,8 @@ public class UsesTest { @Test public void usesInGroupingTest() { - final SchemaContext context = YangParserTestUtils.parseYangResource( - "/uses-of-grouping/uses-of-grouping-grouping.yang"); - - assertNotNull(context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/uses-of-grouping/uses-of-grouping-grouping.yang")); int groupingTestCount = 0; int groupingGroupingTestCounter = 0; @@ -223,11 +209,8 @@ public class UsesTest { @Test public void usesInListTest() { - final SchemaContext context = YangParserTestUtils.parseYangResource( - "/uses-of-grouping/uses-of-grouping-list.yang"); - - assertNotNull(context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/uses-of-grouping/uses-of-grouping-list.yang")); int listTestCounter = 0; int groupingListTestCounter = 0; @@ -303,11 +286,8 @@ public class UsesTest { @Test public void usesInModulTest() { - final SchemaContext context = YangParserTestUtils.parseYangResource( - "/uses-of-grouping/uses-of-grouping-modul.yang"); - - assertNotNull(context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/uses-of-grouping/uses-of-grouping-modul.yang")); int groupingModulTestCounter = 0; int groupingUsesModulDataCounter = 0; @@ -352,11 +332,8 @@ public class UsesTest { @Test public void usesInRpcTest() { - final SchemaContext context = YangParserTestUtils.parseYangResource( - "/uses-of-grouping/uses-of-grouping-rpc.yang"); - - assertNotNull(context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/uses-of-grouping/uses-of-grouping-rpc.yang")); int rpcTestInputCounter = 0; int rpcTestOutputCounter = 0; @@ -443,11 +420,8 @@ public class UsesTest { @Test public void usesInAugmentTest() { - final SchemaContext context = YangParserTestUtils.parseYangResource( - "/uses-of-grouping/uses-of-grouping-augment.yang"); - - assertNotNull(context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/uses-of-grouping/uses-of-grouping-augment.yang")); GeneratedType containerAugment1 = null; GeneratedType groupingAugmentTest = null; @@ -494,11 +468,8 @@ public class UsesTest { @Test public void usesInNotification() { - final SchemaContext context = YangParserTestUtils.parseYangResource( - "/uses-of-grouping/uses-of-grouping-notification.yang"); - - assertNotNull(context); - final List genTypes = DefaultBindingGenerator.generateFor(context); + final List genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource( + "/uses-of-grouping/uses-of-grouping-notification.yang")); GeneratedType notificationTest = null; GeneratedType groupingNotificationTest = null; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java index 447e812aa6..952cc1e47a 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java @@ -25,17 +25,13 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBu import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.model.util.generated.type.builder.CodegenGeneratedTOBuilder; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class ClassCodeGeneratorTest { @Test public void compositeKeyClassTest() { - - final SchemaContext context = YangParserTestUtils.parseYangResource("/list-composite-key.yang"); - - assertNotNull(context); - final List genTypes = new DefaultBindingGenerator().generateTypes(context); + final List genTypes = new DefaultBindingGenerator().generateTypes(YangParserTestUtils.parseYangResource( + "/list-composite-key.yang")); assertTrue(genTypes != null); assertEquals(7, genTypes.size()); diff --git a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeContext.java b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeContext.java index 886fb6376f..6679c9f278 100644 --- a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeContext.java +++ b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeContext.java @@ -29,8 +29,8 @@ import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; @@ -43,7 +43,7 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; * by additional models. Same goes for all possible augmentations. */ @Beta -public interface BindingRuntimeContext extends SchemaContextProvider, Immutable { +public interface BindingRuntimeContext extends EffectiveModelContextProvider, Immutable { /** * Returns a class loading strategy associated with this binding runtime context * which is used to load classes. @@ -55,8 +55,8 @@ public interface BindingRuntimeContext extends SchemaContextProvider, Immutable @NonNull BindingRuntimeTypes getTypes(); @Override - default SchemaContext getSchemaContext() { - return getTypes().getSchemaContext(); + default EffectiveModelContext getEffectiveModelContext() { + return getTypes().getEffectiveModelContext(); } /** diff --git a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeGenerator.java b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeGenerator.java index c76a44d912..0f24334533 100644 --- a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeGenerator.java +++ b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeGenerator.java @@ -10,7 +10,7 @@ package org.opendaylight.binding.runtime.api; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; /** * Runtime equivalent of {@link BindingGenerator}. It generates equivalent type information, but does not include @@ -20,12 +20,12 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; @NonNullByDefault public interface BindingRuntimeGenerator { /** - * Generate Type mapping from specified {@link SchemaContext} for the specified subset of modules. The SchemaContext - * MUST contain all of the sub modules otherwise the there is no guarantee that result List of Generated Types will - * contain correct Generated Types. + * Generate Type mapping from specified {@link EffectiveModelContext} for the specified subset of modules. + * The EffectiveModelContext MUST contain all of the sub modules otherwise the there is no guarantee that result + * List of Generated Types will contain correct Generated Types. * * @param context Schema Context * @return Generated type mapping. */ - BindingRuntimeTypes generateTypeMapping(SchemaContext context); + BindingRuntimeTypes generateTypeMapping(EffectiveModelContext context); } diff --git a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeTypes.java b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeTypes.java index 5b79598533..7c7ec903a6 100644 --- a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeTypes.java +++ b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeTypes.java @@ -25,21 +25,21 @@ import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; /** * The result of BindingGenerator run. Contains mapping between Types and SchemaNodes. */ @Beta -public final class BindingRuntimeTypes implements SchemaContextProvider, Immutable { - private final @NonNull SchemaContext schemaContext; +public final class BindingRuntimeTypes implements EffectiveModelContextProvider, Immutable { + private final @NonNull EffectiveModelContext schemaContext; private final ImmutableMap typeToAugmentation; private final ImmutableBiMap typeToSchema; private final ImmutableMultimap choiceToCases; private final ImmutableMap identities; - public BindingRuntimeTypes(final SchemaContext schemaContext, + public BindingRuntimeTypes(final EffectiveModelContext schemaContext, final Map typeToAugmentation, final BiMap typeToDefiningSchema, final Multimap choiceToCases, final Map identities) { @@ -51,7 +51,7 @@ public final class BindingRuntimeTypes implements SchemaContextProvider, Immutab } @Override - public SchemaContext getSchemaContext() { + public EffectiveModelContext getEffectiveModelContext() { return schemaContext; }