[infinispan-commits] Infinispan SVN: r1213 - in trunk/query/src/main/java/org/infinispan/query: backend and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-11-24 07:42:45 -0500 (Tue, 24 Nov 2009)
New Revision: 1213

Modified:
   trunk/query/src/main/java/org/infinispan/query/KeyTransformationHandler.java
   trunk/query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java
Log:
Make tests pass

Modified: trunk/query/src/main/java/org/infinispan/query/KeyTransformationHandler.java
===================================================================
--- trunk/query/src/main/java/org/infinispan/query/KeyTransformationHandler.java	2009-11-24 12:26:37 UTC (rev 1212)
+++ trunk/query/src/main/java/org/infinispan/query/KeyTransformationHandler.java	2009-11-24 12:42:45 UTC (rev 1213)
@@ -48,13 +48,19 @@
          //   "D:5.34"
          //   "B:f"
          //   "T:com.myorg.MyTransformer:STRING_GENERATED_BY_MY_TRANSFORMER"
-         return key.toString();
+
+
+         // for now just support Strings!!
+         return "S:" + key.toString();
       }
       else
-         throw new IllegalArgumentException("Indexing only works with entries keyed on Strings!");
+         throw new IllegalArgumentException("Indexing only works with entries keyed on Strings - you passed in a " + key.getClass().toString());
    }
 
    private static boolean validKey(Object key) {
+      // for now we just support Strings and bypass the rest of the logic!
+      if (true) return key instanceof String;
+      
       // we support String and JDK primitives and their wrappers.
       if (key instanceof String ||
             key instanceof Integer ||

Modified: trunk/query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java
===================================================================
--- trunk/query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java	2009-11-24 12:26:37 UTC (rev 1212)
+++ trunk/query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java	2009-11-24 12:42:45 UTC (rev 1213)
@@ -54,7 +54,7 @@
       Object toReturn = invokeNextInterceptor(ctx, command);
 
       if (shouldModifyIndexes(ctx)) {         
-         addToIndexes(extractValue(command.getKey()), extractValue(command.getValue()));
+         addToIndexes(extractValue(command.getValue()), extractValue(command.getKey()));
       }