Skip to content

[retrive-project-info-from-ods] - Apply sonar improvements. #25

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
Apr 23, 2026
Merged

[retrive-project-info-from-ods] - Apply sonar improvements. #25

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
8 changes: 6 additions & 2 deletions ...java/org/opendevstack/component_provisioner/server/services/ReplaceParametersService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,20 @@ public class ReplaceParametersService {

private final List<String> paramsToOverrideFromOdsApi;

private final Boolean odsApiServiceEnabled;

public ReplaceParametersService(OdsApiService odsApiService, SnakeCaseExtractor snakeCaseExtractor,
@Value("${component-provisioner.ods-api-service.params.override}") String paramsToOverrideFromOdsApiConfig) {
@Value("${component-provisioner.ods-api-service.params.override}") String paramsToOverrideFromOdsApiConfig,
@Value("${component-provisioner.ods-api-service.enabled}") Boolean odsApiServiceEnabled) {
this.odsApiService = odsApiService;
this.snakeCaseExtractor = snakeCaseExtractor;

this.paramsToOverrideFromOdsApi = Arrays.stream(paramsToOverrideFromOdsApiConfig.split(",")).toList();
this.odsApiServiceEnabled = odsApiServiceEnabled;
}

public ProvisionActionWrapper replaceProvisioningParametersFromOdsApi(ProvisionActionWrapper provisionActionWrapper) {
if (paramsToOverrideFromOdsApi == null || paramsToOverrideFromOdsApi.isEmpty()) {
if (Boolean.FALSE.equals(odsApiServiceEnabled) || paramsToOverrideFromOdsApi == null || paramsToOverrideFromOdsApi.isEmpty()) {
log.debug("No ODS API parameters configured to override. Skipping overriding provisioning parameters from ODS API.");

return provisionActionWrapper;
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/application-local.env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ PROJECTS_INFO_SERVICE_BASE_REST_URL="https://projects-info-service-devstack-dev.
CACHING_PROJECTS_INFO_SERVICE_CACHE_EVICTION_INTERVAL=5s
CACHING_PROJECTS_INFO_SERVICE_CACHE_MAX_SIZE=100MB

ODS_API_SERVICE_ENABLED=true
ODS_API_SERVICE_SERVICE_PARAMS_OVERRIDE="project_flavour"
ODS_API_SERVICE_SERVICE_BASE_REST_URL="https://localhost:8081/v1"
ODS_API_SERVICE_SERVICE_PARAMS_CLIENT_ID="client-id"
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ component-provisioner:
username: ${COMPONENT_CATALOG_PROVISIONER_USERNAME}
password: ${COMPONENT_CATALOG_PROVISIONER_PASSWORD}
ods-api-service:
enabled: ${ODS_API_SERVICE_ENABLED}
service:
base-rest-url: ${ODS_API_SERVICE_SERVICE_BASE_REST_URL}
params:
Expand Down
2 changes: 1 addition & 1 deletion .../org/opendevstack/component_provisioner/server/services/ReplaceParametersServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ReplaceParametersServiceTest {
private ReplaceParametersService replaceParametersService;

private void initializeService(String paramsToOverride) {
replaceParametersService = new ReplaceParametersService(odsApiService, snakeCaseExtractor, paramsToOverride);
replaceParametersService = new ReplaceParametersService(odsApiService, snakeCaseExtractor, paramsToOverride, true);
}

@Test
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/application-testing.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ PROJECTS_INFO_SERVICE_BASE_REST_URL="https://projects-info-service-devstack-dev.
CACHING_PROJECTS_INFO_SERVICE_CACHE_EVICTION_INTERVAL=5s
CACHING_PROJECTS_INFO_SERVICE_CACHE_MAX_SIZE=100MB

ODS_API_SERVICE_ENABLED=true
ODS_API_SERVICE_SERVICE_PARAMS_OVERRIDE="project_flavour"
ODS_API_SERVICE_SERVICE_BASE_REST_URL="https://www.example.com/v1"
ODS_API_SERVICE_SERVICE_PARAMS_CLIENT_ID="client-id"
Expand Down
Loading