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/07/15 11:46:08 UTC
[myfaces] branch master updated: move SerialFactory to SPI
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 18edf1a move SerialFactory to SPI
18edf1a is described below
commit 18edf1a7876a8a37a8dea253e72ee5494f9e1220
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Mon Jul 15 13:46:00 2019 +0200
move SerialFactory to SPI
---
.../java/org/apache/myfaces/application/viewstate/StateUtils.java | 4 ++--
impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java | 4 ++--
.../main/java/org/apache/myfaces/{util => spi}/SerialFactory.java | 2 +-
.../org/apache/myfaces/{util => spi/impl}/DefaultSerialFactory.java | 4 +++-
.../main/java/org/apache/myfaces/util/MyFacesObjectInputStream.java | 5 +++--
.../java/org/apache/myfaces/application/StateManagerImplTest.java | 2 +-
.../test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java | 2 +-
.../java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java | 2 +-
.../apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java | 2 +-
.../myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java | 2 +-
10 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java b/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java
index 3d0fe06..2703664 100644
--- a/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java
@@ -47,7 +47,7 @@ import javax.servlet.ServletContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.util.lang.Assert;
-import org.apache.myfaces.util.SerialFactory;
+import org.apache.myfaces.spi.SerialFactory;
/**
* <p>This Class exposes a handful of methods related to encryption,
@@ -144,7 +144,7 @@ public final class StateUtils
/**
* Defines the factory class name using for serialize/deserialize the view state returned
* by state manager into a byte array. The expected class must implement
- * org.apache.myfaces.util.serial.SerialFactory interface.
+ * {@link org.apache.myfaces.spi.SerialFactory} interface.
*/
@JSFWebConfigParam(name="org.apache.myfaces.SERIAL_FACTORY", since="1.1",group="state",tags="performance")
public static final String SERIAL_FACTORY = INIT_PREFIX + "SERIAL_FACTORY";
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 f6d9c7c..74ff808 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -128,8 +128,8 @@ import org.apache.myfaces.config.element.facelets.FaceletTagLibrary;
import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
import org.apache.myfaces.lifecycle.LifecycleImpl;
import org.apache.myfaces.renderkit.LazyRenderKit;
-import org.apache.myfaces.util.DefaultSerialFactory;
-import org.apache.myfaces.util.SerialFactory;
+import org.apache.myfaces.spi.impl.DefaultSerialFactory;
+import org.apache.myfaces.spi.SerialFactory;
import org.apache.myfaces.spi.FacesConfigurationMerger;
import org.apache.myfaces.spi.FacesConfigurationMergerFactory;
import org.apache.myfaces.spi.InjectionProvider;
diff --git a/impl/src/main/java/org/apache/myfaces/util/SerialFactory.java b/impl/src/main/java/org/apache/myfaces/spi/SerialFactory.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/util/SerialFactory.java
rename to impl/src/main/java/org/apache/myfaces/spi/SerialFactory.java
index 88a4a9c..3a9fa74 100644
--- a/impl/src/main/java/org/apache/myfaces/util/SerialFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/SerialFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.util;
+package org.apache.myfaces.spi;
import java.io.IOException;
import java.io.InputStream;
diff --git a/impl/src/main/java/org/apache/myfaces/util/DefaultSerialFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultSerialFactory.java
similarity index 90%
rename from impl/src/main/java/org/apache/myfaces/util/DefaultSerialFactory.java
rename to impl/src/main/java/org/apache/myfaces/spi/impl/DefaultSerialFactory.java
index 1390319..810e398 100644
--- a/impl/src/main/java/org/apache/myfaces/util/DefaultSerialFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultSerialFactory.java
@@ -16,13 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.util;
+package org.apache.myfaces.spi.impl;
+import org.apache.myfaces.spi.SerialFactory;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
+import org.apache.myfaces.util.MyFacesObjectInputStream;
public class DefaultSerialFactory implements SerialFactory
{
diff --git a/impl/src/main/java/org/apache/myfaces/util/MyFacesObjectInputStream.java b/impl/src/main/java/org/apache/myfaces/util/MyFacesObjectInputStream.java
index b5320ec..208e998 100644
--- a/impl/src/main/java/org/apache/myfaces/util/MyFacesObjectInputStream.java
+++ b/impl/src/main/java/org/apache/myfaces/util/MyFacesObjectInputStream.java
@@ -32,14 +32,14 @@ import java.lang.reflect.Proxy;
* the input stream. The solution appears to be to subclass ObjectInputStream
* (eg. CustomInputStream), and specify a different class-loading mechanism.
*/
-public class MyFacesObjectInputStream
- extends ObjectInputStream
+public class MyFacesObjectInputStream extends ObjectInputStream
{
public MyFacesObjectInputStream(InputStream in) throws IOException
{
super(in);
}
+ @Override
protected Class resolveClass(ObjectStreamClass desc)
throws ClassNotFoundException, IOException
{
@@ -53,6 +53,7 @@ public class MyFacesObjectInputStream
}
}
+ @Override
protected Class resolveProxyClass(String[] interfaces)
throws IOException, ClassNotFoundException
{
diff --git a/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java b/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java
index 14055c8..af91c56 100644
--- a/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java
@@ -29,7 +29,7 @@ import javax.faces.render.ResponseStateManager;
import org.apache.myfaces.renderkit.html.HtmlResponseStateManager;
import org.apache.myfaces.application.viewstate.StateUtils;
-import org.apache.myfaces.util.DefaultSerialFactory;
+import org.apache.myfaces.spi.impl.DefaultSerialFactory;
import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMultipleRequestsTestCase;
import org.apache.myfaces.test.mock.MockRenderKit;
import org.apache.myfaces.test.mock.MockResponseWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
index 9c4f2e9..2ec7113 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/ErrorPageWriterTest.java
@@ -30,7 +30,7 @@ import junit.framework.TestSuite;
import org.apache.myfaces.renderkit.html.HtmlTextRenderer;
import org.apache.myfaces.application.viewstate.StateUtils;
-import org.apache.myfaces.util.DefaultSerialFactory;
+import org.apache.myfaces.spi.impl.DefaultSerialFactory;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java b/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
index d19353f..6181b36 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.shared.util;
*/
import org.apache.myfaces.application.viewstate.StateUtils;
-import org.apache.myfaces.util.DefaultSerialFactory;
+import org.apache.myfaces.spi.impl.DefaultSerialFactory;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import java.io.Serializable;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java b/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java
index 84a4f61..c86a24a 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java
@@ -26,7 +26,7 @@ import javax.faces.render.ResponseStateManager;
import org.apache.myfaces.application.StateManagerImpl;
import org.apache.myfaces.renderkit.html.HtmlResponseStateManager;
import org.apache.myfaces.application.viewstate.StateUtils;
-import org.apache.myfaces.util.DefaultSerialFactory;
+import org.apache.myfaces.spi.impl.DefaultSerialFactory;
import org.apache.myfaces.test.mock.MockFacesContext20;
import org.apache.myfaces.test.mock.MockRenderKit;
import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java
index d6b5e0e..6c310ff 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/UniqueComponentIdTestCase.java
@@ -34,7 +34,7 @@ import org.apache.myfaces.application.StateManagerImpl;
import org.apache.myfaces.renderkit.html.HtmlResponseStateManager;
import org.apache.myfaces.config.MyfacesConfig;
import org.apache.myfaces.application.viewstate.StateUtils;
-import org.apache.myfaces.util.DefaultSerialFactory;
+import org.apache.myfaces.spi.impl.DefaultSerialFactory;
import org.apache.myfaces.test.mock.MockFacesContext20;
import org.apache.myfaces.test.mock.MockRenderKit;
import org.apache.myfaces.view.facelets.FaceletMultipleRequestsTestCase;