Skip to content

Issue/565/skilltrigger returnval #797

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
merged 5 commits into from
Nov 26, 2024
Merged

Issue/565/skilltrigger returnval #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
edc2b14
force return for skill triggers
ahmedmuhsin Nov 14, 2024
a5b808e
always add data target for return if the return type is not void or t…
ahmedmuhsin Nov 19, 2024
e359c25
update tests
ahmedmuhsin Nov 20, 2024
4e14ef9
Merge branch 'dev' into issue/565/skilltrigger-returnval
gavin-aguiar Nov 22, 2024
4b93b35
Merge branch 'dev' into issue/565/skilltrigger-returnval
ahmedmuhsin Nov 26, 2024
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
4 changes: 2 additions & 2 deletions src/main/java/com/microsoft/azure/functions/worker/binding/BindingDataStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ public Optional<TypedData> getDataTargetTypedValue(String name) throws Exception
});
}

public Optional<BindingData> getOrAddDataTarget(UUID outputId, String name, Type target, boolean hasImplicitOutput) {
public Optional<BindingData> getOrAddDataTarget(UUID outputId, String name, Type target, boolean ignoreDefinition) {
DataTarget output = null;
if (this.isDataTargetValid(name, target)) {
output = this.getTarget(outputId).get(name);
if (output == null && (this.isDefinitionOutput(name) || hasImplicitOutput)) {
if (output == null && (this.isDefinitionOutput(name) || ignoreDefinition)) {
this.getTarget(outputId).put(name, output = rpcDataTargetFromType(target));
}
}
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/com/microsoft/azure/functions/worker/broker/MethodBindInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,22 @@ public List<ParamBindInfo> getParams() {
return params;
}

public boolean hasEffectiveReturnType(){
boolean nonVoidReturn = this.hasNonVoidReturnType();
// For function annotated with @HasImplicitOutput, we should allow it to send back data even function's return type is void
// Reference to https://github.com/microsoft/durabletask-java/issues/126
boolean implicitOutput = this.hasImplicitOutput();
return nonVoidReturn || implicitOutput;
}

public boolean hasImplicitOutput() {
return hasImplicitOutput;
}

public boolean hasNonVoidReturnType() {
Class<?> returnType = this.getMethod().getReturnType();
return !returnType.equals(void.class) && !returnType.equals(Void.class);
}
}


10 changes: 4 additions & 6 deletions src/main/java/com/microsoft/azure/functions/worker/broker/ParameterResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,11 @@ else if (paramName == null && !paramBindingNameAnnotation.isEmpty()) {
BindingData actualArg = argument.orElseThrow(WrongMethodTypeException::new);
invokeInfo.appendArgument(actualArg.getValue());
}
// For function annotated with @HasImplicitOutput, we should allow it to send back data even function's return type is void
// Reference to https://github.com/microsoft/durabletask-java/issues/126
if (!method.getMethod().getReturnType().equals(void.class)
&& !method.getMethod().getReturnType().equals(Void.class)
|| method.hasImplicitOutput()) {
dataStore.getOrAddDataTarget(invokeInfo.getOutputsId(), BindingDataStore.RETURN_NAME, method.getMethod().getReturnType(), method.hasImplicitOutput());

if (method.hasEffectiveReturnType()){
dataStore.getOrAddDataTarget(invokeInfo.getOutputsId(), BindingDataStore.RETURN_NAME, method.getMethod().getReturnType(), true);
}

return invokeInfo;
} catch (Exception ex) {
ExceptionUtils.rethrow(ex);
Expand Down
35 changes: 32 additions & 3 deletions src/test/java/com/microsoft/azure/functions/worker/broker/ParameterResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ public <T> T getInstance(Class<T> functionClass) throws Exception {

@Test
public void testResolveArgumentsHasImplicitOutputTrue() throws Exception {
Method testMethod = this.getClass().getDeclaredMethod("testMethod");
Method testMethod = this.getClass().getDeclaredMethod("testMethodVoid");
when(methodBindInfo.hasNonVoidReturnType()).thenCallRealMethod();
when(methodBindInfo.hasEffectiveReturnType()).thenCallRealMethod();
when(methodBindInfo.hasImplicitOutput()).thenReturn(true);
when(methodBindInfo.getMethod()).thenReturn(testMethod);
when(methodBindInfo.getParams()).thenReturn(new ArrayList<>());
Expand All @@ -66,13 +68,40 @@ public void testResolveArgumentsHasImplicitOutputTrue() throws Exception {

@Test
public void testResolveArgumentsHasImplicitOutputFalse() throws Exception {
Method testMethod = this.getClass().getDeclaredMethod("testMethod");
Method testMethod = this.getClass().getDeclaredMethod("testMethodVoid");
when(methodBindInfo.hasNonVoidReturnType()).thenCallRealMethod();
when(methodBindInfo.hasEffectiveReturnType()).thenCallRealMethod();
when(methodBindInfo.hasImplicitOutput()).thenReturn(false);
when(methodBindInfo.getMethod()).thenReturn(testMethod);
when(methodBindInfo.getParams()).thenReturn(new ArrayList<>());
ParameterResolver.resolveArguments(executionContextDataSource);
assertFalse(executionContextDataSource.getDataStore().getDataTargetTypedValue(BindingDataStore.RETURN_NAME).isPresent());
}

public void testMethod() {}
@Test
public void testResolveArgumentsNonVoidReturnTypeTrue() throws Exception {
Method testMethod = this.getClass().getDeclaredMethod("testMethodNonVoid");
when(methodBindInfo.getMethod()).thenReturn(testMethod);
when(methodBindInfo.getParams()).thenReturn(new ArrayList<>());
when(methodBindInfo.hasNonVoidReturnType()).thenCallRealMethod(); // Ensures real logic is executed
when(methodBindInfo.hasImplicitOutput()).thenReturn(false);
when(methodBindInfo.hasEffectiveReturnType()).thenCallRealMethod();
ParameterResolver.resolveArguments(executionContextDataSource);
assertTrue(executionContextDataSource.getDataStore().getDataTargetTypedValue(BindingDataStore.RETURN_NAME).isPresent());
}

@Test
public void testResolveArgumentsNonVoidReturnTypeFalse() throws Exception {
Method testMethod = this.getClass().getDeclaredMethod("testMethodVoid");
when(methodBindInfo.getMethod()).thenReturn(testMethod);
when(methodBindInfo.getParams()).thenReturn(new ArrayList<>());
when(methodBindInfo.hasNonVoidReturnType()).thenCallRealMethod(); // Ensures real logic is executed
when(methodBindInfo.hasImplicitOutput()).thenReturn(false);
when(methodBindInfo.hasEffectiveReturnType()).thenCallRealMethod();
ParameterResolver.resolveArguments(executionContextDataSource);
assertFalse(executionContextDataSource.getDataStore().getDataTargetTypedValue(BindingDataStore.RETURN_NAME).isPresent());
}

public void testMethodVoid() {}
public String testMethodNonVoid() { return "test"; }
}