[jboss-svn-commits] JBoss Common SVN: r3862 - arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2009-12-16 04:15:01 -0500 (Wed, 16 Dec 2009)
New Revision: 3862

Modified:
   arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/DeployableContainers.java
Log:
ARQ-39 Changed to use DefaultServiceLoader

Modified: arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/DeployableContainers.java
===================================================================
--- arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/DeployableContainers.java	2009-12-16 09:11:00 UTC (rev 3861)
+++ arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/DeployableContainers.java	2009-12-16 09:15:01 UTC (rev 3862)
@@ -16,11 +16,6 @@
  */
 package org.jboss.arquillian.spi.util;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ServiceLoader;
-
 import org.jboss.arquillian.spi.DeployableContainer;
 
 /**
@@ -36,26 +31,15 @@
    
    public static DeployableContainer load() 
    {
-      ServiceLoader<DeployableContainer> containerLoader = ServiceLoader.load(DeployableContainer.class);
-      List<DeployableContainer> containers = toList(containerLoader.iterator());
-      if(containers.size() == 0)
+      DefaultServiceLoader<DeployableContainer> containerLoader = DefaultServiceLoader.load(DeployableContainer.class);
+      if(containerLoader.getProviders().size() == 0)
       {
          throw new RuntimeException("No containers found");
       }
-      if(containers.size() > 1)
+      if(containerLoader.getProviders().size() > 1)
       {
          throw new RuntimeException("More the one container found, check classpath");
       }
-      return containers.get(0);
+      return containerLoader.iterator().next();
    }
-   
-   private static <T> List<T> toList(Iterator<T> iterator) 
-   {
-      List<T> list = new ArrayList<T>();
-      while(iterator.hasNext())
-      {
-         list.add(iterator.next());
-      }
-      return list;
-   }
 }