From d98a0c1eeac636d14d0d4b576e1e01bde9722ff1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 8 Apr 2022 12:38:44 +0200 Subject: [PATCH] Split out isBitsType() Simplify dispatch of checking to a separate method. Change-Id: I59e3baf22bf99ead66f43c7df0fd62ab2b030894 Signed-off-by: Robert Varga --- .../binding/java/api/generator/UnionTemplate.xtend | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend index c940dea195..4779907d57 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend @@ -137,9 +137,7 @@ class UnionTemplate extends ClassTemplate { «ELSEIF EMPTY_TYPE.equals(propRet) || EMPTY_TYPE.equals(propRet.typedefReturnType)» ««« generated empty typedef return ""; - «ELSEIF propRet instanceof GeneratedTransferObject // Is it a GeneratedTransferObject - && (propRet as GeneratedTransferObject).typedef // Is it a typedef - && (propRet as GeneratedTransferObject).baseType instanceof BitsTypeDefinition» + «ELSEIF propRet.isBitsType» ««« generated bits typedef return «JU_ARRAYS.importedName».toString(«field».getValue()); «ELSE» @@ -152,6 +150,13 @@ class UnionTemplate extends ClassTemplate { } ''' + private static def isBitsType(Type type) { + if (type instanceof GeneratedTransferObject) { + return type.typedef && type.baseType instanceof BitsTypeDefinition + } + return false + } + private static def Type typedefReturnType(Type type) { if (!(type instanceof GeneratedTransferObject)) { return null -- 2.36.6