Skip to content

[bugfix] - Fix a NPE when a custom parameter is not present in userAc… #16

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
sergio-soria-bi merged 1 commit into from
Feb 25, 2026
Merged

[bugfix] - Fix a NPE when a custom parameter is not present in userAc… #16

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
9 changes: 8 additions & 1 deletion src/main/java/org/opendevstack/component_catalog/server/controllers/CatalogApiAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,15 @@ private List<CatalogItemUserActionParameter> finalizeUserActionParameters(List<
var baseNonCustomizableParamsNames = baseNonCustomizableUserActionParams.stream()
.map(CatalogItemUserActionParameter::getName)
.collect(Collectors.toSet());

var customizableParamsPairs = customizableParamsPairsJoinedWithUserParams.stream()
.filter(pair -> !baseNonCustomizableParamsNames.contains(pair.getLeft().getName()))
.filter(pair -> {
var userDefinedParamName = Optional.ofNullable(pair.getLeft())
.map(CatalogItemUserActionParameter::getName)
.orElse(Strings.EMPTY);

return !baseNonCustomizableParamsNames.contains(userDefinedParamName);
})
.toList();


Expand Down
48 changes: 48 additions & 0 deletions ...est/java/org/opendevstack/component_catalog/server/controllers/CatalogApiAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,54 @@ void givenACatalogItem_AndItemContainsParameters_AndOneParameterSharesNameWithAN
assertThat(parameterNonCustomizable.get().getDefaultValue().get()).isEqualTo("123");
}

@Test
void givenACatalogItem_AndItemContainsParameters_AndOneParameterIsCustomizable_andCustomUserActionDoesNotDefineIt_whenFinalizeUserActions_thenCustomParameterAppers() {
// given
var customUserActionProvision = generateCustomUserActions();
var defaultUserActionProvision = generateDefaultUserActionEntity();
var parametersWithExtraOneList = new ArrayList<>(Arrays.asList(defaultUserActionProvision.getParameters()));
var extraCustomizableParameterName = "extraCustomizableParameter";
var extraCustomizableParameterValue = "123999";
var extraCustomizableParameter = UserActionEntityParameterMother.of(extraCustomizableParameterName,
"string",
true,
extraCustomizableParameterValue,
Collections.emptyList(),
List.of(UserActionEntityParameterLocationMother.of()),
Collections.emptyList(),
"Workflow to execute.",
"workflow placeholder",
"workflow hint",
true,
false,
List.of(UserActionEntityParameterValidationMother.of()));
parametersWithExtraOneList.add(extraCustomizableParameter);

defaultUserActionProvision.setParameters(parametersWithExtraOneList.toArray(UserActionEntityParameter[]::new));

var clusters = Collections.<String>emptyList();
var userGroups = Collections.<String>emptyList();
var projectKey = Strings.EMPTY;
var catalogItemId = Strings.EMPTY;

List<CatalogItemUserAction> customUserActions = List.of(customUserActionProvision);
UserActionEntity[] defaultUserActions = {defaultUserActionProvision};

// when
var mergedUserActions = catalogApiAdapter.finalizeUserActions(
customUserActions, defaultUserActions, clusters, userGroups, projectKey, catalogItemId);

// then
assertThat(mergedUserActions).hasSize(1);

var parameters = mergedUserActions.getFirst().getParameters();

assertThat(parameters).hasSize(4);
var generatedExtraCustomizableParameter = parameters.stream().filter(p -> p.getName().equals(extraCustomizableParameterName)).findFirst();
assertThat(generatedExtraCustomizableParameter).isPresent();
assertThat(generatedExtraCustomizableParameter.get().getDefaultValue().get()).isEqualTo(extraCustomizableParameterValue);
}

private UserActionEntity generateDefaultUserActionEntity() {
var defaultParameter = UserActionEntityParameterMother.of();
var defaultParameterNonCustomizable = UserActionEntityParameterMother.of(PARAMETER_NON_CUSTOMIZABLE_NAME);
Expand Down