change creation of BlobStoreContext

Author: s-yonkov-yonkov

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBean.java

@@ -1,5 +1,11 @@
 package org.cloudfoundry.multiapps.controller.web.configuration.bean.factory;
 
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import io.pivotal.cfenv.core.CfService;
 import org.apache.commons.lang3.StringUtils;
 import org.cloudfoundry.multiapps.controller.core.util.UriUtil;
@@ -15,12 +21,6 @@
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 public class ObjectStoreFileStorageFactoryBean implements FactoryBean<ObjectStoreFileStorage>, InitializingBean {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ObjectStoreFileStorageFactoryBean.class);
@@ -44,26 +44,25 @@ private ObjectStoreFileStorage createObjectStoreFileStorage() {
         if (providersServiceInfo.isEmpty()) {
             return null;
         }
+
         Map<String, Exception> exceptions = new HashMap<>();
+
         for (ObjectStoreServiceInfo objectStoreServiceInfo : providersServiceInfo) {
-            BlobStoreContext context = getBlobStoreContext(objectStoreServiceInfo);
-            if (context == null) {
-                exceptions.put(objectStoreServiceInfo.getProvider(),
-                               new IllegalArgumentException(Messages.MISSING_PROPERTIES_FOR_CREATING_THE_SPECIFIC_PROVIDER));
-                continue;
-            }
-            ObjectStoreFileStorage fileStorage = createFileStorage(objectStoreServiceInfo, context);
             try {
+                BlobStoreContext context = getBlobStoreContext(objectStoreServiceInfo);
+                ObjectStoreFileStorage fileStorage = createFileStorage(objectStoreServiceInfo, context);
                 fileStorage.testConnection();
                 LOGGER.info(MessageFormat.format(Messages.OBJECT_STORE_WITH_PROVIDER_0_CREATED, objectStoreServiceInfo.getProvider()));
                 return fileStorage;
             } catch (Exception e) {
                 exceptions.put(objectStoreServiceInfo.getProvider(), e);
             }
         }
+        
         exceptions.forEach(
-            (provider, exception) -> LOGGER.error(MessageFormat.format(Messages.CANNOT_CREATE_OBJECT_STORE_CLIENT_WITH_PROVIDER_0, provider),
-                                                  exception));
+            (provider, exception) -> LOGGER.error(
+                MessageFormat.format(Messages.CANNOT_CREATE_OBJECT_STORE_CLIENT_WITH_PROVIDER_0, provider),
+                exception));
         throw new IllegalStateException(Messages.NO_VALID_OBJECT_STORE_CONFIGURATION_FOUND);
     }
 
@@ -77,15 +76,23 @@ private List<ObjectStoreServiceInfo> getProvidersServiceInfo() {
 
     private BlobStoreContext getBlobStoreContext(ObjectStoreServiceInfo serviceInfo) {
         ContextBuilder contextBuilder = ContextBuilder.newBuilder(serviceInfo.getProvider());
+
         if (serviceInfo.getCredentialsSupplier() != null) {
             contextBuilder.credentialsSupplier(serviceInfo.getCredentialsSupplier());
         } else if (serviceInfo.getIdentity() != null && serviceInfo.getCredential() != null) {
             contextBuilder.credentials(serviceInfo.getIdentity(), serviceInfo.getCredential());
         } else {
-            return null;
+            throw new IllegalArgumentException(Messages.MISSING_PROPERTIES_FOR_CREATING_THE_SPECIFIC_PROVIDER);
         }
+
         resolveContextEndpoint(serviceInfo, contextBuilder);
-        return contextBuilder.buildView(BlobStoreContext.class);
+
+        try {
+            return contextBuilder.buildView(BlobStoreContext.class);
+        } catch (NullPointerException nullPointerException) {
+            throw new IllegalArgumentException("JClouds failed to build BlobStoreContext. Possible missing credentials.",
+                                               nullPointerException);
+        }
     }
 
     private void resolveContextEndpoint(ObjectStoreServiceInfo serviceInfo, ContextBuilder contextBuilder) {