Migrate getDataChildByName() users

[mdsal.git] / binding / mdsal-binding-generator-impl / src / main / java / org / opendaylight / mdsal / binding / yang / types / AbstractTypeProvider.java

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
index 5f64d5dc542dfaf7ce288a48179403b7698553f7..3d092c7b6e07860226f47f64c8114b6f00c8ac04 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
@@ -268,9 +268,9 @@ public abstract class AbstractTypeProvider implements TypeProvider {
         DataSchemaNode dataChildByName;
         for (QName next : parentNode.getPath().getPathFromRoot()) {
             if (current == null) {
-                dataChildByName = schemaContext.getDataChildByName(next);
+                dataChildByName = schemaContext.dataChildByName(next);
             } else {
-                dataChildByName = current.getDataChildByName(next);
+                dataChildByName = current.dataChildByName(next);
             }
             if (dataChildByName == null) {
                 return false;
@@ -1592,16 +1592,10 @@ public abstract class AbstractTypeProvider implements TypeProvider {
         bits.sort(BIT_NAME_COMPARATOR);
         final StringBuilder sb = new StringBuilder();
         if (!isExt) {
-            sb.append("new ");
-            sb.append(className);
-            sb.append('(');
+            sb.append("new ").append(className).append('(');
         }
         for (int i = 0; i < bits.size(); i++) {
-            if (bits.get(i).getName().equals(defaultValue)) {
-                sb.append(true);
-            } else {
-                sb.append(false);
-            }
+            sb.append(bits.get(i).getName().equals(defaultValue));
             if (i != bits.size() - 1) {
                 sb.append(", ");
             }
@@ -1693,11 +1687,7 @@ public abstract class AbstractTypeProvider implements TypeProvider {
 
     private static String union(final String className, final String defaultValue, final LeafSchemaNode node) {
         return new StringBuilder()
-                .append("new ")
-                .append(className)
-                .append("(\"")
-                .append(defaultValue)
-                .append("\".toCharArray())")
+                .append("new ").append(className).append("(\"").append(defaultValue).append("\".toCharArray())")
                 .toString();
     }