From ea81234d5429f36f687baee790fcfb884a8b96d1 Mon Sep 17 00:00:00 2001 From: Iaroslav Date: Fri, 4 Dec 2020 12:36:44 +0200 Subject: [PATCH] Remove getter @Nullable annotations for non-List/Map types In generated types getter will no longer be marked @Nullable annotation for non List and Map types. Jira: MDSAL-603 Change-Id: I2ad00e625f652399e184fca1a7a00d3ed36d3dff Signed-off-by: Iaroslav --- .../mdsal/binding/java/api/generator/InterfaceTemplate.xtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend index 903b99fdd2..799a0f85f5 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend @@ -338,7 +338,7 @@ class InterfaceTemplate extends BaseTemplate { ''' def private String nullableType(Type type) { - if (type.isObject) { + if (type.isObject && (Types.isMapType(type) || Types.isListType(type))) { return type.importedNullable } return type.importedName -- 2.36.6