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/05/14 09:26:40 UTC
[myfaces] branch master updated:
DigesterlessFacesConfigUnmarshallerImpl as default; it's a big startup boost
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
The following commit(s) were added to refs/heads/master by this push:
new e55581d DigesterlessFacesConfigUnmarshallerImpl as default; it's a big startup boost
e55581d is described below
commit e55581da8c603faa89c37a8f1cc4aaa0f9d394b1
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Tue May 14 11:26:34 2019 +0200
DigesterlessFacesConfigUnmarshallerImpl as default; it's a big startup boost
---
.../myfaces/config/DefaultFacesConfigurationProvider.java | 4 ++--
.../main/java/org/apache/myfaces/config/FacesConfigurator.java | 4 ++--
.../apache/myfaces/application/NavigationHandlerImplTest.java | 6 +++---
.../apache/myfaces/config/FacesConfigValidatorTestCase.java | 4 ++--
.../org/apache/myfaces/config/OrderingFacesConfigTest.java | 6 +++---
.../impl/digister/DigesterFacesConfigUnmarshallerImplTest.java | 10 +++++-----
.../myfaces/view/facelets/FaceletMultipleRequestsTestCase.java | 4 ++--
.../java/org/apache/myfaces/view/facelets/FaceletTestCase.java | 4 ++--
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
index 4ed0a64..7a9dee9 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.config;
import java.io.FileNotFoundException;
import org.apache.myfaces.config.annotation.AnnotationConfigurator;
import org.apache.myfaces.config.element.FacesConfig;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
import org.apache.myfaces.util.ClassUtils;
import org.apache.myfaces.spi.FacesConfigResourceProvider;
import org.apache.myfaces.spi.FacesConfigResourceProviderFactory;
@@ -124,7 +124,7 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
{
if (_unmarshaller == null)
{
- _unmarshaller = new DigesterFacesConfigUnmarshallerImpl(ectx);
+ _unmarshaller = new DigesterlessFacesConfigUnmarshallerImpl(ectx);
}
return _unmarshaller;
}
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 d7c1d81..5f840b3 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -96,7 +96,6 @@ import org.apache.myfaces.config.element.Renderer;
import org.apache.myfaces.config.element.ResourceBundle;
import org.apache.myfaces.config.element.SystemEventListener;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
import org.apache.myfaces.context.ExceptionHandlerFactoryImpl;
import org.apache.myfaces.context.ExternalContextFactoryImpl;
import org.apache.myfaces.context.FacesContextFactoryImpl;
@@ -127,6 +126,7 @@ import org.apache.myfaces.component.search.SearchExpressionContextFactoryImpl;
import org.apache.myfaces.config.element.FaceletsTemplateMapping;
import org.apache.myfaces.config.element.ViewPoolMapping;
import org.apache.myfaces.config.element.facelets.FaceletTagLibrary;
+import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
import org.apache.myfaces.lifecycle.LifecycleImpl;
import org.apache.myfaces.renderkit.LazyRenderKit;
import org.apache.myfaces.util.DefaultSerialFactory;
@@ -237,7 +237,7 @@ public class FacesConfigurator
{
if (_unmarshaller == null)
{
- _unmarshaller = new DigesterFacesConfigUnmarshallerImpl(_externalContext);
+ _unmarshaller = new DigesterlessFacesConfigUnmarshallerImpl(_externalContext);
}
return _unmarshaller;
diff --git a/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java b/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
index 52cb37f..d3f04d6 100644
--- a/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
@@ -36,7 +36,7 @@ import javax.faces.application.NavigationCase;
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.config.element.NavigationRule;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.junit.Assert;
import org.junit.Test;
@@ -45,7 +45,7 @@ import org.xml.sax.SAXException;
public class NavigationHandlerImplTest extends AbstractJsfTestCase
{
- private DigesterFacesConfigUnmarshallerImpl _digesterFacesConfigUnmarshaller;
+ private DigesterlessFacesConfigUnmarshallerImpl _digesterFacesConfigUnmarshaller;
public NavigationHandlerImplTest()
{
@@ -56,7 +56,7 @@ public class NavigationHandlerImplTest extends AbstractJsfTestCase
public void setUp() throws Exception
{
super.setUp();
- _digesterFacesConfigUnmarshaller = new DigesterFacesConfigUnmarshallerImpl(
+ _digesterFacesConfigUnmarshaller = new DigesterlessFacesConfigUnmarshallerImpl(
externalContext);
}
diff --git a/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java b/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
index e6cbc03..074864c 100644
--- a/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.myfaces.config.element.NavigationRule;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
import org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
@@ -44,7 +44,7 @@ public class FacesConfigValidatorTestCase extends AbstractJsfTestCase
super.setUp();
dispenser = new DigesterFacesConfigDispenserImpl();
- unmarshaller = new DigesterFacesConfigUnmarshallerImpl(externalContext);
+ unmarshaller = new DigesterlessFacesConfigUnmarshallerImpl(externalContext);
try
{
ByteArrayInputStream bais = new ByteArrayInputStream(testFacesConfig.getBytes());
diff --git a/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java b/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
index aba024b..c03a1fe 100644
--- a/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
+++ b/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
@@ -17,7 +17,6 @@ package org.apache.myfaces.config;
import org.apache.myfaces.config.element.FacesConfig;
import org.apache.myfaces.config.element.OrderSlot;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
import org.apache.myfaces.config.impl.digester.elements.AbsoluteOrderingImpl;
import org.apache.myfaces.config.impl.digester.elements.ConfigOthersSlotImpl;
import org.apache.myfaces.config.impl.digester.elements.FacesConfigNameSlotImpl;
@@ -30,12 +29,13 @@ import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
public class OrderingFacesConfigTest extends AbstractJsfTestCase
{
private static final Logger log = Logger.getLogger(OrderingFacesConfigTest.class.getName());
- private DigesterFacesConfigUnmarshallerImpl _impl;
+ private DigesterlessFacesConfigUnmarshallerImpl _impl;
public OrderingFacesConfigTest(String name)
{
@@ -45,7 +45,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
protected void setUp() throws Exception
{
super.setUp();
- _impl = new DigesterFacesConfigUnmarshallerImpl(null);
+ _impl = new DigesterlessFacesConfigUnmarshallerImpl(null);
}
public void printFacesConfigList(String label, List<FacesConfig> appConfigResources)
diff --git a/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java b/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java
index 3dbfd00..2232e4f 100644
--- a/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java
@@ -19,7 +19,7 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
import org.apache.myfaces.config.element.Application;
import org.apache.myfaces.config.element.ContractMapping;
import org.apache.myfaces.config.element.FacesConfig;
@@ -33,11 +33,11 @@ import org.apache.myfaces.config.element.OrderSlot;
*/
public class DigesterFacesConfigUnmarshallerImplTest extends TestCase
{
- private DigesterFacesConfigUnmarshallerImpl _impl;
+ private DigesterlessFacesConfigUnmarshallerImpl _impl;
protected void setUp() throws Exception
{
- _impl = new DigesterFacesConfigUnmarshallerImpl(null);
+ _impl = new DigesterlessFacesConfigUnmarshallerImpl(null);
}
public void testEmptyConfig() throws Exception
@@ -118,8 +118,8 @@ public class DigesterFacesConfigUnmarshallerImplTest extends TestCase
assertEquals("b", ((FacesConfigNameSlot) orderList.get(0)).getName());
assertEquals("c", ((FacesConfigNameSlot) orderList.get(1)).getName());
- assertEquals(org.apache.myfaces.config.impl.digester.elements.ConfigOthersSlotImpl.class, orderList.get(2).getClass());
- assertEquals("d", ((FacesConfigNameSlot) orderList.get(3)).getName());
+ assertEquals("d", ((FacesConfigNameSlot) orderList.get(2)).getName());
+ assertEquals(org.apache.myfaces.config.impl.digester.elements.ConfigOthersSlotImpl.class, orderList.get(3).getClass());
assertTrue(cfg.getApplications().isEmpty());
assertTrue(cfg.getComponents().isEmpty());
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
index af9c9d8..cf5764f 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
@@ -49,7 +49,7 @@ import org.apache.myfaces.config.element.FacesConfig;
import org.apache.myfaces.config.element.Renderer;
import org.apache.myfaces.config.element.facelets.FaceletTagLibrary;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
import org.apache.myfaces.context.PartialViewContextFactoryImpl;
import org.apache.myfaces.application.ViewIdSupport;
import org.apache.myfaces.util.ClassUtils;
@@ -297,7 +297,7 @@ public abstract class FaceletMultipleRequestsTestCase extends AbstractJsfConfigu
{
InputStream stream = ClassUtils
.getResourceAsStream("META-INF/standard-faces-config.xml");
- FacesConfigUnmarshaller<? extends FacesConfig> unmarshaller = new DigesterFacesConfigUnmarshallerImpl(
+ FacesConfigUnmarshaller<? extends FacesConfig> unmarshaller = new DigesterlessFacesConfigUnmarshallerImpl(
externalContext);
dispenser = new DigesterFacesConfigDispenserImpl();
dispenser.feed(unmarshaller.getFacesConfig(stream,
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
index 611d7c7..e24b6a1 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
@@ -50,7 +50,7 @@ import org.apache.myfaces.config.element.FacesConfig;
import org.apache.myfaces.config.element.Renderer;
import org.apache.myfaces.config.element.facelets.FaceletTagLibrary;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
import org.apache.myfaces.context.PartialViewContextFactoryImpl;
import org.apache.myfaces.application.ViewIdSupport;
import org.apache.myfaces.util.ClassUtils;
@@ -273,7 +273,7 @@ public abstract class FaceletTestCase extends AbstractJsfConfigurableMockTestCas
{
InputStream stream = ClassUtils
.getResourceAsStream("META-INF/standard-faces-config.xml");
- FacesConfigUnmarshaller<? extends FacesConfig> unmarshaller = new DigesterFacesConfigUnmarshallerImpl(
+ FacesConfigUnmarshaller<? extends FacesConfig> unmarshaller = new DigesterlessFacesConfigUnmarshallerImpl(
externalContext);
dispenser = new DigesterFacesConfigDispenserImpl();
dispenser.feed(unmarshaller.getFacesConfig(stream,