You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/12/08 12:54:46 UTC
svn commit: r1043369 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/
Author: jakobk
Date: Wed Dec 8 11:54:45 2010
New Revision: 1043369
URL: http://svn.apache.org/viewvc?rev=1043369&view=rev
Log:
MYFACES-2997 Clean up SpiUtils
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java?rev=1043369&r1=1043368&r2=1043369&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java Wed Dec 8 11:54:45 2010
@@ -18,6 +18,14 @@
*/
package org.apache.myfaces.spi.impl;
+import org.apache.myfaces.config.annotation.DefaultAnnotationProvider;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.spi.AnnotationProvider;
+import org.apache.myfaces.spi.AnnotationProviderFactory;
+import org.apache.myfaces.spi.ServiceProviderFinderFactory;
+
+import javax.faces.FacesException;
+import javax.faces.context.ExternalContext;
import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.PrivilegedActionException;
@@ -25,14 +33,6 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.faces.FacesException;
-import javax.faces.context.ExternalContext;
-
-import org.apache.myfaces.config.annotation.DefaultAnnotationProvider;
-import org.apache.myfaces.spi.AnnotationProvider;
-import org.apache.myfaces.spi.AnnotationProviderFactory;
-import org.apache.myfaces.spi.ServiceProviderFinderFactory;
-
/**
*
* @since 2.0.2
@@ -132,6 +132,6 @@ public class DefaultAnnotationProviderFa
classList = ServiceProviderFinderFactory.getServiceProviderFinder(externalContext).getServiceProviderList(ANNOTATION_PROVIDER);
externalContext.getApplicationMap().put(ANNOTATION_PROVIDER_LIST, classList);
}
- return SpiUtils.buildApplicationObject(externalContext, AnnotationProvider.class, classList, new DefaultAnnotationProvider());
+ return ClassUtils.buildApplicationObject(AnnotationProvider.class, classList, new DefaultAnnotationProvider());
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java?rev=1043369&r1=1043368&r2=1043369&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java Wed Dec 8 11:54:45 2010
@@ -18,6 +18,14 @@
*/
package org.apache.myfaces.spi.impl;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.spi.FaceletConfigResourceProvider;
+import org.apache.myfaces.spi.FaceletConfigResourceProviderFactory;
+import org.apache.myfaces.spi.ServiceProviderFinderFactory;
+import org.apache.myfaces.view.facelets.compiler.DefaultFaceletConfigResourceProvider;
+
+import javax.faces.FacesException;
+import javax.faces.context.ExternalContext;
import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.PrivilegedActionException;
@@ -25,14 +33,6 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.faces.FacesException;
-import javax.faces.context.ExternalContext;
-
-import org.apache.myfaces.spi.FaceletConfigResourceProvider;
-import org.apache.myfaces.spi.FaceletConfigResourceProviderFactory;
-import org.apache.myfaces.spi.ServiceProviderFinderFactory;
-import org.apache.myfaces.view.facelets.compiler.DefaultFaceletConfigResourceProvider;
-
/**
*
* @since 2.0.2
@@ -119,7 +119,7 @@ public class DefaultFaceletConfigResourc
externalContext.getApplicationMap().put(FACELET_CONFIG_PROVIDER_LIST, classList);
}
- return SpiUtils.buildApplicationObject(externalContext, FaceletConfigResourceProvider.class, classList, new DefaultFaceletConfigResourceProvider());
+ return ClassUtils.buildApplicationObject(FaceletConfigResourceProvider.class, classList, new DefaultFaceletConfigResourceProvider());
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java?rev=1043369&r1=1043368&r2=1043369&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java Wed Dec 8 11:54:45 2010
@@ -18,6 +18,14 @@
*/
package org.apache.myfaces.spi.impl;
+import org.apache.myfaces.config.DefaultFacesConfigResourceProvider;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.spi.FacesConfigResourceProvider;
+import org.apache.myfaces.spi.FacesConfigResourceProviderFactory;
+import org.apache.myfaces.spi.ServiceProviderFinderFactory;
+
+import javax.faces.FacesException;
+import javax.faces.context.ExternalContext;
import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.PrivilegedActionException;
@@ -25,14 +33,6 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.faces.FacesException;
-import javax.faces.context.ExternalContext;
-
-import org.apache.myfaces.config.DefaultFacesConfigResourceProvider;
-import org.apache.myfaces.spi.FacesConfigResourceProvider;
-import org.apache.myfaces.spi.FacesConfigResourceProviderFactory;
-import org.apache.myfaces.spi.ServiceProviderFinderFactory;
-
/**
*
* @since 2.0.2
@@ -119,7 +119,7 @@ public class DefaultFacesConfigResourceP
externalContext.getApplicationMap().put(FACES_CONFIG_PROVIDER_LIST, classList);
}
- return SpiUtils.buildApplicationObject(externalContext, FacesConfigResourceProvider.class, classList, new DefaultFacesConfigResourceProvider());
+ return ClassUtils.buildApplicationObject(FacesConfigResourceProvider.class, classList, new DefaultFacesConfigResourceProvider());
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java?rev=1043369&r1=1043368&r2=1043369&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java Wed Dec 8 11:54:45 2010
@@ -18,6 +18,14 @@
*/
package org.apache.myfaces.spi.impl;
+import org.apache.myfaces.config.DefaultFacesConfigurationProvider;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.spi.FacesConfigurationProvider;
+import org.apache.myfaces.spi.FacesConfigurationProviderFactory;
+import org.apache.myfaces.spi.ServiceProviderFinderFactory;
+
+import javax.faces.FacesException;
+import javax.faces.context.ExternalContext;
import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.PrivilegedActionException;
@@ -25,14 +33,6 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.faces.FacesException;
-import javax.faces.context.ExternalContext;
-
-import org.apache.myfaces.config.DefaultFacesConfigurationProvider;
-import org.apache.myfaces.spi.FacesConfigurationProvider;
-import org.apache.myfaces.spi.FacesConfigurationProviderFactory;
-import org.apache.myfaces.spi.ServiceProviderFinderFactory;
-
/**
*
* @author Leonardo Uribe
@@ -128,6 +128,6 @@ public class DefaultFacesConfigurationPr
externalContext.getApplicationMap().put(FACES_CONFIGURATION_PROVIDER_LIST, classList);
}
- return SpiUtils.buildApplicationObject(externalContext, FacesConfigurationProvider.class, classList, new DefaultFacesConfigurationProvider());
+ return ClassUtils.buildApplicationObject(FacesConfigurationProvider.class, classList, new DefaultFacesConfigurationProvider());
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java?rev=1043369&r1=1043368&r2=1043369&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java Wed Dec 8 11:54:45 2010
@@ -28,6 +28,7 @@ import java.util.logging.Logger;
import javax.faces.FacesException;
import javax.faces.context.ExternalContext;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
import org.apache.myfaces.spi.WebConfigProvider;
import org.apache.myfaces.spi.WebConfigProviderFactory;
@@ -123,7 +124,7 @@ public class DefaultWebConfigProviderFac
externalContext.getApplicationMap().put(WEB_CONFIG_PROVIDER_LIST, classList);
}
- return SpiUtils.buildApplicationObject(externalContext, WebConfigProvider.class, classList, new DefaultWebConfigProvider());
+ return ClassUtils.buildApplicationObject(WebConfigProvider.class, classList, new DefaultWebConfigProvider());
}
}
\ No newline at end of file
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java?rev=1043369&r1=1043368&r2=1043369&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java Wed Dec 8 11:54:45 2010
@@ -51,26 +51,6 @@ public final class SpiUtils
}
return ClassUtils.newInstance(defaultImpl);
}
-
- public static <T> T buildApplicationObject(ExternalContext ectx, Class<T> interfaceClass, T defaultObject)
- {
- List<String> classList = ServiceProviderFinderFactory.getServiceProviderFinder(ectx).getServiceProviderList(interfaceClass.getName());
-
- if (classList != null && !classList.isEmpty())
- {
- return ClassUtils.buildApplicationObject(interfaceClass, classList, defaultObject);
- }
- return defaultObject;
- }
-
- public static <T> T buildApplicationObject(ExternalContext ectx, Class<T> interfaceClass, List<String> classList, T defaultObject)
- {
- if (classList != null && !classList.isEmpty())
- {
- return ClassUtils.buildApplicationObject(interfaceClass, classList, defaultObject);
- }
- return defaultObject;
- }
private static Logger getLogger()
{