Skip to content

Fix resolving refrence #1604

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
Yavor16 merged 1 commit into from
Mar 6, 2025
Merged

Fix resolving refrence #1604

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
16 changes: 11 additions & 5 deletions ...rg/cloudfoundry/multiapps/controller/core/helpers/v3/ConfigurationReferencesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,7 @@ protected List<RequiredDependency> expandRequiredDependencyIfNecessary(Propertie
}

if (!permitsMultipleResources(dependency)) {
if (dependencyOwner instanceof Resource resource && resource.isOptional()) {
return Collections.singletonList(dependency);
} else {
makeSureIsResolvedToSingleResource(dependency.getName(), resolvedReference.getResolvedResources());
}
return getSingleResolvedResource(dependencyOwner, dependency, resolvedReference);
}

if (resolvedReference.getResolvedResources()
Expand All @@ -91,6 +87,16 @@ protected List<RequiredDependency> expandRequiredDependencyIfNecessary(Propertie
return expandedDependencies;
}

private List<RequiredDependency> getSingleResolvedResource(PropertiesContainer dependencyOwner, RequiredDependency dependency,
ResolvedConfigurationReference resolvedReference) {
if (dependencyOwner instanceof Resource resource && resource.isOptional()) {
return Collections.singletonList(dependency);
} else {
makeSureIsResolvedToSingleResource(dependency.getName(), resolvedReference.getResolvedResources());
return Collections.singletonList(dependency);
}
}

private void setEmptyListProperty(PropertiesContainer dependencyOwner, RequiredDependency dependencyV3) {
String listName = dependencyV3.getList();
dependencyOwner.setProperties(putEmptyListProperty(dependencyOwner.getProperties(), listName));
Expand Down