You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2019/08/18 21:14:41 UTC
[myfaces] branch master updated (3c81823 -> 92b1c46)
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git.
from 3c81823 cleanup
new 521f19e cosmetics
new 92b1c46 refactored
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/myfaces/config/FacesConfigurator.java | 1 -
.../spi/impl/DefaultFacesFlowProviderFactory.java | 3 +-
.../spi/impl/DefaultServiceProviderFinder.java | 77 +++++++++-------------
.../spi/impl/DefaultStateCacheProviderFactory.java | 10 +--
.../spi/impl/DefaultViewScopeProviderFactory.java | 3 +-
5 files changed, 35 insertions(+), 59 deletions(-)
[myfaces] 02/02: refactored
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
commit 92b1c4670be784109bd22f18900199381de2a480
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Sun Aug 18 23:14:34 2019 +0200
refactored
---
.../spi/impl/DefaultFacesFlowProviderFactory.java | 3 +-
.../spi/impl/DefaultServiceProviderFinder.java | 77 +++++++++-------------
.../spi/impl/DefaultStateCacheProviderFactory.java | 10 +--
.../spi/impl/DefaultViewScopeProviderFactory.java | 3 +-
4 files changed, 35 insertions(+), 58 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java
index c40e012..5b65794 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java
@@ -61,8 +61,7 @@ public class DefaultFacesFlowProviderFactory extends FacesFlowProviderFactory
{
if (ExternalSpecifications.isCDIAvailable(externalContext))
{
- returnValue = (FacesFlowProvider) ClassUtils.newInstance(
- DefaultCDIFacesFlowProvider.class.getName());
+ returnValue = new DefaultCDIFacesFlowProvider();
}
else
{
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java
index 5bfa7e0..ccb5f85 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java
@@ -55,8 +55,7 @@ public class DefaultServiceProviderFinder extends ServiceProviderFinder
Enumeration<URL> profiles = null;
try
{
- profiles = ClassUtils.getContextClassLoader().getResources(
- META_INF_SERVICES + spiClass);
+ profiles = ClassUtils.getContextClassLoader().getResources(META_INF_SERVICES + spiClass);
}
catch (IOException e)
{
@@ -88,66 +87,52 @@ public class DefaultServiceProviderFinder extends ServiceProviderFinder
}
Set<URL> urls = getURLs(spiClass);
-
if (!urls.isEmpty())
{
- List<String> results = new LinkedList<String>();
+ List<String> results = new LinkedList<>();
for (URL url : urls)
{
- InputStream is = null;
-
try
{
- try
+ try (InputStream is = openStreamWithoutCache(url))
{
- is = openStreamWithoutCache(url);
- if (is != null)
+ // This code is needed by EBCDIC and other
+ // strange systems. It's a fix for bugs
+ // reported in xerces
+ BufferedReader rd;
+ try
{
- // This code is needed by EBCDIC and other
- // strange systems. It's a fix for bugs
- // reported in xerces
- BufferedReader rd;
- try
- {
- rd = new BufferedReader(new InputStreamReader(is, "UTF-8"));
- }
- catch (java.io.UnsupportedEncodingException e)
- {
- rd = new BufferedReader(new InputStreamReader(is));
- }
-
- try
+ rd = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+ }
+ catch (java.io.UnsupportedEncodingException e)
+ {
+ rd = new BufferedReader(new InputStreamReader(is));
+ }
+
+ try
+ {
+ String serviceImplName;
+ while ((serviceImplName = rd.readLine()) != null)
{
- String serviceImplName;
- while ((serviceImplName = rd.readLine()) != null)
+ int idx = serviceImplName.indexOf('#');
+ if (idx >= 0)
{
- int idx = serviceImplName.indexOf('#');
- if (idx >= 0)
- {
- serviceImplName = serviceImplName.substring(0, idx);
- }
- serviceImplName = serviceImplName.trim();
-
- if (serviceImplName.length() != 0)
- {
- results.add(serviceImplName);
- }
+ serviceImplName = serviceImplName.substring(0, idx);
}
- }
- finally
- {
- if (rd != null)
+ serviceImplName = serviceImplName.trim();
+
+ if (serviceImplName.length() != 0)
{
- rd.close();
+ results.add(serviceImplName);
}
}
}
- }
- finally
- {
- if (is != null)
+ finally
{
- is.close();
+ if (rd != null)
+ {
+ rd.close();
+ }
}
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultStateCacheProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultStateCacheProviderFactory.java
index d3d7a36..077e06e 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultStateCacheProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultStateCacheProviderFactory.java
@@ -53,14 +53,8 @@ public class DefaultStateCacheProviderFactory extends StateCacheProviderFactory
@Override
public StateCacheProvider getStateCacheProvider(ExternalContext externalContext)
{
- StateCacheProvider stateCacheProvider
- = (StateCacheProvider) externalContext.getApplicationMap().get(STATE_CACHE_PROVIDER_INSTANCE);
- if (stateCacheProvider == null)
- {
- stateCacheProvider = createStateCacheProvider(externalContext);
- externalContext.getApplicationMap().put(STATE_CACHE_PROVIDER_INSTANCE, stateCacheProvider);
- }
- return stateCacheProvider;
+ return (StateCacheProvider) externalContext.getApplicationMap().computeIfAbsent(STATE_CACHE_PROVIDER_INSTANCE,
+ k -> createStateCacheProvider(externalContext));
}
@Override
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultViewScopeProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultViewScopeProviderFactory.java
index 0337dda..0b4e094 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultViewScopeProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultViewScopeProviderFactory.java
@@ -20,7 +20,6 @@ package org.apache.myfaces.spi.impl;
import javax.faces.context.ExternalContext;
import org.apache.myfaces.cdi.view.CDIViewScopeProviderImpl;
-import org.apache.myfaces.util.lang.ClassUtils;
import org.apache.myfaces.spi.ViewScopeProvider;
import org.apache.myfaces.spi.ViewScopeProviderFactory;
import org.apache.myfaces.util.ExternalSpecifications;
@@ -46,7 +45,7 @@ public class DefaultViewScopeProviderFactory extends ViewScopeProviderFactory
{
if (ExternalSpecifications.isCDIAvailable(externalContext))
{
- returnValue = (ViewScopeProvider) ClassUtils.newInstance(CDIViewScopeProviderImpl.class.getName());
+ returnValue = new CDIViewScopeProviderImpl();
}
// cache the result on the ApplicationMap
[myfaces] 01/02: cosmetics
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
commit 521f19e48c149032ecdc0141228b1f9e8551df57
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Sun Aug 18 23:05:05 2019 +0200
cosmetics
---
impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
index 3e99dc6..bc45f88 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -1092,7 +1092,6 @@ public class FacesConfigurator
renderKitClass.add(DEFAULT_RENDER_KIT_CLASS);
}
- //RenderKit renderKit = (RenderKit) ClassUtils.newInstance(renderKitClass);
RenderKit renderKit = (RenderKit) ClassUtils.buildApplicationObject(RenderKit.class, renderKitClass, null);
// If the default html RenderKit instance is wrapped, the top level object will not implement
// LazyRenderKit and all renderers will be added using the standard form.