Unify GeneratedType verification

[mdsal.git] / binding / mdsal-binding-generator / src / main / java / org / opendaylight / mdsal / binding / generator / impl / reactor / OpaqueObjectGenerator.java

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OpaqueObjectGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OpaqueObjectGenerator.java
index 2e7da2abbb7cb98a78ec4d4ff54ff7b5e1636dc8..35f1c45f7df66cdb32cad4743e2b93e17443db98 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OpaqueObjectGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OpaqueObjectGenerator.java
@@ -7,19 +7,17 @@
  */
 package org.opendaylight.mdsal.binding.generator.impl.reactor;
 
-import static com.google.common.base.Verify.verify;
-
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultAnydataRuntimeType;
 import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultAnyxmlRuntimeType;
 import org.opendaylight.mdsal.binding.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding.model.api.Type;
-import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder;
 import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase;
 import org.opendaylight.mdsal.binding.model.ri.BindingTypes;
 import org.opendaylight.mdsal.binding.runtime.api.AnydataRuntimeType;
 import org.opendaylight.mdsal.binding.runtime.api.AnyxmlRuntimeType;
 import org.opendaylight.mdsal.binding.runtime.api.OpaqueRuntimeType;
+import org.opendaylight.yangtools.yang.binding.contract.StatementNamespace;
 import org.opendaylight.yangtools.yang.model.api.stmt.AnydataEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement;
@@ -35,6 +33,11 @@ abstract class OpaqueObjectGenerator<S extends DataTreeEffectiveStatement<?>, R
             super(statement, parent);
         }
 
+        @Override
+        StatementNamespace namespace() {
+            return StatementNamespace.ANYDATA;
+        }
+
         @Override
         AnydataRuntimeType createExternalRuntimeType(final GeneratedType type) {
             return new DefaultAnydataRuntimeType(type, statement());
@@ -52,6 +55,11 @@ abstract class OpaqueObjectGenerator<S extends DataTreeEffectiveStatement<?>, R
             super(statement, parent);
         }
 
+        @Override
+        StatementNamespace namespace() {
+            return StatementNamespace.ANYXML;
+        }
+
         @Override
         AnyxmlRuntimeType createExternalRuntimeType(final GeneratedType type) {
             return new DefaultAnyxmlRuntimeType(type, statement());
@@ -70,18 +78,18 @@ abstract class OpaqueObjectGenerator<S extends DataTreeEffectiveStatement<?>, R
 
     @Override
     void pushToInference(final SchemaInferenceStack dataTree) {
-        dataTree.enterDataTree(statement().getIdentifier());
+        dataTree.enterDataTree(statement().argument());
     }
 
     @Override
     GeneratedType createTypeImpl(final TypeBuilderFactory builderFactory) {
-        final GeneratedTypeBuilder builder = builderFactory.newGeneratedTypeBuilder(typeName());
+        final var builder = builderFactory.newGeneratedTypeBuilder(typeName());
         builder.addImplementsType(BindingTypes.opaqueObject(builder));
         addImplementsChildOf(builder);
         defaultImplementedInterace(builder);
         annotateDeprecatedIfNecessary(builder);
 
-        final ModuleGenerator module = currentModule();
+        final var module = currentModule();
         module.addQNameConstant(builder, localName());
 
         builderFactory.addCodegenInformation(module, statement(), builder);
@@ -97,22 +105,15 @@ abstract class OpaqueObjectGenerator<S extends DataTreeEffectiveStatement<?>, R
     }
 
     @Override
-    final GeneratedType runtimeJavaType() {
-        return generatedType().orElse(null);
-    }
-
-    @Override
-    final @NonNull R createExternalRuntimeType(final Type type) {
-        verify(type instanceof GeneratedType, "Unexpected type %s", type);
-        return createExternalRuntimeType((GeneratedType) type);
+    final R createExternalRuntimeType(final Type type) {
+        return createExternalRuntimeType(verifyGeneratedType(type));
     }
 
     abstract @NonNull R createExternalRuntimeType(@NonNull GeneratedType type);
 
     @Override
-    final R createInternalRuntimeType(final ChildLookup lookup, final S statement, final Type type) {
-        verify(type instanceof GeneratedType, "Unexpected type %s", type);
-        return createInternalRuntimeType(statement, (GeneratedType) type);
+    final R createInternalRuntimeType(final AugmentResolver resolver, final S statement, final Type type) {
+        return createInternalRuntimeType(statement, verifyGeneratedType(type));
     }
 
     abstract @NonNull R createInternalRuntimeType(@NonNull S statement, @NonNull GeneratedType type);