[jboss-cvs] JBossCache/src/org/jboss/cache/marshall ...
Manik Surtani
msurtani at belmont.prod.atl2.jboss.com
Wed Aug 30 12:26:01 EDT 2006
User: msurtani
Date: 06/08/30 12:26:01
Modified: src/org/jboss/cache/marshall MethodDeclarations.java
Log:
Java5 optimisations
Revision Changes Path
1.14 +282 -317 JBossCache/src/org/jboss/cache/marshall/MethodDeclarations.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MethodDeclarations.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/MethodDeclarations.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- MethodDeclarations.java 25 Aug 2006 14:10:08 -0000 1.13
+++ MethodDeclarations.java 30 Aug 2006 16:26:01 -0000 1.14
@@ -16,7 +16,6 @@
import org.jboss.cache.optimistic.DataVersion;
import org.jboss.cache.rpc.RpcTreeCache;
import org.jgroups.Address;
-import org.jboss.cache.marshall.MethodCall;
import org.jgroups.stack.IpAddress;
import java.lang.reflect.Method;
@@ -31,7 +30,7 @@
* allowing lookup operations both ways.
*
* @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public class MethodDeclarations
{
@@ -190,83 +189,50 @@
{
try
{
- getDataMapMethodLocal = TreeCache.class.getDeclaredMethod("_getData", new Class[]
- {Fqn.class});
- existsMethod = TreeCache.class.getDeclaredMethod("exists", new Class[]
- {Fqn.class});
- putDataMethodLocal = TreeCache.class.getDeclaredMethod("_put", new Class[]
- {GlobalTransaction.class, Fqn.class, Map.class, boolean.class});
- putDataEraseMethodLocal = TreeCache.class.getDeclaredMethod("_put", new Class[]
- {GlobalTransaction.class, Fqn.class, Map.class, boolean.class, boolean.class});
- putKeyValMethodLocal = TreeCache.class.getDeclaredMethod("_put", new Class[]
- {GlobalTransaction.class, Fqn.class, Object.class, Object.class, boolean.class});
- removeNodeMethodLocal = TreeCache.class.getDeclaredMethod("_remove", new Class[]
- {GlobalTransaction.class, Fqn.class, boolean.class});
- removeKeyMethodLocal = TreeCache.class.getDeclaredMethod("_remove", new Class[]
- {GlobalTransaction.class, Fqn.class, Object.class, boolean.class});
- removeDataMethodLocal = TreeCache.class.getDeclaredMethod("_removeData", new Class[]
- {GlobalTransaction.class, Fqn.class, boolean.class});
- evictNodeMethodLocal = TreeCache.class.getDeclaredMethod("_evict", new Class[]
- {Fqn.class});
- evictVersionedNodeMethodLocal = TreeCache.class.getDeclaredMethod("_evict", new Class[]
- {Fqn.class, DataVersion.class});
+ getDataMapMethodLocal = TreeCache.class.getDeclaredMethod("_getData", Fqn.class);
+ existsMethod = TreeCache.class.getDeclaredMethod("exists", Fqn.class);
+ putDataMethodLocal = TreeCache.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Map.class, boolean.class);
+ putDataEraseMethodLocal = TreeCache.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Map.class, boolean.class, boolean.class);
+ putKeyValMethodLocal = TreeCache.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Object.class, Object.class, boolean.class);
+ removeNodeMethodLocal = TreeCache.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, boolean.class);
+ removeKeyMethodLocal = TreeCache.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, Object.class, boolean.class);
+ removeDataMethodLocal = TreeCache.class.getDeclaredMethod("_removeData", GlobalTransaction.class, Fqn.class, boolean.class);
+ evictNodeMethodLocal = TreeCache.class.getDeclaredMethod("_evict", Fqn.class);
+ evictVersionedNodeMethodLocal = TreeCache.class.getDeclaredMethod("_evict", Fqn.class, DataVersion.class);
// evictKeyValueMethodLocal=TreeCache.class.getDeclaredMethod("_evict", new Class[]{Fqn.class, Object.class});
- prepareMethod = TreeCache.class.getDeclaredMethod("prepare", new Class[]
- {GlobalTransaction.class, List.class, Address.class, boolean.class});
- commitMethod = TreeCache.class.getDeclaredMethod("commit", new Class[]
- {GlobalTransaction.class});
- rollbackMethod = TreeCache.class.getDeclaredMethod("rollback", new Class[]
- {GlobalTransaction.class});
- addChildMethodLocal = TreeCache.class.getDeclaredMethod("_addChild", new Class[]
- {GlobalTransaction.class, Fqn.class, Object.class, DataNode.class});
- getKeyValueMethodLocal = TreeCache.class.getDeclaredMethod("_get", new Class[]
- {Fqn.class, Object.class, boolean.class});
- getNodeMethodLocal = TreeCache.class.getDeclaredMethod("_get", new Class[]
- {Fqn.class});
- getKeysMethodLocal = TreeCache.class.getDeclaredMethod("_getKeys", new Class[]
- {Fqn.class});
- getChildrenNamesMethodLocal = TreeCache.class.getDeclaredMethod("_getChildrenNames", new Class[]
- {Fqn.class});
- replicateMethod = TreeCache.class.getDeclaredMethod("_replicate", new Class[]
- {MethodCall.class});
- replicateAllMethod = TreeCache.class.getDeclaredMethod("_replicate", new Class[]
- {List.class});
- releaseAllLocksMethodLocal = TreeCache.class.getDeclaredMethod("_releaseAllLocks", new Class[]
- {Fqn.class});
- printMethodLocal = TreeCache.class.getDeclaredMethod("_print", new Class[]
- {Fqn.class});
- lockMethodLocal = TreeCache.class.getDeclaredMethod("_lock", new Class[]
- {Fqn.class, DataNode.LockType.class, boolean.class});
-
- optimisticPrepareMethod = TreeCache.class.getDeclaredMethod("optimisticPrepare", new Class[]
- {GlobalTransaction.class, List.class, Map.class, Address.class, boolean.class});
-
- getPartialStateMethod = TreeCache.class.getDeclaredMethod("_getState", new Class[]
- {Fqn.class, long.class, boolean.class, boolean.class});
+ prepareMethod = TreeCache.class.getDeclaredMethod("prepare", GlobalTransaction.class, List.class, Address.class, boolean.class);
+ commitMethod = TreeCache.class.getDeclaredMethod("commit", GlobalTransaction.class);
+ rollbackMethod = TreeCache.class.getDeclaredMethod("rollback", GlobalTransaction.class);
+ addChildMethodLocal = TreeCache.class.getDeclaredMethod("_addChild", GlobalTransaction.class, Fqn.class, Object.class, DataNode.class);
+ getKeyValueMethodLocal = TreeCache.class.getDeclaredMethod("_get", Fqn.class, Object.class, boolean.class);
+ getNodeMethodLocal = TreeCache.class.getDeclaredMethod("_get", Fqn.class);
+ getKeysMethodLocal = TreeCache.class.getDeclaredMethod("_getKeys", Fqn.class);
+ getChildrenNamesMethodLocal = TreeCache.class.getDeclaredMethod("_getChildrenNames", Fqn.class);
+ replicateMethod = TreeCache.class.getDeclaredMethod("_replicate", MethodCall.class);
+ replicateAllMethod = TreeCache.class.getDeclaredMethod("_replicate", List.class);
+ releaseAllLocksMethodLocal = TreeCache.class.getDeclaredMethod("_releaseAllLocks", Fqn.class);
+ printMethodLocal = TreeCache.class.getDeclaredMethod("_print", Fqn.class);
+ lockMethodLocal = TreeCache.class.getDeclaredMethod("_lock", Fqn.class, DataNode.LockType.class, boolean.class);
+
+ optimisticPrepareMethod = TreeCache.class.getDeclaredMethod("optimisticPrepare", GlobalTransaction.class, List.class, Map.class, Address.class, boolean.class);
- clusteredGetMethod = TreeCache.class.getDeclaredMethod("_clusteredGet", new Class[]
- {MethodCall.class, Boolean.class});
+ getPartialStateMethod = TreeCache.class.getDeclaredMethod("_getState", Fqn.class, long.class, boolean.class, boolean.class);
- enqueueMethodCallMethod = TreeCache.class.getDeclaredMethod("_enqueueMethodCall", new Class[]
- {String.class, MethodCall.class});
+ clusteredGetMethod = TreeCache.class.getDeclaredMethod("_clusteredGet", MethodCall.class, Boolean.class);
- notifyCallOnInactiveMethod = TreeCache.class.getDeclaredMethod("notifyCallForInactiveSubtree", new Class[]
- {String.class});
+ enqueueMethodCallMethod = TreeCache.class.getDeclaredMethod("_enqueueMethodCall", String.class, MethodCall.class);
+
+ notifyCallOnInactiveMethod = TreeCache.class.getDeclaredMethod("notifyCallForInactiveSubtree", String.class);
// ------------ buddy replication
- remoteAnnounceBuddyPoolNameMethod = TreeCache.class.getDeclaredMethod("_remoteAnnounceBuddyPoolName",
- new Class[]
- {IpAddress.class, String.class});
- remoteRemoveFromBuddyGroupMethod = TreeCache.class.getDeclaredMethod("_remoteRemoveFromBuddyGroup",
- new Class[]
- {String.class});
- remoteAssignToBuddyGroupMethod = TreeCache.class.getDeclaredMethod("_remoteAssignToBuddyGroup", new Class[]
- {BuddyGroup.class, Map.class});
+ remoteAnnounceBuddyPoolNameMethod = TreeCache.class.getDeclaredMethod("_remoteAnnounceBuddyPoolName", IpAddress.class, String.class);
+ remoteRemoveFromBuddyGroupMethod = TreeCache.class.getDeclaredMethod("_remoteRemoveFromBuddyGroup", String.class);
+ remoteAssignToBuddyGroupMethod = TreeCache.class.getDeclaredMethod("_remoteAssignToBuddyGroup", BuddyGroup.class, Map.class);
- dataGravitationCleanupMethod = TreeCache.class.getDeclaredMethod("_dataGravitationCleanup", new Class[]{GlobalTransaction.class, Fqn.class, Fqn.class});
- dataGravitationMethod = TreeCache.class.getDeclaredMethod("_gravitateData", new Class[]{Fqn.class, boolean.class, boolean.class});
+ dataGravitationCleanupMethod = TreeCache.class.getDeclaredMethod("_dataGravitationCleanup", GlobalTransaction.class, Fqn.class, Fqn.class);
+ dataGravitationMethod = TreeCache.class.getDeclaredMethod("_gravitateData", Fqn.class, boolean.class, boolean.class);
}
@@ -319,7 +285,6 @@
}
-
putMethodIds.add(putDataMethodLocal_id);
putMethodIds.add(putDataEraseMethodLocal_id);
putMethodIds.add(putKeyValMethodLocal_id);
@@ -347,7 +312,7 @@
if (methodIdInteger != null)
{
- methodId = methodIdInteger.intValue();
+ methodId = methodIdInteger;
}
else
{
@@ -362,7 +327,7 @@
protected static Method lookupMethod(int id)
{
- Method method = methods.get(new Integer(id));
+ Method method = methods.get(id);
if (method == null)
{
if (log.isErrorEnabled())
More information about the jboss-cvs-commits
mailing list