Merge pull request #466 from olivergondza/Fix-HttpExecutor-init

Do not throw Exceptions in static initializer

Author: gondor

core/src/main/java/org/openstack4j/core/transport/internal/HttpExecutor.java

@@ -12,7 +12,7 @@
 
 /**
  * HttpExecutor is a delegate to the underline connector associated to OpenStack4j.
- * 
+ *
  * @author Jeremy Unruh
  */
 public class HttpExecutor  {
@@ -21,33 +21,33 @@ public class HttpExecutor  {
     private static final HttpExecutor INSTANCE = new HttpExecutor();
     private HttpExecutorService service;
 
-    private HttpExecutor() { 
-        initService();
-    }
+    private HttpExecutor() {}
+
+    private HttpExecutorService service() {
+        if (service != null) return service;
 
-    private void initService() {
         Iterator<HttpExecutorService> it = ServiceLoader.load(HttpExecutorService.class, getClass().getClassLoader()).iterator();
         if (!it.hasNext())
         {
             LOG.error("No OpenStack4j connector found in classpath");
             throw new ConnectorNotFoundException("No OpenStack4j connector found in classpath");
         }
-        service = it.next();
+        return service = it.next();
     }
 
     public static HttpExecutor create() {
         return INSTANCE;
     }
-    
+
     public String getExecutorName() {
-        return service.getExecutorDisplayName();
+        return service().getExecutorDisplayName();
     }
 
     /**
-     * Delegate to {@link HttpExecutorService#execute(HttpRequest)} 
+     * Delegate to {@link HttpExecutorService#execute(HttpRequest)}
      */
     public <R> HttpResponse execute(HttpRequest<R> request) {
         LOG.debug("Executing Request: %s -> %s", request.getEndpoint(), request.getPath());
-        return service.execute(request);
+        return service().execute(request);
     }
 }