Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deprecate methods in JsfRuntimeInformation

Browse Source 
Issue: SWF-1719
This commit is contained in:
Rossen Stoyanchev
2018-02-09 12:45:30 -05:00
parent e2f0dd40f6
commit 513dc2de7c
2 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
spring-faces/src/main/java/org/springframework/faces/webflow/JsfRuntimeInformation.java
View File

@@ -20,7 +20,6 @@ import javax.faces.context.FacesContext;
import javax.faces.context.FacesContextWrapper;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
/**
* Helper class to provide information about the JSF runtime environment such as
@@ -33,33 +32,6 @@ public class JsfRuntimeInformation {
private static final ClassLoader CLASSLOADER = JsfRuntimeInformation.class.getClassLoader();
public static final int JSF_22 = 4;
public static final int JSF_21 = 3;
public static final int JSF_20 = 2;
public static final int JSF_12 = 1;
public static final int JSF_11 = 0;
private static final int jsfVersion;
static {
if (ReflectionUtils.findMethod(FacesContext.class, "getResourceLibraryContracts") != null) {
jsfVersion = JSF_22;
} else if (ReflectionUtils.findMethod(FacesContext.class, "isReleased") != null) {
jsfVersion = JSF_21;
} else if (ReflectionUtils.findMethod(FacesContext.class, "isPostback") != null) {
jsfVersion = JSF_20;
} else if (ReflectionUtils.findMethod(FacesContext.class, "getELContext") != null) {
jsfVersion = JSF_12;
} else {
jsfVersion = JSF_11;
}
}
private static final boolean mojarraPresent =
ClassUtils.isPresent("com.sun.faces.context.FacesContextImpl", CLASSLOADER);
@@ -69,25 +41,39 @@ public class JsfRuntimeInformation {
private static Boolean myFacesInUse;
/**
* @deprecated as of 2.5, always returns true.
*/
public static boolean isAtLeastJsf22() {
return jsfVersion >= JSF_22;
return true;
}
/**
* @deprecated as of 2.5, always returns true.
*/
public static boolean isAtLeastJsf21() {
return jsfVersion >= JSF_21;
return true;
}
/**
* @deprecated as of 2.5, always returns true.
*/
public static boolean isAtLeastJsf20() {
return jsfVersion >= JSF_20;
return true;
}
/**
* @deprecated as of 2.5, always returns true.
*/
public static boolean isAtLeastJsf12() {
return jsfVersion >= JSF_12;
return true;
}
/**
* @deprecated as of 2.5, always returns false.
*/
public static boolean isLessThanJsf20() {
return jsfVersion < JSF_20;
return false;
}

5
spring-faces/src/main/java/org/springframework/faces/webflow/JsfUtils.java
View File

@@ -17,7 +17,6 @@ package org.springframework.faces.webflow;
import java.util.HashMap;
import java.util.Map;
import javax.faces.FactoryFinder;
import javax.faces.application.ApplicationFactory;
import javax.faces.component.visit.VisitContextFactory;
@@ -103,9 +102,7 @@ public class JsfUtils {
FACTORY_NAMES.put(ApplicationFactory.class, FactoryFinder.APPLICATION_FACTORY);
FACTORY_NAMES.put(ExceptionHandlerFactory.class, FactoryFinder.EXCEPTION_HANDLER_FACTORY);
FACTORY_NAMES.put(ExternalContextFactory.class, FactoryFinder.EXTERNAL_CONTEXT_FACTORY);
if (JsfRuntimeInformation.isAtLeastJsf21()) {
FACTORY_NAMES.put(FaceletCacheFactory.class, FactoryFinder.FACELET_CACHE_FACTORY);
}
FACTORY_NAMES.put(FaceletCacheFactory.class, FactoryFinder.FACELET_CACHE_FACTORY);
FACTORY_NAMES.put(FacesContextFactory.class, FactoryFinder.FACES_CONTEXT_FACTORY);
FACTORY_NAMES.put(LifecycleFactory.class, FactoryFinder.LIFECYCLE_FACTORY);
FACTORY_NAMES.put(PartialViewContextFactory.class, FactoryFinder.PARTIAL_VIEW_CONTEXT_FACTORY);