From e770a4cb6dc18319782664404c58c4138dcaf7c9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 10 Apr 2019 14:51:00 +0200 Subject: [PATCH] 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 (cherry picked from commit d9972690bb45cb28f43c63c21395b5042f4d4ce2) --- .../impl/DataNodeContainerSerializerSource.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) 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, -- 2.36.6