From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 11 Sep 2017 16:23:31 +0000 (+0200)
Subject: Use trigraphs where convenient
X-Git-Tag: release/oxygen~97
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=bbe8cd7ba243e6ac14faeb262478266024f8e5e7;p=mdsal.git

Use trigraphs where convenient

Instead if/else blocks of simple returns, use a trigraph.

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

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java
index 5c11b7ca97..ff86acc46a 100644
--- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java
@@ -143,11 +143,7 @@ public final class TextTemplateUtil {
      * @return parameter name, based on given Type
      */
     public static String paramValue(final Type returnType, final String paramName) {
-        if (returnType instanceof ConcreteType) {
-            return paramName;
-        } else {
-            return paramName + ".getValue()";
-        }
+        return returnType instanceof ConcreteType ? paramName : paramName + ".getValue()";
     }
 
     /**
@@ -157,10 +153,7 @@ public final class TextTemplateUtil {
      * @return string with comment in JAVA format
      */
     public static String asJavadoc(final String comment) {
-        if (comment == null) {
-            return "";
-        }
-        return wrapToDocumentation(formatToParagraph(comment.trim(), 0));
+        return comment == null ? "" : wrapToDocumentation(formatToParagraph(comment.trim(), 0));
     }
 
     private static String formatDataForJavaDoc(final TypeMember type, final String additionalComment) {