Handle arrays of DictionaryType in javaFuncs.getJavaType()

OkieOth · Apr 3, 2024 · d71205e · d71205e
1 parent c6c99a6
commit d71205e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 6.5.1
+* Handle arrays of DictionaryType in javaFuncs.getJavaType()
+
 # 6.5.0
 * Introduce 'format' attribute to StringType
 

diff --git a/tests/generators/test_javaFuncs.py b/tests/generators/test_javaFuncs.py
@@ -5,7 +5,7 @@
 import yacg.model.model as model
 
 from yacg.model.model import IntegerType, IntegerTypeFormatEnum, NumberType, NumberTypeFormatEnum
-from yacg.model.model import StringType, EnumType #, DictionaryType
+from yacg.model.model import StringType, EnumType, DictionaryType
 from yacg.model.model import DateType, TimeType, DateTimeType, UuidType
 from yacg.model.model import ComplexType, BytesType, ObjectType
 import yacg.generators.helper.javaFuncs as javaFuncs
@@ -164,6 +164,11 @@ def testgetJavaTypes(self):
         self.assertEqual('Foo', javaFuncs.getJavaType(enumType, False))
         self.assertEqual('java.util.List<Foo>', javaFuncs.getJavaType(enumType, True))
 
+        dictType = DictionaryType()
+        dictType.valueType = UuidType()
+        self.assertEqual('java.util.Map<String, java.util.UUID>', javaFuncs.getJavaType(dictType, False))
+        self.assertEqual('java.util.List<java.util.Map<String, java.util.UUID>>', javaFuncs.getJavaType(dictType, True))
+
     def testJavaFuncs(self):
         myType = getExampleType()
         self.assertEqual('ExampleType', myType.name)

diff --git a/yacg/generators/helper/javaFuncs.py b/yacg/generators/helper/javaFuncs.py
@@ -45,7 +45,7 @@ def getJavaType(typeObj, isArray):
     elif isinstance(typeObj, model.DateTimeType):
         return 'java.time.LocalDateTime' if not isArray else 'java.util.List<java.time.LocalDateTime>'
     elif isinstance(typeObj, model.DictionaryType):
-        return 'java.util.Map<String, {}>'.format(getJavaType(typeObj.valueType, False))
+        return 'java.util.Map<String, {}>'.format(getJavaType(typeObj.valueType, False)) if not isArray else 'java.util.List<java.util.Map<String, {}>>'.format(getJavaType(typeObj.valueType, False))
     elif isinstance(typeObj, model.ComplexType):
         return typeObj.name if not isArray else 'java.util.List<{}>'.format(typeObj.name)
     else: