Skip to content

Commit f5bdc4e

Browse files
committed
Fix resolving refrence
1 parent c2342ba commit f5bdc4e

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/helpers/v3/ConfigurationReferencesResolver.java

+11-5
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,7 @@ protected List<RequiredDependency> expandRequiredDependencyIfNecessary(Propertie
7171
}
7272

7373
if (!permitsMultipleResources(dependency)) {
74-
if (dependencyOwner instanceof Resource resource && resource.isOptional()) {
75-
return Collections.singletonList(dependency);
76-
} else {
77-
makeSureIsResolvedToSingleResource(dependency.getName(), resolvedReference.getResolvedResources());
78-
}
74+
return getSingleResolvedResource(dependencyOwner, dependency, resolvedReference);
7975
}
8076

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

90+
private List<RequiredDependency> getSingleResolvedResource(PropertiesContainer dependencyOwner, RequiredDependency dependency,
91+
ResolvedConfigurationReference resolvedReference) {
92+
if (dependencyOwner instanceof Resource resource && resource.isOptional()) {
93+
return Collections.singletonList(dependency);
94+
} else {
95+
makeSureIsResolvedToSingleResource(dependency.getName(), resolvedReference.getResolvedResources());
96+
return Collections.singletonList(dependency);
97+
}
98+
}
99+
94100
private void setEmptyListProperty(PropertiesContainer dependencyOwner, RequiredDependency dependencyV3) {
95101
String listName = dependencyV3.getList();
96102
dependencyOwner.setProperties(putEmptyListProperty(dependencyOwner.getProperties(), listName));

0 commit comments

Comments
 (0)