Update BindingRuntime{Context,Generator,Types} 94/89294/5
authorRobert Varga <robert.varga@pantheon.tech>
Wed, 22 Apr 2020 22:13:54 +0000 (00:13 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Wed, 22 Apr 2020 23:19:50 +0000 (01:19 +0200)
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 <robert.varga@pantheon.tech>
46 files changed:
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/CurrentAdapterSerializerTest.java
binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/BindingGenerator.java
binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java
binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/CodegenTypeGenerator.java
binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGenerator.java
binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingRuntimeGenerator.java
binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ActionsTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BinaryTypeTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ControllerTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal182Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal300Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal302Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal324Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal332Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal335Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal352Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal437Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal438Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal448Test.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java
binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java
binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeContext.java
binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeGenerator.java
binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/binding/runtime/api/BindingRuntimeTypes.java

index 599d959cf8b4b0d9d7666126178cab4dda7ddcd1..5b47b74520a505dc9627163f3af3151e5d23eb80 100644 (file)
@@ -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<InstanceIdentifier<?>, 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<InstanceIdentifier<?>, 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<InstanceIdentifier<?>, 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())));
index 1e61293e6cf32ea7aa99581a1f6d71c297c2afd6..0cc1242eb471d0c8cb8f9ead4f71e2505079b4b9 100644 (file)
@@ -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<Type> generateTypes(final SchemaContext context) {
+    default @NonNull List<Type> 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<Type> generateTypes(SchemaContext context, Collection<? extends Module> modules);
+    @NonNull List<Type> generateTypes(EffectiveModelContext context, Collection<? extends Module> modules);
 }
index 90d6ccf3969845798d77863b7f35ed16d3bde1c2..c5e74c586af6306f210b099c6b9e1feef8d58095 100644 (file)
@@ -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<SchemaNode, JavaTypeName> renames;
 
