Adjust to yangtools-2.0.0 changes

[mdsal.git] / binding2 / mdsal-binding2-generator-impl / src / main / java / org / opendaylight / mdsal / binding / javav2 / generator / impl / AuxiliaryGenUtils.java

diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AuxiliaryGenUtils.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AuxiliaryGenUtils.java
index e77164a7d6da7436cd4ba2a3b5882c4447dbd20e..eb3d9d3801ece7d443fa4c6c63de5ca7a7609c38 100644 (file)
--- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AuxiliaryGenUtils.java
+++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AuxiliaryGenUtils.java
@@ -48,7 +48,7 @@ import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.MethodSignat
 import org.opendaylight.mdsal.binding.javav2.spec.runtime.BindingNamespaceType;
 import org.opendaylight.mdsal.binding.javav2.util.BindingMapping;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
+import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
@@ -101,7 +101,7 @@ final class AuxiliaryGenUtils {
         return (namespaceType.equals(BindingNamespaceType.Data)
                 && (schemaNode instanceof ContainerSchemaNode || schemaNode instanceof ListSchemaNode
                 || schemaNode instanceof RpcDefinition || schemaNode instanceof NotificationDefinition
-                || schemaNode instanceof ChoiceCaseNode));
+                || schemaNode instanceof CaseSchemaNode));
     }
 
     static Constant qNameConstant(final GeneratedTypeBuilderBase<?> toBuilder, final String constantName,
@@ -155,7 +155,8 @@ final class AuxiliaryGenUtils {
      * @return string with the name of the getter method for
      *         <code>methodName</code> in JAVA method format
      */
-    private static String getterMethodName(final String localName, final Type returnType) {
+    @VisibleForTesting
+    static String getterMethodName(final String localName, final Type returnType) {
         final StringBuilder method = new StringBuilder();
         if (BOOLEAN.equals(returnType)) {
             method.append("is");
@@ -169,7 +170,7 @@ final class AuxiliaryGenUtils {
                                     final SchemaContext schemaContext, final boolean verboseClassComments,
                                     final BindingNamespaceType namespaceType) {
         final StringBuilder sb = new StringBuilder();
-        final String nodeDescription = encodeAngleBrackets(schemaNode.getDescription());
+        final String nodeDescription = encodeAngleBrackets(schemaNode.getDescription().orElse(null));
         final String formattedDescription = YangTextTemplate.formatToParagraph(nodeDescription, 0);
 
         if (!Strings.isNullOrEmpty(formattedDescription)) {
@@ -238,7 +239,7 @@ final class AuxiliaryGenUtils {
 
     static String createDescription(final Module module, final boolean verboseClassComments) {
         final StringBuilder sb = new StringBuilder();
-        final String moduleDescription = encodeAngleBrackets(module.getDescription());
+        final String moduleDescription = encodeAngleBrackets(module.getDescription().orElse(null));
         final String formattedDescription = YangTextTemplate.formatToParagraph(moduleDescription, 0);
 
         if (!Strings.isNullOrEmpty(formattedDescription)) {
@@ -288,7 +289,8 @@ final class AuxiliaryGenUtils {
         return replaceAllIllegalChars(sb);
     }
 
-    private static boolean isNullOrEmpty(final Collection<?> list) {
+    @VisibleForTesting
+    static boolean isNullOrEmpty(final Collection<?> list) {
         return list == null || list.isEmpty();
     }
 
@@ -352,7 +354,7 @@ final class AuxiliaryGenUtils {
             final Map<Module, ModuleContext> genCtx, final GeneratedTypeBuilder typeBuilder, final Module module) {
         if (enumTypeDef != null && typeBuilder != null && enumTypeDef.getQName().getLocalName() != null) {
             final EnumBuilder enumBuilder = typeBuilder.addEnumeration(enumName.getLocalName(), genCtx.get(module));
-            final String enumTypedefDescription = encodeAngleBrackets(enumTypeDef.getDescription());
+            final String enumTypedefDescription = encodeAngleBrackets(enumTypeDef.getDescription().orElse(null));
             enumBuilder.setDescription(enumTypedefDescription);
             enumBuilder.updateEnumPairsFromEnumTypeDef(enumTypeDef);
             final ModuleContext ctx = genCtx.get(module);
@@ -412,16 +414,16 @@ final class AuxiliaryGenUtils {
     static Type createReturnTypeForUnion(final GeneratedTOBuilder genTOBuilder, final TypeDefinition<?> typeDef,
             final GeneratedTypeBuilder typeBuilder, final Module parentModule, final TypeProvider typeProvider) {
         final GeneratedTOBuilderImpl returnType = (GeneratedTOBuilderImpl) genTOBuilder;
-        final String typedefDescription = encodeAngleBrackets(typeDef.getDescription());
+        final String typedefDescription = encodeAngleBrackets(typeDef.getDescription().orElse(null));
 
         returnType.setDescription(typedefDescription);
-        returnType.setReference(typeDef.getReference());
+        returnType.setReference(typeDef.getReference().orElse(null));
         returnType.setSchemaPath((List) typeDef.getPath().getPathFromRoot());
         returnType.setModuleName(parentModule.getName());
 
         genTOBuilder.setTypedef(true);
         genTOBuilder.setIsUnion(true);
-        TypeProviderImpl.addUnitsToGenTO(genTOBuilder, typeDef.getUnits());
+        TypeProviderImpl.addUnitsToGenTO(genTOBuilder, typeDef.getUnits().orElse(null));
 
         return returnType.toInstance();
     }
@@ -507,7 +509,7 @@ final class AuxiliaryGenUtils {
             leafGetterName = leafName;
         }
 
-        final String leafDesc = encodeAngleBrackets(leaf.getDescription());
+        final String leafDesc = encodeAngleBrackets(leaf.getDescription().orElse(null));
         final GeneratedPropertyBuilder propBuilder =
                 toBuilder.addProperty(JavaIdentifierNormalizer.normalizeSpecificIdentifier(leafGetterName, JavaIdentifier.METHOD));
         propBuilder.setReadOnly(isReadOnly);