From 7cc36ae7b764ac228b3716642fec9e1b7c799a1e Mon Sep 17 00:00:00 2001 From: Yavor16 Date: Wed, 14 Feb 2024 15:00:38 +0200 Subject: [PATCH] fix ivan comment --- .../mta/resolvers/v2/ResourceLiveParameterResolver.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/v2/ResourceLiveParameterResolver.java b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/v2/ResourceLiveParameterResolver.java index a600f63e..159b5688 100644 --- a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/v2/ResourceLiveParameterResolver.java +++ b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/v2/ResourceLiveParameterResolver.java @@ -85,17 +85,17 @@ private void updateConfigParameterFromModule(Reference reference, Module module, if (requiredDependencyValue instanceof Map) { resolveModuleProvidedDependency(castToMap(requiredDependencyValue), module); resourceParameter.setValue(requiredDependencyValue); - } else if (resourceParameterValue instanceof String && doesParameterContainDefaultPlaceholder(requiredDependencyValue)) { + } else if (resourceParameterValue instanceof String && doesParameterContainDefaultPlaceholder(castToString(requiredDependencyValue))) { replaceValueInResourceParameter(module, resourceParameterValue, resourceParameter, reference, castToString(requiredDependencyValue)); } } } - private boolean doesParameterContainDefaultPlaceholder(Object object) { + private boolean doesParameterContainDefaultPlaceholder(String parameter) { return idleToLiveParameterPairs.keySet() .stream() - .anyMatch(defaultParamPlaceholder -> castToString(object).contains(defaultParamPlaceholder)); + .anyMatch(parameter::contains); } private void replaceValueInResourceParameter(Module module, String resourceParameterValue, Map.Entry resourceParameter, @@ -117,7 +117,7 @@ private void resolveModuleProvidedDependency(Map requiredDepende private void updateModuleDependencyFromMap(Module module, Map.Entry entry) { if (entry.getValue() instanceof Map) { resolveModuleProvidedDependency(castToMap(entry.getValue()), module); - } else if (entry.getValue() instanceof String && doesParameterContainDefaultPlaceholder(entry.getValue())) { + } else if (entry.getValue() instanceof String && doesParameterContainDefaultPlaceholder(castToString(entry.getValue()))) { var matchedPlaceholderEntry = matchPlaceholderInParameter(castToString(entry.getValue())); String replacedParameter = castToString(entry.getValue()).replace(matchedPlaceholderEntry.getKey(), castToString(module.getParameters()