-    AbstractTypeGenerator(final SchemaContext context, final AbstractTypeProvider typeProvider,
+    AbstractTypeGenerator(final EffectiveModelContext context, final AbstractTypeProvider typeProvider,
             final Map<SchemaNode, JavaTypeName> 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;
     }
 
index 31339498e3b65e19ab469270ec8ce6ed62d014b0..23650335833db262931a61f63d09d17a93199bb0 100644 (file)
@@ -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<SchemaNode, JavaTypeName> renames) {
+    CodegenTypeGenerator(final EffectiveModelContext context, final Map<SchemaNode, JavaTypeName> renames) {
         super(context, new CodegenTypeProvider(context, renames), renames);
     }
 
index 84c4abc47d34b72be0b1bf6562e8b16e55ed0cc8..c55f7f76df545ca89980e3f213b273fcfc110617 100644 (file)
@@ -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<Type> generateTypes(final SchemaContext context, final Collection<? extends Module> modules) {
+    public List<Type> generateTypes(final EffectiveModelContext context, final Collection<? extends Module> modules) {
         return generateFor(context, modules);
     }
 
     @VisibleForTesting
-    static @NonNull List<Type> generateFor(final SchemaContext context) {
+    static @NonNull List<Type> generateFor(final EffectiveModelContext context) {
         return generateFor(context, context.getModules());
     }
 
@@ -66,7 +66,8 @@ public final class DefaultBindingGenerator implements BindingGenerator {
      *             if <code>context</code> contain no modules
      */
     @VisibleForTesting
-    static @NonNull List<Type> generateFor(final SchemaContext context, final Collection<? extends Module> modules) {
+    static @NonNull List<Type> generateFor(final EffectiveModelContext context,
+            final Collection<? extends Module> modules) {
         GeneratorUtils.checkContext(context);
         checkArgument(modules != null, "Set of Modules cannot be NULL.");
 
index 30cca455ca9f97c14a103a99dfc630911a1fdf21..6223c8a4bf7a2d85061e95e41d48144be99af27d 100644 (file)
@@ -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<SchemaNode, JavaTypeName> renames = new IdentityHashMap<>();
index 1402fda03799d6cf059270856c12e74f4873ed80..0f78dbca9297577ac8f89cb63c3115c737e6f48f 100644 (file)
@@ -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<SchemaNode, JavaTypeName> renames) {
+    RuntimeTypeGenerator(final EffectiveModelContext context, final Map<SchemaNode, JavaTypeName> renames) {
         super(context, new RuntimeTypeProvider(context, renames), renames);
     }
 
index 7dfd8f3abf47e1f2bb74693c7e15745d73784c93..4981408077914d39f537b9bfb05ec22c4303ddd1 100644 (file)
@@ -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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
         assertNotNull(generateTypes);
index 812b0f2e92fa77f8aa5f334ac35c65b6dbe75925..c53cc7de946fe7f7cde0fe69551ec9e0251e36d1 100644 (file)
@@ -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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
index faf840d85d4ec74fcc9cf4c57283b024d108c102..a7d658ac828431c17ced1c6921b63190916b9e81 100644 (file)
@@ -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",
index ab50acd53e78583a9ee65bcf3a3f461c191bf712..926892b5da0b07e6ad03ce4129e9da3b7ca323b4 100644 (file)
@@ -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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
index 48a1a74a7da18a137a3717950b9eedc05097e17f..4c157a2a22fb3e96ce402fe282c675794ded3c10 100644 (file)
@@ -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<Type> 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<Type> 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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        List<Type> 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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        List<Type> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+                "/binding-generator-impl-test/notification-test.yang"));
 
         GeneratedType foo = null;
         for (Type type : generateTypes) {
index 319197c988bd3307bea338c20dfcdc74ea5be1e4..578a9cc1aa336cbfdf6df2f454853b2ed08dce7c 100644 (file)
@@ -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) {
index 54a9a46b3ba6070f051daee394524314e986751a..2863c7f0c7d6a1e7123139ea5ea718d428a86808 100644 (file)
@@ -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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        List<Type> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/bug-4145/foo.yang"));
         assertNotNull(generateTypes);
         assertTrue(generateTypes.size() > 0);
     }
index 786bd099829eae3eed8a895dbd428e067812eba2..eea340e6a74747eea8060cfd444e466063a2d9c2 100644 (file)
@@ -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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/bug-6135/foo.yang"));
         assertFalse(generateTypes.isEmpty());
 
         GeneratedType genInterface = null;
index be704dbee26c0c28b581bb42e13efb0c6a131eb5..c1940cb40ef4d08ed0214d3515f3e55c335dfa48 100644 (file)
@@ -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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangFiles(testModels));
 
         assertNotNull("genTypes is null", genTypes);
         assertFalse("genTypes is empty", genTypes.isEmpty());
index c9fa922b3a62543d46a1f771846cd68713d919d6..149902089a0717a547e60791f318a55ea545d692 100644 (file)
@@ -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<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+            "/ietf/ietf-inet-types.yang"));
 
         assertNotNull(genTypes);
         assertTrue(!genTypes.isEmpty());
index e138deb25734c4c2cfb21874d5c6bc0418ebd526..3b0dfc2689593aebf94a6c6234e354e8c7282a26 100644 (file)
@@ -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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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());
     }
-
 }
index 8a5ec25ec3ce28845d3f492901a7bc0067852a08..ae0b74ea7c7d29c23851228696c83961872c0882 100644 (file)
@@ -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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> 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<Type> 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());
     }
-
 }
index cf94952c2db829716062415698c441bc69c36934..806fb76bdaab79f3c32f5e897bea591e1c590cd7 100644 (file)
@@ -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<Module> 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);
index 1093f9b963f0b2eb24f68df50becbaa80d1d6667..76656dcc01525ebd69fe0be8a4e8d1ea5eadb986 100644 (file)
@@ -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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/bit_and_union_in_leaf.yang"));
         assertTrue(genTypes != null);
 
         boolean parentContainerFound = false;
index 28781e997fb2965e80c22ee521227b25af2224a2..a6d4751014ccee62b20e8d96edcac1e660bf7a65 100644 (file)
@@ -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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/simple-bits-demo.yang"));
         assertTrue(genTypes != null);
 
         List<MethodSignature> methodSignaturesList = null;
@@ -111,5 +107,4 @@ public class GeneratedTypesBitsTest {
         assertFalse(setByteLeafMethodFound);
         assertEquals(0, setByteLeafMethodParamNum);
     }
-
 }
