Skip to content

Async to Sync Revert for Java Generation #3672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baywet merged 10 commits into from
Nov 13, 2023
Merged

Async to Sync Revert for Java Generation #3672

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3a5f725
remove completeable futures
ramsessanchez Nov 3, 2023
63cbb28
Update Unit Tests and remove async suffix
ramsessanchez Nov 7, 2023
6d3c867
Merge branch 'main' into rsh/syncRevert_java
ramsessanchez Nov 7, 2023
5a83bf0
changelog
ramsessanchez Nov 7, 2023
6805203
- bumps kiota dependencies for java integration tests
baywet Nov 13, 2023
81dd8a7
- removes future from java execution test
baywet Nov 13, 2023
ab41894
- fixes exception type
baywet Nov 13, 2023
1197c2d
- skips returns in java overloads
baywet Nov 13, 2023
4a94cce
- fixes exception cast in integration tests
baywet Nov 13, 2023
ba7bb13
- fixes void return in request executors
baywet Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions src/Kiota.Builder/Writers/Java/CodeMethodWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,17 +688,14 @@ private void WriteSerializationMethodCall(CodeProperty otherProp, CodeMethod met
private static readonly BaseCodeParameterOrderComparer parameterOrderComparer = new();
private string GetFinalReturnType(CodeMethod code, string returnType)
{
var voidType = code.IsAsync ? "Void" : "void";
if (code.ReturnType is CodeType { TypeDefinition: CodeEnum { Flags: true }, IsCollection: false })
returnType = $"EnumSet<{returnType}>";
var returnTypeAsyncPrefix = code.IsAsync ? "java.util.concurrent.CompletableFuture<" : string.Empty;
var returnTypeAsyncSuffix = code.IsAsync ? ">" : string.Empty;
var reType = returnType.Equals("void", StringComparison.OrdinalIgnoreCase) ? voidType : returnType;
var reType = returnType.Equals("void", StringComparison.OrdinalIgnoreCase) ? "void" : returnType;
var collectionCorrectedReturnType = code.ReturnType.IsArray && code.IsOfKind(CodeMethodKind.RequestExecutor) ?
$"Iterable<{returnType.StripArraySuffix()}>" :
reType;
var isConstructor = code.IsOfKind(CodeMethodKind.Constructor, CodeMethodKind.ClientConstructor, CodeMethodKind.RawUrlConstructor);
var finalReturnType = isConstructor ? string.Empty : $"{returnTypeAsyncPrefix}{collectionCorrectedReturnType}{returnTypeAsyncSuffix}";
var finalReturnType = isConstructor ? string.Empty : $"{collectionCorrectedReturnType}";
return finalReturnType.Trim();
}
private void WriteMethodPrototype(CodeMethod code, LanguageWriter writer, string returnType)
Expand Down Expand Up @@ -729,11 +726,7 @@ private void WriteMethodDocumentation(CodeMethod code, LanguageWriter writer, st
{
var returnVoid = baseReturnType.Equals("void", StringComparison.OrdinalIgnoreCase);
// Void returns, this includes constructors, should not have a return statement in the JavaDocs.
var returnRemark = returnVoid ? string.Empty : (code.IsAsync switch
{
true => $"@return a CompletableFuture of {baseReturnType}",
false => $"@return a {finalReturnType}",
});
var returnRemark = returnVoid ? string.Empty : $"@return a {finalReturnType}";
conventions.WriteLongDescription(code,
writer,
code.Parameters
Expand Down