Skip to content

Commit b953b74

Browse files
committed
Fix resolving refrence
1 parent c2342ba commit b953b74

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,10 @@ 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 {
74+
if (isResourceNotOptional(dependencyOwner)) {
7775
makeSureIsResolvedToSingleResource(dependency.getName(), resolvedReference.getResolvedResources());
7876
}
77+
return Collections.singletonList(dependency);
7978
}
8079

8180
if (resolvedReference.getResolvedResources()
@@ -110,6 +109,10 @@ protected List<RequiredDependency> getUpdatedRequiredDependencies(Resource resou
110109
.collect(Collectors.toList());
111110
}
112111

112+
private boolean isResourceNotOptional(PropertiesContainer dependencyOwner) {
113+
return !(dependencyOwner instanceof Resource resource) || !resource.isOptional();
114+
}
115+
113116
@Override
114117
protected RequiredDependency createRequiredDependency(Resource resource, RequiredDependency dependency) {
115118
return RequiredDependency.createV3()

0 commit comments

Comments
 (0)