index ec18861b0fd6ead8fa962af0cc707b22f6074f63..87e5fc1b5708c93ee7daef7d04b06495141bf78f 100644 (file)
@@ -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<Type> 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 {
index d0b33b462ed8bec5f5decdd544789b769cc13cf8..5115bdae8edbee32ead363849ff75f9b2d6a10c5 100644 (file)
@@ -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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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);
-
     }
-
 }
index 825596abc8de4d767d0eaa9aebbafb65a7ae70f1..3fc45f4c95a5868d3f2cf3e2218adb92a71b4bd8 100644 (file)
@@ -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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/demo-topology.yang"));
 
         assertNotNull(genTypes);
         assertEquals(14, genTypes.size());
index 6ba3cd8b3149cf16fb1563b1bd5f95fea4a22e2b..40e86f1700baade8654584f84f3e4e6b2819af5a 100644 (file)
@@ -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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangFiles(testModels));
 
         GeneratedType moduleGenType = null;
         for (Type type : genTypes) {
index e87d7980c40300b8dbbe96fa624da73d81efd4b4..ad589b0c16486bd3fe7bb8ef35b9f37de87d43b1 100644 (file)
@@ -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<Type> types = DefaultBindingGenerator.generateFor(context);
+        final Collection<Type> types = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/mdsal161.yang"));
         assertNotNull(types);
         assertEquals(24, types.size());
 
index 7eccb3bcff0f9fa22b1afd2b9a9acb6ecaeace66..67156ad9eef98669645a2199524f49546f440230 100644 (file)
@@ -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<Type> types = DefaultBindingGenerator.generateFor(context);
+        final Collection<Type> 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<Type> types = DefaultBindingGenerator.generateFor(context);
+        final Collection<Type> types = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/mdsal-182/grouping-leafref.yang"));
         assertNotNull(types);
         assertEquals(4, types.size());
     }
index 52871322e1dd4a688112f8c250f8d999bdb50f7d..02de4d4d46c044a2fed1c0f8f00bf2820f42eaee 100644 (file)
@@ -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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/mdsal269.yang"));
         assertNotNull(generateTypes);
         assertEquals(4, generateTypes.size());
 
index 19f6e0773ddc1797f6e3e8991accc50d6ccaf356..332cc59c006726ba16dc51fe0893bced622f8860 100644 (file)
@@ -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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        List<Type> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResourceDirectory(
+            "/mdsal-300"));
         assertNotNull(generateTypes);
         assertEquals(18, generateTypes.size());
     }
index 0aeb0bbbf1db20c19c7fd715f161af51f3ee6133..f08e6460fda756e789257746bbdea474dd1e0836 100644 (file)
@@ -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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        List<Type> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/mdsal-302/mdsal-302.yang"));
         assertNotNull(generateTypes);
         assertEquals(15, generateTypes.size());
     }
index ed7b95b017dd097f26699d637aba0a117424a0c5..ce7ea28b8d202c80b1c48586cc3e26611bef27c2 100644 (file)
@@ -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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/mdsal320.yang"));
         assertNotNull(generateTypes);
         assertEquals(4, generateTypes.size());
 
index 291e43ae0c1ee6a143ecba6a9420300cd446b387..4fee03e2084d6ff46c5a87353b976330a5fb486a 100644 (file)
@@ -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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/mdsal324.yang"));
         assertNotNull(generateTypes);
         assertEquals(6, generateTypes.size());
     }
index 862a163d8c289e6f4c8dccb08679077ee5d25290..c8880670afbff67f720ac1cc6c4f50ba2c2617ef 100644 (file)
@@ -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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/mdsal332.yang"));
         assertNotNull(generateTypes);
         assertEquals(5, generateTypes.size());
 
index d9787d55b12c3dda5131e500300b86136d1a838e..0184738fea318b39ae9ef862fa111f5437b82005 100644 (file)
@@ -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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/mdsal335.yang"));
         assertNotNull(generateTypes);
         assertEquals(2, generateTypes.size());
 
index a3bc9b4ac43dee10b2dfc5878b9df71e6bf5136e..de01e1f077266c489ed06715442f3bd198740d5f 100644 (file)
@@ -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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/mdsal352.yang"));
         assertNotNull(generateTypes);
         assertEquals(6, generateTypes.size());
     }
