Merge pull request #3 from leonchen83/master

modify following files

Author: itamarhaber

.gitignore

@@ -4,3 +4,25 @@
 !**/*.md
 !.gitignore
 !pom.xml
+
+/target
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# Eclipse
+/.project
+/.classpath
+
+# Idea
+/redis-replicator.iml
+/.idea

README.md

@@ -13,17 +13,17 @@ This project is currently WIP and the interface may change. Also note that only
 1. Install Jedis (once v3 is released this step will be obsolete)
     1. Clone it: `git clone --depth 1 [email protected]:xetorthio/jedis.git`
     2. `cd jedis`
-    3. `mvn -Dmaven.test.skip=true install`
+    3. `mvn clean install -Dmaven.test.skip=true`
 2. Install JReJSON (todo: add to maven)
     1. Clone it: `git clone [email protected]:RedisLabs/JReJSON.git`
     2. `cd JReJSON`
-    3. `mvn -Dmaven.test.skip=true install`
+    3. `mvn clean install -Dmaven.test.skip=true`
 
 ## Usage example
 
-```java
+```java  
 import redis.clients.jedis.Jedis;
-import io.rejson.JReJSON;
+import com.redislabs.modules.rejson.JReJSON;
 
 // First get a connection
 Jedis jedis = new Jedis("localhost", 6379);

pom.xml

@@ -1,79 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ BSD 2-Clause License
+ ~
+ ~ Copyright (c) 2017, Redis Labs
+ ~ All rights reserved.
+ ~
+ ~ Redistribution and use in source and binary forms, with or without
+ ~ modification, are permitted provided that the following conditions are met:
+ ~
+ ~ * Redistributions of source code must retain the above copyright notice, this
+ ~ list of conditions and the following disclaimer.
+ ~
+ ~ * Redistributions in binary form must reproduce the above copyright notice,
+ ~ this list of conditions and the following disclaimer in the documentation
+ ~ and/or other materials provided with the distribution.
+ ~
+ ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ ~ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ ~ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ ~ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ ~ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ ~ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ ~ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ ~ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ ~ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.redislabs</groupId>
     <artifactId>jrejson</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
+    <name>jrejson</name>
+
+    <developers>
+        <developer>
+            <name>Itamar Haber</name>
+            <organization>redislabs</organization>
+            <organizationUrl>https://redislabs.com/</organizationUrl>
+        </developer>
+    </developers>
+
+    <scm>
+        <connection>scm:git:[email protected]:RedisLabs/JReJSON.git</connection>
+        <url>scm:git:[email protected]:RedisLabs/JReJSON.git</url>
+        <developerConnection>scm:git:[email protected]:RedisLabs/JReJSON.git</developerConnection>
+        <tag>1.0.0</tag>
+    </scm>
+
+    <issueManagement>
+        <system>github</system>
+        <url>https://github.com/RedisLabs/JReJSON/issues</url>
+    </issueManagement>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <gson.version>2.8.0</gson.version>
+        <jedis.version>3.0.0-SNAPSHOT</jedis.version>
+        <commons.pool2.version>2.4.2</commons.pool2.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>${jedis.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.0</version>
+            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-            <version>2.4.2</version>
+            <version>${commons.pool2.version}</version>
         </dependency>
+        <!-- test -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <maven.test.source>8</maven.test.source>
-        <maven.test.target>8</maven.test.target>
-    </properties>
-
 
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
                 <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <!--<mainClass></mainClass>-->
-                        </manifest>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.3</version>
+                <configuration>
+                    <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
                 <executions>
                     <execution>
-                        <id>make-my-jar-with-dependencies</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>jar</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
-
-
-
-
 </project>

src/main/java/io/rejson/JReJSON.java …om/redislabs/modules/rejson/JReJSON.javasrc/main/java/io/rejson/JReJSON.java renamed to src/main/java/com/redislabs/modules/rejson/JReJSON.java src/main/java/io/rejson/JReJSON.java renamed to src/main/java/com/redislabs/modules/rejson/JReJSON.java

@@ -1,4 +1,32 @@
-package io.rejson;
+/*
+ * BSD 2-Clause License
+ *
+ * Copyright (c) 2017, Redis Labs
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.redislabs.modules.rejson;
 
 import com.google.gson.Gson;
 import redis.clients.jedis.Jedis;
@@ -95,7 +123,7 @@ else if (1 == path.length)
      */
     public static Long del(Jedis conn, String key, Path... path) {
 
-        ArrayList<byte[]> args = new ArrayList(2);
+        List<byte[]> args = new ArrayList(2);
 
         args.add(SafeEncoder.encode(key));
         args.add(SafeEncoder.encode(getSingleOptionalPath(path).toString()));
@@ -117,7 +145,7 @@ public static Long del(Jedis conn, String key, Path... path) {
      */
     public static Object get(Jedis conn, String key, Path... paths) {
 
-        ArrayList<byte[]> args = new ArrayList(2);
+        List<byte[]> args = new ArrayList(2);
 
         args.add(SafeEncoder.encode(key));
         for (Path p :paths) {
@@ -143,7 +171,7 @@ public static Object get(Jedis conn, String key, Path... paths) {
      */
     public static void set(Jedis conn, String key, Object object, ExistenceModifier flag, Path... path) {
 
-        ArrayList<byte[]> args = new ArrayList(4);
+        List<byte[]> args = new ArrayList(4);
 
         args.add(SafeEncoder.encode(key));
         args.add(SafeEncoder.encode(getSingleOptionalPath(path).toString()));
@@ -178,11 +206,9 @@ public static void set(Jedis conn, String key, Object object, Path... path) {
      * @param path optional single path in the object, defaults to root
      * @return the Java class of the requested object
      */
-    public static Class<? extends Object> type(Jedis conn, String key, Path... path) {
-
-        ArrayList<byte[]> args = new ArrayList(2);
-
+    public static Class<?> type(Jedis conn, String key, Path... path) {
 
+        List<byte[]> args = new ArrayList(2);
 
         args.add(SafeEncoder.encode(key));
         args.add(SafeEncoder.encode(getSingleOptionalPath(path).toString()));

src/main/java/com/redislabs/modules/rejson/Path.java

@@ -0,0 +1,55 @@
+/*
+ * BSD 2-Clause License
+ *
+ * Copyright (c) 2017, Redis Labs
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.redislabs.modules.rejson;
+
+/**
+ * Path is a ReJSON path, representing a valid path into an object
+ * TODO: make path building even more fun
+ */
+
+public class Path {
+    private final String strPath;
+
+    public Path(final String strPath) {
+        this.strPath = strPath;
+    }
+
+    /**
+     * Makes a root path
+     * @return the root path
+     */
+    public static Path RootPath() {
+        return new Path(".");
+    }
+
+    @Override
+    public String toString() {
+        return strPath;
+    }
+}