[infinispan-commits] Infinispan SVN: r1820 - in trunk/client/hotrod-client/src: main/java/org/infinispan/client/hotrod/impl and 2 other directories.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2010-05-18 15:46:27 -0400 (Tue, 18 May 2010)
New Revision: 1820

Modified:
   trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCache.java
   trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheImpl.java
   trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsImpl.java
   trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerNotStartedTest.java
   trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerStoppedTest.java
   trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java
   trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteCacheManagerTest.java
Log:
removed ping from the interface


Modified: trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCache.java
===================================================================
--- trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCache.java	2010-05-18 19:27:20 UTC (rev 1819)
+++ trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCache.java	2010-05-18 19:46:27 UTC (rev 1820)
@@ -338,11 +338,6 @@
    @Override
    void putAll(Map<? extends K, ? extends V> m);
 
-   /**
-    * Returns true if the remote cluster can be reached, false otherwise.
-    */
-   boolean ping();
-
    public ServerStatistics stats();
 
    RemoteCache<K,V> withFlags(Flag... flags);

Modified: trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheImpl.java
===================================================================
--- trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheImpl.java	2010-05-18 19:27:20 UTC (rev 1819)
+++ trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheImpl.java	2010-05-18 19:46:27 UTC (rev 1820)
@@ -287,12 +287,6 @@
    }
 
    @Override
-   public boolean ping() {
-      assertRemoteCacheManagerIsStarted();
-      return operations.ping();
-   }
-
-   @Override
    public void start() {
       if (log.isInfoEnabled()) {
          log.info("Start called, nothing to do here(" + getName() + ")");

Modified: trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsImpl.java
===================================================================
--- trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsImpl.java	2010-05-18 19:27:20 UTC (rev 1819)
+++ trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsImpl.java	2010-05-18 19:46:27 UTC (rev 1820)
@@ -234,7 +234,7 @@
          }
          throw new IllegalStateException("Unknown response status: " + Integer.toHexString(respStatus));
       } catch (TransportException te) {
-         log.trace("Exception while ping", te);
+         log.trace("Exception while adsdsa", te);
          return false;
       }
       finally {

Modified: trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerNotStartedTest.java
===================================================================
--- trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerNotStartedTest.java	2010-05-18 19:27:20 UTC (rev 1819)
+++ trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerNotStartedTest.java	2010-05-18 19:46:27 UTC (rev 1820)
@@ -107,11 +107,6 @@
       cache().removeWithVersionAsync("key", 12312321l);
    }
 
-   @Test(expectedExceptions = RemoteCacheManagerNotStartedException.class)
-   public void testPing() {
-      cache().ping();
-   }
-
    private RemoteCache<Object, Object> cache() {
       return remoteCacheManager.getCache();
    }

Modified: trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerStoppedTest.java
===================================================================
--- trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerStoppedTest.java	2010-05-18 19:27:20 UTC (rev 1819)
+++ trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CacheManagerStoppedTest.java	2010-05-18 19:46:27 UTC (rev 1820)
@@ -44,7 +44,6 @@
    public void testGetCacheOperations() {
       assert remoteCacheManager.getCache() != null;
       assert remoteCacheManager.getCache(CACHE_NAME) != null;
-      cache().ping();
       cache().put("k", "v");
       assert cache().get("k").equals("v");      
    }
@@ -118,11 +117,6 @@
       cache().removeWithVersionAsync("key", 12312321l);
    }
 
-   @Test(expectedExceptions = RemoteCacheManagerNotStartedException.class, dependsOnMethods = "testStopCacheManager")
-   public void testPing() {
-      cache().ping();
-   }
-
    private RemoteCache<Object, Object> cache() {
       return remoteCacheManager.getCache();
    }

Modified: trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java
===================================================================
--- trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java	2010-05-18 19:27:20 UTC (rev 1819)
+++ trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java	2010-05-18 19:46:27 UTC (rev 1820)
@@ -71,9 +71,7 @@
    @AfterClass 
    public void testDestroyRemoteCacheFactory() {
       remoteCacheManager.stop();
-//      assert remoteCache.ping();
       hotrodServer.stop();
-//      assert !remoteCache.ping();
    }
 
    public void testPut() {

Modified: trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteCacheManagerTest.java
===================================================================
--- trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteCacheManagerTest.java	2010-05-18 19:27:20 UTC (rev 1819)
+++ trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteCacheManagerTest.java	2010-05-18 19:46:27 UTC (rev 1820)
@@ -98,7 +98,6 @@
 
    private void assertWorks(RemoteCacheManager remoteCacheManager) {
       RemoteCache<Object, Object> cache = remoteCacheManager.getCache();
-      assert cache.ping();
       cache.put("aKey", "aValue");
       assert cache.get("aKey").equals("aValue");
    }