added extedned and implements

Author: dragnot

src/main/java/io/rejson/IJReJSON.java

@@ -0,0 +1,10 @@
+package io.rejson;
+
+/**
+ * Created by guylubovitch on 4/30/17.
+ */
+public interface IJReJSON {
+
+    public Object JSONGet(String key);
+
+}

src/main/java/io/rejson/Client.java src/main/java/io/rejson/JReJSON.javasrc/main/java/io/rejson/Client.java renamed to src/main/java/io/rejson/JReJSON.java

@@ -5,15 +5,16 @@
 import redis.clients.jedis.JedisPoolConfig;
 
 import com.google.gson.Gson;
-import redis.clients.jedis.commands.ProtocolCommand;
+import redis.clients.jedis.Pipeline;
+import redis.clients.jedis.commands.*;
 import redis.clients.util.SafeEncoder;
 
 import java.util.*;
 
 /**
- * Client is the main ReJSON client class, wrapping connection management and all ReJSON commands
+ * JReJSON is the main ReJSON client class, wrapping connection management and all ReJSON commands
  */
-public class Client {
+public class JReJSON extends Jedis implements JedisCommands, MultiKeyCommands, AdvancedJedisCommands, ScriptingCommands, BasicCommands, ClusterCommands, SentinelCommands, ModuleCommands,IJReJSON {
 
     private JedisPool pool;
     private Gson gson;
@@ -22,6 +23,13 @@ Jedis _conn() {
         return pool.getResource();
     }
 
+    @Override
+    public Object JSONGet(String key) {
+
+
+        return null;
+    }
+
     private enum Command implements ProtocolCommand {
         DEL("JSON.DEL"),
         GET("JSON.GET"),
@@ -101,7 +109,7 @@ private Path getSingleOptionalPath(Path... path) {
      * @param timeout the timeout
      * @param poolSize the pool's size
      */
-    public Client(String host, int port, int timeout, int poolSize) {
+    public JReJSON(String host, int port, int timeout, int poolSize) {
         JedisPoolConfig conf = new JedisPoolConfig();
         conf.setMaxTotal(poolSize);
         conf.setTestOnBorrow(false);
@@ -123,7 +131,7 @@ public Client(String host, int port, int timeout, int poolSize) {
      * @param host the Redis host
      * @param port the Redis port
      */
-    public Client(String host, int port) {
+    public JReJSON(String host, int port) {
         this(host, port, 500, 100);
     }
 
@@ -249,4 +257,9 @@ public Class<? extends Object> type(String key, Path... path) {
                 throw new java.lang.RuntimeException(rep);
         }
     }
+    @Override
+    public Pipeline pipelined()
+    {
+
+    }
 }

src/test/java/io/rejson/ClientTest.java

@@ -4,6 +4,9 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
+import redis.clients.jedis.Pipeline;
 
 import static junit.framework.TestCase.*;
 
@@ -28,13 +31,13 @@ public IRLObject() {
 
 public class ClientTest {
 
-    private Client c;
+    private JReJSON c;
     private Gson g;
 
     @Before
     public void initialize() {
         g = new Gson();
-        c = new Client("localhost", 6379);
+        c = new JReJSON("localhost", 6379);
     }
 
     @Test
@@ -67,7 +70,7 @@ public void setExistingPathOnlyIfExistsShouldSucceed() throws Exception {
 
         c.set("obj", new IRLObject());
         Path p = new Path(".str");
-        c.set("obj", "strangle", Client.ExistenceModifier.MUST_EXIST, p);
+        c.set("obj", "strangle", JReJSON.ExistenceModifier.MUST_EXIST, p);
         assertEquals("strangle", c.get("obj", p));
     }
 
@@ -77,7 +80,7 @@ public void setNonExistingOnlyIfNotExistsShouldSucceed() throws Exception {
 
         c.set("obj", new IRLObject());
         Path p = new Path(".none");
-        c.set("obj", "strangle", Client.ExistenceModifier.NOT_EXISTS, p);
+        c.set("obj", "strangle", JReJSON.ExistenceModifier.NOT_EXISTS, p);
         assertEquals("strangle", c.get("obj", p));
     }
 
@@ -87,7 +90,7 @@ public void setExistingPathOnlyIfNotExistsShouldFail() throws Exception {
 
         c.set("obj", new IRLObject());
         Path p = new Path(".str");
-        c.set("obj", "strangle", Client.ExistenceModifier.NOT_EXISTS, p);
+        c.set("obj", "strangle", JReJSON.ExistenceModifier.NOT_EXISTS, p);
     }
 
     @Test(expected = Exception.class)
@@ -96,7 +99,7 @@ public void setNonExistingPathOnlyIfExistsShouldFail() throws Exception {
 
         c.set("obj", new IRLObject());
         Path p = new Path(".none");
-        c.set("obj", "strangle", Client.ExistenceModifier.MUST_EXIST, p);
+        c.set("obj", "strangle", JReJSON.ExistenceModifier.MUST_EXIST, p);
     }
 
     @Test(expected = Exception.class)
@@ -175,4 +178,33 @@ public void typeException() throws Exception {
         c.type("foobar", new Path(".foo[1]"));
     }
 
+    @Test(expected = Exception.class)
+    public void type1Exception() throws Exception {
+        c._conn().flushDB();
+        c.set("foobar", new FooBarObject(), Path.RootPath());
+        c.type("foobar", new Path(".foo[1]"));
+
+        JedisPoolConfig conf = new JedisPoolConfig();
+        conf.setMaxTotal(poolSize);
+        conf.setTestOnBorrow(false);
+        conf.setTestOnReturn(false);
+        conf.setTestOnCreate(false);
+        conf.setTestWhileIdle(false);
+        conf.setMinEvictableIdleTimeMillis(60000);
+        conf.setTimeBetweenEvictionRunsMillis(30000);
+        conf.setNumTestsPerEvictionRun(-1);
+        conf.setFairness(true);
+
+        JedisPool pool = new JedisPool(conf, "localhost", 6379,1000);
+
+        JReJSON jReJSON = (JReJSON) pool.getResource();
+
+        
+
+        //Pipeline pipe =  jReJSON.pipelined();
+
+
+    }
+
+
 }

src/test/java/io/rejson/UsageExampleTest.java

@@ -7,14 +7,14 @@
 public class UsageExampleTest {
     @Before
     public void initialize() {
-        Client c = new Client("localhost", 6379);
+        JReJSON c = new JReJSON("localhost", 6379);
         c._conn().flushDB();
     }
 
     @Test
     public void exampleShouldWork() throws Exception {
         // Firstly, the client's initialization
-        Client c = new Client("localhost", 6379);
+        JReJSON c = new JReJSON("localhost", 6379);
 
         // Setting a Redis key name _foo_ to the string _"bar"_, and reading it back
         c.set("foo", "bar");