Feature/tp3 support

.gitignore

@@ -1 +1,3 @@
 build
+.idea/
+.gradle/

.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

README.md

@@ -5,7 +5,7 @@ Spring data gremlin makes it easier to implement Graph based repositories. This
 ## Features
 
 - All the great features of [Spring Data](http://projects.spring.io/spring-data)
-- Support for [OrientDB](http://orientdb.com) and [TitanDB](http://s3.thinkaurelius.com/docs/titan/current)  out of the box
+- Support for [OrientDB](http://orientdb.com) and [JanusGraph](http://janusgraph.org)  out of the box
 - Schema creation in supported databases
 - Support to build repositories based on Spring using our [custom set of annotations](https://github.com/gjrwebber/org/springframework/data/gremlin/annotation), [spring-data-neo4j](http://docs.spring.io/spring-data/neo4j/docs/current/reference/html/#reference_programming-model_annotations) or JPA annotations.
 - Vertex and Edge repository support
@@ -98,7 +98,7 @@ Once you have your build configuration setup you need to add the correct depende
 
 #### Database dependency
 **OrientDB** - com.github.gjrwebber:spring-data-gremlin-orientdb:0.1.0-SNAPSHOT  
-**TitanDB** - com.github.gjrwebber:spring-data-gremlin-titan:0.1.0-SNAPSHOT
+**JanusGraph** - com.github.gjrwebber:spring-data-gremlin-janus:0.1.0-SNAPSHOT
 
 #### Schema generator dependency
 **Default** - No further dependency  
@@ -124,10 +124,10 @@ Using OrientDB database with Neo4j schema generator:
 
 #### Gradle example
 
-Using TitanDB with default schema generator:
+Using JanusGraph with default schema generator:
 
 ```
-compile("com.github.gjrwebber:spring-data-gremlin-titan:0.1.0-SNAPSHOT")
+compile("com.github.gjrwebber:spring-data-gremlin-janus:0.1.0-SNAPSHOT")
 ```
 
 ### Create you domain model

build.gradle

@@ -8,7 +8,10 @@ buildscript {
 }
 
 ext {
-    springVersion = "4.2.4.RELEASE"
+
+    springVersion = "4.3.7.RELEASE"
+    gremlinVersion = "3.3.0-SNAPSHOT"
+    jacksonVersion = "2.8.8"
 }
 
 
@@ -25,31 +28,55 @@ allprojects {
     apply plugin: 'propdeps-eclipse'
 
     sourceCompatibility = 1.7
-    version = '0.1.1-SNAPSHOT'
+    version = '0.2.0-SNAPSHOT'
     group = 'com.github.gjrwebber'
 
     repositories {
         mavenLocal()
         maven { url 'https://repo.spring.io/libs-release' }
         maven { url 'https://repo.spring.io/libs-snapshot' }
+        maven { url 'http://repository.apache.org/snapshots' }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+        maven { url 'https://oss.sonatype.org/service/local/staging/deploy/maven2' }
+        maven { url 'https://maven.oracle.com'}
+        maven { url "https://jitpack.io" }
         mavenCentral()
     }
 
     dependencies {
         compile("org.springframework:spring-core:${springVersion}")
         compile("org.springframework:spring-context:${springVersion}")
         compile("org.springframework:spring-tx:${springVersion}")
-        compile('org.springframework.data:spring-data-commons:1.11.0.RELEASE')
-        compile('com.tinkerpop.blueprints:blueprints-core:2.6.0')
-        compile('com.tinkerpop.gremlin:gremlin-java:2.6.0')
-        compile('com.tinkerpop.gremlin:gremlin-groovy:2.6.0')
+        compile('org.springframework.data:spring-data-commons:1.13.1.RELEASE')
+        compile("org.apache.tinkerpop:gremlin-core:${gremlinVersion}") {
+            exclude group: 'com.carrotsearch'
+        }
+        compile('com.carrotsearch:hppc:0.6.0')
+        compile("org.apache.tinkerpop:gremlin-driver:${gremlinVersion}") {
+            exclude group: 'com.carrotsearch'
+        }
+        compile("org.apache.tinkerpop:gremlin-groovy:${gremlinVersion}") {
+            exclude group: 'com.carrotsearch'
+        }
+        compile("org.apache.tinkerpop:tinkergraph-gremlin:${gremlinVersion}") {
+            exclude group: 'com.carrotsearch'
+        }
+
         compile('org.apache.commons:commons-collections4:4.0')
         compile('org.apache.commons:commons-lang3:3.4')
-        compile('org.reflections:reflections:0.9.9-RC1')
+        compile('org.reflections:reflections:0.9.9-RC1') {
+            exclude group: 'com.google.guava'
+        }
+
+        compile('com.google.guava:guava:19.0')
+        compile("com.fasterxml.jackson.core:jackson-core:${jacksonVersion}")
+        compile("com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}")
+        compile("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}")
+        compile('org.slf4j:slf4j-simple:1.7.7')
         testCompile('junit:junit:4.12')
         testCompile('org.mockito:mockito-core:1.10.19')
         testCompile("org.springframework:spring-test:${springVersion}")
-//        testCompile('org.slf4j:slf4j-simple:1.7.7')
+
     }
 
     task javadocJar(type: Jar) {
@@ -77,15 +104,15 @@ allprojects {
     uploadArchives {
         repositories {
             mavenDeployer {
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                    authentication(userName: ossrhUsername, password: ossrhPassword)
-                }
+                //beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-                snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                    authentication(userName: ossrhUsername, password: ossrhPassword)
-                }
+//                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+//                    authentication(userName: ossrhUsername, password: ossrhPassword)
+//                }
+//
+//                snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+//                    authentication(userName: ossrhUsername, password: ossrhPassword)
+//                }
 
                 pom.project {
                     name 'Spring Data Gremlin'
@@ -126,6 +153,11 @@ allprojects {
                             name 'Graham Webber'
                             email '[email protected]'
                         }
+                        developer {
+                            id 'zifnab87'
+                            name 'Michail Michailidis'
+                            email '[email protected]'
+                        }
                     }
                 }
             }
@@ -135,4 +167,3 @@ allprojects {
 }
 
 
-

out/test/spring-data-gremlin-core/application.properties

@@ -0,0 +1,3 @@
+
+logging.level.org.springframework.data.gremlin=DEBUG
+#logging.level.org.springframework=DEBUG

settings.gradle

@@ -1,3 +1,3 @@
-include 'spring-data-gremlin-core', 'spring-data-gremlin-test', 'spring-data-gremlin-schemagen-jpa', 'spring-data-gremlin-schemagen-neo4j', 'spring-data-gremlin-orientdb', 'spring-data-gremlin-tinker', 'spring-data-gremlin-titan'
+include 'spring-data-gremlin-core', 'spring-data-gremlin-test', 'spring-data-gremlin-schemagen-jpa', 'spring-data-gremlin-schemagen-neo4j', 'spring-data-gremlin-orientdb', 'spring-data-gremlin-tinker', 'spring-data-gremlin-janus'
 rootProject.name = 'spring-data-gremlin'
 

spring-data-gremlin-core/application.properties

@@ -0,0 +1 @@
+logging.level.org.springframework.data.gremlin=DEBUG

spring-data-gremlin-core/src/main/java/org/springframework/data/gremlin/annotation/Link.java

@@ -1,6 +1,7 @@
 package org.springframework.data.gremlin.annotation;
 
-import com.tinkerpop.blueprints.Direction;
+
+import org.apache.tinkerpop.gremlin.structure.Direction;
 
 import java.lang.annotation.*;
 

spring-data-gremlin-core/src/main/java/org/springframework/data/gremlin/annotation/LinkVia.java

@@ -1,6 +1,7 @@
 package org.springframework.data.gremlin.annotation;
 
-import com.tinkerpop.blueprints.Direction;
+
+import org.apache.tinkerpop.gremlin.structure.Direction;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-data-gremlin-core/src/main/java/org/springframework/data/gremlin/query/AbstractGremlinQuery.java

@@ -138,4 +138,6 @@ private boolean isMapQuery() {
     private boolean isCompositeQuery() {
         return method.getReturnedObjectType() == CompositeResult.class;
     }
+
+
 }

spring-data-gremlin-core/src/main/java/org/springframework/data/gremlin/query/AbstractNativeGremlinQuery.java

@@ -4,6 +4,8 @@
 import org.springframework.data.gremlin.schema.GremlinSchemaFactory;
 import org.springframework.data.gremlin.tx.GremlinGraphFactory;
 
+import java.util.Collection;
+
 /**
  * Native query abstraction for {@link AbstractGremlinQuery}s.
  *
@@ -23,6 +25,7 @@ public abstract class AbstractNativeGremlinQuery extends AbstractGremlinQuery {
     public AbstractNativeGremlinQuery(GremlinGraphFactory dbf, GremlinQueryMethod method, GremlinSchemaFactory schemaFactory, GremlinGraphAdapter graphAdapter, String query) {
         super(schemaFactory, method, graphAdapter);
 
+
         this.dbf = dbf;
         this.method = method;
         this.schemaFactory = schemaFactory;
@@ -61,4 +64,5 @@ protected boolean isCountQuery() {
     protected boolean isModifyingQuery() {
         return modifyingQuery;
     }
+
 }