Freeform Map<String,String> configuration properties always marked as…

… required, fix quarkusio#42505
ppalaga · Aug 13, 2024 · e354577 · e354577
1 parent 7bbbfe2
commit e354577
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...ain/java/io/quarkus/annotation/processor/documentation/config/discovery/ResolvedType.java b/...ain/java/io/quarkus/annotation/processor/documentation/config/discovery/ResolvedType.java
@@ -4,6 +4,8 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
+import io.quarkus.annotation.processor.documentation.config.util.TypeUtil;
+
 public record ResolvedType(
         TypeMirror wrapperType,
         TypeMirror unwrappedType,
@@ -73,7 +75,11 @@ public static ResolvedType makeMap(TypeMirror type, ResolvedType unwrappedResolv
                 unwrappedResolvedType.binaryName, unwrappedResolvedType.qualifiedName, unwrappedResolvedType.simplifiedName,
                 unwrappedResolvedType.isPrimitive,
                 true, unwrappedResolvedType.isList,
-                unwrappedResolvedType.isOptional,
+                unwrappedResolvedType.isOptional
+                        // backwards compatibility with versions before Quarkus 3.14
+                        // see https://github.com/quarkusio/quarkus/issues/42505
+                        || "java.lang.String".equals(unwrappedResolvedType.qualifiedName)
+                        || TypeUtil.isPrimitiveWrapper(unwrappedResolvedType.qualifiedName),
                 unwrappedResolvedType.isDeclared, unwrappedResolvedType.isInterface, unwrappedResolvedType.isClass,
                 unwrappedResolvedType.isEnum, unwrappedResolvedType.isDuration, unwrappedResolvedType.isConfigGroup);
     }