From b6de0044a27c9e22ab0b5d2a999ad792e2fcf389 Mon Sep 17 00:00:00 2001 From: Yavor16 Date: Wed, 1 Apr 2026 11:12:55 +0300 Subject: [PATCH 1/2] Fix the problem with the start of deploy-service --- .../ObjectStoreFileStorageFactoryBean.java | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBean.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBean.java index f8311d7d94..a219420c1a 100644 --- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBean.java +++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBean.java @@ -23,7 +23,6 @@ import org.cloudfoundry.multiapps.controller.persistence.util.EnvironmentServicesFinder; import org.cloudfoundry.multiapps.controller.web.Constants; import org.cloudfoundry.multiapps.controller.web.Messages; -import org.cloudfoundry.multiapps.controller.web.configuration.service.ImmutableObjectStoreServiceInfo; import org.cloudfoundry.multiapps.controller.web.configuration.service.ObjectStoreServiceInfo; import org.cloudfoundry.multiapps.controller.web.configuration.service.ObjectStoreServiceInfoCreator; import org.jclouds.ContextBuilder; @@ -92,11 +91,13 @@ public FileStorage createObjectStoreFromFirstReachableProvider(Map createObjectStoreBasedOnProvider(String objectStoreProviderName, List providersServiceInfo, Map exceptions) { - return switch (objectStoreProviderName) { - case Constants.AZURE -> tryToCreateSdkObjectStore(exceptions, Constants.AZUREBLOB); - case Constants.GCP -> tryToCreateSdkObjectStore(exceptions, Constants.GOOGLE_CLOUD_STORAGE); - default -> tryToCreateJCloudsObjectStore(objectStoreProviderName, providersServiceInfo, exceptions); - }; + Optional objectStoreServiceInfoOptional = getAppropriateProvider(objectStoreProviderName, + providersServiceInfo); + if (objectStoreServiceInfoOptional.isEmpty()) { + LOGGER.warn(Messages.NO_OBJECTSTORE_PROVIDER_FOUND); + return Optional.empty(); + } + return tryToCreateObjectStore(objectStoreServiceInfoOptional.get(), exceptions); } private Optional getAppropriateProvider(String objectStoreProviderName, @@ -107,25 +108,6 @@ private Optional getAppropriateProvider(String objectSto .findFirst(); } - private Optional tryToCreateJCloudsObjectStore(String objectStoreProviderName, - List providersServiceInfo, - Map exceptions) { - Optional objectStoreServiceInfoOptional = getAppropriateProvider(objectStoreProviderName, - providersServiceInfo); - if (objectStoreServiceInfoOptional.isPresent()) { - ObjectStoreServiceInfo objectStoreServiceInfo = objectStoreServiceInfoOptional.get(); - return tryToCreateObjectStore(objectStoreServiceInfo, exceptions); - } - LOGGER.warn(Messages.NO_OBJECTSTORE_PROVIDER_FOUND); - return Optional.empty(); - } - - private Optional tryToCreateSdkObjectStore(Map exceptions, String providerName) { - return tryToCreateObjectStore(ImmutableObjectStoreServiceInfo.builder() - .provider(providerName) - .build(), exceptions); - } - private Optional tryToCreateObjectStore(ObjectStoreServiceInfo objectStoreServiceInfo, Map exceptions) { try { From 8fd10268350a10ad4454cf5a7beb0f872fd972b8 Mon Sep 17 00:00:00 2001 From: Yavor16 Date: Wed, 1 Apr 2026 13:47:11 +0300 Subject: [PATCH 2/2] fix comments --- .../org/cloudfoundry/multiapps/controller/web/Messages.java | 2 +- .../bean/factory/ObjectStoreFileStorageFactoryBean.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/Messages.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/Messages.java index 4bbccac51f..44e23acd6e 100644 --- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/Messages.java +++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/Messages.java @@ -58,7 +58,7 @@ public final class Messages { // WARN log messages - public static final String NO_OBJECTSTORE_PROVIDER_FOUND = "No ObjectStore provider found!"; + public static final String NO_OBJECTSTORE_PROVIDER_FOUND_FOR_0 = "No ObjectStore provider found for {0}!"; // INFO log messages public static final String ALM_SERVICE_ENV_INITIALIZED = "Deploy service environment initialized"; diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBean.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBean.java index a219420c1a..18020e1a0a 100644 --- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBean.java +++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBean.java @@ -94,7 +94,7 @@ private Optional createObjectStoreBasedOnProvider(String objectStor Optional objectStoreServiceInfoOptional = getAppropriateProvider(objectStoreProviderName, providersServiceInfo); if (objectStoreServiceInfoOptional.isEmpty()) { - LOGGER.warn(Messages.NO_OBJECTSTORE_PROVIDER_FOUND); + LOGGER.warn(MessageFormat.format(Messages.NO_OBJECTSTORE_PROVIDER_FOUND_FOR_0, objectStoreProviderName)); return Optional.empty(); } return tryToCreateObjectStore(objectStoreServiceInfoOptional.get(), exceptions);