[infinispan-commits] Infinispan SVN: r1950 - in branches/4.1.x/server/rest/src: test/scala/org/infinispan/rest and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-07-01 10:53:01 -0400 (Thu, 01 Jul 2010)
New Revision: 1950

Modified:
   branches/4.1.x/server/rest/src/main/scala/org/infinispan/rest/Server.scala
   branches/4.1.x/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala
Log:
implemented retry logic in hotrod client - fixed default cache name refactoring in rest module

Modified: branches/4.1.x/server/rest/src/main/scala/org/infinispan/rest/Server.scala
===================================================================
--- branches/4.1.x/server/rest/src/main/scala/org/infinispan/rest/Server.scala	2010-07-01 11:52:46 UTC (rev 1949)
+++ branches/4.1.x/server/rest/src/main/scala/org/infinispan/rest/Server.scala	2010-07-01 14:53:01 UTC (rev 1950)
@@ -137,10 +137,10 @@
    var instance: EmbeddedCacheManager = null
 
    def getCache(name: String): Cache[String, Any] = {
-      if (name != DefaultCacheManager.DEFAULT_CACHE_NAME && !instance.getCacheNames.contains(name))
+      if (name != CacheContainer.DEFAULT_CACHE_NAME && !instance.getCacheNames.contains(name))
          throw new CacheNotFoundException("Cache with name '" + name + "' not found amongst the configured caches")
 
-      if (name == DefaultCacheManager.DEFAULT_CACHE_NAME) instance.getCache[String, Any]
+      if (name == CacheContainer.DEFAULT_CACHE_NAME) instance.getCache[String, Any]
       else instance.getCache(name)
    }
 

Modified: branches/4.1.x/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala
===================================================================
--- branches/4.1.x/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala	2010-07-01 11:52:46 UTC (rev 1949)
+++ branches/4.1.x/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala	2010-07-01 14:53:01 UTC (rev 1950)
@@ -10,9 +10,8 @@
 import org.testng.annotations.Test
 import org.testng.Assert._
 import java.lang.reflect.Method
-import org.infinispan.manager.DefaultCacheManager
+import org.infinispan.manager.{CacheContainer, DefaultCacheManager}
 
-
 /**
  * This tests using the Apache HTTP commons client library - but you could use anything
  * Decided to do this instead of testing the Server implementation itself, as testing the impl directly was kind of too easy.
@@ -25,7 +24,7 @@
 @Test(groups = Array("functional"), testName = "rest.IntegrationTest")
 class IntegrationTest {
    val HOST = "http://localhost:8888/"
-   val cacheName = DefaultCacheManager.DEFAULT_CACHE_NAME
+   val cacheName = CacheContainer.DEFAULT_CACHE_NAME
    val fullPath = HOST + "rest/" + cacheName
    //val HOST = "http://localhost:8080/infinispan/"
 
@@ -221,9 +220,9 @@
 
       val obj = new MySer
       obj.name = "mic"
-      ManagerInstance getCache(DefaultCacheManager.DEFAULT_CACHE_NAME) put (m.getName, obj)
-      ManagerInstance getCache(DefaultCacheManager.DEFAULT_CACHE_NAME) put (m.getName + "2", "hola")
-      ManagerInstance getCache(DefaultCacheManager.DEFAULT_CACHE_NAME) put (m.getName + "3", new MyNonSer)
+      ManagerInstance getCache(CacheContainer.DEFAULT_CACHE_NAME) put (m.getName, obj)
+      ManagerInstance getCache(CacheContainer.DEFAULT_CACHE_NAME) put (m.getName + "2", "hola")
+      ManagerInstance getCache(CacheContainer.DEFAULT_CACHE_NAME) put (m.getName + "3", new MyNonSer)
 
       //check we can get it back as an object...
       val get = new GetMethod(fullPathKey);
@@ -269,7 +268,7 @@
       put.setRequestBody(new ByteArrayInputStream(bout.toByteArray))
       Client.call(put)
 
-      val x = ManagerInstance.getCache(DefaultCacheManager.DEFAULT_CACHE_NAME).get(m.getName).asInstanceOf[MySer]
+      val x = ManagerInstance.getCache(CacheContainer.DEFAULT_CACHE_NAME).get(m.getName).asInstanceOf[MySer]
       assertTrue(x.name == "mic")
    }