add support for java 1.5

src/main/java/redis/clients/util/Sharded.java

@@ -2,8 +2,10 @@ package redis.clients.util;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.TreeMap;
+import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -22,69 +24,73 @@ public class Sharded<R, S extends ShardInfo<R>> {
     private Pattern tagPattern = null;
     // the tag is anything between {}
     public static final Pattern DEFAULT_KEY_TAG_PATTERN = Pattern
-	    .compile("\\{(.+?)\\}");
+            .compile("\\{(.+?)\\}");
 
     public Sharded(List<S> shards) {
-	this(shards, Hashing.MURMUR_HASH); // MD5 is really not good as we works
-	// with 64-bits not 128
+        this(shards, Hashing.MURMUR_HASH); // MD5 is really not good as we works
+        // with 64-bits not 128
     }
 
     public Sharded(List<S> shards, Hashing algo) {
-	this.algo = algo;
-	initialize(shards);
+        this.algo = algo;
+        initialize(shards);
     }
 
     public Sharded(List<S> shards, Pattern tagPattern) {
-	this(shards, Hashing.MURMUR_HASH, tagPattern); // MD5 is really not good
-	// as we works with
-	// 64-bits not 128
+        this(shards, Hashing.MURMUR_HASH, tagPattern); // MD5 is really not good
+        // as we works with
+        // 64-bits not 128
     }
 
     public Sharded(List<S> shards, Hashing algo, Pattern tagPattern) {
-	this.algo = algo;
-	this.tagPattern = tagPattern;
-	initialize(shards);
+        this.algo = algo;
+        this.tagPattern = tagPattern;
+        initialize(shards);
     }
 
     private void initialize(List<S> shards) {
-	nodes = new TreeMap<Long, S>();
+        nodes = new TreeMap<Long, S>();
 
-	int totalWeight = 0;
+        int totalWeight = 0;
 
-	for (ShardInfo<?> shard : shards) {
-	    totalWeight += shard.getWeight();
-	}
+        for (ShardInfo<?> shard : shards) {
+            totalWeight += shard.getWeight();
+        }
 
-	long oneForthOfStep = (1L << 62) / totalWeight; // 62 vs 64 to normalize
-	// math in Long
+        long oneForthOfStep = (1L << 62) / totalWeight; // 62 vs 64 to normalize
+        // math in Long
 
-	long floor = Long.MIN_VALUE;
-	for (int i = 0; i != shards.size(); ++i) {
-	    final S shardInfo = shards.get(i);
-	    shardInfo.initResource();
-	    nodes.put(floor, shardInfo);
-	    floor += 4 * oneForthOfStep * shardInfo.getWeight(); // *4 to
-	    // compensate
-	    // 62 vs 64
-	}
+        long floor = Long.MIN_VALUE;
+        for (int i = 0; i != shards.size(); ++i) {
+            final S shardInfo = shards.get(i);
+            shardInfo.initResource();
+            nodes.put(floor, shardInfo);
+            floor += 4 * oneForthOfStep * shardInfo.getWeight(); // *4 to
+            // compensate
+            // 62 vs 64
+        }
     }
 
-	public R getShard(byte[] key) {
-		return nodes
-			.floorEntry(algo.hash(key))
-			.getValue()
-			.getResource();
-	}
+    public R getShard(byte[] key) {
+        return getShardInfo(key).getResource();
+    }
 
-	public R getShard(String key) {
-		return nodes
-			.floorEntry(algo.hash(getKeyTag(key)))
-			.getValue()
-			.getResource();
-	}
+    public R getShard(String key) {
+        return getShardInfo(key).getResource();
+    }
+
+    private S getShardInfo(byte[] key) {
+        Iterator<Entry<Long, S>> iterator = nodes.headMap(algo.hash(key))
+                .entrySet().iterator();
+        Entry<Long, S> next = iterator.next();
+        if (iterator.hasNext()) {
+            next = iterator.next();
+        }
+        return next.getValue();
+    }
 
     public S getShardInfo(String key) {
-	return nodes.floorEntry(algo.hash(getKeyTag(key))).getValue();
+        return getShardInfo(SafeEncoder.encode(getKeyTag(key)));
     }
 
     /**
@@ -97,15 +103,15 @@ public class Sharded<R, S extends ShardInfo<R>> {
      * @return The tag if it exists, or the original key
      */
     public String getKeyTag(String key) {
-	if (tagPattern != null) {
-	    Matcher m = tagPattern.matcher(key);
-	    if (m.find())
-		return m.group(1);
-	}
-	return key;
+        if (tagPattern != null) {
+            Matcher m = tagPattern.matcher(key);
+            if (m.find())
+                return m.group(1);
+        }
+        return key;
     }
 
     public Collection<S> getAllShards() {
-	return Collections.unmodifiableCollection(nodes.values());
+        return Collections.unmodifiableCollection(nodes.values());
     }
 }