OCaml: Fix enums in anyOf

Author: sir4ur0n

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java

@@ -295,11 +295,37 @@ public ModelsMap postProcessModels(ModelsMap objs) {
                     }
                 }
             }
+
+            // Fix enum references in composed schemas (anyOf, oneOf, allOf)
+            if (cm.getComposedSchemas() != null) {
+                fixEnumReferencesInComposedSchemas(cm.getComposedSchemas().getAnyOf());
+                fixEnumReferencesInComposedSchemas(cm.getComposedSchemas().getOneOf());
+                fixEnumReferencesInComposedSchemas(cm.getComposedSchemas().getAllOf());
+            }
         }
 
         return objs;
     }
 
+    private void fixEnumReferencesInComposedSchemas(List<CodegenProperty> schemas) {
+        if (schemas == null) {
+            return;
+        }
+
+        for (CodegenProperty schema : schemas) {
+            // If this schema is an enum, add Enums. prefix to datatypeWithEnum
+            if (schema.isEnum) {
+                if (!schema.datatypeWithEnum.startsWith("Enums.")) {
+                    schema.datatypeWithEnum = "Enums." + schema.datatypeWithEnum;
+                }
+                // Also update dataType for the variant constructor
+                if (!schema.dataType.startsWith("Enums.")) {
+                    schema.dataType = "Enums." + schema.dataType;
+                }
+            }
+        }
+    }
+
     private void enrichPropertiesWithEnumDefaultValues(List<CodegenProperty> properties) {
         for (CodegenProperty property : properties) {
             if (property.get_enum() != null && property.get_enum().size() == 1) {

samples/client/petstore/ocaml-enum-in-composed-schema/src/models/test_model_optional_url.ml

@@ -8,12 +8,12 @@
 
         type t =
             | AnyOf0 of string
-            | AnyOf1 of any_of_1
+            | AnyOf1 of Enums.any_of_1
         [@@deriving show, eq];;
 
         let to_yojson = function
             | AnyOf0 v -> [%to_yojson: string] v
-            | AnyOf1 v -> [%to_yojson: any_of_1] v
+            | AnyOf1 v -> [%to_yojson: Enums.any_of_1] v
 
         (* Manual implementations because the derived one encodes into a tuple list where the first element is the constructor name. *)
 
@@ -22,7 +22,7 @@
             [%of_yojson: string] json
               |> Stdlib.Result.to_option
               |> Stdlib.Option.map (fun v -> AnyOf0 v);
-            [%of_yojson: any_of_1] json
+            [%of_yojson: Enums.any_of_1] json
               |> Stdlib.Result.to_option
               |> Stdlib.Option.map (fun v -> AnyOf1 v);
                         ]