From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 10 Apr 2019 12:51:00 +0000 (+0200)
Subject: Clean up tryToUseCacheElse()
X-Git-Tag: v14.0.0~1169
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e71f998ae927887ce734532a658354457905040c;p=yangtools.git

Clean up tryToUseCacheElse()

Generated code is a bit ugly for the case of accessing cache,
with missing newline and misplaced whitespace. Clean that up.

Change-Id: I13c754c808b9da19e3f5e4cfc216073aafb462db
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/impl/DataNodeContainerSerializerSource.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/impl/DataNodeContainerSerializerSource.java
index 9bed830009..deb82f6117 100644
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/impl/DataNodeContainerSerializerSource.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/impl/DataNodeContainerSerializerSource.java
@@ -161,26 +161,23 @@ abstract class DataNodeContainerSerializerSource extends DataObjectSerializerSou
             final ListSchemaNode casted = (ListSchemaNode) child;
             emitList(sb, getterName, valueType, casted);
         } else if (child instanceof ContainerSchemaNode) {
-            sb.append(tryToUseCacheElse(getterName,statement(staticInvokeEmitter(childType, getterName))));
+            sb.append(tryToUseCacheElse(getterName, statement(staticInvokeEmitter(childType, getterName))));
         } else if (child instanceof ChoiceSchemaNode) {
             final String propertyName = CHOICE_PREFIX + childType.getName();
             staticConstant(propertyName, DataObjectSerializerImplementation.class,
                 ChoiceDispatchSerializer.from(loadClass(childType)));
-            sb.append(tryToUseCacheElse(getterName,statement(invoke(propertyName,
+            sb.append(tryToUseCacheElse(getterName, statement(invoke(propertyName,
                 StreamWriterGenerator.SERIALIZE_METHOD_NAME, REGISTRY, cast(DataObject.class.getName(), getterName),
                 STREAM))));
         }
     }
 
     private static StringBuilder tryToUseCacheElse(final String getterName, final CharSequence statement) {
-        final StringBuilder b = new StringBuilder();
-        b.append("if ( ");
-        b.append(SERIALIZER).append("== null || ");
-        b.append(invoke(SERIALIZER, "serialize", getterName)).append("== null");
-        b.append(") {");
-        b.append(statement);
-        b.append('}');
-        return b;
+        return new StringBuilder()
+                .append("if (").append(SERIALIZER).append(" == null || ")
+                .append(invoke(SERIALIZER, "serialize", getterName)).append(" == null) {\n")
+                .append(statement)
+                .append('}');
     }
 
     private void emitList(final StringBuilder sb, final String getterName, final Type valueType,