Skip to content
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

Jump to bottom

[Fix #3772] Duplicate function error #3774

Merged
merged 1 commit into from
Nov 13, 2024
Merged

[Fix #3772] Duplicate function error #3774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions ...java/org/kie/kogito/serverless/workflow/parser/handlers/validation/WorkflowValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@
*/
package org.kie.kogito.serverless.workflow.parser.handlers.validation;

import java.util.Map;

import org.kie.kogito.serverless.workflow.parser.ParserContext;

import io.serverlessworkflow.api.Workflow;

import static org.kie.kogito.internal.utils.ConversionUtils.isEmpty;
import static org.kie.kogito.serverless.workflow.utils.ServerlessWorkflowUtils.findDuplicates;

public class WorkflowValidator {

Expand All @@ -33,5 +36,13 @@ public static void validateStart(Workflow workflow, ParserContext context) {
if (workflow.getStart() == null || isEmpty(workflow.getStart().getStateName())) {
context.addValidationError("Workflow does not define a starting state");
}
if (workflow.getFunctions() != null) {
Map<String, Integer> functionDuplicates = findDuplicates(workflow.getFunctions().getFunctionDefs(), f -> f.getName());
if (!functionDuplicates.isEmpty()) {
StringBuilder sb = new StringBuilder("There are duplicated function definitions: ");
functionDuplicates.forEach((k, v) -> sb.append(String.format("\nFunction %s appears %d times", k, v)));
context.addValidationError(sb.toString());
}
}
}
}
20 changes: 20 additions & 0 deletions ...ilder/src/main/java/org/kie/kogito/serverless/workflow/utils/ServerlessWorkflowUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@
import java.nio.file.Path;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;

Expand Down Expand Up @@ -251,4 +256,19 @@ private static ModelMetaData getModelMetadata(WorkflowProcess process, Class<?>
return new ModelMetaData(process.getId(), modelClass.getPackage().getName(), modelClass.getSimpleName(), KogitoWorkflowProcess.PUBLIC_VISIBILITY,
VariableDeclarations.of(Collections.emptyMap()), false);
}

public static <T, V> Map<V, Integer> findDuplicates(List<T> items, Function<T, V> converter) {
if (items == null) {
return Map.of();
}
Map<V, Integer> duplicates = new LinkedHashMap<>();
Set<V> helper = new HashSet<>();
items.forEach(item -> {
V toAdd = converter.apply(item);
if (!helper.add(toAdd)) {
duplicates.compute(toAdd, (k, v) -> v == null ? 2 : ++v);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although the helper set is not stricly needed, since you can remove not duplicates from the map after the main loop is completed
duplicates().values().removeIf ( v -> v == 1);
it will slighly affects the performace of the most common case. You have to remove original number - duplicate elements from the map. If duplicate elements is 0 (the most common case) you remove the original number.
It can be argued thad adding the helper Set consumes more memory, but this is not completely true, because at the end a HashSet is a "capped" HashMap. Since the number of Map key buckets depends on the number of duplicates, with a helper map you have original number + duplicate number buckets, without it you have original number buckets. So you only have the duplicate buckets as additional memory (precisely the addtional memory that will be preserved when the method returns) and as benefit you save the removal.

}
});
return duplicates;
}
}
7 changes: 7 additions & 0 deletions ...low-builder/src/test/java/org/kie/kogito/serverless/workflow/utils/WorkflowUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
package org.kie.kogito.serverless.workflow.utils;

import java.io.File;
import java.util.Arrays;
import java.util.Collections;
import java.util.Map;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -51,4 +53,9 @@ public void testResolveFunctionMetadata() {
assertThat(resolveFunctionMetadata(function, "testprop1", context)).isNotNull().isEqualTo("customtestprop1val");
assertThat(resolveFunctionMetadata(function, "testprop2", context)).isNotNull().isEqualTo("testprop2val");
}

@Test
void findDuplicates() {
assertThat(ServerlessWorkflowUtils.findDuplicates(Arrays.asList(1, 3, 3, 2, 2, 1, 8, 7, 3), v -> v)).isEqualTo(Map.of(3, 3, 2, 2, 1, 2));
}
}
5 changes: 3 additions & 2 deletions .../test/java/org/kie/kogito/serverless/workflow/executor/StaticWorkflowApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,9 @@ void testValidationError() throws IOException {
StaticWorkflowApplication application = StaticWorkflowApplication.create()) {
Workflow workflow = getWorkflow(reader, WorkflowFormat.JSON);
ValidationException validationException = catchThrowableOfType(() -> application.process(workflow), ValidationException.class);
assertThat(validationException.getErrors()).hasSizeGreaterThanOrEqualTo(4);
assertThat(validationException).hasMessageContaining("error").hasMessageContaining("function").hasMessageContaining("connect").hasMessageContaining("transition");
assertThat(validationException.getErrors()).hasSizeGreaterThanOrEqualTo(5);
assertThat(validationException).hasMessageContaining("error").hasMessageContaining("function").hasMessageContaining("connect").hasMessageContaining("transition")
.hasMessageContaining("duplicated");
}
}

Expand Down
5 changes: 5 additions & 0 deletions ...erless-workflow/kogito-serverless-workflow-executor-core/src/test/resources/wrong.sw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
"name": "logInfo",
"type": "custom",
"operation": "sysout:INFO"
},
{
"name": "pushData",
"type": "custom",
"operation": "script:python:print('javierito')"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Different operation but same name (which is the one to be checked) makes them duplicated, clear example!

}
],
"errors":[],
Expand Down
6 changes: 6 additions & 0 deletions ...workflow-fluent/src/main/java/org/kie/kogito/serverless/workflow/fluent/StateBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public static ForEachStateBuilder forEach(String inputExpr) {
protected final S state;
protected final Collection<FunctionBuilder> functionDefinitions = new HashSet<>();
protected final Collection<EventDefBuilder> eventDefinitions = new HashSet<>();
private short buildCount;

Collection<FunctionBuilder> getFunctions() {
return functionDefinitions;
Expand Down Expand Up @@ -115,9 +116,14 @@ public T outputFilter(String filter) {
}

public S build() {
buildCount++;
return ensureName(state);
}

short buildCount() {
return buildCount;
}

private static int counter;

protected static <T extends DefaultState> T ensureName(T state) {
Expand Down
6 changes: 4 additions & 2 deletions ...low-fluent/src/main/java/org/kie/kogito/serverless/workflow/fluent/TransitionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ protected TransitionBuilder(T container, WorkflowBuilder workflow, DefaultState

public TransitionBuilder<T> next(StateBuilder<?, ?> stateBuilder) {
DefaultState state = stateBuilder.build();
workflow.addFunctions(stateBuilder.getFunctions());
workflow.addEvents(stateBuilder.getEvents());
if (stateBuilder.buildCount() == 1) {
workflow.addFunctions(stateBuilder.getFunctions());
workflow.addEvents(stateBuilder.getEvents());
}
next(state);
lastState = state;
return this;
Expand Down
Loading