Rehost BindingMapping in yang.binding.contract.Naming

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

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java
index e7c80f5b5fc526c2a6f9642f3932fb0ce9878834..9cec1ea31e2bb5d38a0b377389daa0b79920efe1 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java
@@ -18,7 +18,7 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuil
 import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType;
 import org.opendaylight.mdsal.binding.runtime.api.ContainerRuntimeType;
 import org.opendaylight.mdsal.binding.runtime.api.RuntimeType;
-import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
+import org.opendaylight.yangtools.yang.binding.contract.Naming;
 import org.opendaylight.yangtools.yang.model.api.stmt.ContainerEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PresenceEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
@@ -80,7 +80,7 @@ final class ContainerGenerator extends CompositeSchemaTreeGenerator<ContainerEff
                 .setMechanics(ValueMechanics.NORMAL);
         if (statement().findFirstEffectiveSubstatement(PresenceEffectiveStatement.class).isEmpty()) {
             final MethodSignatureBuilder nonnull = builder
-                    .addMethod(BindingMapping.getNonnullMethodName(localName().getLocalName()))
+                    .addMethod(Naming.getNonnullMethodName(localName().getLocalName()))
                     .setReturnType(returnType)
                     .setDefault(false);
             annotateDeprecatedIfNecessary(nonnull);