fix(core): Avoid double STRING schema type for types that resolves to…

… a String Fixes #6821
kestra-io · Jan 20, 2025 · 1a130da · 1a130da
1 parent b48c6c3
commit 1a130da
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/core/src/main/java/io/kestra/core/docs/JsonSchemaGenerator.java b/core/src/main/java/io/kestra/core/docs/JsonSchemaGenerator.java
@@ -41,15 +41,15 @@
 import jakarta.inject.Singleton;
 
 import java.lang.reflect.*;
-import java.time.Duration;
-import java.time.LocalTime;
+import java.time.*;
 import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
 @Singleton
 public class JsonSchemaGenerator {
+    private static final List<Class<?>> TYPES_RESOLVED_AS_STRING = List.of(Duration.class, LocalTime.class, LocalDate.class, LocalDateTime.class, ZonedDateTime.class, OffsetDateTime.class, OffsetTime.class);
 
     private final PluginRegistry pluginRegistry;
 
@@ -251,6 +251,7 @@ public CustomDefinition provideCustomSchemaDefinition(ResolvedType javaType, Sch
             if (javaType.isInstanceOf(Property.class)) {
                 TypeContext context = target.getContext();
                 Class<?> erasedType = javaType.getTypeParameters().getFirst().getErasedType();
+
                 if(String.class.isAssignableFrom(erasedType)) {
                     return List.of(
                         context.resolve(String.class)
@@ -267,6 +268,10 @@ public CustomDefinition provideCustomSchemaDefinition(ResolvedType javaType, Sch
                     return List.of(
                         javaType.getTypeParameters().getFirst()
                     );
+                } else if (isAssignableFromResolvedAsString(erasedType)) {
+                    return List.of(
+                        javaType.getTypeParameters().getFirst()
+                    );
                 } else {
                     return List.of(
                         javaType.getTypeParameters().getFirst(),
@@ -471,6 +476,15 @@ public CustomDefinition provideCustomSchemaDefinition(ResolvedType javaType, Sch
         }
     }
 
+    private boolean isAssignableFromResolvedAsString(Class<?> declaredType) {
+        for (Class<?> clazz : TYPES_RESOLVED_AS_STRING) {
+            if (clazz.isAssignableFrom(declaredType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     protected List<ResolvedType> subtypeResolver(ResolvedType declaredType, TypeContext typeContext) {
         if (declaredType.getErasedType() == Task.class) {
             return getRegisteredPlugins()