[jbosscache-commits] JBoss Cache SVN: r6275 - in core/trunk/src: main/java/org/jboss/cache/buddyreplication and 27 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Tue Jul 15 11:05:40 EDT 2008
Author: manik.surtani at jboss.com
Date: 2008-07-15 11:05:40 -0400 (Tue, 15 Jul 2008)
New Revision: 6275
Modified:
core/trunk/src/main/java/org/jboss/cache/AbstractNode.java
core/trunk/src/main/java/org/jboss/cache/Cache.java
core/trunk/src/main/java/org/jboss/cache/CacheSPI.java
core/trunk/src/main/java/org/jboss/cache/DataContainer.java
core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java
core/trunk/src/main/java/org/jboss/cache/Fqn.java
core/trunk/src/main/java/org/jboss/cache/Node.java
core/trunk/src/main/java/org/jboss/cache/NodeSPI.java
core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
core/trunk/src/main/java/org/jboss/cache/StringFqn.java
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
core/trunk/src/main/java/org/jboss/cache/commands/CommandsFactory.java
core/trunk/src/main/java/org/jboss/cache/commands/CommandsFactoryImpl.java
core/trunk/src/main/java/org/jboss/cache/commands/PessimisticCommandsFactoryImpl.java
core/trunk/src/main/java/org/jboss/cache/commands/read/GetKeyValueCommand.java
core/trunk/src/main/java/org/jboss/cache/commands/read/GravitateDataCommand.java
core/trunk/src/main/java/org/jboss/cache/config/EvictionConfig.java
core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java
core/trunk/src/main/java/org/jboss/cache/loader/AbstractCacheLoader.java
core/trunk/src/main/java/org/jboss/cache/marshall/NodeData.java
core/trunk/src/test/java/org/jboss/cache/CallbackTest.java
core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java
core/trunk/src/test/java/org/jboss/cache/FqnTest.java
core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java
core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java
core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java
core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java
core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationFailoverTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/config/ChannelInjectionTest.java
core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java
core/trunk/src/test/java/org/jboss/cache/eviction/BaseEvictionAlgorithmTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/integration/hibernate/HibernateIntegrationTestUtil.java
core/trunk/src/test/java/org/jboss/cache/integration/hibernate/UpdateTimestampsCachingTest.java
core/trunk/src/test/java/org/jboss/cache/interceptors/EvictionInterceptorTest.java
core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java
core/trunk/src/test/java/org/jboss/cache/loader/BdbjeTest.java
core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java
core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java
core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/lock/LockReleaseTest.java
core/trunk/src/test/java/org/jboss/cache/lock/PessimisticLockTest.java
core/trunk/src/test/java/org/jboss/cache/lock/WriteLockOnParentTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.java
core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java
core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerPassivationTest.java
core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerTest.java
core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java
core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java
core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java
core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java
core/trunk/src/test/java/org/jboss/cache/options/FailSilentlyTest.java
core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java
core/trunk/src/test/java/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java
core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java
core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java
core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java
core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/StatusUnknownTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/TransactionTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java
Log:
JBCACHE-1390: de-genericized Fqn
Modified: core/trunk/src/main/java/org/jboss/cache/AbstractNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/AbstractNode.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/AbstractNode.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -17,7 +17,7 @@
public abstract class AbstractNode<K, V>
{
protected Map<Object, Node<K, V>> children;
- protected Fqn<?> fqn;
+ protected Fqn fqn;
/**
* Flags placed on the node. Replaces older 'boolean' flags.
*/
Modified: core/trunk/src/main/java/org/jboss/cache/Cache.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Cache.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/Cache.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -129,7 +129,7 @@
* A <code>null</code> return can also indicate that the Node previously associated <code>null</code> with the specified key, if the implementation supports null values.
* @throws IllegalStateException if the cache is not in a started state.
*/
- V put(Fqn<?> fqn, K key, V value);
+ V put(Fqn fqn, K key, V value);
/**
* Convenience method that takes a string representation of an Fqn. Otherwise identical to {@link #put(Fqn, Object, Object)}
@@ -170,7 +170,7 @@
* @param value value to be associated with the specified key.
* @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link org.jboss.cache.CacheStatus#STARTED}.
*/
- void putForExternalRead(Fqn<?> fqn, K key, V value);
+ void putForExternalRead(Fqn fqn, K key, V value);
/**
* Copies all of the mappings from the specified map to a {@link Node}.
@@ -179,7 +179,7 @@
* @param data mappings to copy
* @throws IllegalStateException if the cache is not in a started state
*/
- void put(Fqn<?> fqn, Map<K, V> data);
+ void put(Fqn fqn, Map<K, V> data);
/**
* Convenience method that takes a string representation of an Fqn. Otherwise identical to {@link #put(Fqn, java.util.Map)}
@@ -200,7 +200,7 @@
* @return previous value associated with specified Node's key
* @throws IllegalStateException if the cache is not in a started state
*/
- V remove(Fqn<?> fqn, K key);
+ V remove(Fqn fqn, K key);
/**
* Convenience method that takes a string representation of an Fqn. Otherwise identical to {@link #remove(Fqn, Object)}
@@ -219,7 +219,7 @@
* @return true if the node was removed, false if the node was not found
* @throws IllegalStateException if the cache is not in a started state
*/
- boolean removeNode(Fqn<?> fqn);
+ boolean removeNode(Fqn fqn);
/**
* Convenience method that takes a string representation of an Fqn. Otherwise identical to {@link #removeNode(Fqn)}
@@ -237,7 +237,7 @@
* @return a Node object, or a null if the node does not exist.
* @throws IllegalStateException if the cache is not in a started state
*/
- Node<K, V> getNode(Fqn<?> fqn);
+ Node<K, V> getNode(Fqn fqn);
/**
* Convenience method that takes a string representation of an Fqn. Otherwise identical to {@link #getNode(Fqn)}
@@ -257,7 +257,7 @@
* @return returns data held under specified key in {@link Node} denoted by specified Fqn.
* @throws IllegalStateException if the cache is not in a started state
*/
- V get(Fqn<?> fqn, K key);
+ V get(Fqn fqn, K key);
/**
* Convenience method that takes a string representation of an Fqn. Otherwise identical to {@link #get(Fqn, Object)}
@@ -276,7 +276,7 @@
* @param recursive evicts children as well
* @throws IllegalStateException if the cache is not in a started state
*/
- void evict(Fqn<?> fqn, boolean recursive);
+ void evict(Fqn fqn, boolean recursive);
/**
* Eviction call that evicts the specified {@link Node} from memory. Not recursive.
@@ -284,7 +284,7 @@
* @param fqn <b><i>absolute</i></b> {@link Fqn} to the {@link Node} to be evicted.
* @throws IllegalStateException if the cache is not in a started state
*/
- void evict(Fqn<?> fqn);
+ void evict(Fqn fqn);
/**
* Retrieves a {@link Region} for a given {@link Fqn}. If the region does not exist,
@@ -298,7 +298,7 @@
* @return a MarshRegion. Null if none is found.
* @see Region
*/
- Region getRegion(Fqn<?> fqn, boolean createIfAbsent);
+ Region getRegion(Fqn fqn, boolean createIfAbsent);
/**
* Removes a region denoted by the Fqn passed in.
@@ -306,7 +306,7 @@
* @param fqn of the region to remove
* @return true if a region did exist and was removed; false otherwise.
*/
- boolean removeRegion(Fqn<?> fqn);
+ boolean removeRegion(Fqn fqn);
/**
* Lifecycle method that initializes configuration state, the root node, etc.
@@ -431,7 +431,7 @@
* @throws NodeNotExistsException may throw one of these if the target node does not exist or if a different thread has moved this node elsewhere already.
* @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link CacheStatus#STARTED}.
*/
- void move(Fqn<?> nodeToMove, Fqn<?> newParent) throws NodeNotExistsException;
+ void move(Fqn nodeToMove, Fqn newParent) throws NodeNotExistsException;
/**
* Convenience method that takes in string representations of Fqns. Otherwise identical to {@link #move(Fqn, Fqn)}
@@ -457,7 +457,7 @@
* @throws CacheException
* @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link CacheStatus#STARTED}.
*/
- Map<K, V> getData(Fqn<?> fqn);
+ Map<K, V> getData(Fqn fqn);
/**
* Convenience method that takes in a String represenation of the Fqn. Otherwise identical to {@link #getKeys(Fqn)}.
@@ -475,7 +475,7 @@
* @param fqn name of the node
* @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link CacheStatus#STARTED}.
*/
- Set<K> getKeys(Fqn<?> fqn);
+ Set<K> getKeys(Fqn fqn);
/**
* Convenience method that takes in a String represenation of the Fqn. Otherwise identical to {@link #clearData(Fqn)}.
@@ -493,6 +493,6 @@
* @param fqn name of the node
* @throws IllegalStateException if {@link #getCacheStatus()} would not return {@link CacheStatus#STARTED}.
*/
- void clearData(Fqn<?> fqn);
+ void clearData(Fqn fqn);
}
Modified: core/trunk/src/main/java/org/jboss/cache/CacheSPI.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/CacheSPI.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/CacheSPI.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -64,7 +64,7 @@
* @param f an Fqn
* @return a NodeSPI
*/
- NodeSPI<K, V> getNode(Fqn<?> f);
+ NodeSPI<K, V> getNode(Fqn f);
/**
@@ -256,7 +256,7 @@
* @param includeDeletedNodes if you intend to see nodes marked as deleted within the current tx, set this to true
* @return a node if one exists or null
*/
- NodeSPI<K, V> peek(Fqn<?> fqn, boolean includeDeletedNodes);
+ NodeSPI<K, V> peek(Fqn fqn, boolean includeDeletedNodes);
/**
* Returns a node without accessing the interceptor chain, optionally returning nodes that are marked as invalid ({@link org.jboss.cache.Node#isValid()} == false).
@@ -270,7 +270,7 @@
* @param includeInvalidNodes if true, nodes marked as being invalid are also returned.
* @return a node if one exists or null
*/
- NodeSPI<K, V> peek(Fqn<?> fqn, boolean includeDeletedNodes, boolean includeInvalidNodes);
+ NodeSPI<K, V> peek(Fqn fqn, boolean includeDeletedNodes, boolean includeInvalidNodes);
/**
* Used with buddy replication's data gravitation interceptor. If marshalling is necessary, ensure that the cache is
@@ -282,7 +282,7 @@
* @param ctx
* @return a GravitateResult which contains the data for the gravitation
*/
- GravitateResult gravitateData(Fqn<?> fqn, boolean searchBuddyBackupSubtrees, InvocationContext ctx);
+ GravitateResult gravitateData(Fqn fqn, boolean searchBuddyBackupSubtrees, InvocationContext ctx);
/**
* Returns a Set<Fqn> of Fqns of the topmost node of internal regions that
@@ -304,7 +304,7 @@
* @param fqn Fqn to peek
* @return true if the peek returns a non-null value.
*/
- boolean exists(Fqn<?> fqn);
+ boolean exists(Fqn fqn);
/**
* A convenience method that takes a String representation of an Fqn. Otherwise identical to {@link #exists(Fqn)}.
@@ -321,7 +321,7 @@
* @param fqn The fully qualified name of the node
* @return Set an unmodifiable set of children names, Object.
*/
- <E> Set<E> getChildrenNames(Fqn<E> fqn);
+ Set<Object> getChildrenNames(Fqn fqn);
/**
* Convenience method that takes a String representation of an Fqn. Otherwise identical to {@link #getChildrenNames(Fqn)}
@@ -329,5 +329,5 @@
* @param fqn as a string
* @return Set an unmodifiable set of children names, Object.
*/
- Set getChildrenNames(String fqn);
+ Set<String> getChildrenNames(String fqn);
}
Modified: core/trunk/src/main/java/org/jboss/cache/DataContainer.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/DataContainer.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/DataContainer.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -44,7 +44,7 @@
* @param includeDeletedNodes if true, deleted nodes are considered
* @return the node, if found, or null otherwise.
*/
- NodeSPI peek(Fqn<?> fqn, boolean includeDeletedNodes);
+ NodeSPI peek(Fqn fqn, boolean includeDeletedNodes);
/**
* Peeks for a specified node. This involves a direct walk of the tree, starting at the root, until the required node
@@ -55,7 +55,7 @@
* @param includeInvalidNodes if true, invalid nodes are also considered
* @return the node, if found, or null otherwise.
*/
- NodeSPI peek(Fqn<?> fqn, boolean includeDeletedNodes, boolean includeInvalidNodes);
+ NodeSPI peek(Fqn fqn, boolean includeDeletedNodes, boolean includeInvalidNodes);
/**
* Tests if an Fqn exists and is valid and not deleted.
Modified: core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -118,12 +118,12 @@
return peek(fqn, false, false);
}
- public NodeSPI peek(Fqn<?> fqn, boolean includeDeletedNodes)
+ public NodeSPI peek(Fqn fqn, boolean includeDeletedNodes)
{
return peek(fqn, includeDeletedNodes, false);
}
- public NodeSPI peek(Fqn<?> fqn, boolean includeDeletedNodes, boolean includeInvalidNodes)
+ public NodeSPI peek(Fqn fqn, boolean includeDeletedNodes, boolean includeInvalidNodes)
{
if (fqn == null || fqn.size() == 0) return getRoot();
NodeSPI n = getRoot();
Modified: core/trunk/src/main/java/org/jboss/cache/Fqn.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Fqn.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/Fqn.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -32,7 +32,7 @@
* Fqn<String> abc = Fqn.fromString("/people/Smith/Joe/");
* Node joesmith = Cache.getRoot().getChild(abc);
* </pre>
- * Alternatively, the same Fqn could be constructed using a List or varargs:
+ * Alternatively, the same Fqn could be constructed using a List<Object> or varargs:
* <pre>
* Fqn<String> abc = Fqn.fromElements("people", "Smith", "Joe");
* </pre>
@@ -75,22 +75,21 @@
* @version $Revision$
*/
@Immutable
-public class Fqn<E> implements Comparable<Fqn<?>>
+public class Fqn implements Comparable<Fqn>
{
/**
* Separator between FQN elements.
*/
public static final String SEPARATOR = "/";
- protected List<E> elements;
+ protected List<Object> elements;
private transient int hash_code = 0;
protected int size = 0;
/**
- * Immutable root FQN.
+ * Immutable root Fqn.
*/
- @SuppressWarnings("unchecked")
- public static final Fqn<Object> ROOT = new Fqn<Object>();
+ public static final Fqn ROOT = new Fqn();
/**
* A cached string representation of this Fqn, used by toString to it isn't calculated again every time.
@@ -105,12 +104,12 @@
size = 0;
}
- protected Fqn(List<E> names, boolean safe)
+ protected Fqn(List<Object> names, boolean safe)
{
if (names != null)
{
// if not safe make a defensive copy
- elements = safe ? names : new ArrayList<E>(names);
+ elements = safe ? names : new ArrayList<Object>(names);
if (elements.size() > 0)
{
if (SEPARATOR.equals(elements.get(0))) elements.remove(0);
@@ -125,9 +124,9 @@
}
}
- protected Fqn(Fqn<E> base, List<E> relative)
+ protected Fqn(Fqn base, List<Object> relative)
{
- List<E> elements = new ArrayList<E>(base.elements.size() + relative.size());
+ List<Object> elements = new ArrayList<Object>(base.elements.size() + relative.size());
elements.addAll(base.elements);
elements.addAll(relative);
this.elements = elements;
@@ -143,9 +142,9 @@
* @return an Fqn
* @since 2.2.0
*/
- public static <E> Fqn<E> fromList(List<E> names)
+ public static Fqn fromList(List<Object> names)
{
- return new Fqn<E>(names, false);
+ return new Fqn(names, false);
}
/**
@@ -155,9 +154,9 @@
* @return an Fqn
* @since 2.2.0
*/
- public static <E> Fqn<E> fromElements(E... elements)
+ public static Fqn fromElements(Object... elements)
{
- return new Fqn<E>(Arrays.asList(elements), true);
+ return new Fqn(Arrays.asList(elements), true);
}
/**
@@ -168,22 +167,22 @@
* @return an Fqn
* @since 2.2.0
*/
- public static <E> Fqn<E> fromRelativeFqn(Fqn<E> base, Fqn<E> relative)
+ public static Fqn fromRelativeFqn(Fqn base, Fqn relative)
{
- return new Fqn<E>(base, relative.elements);
+ return new Fqn(base, relative.elements);
}
/**
- * Retrieves an Fqn that represents the List of elements passed in, relative to the base Fqn.
+ * Retrieves an Fqn that represents the List<Object> of elements passed in, relative to the base Fqn.
*
* @param base base Fqn
- * @param relativeElements relative List of elements
+ * @param relativeElements relative List<Object> of elements
* @return an Fqn
* @since 2.2.0
*/
- public static <E> Fqn<E> fromRelativeList(Fqn<E> base, List<E> relativeElements)
+ public static Fqn fromRelativeList(Fqn base, List<Object> relativeElements)
{
- return new Fqn<E>(base, relativeElements);
+ return new Fqn(base, relativeElements);
}
/**
@@ -194,9 +193,9 @@
* @return an Fqn
* @since 2.2.0
*/
- public static <E> Fqn<E> fromRelativeElements(Fqn<E> base, E... relativeElements)
+ public static Fqn fromRelativeElements(Fqn base, Object... relativeElements)
{
- return new Fqn<E>(base, Arrays.asList(relativeElements));
+ return new Fqn(base, Arrays.asList(relativeElements));
}
/**
@@ -214,14 +213,15 @@
* @param stringRepresentation String representation of the Fqn
* @return an Fqn<String> constructed from the string representation passed in
*/
- public static Fqn<String> fromString(String stringRepresentation)
+ @SuppressWarnings("unchecked")
+ public static Fqn fromString(String stringRepresentation)
{
if (stringRepresentation == null || stringRepresentation.equals(SEPARATOR))
{
return root();
}
- List<String> elements = Arrays.asList(stringRepresentation.split("/"));
- return new Fqn<String>(elements, false);
+ List elements = Arrays.asList(stringRepresentation.split("/"));
+ return new Fqn(elements, false);
}
/**
@@ -233,9 +233,9 @@
* @throws ClassNotFoundException in the event of classes that comprise the element list of this Fqn not being found
* @since 2.2.0
*/
- public static Fqn<?> fromExternalStream(ObjectInput in) throws IOException, ClassNotFoundException
+ public static Fqn fromExternalStream(ObjectInput in) throws IOException, ClassNotFoundException
{
- Fqn<Object> f = new Fqn<Object>();
+ Fqn f = new Fqn();
f.readExternal(in);
return f;
}
@@ -264,7 +264,7 @@
* @param generation the generation of the ancestor to retrieve
* @return an ancestor of the current Fqn
*/
- public Fqn<E> getAncestor(int generation)
+ public Fqn getAncestor(int generation)
{
if (generation == 0) return root();
return getSubFqn(0, generation);
@@ -277,10 +277,10 @@
* @param endIndex end index
* @return a subFqn
*/
- public Fqn<E> getSubFqn(int startIndex, int endIndex)
+ public Fqn getSubFqn(int startIndex, int endIndex)
{
- List<E> el = elements.subList(startIndex, endIndex);
- return new Fqn<E>(el, true);
+ List<Object> el = elements.subList(startIndex, endIndex);
+ return new Fqn(el, true);
}
/**
@@ -295,7 +295,7 @@
* @param n index of the element to return
* @return Returns the nth element in the Fqn.
*/
- public E get(int n)
+ public Object get(int n)
{
return elements.get(n);
}
@@ -304,7 +304,7 @@
* @return the last element in the Fqn.
* @see #getLastElementAsString
*/
- public E getLastElement()
+ public Object getLastElement()
{
if (isRoot()) return null;
return elements.get(size - 1);
@@ -314,7 +314,7 @@
* @param element element to find
* @return true if the Fqn contains this element, false otherwise.
*/
- public boolean hasElement(E element)
+ public boolean hasElement(Object element)
{
return elements.indexOf(element) != -1;
}
@@ -333,7 +333,7 @@
{
return false;
}
- Fqn<?> other = (Fqn<?>) obj;
+ Fqn other = (Fqn) obj;
return size == other.size() && elements.equals(other.elements);
}
@@ -373,7 +373,7 @@
public void writeExternal(ObjectOutput out) throws IOException
{
out.writeShort(size);
- for (E element : elements)
+ for (Object element : elements)
{
out.writeObject(element);
}
@@ -383,12 +383,8 @@
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
size = in.readShort();
- this.elements = new ArrayList<E>(size);
- for (int i = 0; i < size; i++)
- {
- E e = (E) in.readObject();
- elements.add(e);
- }
+ this.elements = new ArrayList<Object>(size);
+ for (int i = 0; i < size; i++) elements.add(in.readObject());
}
@@ -406,7 +402,7 @@
* @param parentFqn candidate parent to test against
* @return true if the target is a child of parentFqn
*/
- public boolean isChildOf(Fqn<E> parentFqn)
+ public boolean isChildOf(Fqn parentFqn)
{
return parentFqn.size() != size && isChildOrEquals(parentFqn);
}
@@ -425,9 +421,9 @@
* @param parentFqn candidate parent to test against
* @return true if this Fqn is equals or the child of parentFqn.
*/
- public boolean isChildOrEquals(Fqn<E> parentFqn)
+ public boolean isChildOrEquals(Fqn parentFqn)
{
- List<E> parentList = parentFqn.elements;
+ List<Object> parentList = parentFqn.elements;
if (parentList.size() > size)
{
return false;
@@ -451,12 +447,8 @@
{
int hashCode = 0;
int count = 1;
- Object o;
- for (E element : elements)
- {
- o = element;
- hashCode += (o == null) ? 0 : o.hashCode() * count++;
- }
+ for (Object element : elements) hashCode += (element == null) ? 0 : element.hashCode() * count++;
+
if (hashCode == 0)// fix degenerate case
{
hashCode = 0xFEED;
@@ -464,7 +456,7 @@
return hashCode;
}
- protected String getStringRepresentation(List elements)
+ protected String getStringRepresentation(List<Object> elements)
{
StringBuilder builder = new StringBuilder();
for (Object e : elements)
@@ -494,7 +486,7 @@
*
* @return the parent Fqn
*/
- public Fqn<E> getParent()
+ public Fqn getParent()
{
switch (size)
{
@@ -502,14 +494,13 @@
case 1:
return root();
default:
- return new Fqn<E>(elements.subList(0, size - 1), true);
+ return new Fqn(elements.subList(0, size - 1), true);
}
}
- @SuppressWarnings("unchecked")
- public static final <T> Fqn<T> root() // declared final so compilers can optimise and in-line.
+ public static final Fqn root() // declared final so compilers can optimise and in-line.
{
- return (Fqn<T>) ROOT;
+ return ROOT;
}
/**
@@ -549,7 +540,7 @@
*
* @return an unmodifiable list
*/
- public List<E> peekElements()
+ public List<Object> peekElements()
{
return elements;
}
@@ -557,9 +548,9 @@
/**
* Compares this Fqn to another using {@link FqnComparator}.
*/
- public int compareTo(Fqn<?> Fqn)
+ public int compareTo(Fqn fqn)
{
- return FqnComparator.INSTANCE.compare(this, Fqn);
+ return FqnComparator.INSTANCE.compare(this, fqn);
}
/**
@@ -569,11 +560,11 @@
* @param newAncestor nw ancestor to replace with
* @return a new Fqn with ancestors replaced.
*/
- public Fqn<E> replaceAncestor(Fqn<E> oldAncestor, Fqn<E> newAncestor)
+ public Fqn replaceAncestor(Fqn oldAncestor, Fqn newAncestor)
{
if (!isChildOf(oldAncestor))
throw new IllegalArgumentException("Old ancestor must be an ancestor of the current Fqn!");
- Fqn<E> subFqn = this.getSubFqn(oldAncestor.size(), size());
+ Fqn subFqn = this.getSubFqn(oldAncestor.size(), size());
return Fqn.fromRelativeFqn(newAncestor, subFqn);
}
}
\ No newline at end of file
Modified: core/trunk/src/main/java/org/jboss/cache/Node.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Node.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/Node.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -90,7 +90,7 @@
* @param f {@link Fqn} of the child node, relative to the current node.
* @return the newly created node, or the existing node if one already exists.
*/
- Node<K, V> addChild(Fqn<?> f);
+ Node<K, V> addChild(Fqn f);
/**
* Removes a child node specified by the given relative {@link Fqn}.
@@ -100,7 +100,7 @@
* @param f {@link Fqn} of the child node, relative to the current node.
* @return true if the node was found and removed, false otherwise
*/
- boolean removeChild(Fqn<?> f);
+ boolean removeChild(Fqn f);
/**
* Removes a child node specified by the given name.
@@ -117,7 +117,7 @@
* @param f {@link Fqn} of the child node
* @return null if the child does not exist.
*/
- Node<K, V> getChild(Fqn<?> f);
+ Node<K, V> getChild(Fqn f);
/**
* @param name name of the child
@@ -259,7 +259,7 @@
* @param f {@link Fqn} relative to the current node of the child you are testing the existence of.
* @return true if the child node denoted by the relative {@link Fqn} passed in exists.
*/
- boolean hasChild(Fqn<?> f);
+ boolean hasChild(Fqn f);
/**
* Returns true if the child node denoted by the Object name passed in exists.
Modified: core/trunk/src/main/java/org/jboss/cache/NodeSPI.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/NodeSPI.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/NodeSPI.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -118,7 +118,7 @@
*
* @param f fqn to set
*/
- void setFqn(Fqn<?> f);
+ void setFqn(Fqn f);
/**
* Returns true if the instance has been deleted in the current transaction.
Modified: core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -41,12 +41,12 @@
* eviction settings bound under this 'default' Fqn is appplied to {@link org.jboss.cache.Fqn#ROOT} internally so
* any region that is not explicitly defined comes under the settings defined for this default.
*/
- public static final Fqn<?> DEFAULT_REGION = Fqn.fromString("/_default_");
+ public static final Fqn DEFAULT_REGION = Fqn.fromString("/_default_");
private RegionRegistry regionsRegistry;
private boolean defaultInactive;
protected final Log log = LogFactory.getLog(RegionManagerImpl.class);
- CacheSPI cache;
+ CacheSPI<?, ?> cache;
private boolean usingEvictions;
private EvictionConfig evictionConfig;
private final EvictionTimerTask evictionTimerTask = new EvictionTimerTask();
Modified: core/trunk/src/main/java/org/jboss/cache/StringFqn.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/StringFqn.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/StringFqn.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -19,7 +19,7 @@
*/
// TODO: 3.0.0: Implement proper String escaping.
@Experimental
-public final class StringFqn extends Fqn<String>
+public final class StringFqn extends Fqn
{
protected StringFqn()
{
@@ -27,10 +27,11 @@
stringRepresentation = SEPARATOR;
}
+ @SuppressWarnings("unchecked")
protected StringFqn(StringFqn base, List<String> elements)
{
- super(base, elements);
- String elementStringRep = getStringRepresentation(elements);
+ super(base, (List) elements);
+ String elementStringRep = getStringRepresentation((List) elements);
stringRepresentation = base.isRoot() ? elementStringRep : base.stringRepresentation + elementStringRep;
}
@@ -53,9 +54,10 @@
}
}
+ @SuppressWarnings("unchecked")
protected StringFqn(List<String> stringElements)
{
- super(stringElements, false);
+ super((List) stringElements, false);
stringRepresentation = getStringRepresentation(elements);
}
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -15,8 +15,8 @@
*/
public class BuddyFqnTransformer
{
- public static final String BUDDY_BACKUP_SUBTREE = "_BUDDY_BACKUP_";
- public static final Fqn<String> BUDDY_BACKUP_SUBTREE_FQN = Fqn.fromString(BUDDY_BACKUP_SUBTREE);
+ public static final String BUDDY_BACKUP_SUBTREE = BuddyManager.BUDDY_BACKUP_SUBTREE;
+ public static final Fqn BUDDY_BACKUP_SUBTREE_FQN = BuddyManager.BUDDY_BACKUP_SUBTREE_FQN;
/**
* Utility method that retrieves a buddy backup Fqn given the actual Fqn of some data and the data owner's Address.
@@ -71,6 +71,7 @@
return Fqn.fromList(elements);
}
+ @SuppressWarnings("unchecked")
public boolean isBackupFqn(Fqn name)
{
return name != null && name.hasElement(BuddyManager.BUDDY_BACKUP_SUBTREE);
@@ -110,10 +111,9 @@
* @param dataOwner owner of a data set
* @return a backup root for a given data owner
*/
- @SuppressWarnings("unchecked")
- public Fqn<String> getBackupRoot(Address dataOwner)
+ public Fqn getBackupRoot(Address dataOwner)
{
- return (Fqn) Fqn.fromRelativeElements(BUDDY_BACKUP_SUBTREE_FQN, getGroupNameFromAddress(dataOwner));
+ return Fqn.fromRelativeElements(BUDDY_BACKUP_SUBTREE_FQN, getGroupNameFromAddress(dataOwner));
}
/**
@@ -122,10 +122,9 @@
* @param dataOwner owner of data
* @return Fqn of dead data owner's root
*/
- @SuppressWarnings("unchecked")
- public Fqn<String> getDeadBackupRoot(Address dataOwner)
+ public Fqn getDeadBackupRoot(Address dataOwner)
{
- return (Fqn) Fqn.fromRelativeElements(BUDDY_BACKUP_SUBTREE_FQN, getGroupNameFromAddress(dataOwner) + ":DEAD");
+ return Fqn.fromRelativeElements(BUDDY_BACKUP_SUBTREE_FQN, getGroupNameFromAddress(dataOwner) + ":DEAD");
}
public boolean isDeadBackupRoot(Fqn f)
@@ -142,6 +141,7 @@
* Returns the buddy backp root portion of a given Fqn, provided it is a backup Fqn. If it is not a backup Fqn, Fqn.ROOT is returned.
*
* @param fqn fqn
+ * @return a backup root from an Fqn
*/
public Fqn getBackupRootFromFqn(Fqn fqn)
{
@@ -151,7 +151,7 @@
}
else
{
- return Fqn.ROOT;
+ return Fqn.root();
}
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -130,7 +130,7 @@
* Constants representng the buddy backup subtree
*/
public static final String BUDDY_BACKUP_SUBTREE = "_BUDDY_BACKUP_";
- public static final Fqn<String> BUDDY_BACKUP_SUBTREE_FQN = Fqn.fromString(BUDDY_BACKUP_SUBTREE);
+ public static final Fqn BUDDY_BACKUP_SUBTREE_FQN = Fqn.fromString(BUDDY_BACKUP_SUBTREE);
/**
* number of times to retry communicating with a selected buddy if the buddy has not been initialised.
@@ -1059,10 +1059,10 @@
{
// the defunct Fqn should be: /_BUDDY_BACKUP_/dataOwnerAddess:DEAD/N
// where N is a number.
- Fqn<String> defunctRoot = buddyFqnTransformer.getDeadBackupRoot(dataOwner);
+ Fqn defunctRoot = buddyFqnTransformer.getDeadBackupRoot(dataOwner);
cache.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
- Node defunctRootNode = dataContainer.getRoot().addChild(defunctRoot);
- SortedSet childrenNames = new TreeSet(defunctRootNode.getChildrenNames()); // will be naturally sorted.
+ Node<?, ?> defunctRootNode = dataContainer.getRoot().addChild(defunctRoot);
+ SortedSet<Object> childrenNames = new TreeSet<Object>(defunctRootNode.getChildrenNames()); // will be naturally sorted.
Integer childName = 1;
if (!childrenNames.isEmpty())
@@ -1222,10 +1222,6 @@
// make sure no one is concurrently writing to nullBuddyPool.
synchronized (nullBuddyPool)
{
- // log.trace("Testing on node " + buddyGroup.getDataOwner() + " for candidate " + address);
- // log.trace("Is me? " + address.equals(cache.getLocalAddress()));
- // log.trace("is in bP? " + buddyPool.keySet().contains(address));
- // log.trace("is in nBP? " + nullBuddyPool.contains(address));
infoReceived = infoReceived && (address.equals(cache.getLocalAddress()) || buddyPool.keySet().contains(address) || nullBuddyPool.contains(address));
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/commands/CommandsFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/CommandsFactory.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/commands/CommandsFactory.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -80,13 +80,13 @@
InvalidateCommand buildInvalidateCommand(Fqn fqn);
- RemoveKeyCommand buildRemoveKeyCommand(GlobalTransaction tx, Fqn<?> fqn, Object key);
+ RemoveKeyCommand buildRemoveKeyCommand(GlobalTransaction tx, Fqn fqn, Object key);
GetDataMapCommand buildGetDataMapCommand(Fqn fqn);
ExistsCommand buildExistsNodeCommand(Fqn fqn);
- GetKeyValueCommand buildGetKeyValueCommand(Fqn<?> fqn, Object key, boolean sendNodeEvent);
+ GetKeyValueCommand buildGetKeyValueCommand(Fqn fqn, Object key, boolean sendNodeEvent);
GetNodeCommand buildGetNodeCommand(Fqn fqn);
Modified: core/trunk/src/main/java/org/jboss/cache/commands/CommandsFactoryImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/CommandsFactoryImpl.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/commands/CommandsFactoryImpl.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -177,7 +177,7 @@
return command;
}
- public GetKeyValueCommand buildGetKeyValueCommand(Fqn<?> fqn, Object key, boolean sendNodeEvent)
+ public GetKeyValueCommand buildGetKeyValueCommand(Fqn fqn, Object key, boolean sendNodeEvent)
{
GetKeyValueCommand command = new GetKeyValueCommand(fqn, key, sendNodeEvent);
command.initialize(dataContainer, notifier);
@@ -257,7 +257,7 @@
return cmd;
}
- public RemoveKeyCommand buildRemoveKeyCommand(GlobalTransaction tx, Fqn<?> fqn, Object key)
+ public RemoveKeyCommand buildRemoveKeyCommand(GlobalTransaction tx, Fqn fqn, Object key)
{
RemoveKeyCommand cmd = new RemoveKeyCommand(tx, fqn, key);
cmd.initialize(notifier, dataContainer);
Modified: core/trunk/src/main/java/org/jboss/cache/commands/PessimisticCommandsFactoryImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/PessimisticCommandsFactoryImpl.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/commands/PessimisticCommandsFactoryImpl.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -83,7 +83,7 @@
}
@Override
- public RemoveKeyCommand buildRemoveKeyCommand(GlobalTransaction tx, Fqn<?> fqn, Object key)
+ public RemoveKeyCommand buildRemoveKeyCommand(GlobalTransaction tx, Fqn fqn, Object key)
{
RemoveKeyCommand cmd = new PessRemoveKeyCommand(tx, fqn, key);
cmd.initialize(notifier, dataContainer);
Modified: core/trunk/src/main/java/org/jboss/cache/commands/read/GetKeyValueCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/read/GetKeyValueCommand.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/commands/read/GetKeyValueCommand.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -28,7 +28,7 @@
private Object key;
boolean sendNodeEvent;
- public GetKeyValueCommand(Fqn<?> fqn, Object key, boolean sendNodeEvent)
+ public GetKeyValueCommand(Fqn fqn, Object key, boolean sendNodeEvent)
{
this.fqn = fqn;
this.key = key;
Modified: core/trunk/src/main/java/org/jboss/cache/commands/read/GravitateDataCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/read/GravitateDataCommand.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/commands/read/GravitateDataCommand.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -104,7 +104,7 @@
{
// groupName is the name of a buddy group since all child names in this
// collection are direct children of BUDDY_BACKUP_SUBTREE_FQN
- Fqn backupRoot = Fqn.fromRelativeElements(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, groupName);
+ Fqn backupRoot = Fqn.fromRelativeElements(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, (String) groupName);
if (buddyFqnTransformer.isDeadBackupRoot(backupRoot))
{
Set<Integer> deadChildNames = new TreeSet<Integer>(spi.getChildrenNames(backupRoot));
Modified: core/trunk/src/main/java/org/jboss/cache/config/EvictionConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/EvictionConfig.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/config/EvictionConfig.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -248,7 +248,7 @@
*/
public EvictionRegionConfig getEvictionRegionConfig(String region)
{
- Fqn<String> fqn = Fqn.fromString(region);
+ Fqn fqn = Fqn.fromString(region);
for (EvictionRegionConfig evConfig : getEvictionRegionConfigs())
{
if (evConfig.getRegionFqn().equals(fqn))
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -220,7 +220,7 @@
return exists(Fqn.fromString(fqn));
}
- public boolean exists(Fqn<?> fqn)
+ public boolean exists(Fqn fqn)
{
return peek(fqn, false, false) != null;
}
@@ -325,7 +325,7 @@
return Version.printVersion();
}
- public void move(Fqn<?> nodeToMove, Fqn<?> newParent) throws NodeNotExistsException
+ public void move(Fqn nodeToMove, Fqn newParent) throws NodeNotExistsException
{
InvocationContext ctx = invocationContextContainer.get();
cacheStatusCheck(ctx);
@@ -348,7 +348,7 @@
return regionManager.getRegion(fqn, createIfAbsent);
}
- public void evict(Fqn<?> fqn, boolean recursive)
+ public void evict(Fqn fqn, boolean recursive)
{
InvocationContext ctx = invocationContextContainer.get();
cacheStatusCheck(ctx);
@@ -357,12 +357,12 @@
invoker.invoke(ctx, c);
}
- public void evict(Fqn<?> fqn)
+ public void evict(Fqn fqn)
{
evict(fqn, false);
}
- public V get(Fqn<?> fqn, K key)
+ public V get(Fqn fqn, K key)
{
InvocationContext ctx = invocationContextContainer.get();
cacheStatusCheck(ctx);
@@ -375,7 +375,7 @@
return get(Fqn.fromString(fqn), key);
}
- public boolean removeNode(Fqn<?> fqn)
+ public boolean removeNode(Fqn fqn)
{
// special case if we are removing the root. Remove all children instead.
if (fqn.isRoot())
@@ -411,7 +411,7 @@
return removeNode(Fqn.fromString(fqn));
}
- public NodeSPI<K, V> getNode(Fqn<?> fqn)
+ public NodeSPI<K, V> getNode(Fqn fqn)
{
InvocationContext ctx = invocationContextContainer.get();
cacheStatusCheck(ctx);
@@ -424,7 +424,7 @@
return getNode(Fqn.fromString(fqn));
}
- public V remove(Fqn<?> fqn, K key) throws CacheException
+ public V remove(Fqn fqn, K key) throws CacheException
{
InvocationContext ctx = invocationContextContainer.get();
cacheStatusCheck(ctx);
@@ -438,7 +438,7 @@
return remove(Fqn.fromString(fqn), key);
}
- public void put(Fqn<?> fqn, Map<K, V> data)
+ public void put(Fqn fqn, Map<K, V> data)
{
InvocationContext ctx = invocationContextContainer.get();
cacheStatusCheck(ctx);
@@ -451,7 +451,7 @@
put(Fqn.fromString(fqn), data);
}
- public void putForExternalRead(Fqn<?> fqn, K key, V value)
+ public void putForExternalRead(Fqn fqn, K key, V value)
{
InvocationContext ctx = invocationContextContainer.get();
cacheStatusCheck(ctx);
@@ -470,7 +470,7 @@
}
}
- public V put(Fqn<?> fqn, K key, V value)
+ public V put(Fqn fqn, K key, V value)
{
InvocationContext ctx = invocationContextContainer.get();
cacheStatusCheck(ctx);
@@ -491,7 +491,7 @@
* @return map of data, or an empty map
* @throws CacheException
*/
- public Map<K, V> getData(Fqn<?> fqn)
+ public Map<K, V> getData(Fqn fqn)
{
InvocationContext ctx = invocationContextContainer.get();
cacheStatusCheck(ctx);
@@ -518,7 +518,7 @@
*
* @param fqn name of the node
*/
- public Set<K> getKeys(Fqn<?> fqn)
+ public Set<K> getKeys(Fqn fqn)
{
InvocationContext ctx = invocationContextContainer.get();
cacheStatusCheck(ctx);
@@ -552,22 +552,22 @@
* @param fqn The fully qualified name of the node
* @return Set an unmodifiable set of children names, Object.
*/
- public <E> Set<E> getChildrenNames(Fqn<E> fqn)
+ public Set<Object> getChildrenNames(Fqn fqn)
{
InvocationContext ctx = invocationContextContainer.get();
cacheStatusCheck(ctx);
GetChildrenNamesCommand command = commandsFactory.buildGetChildrenNamesCommand(fqn);
- Set<E> retval = (Set<E>) invoker.invoke(ctx, command);
+ Set<Object> retval = (Set<Object>) invoker.invoke(ctx, command);
if (retval != null)
- retval = Collections.unmodifiableSet(new HashSet<E>(retval));
+ retval = Collections.unmodifiableSet(new HashSet<Object>(retval));
else
retval = Collections.emptySet();
return retval;
}
- public Set getChildrenNames(String fqn)
+ public Set<String> getChildrenNames(String fqn)
{
- return getChildrenNames(Fqn.fromString(fqn));
+ return (Set) getChildrenNames(Fqn.fromString(fqn));
}
public DataContainer getDataContainer()
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -85,7 +85,7 @@
return node.getLock();
}
- public void setFqn(Fqn<?> f)
+ public void setFqn(Fqn f)
{
node.setFqn(f);
}
@@ -280,7 +280,7 @@
return node.getFqn();
}
- public Node<K, V> addChild(Fqn<?> f)
+ public Node<K, V> addChild(Fqn f)
{
// TODO: Revisit. Is this really threadsafe? See comment in putIfAbsent() - same solution should be applied here too.
assertValid();
@@ -302,7 +302,7 @@
return child;
}
- public boolean removeChild(Fqn<?> f)
+ public boolean removeChild(Fqn f)
{
assertValid();
return spi.removeNode(Fqn.fromRelativeFqn(getFqn(), f));
@@ -314,7 +314,7 @@
return spi.removeNode(Fqn.fromRelativeElements(getFqn(), childName));
}
- public Node<K, V> getChild(Fqn<?> f)
+ public Node<K, V> getChild(Fqn f)
{
assertValid();
return spi.getNode(Fqn.fromRelativeFqn(getFqn(), f));
@@ -416,7 +416,7 @@
return spi.getKeys(getFqn()).size();
}
- public boolean hasChild(Fqn<?> f)
+ public boolean hasChild(Fqn f)
{
// TODO: This could be made more efficient when calls are made directly on the node
assertValid();
Modified: core/trunk/src/main/java/org/jboss/cache/loader/AbstractCacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/AbstractCacheLoader.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/loader/AbstractCacheLoader.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -143,17 +143,7 @@
public void loadState(Fqn subtree, ObjectOutputStream os) throws Exception
{
-// ClassLoader currentCL = Thread.currentThread().getContextClassLoader();
-// try
-// {
- // Set the TCCL to any classloader registered for subtree
-// setUnmarshallingClassLoader(subtree);
loadStateHelper(subtree, os);
-// }
-// finally
-// {
-// Thread.currentThread().setContextClassLoader(currentCL);
-// }
}
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/NodeData.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/NodeData.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/NodeData.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -18,7 +18,7 @@
// TODO: 3.0.0: remove Externalizable and rely on the CacheMarshaller.
public class NodeData implements Externalizable
{
- private Fqn<?> fqn = null;
+ private Fqn fqn = null;
private Map<?, ?> attrs = null;
static final long serialVersionUID = -7571995794010294485L;
@@ -27,12 +27,12 @@
{
}
- public NodeData(Fqn<?> fqn)
+ public NodeData(Fqn fqn)
{
this.fqn = fqn;
}
- public NodeData(Fqn<?> fqn, Map<?, ?> attrs, boolean mapSafe)
+ public NodeData(Fqn fqn, Map<?, ?> attrs, boolean mapSafe)
{
this.fqn = fqn;
if (mapSafe || attrs == null)
Modified: core/trunk/src/test/java/org/jboss/cache/CallbackTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/CallbackTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/CallbackTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -22,8 +22,8 @@
public class CallbackTest
{
CacheSPI<Object, Object> cache = null, cache2;
- final Fqn<String> FQN_A = Fqn.fromString("/a");
- final Fqn<String> FQN_B = Fqn.fromString("/b");
+ final Fqn FQN_A = Fqn.fromString("/a");
+ final Fqn FQN_B = Fqn.fromString("/b");
static final String KEY = "key";
static final String VALUE = "value";
@@ -142,9 +142,9 @@
public class GetListener
{
CacheSPI<Object, Object> c;
- Fqn<?> my_fqn;
+ Fqn my_fqn;
- public GetListener(CacheSPI<Object, Object> c, Fqn<?> my_fqn)
+ public GetListener(CacheSPI<Object, Object> c, Fqn my_fqn)
{
this.c = c;
this.my_fqn = my_fqn;
Modified: core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/ComparatorTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -5,6 +5,7 @@
import org.testng.annotations.Test;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -30,8 +31,8 @@
public void testNullCompare()
{
- Fqn<String> fqn1 = Fqn.fromList(new ArrayList<String>());
- Fqn<String> fqn2 = Fqn.fromList(new ArrayList<String>());
+ Fqn fqn1 = Fqn.fromList(Collections.emptyList());
+ Fqn fqn2 = Fqn.fromList(Collections.emptyList());
assertTrue(comp.compare(fqn1, fqn2) == 0);
assertTrue(comp.compare(fqn2, fqn1) == 0);
@@ -41,10 +42,10 @@
public void testOneNullCompare()
{
- Fqn<String> fqn1 = Fqn.fromList(new ArrayList<String>());
- List<String> temp = new ArrayList<String>();
+ Fqn fqn1 = Fqn.fromList(Collections.emptyList());
+ List<Object> temp = new ArrayList<Object>();
temp.add("one");
- Fqn<String> fqn2 = Fqn.fromList(temp);
+ Fqn fqn2 = Fqn.fromList(temp);
assertTrue(comp.compare(fqn1, fqn2) < 0);
assertTrue(comp.compare(fqn2, fqn1) > 0);
@@ -52,9 +53,9 @@
public void testNotComparableCompare()
{
- Fqn<String> fqn1 = Fqn.fromList(new ArrayList<String>());
+ Fqn fqn1 = Fqn.fromList(Collections.emptyList());
- List<String> temp = new ArrayList<String>();
+ List<Object> temp = new ArrayList<Object>();
temp.add("one");
Fqn fqn2 = Fqn.fromList(temp);
@@ -124,11 +125,11 @@
public void testStringIntMultidCompare()
{
- Fqn<String> fqn1 = Fqn.fromString("/one/two");
+ Fqn fqn1 = Fqn.fromString("/one/two");
List<Object> temp = new ArrayList<Object>();
temp.add(1234);
- Fqn<Object> fqn2 = Fqn.fromList(temp);
+ Fqn fqn2 = Fqn.fromList(temp);
assertTrue(comp.compare(fqn1, fqn2) > 0);
assertTrue(comp.compare(fqn2, fqn1) < 0);
@@ -140,11 +141,11 @@
public void testOrdinaryObjectCompare()
{
- Fqn<Object> fqn1 = Fqn.fromElements(new XYZ(), new ABC());
+ Fqn fqn1 = Fqn.fromElements(new XYZ(), new ABC());
Fqn fqn2 = Fqn.fromElements("XYZ", "ABC");
- Fqn<Object> fqn3 = Fqn.fromElements("XYZ", new ABC());
+ Fqn fqn3 = Fqn.fromElements("XYZ", new ABC());
- Fqn<Object> fqn4 = Fqn.fromElements("XYZ", new XYZ());
+ Fqn fqn4 = Fqn.fromElements("XYZ", new XYZ());
assertEquals(0, comp.compare(fqn1, fqn2));
assertEquals(0, comp.compare(fqn1, fqn3));
Modified: core/trunk/src/test/java/org/jboss/cache/FqnTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/FqnTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/FqnTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -61,7 +61,7 @@
public void testOne()
{
- Fqn<Integer> fqn = Fqn.fromElements(22);
+ Fqn fqn = Fqn.fromElements(22);
log("one fqn is " + fqn);
assert 1 == fqn.size();
int hcode = fqn.hashCode();
@@ -77,11 +77,11 @@
public void testFqn()
{
- Fqn<String> fqn = Fqn.fromString("/a/b/c");
+ Fqn fqn = Fqn.fromString("/a/b/c");
log("fqn is " + fqn);
assert 3 == fqn.size();
- Fqn<String> fqn2 = Fqn.fromElements("a", "b", "c");
+ Fqn fqn2 = Fqn.fromElements("a", "b", "c");
log("fqn2 is " + fqn2);
assert 3 == fqn.size();
assert fqn.equals(fqn2);
@@ -116,7 +116,7 @@
public void testHashcode2()
{
- Fqn<Integer> fqn = Fqn.fromElements(-1);
+ Fqn fqn = Fqn.fromElements(-1);
log("one fqn is " + fqn);
assert fqn.size() == 1;
int hcode = fqn.hashCode();
@@ -125,7 +125,7 @@
public void testEquals()
{
- Fqn<String> fqn1 = Fqn.fromElements("person/test");
+ Fqn fqn1 = Fqn.fromElements("person/test");
Fqn f1, f2, f3;
@@ -146,8 +146,8 @@
public void testEquals2()
{
- Fqn<String> f1;
- Fqn<String> f2;
+ Fqn f1;
+ Fqn f2;
f1 = Fqn.fromString("/a/b/c");
f2 = Fqn.fromString("/a/b/c");
assert f1.equals(f2);
@@ -161,7 +161,7 @@
public void testEquals2WithMarshalling() throws Exception
{
- Fqn<String> f1, f2;
+ Fqn f1, f2;
f1 = Fqn.fromString("/a/b/c");
f2 = marshalAndUnmarshal(f1);
assert f1.equals(f2);
@@ -170,7 +170,7 @@
public void testEquals3()
{
Fqn f1;
- Fqn<?> f2;
+ Fqn f2;
f1 = Fqn.fromElements("a", 322649, Boolean.TRUE);
f2 = Fqn.ROOT;
assert !f1.equals(f2);
@@ -194,7 +194,7 @@
assert f1.equals(f2);
assert f2.equals(f1);
- Fqn<String> f3 = Fqn.fromString("a/322649/TRUE");
+ Fqn f3 = Fqn.fromString("a/322649/TRUE");
f3 = marshalAndUnmarshal(f3);
assert !f1.equals(f3);
@@ -209,7 +209,7 @@
public void testEquals4()
{
- Fqn<String> fqn = Fqn.fromString("X");
+ Fqn fqn = Fqn.fromString("X");
// Check casting
assert !fqn.equals("X");
// Check null
@@ -218,7 +218,7 @@
public void testNullElements() throws CloneNotSupportedException
{
- Fqn<Object> fqn0 = Fqn.fromElements((Object) null);
+ Fqn fqn0 = Fqn.fromElements((Object) null);
assert 1 == fqn0.size();
Fqn fqn1 = Fqn.fromElements("NULL", null, 0);
@@ -231,13 +231,13 @@
public void testIteration()
{
- Fqn<String> fqn = Fqn.fromString("/a/b/c");
+ Fqn fqn = Fqn.fromString("/a/b/c");
assert 3 == fqn.size();
- Fqn<Object> tmp_fqn = Fqn.ROOT;
+ Fqn tmp_fqn = Fqn.ROOT;
assert 0 == tmp_fqn.size();
for (int i = 0; i < fqn.size(); i++)
{
- String s = fqn.get(i);
+ String s = (String) fqn.get(i);
tmp_fqn = Fqn.fromRelativeElements(tmp_fqn, s);
assert tmp_fqn.size() == i + 1;
}
@@ -247,8 +247,8 @@
public void testIsChildOf()
{
- Fqn<String> child = Fqn.fromString("/a/b");
- Fqn<String> parent = Fqn.fromString("/a");
+ Fqn child = Fqn.fromString("/a/b");
+ Fqn parent = Fqn.fromString("/a");
assert child.isChildOf(parent);
assert !parent.isChildOf(child);
assert child.isChildOrEquals(child);
@@ -260,27 +260,27 @@
public void testIsChildOf2()
{
- Fqn<String> child = Fqn.fromString("/a/b/c/d");
+ Fqn child = Fqn.fromString("/a/b/c/d");
assert "/b/c/d".equals(child.getSubFqn(1, child.size()).toString());
}
public void testParentage()
{
- Fqn<String> fqnRoot = Fqn.ROOT;
- Fqn<String> parent = fqnRoot.getParent();
+ Fqn fqnRoot = Fqn.ROOT;
+ Fqn parent = fqnRoot.getParent();
assert parent.equals(fqnRoot);
- Fqn<String> fqnOne = Fqn.fromString("/one");
+ Fqn fqnOne = Fqn.fromString("/one");
parent = fqnOne.getParent();
assert parent.equals(fqnRoot);
assert fqnOne.isChildOf(parent);
- Fqn<String> fqnTwo = Fqn.fromString("/one/two");
+ Fqn fqnTwo = Fqn.fromString("/one/two");
parent = fqnTwo.getParent();
assert parent.equals(fqnOne);
assert fqnTwo.isChildOf(parent);
- Fqn<String> fqnThree = Fqn.fromString("/one/two/three");
+ Fqn fqnThree = Fqn.fromString("/one/two/three");
parent = fqnThree.getParent();
assert parent.equals(fqnTwo);
assert fqnThree.isChildOf(parent);
@@ -289,7 +289,7 @@
public void testRoot()
{
- Fqn<String> fqn = Fqn.ROOT;
+ Fqn fqn = Fqn.ROOT;
assert fqn.isRoot();
fqn = Fqn.fromString("/one/two");
@@ -303,11 +303,11 @@
public void testGetName()
{
- Fqn<Integer> integerFqn = Fqn.fromElements(1);
+ Fqn integerFqn = Fqn.fromElements(1);
assert "1".equals(integerFqn.getLastElementAsString());
Object object = new Object();
- Fqn<Object> objectFqn = Fqn.fromElements(object);
+ Fqn objectFqn = Fqn.fromElements(object);
assert object.toString().equals(objectFqn.getLastElementAsString());
}
@@ -330,8 +330,7 @@
assert !cache.getRoot().hasChild(f);
}
- @SuppressWarnings("unchecked")
- <T> Fqn<T> marshalAndUnmarshal(Fqn<T> fqn) throws Exception
+ Fqn marshalAndUnmarshal(Fqn fqn) throws Exception
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream(baos);
@@ -339,25 +338,11 @@
out.close();
baos.close();
ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
- return (Fqn<T>) marshaller.objectFromObjectStream(in);
+ return (Fqn) marshaller.objectFromObjectStream(in);
}
// testing generics
- public void testGenerics()
- {
- Fqn<String> f = Fqn.fromString("/blah/blah");
- Fqn<String> f2 = Fqn.fromString("/blah/blah");
-
- assert f.equals(f2);
-
- Fqn<Integer> f3 = Fqn.fromElements(1, 2, 3, 5);
-
- Fqn<Integer> f4 = Fqn.fromElements(1, 2, 3);
-
- assert f3.getParent().equals(f4);
- }
-
public void testSize()
{
Fqn f = Fqn.ROOT;
@@ -373,27 +358,9 @@
assert !f.isRoot();
}
-// public void testIntermediateFqns()
-// {
-// Fqn lastCreated = Fqn.fromString("/a/b");
-// Fqn target = Fqn.fromString("/a/b/c/d/e/f");
-//
-// List<Fqn> intermediates = new ArrayList<Fqn>();
-// intermediates.add(Fqn.fromString("/a/b/c"));
-// intermediates.add(Fqn.fromString("/a/b/c/d"));
-// intermediates.add(Fqn.fromString("/a/b/c/d/e"));
-//
-// System.out.println("Expecting " + intermediates);
-// System.out.println("Was: " + target.getIntermediateFqns(lastCreated));
-//
-// assert target.getIntermediateFqns(lastCreated).equals(intermediates);
-// }
-
- //
-
public void testGenerations()
{
- Fqn<Integer> f = Fqn.fromElements(1, 2, 3, 4, 5, 6, 7);
+ Fqn f = Fqn.fromElements(1, 2, 3, 4, 5, 6, 7);
assert f.equals(f.getAncestor(f.size()));
assert f.getParent().equals(f.getAncestor(f.size() - 1));
@@ -457,10 +424,9 @@
fqns[i++] = Fqn.fromString("/a/b/c");
fqns[i++] = Fqn.fromRelativeElements(Fqn.ROOT, "a", "b", "c");
fqns[i++] = Fqn.fromElements("a", "b", "c");
- fqns[i++] = Fqn.fromList(Arrays.asList(new String[]{"a", "b", "c"}));
- fqns[i++] = Fqn.fromRelativeList(Fqn.ROOT, Arrays.asList(new String[]{"a", "b", "c"}));
- fqns[i++] = Fqn.fromRelativeFqn(Fqn.ROOT, Fqn.fromString("/a/b/c"));
- fqns[i] = new Fqn("a", "b", "c"); // "old-style" Fqn
+ fqns[i++] = Fqn.fromList(Arrays.asList(new Object[]{"a", "b", "c"}));
+ fqns[i++] = Fqn.fromRelativeList(Fqn.ROOT, Arrays.asList(new Object[]{"a", "b", "c"}));
+ fqns[i] = Fqn.fromRelativeFqn(Fqn.ROOT, Fqn.fromString("/a/b/c"));
// all of the above should be equal to each other.
for (i = 0; i < fqns.length; i++)
Modified: core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/api/CacheAPITest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -134,7 +134,7 @@
*/
public void testConvenienceMethods()
{
- Fqn<String> fqn = Fqn.fromString("/test/fqn");
+ Fqn fqn = Fqn.fromString("/test/fqn");
String key = "key", value = "value";
Map<String, String> data = new HashMap<String, String>();
data.put(key, value);
@@ -161,7 +161,7 @@
public void testNodeConvenienceNodeRemoval()
{
// this fqn is relative, but since it is from the root it may as well be absolute
- Fqn<String> fqn = Fqn.fromString("/test/fqn");
+ Fqn fqn = Fqn.fromString("/test/fqn");
cache.getRoot().addChild(fqn);
assertTrue(cache.getRoot().hasChild(fqn));
@@ -180,7 +180,7 @@
System.out.println("Cache: " + CachePrinter.printCacheDetails(cache));
// Check that it's removed if it has a child
- Fqn<String> child = Fqn.fromString("/test/fqn/child");
+ Fqn child = Fqn.fromString("/test/fqn/child");
cache.getRoot().addChild(child);
assertTrue(cache.getRoot().hasChild(child));
@@ -194,8 +194,8 @@
*/
public void testEvict()
{
- Fqn<String> one = Fqn.fromString("/one");
- Fqn<String> two = Fqn.fromString("/one/two");
+ Fqn one = Fqn.fromString("/one");
+ Fqn two = Fqn.fromString("/one/two");
String key = "key", value = "value";
cache.getRoot().addChild(one).put(key, value);
@@ -234,8 +234,8 @@
*/
public void testEvictRecursive()
{
- Fqn<String> one = Fqn.fromString("/one");
- Fqn<String> two = Fqn.fromString("/one/two");
+ Fqn one = Fqn.fromString("/one");
+ Fqn two = Fqn.fromString("/one/two");
String key = "key", value = "value";
cache.getRoot().addChild(one).put(key, value);
Modified: core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/api/DeletedChildResurrectionTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -26,9 +26,9 @@
public class DeletedChildResurrectionTest
{
private CacheSPI<Object, Object> cache;
- private static final Fqn<String> A_B = Fqn.fromString("/a/b");
- private static final Fqn<String> A = Fqn.fromString("/a");
- private static final Fqn<String> A_C = Fqn.fromString("/a/c");
+ private static final Fqn A_B = Fqn.fromString("/a/b");
+ private static final Fqn A = Fqn.fromString("/a");
+ private static final Fqn A_C = Fqn.fromString("/a/c");
private static final String KEY = "key";
private static final String VALUE = "value";
private static final String K2 = "k2";
Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -40,9 +40,9 @@
private TransactionManager tm;
- protected static final Fqn<String> A = Fqn.fromString("/a"), B = Fqn.fromString("/b"), C = Fqn.fromString("/c"), D = Fqn
+ protected static final Fqn A = Fqn.fromString("/a"), B = Fqn.fromString("/b"), C = Fqn.fromString("/c"), D = Fqn
.fromString("/d");
- protected Fqn<Object> A_B = Fqn.fromRelativeFqn(A, B);
+ protected Fqn A_B = Fqn.fromRelativeFqn(A, B);
protected Fqn A_C = Fqn.fromRelativeFqn(A, C);
@BeforeMethod(alwaysRun = true)
@@ -257,7 +257,7 @@
public void testDefensiveCopyOfChildren()
{
- Fqn<String> childFqn = Fqn.fromString("/child");
+ Fqn childFqn = Fqn.fromString("/child");
rootNode.addChild(childFqn).put("k", "v");
Set<Node<Object, Object>> children = rootNode.getChildren();
Set<Object> childrenNames = rootNode.getChildrenNames();
@@ -397,7 +397,7 @@
rootNode.addChild(A).put("k", "v");
rootNode.addChild(B).put("k", "v");
- Set<String> childrenNames = new HashSet<String>();
+ Set<Object> childrenNames = new HashSet<Object>();
childrenNames.add(A.getLastElement());
childrenNames.add(B.getLastElement());
Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -39,7 +39,7 @@
protected Node<Object, Object> rootNode, nodeA, nodeB, nodeC, nodeD, nodeE;
protected CacheSPI<Object, Object> cache;
protected TransactionManager tm;
- protected static final Fqn<String> A = Fqn.fromString("/a"), B = Fqn.fromString("/b"), C = Fqn.fromString("/c"), D = Fqn.fromString("/d"), E = Fqn.fromString("/e");
+ protected static final Fqn A = Fqn.fromString("/a"), B = Fqn.fromString("/b"), C = Fqn.fromString("/c"), D = Fqn.fromString("/d"), E = Fqn.fromString("/e");
protected Object k = "key", vA = "valueA", vB = "valueB", vC = "valueC", vD = "valueD", vE = "valueE";
protected NodeLockingScheme nodeLockingScheme = NodeLockingScheme.PESSIMISTIC;
@@ -429,7 +429,7 @@
// N threads constantly move /x and /y around to hang off either /a ~ /e randomly.
- final Fqn<String> FQN_A = A, FQN_B = B, FQN_C = C, FQN_D = D, FQN_E = E, FQN_X = Fqn.fromString("/x"), FQN_Y = Fqn.fromString("/y");
+ final Fqn FQN_A = A, FQN_B = B, FQN_C = C, FQN_D = D, FQN_E = E, FQN_X = Fqn.fromString("/x"), FQN_Y = Fqn.fromString("/y");
// set up the initial structure.
final Node[] NODES = {
@@ -529,7 +529,7 @@
public void testMoveInSamePlace()
{
- final Fqn<String> FQN_X = Fqn.fromString("/x");
+ final Fqn FQN_X = Fqn.fromString("/x");
// set up the initial structure.
Node aNode = rootNode.addChild(A);
Node xNode = aNode.addChild(FQN_X);
Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeReplicatedMoveTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -31,7 +31,7 @@
protected CacheSPI<Object, Object> cache1;
protected CacheSPI<Object, Object> cache2;
protected TransactionManager tm;
- protected static final Fqn<String> A = Fqn.fromString("/a"), B = Fqn.fromString("/b"), C = Fqn.fromString("/c"), D = Fqn.fromString("/d"), E = Fqn.fromString("/e");
+ protected static final Fqn A = Fqn.fromString("/a"), B = Fqn.fromString("/b"), C = Fqn.fromString("/c"), D = Fqn.fromString("/d"), E = Fqn.fromString("/e");
protected Object k = "key", vA = "valueA", vB = "valueB", vC = "valueC", vD = "valueD", vE = "valueE";
protected NodeLockingScheme nodeLockingScheme = NodeLockingScheme.PESSIMISTIC;
Modified: core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/api/SyncReplTxTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -126,7 +126,7 @@
assertClusterSize("Should only be 2 caches in the cluster!!!", 2);
assertInvocationContextInitState();
- Fqn<String> f = Fqn.fromString("/test/data");
+ Fqn f = Fqn.fromString("/test/data");
String k = "key", v = "value";
assertNull("Should be null", caches.get(0).getRoot().getChild(f));
Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -43,8 +43,8 @@
protected TransactionManager tm1, tm2;
- protected Fqn<String> fqn = Fqn.fromString("/one/two");
- protected Fqn<String> parentFqn = fqn.getParent();
+ protected Fqn fqn = Fqn.fromString("/one/two");
+ protected Fqn parentFqn = fqn.getParent();
protected String key = "k", value = "v", value2 = "v2";
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyAssignmentStateTransferTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -82,7 +82,7 @@
caches = new ArrayList<CacheSPI<Object, Object>>();
caches.add(createCache(1, "TEST", false, true));
- Fqn<String> main = Fqn.fromString("/a/b/c");
+ Fqn main = Fqn.fromString("/a/b/c");
caches.get(0).put(main, "name", "Joe");
CountDownLatch latch = new CountDownLatch(1);
@@ -90,7 +90,7 @@
assert latch.await(getSleepTimeout(), TimeUnit.MILLISECONDS) : "Buddy groups not formed after " + getSleepTimeout() + " millis!";
- Fqn<String> test = fqnTransformer.getBackupFqn(caches.get(0).getLocalAddress(), main);
+ Fqn test = fqnTransformer.getBackupFqn(caches.get(0).getLocalAddress(), main);
assertEquals("State not transferred", "Joe", caches.get(1).get(test, "name"));
@@ -199,7 +199,7 @@
caches.get(0).create();
caches.get(0).addCacheListener(new BuddyJoinedListener(latch));
caches.get(0).start();
- Fqn<String> main = Fqn.fromString("/a/b/c");
+ Fqn main = Fqn.fromString("/a/b/c");
caches.get(0).put(main, "name", "Joe");
caches.add(createCacheWithCacheLoader(false, false, false, true, false));
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -15,8 +15,8 @@
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Configuration.CacheMode;
import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.util.CachePrinter;
import org.jboss.cache.util.TestingUtil;
-import org.jboss.cache.util.CachePrinter;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -34,8 +34,8 @@
@Test(groups = "functional")
public class BuddyBackupActivationInactivationTest extends BuddyReplicationTestsBase
{
- public static final Fqn<String> A = Fqn.fromString("/a");
- public static final Fqn<String> A_B = Fqn.fromString("/a/b");
+ public static final Fqn A = Fqn.fromString("/a");
+ public static final Fqn A_B = Fqn.fromString("/a/b");
public static final String JOE = "JOE";
protected Map<String, Cache> caches;
@@ -82,7 +82,7 @@
TestingUtil.blockUntilViewsReceived(VIEW_BLOCK_TIMEOUT, cache1, cache2);
Fqn backupFqn = fqnTransformer.getBackupFqn(cache1.getLocalAddress(), A_B);
- Fqn<String> A = Fqn.fromString("/a");
+ Fqn A = Fqn.fromString("/a");
Region regionA = cache1.getRegion(A, true);
regionA.registerContextClassLoader(getClass().getClassLoader());
@@ -104,7 +104,7 @@
public void testBuddyBackupInactivation() throws Exception
{
CacheSPI cache1 = createCache("cache1", true, true, true);
- Fqn<String> A = Fqn.fromString("/a");
+ Fqn A = Fqn.fromString("/a");
Region regionA = cache1.getRegion(A, true);
regionA.registerContextClassLoader(getClass().getClassLoader());
regionA.activate();
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -219,7 +219,7 @@
public void testGetActualFqn()
{
BuddyFqnTransformer fqnTransformer = new BuddyFqnTransformer();
- Fqn<String> x = Fqn.fromString("/x");
+ Fqn x = Fqn.fromString("/x");
Fqn backup = fqnTransformer.getBackupFqn("y", x);
assertEquals(x, fqnTransformer.getActualFqn(backup));
}
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationFailoverTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationFailoverTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationFailoverTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -185,11 +185,11 @@
{
caches = createCaches(3, false, true, optimisticLocks);
- Fqn<String> fqn = Fqn.fromString("/test");
- Fqn<String> fqn2 = Fqn.fromString("/test/subtree");
+ Fqn fqn = Fqn.fromString("/test");
+ Fqn fqn2 = Fqn.fromString("/test/subtree");
- Fqn<String> backupFqn = fqnTransformer.getBackupFqn(caches.get(0).getLocalAddress(), fqn);
- Fqn<String> backupFqn2 = fqnTransformer.getBackupFqn(caches.get(0).getLocalAddress(), fqn2);
+ Fqn backupFqn = fqnTransformer.getBackupFqn(caches.get(0).getLocalAddress(), fqn);
+ Fqn backupFqn2 = fqnTransformer.getBackupFqn(caches.get(0).getLocalAddress(), fqn2);
caches.get(0).put(fqn, key, value);
caches.get(0).put(fqn2, key, value);
@@ -215,8 +215,8 @@
caches.get(2).getNode(fqn); // expect entire subtree to gravitate.
delay(); // cleanup commands are async
- Fqn<String> newBackupFqn = fqnTransformer.getBackupFqn(caches.get(2).getLocalAddress(), fqn);
- Fqn<String> newBackupFqn2 = fqnTransformer.getBackupFqn(caches.get(2).getLocalAddress(), fqn2);
+ Fqn newBackupFqn = fqnTransformer.getBackupFqn(caches.get(2).getLocalAddress(), fqn);
+ Fqn newBackupFqn2 = fqnTransformer.getBackupFqn(caches.get(2).getLocalAddress(), fqn2);
assertEquals(value, caches.get(2).get(fqn, key));
assertTrue(caches.get(2).exists(fqn2));
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationWithCacheLoaderTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -10,12 +10,12 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
-import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.EvictionRegionConfig;
import org.jboss.cache.eviction.LRUConfiguration;
import org.jboss.cache.loader.CacheLoader;
+import org.jboss.cache.util.TestingUtil;
import static org.jboss.cache.util.TestingUtil.dumpCacheContents;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
@@ -34,7 +34,7 @@
public class BuddyReplicationWithCacheLoaderTest extends BuddyReplicationTestsBase
{
- protected Fqn<String> fqn = Fqn.fromString("/test/br/four/level");
+ protected Fqn fqn = Fqn.fromString("/test/br/four/level");
protected String key = "key";
protected String value = "value";
protected boolean passivation = false;
Modified: core/trunk/src/test/java/org/jboss/cache/config/ChannelInjectionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/ChannelInjectionTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/config/ChannelInjectionTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -57,7 +57,7 @@
TestingUtil.blockUntilViewsReceived(new Cache[]{cache1, cache2}, 10000);
- Fqn<String> fqn = Fqn.fromString("/a");
+ Fqn fqn = Fqn.fromString("/a");
cache1.put(fqn, "key", "value");
assertEquals("Value replicated", "value", cache2.get(fqn, "key"));
}
Modified: core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -50,6 +50,7 @@
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedList;
@@ -595,9 +596,9 @@
private Node getNode(Object[] path)
{
- Fqn<String> fqnToPath;
- if (path.length == 0) fqnToPath = Fqn.ROOT;
- List<String> elements = convertMyNodeArrayToStringArray(path);
+ Fqn fqnToPath;
+ if (path.length == 0) fqnToPath = Fqn.root();
+ List<Object> elements = Arrays.asList(path);
fqnToPath = Fqn.fromList(elements);
if (root.hasChild(fqnToPath))
{
@@ -610,17 +611,6 @@
}
}
- private List<String> convertMyNodeArrayToStringArray(Object[] path)
- {
- List<String> list = new LinkedList<String>();
- for (Object o : path)
- {
- JBossCacheGUI.DisplayNode n = (JBossCacheGUI.DisplayNode) o;
- if (!n.name.equals(Fqn.SEPARATOR)) list.add(n.name);
- }
- return list;
- }
-
protected void clearTable()
{
int num_rows = table.getRowCount();
@@ -741,7 +731,7 @@
}
}
- private void load(Fqn<String> fqn)
+ private void load(Fqn fqn)
{
try
{
@@ -1153,19 +1143,19 @@
* Adds a new node to the view. Intermediary nodes will be created if they don't yet exist.
* Returns the first node that was created or null if node already existed
*/
- public JBossCacheGUI.DisplayNode add(Fqn<String> fqn)
+ public JBossCacheGUI.DisplayNode add(Fqn fqn)
{
JBossCacheGUI.DisplayNode curr, n, ret = null;
if (fqn == null) return null;
curr = this;
- for (String child_name : fqn.peekElements())
+ for (Object childName : fqn.peekElements())
{
- n = curr.findChild(child_name);
+ n = curr.findChild((String) childName);
if (n == null)
{
- n = new JBossCacheGUI.DisplayNode(child_name);
+ n = new JBossCacheGUI.DisplayNode((String) childName);
if (ret == null) ret = n;
curr.add(n);
}
@@ -1184,16 +1174,16 @@
}
- private JBossCacheGUI.DisplayNode findNode(Fqn<String> fqn)
+ private JBossCacheGUI.DisplayNode findNode(Fqn fqn)
{
JBossCacheGUI.DisplayNode curr, n;
if (fqn == null) return null;
curr = this;
- for (String child_name : fqn.peekElements())
+ for (Object childName : fqn.peekElements())
{
- n = curr.findChild(child_name);
+ n = curr.findChild((String) childName);
if (n == null)
{
return null;
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/BaseEvictionAlgorithmTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/BaseEvictionAlgorithmTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/BaseEvictionAlgorithmTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -75,7 +75,7 @@
for (int i = 0; i < (recycleQueueCapacity + 1); i++)
{
- Fqn<String> fqn = Fqn.fromString("/a/b/c/" + Integer.toString(i + 1));
+ Fqn fqn = Fqn.fromString("/a/b/c/" + Integer.toString(i + 1));
region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ConcurrentEvictionTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -107,7 +107,7 @@
public void testConcurrentEviction() throws Exception
{
- Fqn<String> base = Fqn.fromString("/org/jboss/test/data/concurrent/eviction");
+ Fqn base = Fqn.fromString("/org/jboss/test/data/concurrent/eviction");
// Create a bunch of nodes; more than the /org/jboss/test/data
// region's maxNodes so we know eviction will kick in
@@ -123,7 +123,7 @@
// If any get returns null, that's a failure
for (int i = 0; i < 1000; i++)
{
- Fqn<Object> fqn = Fqn.fromRelativeElements(base, i / 100);
+ Fqn fqn = Fqn.fromRelativeElements(base, i / 100);
Integer key = i;
assertNotNull("found value under Fqn " + fqn + " and key " + key,
cache_.get(fqn, key));
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -1,13 +1,17 @@
package org.jboss.cache.eviction;
-import org.jboss.cache.*;
-import org.jboss.cache.util.TestingUtil;
+import org.jboss.cache.Cache;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.EvictionRegionConfig;
import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
import org.jboss.cache.lock.IsolationLevel;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -210,7 +214,7 @@
// Add a parent, then a child. LRU will evict the parent,
// then the child, leaving behind an empty parent
- Fqn<String> parent = Fqn.fromString(rootStr + "parent");
+ Fqn parent = Fqn.fromString(rootStr + "parent");
cache.put(parent, "key", "value");
cache.put(Fqn.fromRelativeElements(parent, "child"), "key", "value");
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -156,7 +156,7 @@
// Add a parent, then a child. LRU will evict the parent,
// then the child, leaving behind an empty parent
- Fqn<String> parent = Fqn.fromString(rootStr + "parent");
+ Fqn parent = Fqn.fromString(rootStr + "parent");
cache.put(parent, "key", "value");
cache.put(Fqn.fromRelativeElements(parent, "child"), "key", "value");
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -31,8 +31,6 @@
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.EvictionRegionConfig;
-import org.jboss.cache.config.parsing.XmlConfigurationParser;
-import org.jboss.cache.config.parsing.XmlConfigHelper;
import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.util.TestingUtil;
@@ -40,7 +38,6 @@
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import org.w3c.dom.Element;
/**
* Unit tests for programmatic configuration of LRU policy
@@ -92,7 +89,7 @@
lruConfig.setMaxNodes(1000);
lruConfig.setTimeToLive(4000);
EvictionRegionConfig regConfig = new EvictionRegionConfig(Fqn.fromString("/dummy"), lruConfig);
-
+
RegionManager regionManager = cache.getRegionManager();
EvictionConfig topConfig = cache.getConfiguration().getEvictionConfig();
regionManager.setEvictionConfig(topConfig);
@@ -108,7 +105,7 @@
for (int i = 0; i < 10; i++)
{
String str = rootStr + i;
- Fqn<String> fqn = Fqn.fromString(str);
+ Fqn fqn = Fqn.fromString(str);
cache.put(fqn, str, str);
}
@@ -184,14 +181,13 @@
addObjectBasedRegion();
Integer ii = 1;
- Fqn<Integer> rootfqn = Fqn.fromElements(ii);
+ Fqn rootfqn = Fqn.fromElements(ii);
for (int i = 0; i < 10; i++)
{
- Integer in = i;
- Fqn<Object> fqn = Fqn.fromRelativeElements(rootfqn, in);
+ Fqn fqn = Fqn.fromRelativeElements(rootfqn, i);
try
{
- cache.put(fqn, in, in);
+ cache.put(fqn, i, i);
}
catch (Exception e)
{
@@ -203,7 +199,7 @@
try
{
Integer in = 3;
- Fqn<Object> fqn = Fqn.fromRelativeElements(rootfqn, in);
+ Fqn fqn = Fqn.fromRelativeElements(rootfqn, in);
Object val = cache.get(fqn, in);
assertNotNull("DataNode should be empty ", val);
}
@@ -219,7 +215,7 @@
try
{
Integer in = 3;
- Fqn<Object> fqn = Fqn.fromRelativeElements(rootfqn, in);
+ Fqn fqn = Fqn.fromRelativeElements(rootfqn, in);
Object val = cache.get(fqn, in);
assertNull("DataNode should be empty ", val);
}
Modified: core/trunk/src/test/java/org/jboss/cache/integration/hibernate/HibernateIntegrationTestUtil.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/integration/hibernate/HibernateIntegrationTestUtil.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/integration/hibernate/HibernateIntegrationTestUtil.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -31,8 +31,8 @@
*/
public class HibernateIntegrationTestUtil
{
- public static final Fqn<String> TS_BASE_FQN = Fqn.fromString("/TS");
- public static final Fqn<String> REGION_PREFIX_FQN = Fqn.fromString("/test");
+ public static final Fqn TS_BASE_FQN = Fqn.fromString("/TS");
+ public static final Fqn REGION_PREFIX_FQN = Fqn.fromString("/test");
public static final Fqn TS_FQN = Fqn.fromRelativeFqn(TS_BASE_FQN, Fqn.fromRelativeFqn(REGION_PREFIX_FQN, Fqn.fromString("/org/hibernate/cache/UpdateTimestampsCache")));
public static final String ITEM = "item";
Modified: core/trunk/src/test/java/org/jboss/cache/integration/hibernate/UpdateTimestampsCachingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/integration/hibernate/UpdateTimestampsCachingTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/integration/hibernate/UpdateTimestampsCachingTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -34,7 +34,7 @@
{
private static final Log log = LogFactory.getLog(UpdateTimestampsCachingTest.class);
- private static final Fqn<String> ENTITY_TYPE_FQN = Fqn.fromString("/com/foo/MyEntity");
+ private static final Fqn ENTITY_TYPE_FQN = Fqn.fromString("/com/foo/MyEntity");
private Set<Cache<String, Object>> caches;
@@ -100,11 +100,11 @@
private class UpdateTimestampsSynchronization implements Synchronization
{
private final Cache<String, Object> cache;
- private final Fqn<String> entityType;
+ private final Fqn entityType;
private final TransactionManager tm;
private Long timestamp;
- UpdateTimestampsSynchronization(Fqn<String> entityType, Cache<String, Object> cache, TransactionManager tm)
+ UpdateTimestampsSynchronization(Fqn entityType, Cache<String, Object> cache, TransactionManager tm)
{
this.entityType = entityType;
this.cache = cache;
Modified: core/trunk/src/test/java/org/jboss/cache/interceptors/EvictionInterceptorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/interceptors/EvictionInterceptorTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/interceptors/EvictionInterceptorTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -324,7 +324,7 @@
for (int i = 0; i < 100; i++)
{
- PutKeyValueCommand pkvCommand = commandsFactory.buildPutKeyValueCommand(null, (Fqn<?>) fqn, i, "value");
+ PutKeyValueCommand pkvCommand = commandsFactory.buildPutKeyValueCommand(null, (Fqn) fqn, i, "value");
invoker.invoke(pkvCommand);
assertEquals("value", cache.peek(fqn, false, false).getDirect(i));
@@ -387,7 +387,7 @@
Object key = "key";
Object value = "value";
- PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(null, (Fqn<?>) fqn, key, value);
+ PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(null, (Fqn) fqn, key, value);
invoker.invoke(command);
assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
EvictedEventNode event = region.takeLastEventNode();
@@ -397,7 +397,7 @@
assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
assertNull(region.takeLastEventNode());
- command = commandsFactory.buildPutKeyValueCommand(null, (Fqn<?>) fqn, key, value);
+ command = commandsFactory.buildPutKeyValueCommand(null, (Fqn) fqn, key, value);
invoker.invoke(command);
assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
event = region.takeLastEventNode();
@@ -508,7 +508,7 @@
Object key = "key";
Object value = "value";
- PutKeyValueCommand putKeyValueCommand = commandsFactory.buildPutKeyValueCommand(null, (Fqn<?>) fqn, key, value);
+ PutKeyValueCommand putKeyValueCommand = commandsFactory.buildPutKeyValueCommand(null, (Fqn) fqn, key, value);
invoker.invoke(putKeyValueCommand);
assertEquals("value", cache.peek(fqn, false, false).getDirect(key));
event = region.takeLastEventNode();
Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/invalidation/InvalidationInterceptorTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -13,12 +13,12 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
import org.jboss.cache.NodeSPI;
+import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import org.jboss.cache.optimistic.DefaultDataVersion;
import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.util.internals.ReplicationListener;
-import org.jboss.cache.config.CacheLoaderConfig;
-import org.jboss.cache.config.Configuration;
-import org.jboss.cache.optimistic.DefaultDataVersion;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -372,7 +372,7 @@
Node root2 = cache2.getRoot();
// this fqn is relative, but since it is from the root it may as well be absolute
- Fqn<String> fqn = Fqn.fromString("/test/fqn");
+ Fqn fqn = Fqn.fromString("/test/fqn");
cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
cache1.put(fqn, "key", "value");
assertEquals("value", cache1.get(fqn, "key"));
@@ -386,7 +386,7 @@
checkRemoteNodeIsRemoved(remoteNode);
assertEquals(false, cache1.removeNode(fqn));
- Fqn<String> child = Fqn.fromString("/test/fqn/child");
+ Fqn child = Fqn.fromString("/test/fqn/child");
cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
cache1.put(child, "key", "value");
assertEquals("value", cache1.get(child, "key"));
@@ -430,7 +430,7 @@
cache2 = createCache(optimistic);
// this fqn is relative, but since it is from the root it may as well be absolute
- Fqn<String> fqn = Fqn.fromString("/test/fqn1");
+ Fqn fqn = Fqn.fromString("/test/fqn1");
cache1.put(fqn, "key", "value");
assertEquals("value", cache1.get(fqn, "key"));
assertEquals(null, cache2.get(fqn, "key"));
@@ -515,7 +515,7 @@
Node root2 = cache2.getRoot();
// this fqn is relative, but since it is from the root it may as well be absolute
- Fqn<String> fqn = Fqn.fromString("/test/fqn");
+ Fqn fqn = Fqn.fromString("/test/fqn");
cache1.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
root1.addChild(fqn);
assertEquals(true, root1.hasChild(fqn));
@@ -905,8 +905,8 @@
protected CacheLoaderConfig getCacheLoaderConfig() throws Exception
{
- return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "",
- "org.jboss.cache.loader.DummySharedInMemoryCacheLoader", "", false, false, false, false, false);
+ return UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig(false, "",
+ "org.jboss.cache.loader.DummySharedInMemoryCacheLoader", "", false, false, false, false, false);
}
protected void assertHasBeenInvalidated(Node n, String message)
Modified: core/trunk/src/test/java/org/jboss/cache/loader/BdbjeTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/BdbjeTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/loader/BdbjeTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -43,7 +43,7 @@
private static final int STREAM_HEADER_LENGTH = 4;
private static final String envHome = ".";
- private static final Fqn<String> FQN = Fqn.fromString("/key");
+ private static final Fqn FQN = Fqn.fromString("/key");
private CacheSPI cache;
private CacheLoader loader;
@@ -231,9 +231,9 @@
os.close();
/* Add three FQNs, middle FQN last. */
- Fqn<String> k1 = Fqn.fromString("/key1");
- Fqn<String> k2 = Fqn.fromString("/key2");
- Fqn<String> k3 = Fqn.fromString("/key3");
+ Fqn k1 = Fqn.fromString("/key1");
+ Fqn k2 = Fqn.fromString("/key2");
+ Fqn k3 = Fqn.fromString("/key3");
doPutTests(k1);
doPutTests(k3);
@@ -261,7 +261,7 @@
/**
* Do basic put tests for a given FQN.
*/
- private void doPutTests(Fqn<String> fqn)
+ private void doPutTests(Fqn fqn)
throws Exception
{
@@ -301,7 +301,7 @@
/**
* Do basic remove tests for a given FQN.
*/
- private void doRemoveTests(Fqn<String> fqn)
+ private void doRemoveTests(Fqn fqn)
throws Exception
{
@@ -552,7 +552,7 @@
/**
* Checks that the given list of children part names is returned.
*/
- private void checkChildren(Fqn<String> fqn, String[] names)
+ private void checkChildren(Fqn fqn, String[] names)
throws Exception
{
Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -48,7 +48,7 @@
private static final Log log = LogFactory.getLog(CacheLoaderTestsBase.class);
protected CacheSPI<Object, Object> cache;
CacheLoader loader = null;
- static final Fqn<String> FQN = Fqn.fromString("/key");
+ static final Fqn FQN = Fqn.fromString("/key");
private static final Fqn SUBTREE_FQN = Fqn.fromRelativeElements(FQN, "subtree");
private static final Fqn BUDDY_BASE = Fqn.fromRelativeElements(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, "test");
@@ -508,7 +508,7 @@
{
cache.put("/a/b/c", null);
}
- Set children = cache.getChildrenNames((Fqn<String>) null);
+ Set children = cache.getChildrenNames((Fqn) null);
assertTrue(children.isEmpty());
}
catch (Exception e)
Modified: core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/loader/ClusteredCacheLoaderTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -12,9 +12,9 @@
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.Region;
-import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.lock.TimeoutException;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -39,7 +39,7 @@
private static Log log = LogFactory.getLog(ClusteredCacheLoaderTest.class);
private CacheSPI<Object, Object> cache1, cache2;
private CacheLoader loader1, loader2;
- private Fqn<String> fqn = Fqn.fromString("/a");
+ private Fqn fqn = Fqn.fromString("/a");
private String key = "key";
protected boolean useRegionBasedMarshalling = false;
Modified: core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheServerTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -1,22 +1,19 @@
package org.jboss.cache.loader;
-import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.*;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
-import org.jboss.cache.util.TestingUtil;
import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration;
-import org.jboss.cache.config.parsing.XmlConfigurationParser;
-import org.jboss.cache.config.parsing.XmlConfigHelper;
import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
+import static org.jboss.cache.factories.UnitTestCacheConfigurationFactory.buildSingleCacheLoaderConfig;
import org.jboss.cache.jmx.CacheJmxWrapper;
import org.jboss.cache.loader.tcp.TcpCacheServer;
+import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
-import org.w3c.dom.Element;
import java.net.UnknownHostException;
@@ -169,7 +166,7 @@
private void usabilityCheck() throws Exception
{
- Fqn<String> fqn = Fqn.fromString("/key");
+ Fqn fqn = Fqn.fromString("/key");
assertFalse("Fqn does not exist in loader", loader.exists(fqn));
/* put(Fqn,Object,Object) and get(Fqn,Object) */
Modified: core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/loader/TxCacheLoaderTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -3,8 +3,8 @@
import org.jboss.cache.CacheSPI;
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
+import org.jboss.cache.transaction.TransactionSetup;
import org.jboss.cache.util.TestingUtil;
-import org.jboss.cache.transaction.TransactionSetup;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -24,7 +24,7 @@
public class TxCacheLoaderTest extends AbstractCacheLoaderTestBase
{
CacheSPI<Object, Object> cache1, cache2;
- private Fqn<String> fqn = Fqn.fromString("/one/two/three");
+ private Fqn fqn = Fqn.fromString("/one/two/three");
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/lock/LockReleaseTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/lock/LockReleaseTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/lock/LockReleaseTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -36,8 +36,8 @@
CacheSPI<Object, Object> cache = null;
UserTransaction tx = null;
Log log;
- final Fqn<String> NODE1 = Fqn.fromString("/test");
- final Fqn<String> NODE2 = Fqn.fromString("/my/test");
+ final Fqn NODE1 = Fqn.fromString("/test");
+ final Fqn NODE2 = Fqn.fromString("/my/test");
final String KEY = "key";
final String VAL1 = "val1";
final String VAL2 = "val2";
Modified: core/trunk/src/test/java/org/jboss/cache/lock/PessimisticLockTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/lock/PessimisticLockTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/lock/PessimisticLockTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -28,7 +28,7 @@
{
private Cache<Object, Object> cache;
private TransactionManager tm;
- private Fqn<String> fqn = Fqn.fromString("/a/b/c");
+ private Fqn fqn = Fqn.fromString("/a/b/c");
private LockManager lockManager;
@BeforeMethod(alwaysRun = true)
Modified: core/trunk/src/test/java/org/jboss/cache/lock/WriteLockOnParentTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/lock/WriteLockOnParentTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/lock/WriteLockOnParentTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -17,7 +17,7 @@
{
private CacheSPI<Object, Object> cache;
private TransactionManager tm;
- private Fqn<String> a = Fqn.fromString("/a"), a_b = Fqn.fromString("/a/b"), a_c = Fqn.fromString("/a/c");
+ private Fqn a = Fqn.fromString("/a"), a_b = Fqn.fromString("/a/b"), a_c = Fqn.fromString("/a/c");
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/ActiveInactiveTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -34,8 +34,8 @@
RegionManager rman;
CacheSPI cache;
Configuration c;
- Fqn<String> A = Fqn.fromString("/a");
- Fqn<String> I = Fqn.fromString("/i");
+ Fqn A = Fqn.fromString("/a");
+ Fqn I = Fqn.fromString("/i");
Fqn A_B = Fqn.fromRelativeElements(A, "b");
@BeforeMethod(alwaysRun = true)
Modified: core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/AsyncReplTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -48,7 +48,7 @@
Person ben;
Address addr;
Throwable ex;
- private Fqn<String> aop = Fqn.fromString("/aop");
+ private Fqn aop = Fqn.fromString("/aop");
protected boolean useMarshalledValues = false;
ReplicationListener replListener1;
ReplicationListener replListener2;
Modified: core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerPassivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerPassivationTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerPassivationTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -33,7 +33,7 @@
private Cache<Object, Object> cache;
private EventLog eventLog = new EventLog();
private TransactionManager tm;
- private Fqn<String> fqn = Fqn.fromString("/test");
+ private Fqn fqn = Fqn.fromString("/test");
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/CacheListenerTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -46,7 +46,7 @@
private Cache<Object, Object> cache;
private TransactionManager tm;
private EventLog eventLog = new EventLog();
- private Fqn<String> fqn = Fqn.fromString("/test");
+ private Fqn fqn = Fqn.fromString("/test");
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
@@ -247,7 +247,7 @@
public void testMove()
{
assertEquals("Event log should be empty", Collections.emptyList(), eventLog.events);
- Fqn<String> newParent = Fqn.fromString("/a");
+ Fqn newParent = Fqn.fromString("/a");
cache.put(fqn, "key", "value");
cache.put(newParent, "key", "value");
@@ -431,7 +431,7 @@
public void testTxMove() throws Exception
{
assertEquals("Event log should be empty", Collections.emptyList(), eventLog.events);
- Fqn<String> newParent = Fqn.fromString("/a");
+ Fqn newParent = Fqn.fromString("/a");
cache.put(fqn, "key", "value");
cache.put(newParent, "key", "value");
Modified: core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/NotificationThreadTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -127,7 +127,7 @@
listener.sameThreadExpected = true;
listener.mainThread = Thread.currentThread();
- Fqn<String> fqn = Fqn.fromString("/a/b/c");
+ Fqn fqn = Fqn.fromString("/a/b/c");
// basic node manipulation events
if (tx)
Modified: core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/notifications/RemoteCacheListenerTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -65,7 +65,7 @@
@SuppressWarnings("unused")
private TransactionManager tm1, tm2;
private EventLog eventLog1 = new EventLog(), eventLog2 = new EventLog();
- private Fqn<String> fqn = Fqn.fromString("/test");
+ private Fqn fqn = Fqn.fromString("/test");
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
@@ -352,7 +352,7 @@
public void testMove()
{
assertEquals("Event log should be empty", Collections.emptyList(), eventLog2.events);
- Fqn<String> newParent = Fqn.fromString("/a");
+ Fqn newParent = Fqn.fromString("/a");
cache1.put(fqn, "key", "value");
cache1.put(newParent, "key", "value");
@@ -596,7 +596,7 @@
public void testTxMove() throws Exception
{
assertEquals("Event log should be empty", Collections.emptyList(), eventLog2.events);
- Fqn<String> newParent = Fqn.fromString("/a");
+ Fqn newParent = Fqn.fromString("/a");
cache1.put(fqn, "key", "value");
cache1.put(newParent, "key", "value");
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/AbstractOptimisticTestCase.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -49,7 +49,7 @@
public class AbstractOptimisticTestCase
{
// some test data shared among all the test cases
- protected Fqn<String> fqn = Fqn.fromString("/blah");
+ protected Fqn fqn = Fqn.fromString("/blah");
protected String key = "myKey", value = "myValue";
protected CacheSPI<Object, Object> createCacheUnstarted() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/ConcurrentTransactionTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -35,7 +35,7 @@
public class ConcurrentTransactionTest extends AbstractOptimisticTestCase
{
private CacheSPI<Object, Object> cache;
- private Fqn<String> f = Fqn.fromString("/a/b");
+ private Fqn f = Fqn.fromString("/a/b");
private List<Exception> exceptions = new CopyOnWriteArrayList<Exception>();
@BeforeMethod(alwaysRun = true)
Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/FullStackInterceptorTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -795,7 +795,7 @@
TransactionManager tm1 = cache1.getConfiguration().getRuntimeConfig().getTransactionManager();
- Fqn<String> fqn = Fqn.fromString("/test/node");
+ Fqn fqn = Fqn.fromString("/test/node");
String KEY = "key";
String VALUE1 = "value1";
Modified: core/trunk/src/test/java/org/jboss/cache/options/FailSilentlyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/FailSilentlyTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/options/FailSilentlyTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -32,7 +32,7 @@
private CacheSPI cache;
private TransactionManager manager;
private Transaction tx;
- private Fqn<String> fqn = Fqn.fromString("/a");
+ private Fqn fqn = Fqn.fromString("/a");
private String key = "key";
@BeforeMethod(alwaysRun = true)
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/ConcurrentPassivationTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -81,7 +81,7 @@
// If any get returns null, that's a failure
for (int i = 0; i < 35000; i++)
{
- Fqn<Object> fqn = Fqn.fromRelativeElements(base, i / 100);
+ Fqn fqn = Fqn.fromRelativeElements(base, i / 100);
assertNotNull("Get on Fqn " + fqn + " returned null", cache.getNode(fqn));
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -42,7 +42,7 @@
@Test(groups = {"functional"})
public class PassivationActivationCallbacksTestCase
{
- private static final Fqn<String> BASE = Fqn.fromString("/base");
+ private static final Fqn BASE = Fqn.fromString("/base");
private static final Log log = LogFactory.getLog(PassivationActivationCallbacksTestCase.class);
//Cache Loader fields
@@ -150,8 +150,8 @@
{
protected Log log = LogFactory.getLog(CacheListener.class);
- protected Set<Fqn<String>> passivated = new HashSet<Fqn<String>>();
- protected Set<Fqn<String>> activated = new HashSet<Fqn<String>>();
+ protected Set<Fqn> passivated = new HashSet<Fqn>();
+ protected Set<Fqn> activated = new HashSet<Fqn>();
protected Exception passivationException;
protected Exception activationException;
@@ -196,7 +196,7 @@
{
if (!e.isPre())
return; // we are not interested in postPassivate event
- Fqn<String> fqn = e.getFqn();
+ Fqn fqn = e.getFqn();
if (!fqn.isChildOrEquals(BASE))
return; // don't care about fqn that doesn't belong to me.
Modified: core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/PassivationTestsBase.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -48,7 +48,7 @@
//Cache Loader fields
protected CacheSPI<Object, Object> cache;
CacheLoader loader = null;
- static final Fqn<String> FQN = Fqn.fromString("/key");
+ static final Fqn FQN = Fqn.fromString("/key");
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
@@ -349,7 +349,7 @@
{
cache.put("/a/b/c", null);
}
- Set children = cache.getChildrenNames((Fqn<String>) null);// get "null* node children names
+ Set children = cache.getChildrenNames((Fqn) null);// get "null* node children names
assertTrue(children.isEmpty());
}
catch (Exception e)
@@ -554,7 +554,7 @@
public void testRemoveData2Passivation() throws Exception
{
Set<Object> keys;
- Fqn<String> key = Fqn.fromString("/x/y/z/");
+ Fqn key = Fqn.fromString("/x/y/z/");
cache.put(key, "keyA", "valA");
cache.put(key, "keyB", "valB");
cache.put(key, "keyC", "valC");
@@ -573,7 +573,7 @@
public void testRemoveData3Passivation() throws Exception
{
Set<Object> keys;
- Fqn<String> key = Fqn.fromString("/x/y/z/");
+ Fqn key = Fqn.fromString("/x/y/z/");
cache.put(key, "keyA", "valA");
cache.put(key, "keyB", "valB");
cache.put(key, "keyC", "valC");
@@ -782,7 +782,7 @@
public void testPassivationAndActivation() throws Exception
{
Object val, val2;
- Fqn<String> NODE = Fqn.fromString("/test");
+ Fqn NODE = Fqn.fromString("/test");
loader.remove(Fqn.fromString("/"));
cache.put(NODE, "key", "val");
//val=loader.get(NODE).get("key");
@@ -856,7 +856,7 @@
/**
* Do basic put tests for a given FQN.
*/
- private void doPutTests(Fqn<String> fqn)
+ private void doPutTests(Fqn fqn)
throws Exception
{
@@ -903,7 +903,7 @@
/**
* Do basic remove tests for a given FQN.
*/
- private void doRemoveTests(Fqn<String> fqn)
+ private void doRemoveTests(Fqn fqn)
throws Exception
{
@@ -1362,7 +1362,7 @@
{
Modification mod = list.get(i);
@SuppressWarnings("unchecked")
- Fqn<String> fqn = mod.getFqn();
+ Fqn fqn = mod.getFqn();
switch (mod.getType())
{
case PUT_KEY_VALUE:
Modified: core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/replicated/SyncReplTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -94,7 +94,7 @@
public void testNodeConvenienceNodeRemoval()
{
// this fqn is relative, but since it is from the root it may as well be absolute
- Fqn<String> fqn = Fqn.fromString("/test/fqn");
+ Fqn fqn = Fqn.fromString("/test/fqn");
caches[0].getRoot().addChild(fqn);
assertTrue(caches[0].getRoot().hasChild(fqn));
assertTrue(caches[1].getRoot().hasChild(fqn));
@@ -105,7 +105,7 @@
assertEquals(false, caches[0].removeNode(fqn));
// Confirm it works as expected if the removed node has a child
- Fqn<String> child = Fqn.fromString("/test/fqn/child");
+ Fqn child = Fqn.fromString("/test/fqn/child");
caches[0].getRoot().addChild(child);
assertTrue(caches[0].getRoot().hasChild(child));
assertTrue(caches[1].getRoot().hasChild(child));
Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferTestBase.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -58,16 +58,16 @@
{
protected static final int SUBTREE_SIZE = 10;
- public static final Fqn<String> A = Fqn.fromString("/a");
- public static final Fqn<String> B = Fqn.fromString("/b");
- public static final Fqn<String> C = Fqn.fromString("/c");
+ public static final Fqn A = Fqn.fromString("/a");
+ public static final Fqn B = Fqn.fromString("/b");
+ public static final Fqn C = Fqn.fromString("/c");
protected static final String ADDRESS_CLASSNAME = "org.jboss.cache.marshall.data.Address";
protected static final String PERSON_CLASSNAME = "org.jboss.cache.marshall.data.Person";
- public static final Fqn<String> A_B = Fqn.fromString("/a/b");
- public static final Fqn<String> A_C = Fqn.fromString("/a/c");
- public static final Fqn<String> A_D = Fqn.fromString("/a/d");
+ public static final Fqn A_B = Fqn.fromString("/a/b");
+ public static final Fqn A_C = Fqn.fromString("/a/c");
+ public static final Fqn A_D = Fqn.fromString("/a/d");
public static final String JOE = "JOE";
public static final String BOB = "BOB";
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -78,7 +78,7 @@
final CountDownLatch firstCanRollback = new CountDownLatch(1);
final CountDownLatch firstDone = new CountDownLatch(1);
- final Fqn<String> PARENT = Fqn.fromString("/a");
+ final Fqn PARENT = Fqn.fromString("/a");
// start a first thread and a transaction
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/StatusUnknownTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/StatusUnknownTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/StatusUnknownTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -53,7 +53,7 @@
public void testStatusUnknown() throws Exception
{
tm.begin();
- Fqn<String> fqn = Fqn.fromString("/a/b/c");
+ Fqn fqn = Fqn.fromString("/a/b/c");
cache.put(fqn, "k", "v");
assertEquals(4, ((CacheSPI) cache).getNumberOfLocksHeld());
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/TransactionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/TransactionTest.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/TransactionTest.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -797,7 +797,7 @@
public void testSimpleRollbackTransactions() throws Exception
{
- final Fqn<String> fqn = Fqn.fromString("/a/b/c");
+ final Fqn fqn = Fqn.fromString("/a/b/c");
tx.begin();
cache.put(fqn, "entry", "commit");
tx.commit();
@@ -906,7 +906,7 @@
public void testRemoveAndGetInTx() throws Exception
{
Fqn A_B = Fqn.fromString("/a/b");
- Fqn<String> A = Fqn.fromString("/a");
+ Fqn A = Fqn.fromString("/a");
cache.put(A_B, "k", "v");
@@ -921,7 +921,7 @@
public void testRemoveAndPutInTx() throws Exception
{
- Fqn<String> A_B = Fqn.fromString("/a/b");
+ Fqn A_B = Fqn.fromString("/a/b");
Fqn A = Fqn.fromString("/a");
cache.put(A_B, "k", "v");
@@ -946,7 +946,7 @@
public void testRemoveParentAndPutInTx() throws Exception
{
Fqn A_B = Fqn.fromString("/a/b");
- Fqn<String> A = Fqn.fromString("/a");
+ Fqn A = Fqn.fromString("/a");
cache.put(A_B, "k", "v");
@@ -967,7 +967,7 @@
public void testRemoveGrandParentAndPutInTx() throws Exception
{
Fqn A_B_C = Fqn.fromString("/a/b/c");
- Fqn<String> A = Fqn.fromString("/a");
+ Fqn A = Fqn.fromString("/a");
cache.put(A_B_C, "k", "v");
@@ -988,7 +988,7 @@
public void testRootNodeRemoval() throws Exception
{
Fqn root = Fqn.ROOT;
- Fqn<Integer> fqn = Fqn.fromElements(1);
+ Fqn fqn = Fqn.fromElements(1);
//put first time
tx.begin();
this.cache.put(fqn, "k", "v");
@@ -1041,8 +1041,8 @@
public void testRootNodeRemovalRollback() throws Exception
{
@SuppressWarnings("unchecked")
- Fqn<Object> root = Fqn.ROOT;
- Fqn<Object> fqn = Fqn.fromRelativeElements(root, 1);
+ Fqn root = Fqn.ROOT;
+ Fqn fqn = Fqn.fromRelativeElements(root, 1);
//put first time
tx.begin();
this.cache.put(fqn, "k", "v");
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java 2008-07-15 14:59:39 UTC (rev 6274)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/isolationlevels/IsolationLevelTestBase.java 2008-07-15 15:05:40 UTC (rev 6275)
@@ -29,9 +29,9 @@
protected IsolationLevel isolationLevel;
protected Cache<String, String> cache;
protected TransactionManager transactionManager;
- protected Fqn<String> fqn = Fqn.fromString("/a/b/c");
- protected Fqn<String> fqnChild1 = Fqn.fromString("/a/b/c/child1");
- protected Fqn<String> fqnChild2 = Fqn.fromString("/a/b/c/child2");
+ protected Fqn fqn = Fqn.fromString("/a/b/c");
+ protected Fqn fqnChild1 = Fqn.fromString("/a/b/c/child1");
+ protected Fqn fqnChild2 = Fqn.fromString("/a/b/c/child2");
protected String k = "key", v = "value";
protected Collection<IsolationLevel> allowedLevels;
More information about the jbosscache-commits
mailing list