Merge branch '4.11.x' into 4.x

Author: adutra

integration-tests/src/test/java/com/datastax/oss/driver/api/core/cloud/CloudIT.java

@@ -51,11 +51,13 @@
 import java.util.List;
 import javax.net.ssl.SSLContext;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 @Category(IsolatedTests.class)
+@Ignore("Disabled because it is causing trouble in Jenkins CI")
 public class CloudIT {
 
   private static final String BUNDLE_URL_PATH = "/certs/bundles/creds.zip";

mapper-runtime/src/main/java/com/datastax/oss/driver/internal/mapper/DefaultMapperContext.java

@@ -32,12 +32,17 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 import java.util.Objects;
+import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DefaultMapperContext implements MapperContext {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(DefaultMapperContext.class);
+
   private final ConcurrentMap<GenericType<?>, MapperResultProducer> resultProducerCache =
       new ConcurrentHashMap<>();
 
@@ -188,10 +193,20 @@ private static NameConverter buildNameConverter(Class<? extends NameConverter> c
 
   private static ImmutableList<MapperResultProducer> locateResultProducers(
       ClassLoader classLoader) {
-    ImmutableList.Builder<MapperResultProducer> result = ImmutableList.builder();
-    ServiceLoader<MapperResultProducerService> loader =
-        ServiceLoader.load(MapperResultProducerService.class, classLoader);
-    loader.iterator().forEachRemaining(provider -> result.addAll(provider.getProducers()));
-    return result.build();
+    LOGGER.debug(
+        "Locating result producers with CL = {}, MapperResultProducerService CL = {}",
+        classLoader,
+        MapperResultProducerService.class.getClassLoader());
+    ImmutableList.Builder<MapperResultProducer> builder = ImmutableList.builder();
+    try {
+      ServiceLoader<MapperResultProducerService> loader =
+          ServiceLoader.load(MapperResultProducerService.class, classLoader);
+      loader.iterator().forEachRemaining(provider -> builder.addAll(provider.getProducers()));
+    } catch (Exception | ServiceConfigurationError e) {
+      LOGGER.error("Failed to locate result producers", e);
+    }
+    ImmutableList<MapperResultProducer> producers = builder.build();
+    LOGGER.debug("Located {} result producers: {}", producers.size(), producers);
+    return producers;
   }
 }