From d058b9ae665df87642775026632400eb1cccf931 Mon Sep 17 00:00:00 2001 From: DvirDukhan Date: Thu, 6 Jun 2019 15:29:57 +0300 Subject: [PATCH 1/3] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e0ee5de..8ae38a7 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ RedisGraph Java client ``` ### Snapshots +To be used with RedisGraph 2.0 (not officially released) ```xml @@ -39,7 +40,7 @@ and com.redislabs jredisgraph - 1.0.5-SNAPSHOT + 2.0.0-SNAPSHOT ``` From 582e3c55f2e4c0dfe0453491b8a6ad80498e474c Mon Sep 17 00:00:00 2001 From: DvirDukhan Date: Wed, 12 Jun 2019 08:34:28 +0300 Subject: [PATCH 2/3] added entity property names keyset available. closes #38 --- .../com/redislabs/redisgraph/impl/GraphEntity.java | 8 ++++++++ .../com/redislabs/redisgraph/RedisGraphAPITest.java | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/redislabs/redisgraph/impl/GraphEntity.java b/src/main/java/com/redislabs/redisgraph/impl/GraphEntity.java index 9357b97..c12f5af 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/GraphEntity.java +++ b/src/main/java/com/redislabs/redisgraph/impl/GraphEntity.java @@ -51,6 +51,14 @@ public void addProperty(String name, ResultSetScalarTypes type, Object value){ } + /** + * + * @return Entity's property names, as a Set + */ + public Set getEntityPropertyNames(){ + return propertyMap.keySet(); + } + /** * Add a property to the entity * @param property diff --git a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java index 8d71363..e15498a 100644 --- a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java +++ b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java @@ -280,6 +280,10 @@ public void testRecord(){ place, since, doubleValue, false, null), record.values()); + Node a = record.getValue("a"); + for (String propertyName : expectedNode.getEntityPropertyNames()){ + Assert.assertEquals(expectedNode.getProperty(propertyName) ,a.getProperty(propertyName)); + } Assert.assertEquals( "roi", record.getString(2)); Assert.assertEquals( "32", record.getString(3)); @@ -408,9 +412,9 @@ public void testAdditionToProcedures(){ Assert.assertNotNull(api.query("social", "MATCH (a:person), (b:person) WHERE (a.name = 'roi' AND b.name='amit') CREATE (a)-[:knows]->(b)")); - List resultSets = IntStream.range(0,16).parallel(). - mapToObj(i-> api.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a,r")). - collect(Collectors.toList()); +// List resultSets = IntStream.range(0,16).parallel(). +// mapToObj(i-> api.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a,r")). +// collect(Collectors.toList()); //expected objects init Property nameProperty = new Property("name", ResultSet.ResultSetScalarTypes.PROPERTY_STRING, "roi"); From 45399e32842f536be602942954f2b818a81fbcf9 Mon Sep 17 00:00:00 2001 From: DvirDukhan Date: Wed, 12 Jun 2019 10:40:34 +0300 Subject: [PATCH 3/3] modified package structure --- .../java/com/redislabs/redisgraph/RedisGraph.java | 2 +- .../redisgraph/{impl => graph_entities}/Edge.java | 2 +- .../{impl => graph_entities}/GraphEntity.java | 2 +- .../redisgraph/{impl => graph_entities}/Node.java | 2 +- .../redisgraph/{impl => graph_entities}/Property.java | 2 +- .../com/redislabs/redisgraph/impl/ResultSetImpl.java | 10 ++++++---- .../redisgraph/impl/{ => graph_cache}/GraphCache.java | 2 +- .../impl/{ => graph_cache}/GraphCacheList.java | 2 +- .../com/redislabs/redisgraph/RedisGraphAPITest.java | 11 +++-------- 9 files changed, 16 insertions(+), 19 deletions(-) rename src/main/java/com/redislabs/redisgraph/{impl => graph_entities}/Edge.java (97%) rename src/main/java/com/redislabs/redisgraph/{impl => graph_entities}/GraphEntity.java (98%) rename src/main/java/com/redislabs/redisgraph/{impl => graph_entities}/Node.java (97%) rename src/main/java/com/redislabs/redisgraph/{impl => graph_entities}/Property.java (97%) rename src/main/java/com/redislabs/redisgraph/impl/{ => graph_cache}/GraphCache.java (96%) rename src/main/java/com/redislabs/redisgraph/impl/{ => graph_cache}/GraphCacheList.java (97%) diff --git a/src/main/java/com/redislabs/redisgraph/RedisGraph.java b/src/main/java/com/redislabs/redisgraph/RedisGraph.java index 5542538..9c0871d 100644 --- a/src/main/java/com/redislabs/redisgraph/RedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/RedisGraph.java @@ -1,6 +1,6 @@ package com.redislabs.redisgraph; -import com.redislabs.redisgraph.impl.GraphCache; +import com.redislabs.redisgraph.impl.graph_cache.GraphCache; import com.redislabs.redisgraph.impl.ResultSetImpl; import org.apache.commons.text.translate.AggregateTranslator; import org.apache.commons.text.translate.CharSequenceTranslator; diff --git a/src/main/java/com/redislabs/redisgraph/impl/Edge.java b/src/main/java/com/redislabs/redisgraph/graph_entities/Edge.java similarity index 97% rename from src/main/java/com/redislabs/redisgraph/impl/Edge.java rename to src/main/java/com/redislabs/redisgraph/graph_entities/Edge.java index 4b113fc..fa30d03 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/Edge.java +++ b/src/main/java/com/redislabs/redisgraph/graph_entities/Edge.java @@ -1,4 +1,4 @@ -package com.redislabs.redisgraph.impl; +package com.redislabs.redisgraph.graph_entities; import java.util.Objects; diff --git a/src/main/java/com/redislabs/redisgraph/impl/GraphEntity.java b/src/main/java/com/redislabs/redisgraph/graph_entities/GraphEntity.java similarity index 98% rename from src/main/java/com/redislabs/redisgraph/impl/GraphEntity.java rename to src/main/java/com/redislabs/redisgraph/graph_entities/GraphEntity.java index c12f5af..d2083a6 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/GraphEntity.java +++ b/src/main/java/com/redislabs/redisgraph/graph_entities/GraphEntity.java @@ -1,4 +1,4 @@ -package com.redislabs.redisgraph.impl; +package com.redislabs.redisgraph.graph_entities; import com.redislabs.redisgraph.ResultSet.ResultSetScalarTypes; diff --git a/src/main/java/com/redislabs/redisgraph/impl/Node.java b/src/main/java/com/redislabs/redisgraph/graph_entities/Node.java similarity index 97% rename from src/main/java/com/redislabs/redisgraph/impl/Node.java rename to src/main/java/com/redislabs/redisgraph/graph_entities/Node.java index 80b316f..6ede861 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/Node.java +++ b/src/main/java/com/redislabs/redisgraph/graph_entities/Node.java @@ -1,4 +1,4 @@ -package com.redislabs.redisgraph.impl; +package com.redislabs.redisgraph.graph_entities; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/redislabs/redisgraph/impl/Property.java b/src/main/java/com/redislabs/redisgraph/graph_entities/Property.java similarity index 97% rename from src/main/java/com/redislabs/redisgraph/impl/Property.java rename to src/main/java/com/redislabs/redisgraph/graph_entities/Property.java index 7eee7db..9a897f8 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/Property.java +++ b/src/main/java/com/redislabs/redisgraph/graph_entities/Property.java @@ -1,4 +1,4 @@ -package com.redislabs.redisgraph.impl; +package com.redislabs.redisgraph.graph_entities; import com.redislabs.redisgraph.ResultSet; diff --git a/src/main/java/com/redislabs/redisgraph/impl/ResultSetImpl.java b/src/main/java/com/redislabs/redisgraph/impl/ResultSetImpl.java index 252636a..9cfc5b8 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/ResultSetImpl.java +++ b/src/main/java/com/redislabs/redisgraph/impl/ResultSetImpl.java @@ -1,9 +1,11 @@ package com.redislabs.redisgraph.impl; -import com.redislabs.redisgraph.Header; -import com.redislabs.redisgraph.Record; -import com.redislabs.redisgraph.ResultSet; -import com.redislabs.redisgraph.Statistics; +import com.redislabs.redisgraph.*; +import com.redislabs.redisgraph.graph_entities.Edge; +import com.redislabs.redisgraph.graph_entities.GraphEntity; +import com.redislabs.redisgraph.graph_entities.Node; +import com.redislabs.redisgraph.graph_entities.Property; +import com.redislabs.redisgraph.impl.graph_cache.GraphCache; import redis.clients.jedis.util.SafeEncoder; import java.util.ArrayList; diff --git a/src/main/java/com/redislabs/redisgraph/impl/GraphCache.java b/src/main/java/com/redislabs/redisgraph/impl/graph_cache/GraphCache.java similarity index 96% rename from src/main/java/com/redislabs/redisgraph/impl/GraphCache.java rename to src/main/java/com/redislabs/redisgraph/impl/graph_cache/GraphCache.java index 15239b3..765dff8 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/GraphCache.java +++ b/src/main/java/com/redislabs/redisgraph/impl/graph_cache/GraphCache.java @@ -1,4 +1,4 @@ -package com.redislabs.redisgraph.impl; +package com.redislabs.redisgraph.impl.graph_cache; import com.redislabs.redisgraph.RedisGraph; diff --git a/src/main/java/com/redislabs/redisgraph/impl/GraphCacheList.java b/src/main/java/com/redislabs/redisgraph/impl/graph_cache/GraphCacheList.java similarity index 97% rename from src/main/java/com/redislabs/redisgraph/impl/GraphCacheList.java rename to src/main/java/com/redislabs/redisgraph/impl/graph_cache/GraphCacheList.java index 58b8b43..d608f16 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/GraphCacheList.java +++ b/src/main/java/com/redislabs/redisgraph/impl/graph_cache/GraphCacheList.java @@ -1,4 +1,4 @@ -package com.redislabs.redisgraph.impl; +package com.redislabs.redisgraph.impl.graph_cache; import com.redislabs.redisgraph.Record; import com.redislabs.redisgraph.RedisGraph; diff --git a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java index e15498a..8730526 100644 --- a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java +++ b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java @@ -7,9 +7,9 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import com.redislabs.redisgraph.impl.Edge; -import com.redislabs.redisgraph.impl.Node; -import com.redislabs.redisgraph.impl.Property; +import com.redislabs.redisgraph.graph_entities.Edge; +import com.redislabs.redisgraph.graph_entities.Node; +import com.redislabs.redisgraph.graph_entities.Property; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -411,11 +411,6 @@ public void testAdditionToProcedures(){ Assert.assertNotNull(api.query("social", "CREATE (:person{name:'amit',age:30})")); Assert.assertNotNull(api.query("social", "MATCH (a:person), (b:person) WHERE (a.name = 'roi' AND b.name='amit') CREATE (a)-[:knows]->(b)")); - -// List resultSets = IntStream.range(0,16).parallel(). -// mapToObj(i-> api.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a,r")). -// collect(Collectors.toList()); - //expected objects init Property nameProperty = new Property("name", ResultSet.ResultSetScalarTypes.PROPERTY_STRING, "roi"); Property ageProperty = new Property("age", ResultSet.ResultSetScalarTypes.PROPERTY_INTEGER, 32);