Changeset 16:ff01cdc39c7f

Timestamp:

04/01/08 15:28:04 (9 months ago)

Author:

ryan@…

Branch:

default

Message:

Code cleanup

Location:

jmemcached-core/src/main/java/com/thimbleware/jmemcached

Files:

• Cache.java (modified) (3 diffs)
• ServerSessionHandler.java (modified) (6 diffs)

jmemcached-core/src/main/java/com/thimbleware/jmemcached/Cache.java

@@ -41 +41 @@
     }
 
+    public enum DeleteResponse {
+        DELETED, NOT_FOUND
+    }
 
     /**
@@ -67 +70 @@
      * @return the message response
      */
-    public boolean delete(String key, int time) {
+    public DeleteResponse delete(String key, int time) {
         try {
             startCacheWrite();
@@ -81 +84 @@
                     this.cacheStorage.remove(key); // just remove it
                 }
-                return true;
+                return DeleteResponse.DELETED;
             } else {
-                return false;
+                return DeleteResponse.NOT_FOUND;
             }
         } finally {

jmemcached-core/src/main/java/com/thimbleware/jmemcached/ServerSessionHandler.java

@@ -251 +251 @@
      */
     protected String delete(String key, int time) {
-        if (cache.delete(key, time)) return "DELETED\r\n";
+        return getDeleteResponseString(cache.delete(key, time));
+    }
+
+    private String getDeleteResponseString(Cache.DeleteResponse deleteResponse) {
+        if (deleteResponse == Cache.DeleteResponse.DELETED) return "DELETED\r\n";
         else return "NOT_FOUND\r\n";
     }
@@ -262 +266 @@
      */
     protected String add(MCElement e) {
-        if (cache.add(e) == Cache.StoreResponse.STORED) return "STORED\r\n";
-        else return "NOT_STORED\r\n";
-    }
-
-    protected String getStoreResponeString(Cache.StoreResponse storeResponse) {
+        return getStoreResponseString(cache.add(e));
+    }
+
+    protected String getStoreResponseString(Cache.StoreResponse storeResponse) {
         switch (storeResponse) {
             case EXISTS:
@@ -277 +280 @@
                 return "STORED\r\n";
         }
-        return null;
+        throw new RuntimeException("unknown store response from cache: " + storeResponse);
     }
 
@@ -287 +290 @@
      */
     protected String replace(MCElement e) {
-        return getStoreResponeString(cache.replace(e));
+        return getStoreResponseString(cache.replace(e));
     }
 
@@ -297 +300 @@
      */
     protected String set(MCElement e) {
-        return getStoreResponeString(cache.set(e));
+        return getStoreResponseString(cache.set(e));
     }
 
@@ -303 +306 @@
      * Check and set an element in the cache
      *
-     * @param cas_key
+     * @param cas_key the unique cas id for the element, to match against
      * @param e       the element to set @return the message response string
      */
     protected String cas(Long cas_key, MCElement e) {
-        return getStoreResponeString(cache.cas(cas_key, e));
+        return getStoreResponseString(cache.cas(cas_key, e));
     }