Merge pull request #3939 from andreaTP/issue-3824

[Java] Fix generation of models with underscores
microsoft · Dec 20, 2023 · d08a287 · d08a287
2 parents 7a5c7dd + 0dae240
commit d08a287
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed a bug where the discriminator validation rule would report false positives on nullable union types.
 - Fixed a bug where constructors and model names where clashing in Go. [#3920](https://github.com/microsoft/kiota/issues/3920)
 - Fixed a bug where the order of enum declaration might results in a missing enum type. [#3935](https://github.com/microsoft/kiota/issues/3935)
+- Fixed java generating compound types with underscore in the name. [#3824](https://github.com/microsoft/kiota/issues/3824)
 
 ## [1.9.1] - 2023-12-13
 

diff --git a/src/Kiota.Builder/Refiners/JavaRefiner.cs b/src/Kiota.Builder/Refiners/JavaRefiner.cs
@@ -38,6 +38,13 @@ public override Task Refine(CodeNamespace generatedCode, CancellationToken cance
                         IsExternal = true
                     }
                 });
+            ConvertUnionTypesToWrapper(generatedCode,
+                _configuration.UsesBackingStore,
+                s => s.ToFirstCharacterLowerCase(),
+                true,
+                SerializationNamespaceName,
+                "ComposedTypeWrapper"
+            );
             var reservedNamesProvider = new JavaReservedNamesProvider();
             CorrectNames(generatedCode, s =>
             {
@@ -58,13 +65,6 @@ public override Task Refine(CodeNamespace generatedCode, CancellationToken cance
                 GenerationLanguage.Java);
             cancellationToken.ThrowIfCancellationRequested();
             RemoveCancellationParameter(generatedCode);
-            ConvertUnionTypesToWrapper(generatedCode,
-                _configuration.UsesBackingStore,
-                s => s.ToFirstCharacterLowerCase(),
-                true,
-                SerializationNamespaceName,
-                "ComposedTypeWrapper"
-            );
             CorrectCoreType(generatedCode, CorrectMethodType, CorrectPropertyType, CorrectImplements);
             cancellationToken.ThrowIfCancellationRequested();
             ReplaceBinaryByNativeType(generatedCode, "InputStream", "java.io", true, true);

diff --git a/src/Kiota.Builder/Refiners/RubyRefiner.cs b/src/Kiota.Builder/Refiners/RubyRefiner.cs
@@ -39,6 +39,10 @@ public override Task Refine(CodeNamespace generatedCode, CancellationToken cance
             var suffix = "Model";
             DisambiguateClassesWithNamespaceNames(generatedCode, classesToDisambiguate, suffix);
             UpdateReferencesToDisambiguatedClasses(generatedCode, classesToDisambiguate, suffix);
+            ConvertUnionTypesToWrapper(generatedCode,
+                _configuration.UsesBackingStore,
+                static s => s
+            );
             var reservedNamesProvider = new RubyReservedNamesProvider();
             CorrectNames(generatedCode, s =>
             {
@@ -55,10 +59,6 @@ public override Task Refine(CodeNamespace generatedCode, CancellationToken cance
                 FlattenModelsNamespaces(modelsNS, modelsNS);
             AddPropertiesAndMethodTypesImports(generatedCode, false, false, true);
             RemoveCancellationParameter(generatedCode);
-            ConvertUnionTypesToWrapper(generatedCode,
-                _configuration.UsesBackingStore,
-                static s => s
-            );
             cancellationToken.ThrowIfCancellationRequested();
             AddParsableImplementsForModelClasses(generatedCode, "MicrosoftKiotaAbstractions::Parsable");
             AddDefaultImports(generatedCode, defaultUsingEvaluators);

diff --git a/tests/Kiota.Builder.IntegrationTests/GenerateSample.cs b/tests/Kiota.Builder.IntegrationTests/GenerateSample.cs
@@ -134,7 +134,14 @@ public async Task GeneratesIdiomaticChildrenNames(GenerationLanguage language)
         };
         await new KiotaBuilder(logger, configuration, _httpClient).GenerateClientAsync(new());
 
+        var fullText = "";
+        foreach (var file in Directory.GetFiles(OutputPath, "*.*", SearchOption.AllDirectories))
+        {
+            fullText += File.ReadAllText(file);
+        }
+
         Assert.Empty(Directory.GetFiles(OutputPath, "*_*", SearchOption.AllDirectories));
+        Assert.DoesNotContain("_", fullText);
     }
     [InlineData(GenerationLanguage.CSharp)]
     [InlineData(GenerationLanguage.Go)]

diff --git a/tests/Kiota.Builder.IntegrationTests/NoUnderscoresInModel.yaml b/tests/Kiota.Builder.IntegrationTests/NoUnderscoresInModel.yaml
@@ -1,11 +1,25 @@
 openapi: 3.0.0
+servers:
+  - url: https://localhost
 info:
   title: Test
   version: 1.0.0
   description: something
+  contact:
+    name: Microsoft
+tags:
+  - name: metrics
+    description: "The metrics API"
+  - name: permissions
+    description: "The permissions API"
+  - name: image
+    description: "The image API"
 paths:
   /api/metrics/v1:
     get:
+      operationId: getMetrics
+      tags:
+        - "metrics"
       responses:
         "200":
           content:
@@ -16,6 +30,9 @@ paths:
       description: Returns a test list
   /api/permissions/v1:
     get:
+      operationId: getPermissions
+      tags:
+        - "permissions"
       responses:
         "200":
           content:
@@ -24,6 +41,25 @@ paths:
                 $ref: "#/components/schemas/app-permissions"
           description: Test
       description: Returns a app permissions
+  /api/image/v1:
+    post:
+      operationId: createImage
+      tags:
+        - "image"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/CreateImageRequest"
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Value"
+          description: Test
+      description: Returns a create image request
 components:
   schemas:
     app-permissions:
@@ -58,3 +94,19 @@ components:
           type: array
           items:
             type: string
+    CreateImageRequest:
+      type: object
+      properties:
+        prompt:
+          description: A text description of the desired image(s). The maximum length is 1000 characters for `dall-e-2` and 4000 characters for `dall-e-3`.
+          type: string
+          example: "A cute baby sea otter"
+        model:
+          anyOf:
+            - type: string
+            - type: string
+              enum: ["dall-e-2", "dall-e-3"]
+          x-oaiTypeLabel: string
+          example: "dall-e-3"
+          nullable: true
+          description: The model to use for image generation.