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 2017/12/10 11:09:43 UTC
svn commit: r1817695 - in /myfaces/core/branches/2.3.x/impl/src:
main/java/org/apache/myfaces/application/viewstate/
test/java/org/apache/myfaces/application/viewstate/
Author: tandraschko
Date: Sun Dec 10 11:09:43 2017
New Revision: 1817695
URL: http://svn.apache.org/viewvc?rev=1817695&view=rev
Log:
MYFACES-4133 small cleanup
Removed:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/IntByteArraySerializedViewKey.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/IntIntSerializedViewKey.java
Modified:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/RandomSessionViewStorageFactory.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewKey.java
myfaces/core/branches/2.3.x/impl/src/test/java/org/apache/myfaces/application/viewstate/SerializedViewCollectionTestCase.java
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/RandomSessionViewStorageFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/RandomSessionViewStorageFactory.java?rev=1817695&r1=1817694&r2=1817695&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/RandomSessionViewStorageFactory.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/RandomSessionViewStorageFactory.java Sun Dec 10 11:09:43 2017
@@ -40,7 +40,7 @@ class RandomSessionViewStorageFactory ex
@Override
public SerializedViewKey createSerializedViewKey(FacesContext context, String viewId, byte[] key)
{
- return new IntByteArraySerializedViewKey(viewId == null ? 0 : viewId.hashCode(), key);
+ return new SerializedViewKey(viewId == null ? 0 : viewId.hashCode(), key);
}
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java?rev=1817695&r1=1817694&r2=1817695&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java Sun Dec 10 11:09:43 2017
@@ -39,11 +39,10 @@ class SerializedViewCollection implement
private static final Object[] EMPTY_STATES = new Object[]{null, null};
private static final long serialVersionUID = -3734849062185115847L;
- private final List<SerializedViewKey> _keys =
- new ArrayList<SerializedViewKey>(
+ private final List<SerializedViewKey> _keys = new ArrayList<>(
MyfacesConfig.INIT_PARAM_NUMBER_OF_VIEWS_IN_SESSION_DEFAULT);
- private final Map<SerializedViewKey, Object> _serializedViews =
- new HashMap<SerializedViewKey, Object>();
+ private final Map<SerializedViewKey, Object> _serializedViews = new HashMap<>();
+
/**
* The viewScopeIds can be shared between multiple entries of the same
* view. To store it into session, the best is use two maps, one to
@@ -55,8 +54,7 @@ class SerializedViewCollection implement
private HashMap<SerializedViewKey, String> _viewScopeIds = null;
private HashMap<String, Integer> _viewScopeIdCounts = null;
- private final Map<SerializedViewKey, SerializedViewKey> _precedence =
- new HashMap<SerializedViewKey, SerializedViewKey>();
+ private final Map<SerializedViewKey, SerializedViewKey> _precedence = new HashMap<>();
private Map<String, SerializedViewKey> _lastWindowKeys = null;
public void put(FacesContext context, Object state,
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewKey.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewKey.java?rev=1817695&r1=1817694&r2=1817695&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewKey.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewKey.java Sun Dec 10 11:09:43 2017
@@ -19,12 +19,52 @@
package org.apache.myfaces.application.viewstate;
import java.io.Serializable;
+import java.util.Arrays;
/**
* Base implementation where all keys used to identify the state of a view should
* extend.
*/
-abstract class SerializedViewKey implements Serializable
+class SerializedViewKey implements Serializable
{
-
+ final int _viewId;
+ final byte[] _sequenceId;
+
+ public SerializedViewKey(int viewId, byte[] sequence)
+ {
+ _sequenceId = sequence;
+ _viewId = viewId;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ {
+ return false;
+ }
+ if (getClass() != obj.getClass())
+ {
+ return false;
+ }
+ final SerializedViewKey other = (SerializedViewKey) obj;
+ if (this._viewId != other._viewId)
+ {
+ return false;
+ }
+ if (!Arrays.equals(this._sequenceId, other._sequenceId))
+ {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int hash = 5;
+ hash = 37 * hash + this._viewId;
+ hash = 37 * hash + Arrays.hashCode(this._sequenceId);
+ return hash;
+ }
}
Modified: myfaces/core/branches/2.3.x/impl/src/test/java/org/apache/myfaces/application/viewstate/SerializedViewCollectionTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/test/java/org/apache/myfaces/application/viewstate/SerializedViewCollectionTestCase.java?rev=1817695&r1=1817694&r2=1817695&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/test/java/org/apache/myfaces/application/viewstate/SerializedViewCollectionTestCase.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/test/java/org/apache/myfaces/application/viewstate/SerializedViewCollectionTestCase.java Sun Dec 10 11:09:43 2017
@@ -36,8 +36,8 @@ public class SerializedViewCollectionTes
SerializedViewCollection collection = new SerializedViewCollection();
String viewId = "/test.xhtml";
- SerializedViewKey key1 = new IntIntSerializedViewKey(viewId.hashCode(), 1);
- SerializedViewKey key2 = new IntIntSerializedViewKey(viewId.hashCode(), 2);
+ SerializedViewKey key1 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 1});
+ SerializedViewKey key2 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 2});
TestViewScopeProvider provider = new TestViewScopeProvider();
@@ -58,9 +58,9 @@ public class SerializedViewCollectionTes
SerializedViewCollection collection = new SerializedViewCollection();
String viewId = "/test.xhtml";
- SerializedViewKey key1 = new IntIntSerializedViewKey(viewId.hashCode(), 1);
- SerializedViewKey key2 = new IntIntSerializedViewKey(viewId.hashCode(), 2);
- SerializedViewKey key3 = new IntIntSerializedViewKey(viewId.hashCode(), 3);
+ SerializedViewKey key1 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 1});
+ SerializedViewKey key2 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 2});
+ SerializedViewKey key3 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 3});
TestViewScopeProvider provider = new TestViewScopeProvider();
@@ -84,9 +84,9 @@ public class SerializedViewCollectionTes
SerializedViewCollection collection = new SerializedViewCollection();
String viewId = "/test.xhtml";
- SerializedViewKey key1 = new IntIntSerializedViewKey(viewId.hashCode(), 1);
- SerializedViewKey key2 = new IntIntSerializedViewKey(viewId.hashCode(), 2);
- SerializedViewKey key3 = new IntIntSerializedViewKey(viewId.hashCode(), 3);
+ SerializedViewKey key1 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 1});
+ SerializedViewKey key2 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 2});
+ SerializedViewKey key3 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 3});
TestViewScopeProvider provider = new TestViewScopeProvider();
@@ -112,9 +112,9 @@ public class SerializedViewCollectionTes
SerializedViewCollection collection = new SerializedViewCollection();
String viewId = "/test.xhtml";
- SerializedViewKey key1 = new IntIntSerializedViewKey(viewId.hashCode(), 1);
- SerializedViewKey key2 = new IntIntSerializedViewKey(viewId.hashCode(), 2);
- SerializedViewKey key3 = new IntIntSerializedViewKey(viewId.hashCode(), 3);
+ SerializedViewKey key1 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 1});
+ SerializedViewKey key2 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 2});
+ SerializedViewKey key3 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 3});
TestViewScopeProvider provider = new TestViewScopeProvider();
@@ -139,10 +139,10 @@ public class SerializedViewCollectionTes
SerializedViewCollection collection = new SerializedViewCollection();
String viewId = "/test.xhtml";
- SerializedViewKey key1 = new IntIntSerializedViewKey(viewId.hashCode(), 1);
- SerializedViewKey key2 = new IntIntSerializedViewKey(viewId.hashCode(), 2);
- SerializedViewKey key3 = new IntIntSerializedViewKey(viewId.hashCode(), 3);
- SerializedViewKey key4 = new IntIntSerializedViewKey(viewId.hashCode(), 4);
+ SerializedViewKey key1 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 1});
+ SerializedViewKey key2 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 2});
+ SerializedViewKey key3 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 3});
+ SerializedViewKey key4 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 4});
TestViewScopeProvider provider = new TestViewScopeProvider();
@@ -180,15 +180,15 @@ public class SerializedViewCollectionTes
SerializedViewCollection collection = new SerializedViewCollection();
String viewId = "/test.xhtml";
- SerializedViewKey key1 = new IntIntSerializedViewKey(viewId.hashCode(), 1);
- SerializedViewKey key2 = new IntIntSerializedViewKey(viewId.hashCode(), 2);
- SerializedViewKey key3 = new IntIntSerializedViewKey(viewId.hashCode(), 3);
- SerializedViewKey key4 = new IntIntSerializedViewKey(viewId.hashCode(), 4);
- SerializedViewKey key5 = new IntIntSerializedViewKey(viewId.hashCode(), 5);
- SerializedViewKey key6 = new IntIntSerializedViewKey(viewId.hashCode(), 6);
- SerializedViewKey key7 = new IntIntSerializedViewKey(viewId.hashCode(), 7);
- SerializedViewKey key8 = new IntIntSerializedViewKey(viewId.hashCode(), 8);
- SerializedViewKey key9 = new IntIntSerializedViewKey(viewId.hashCode(), 9);
+ SerializedViewKey key1 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 1});
+ SerializedViewKey key2 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 2});
+ SerializedViewKey key3 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 3});
+ SerializedViewKey key4 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 4});
+ SerializedViewKey key5 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 5});
+ SerializedViewKey key6 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 6});
+ SerializedViewKey key7 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 7});
+ SerializedViewKey key8 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 8});
+ SerializedViewKey key9 = new SerializedViewKey(viewId.hashCode(), new byte[] {(byte) 9});
TestViewScopeProvider provider = new TestViewScopeProvider();