svn commit: r1349275 - in /incubator/directmemory/trunk/integrations/solr: pom.xml src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapCacheTest.java

[tommaso]

Author: tommaso
Date: Tue Jun 12 11:47:02 2012
New Revision: 1349275

URL: http://svn.apache.org/viewvc?rev=1349275&view=rev
Log:
[DIRECTMEMORY-89] - updated Solr version to 3.6 plus fix of 
SolrOffHeapCacheTest (throwed NotSerializableException)

Modified:
    incubator/directmemory/trunk/integrations/solr/pom.xml
    
incubator/directmemory/trunk/integrations/solr/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java
    
incubator/directmemory/trunk/integrations/solr/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapCacheTest.java

Modified: incubator/directmemory/trunk/integrations/solr/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/directmemory/trunk/integrations/solr/pom.xml?rev=1349275&r1=1349274&r2=1349275&view=diff
==============================================================================
--- incubator/directmemory/trunk/integrations/solr/pom.xml (original)
+++ incubator/directmemory/trunk/integrations/solr/pom.xml Tue Jun 12 11:47:02 
2012
@@ -75,7 +75,7 @@ under the License.
     <dependency>
       <groupId>org.apache.solr</groupId>
       <artifactId>solr-core</artifactId>
-      <version>3.5.0</version>
+      <version>3.6.0</version>
     </dependency>
 
     <dependency>
@@ -98,7 +98,7 @@ under the License.
     <dependency>
       <groupId>org.apache.solr</groupId>
       <artifactId>solr-test-framework</artifactId>
-      <version>3.5.0</version>
+      <version>3.6.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: 
incubator/directmemory/trunk/integrations/solr/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java
URL: 
http://svn.apache.org/viewvc/incubator/directmemory/trunk/integrations/solr/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java?rev=1349275&r1=1349274&r2=1349275&view=diff
==============================================================================
--- 
incubator/directmemory/trunk/integrations/solr/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java
 (original)
+++ 
incubator/directmemory/trunk/integrations/solr/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java
 Tue Jun 12 11:47:02 2012
@@ -103,7 +103,7 @@ public class SolrOffHeapCache<K, V>
         String serializerClassName = (String) args.get( "serializerClassName" 
);
         if ( serializerClassName != null )
         {
-            Serializer serializer = null;
+            Serializer serializer;
             try
             {
                 serializer = SerializerFactory.createNewSerializer( 
serializerClassName );

Modified: 
incubator/directmemory/trunk/integrations/solr/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapCacheTest.java
URL: 
http://svn.apache.org/viewvc/incubator/directmemory/trunk/integrations/solr/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapCacheTest.java?rev=1349275&r1=1349274&r2=1349275&view=diff
==============================================================================
--- 
incubator/directmemory/trunk/integrations/solr/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapCacheTest.java
 (original)
+++ 
incubator/directmemory/trunk/integrations/solr/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapCacheTest.java
 Tue Jun 12 11:47:02 2012
@@ -23,6 +23,7 @@ import org.apache.lucene.search.Sort;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.search.QueryResultKey;
 import org.apache.solr.search.function.DocValues;
+import org.apache.solr.search.function.QueryValueSource;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -90,18 +91,11 @@ public class SolrOffHeapCacheTest
         throws Exception
     {
 
+        MatchAllDocsQuery query = new MatchAllDocsQuery();
         QueryResultKey queryResultKey =
-            new QueryResultKey( new MatchAllDocsQuery(), new 
ArrayList<Query>(), new Sort(), 1 );
-        DocValues docValues = new DocValues()
-        {
-            @Override
-            public String toString( int doc )
-            {
-                return doc + "asd";
-            }
-        };
+            new QueryResultKey(query, new ArrayList<Query>(), new Sort(), 1 );
 
-        solrOffHeapCache.put( queryResultKey, docValues );
+        solrOffHeapCache.put( queryResultKey, new QueryValueSource(query,1) );
 
     }
 }