From 4f8135560d7301a011022235f95f64a73806baba Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 14 Apr 2023 13:26:49 -0400 Subject: [PATCH] - changes with by by for indexers replacements --- src/Kiota.Builder/Refiners/GoRefiner.cs | 2 +- src/Kiota.Builder/Refiners/JavaRefiner.cs | 854 +++++++++--------- src/Kiota.Builder/Refiners/PhpRefiner.cs | 2 +- src/Kiota.Builder/Refiners/PythonRefiner.cs | 2 +- src/Kiota.Builder/Refiners/RubyRefiner.cs | 2 +- src/Kiota.Builder/Refiners/SwiftRefiner.cs | 2 +- .../Refiners/TypeScriptRefiner.cs | 2 +- 7 files changed, 433 insertions(+), 433 deletions(-) diff --git a/src/Kiota.Builder/Refiners/GoRefiner.cs b/src/Kiota.Builder/Refiners/GoRefiner.cs index 6ecf7ae6f5..7bff10e933 100644 --- a/src/Kiota.Builder/Refiners/GoRefiner.cs +++ b/src/Kiota.Builder/Refiners/GoRefiner.cs @@ -32,7 +32,7 @@ public override Task Refine(CodeNamespace generatedCode, CancellationToken cance ReplaceIndexersByMethodsWithParameter( generatedCode, false, - static x => $"With{x.ToFirstCharacterUpperCase()}", + static x => $"By{x.ToFirstCharacterUpperCase()}", static x => x.ToFirstCharacterLowerCase()); FlattenNestedHierarchy(generatedCode); FlattenGoParamsFileNames(generatedCode); diff --git a/src/Kiota.Builder/Refiners/JavaRefiner.cs b/src/Kiota.Builder/Refiners/JavaRefiner.cs index f9ed38482f..d58bcbb2ac 100644 --- a/src/Kiota.Builder/Refiners/JavaRefiner.cs +++ b/src/Kiota.Builder/Refiners/JavaRefiner.cs @@ -11,438 +11,438 @@ namespace Kiota.Builder.Refiners; public class JavaRefiner : CommonLanguageRefiner, ILanguageRefiner { - public JavaRefiner(GenerationConfiguration configuration) : base(configuration) { } - public override Task Refine(CodeNamespace generatedCode, CancellationToken cancellationToken) - { - return Task.Run(() => - { - cancellationToken.ThrowIfCancellationRequested(); - LowerCaseNamespaceNames(generatedCode); - MoveRequestBuilderPropertiesToBaseType(generatedCode, - new CodeUsing - { - Name = "BaseRequestBuilder", - Declaration = new CodeType - { - Name = "com.microsoft.kiota", - IsExternal = true - } - }); - RemoveRequestConfigurationClassesCommonProperties(generatedCode, - new CodeUsing - { - Name = "BaseRequestConfiguration", - Declaration = new CodeType - { - Name = "com.microsoft.kiota", - IsExternal = true - } - }); - var reservedNamesProvider = new JavaReservedNamesProvider(); - CorrectNames(generatedCode, s => - { - if (s.Contains('_') && - s.ToPascalCase(UnderscoreArray) is string refinedName && - !reservedNamesProvider.ReservedNames.Contains(s) && - !reservedNamesProvider.ReservedNames.Contains(refinedName)) - return refinedName; - else - return s; - }); - RemoveClassNamePrefixFromNestedClasses(generatedCode); - InsertOverrideMethodForRequestExecutorsAndBuildersAndConstructors(generatedCode); - ReplaceIndexersByMethodsWithParameter(generatedCode, - true, - static x => $"With{x.ToFirstCharacterUpperCase()}", - static x => x.ToFirstCharacterLowerCase()); - cancellationToken.ThrowIfCancellationRequested(); - RemoveCancellationParameter(generatedCode); - ConvertUnionTypesToWrapper(generatedCode, - _configuration.UsesBackingStore - ); - AddRawUrlConstructorOverload(generatedCode); - CorrectCoreType(generatedCode, CorrectMethodType, CorrectPropertyType, CorrectImplements); - cancellationToken.ThrowIfCancellationRequested(); - ReplaceBinaryByNativeType(generatedCode, "InputStream", "java.io", true, true); - ReplacePropertyNames(generatedCode, - new() { - CodePropertyKind.Custom, - }, - static s => s.ToCamelCase(UnderscoreArray)); - AddGetterAndSetterMethods(generatedCode, - new() { - CodePropertyKind.Custom, - CodePropertyKind.AdditionalData, - CodePropertyKind.BackingStore, - }, - static s => s.ToCamelCase(UnderscoreArray), - _configuration.UsesBackingStore, - true, - "get", - "set", - string.Empty - ); - ReplaceReservedNames(generatedCode, reservedNamesProvider, x => $"{x}Escaped"); - ReplaceReservedExceptionPropertyNames(generatedCode, new JavaExceptionsReservedNamesProvider(), x => $"{x}Escaped"); - AddPropertiesAndMethodTypesImports(generatedCode, true, false, true); - cancellationToken.ThrowIfCancellationRequested(); - AddDefaultImports(generatedCode, defaultUsingEvaluators); - AddParsableImplementsForModelClasses(generatedCode, "Parsable"); - AddEnumSetImport(generatedCode); - cancellationToken.ThrowIfCancellationRequested(); - SetSetterParametersToNullable(generatedCode, new Tuple(CodeMethodKind.Setter, CodePropertyKind.AdditionalData)); - AddConstructorsForDefaultValues(generatedCode, true); - CorrectCoreTypesForBackingStore(generatedCode, "BackingStoreFactorySingleton.instance.createBackingStore()"); - var defaultConfiguration = new GenerationConfiguration(); - cancellationToken.ThrowIfCancellationRequested(); - ReplaceDefaultSerializationModules( - generatedCode, - defaultConfiguration.Serializers, - new(StringComparer.OrdinalIgnoreCase) { - "com.microsoft.kiota.serialization.JsonSerializationWriterFactory", - "com.microsoft.kiota.serialization.TextSerializationWriterFactory", - "com.microsoft.kiota.serialization.FormSerializationWriterFactory", - } - ); - ReplaceDefaultDeserializationModules( - generatedCode, - defaultConfiguration.Deserializers, - new(StringComparer.OrdinalIgnoreCase) { - "com.microsoft.kiota.serialization.JsonParseNodeFactory", - "com.microsoft.kiota.serialization.FormParseNodeFactory", - "com.microsoft.kiota.serialization.TextParseNodeFactory" - } - ); - AddSerializationModulesImport(generatedCode, - new[] { "com.microsoft.kiota.ApiClientBuilder", - "com.microsoft.kiota.serialization.SerializationWriterFactoryRegistry" }, - new[] { "com.microsoft.kiota.serialization.ParseNodeFactoryRegistry" }); - cancellationToken.ThrowIfCancellationRequested(); - AddParentClassToErrorClasses( - generatedCode, - "ApiException", - "com.microsoft.kiota" - ); - AddDiscriminatorMappingsUsingsToParentClasses( - generatedCode, - "ParseNode", - addUsings: true - ); - RemoveHandlerFromRequestBuilder(generatedCode); - SplitLongDiscriminatorMethods(generatedCode); - }, cancellationToken); - } - private static readonly int maxDiscriminatorLength = 500; - private static void SplitLongDiscriminatorMethods(CodeElement currentElement) - { - if (currentElement is CodeMethod currentMethod && - !currentMethod.IsOverload && - currentMethod.IsOfKind(CodeMethodKind.Factory) && - currentMethod.Parent is CodeClass parentClass && - parentClass.IsOfKind(CodeClassKind.Model) && - parentClass.DiscriminatorInformation.HasBasicDiscriminatorInformation && - parentClass.DiscriminatorInformation.DiscriminatorMappings.Count() > maxDiscriminatorLength) - { - var discriminatorsCount = parentClass.DiscriminatorInformation.DiscriminatorMappings.Count(); - for (var currentDiscriminatorPageIndex = 0; currentDiscriminatorPageIndex * maxDiscriminatorLength < discriminatorsCount; currentDiscriminatorPageIndex++) - { - var newMethod = (CodeMethod)currentMethod.Clone(); - newMethod.Name = $"{currentMethod.Name}_{currentDiscriminatorPageIndex}"; - newMethod.OriginalMethod = currentMethod; - newMethod.Access = AccessModifier.Private; - newMethod.RemoveParametersByKind(CodeParameterKind.ParseNode); - newMethod.AddParameter(new CodeParameter - { - Type = new CodeType - { - Name = "String", - IsNullable = true, - IsExternal = true - }, - Optional = false, - Documentation = new() - { - Description = "Discriminator value from the payload", - }, - Name = "discriminatorValue" - }); - parentClass.AddMethod(newMethod); - } - } - CrawlTree(currentElement, SplitLongDiscriminatorMethods); - } - private static void SetSetterParametersToNullable(CodeElement currentElement, params Tuple[] accessorPairs) - { - if (currentElement is CodeMethod method && - accessorPairs.Any(x => method.IsOfKind(x.Item1) && (method.AccessedProperty?.IsOfKind(x.Item2) ?? false))) - foreach (var param in method.Parameters) - param.Type.IsNullable = true; - CrawlTree(currentElement, element => SetSetterParametersToNullable(element, accessorPairs)); - } - private static void AddEnumSetImport(CodeElement currentElement) - { - if (currentElement is CodeClass currentClass && currentClass.IsOfKind(CodeClassKind.Model) && - currentClass.Properties.Any(x => x.Type is CodeType xType && xType.TypeDefinition is CodeEnum xEnumType && xEnumType.Flags)) - { - var nUsing = new CodeUsing - { - Name = "EnumSet", - Declaration = new CodeType { Name = "java.util", IsExternal = true }, - }; - currentClass.AddUsing(nUsing); - } + public JavaRefiner(GenerationConfiguration configuration) : base(configuration) { } + public override Task Refine(CodeNamespace generatedCode, CancellationToken cancellationToken) + { + return Task.Run(() => + { + cancellationToken.ThrowIfCancellationRequested(); + LowerCaseNamespaceNames(generatedCode); + MoveRequestBuilderPropertiesToBaseType(generatedCode, + new CodeUsing + { + Name = "BaseRequestBuilder", + Declaration = new CodeType + { + Name = "com.microsoft.kiota", + IsExternal = true + } + }); + RemoveRequestConfigurationClassesCommonProperties(generatedCode, + new CodeUsing + { + Name = "BaseRequestConfiguration", + Declaration = new CodeType + { + Name = "com.microsoft.kiota", + IsExternal = true + } + }); + var reservedNamesProvider = new JavaReservedNamesProvider(); + CorrectNames(generatedCode, s => + { + if (s.Contains('_') && + s.ToPascalCase(UnderscoreArray) is string refinedName && + !reservedNamesProvider.ReservedNames.Contains(s) && + !reservedNamesProvider.ReservedNames.Contains(refinedName)) + return refinedName; + else + return s; + }); + RemoveClassNamePrefixFromNestedClasses(generatedCode); + InsertOverrideMethodForRequestExecutorsAndBuildersAndConstructors(generatedCode); + ReplaceIndexersByMethodsWithParameter(generatedCode, + true, + static x => $"By{x.ToFirstCharacterUpperCase()}", + static x => x.ToFirstCharacterLowerCase()); + cancellationToken.ThrowIfCancellationRequested(); + RemoveCancellationParameter(generatedCode); + ConvertUnionTypesToWrapper(generatedCode, + _configuration.UsesBackingStore + ); + AddRawUrlConstructorOverload(generatedCode); + CorrectCoreType(generatedCode, CorrectMethodType, CorrectPropertyType, CorrectImplements); + cancellationToken.ThrowIfCancellationRequested(); + ReplaceBinaryByNativeType(generatedCode, "InputStream", "java.io", true, true); + ReplacePropertyNames(generatedCode, + new() { + CodePropertyKind.Custom, + }, + static s => s.ToCamelCase(UnderscoreArray)); + AddGetterAndSetterMethods(generatedCode, + new() { + CodePropertyKind.Custom, + CodePropertyKind.AdditionalData, + CodePropertyKind.BackingStore, + }, + static s => s.ToCamelCase(UnderscoreArray), + _configuration.UsesBackingStore, + true, + "get", + "set", + string.Empty + ); + ReplaceReservedNames(generatedCode, reservedNamesProvider, x => $"{x}Escaped"); + ReplaceReservedExceptionPropertyNames(generatedCode, new JavaExceptionsReservedNamesProvider(), x => $"{x}Escaped"); + AddPropertiesAndMethodTypesImports(generatedCode, true, false, true); + cancellationToken.ThrowIfCancellationRequested(); + AddDefaultImports(generatedCode, defaultUsingEvaluators); + AddParsableImplementsForModelClasses(generatedCode, "Parsable"); + AddEnumSetImport(generatedCode); + cancellationToken.ThrowIfCancellationRequested(); + SetSetterParametersToNullable(generatedCode, new Tuple(CodeMethodKind.Setter, CodePropertyKind.AdditionalData)); + AddConstructorsForDefaultValues(generatedCode, true); + CorrectCoreTypesForBackingStore(generatedCode, "BackingStoreFactorySingleton.instance.createBackingStore()"); + var defaultConfiguration = new GenerationConfiguration(); + cancellationToken.ThrowIfCancellationRequested(); + ReplaceDefaultSerializationModules( + generatedCode, + defaultConfiguration.Serializers, + new(StringComparer.OrdinalIgnoreCase) { + "com.microsoft.kiota.serialization.JsonSerializationWriterFactory", + "com.microsoft.kiota.serialization.TextSerializationWriterFactory", + "com.microsoft.kiota.serialization.FormSerializationWriterFactory", + } + ); + ReplaceDefaultDeserializationModules( + generatedCode, + defaultConfiguration.Deserializers, + new(StringComparer.OrdinalIgnoreCase) { + "com.microsoft.kiota.serialization.JsonParseNodeFactory", + "com.microsoft.kiota.serialization.FormParseNodeFactory", + "com.microsoft.kiota.serialization.TextParseNodeFactory" + } + ); + AddSerializationModulesImport(generatedCode, + new[] { "com.microsoft.kiota.ApiClientBuilder", + "com.microsoft.kiota.serialization.SerializationWriterFactoryRegistry" }, + new[] { "com.microsoft.kiota.serialization.ParseNodeFactoryRegistry" }); + cancellationToken.ThrowIfCancellationRequested(); + AddParentClassToErrorClasses( + generatedCode, + "ApiException", + "com.microsoft.kiota" + ); + AddDiscriminatorMappingsUsingsToParentClasses( + generatedCode, + "ParseNode", + addUsings: true + ); + RemoveHandlerFromRequestBuilder(generatedCode); + SplitLongDiscriminatorMethods(generatedCode); + }, cancellationToken); + } + private static readonly int maxDiscriminatorLength = 500; + private static void SplitLongDiscriminatorMethods(CodeElement currentElement) + { + if (currentElement is CodeMethod currentMethod && + !currentMethod.IsOverload && + currentMethod.IsOfKind(CodeMethodKind.Factory) && + currentMethod.Parent is CodeClass parentClass && + parentClass.IsOfKind(CodeClassKind.Model) && + parentClass.DiscriminatorInformation.HasBasicDiscriminatorInformation && + parentClass.DiscriminatorInformation.DiscriminatorMappings.Count() > maxDiscriminatorLength) + { + var discriminatorsCount = parentClass.DiscriminatorInformation.DiscriminatorMappings.Count(); + for (var currentDiscriminatorPageIndex = 0; currentDiscriminatorPageIndex * maxDiscriminatorLength < discriminatorsCount; currentDiscriminatorPageIndex++) + { + var newMethod = (CodeMethod)currentMethod.Clone(); + newMethod.Name = $"{currentMethod.Name}_{currentDiscriminatorPageIndex}"; + newMethod.OriginalMethod = currentMethod; + newMethod.Access = AccessModifier.Private; + newMethod.RemoveParametersByKind(CodeParameterKind.ParseNode); + newMethod.AddParameter(new CodeParameter + { + Type = new CodeType + { + Name = "String", + IsNullable = true, + IsExternal = true + }, + Optional = false, + Documentation = new() + { + Description = "Discriminator value from the payload", + }, + Name = "discriminatorValue" + }); + parentClass.AddMethod(newMethod); + } + } + CrawlTree(currentElement, SplitLongDiscriminatorMethods); + } + private static void SetSetterParametersToNullable(CodeElement currentElement, params Tuple[] accessorPairs) + { + if (currentElement is CodeMethod method && + accessorPairs.Any(x => method.IsOfKind(x.Item1) && (method.AccessedProperty?.IsOfKind(x.Item2) ?? false))) + foreach (var param in method.Parameters) + param.Type.IsNullable = true; + CrawlTree(currentElement, element => SetSetterParametersToNullable(element, accessorPairs)); + } + private static void AddEnumSetImport(CodeElement currentElement) + { + if (currentElement is CodeClass currentClass && currentClass.IsOfKind(CodeClassKind.Model) && + currentClass.Properties.Any(x => x.Type is CodeType xType && xType.TypeDefinition is CodeEnum xEnumType && xEnumType.Flags)) + { + var nUsing = new CodeUsing + { + Name = "EnumSet", + Declaration = new CodeType { Name = "java.util", IsExternal = true }, + }; + currentClass.AddUsing(nUsing); + } - CrawlTree(currentElement, AddEnumSetImport); - } - private static readonly JavaConventionService conventionService = new(); - private static readonly AdditionalUsingEvaluator[] defaultUsingEvaluators = { - new (static x => x is CodeProperty prop && prop.IsOfKind(CodePropertyKind.RequestAdapter), - "com.microsoft.kiota", "RequestAdapter"), - new (static x => x is CodeProperty prop && prop.IsOfKind(CodePropertyKind.PathParameters), - "java.util", "HashMap"), - new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestGenerator), - "com.microsoft.kiota", "RequestInformation", "RequestOption", "HttpMethod"), - new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestGenerator), - "java.net", "URISyntaxException"), - new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestGenerator), - "java.util", "Collection", "Map"), - new (static x => x is CodeClass @class && @class.IsOfKind(CodeClassKind.Model), - "com.microsoft.kiota.serialization", "Parsable"), - new (static x => x is CodeClass @class && @class.IsOfKind(CodeClassKind.Model) && @class.Properties.Any(x => x.IsOfKind(CodePropertyKind.AdditionalData)), - "com.microsoft.kiota.serialization", "AdditionalDataHolder"), - new (static x => x is CodeMethod method && method.Parameters.Any(x => !x.Optional), - "java.util", "Objects"), - new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestExecutor) && - method.Parameters.Any(x => x.IsOfKind(CodeParameterKind.RequestBody) && - x.Type.Name.Equals(conventionService.StreamTypeName, StringComparison.OrdinalIgnoreCase)), - "java.io", "InputStream"), - new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Serializer), - "com.microsoft.kiota.serialization", "SerializationWriter"), - new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Deserializer), - "com.microsoft.kiota.serialization", "ParseNode"), - new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestExecutor), - "com.microsoft.kiota.serialization", "Parsable", "ParsableFactory"), - new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Deserializer), - "java.util", "HashMap", "Map"), - new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.ClientConstructor) && - method.Parameters.Any(y => y.IsOfKind(CodeParameterKind.BackingStore)), - "com.microsoft.kiota.store", "BackingStoreFactory", "BackingStoreFactorySingleton"), - new (static x => x is CodeProperty prop && prop.IsOfKind(CodePropertyKind.BackingStore), - "com.microsoft.kiota.store", "BackingStore", "BackedModel", "BackingStoreFactorySingleton"), - new (static x => x is CodeProperty prop && "decimal".Equals(prop.Type.Name, StringComparison.OrdinalIgnoreCase) || - x is CodeMethod method && "decimal".Equals(method.ReturnType.Name, StringComparison.OrdinalIgnoreCase) || - x is CodeParameter para && "decimal".Equals(para.Type.Name, StringComparison.OrdinalIgnoreCase), - "java.math", "BigDecimal"), - new (static x => x is CodeProperty prop && prop.IsOfKind(CodePropertyKind.QueryParameter) && !string.IsNullOrEmpty(prop.SerializationName), - "com.microsoft.kiota", "QueryParameter"), - new (static x => x is CodeClass @class && @class.OriginalComposedType is CodeIntersectionType intersectionType && intersectionType.Types.Any(static y => !y.IsExternal), - "com.microsoft.kiota.serialization", "ParseNodeHelper"), - }; - private static void CorrectPropertyType(CodeProperty currentProperty) - { - if (currentProperty.IsOfKind(CodePropertyKind.RequestAdapter)) - { - currentProperty.Type.Name = "RequestAdapter"; - currentProperty.Type.IsNullable = true; - } - else if (currentProperty.IsOfKind(CodePropertyKind.BackingStore)) - currentProperty.Type.Name = currentProperty.Type.Name[1..]; // removing the "I" - else if (currentProperty.IsOfKind(CodePropertyKind.QueryParameter)) - currentProperty.DefaultValue = $"new {currentProperty.Type.Name.ToFirstCharacterUpperCase()}()"; - else if (currentProperty.IsOfKind(CodePropertyKind.AdditionalData)) - { - currentProperty.Type.Name = "Map"; - currentProperty.DefaultValue = "new HashMap<>()"; - } - else if (currentProperty.IsOfKind(CodePropertyKind.UrlTemplate)) - { - currentProperty.Type.IsNullable = true; - } - else if (currentProperty.IsOfKind(CodePropertyKind.PathParameters)) - { - currentProperty.Type.IsNullable = true; - currentProperty.Type.Name = "HashMap"; - if (!string.IsNullOrEmpty(currentProperty.DefaultValue)) - currentProperty.DefaultValue = "new HashMap<>()"; - } - CorrectCoreTypes(currentProperty.Parent as CodeClass, DateTypesReplacements, currentProperty.Type); - } - private static void CorrectImplements(ProprietableBlockDeclaration block) - { - block.Implements.Where(x => "IAdditionalDataHolder".Equals(x.Name, StringComparison.OrdinalIgnoreCase)).ToList().ForEach(x => x.Name = x.Name[1..]); // skipping the I - } - private static void CorrectMethodType(CodeMethod currentMethod) - { - if (currentMethod.IsOfKind(CodeMethodKind.Serializer)) - currentMethod.Parameters.Where(x => x.IsOfKind(CodeParameterKind.Serializer)).ToList().ForEach(x => - { - x.Optional = false; - x.Type.IsNullable = true; - if (x.Type.Name.StartsWith("i", StringComparison.OrdinalIgnoreCase)) - x.Type.Name = x.Type.Name[1..]; - }); - else if (currentMethod.IsOfKind(CodeMethodKind.Deserializer)) - { - currentMethod.ReturnType.Name = "Map>"; - currentMethod.Name = "getFieldDeserializers"; - } - else if (currentMethod.IsOfKind(CodeMethodKind.ClientConstructor, CodeMethodKind.Constructor, CodeMethodKind.RawUrlConstructor)) - { - currentMethod.Parameters.Where(x => x.IsOfKind(CodeParameterKind.RequestAdapter, CodeParameterKind.BackingStore)) - .Where(x => x.Type.Name.StartsWith("I", StringComparison.OrdinalIgnoreCase)) - .ToList() - .ForEach(x => x.Type.Name = x.Type.Name[1..]); // removing the "I" - currentMethod.Parameters.Where(x => x.IsOfKind(CodeParameterKind.RequestAdapter, CodeParameterKind.PathParameters)) - .ToList() - .ForEach(x => x.Type.IsNullable = true); - var urlTplParams = currentMethod.Parameters.FirstOrDefault(x => x.IsOfKind(CodeParameterKind.PathParameters)); - if (urlTplParams != null) - urlTplParams.Type.Name = "HashMap"; - } - else if (currentMethod.IsOfKind(CodeMethodKind.Factory) && currentMethod.Parameters.OfKind(CodeParameterKind.ParseNode) is CodeParameter parseNodeParam) - parseNodeParam.Type.Name = parseNodeParam.Type.Name[1..]; - CorrectCoreTypes(currentMethod.Parent as CodeClass, DateTypesReplacements, currentMethod.Parameters - .Select(static x => x.Type) - .Union(new[] { currentMethod.ReturnType }) - .ToArray()); - } - private static readonly Dictionary DateTypesReplacements = new(StringComparer.OrdinalIgnoreCase) { - {"DateTimeOffset", ("OffsetDateTime", new CodeUsing { - Name = "OffsetDateTime", - Declaration = new CodeType { - Name = "java.time", - IsExternal = true, - }, - })}, - {"TimeSpan", ("Period", new CodeUsing { - Name = "Period", - Declaration = new CodeType { - Name = "java.time", - IsExternal = true, - }, - })}, - {"DateOnly", ("LocalDate", new CodeUsing { - Name = "LocalDate", - Declaration = new CodeType { - Name = "java.time", - IsExternal = true, - }, - })}, - {"TimeOnly", ("LocalTime", new CodeUsing { - Name = "LocalTime", - Declaration = new CodeType { - Name = "java.time", - IsExternal = true, - }, - })}, - {"Guid", ("UUID", new CodeUsing { - Name = "UUID", - Declaration = new CodeType { - Name = "java.util", - IsExternal = true, - }, - })}, - }; - private void InsertOverrideMethodForRequestExecutorsAndBuildersAndConstructors(CodeElement currentElement) - { - if (currentElement is CodeClass currentClass) - { - var codeMethods = currentClass.Methods; - if (codeMethods.Any()) - { - var originalExecutorMethods = codeMethods.Where(x => x.IsOfKind(CodeMethodKind.RequestExecutor)); - var executorMethodsToAdd = originalExecutorMethods - .Union(originalExecutorMethods - .Select(x => GetMethodClone(x, CodeParameterKind.RequestConfiguration))) - .OfType(); - var originalGeneratorMethods = codeMethods.Where(x => x.IsOfKind(CodeMethodKind.RequestGenerator)); - var generatorMethodsToAdd = originalGeneratorMethods - .Select(x => GetMethodClone(x, CodeParameterKind.RequestConfiguration)) - .OfType(); - if (executorMethodsToAdd.Any() || generatorMethodsToAdd.Any()) - currentClass.AddMethod(executorMethodsToAdd - .Union(generatorMethodsToAdd) - .ToArray()); - } - } + CrawlTree(currentElement, AddEnumSetImport); + } + private static readonly JavaConventionService conventionService = new(); + private static readonly AdditionalUsingEvaluator[] defaultUsingEvaluators = { + new (static x => x is CodeProperty prop && prop.IsOfKind(CodePropertyKind.RequestAdapter), + "com.microsoft.kiota", "RequestAdapter"), + new (static x => x is CodeProperty prop && prop.IsOfKind(CodePropertyKind.PathParameters), + "java.util", "HashMap"), + new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestGenerator), + "com.microsoft.kiota", "RequestInformation", "RequestOption", "HttpMethod"), + new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestGenerator), + "java.net", "URISyntaxException"), + new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestGenerator), + "java.util", "Collection", "Map"), + new (static x => x is CodeClass @class && @class.IsOfKind(CodeClassKind.Model), + "com.microsoft.kiota.serialization", "Parsable"), + new (static x => x is CodeClass @class && @class.IsOfKind(CodeClassKind.Model) && @class.Properties.Any(x => x.IsOfKind(CodePropertyKind.AdditionalData)), + "com.microsoft.kiota.serialization", "AdditionalDataHolder"), + new (static x => x is CodeMethod method && method.Parameters.Any(x => !x.Optional), + "java.util", "Objects"), + new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestExecutor) && + method.Parameters.Any(x => x.IsOfKind(CodeParameterKind.RequestBody) && + x.Type.Name.Equals(conventionService.StreamTypeName, StringComparison.OrdinalIgnoreCase)), + "java.io", "InputStream"), + new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Serializer), + "com.microsoft.kiota.serialization", "SerializationWriter"), + new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Deserializer), + "com.microsoft.kiota.serialization", "ParseNode"), + new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestExecutor), + "com.microsoft.kiota.serialization", "Parsable", "ParsableFactory"), + new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Deserializer), + "java.util", "HashMap", "Map"), + new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.ClientConstructor) && + method.Parameters.Any(y => y.IsOfKind(CodeParameterKind.BackingStore)), + "com.microsoft.kiota.store", "BackingStoreFactory", "BackingStoreFactorySingleton"), + new (static x => x is CodeProperty prop && prop.IsOfKind(CodePropertyKind.BackingStore), + "com.microsoft.kiota.store", "BackingStore", "BackedModel", "BackingStoreFactorySingleton"), + new (static x => x is CodeProperty prop && "decimal".Equals(prop.Type.Name, StringComparison.OrdinalIgnoreCase) || + x is CodeMethod method && "decimal".Equals(method.ReturnType.Name, StringComparison.OrdinalIgnoreCase) || + x is CodeParameter para && "decimal".Equals(para.Type.Name, StringComparison.OrdinalIgnoreCase), + "java.math", "BigDecimal"), + new (static x => x is CodeProperty prop && prop.IsOfKind(CodePropertyKind.QueryParameter) && !string.IsNullOrEmpty(prop.SerializationName), + "com.microsoft.kiota", "QueryParameter"), + new (static x => x is CodeClass @class && @class.OriginalComposedType is CodeIntersectionType intersectionType && intersectionType.Types.Any(static y => !y.IsExternal), + "com.microsoft.kiota.serialization", "ParseNodeHelper"), + }; + private static void CorrectPropertyType(CodeProperty currentProperty) + { + if (currentProperty.IsOfKind(CodePropertyKind.RequestAdapter)) + { + currentProperty.Type.Name = "RequestAdapter"; + currentProperty.Type.IsNullable = true; + } + else if (currentProperty.IsOfKind(CodePropertyKind.BackingStore)) + currentProperty.Type.Name = currentProperty.Type.Name[1..]; // removing the "I" + else if (currentProperty.IsOfKind(CodePropertyKind.QueryParameter)) + currentProperty.DefaultValue = $"new {currentProperty.Type.Name.ToFirstCharacterUpperCase()}()"; + else if (currentProperty.IsOfKind(CodePropertyKind.AdditionalData)) + { + currentProperty.Type.Name = "Map"; + currentProperty.DefaultValue = "new HashMap<>()"; + } + else if (currentProperty.IsOfKind(CodePropertyKind.UrlTemplate)) + { + currentProperty.Type.IsNullable = true; + } + else if (currentProperty.IsOfKind(CodePropertyKind.PathParameters)) + { + currentProperty.Type.IsNullable = true; + currentProperty.Type.Name = "HashMap"; + if (!string.IsNullOrEmpty(currentProperty.DefaultValue)) + currentProperty.DefaultValue = "new HashMap<>()"; + } + CorrectCoreTypes(currentProperty.Parent as CodeClass, DateTypesReplacements, currentProperty.Type); + } + private static void CorrectImplements(ProprietableBlockDeclaration block) + { + block.Implements.Where(x => "IAdditionalDataHolder".Equals(x.Name, StringComparison.OrdinalIgnoreCase)).ToList().ForEach(x => x.Name = x.Name[1..]); // skipping the I + } + private static void CorrectMethodType(CodeMethod currentMethod) + { + if (currentMethod.IsOfKind(CodeMethodKind.Serializer)) + currentMethod.Parameters.Where(x => x.IsOfKind(CodeParameterKind.Serializer)).ToList().ForEach(x => + { + x.Optional = false; + x.Type.IsNullable = true; + if (x.Type.Name.StartsWith("i", StringComparison.OrdinalIgnoreCase)) + x.Type.Name = x.Type.Name[1..]; + }); + else if (currentMethod.IsOfKind(CodeMethodKind.Deserializer)) + { + currentMethod.ReturnType.Name = "Map>"; + currentMethod.Name = "getFieldDeserializers"; + } + else if (currentMethod.IsOfKind(CodeMethodKind.ClientConstructor, CodeMethodKind.Constructor, CodeMethodKind.RawUrlConstructor)) + { + currentMethod.Parameters.Where(x => x.IsOfKind(CodeParameterKind.RequestAdapter, CodeParameterKind.BackingStore)) + .Where(x => x.Type.Name.StartsWith("I", StringComparison.OrdinalIgnoreCase)) + .ToList() + .ForEach(x => x.Type.Name = x.Type.Name[1..]); // removing the "I" + currentMethod.Parameters.Where(x => x.IsOfKind(CodeParameterKind.RequestAdapter, CodeParameterKind.PathParameters)) + .ToList() + .ForEach(x => x.Type.IsNullable = true); + var urlTplParams = currentMethod.Parameters.FirstOrDefault(x => x.IsOfKind(CodeParameterKind.PathParameters)); + if (urlTplParams != null) + urlTplParams.Type.Name = "HashMap"; + } + else if (currentMethod.IsOfKind(CodeMethodKind.Factory) && currentMethod.Parameters.OfKind(CodeParameterKind.ParseNode) is CodeParameter parseNodeParam) + parseNodeParam.Type.Name = parseNodeParam.Type.Name[1..]; + CorrectCoreTypes(currentMethod.Parent as CodeClass, DateTypesReplacements, currentMethod.Parameters + .Select(static x => x.Type) + .Union(new[] { currentMethod.ReturnType }) + .ToArray()); + } + private static readonly Dictionary DateTypesReplacements = new(StringComparer.OrdinalIgnoreCase) { + {"DateTimeOffset", ("OffsetDateTime", new CodeUsing { + Name = "OffsetDateTime", + Declaration = new CodeType { + Name = "java.time", + IsExternal = true, + }, + })}, + {"TimeSpan", ("Period", new CodeUsing { + Name = "Period", + Declaration = new CodeType { + Name = "java.time", + IsExternal = true, + }, + })}, + {"DateOnly", ("LocalDate", new CodeUsing { + Name = "LocalDate", + Declaration = new CodeType { + Name = "java.time", + IsExternal = true, + }, + })}, + {"TimeOnly", ("LocalTime", new CodeUsing { + Name = "LocalTime", + Declaration = new CodeType { + Name = "java.time", + IsExternal = true, + }, + })}, + {"Guid", ("UUID", new CodeUsing { + Name = "UUID", + Declaration = new CodeType { + Name = "java.util", + IsExternal = true, + }, + })}, + }; + private void InsertOverrideMethodForRequestExecutorsAndBuildersAndConstructors(CodeElement currentElement) + { + if (currentElement is CodeClass currentClass) + { + var codeMethods = currentClass.Methods; + if (codeMethods.Any()) + { + var originalExecutorMethods = codeMethods.Where(x => x.IsOfKind(CodeMethodKind.RequestExecutor)); + var executorMethodsToAdd = originalExecutorMethods + .Union(originalExecutorMethods + .Select(x => GetMethodClone(x, CodeParameterKind.RequestConfiguration))) + .OfType(); + var originalGeneratorMethods = codeMethods.Where(x => x.IsOfKind(CodeMethodKind.RequestGenerator)); + var generatorMethodsToAdd = originalGeneratorMethods + .Select(x => GetMethodClone(x, CodeParameterKind.RequestConfiguration)) + .OfType(); + if (executorMethodsToAdd.Any() || generatorMethodsToAdd.Any()) + currentClass.AddMethod(executorMethodsToAdd + .Union(generatorMethodsToAdd) + .ToArray()); + } + } - CrawlTree(currentElement, InsertOverrideMethodForRequestExecutorsAndBuildersAndConstructors); - } - private static void RemoveClassNamePrefixFromNestedClasses(CodeElement currentElement) - { - if (currentElement is CodeClass currentClass && currentClass.IsOfKind(CodeClassKind.RequestBuilder)) - { - var prefix = currentClass.Name; - var requestConfigClasses = currentClass - .Methods - .SelectMany(static x => x.Parameters) - .Where(static x => x.Type.ActionOf && x.IsOfKind(CodeParameterKind.RequestConfiguration)) - .SelectMany(static x => x.Type.AllTypes) - .Select(static x => x.TypeDefinition) - .OfType(); - // ensure we do not miss out the types present in request configuration objects i.e. the query parameters - var innerClasses = requestConfigClasses - .SelectMany(static x => x.Properties) - .Where(static x => x.IsOfKind(CodePropertyKind.QueryParameters)) - .SelectMany(static x => x.Type.AllTypes) - .Select(static x => x.TypeDefinition) - .OfType().Union(requestConfigClasses) - .Where(x => x.Name.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)); + CrawlTree(currentElement, InsertOverrideMethodForRequestExecutorsAndBuildersAndConstructors); + } + private static void RemoveClassNamePrefixFromNestedClasses(CodeElement currentElement) + { + if (currentElement is CodeClass currentClass && currentClass.IsOfKind(CodeClassKind.RequestBuilder)) + { + var prefix = currentClass.Name; + var requestConfigClasses = currentClass + .Methods + .SelectMany(static x => x.Parameters) + .Where(static x => x.Type.ActionOf && x.IsOfKind(CodeParameterKind.RequestConfiguration)) + .SelectMany(static x => x.Type.AllTypes) + .Select(static x => x.TypeDefinition) + .OfType(); + // ensure we do not miss out the types present in request configuration objects i.e. the query parameters + var innerClasses = requestConfigClasses + .SelectMany(static x => x.Properties) + .Where(static x => x.IsOfKind(CodePropertyKind.QueryParameters)) + .SelectMany(static x => x.Type.AllTypes) + .Select(static x => x.TypeDefinition) + .OfType().Union(requestConfigClasses) + .Where(x => x.Name.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)); - foreach (var innerClass in innerClasses) - { - innerClass.Name = innerClass.Name[prefix.Length..]; + foreach (var innerClass in innerClasses) + { + innerClass.Name = innerClass.Name[prefix.Length..]; - if (innerClass.IsOfKind(CodeClassKind.RequestConfiguration)) - RemovePrefixFromQueryProperties(innerClass, prefix); - } - RemovePrefixFromRequestConfigParameters(currentClass, prefix); - } - CrawlTree(currentElement, x => RemoveClassNamePrefixFromNestedClasses(x)); - } - private static void RemovePrefixFromQueryProperties(CodeElement currentElement, String prefix) - { - if (currentElement is CodeClass currentClass) - { - var queryProperty = currentClass - .Properties - .Where(static x => x.IsOfKind(CodePropertyKind.QueryParameters)) - .Select(static x => x.Type) - .OfType() - .Where(x => x.Name.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)); + if (innerClass.IsOfKind(CodeClassKind.RequestConfiguration)) + RemovePrefixFromQueryProperties(innerClass, prefix); + } + RemovePrefixFromRequestConfigParameters(currentClass, prefix); + } + CrawlTree(currentElement, x => RemoveClassNamePrefixFromNestedClasses(x)); + } + private static void RemovePrefixFromQueryProperties(CodeElement currentElement, String prefix) + { + if (currentElement is CodeClass currentClass) + { + var queryProperty = currentClass + .Properties + .Where(static x => x.IsOfKind(CodePropertyKind.QueryParameters)) + .Select(static x => x.Type) + .OfType() + .Where(x => x.Name.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)); - foreach (var property in queryProperty) - { - property.Name = property.Name[prefix.Length..]; - } - } - } - private static void RemovePrefixFromRequestConfigParameters(CodeElement currentElement, String prefix) - { - if (currentElement is CodeClass currentClass) - { - var parameters = currentClass - .Methods - .SelectMany(static x => x.Parameters) - .Where(static x => x.Type.ActionOf && x.IsOfKind(CodeParameterKind.RequestConfiguration)) - .Select(static x => x.Type) - .OfType() - .Where(x => x.Name.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)); + foreach (var property in queryProperty) + { + property.Name = property.Name[prefix.Length..]; + } + } + } + private static void RemovePrefixFromRequestConfigParameters(CodeElement currentElement, String prefix) + { + if (currentElement is CodeClass currentClass) + { + var parameters = currentClass + .Methods + .SelectMany(static x => x.Parameters) + .Where(static x => x.Type.ActionOf && x.IsOfKind(CodeParameterKind.RequestConfiguration)) + .Select(static x => x.Type) + .OfType() + .Where(x => x.Name.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)); - foreach (var parameter in parameters) - { - parameter.Name = parameter.Name[prefix.Length..]; - } - } - } - private static void LowerCaseNamespaceNames(CodeElement currentElement) - { - if (currentElement is CodeNamespace codeNamespace) - { - if (!string.IsNullOrEmpty(codeNamespace.Name)) - codeNamespace.Name = codeNamespace.Name.ToLowerInvariant(); + foreach (var parameter in parameters) + { + parameter.Name = parameter.Name[prefix.Length..]; + } + } + } + private static void LowerCaseNamespaceNames(CodeElement currentElement) + { + if (currentElement is CodeNamespace codeNamespace) + { + if (!string.IsNullOrEmpty(codeNamespace.Name)) + codeNamespace.Name = codeNamespace.Name.ToLowerInvariant(); - CrawlTree(currentElement, LowerCaseNamespaceNames); - } - } + CrawlTree(currentElement, LowerCaseNamespaceNames); + } + } } diff --git a/src/Kiota.Builder/Refiners/PhpRefiner.cs b/src/Kiota.Builder/Refiners/PhpRefiner.cs index 848ce9bc3c..8080fe44cc 100644 --- a/src/Kiota.Builder/Refiners/PhpRefiner.cs +++ b/src/Kiota.Builder/Refiners/PhpRefiner.cs @@ -39,7 +39,7 @@ public override Task Refine(CodeNamespace generatedCode, CancellationToken cance MakeModelPropertiesNullable(generatedCode); ReplaceIndexersByMethodsWithParameter(generatedCode, false, - static x => $"With{x.ToFirstCharacterUpperCase()}", + static x => $"By{x.ToFirstCharacterUpperCase()}", static x => x.ToFirstCharacterLowerCase()); cancellationToken.ThrowIfCancellationRequested(); MoveClassesWithNamespaceNamesUnderNamespace(generatedCode); diff --git a/src/Kiota.Builder/Refiners/PythonRefiner.cs b/src/Kiota.Builder/Refiners/PythonRefiner.cs index 15d08b139f..13d6828149 100644 --- a/src/Kiota.Builder/Refiners/PythonRefiner.cs +++ b/src/Kiota.Builder/Refiners/PythonRefiner.cs @@ -22,7 +22,7 @@ public override Task Refine(CodeNamespace generatedCode, CancellationToken cance cancellationToken.ThrowIfCancellationRequested(); ReplaceIndexersByMethodsWithParameter(generatedCode, false, - static x => $"_with_{x.ToSnakeCase()}", + static x => $"by_{x.ToSnakeCase()}", static x => x.ToSnakeCase()); RemoveCancellationParameter(generatedCode); CorrectCoreType(generatedCode, CorrectMethodType, CorrectPropertyType, CorrectImplements); diff --git a/src/Kiota.Builder/Refiners/RubyRefiner.cs b/src/Kiota.Builder/Refiners/RubyRefiner.cs index 72f9a8a198..c516c82cd0 100644 --- a/src/Kiota.Builder/Refiners/RubyRefiner.cs +++ b/src/Kiota.Builder/Refiners/RubyRefiner.cs @@ -19,7 +19,7 @@ public override Task Refine(CodeNamespace generatedCode, CancellationToken cance cancellationToken.ThrowIfCancellationRequested(); ReplaceIndexersByMethodsWithParameter(generatedCode, false, - static x => $"_with_{x.ToSnakeCase()}", + static x => $"by_{x.ToSnakeCase()}", static x => x.ToSnakeCase()); MoveRequestBuilderPropertiesToBaseType(generatedCode, new CodeUsing diff --git a/src/Kiota.Builder/Refiners/SwiftRefiner.cs b/src/Kiota.Builder/Refiners/SwiftRefiner.cs index 26a2b3784e..db9f981307 100644 --- a/src/Kiota.Builder/Refiners/SwiftRefiner.cs +++ b/src/Kiota.Builder/Refiners/SwiftRefiner.cs @@ -21,7 +21,7 @@ public override Task Refine(CodeNamespace generatedCode, CancellationToken cance ReplaceIndexersByMethodsWithParameter( generatedCode, false, - static x => $"With{x.ToFirstCharacterUpperCase()}", + static x => $"By{x.ToFirstCharacterUpperCase()}", static x => x.ToFirstCharacterUpperCase()); cancellationToken.ThrowIfCancellationRequested(); ReplaceReservedNames( diff --git a/src/Kiota.Builder/Refiners/TypeScriptRefiner.cs b/src/Kiota.Builder/Refiners/TypeScriptRefiner.cs index 4e5c95ca94..df85fc8cab 100644 --- a/src/Kiota.Builder/Refiners/TypeScriptRefiner.cs +++ b/src/Kiota.Builder/Refiners/TypeScriptRefiner.cs @@ -28,7 +28,7 @@ public override Task Refine(CodeNamespace generatedCode, CancellationToken cance }); ReplaceIndexersByMethodsWithParameter(generatedCode, false, - static x => $"with{x.ToFirstCharacterUpperCase()}", + static x => $"by{x.ToFirstCharacterUpperCase()}", static x => x.ToFirstCharacterLowerCase()); RemoveCancellationParameter(generatedCode); CorrectCoreType(generatedCode, CorrectMethodType, CorrectPropertyType, CorrectImplements);