From b9f01523b4bb22de2e8845d5583639260a3accd6 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 7 Jan 2021 10:17:41 -0500 Subject: [PATCH 1/9] - fixes response handler return type for typescript --- src/kiota.core/Refiners/TypeScriptRefiner.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/kiota.core/Refiners/TypeScriptRefiner.cs b/src/kiota.core/Refiners/TypeScriptRefiner.cs index d62afc54d3..0312fa333f 100644 --- a/src/kiota.core/Refiners/TypeScriptRefiner.cs +++ b/src/kiota.core/Refiners/TypeScriptRefiner.cs @@ -4,9 +4,10 @@ namespace kiota.core { public class TypeScriptRefiner : ILanguageRefiner { - private readonly HashSet defaultTypes = new HashSet {"string", "integer", "boolean", "array", "object"}; + private readonly HashSet defaultTypes = new HashSet {"string", "integer", "boolean", "array", "object", "(input: object) => object"}; public void Refine(CodeNamespace generatedCode) { + PatchResponseHandlerType(generatedCode); AddRelativeImports(generatedCode); } private void AddRelativeImports(CodeElement current) { @@ -24,5 +25,17 @@ private void AddRelativeImports(CodeElement current) { foreach(var childClass in current.GetChildElements()) AddRelativeImports(childClass); } + private void PatchResponseHandlerType(CodeElement current) { + var properties = current.GetChildElements() + .OfType(); + properties + .Where(x => x.PropertyKind == CodePropertyKind.ResponseHandler) + .ToList() + .ForEach(x => x.Type.Name = "(input: object) => object"); + current.GetChildElements() + .Except(properties) + .ToList() + .ForEach(x => PatchResponseHandlerType(x)); + } } } From 2a6311dc5336a04c729312093e21eb30653e5eea Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 7 Jan 2021 10:28:30 -0500 Subject: [PATCH 2/9] - aligns switch style --- src/kiota.core/Writers/CSharpWriter.cs | 9 +++------ src/kiota.core/Writers/JavaWriter.cs | 3 +-- src/kiota.core/Writers/TypeScriptWriter.cs | 3 +-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/kiota.core/Writers/CSharpWriter.cs b/src/kiota.core/Writers/CSharpWriter.cs index 0794276680..a724f15a8c 100644 --- a/src/kiota.core/Writers/CSharpWriter.cs +++ b/src/kiota.core/Writers/CSharpWriter.cs @@ -88,14 +88,11 @@ public override string TranslateType(string typeName, OpenApiSchema schema) { switch (typeName) { - case "integer": typeName = "int"; break; + case "integer": return "int"; case "boolean": return "bool"; - case "array": - typeName = TranslateType(schema.Items.Type, schema.Items) + "[]"; - break; + case "array": return TranslateType(schema.Items.Type, schema.Items) + "[]"; + default: return typeName; } - - return typeName; } public override string GetParameterSignature(CodeParameter parameter) diff --git a/src/kiota.core/Writers/JavaWriter.cs b/src/kiota.core/Writers/JavaWriter.cs index eb33b3ba07..f7a49aa87c 100644 --- a/src/kiota.core/Writers/JavaWriter.cs +++ b/src/kiota.core/Writers/JavaWriter.cs @@ -41,9 +41,8 @@ public override string TranslateType(string typeName, OpenApiSchema schema) case "string": return "String"; case "object": return "Object"; case "array": return $"{TranslateType(schema.Items.Type, schema.Items)}[]"; + default: return typeName; } - - return typeName; } public override void WriteCodeClassDeclaration(CodeClass.Declaration code) diff --git a/src/kiota.core/Writers/TypeScriptWriter.cs b/src/kiota.core/Writers/TypeScriptWriter.cs index 0215b073c9..75f5362c79 100644 --- a/src/kiota.core/Writers/TypeScriptWriter.cs +++ b/src/kiota.core/Writers/TypeScriptWriter.cs @@ -53,9 +53,8 @@ public override string TranslateType(string typeName, OpenApiSchema schema) {//TODO we're probably missing a bunch of type mappings case "integer": return "number"; case "array": return $"{TranslateType(schema.Items.Type, schema.Items)}[]"; + default: return typeName; } // string, boolean, object : same casing - - return typeName; } public override void WriteCodeClassDeclaration(CodeClass.Declaration code) From 600fa0337b04ca5041a827e0dec22bf6f0e0e34f Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 7 Jan 2021 10:31:21 -0500 Subject: [PATCH 3/9] - fixes an issue where unresolved types would return empty --- src/kiota.core/Writers/CSharpWriter.cs | 2 +- src/kiota.core/Writers/JavaWriter.cs | 2 +- src/kiota.core/Writers/TypeScriptWriter.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kiota.core/Writers/CSharpWriter.cs b/src/kiota.core/Writers/CSharpWriter.cs index a724f15a8c..41bf8bc265 100644 --- a/src/kiota.core/Writers/CSharpWriter.cs +++ b/src/kiota.core/Writers/CSharpWriter.cs @@ -91,7 +91,7 @@ public override string TranslateType(string typeName, OpenApiSchema schema) case "integer": return "int"; case "boolean": return "bool"; case "array": return TranslateType(schema.Items.Type, schema.Items) + "[]"; - default: return typeName; + default: return typeName ?? "Object"; } } diff --git a/src/kiota.core/Writers/JavaWriter.cs b/src/kiota.core/Writers/JavaWriter.cs index f7a49aa87c..cf482c5f37 100644 --- a/src/kiota.core/Writers/JavaWriter.cs +++ b/src/kiota.core/Writers/JavaWriter.cs @@ -41,7 +41,7 @@ public override string TranslateType(string typeName, OpenApiSchema schema) case "string": return "String"; case "object": return "Object"; case "array": return $"{TranslateType(schema.Items.Type, schema.Items)}[]"; - default: return typeName; + default: return typeName ?? "Object"; } } diff --git a/src/kiota.core/Writers/TypeScriptWriter.cs b/src/kiota.core/Writers/TypeScriptWriter.cs index 75f5362c79..5aaccff05b 100644 --- a/src/kiota.core/Writers/TypeScriptWriter.cs +++ b/src/kiota.core/Writers/TypeScriptWriter.cs @@ -53,7 +53,7 @@ public override string TranslateType(string typeName, OpenApiSchema schema) {//TODO we're probably missing a bunch of type mappings case "integer": return "number"; case "array": return $"{TranslateType(schema.Items.Type, schema.Items)}[]"; - default: return typeName; + default: return typeName ?? "object"; } // string, boolean, object : same casing } From 224296f57efeb1517ec4536e2350976541577097 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 7 Jan 2021 10:37:53 -0500 Subject: [PATCH 4/9] - fixes java classes casing --- src/kiota.core/PathSegmenters/JavaPathSegementer.cs | 2 +- src/kiota.core/Writers/JavaWriter.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kiota.core/PathSegmenters/JavaPathSegementer.cs b/src/kiota.core/PathSegmenters/JavaPathSegementer.cs index 7fb170c216..f7a6313e49 100644 --- a/src/kiota.core/PathSegmenters/JavaPathSegementer.cs +++ b/src/kiota.core/PathSegmenters/JavaPathSegementer.cs @@ -20,7 +20,7 @@ public string GetPath(CodeNamespace currentNamespace, CodeClass currentClass) .Replace(ClientNamespaceName, string.Empty) .TrimStart('.') .Replace('.', Path.DirectorySeparatorChar), - currentClass.Name.ToFirstCharacterLowerCase() + FileSuffix); + currentClass.Name.ToFirstCharacterUpperCase() + FileSuffix); var directoryPath = Path.GetDirectoryName(targetPath); if(!Directory.Exists(directoryPath)) Directory.CreateDirectory(directoryPath); diff --git a/src/kiota.core/Writers/JavaWriter.cs b/src/kiota.core/Writers/JavaWriter.cs index cf482c5f37..9ac02383a6 100644 --- a/src/kiota.core/Writers/JavaWriter.cs +++ b/src/kiota.core/Writers/JavaWriter.cs @@ -56,7 +56,7 @@ public override void WriteCodeClassDeclaration(CodeClass.Declaration code) } } //TODO: missing javadoc - WriteLine($"public class {code.Name} {{"); + WriteLine($"public class {code.Name.ToFirstCharacterUpperCase()} {{"); IncreaseIndent(); } @@ -84,7 +84,7 @@ public override void WriteMethod(CodeMethod code) { //TODO javadoc WriteLine("@javax.annotation.Nonnull"); - WriteLine($"public java.util.concurrent.Future<{GetTypeString(code.ReturnType)}> {code.Name.ToFirstCharacterLowerCase()}({string.Join(',', code.Parameters.Select(p=> GetParameterSignature(p)).ToList())}) {{ return null; }}"); + WriteLine($"public java.util.concurrent.Future<{GetTypeString(code.ReturnType).ToFirstCharacterUpperCase()}> {code.Name.ToFirstCharacterLowerCase()}({string.Join(',', code.Parameters.Select(p=> GetParameterSignature(p)).ToList())}) {{ return null; }}"); } public override void WriteProperty(CodeProperty code) From 4474684b46fb77c4045a8b77d82bdfd1c7f02115 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 7 Jan 2021 10:42:43 -0500 Subject: [PATCH 5/9] - fixes response handler type for java --- src/kiota.core/Refiners/JavaRefiner.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/kiota.core/Refiners/JavaRefiner.cs b/src/kiota.core/Refiners/JavaRefiner.cs index 04c9194e7e..d6f5a2e4f6 100644 --- a/src/kiota.core/Refiners/JavaRefiner.cs +++ b/src/kiota.core/Refiners/JavaRefiner.cs @@ -5,6 +5,7 @@ public class JavaRefiner : CommonLanguageRefiner, ILanguageRefiner { public override void Refine(CodeNamespace generatedCode) { + PatchResponseHandlerType(generatedCode); AddInnerClasses(generatedCode); MakeQueryStringParametersNonOptionalAndInsertOverrideMethod(generatedCode); } @@ -35,5 +36,17 @@ private CodeMethod GetMethodClone(CodeMethod currentMethod) { } else return null; } + private void PatchResponseHandlerType(CodeElement current) { + var properties = current.GetChildElements() + .OfType(); + properties + .Where(x => x.PropertyKind == CodePropertyKind.ResponseHandler) + .ToList() + .ForEach(x => x.Type.Name = "java.util.function.Function"); + current.GetChildElements() + .Except(properties) + .ToList() + .ForEach(x => PatchResponseHandlerType(x)); + } } } From fdcfb7d206c9eea80eb2fabae8526646dc3180d5 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 7 Jan 2021 10:56:30 -0500 Subject: [PATCH 6/9] - adds missing imports for java - fixes imports duplication --- src/kiota.core/Refiners/JavaRefiner.cs | 20 +++++++++++++++++++- src/kiota.core/Writers/JavaWriter.cs | 9 +++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/kiota.core/Refiners/JavaRefiner.cs b/src/kiota.core/Refiners/JavaRefiner.cs index d6f5a2e4f6..8f34e3c02c 100644 --- a/src/kiota.core/Refiners/JavaRefiner.cs +++ b/src/kiota.core/Refiners/JavaRefiner.cs @@ -1,13 +1,31 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; namespace kiota.core { public class JavaRefiner : CommonLanguageRefiner, ILanguageRefiner { + private readonly HashSet defaultTypes = new HashSet {"string", "integer", "boolean", "array", "object", "java.util.function.Function"}; public override void Refine(CodeNamespace generatedCode) { PatchResponseHandlerType(generatedCode); AddInnerClasses(generatedCode); MakeQueryStringParametersNonOptionalAndInsertOverrideMethod(generatedCode); + AddRelativeImports(generatedCode); + } + private void AddRelativeImports(CodeElement current) { + if(current is CodeClass currentClass) { + var additionalUsings = current + .GetChildElements() + .OfType() + .Select(x =>x.Type) + .Union(current.GetChildElements().OfType().Select(x => x.ReturnType)) + .Where(x => !defaultTypes.Contains(x.Name)) + .Select(x => new CodeUsing(currentClass){Name = x.Name, Declaration = x}); + if(additionalUsings.Any()) + currentClass.AddUsing(additionalUsings.ToArray()); + } + foreach(var childClass in current.GetChildElements()) + AddRelativeImports(childClass); } private void MakeQueryStringParametersNonOptionalAndInsertOverrideMethod(CodeElement currentElement) { var codeMethods = currentElement diff --git a/src/kiota.core/Writers/JavaWriter.cs b/src/kiota.core/Writers/JavaWriter.cs index 9ac02383a6..12eb6615a6 100644 --- a/src/kiota.core/Writers/JavaWriter.cs +++ b/src/kiota.core/Writers/JavaWriter.cs @@ -50,10 +50,11 @@ public override void WriteCodeClassDeclaration(CodeClass.Declaration code) if(code?.Parent?.Parent is CodeNamespace) { WriteLine($"package {code.Parent.Parent.Name};"); WriteLine(); - foreach (var codeUsing in code.Usings) - { - WriteLine($"import {codeUsing.Name}.*;"); - } + code.Usings + .Select(x => $"import {x.Declaration?.TypeDefinition?.GetImmediateParentOfType()?.Name ?? code.Parent.Parent.Name}.{x.Name.ToFirstCharacterUpperCase()};") + .Distinct() + .ToList() + .ForEach(x => WriteLine(x)); } //TODO: missing javadoc WriteLine($"public class {code.Name.ToFirstCharacterUpperCase()} {{"); From 5d3a524e47d2382701865295b417e4514d38e9c9 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 7 Jan 2021 12:49:46 -0500 Subject: [PATCH 7/9] - updates CSharp debug location --- .vscode/launch.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index d7b69c20f5..83660cff84 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -56,9 +56,9 @@ "--language", "csharp", "-o", - "C:/Users/vibiret/Desktop/graphjavav4/utilities/src/main/java/graphjavav4/utilities", + "C:/Users/vibiret/Desktop/graphdotnetv4", "-n", - "graphcsharpv4.utilities" ], + "graphdotnetv4" ], "cwd": "${workspaceFolder}/src/kiota", // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console "console": "internalConsole", From ae3d481f344bc2179cc99f93b8b259dcbf1aac55 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 7 Jan 2021 12:50:08 -0500 Subject: [PATCH 8/9] - fixes casing for default return type --- src/kiota.core/Writers/CSharpWriter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kiota.core/Writers/CSharpWriter.cs b/src/kiota.core/Writers/CSharpWriter.cs index 41bf8bc265..8e974dffda 100644 --- a/src/kiota.core/Writers/CSharpWriter.cs +++ b/src/kiota.core/Writers/CSharpWriter.cs @@ -91,7 +91,7 @@ public override string TranslateType(string typeName, OpenApiSchema schema) case "integer": return "int"; case "boolean": return "bool"; case "array": return TranslateType(schema.Items.Type, schema.Items) + "[]"; - default: return typeName ?? "Object"; + default: return typeName ?? "object"; } } From 10b3b7b377bf3395248b2c60d18649ddbaa33d01 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 7 Jan 2021 12:51:10 -0500 Subject: [PATCH 9/9] - adds default usings at the class level and not namespace --- src/kiota.core/Refiners/CSharpRefiner.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/kiota.core/Refiners/CSharpRefiner.cs b/src/kiota.core/Refiners/CSharpRefiner.cs index ad2c9ad34c..2a55ba7a20 100644 --- a/src/kiota.core/Refiners/CSharpRefiner.cs +++ b/src/kiota.core/Refiners/CSharpRefiner.cs @@ -7,13 +7,20 @@ public class CSharpRefiner : CommonLanguageRefiner, ILanguageRefiner private static readonly Regex responseHandlerType = new Regex("<(.*),object>"); public override void Refine(CodeNamespace generatedCode) { - generatedCode.AddUsing(new CodeUsing(generatedCode) { Name = "System" }); - generatedCode.AddUsing(new CodeUsing(generatedCode) { Name = "System.Threading.Tasks" }); - generatedCode.AddUsing(new CodeUsing(generatedCode) { Name = "System.Net.Http" }); + AddDefaultImports(generatedCode); AddAsyncSuffix(generatedCode); AddInnerClasses(generatedCode); MakeNativeResponseHandlers(generatedCode); } + private void AddDefaultImports(CodeElement current) { + if(current is CodeClass currentClass) { + currentClass.AddUsing(new CodeUsing(currentClass) { Name = "System" }); + currentClass.AddUsing(new CodeUsing(currentClass) { Name = "System.Threading.Tasks" }); + currentClass.AddUsing(new CodeUsing(currentClass) { Name = "System.Net.Http" }); + } + foreach(var childClass in current.GetChildElements()) + AddDefaultImports(childClass); + } private void MakeNativeResponseHandlers(CodeNamespace generatedCode) {