index 074b7cdc9e1d222a75bc4b17658e65b4f4bb5840..a281edcb1b48f119e5ef05a1408e5585a2a7f1e3 100644 (file)
@@ -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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> generateTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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()
index 759974ea2dee852840e95033ac67daad78a3b8e4..e5f4e8040778a1c6861ff3fcd93e110fd57f28e4 100644 (file)
@@ -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<Type> types = DefaultBindingGenerator.generateFor(context);
+        final List<Type> types = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/mdsal437.yang"));
         assertNotNull(types);
         assertEquals(7, types.size());
 
index b5ccc4f055d59b2ccd6a15a46eff841743ee98b6..8ba8262d179223963d558dbb8804d4dc8a2a2c62 100644 (file)
@@ -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<Type> types = DefaultBindingGenerator.generateFor(context);
+        final List<Type> types = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+            "/mdsal438.yang"));
         assertNotNull(types);
         assertEquals(7, types.size());
 
index f1a41c5274b2be5ed1bf3699f4b11bfb7f90974b..e6a8ddc94c34be0c5d7a33a0c54ef149498bcda5 100644 (file)
@@ -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<? extends GroupingDefinition> groupings = context.findModule("mdsal448").get().getGroupings();
         assertEquals(2, groupings.size());
 
index b642c2cdd5bd2e0f1c66a0eb3c40e4ea3a53da6f..70fcb183f420516f4bae89c661f2380d3a30c74e 100644 (file)
@@ -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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> generateTypes = DefaultBindingGenerator.generateFor(schemaContext);
+        final List<Type> generateTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+                "/leafref_typedef_union/bug8449.yang"));
         assertNotNull(generateTypes);
         for (final Type type : generateTypes) {
             if (type.getName().equals("Cont")) {
index 638e842ea9e033a0044f00896009593004544788..533a33c3c46c8b16948ee2e922c19747360d1f11 100644 (file)
@@ -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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> 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<Type> genTypes = DefaultBindingGenerator.generateFor(context);
+        final List<Type> genTypes = DefaultBindingGenerator.generateFor(YangParserTestUtils.parseYangResource(
+                "/uses-of-grouping/uses-of-grouping-notification.yang"));
 
         GeneratedType notificationTest = null;
         GeneratedType groupingNotificationTest = null;
index 447e812aa63f72d6f09c5091a317f46c9ea6a26b..952cc1e47a8cb56aa131f9b544a5e3ede3687779 100644 (file)
@@ -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<Type> genTypes = new DefaultBindingGenerator().generateTypes(context);
+        final List<Type> genTypes = new DefaultBindingGenerator().generateTypes(YangParserTestUtils.parseYangResource(
+            "/list-composite-key.yang"));
 
         assertTrue(genTypes != null);
         assertEquals(7, genTypes.size());
index 886fb6376fe54ca2c33a52eae834ccf15f800adc..6679c9f27841232bbc671dbb3c6cf064b4c8467b 100644 (file)
@@ -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();
     }
 
     /**
index c76a44d9125ad544a3f4c2a99cabcb5be76e5f70..0f24334533cadd3921f00cb037fea60116d6b40c 100644 (file)
@@ -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);
 }
index 5b79598533e2a4179d06f961f95b96cd9d18ca91..7c7ec903a613dba6386fc78f8721256cd81df378 100644 (file)
@@ -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<Type, AugmentationSchemaNode> typeToAugmentation;
     private final ImmutableBiMap<Type, WithStatus> typeToSchema;
     private final ImmutableMultimap<Type, Type> choiceToCases;
     private final ImmutableMap<QName, Type> identities;
 
-    public BindingRuntimeTypes(final SchemaContext schemaContext,
+    public BindingRuntimeTypes(final EffectiveModelContext schemaContext,
             final Map<Type, AugmentationSchemaNode> typeToAugmentation,
             final BiMap<Type, WithStatus> typeToDefiningSchema, final Multimap<Type, Type> choiceToCases,
             final Map<QName, Type> identities) {
@@ -51,7 +51,7 @@ public final class BindingRuntimeTypes implements SchemaContextProvider, Immutab
     }
 
     @Override
-    public SchemaContext getSchemaContext() {
+    public EffectiveModelContext getEffectiveModelContext() {
         return schemaContext;
     }