Change Java API boolean properties from primitives to references.

Change-Id: I1f5fc44025521ea22592486aeae10471278acfa9 Closes-Bug: #1771748
Juniper · May 17, 2018 · 908fc71 · 908fc71
1 parent 0db39c2
commit 908fc71
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/generateds/ifmap_global.py b/generateds/ifmap_global.py
@@ -20,7 +20,7 @@
     'xsd:string': 'String',
     'xsd:integer': 'Integer',
     'xsd:unsignedInt': 'Integer',
-    'xsd:boolean': 'boolean',
+    'xsd:boolean': 'Boolean',
     'xsd:unsignedLong' : 'Long',
     'xsd:dateTime': 'java.util.Date',
     'xsd:time': 'Long'

diff --git a/generateds/java_api.py b/generateds/java_api.py
@@ -112,22 +112,16 @@ def _GenerateType(self, ctype, file):
                 file.write(member.membername)
             file.write(', ')
             for member in ctype.getDataMembers()[param_end:]:
-                if member.isComplex:
-                    file.write('null')
-                elif member.jtypename is 'boolean':
-                    file.write(member.default or 'false')
-                elif member.jtypename is 'String':
-                    default = 'null'
-                    if member.default:
+                default = 'null'
+                if member.default:
+                    if member.jtypename is 'Boolean':
+                        default = member.default
+                    elif member.jtypename is 'String':
                         default = quoted(member.default)
-                    file.write(default)
-                elif member.jtypename in ['Integer', 'Long']:
-                    default = 'null'
-                    if member.default:
+                    elif member.jtypename in ['Integer', 'Long']:
                         default = str(member.default)
-                    file.write(default)
-                else:
-                    file.write('null')
+                file.write(default)
+
                 if member != ctype.getDataMembers()[param_count-1]:
                     file.write(', ')
                 else: