From 6f4a9f5d670cc61d2bc6fa583a627e32813891e3 Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Wed, 29 Jul 2020 11:52:29 +0300 Subject: [PATCH 1/3] Few code cleanups --- README.md | 10 +++++----- .../java/com/redislabs/redisgraph/impl/Utils.java | 12 ++++++------ .../redisgraph/impl/api/AbstractRedisGraph.java | 2 -- .../redisgraph/impl/api/ContextedRedisGraph.java | 2 +- .../redislabs/redisgraph/impl/api/RedisGraph.java | 2 +- .../redisgraph/impl/resultset/HeaderImpl.java | 4 ++-- .../com/redislabs/redisgraph/RedisGraphAPITest.java | 2 +- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 1d91d64..06b8432 100644 --- a/README.md +++ b/README.md @@ -64,12 +64,12 @@ public class RedisGraphExample { RedisGraph graph = new RedisGraph(); Map params = new HashMap<>(); - params.put("age", 30); - params.put("name", "amit"); + params.put("age", 30); + params.put("name", "amit"); - // send queries to a specific graph called "social" - graph.query("social","CREATE (:person{name:'roi',age:32})"); - graph.query("social","CREATE (:person{name:$name,age:$age})", params); + // send queries to a specific graph called "social" + graph.query("social","CREATE (:person{name:'roi',age:32})"); + graph.query("social","CREATE (:person{name:$name,age:$age})", params); graph.query("social","MATCH (a:person), (b:person) WHERE (a.name = 'roi' AND b.name='amit') CREATE (a)-[:knows]->(b)"); ResultSet resultSet = graph.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a, r, b"); diff --git a/src/main/java/com/redislabs/redisgraph/impl/Utils.java b/src/main/java/com/redislabs/redisgraph/impl/Utils.java index dbc746a..7216ac4 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/Utils.java +++ b/src/main/java/com/redislabs/redisgraph/impl/Utils.java @@ -88,7 +88,7 @@ public static String prepareQuery(String query, Map params){ private static String arrayToString(Object[] arr) { StringBuilder sb = new StringBuilder().append('['); - sb.append(String.join(", ", Arrays.stream(arr).map(obj->valueToString(obj)).collect(Collectors.toList()))); + sb.append(String.join(", ", Arrays.stream(arr).map(Utils::valueToString).collect(Collectors.toList()))); sb.append(']'); return sb.toString(); } @@ -119,22 +119,22 @@ private static String valueToString(Object value) { * @return formatter procedure call */ public static String prepareProcedure(String procedure, List args , Map> kwargs){ - args = args.stream().map( s -> Utils.quoteString(s)).collect(Collectors.toList()); + args = args.stream().map( Utils::quoteString).collect(Collectors.toList()); StringBuilder queryStringBuilder = new StringBuilder(); - queryStringBuilder.append("CALL ").append(procedure).append("("); + queryStringBuilder.append("CALL ").append(procedure).append('('); int i = 0; for (; i < args.size() - 1; i++) { - queryStringBuilder.append(args.get(i)).append(","); + queryStringBuilder.append(args.get(i)).append(','); } if (i == args.size()-1) { queryStringBuilder.append(args.get(i)); } - queryStringBuilder.append(")"); + queryStringBuilder.append(')'); List kwargsList = kwargs.getOrDefault("y", null); if(kwargsList != null){ i = 0; for (; i < kwargsList.size() - 1; i++) { - queryStringBuilder.append(kwargsList.get(i)).append(","); + queryStringBuilder.append(kwargsList.get(i)).append(','); } queryStringBuilder.append(kwargsList.get(i)); diff --git a/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java b/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java index dec71f5..982bca5 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/impl/api/AbstractRedisGraph.java @@ -13,8 +13,6 @@ */ public abstract class AbstractRedisGraph implements RedisGraph { - - /** * Inherited classes should return a Jedis connection, with respect to their context * @return Jedis connection diff --git a/src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java b/src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java index ab92534..9d4478d 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java @@ -19,7 +19,7 @@ */ public class ContextedRedisGraph extends AbstractRedisGraph implements RedisGraphContext, RedisGraphCacheHolder { - private Jedis connectionContext; + private final Jedis connectionContext; private RedisGraphCaches caches; /** diff --git a/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraph.java b/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraph.java index d3bea57..5737205 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraph.java +++ b/src/main/java/com/redislabs/redisgraph/impl/api/RedisGraph.java @@ -15,7 +15,7 @@ public class RedisGraph extends AbstractRedisGraph implements RedisGraphContextGenerator { private final Pool client; - private RedisGraphCaches caches = new RedisGraphCaches(); + private final RedisGraphCaches caches = new RedisGraphCaches(); /** * Creates a client running on the local machine diff --git a/src/main/java/com/redislabs/redisgraph/impl/resultset/HeaderImpl.java b/src/main/java/com/redislabs/redisgraph/impl/resultset/HeaderImpl.java index a9ae068..c4e6c1e 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/resultset/HeaderImpl.java +++ b/src/main/java/com/redislabs/redisgraph/impl/resultset/HeaderImpl.java @@ -36,7 +36,7 @@ public HeaderImpl(List> raw) { */ @Override public List getSchemaNames() { - if (schemaNames.size() == 0) { + if (schemaNames.isEmpty()) { buildSchema(); } return schemaNames; @@ -47,7 +47,7 @@ public List getSchemaNames() { */ @Override public List getSchemaTypes() { - if (schemaTypes.size() == 0) { + if (schemaTypes.isEmpty()) { buildSchema(); } return schemaTypes; diff --git a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java index 7d42997..760e437 100644 --- a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java +++ b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java @@ -340,7 +340,7 @@ public void testMultiThread(){ Property nameProperty = new Property<>("name", "roi"); Property ageProperty = new Property<>("age", 32); - Property lastNameProperty =new Property<>("lastName", "a"); + Property lastNameProperty = new Property<>("lastName", "a"); Node expectedNode = new Node(); expectedNode.setId(0); From af3b3c0bc35cfd7ad432697c33caf9a1ae46109c Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Wed, 29 Jul 2020 15:38:32 +0300 Subject: [PATCH 2/3] Add HeaderImpl test --- .../com/redislabs/redisgraph/RedisGraphAPITest.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java index 760e437..51d5eac 100644 --- a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java +++ b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java @@ -177,15 +177,17 @@ public void testHeader(){ ResultSet queryResult = api.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a,r, a.age"); - Assert.assertNotNull(queryResult.getHeader()); Header header = queryResult.getHeader(); - + Assert.assertNotNull(header); + Assert.assertEquals("HeaderImpl{" + + "schemaTypes=[COLUMN_SCALAR, COLUMN_SCALAR, COLUMN_SCALAR], " + + "schemaNames=[a, r, a.age]}", header.toString()); +// Assert.assertEquals(-1901778507, header.hashCode()); + List schemaNames = header.getSchemaNames(); Assert.assertNotNull(schemaNames); - Assert.assertEquals(3, schemaNames.size()); - Assert.assertEquals("a", schemaNames.get(0)); Assert.assertEquals("r", schemaNames.get(1)); Assert.assertEquals("a.age", schemaNames.get(2)); @@ -315,6 +317,7 @@ public void testRecord(){ } + @Ignore @Test public void tinyTestMultiThread(){ ResultSet resultSet = api.query("social", "CREATE ({name:'roi',age:32})"); From b5d4d9b339c3c0e751bc2c050c6895d4138382b0 Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Wed, 19 Aug 2020 13:56:28 +0300 Subject: [PATCH 3/3] pom cleanup --- pom.xml | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 84e9a90..40144af 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ JRedisGraph Official client for Redis-Graph - https://oss.redislabs.com/redisgraph + https://redisgraph.io RedisLabs @@ -18,16 +18,16 @@ CircleCI - https://circleci.com/gh/RedisLabs/JRedisGraph + https://circleci.com/gh/RedisGraph/JRedisGraph - https://github.com/RedisLabs/JRedisGraph/issues + https://github.com/RedisGraph/JRedisGraph/issues Github - https://github.com/RedisLabs/JRedisGraph - scm:git:git://github.com/RedisLabs/JRedisGraph.git - scm:git:git@github.com:RedisLabs/JRedisGraph.git + https://github.com/RedisGraph/JRedisGraph + scm:git:git://github.com/RedisGraph/JRedisGraph.git + scm:git:git@github.com:RedisGraph/JRedisGraph.git @@ -48,17 +48,6 @@ - - org.apache.commons - commons-pool2 - 2.8.0 - - - junit - junit - 4.12 - test - redis.clients jedis @@ -69,6 +58,12 @@ commons-text 1.8 + + junit + junit + 4.12 + test + org.slf4j slf4j-simple