code cleanup

Author: gkorland

src/main/java/com/redislabs/redisgraph/Record.java

@@ -13,44 +13,46 @@ public interface Record {
 	 * The value at the given field index (represented as String)
 	 * 
 	 * @param index
-	 * @return
+	 * @return string representation of the value
 	 */
 	String getString(int index);
 
 	/**
 	 * The value at the given field (represented as String)
 	 * 
-	 * @param key
-	 * @return
+	 * @param key header key 
+	 * 
+	 * @return string representation of the value
 	 */
 	String getString(String key);
 
 	/**
 	 * The keys of the record
 	 * 
-	 * @return
+	 * @return list of the record key
 	 */
 	List<String> keys();
 
 	/**
 	 * The values of the record
 	 * 
-	 * @return
+	 * @return list of the record values
 	 */
 	List<String> values();
 
 	/**
-	 * Check if the keys contain the given key
+	 * Check if the record header contains the given key
+	 * 
+	 * @param key header key 
 	 * 
-	 * @param key
-	 * @return
+	 * @return <code>true</code> if the the key exists 
 	 */
 	boolean	containsKey(String key);
 
 	/**
 	 * The number of fields in this record
 	 * 
-	 * @return
+	 * @return the number of fields
 	 */
 	int size();
 }

src/main/java/com/redislabs/redisgraph/RedisGraphAPI.java

@@ -13,8 +13,8 @@
  */
 public class RedisGraphAPI {
 
-    final private Pool<Jedis> client;
-    final private String graphId;
+	private final Pool<Jedis> client;
+    private final String graphId;
 
     /**
      * Creates a client to a specific graph running on the local machine
@@ -54,7 +54,7 @@ public RedisGraphAPI(String graphId, Pool<Jedis> jedis) {
      * @return a result set 
      */
     public ResultSet query(String query) {
-    	 try (Jedis conn = _conn()) {
+    	 try (Jedis conn = getConnection()) {
              return new ResultSetImpl(sendCommand(conn, Command.QUERY, graphId, query).getObjectMultiBulkReply());
          }
     }
@@ -65,19 +65,19 @@ public ResultSet query(String query) {
      * @return delete running time statistics 
      */
     public String deleteGraph() {
-		  try (Jedis conn = _conn()) {
+		  try (Jedis conn = getConnection()) {
 		    return sendCommand(conn, Command.DELETE, graphId).getBulkReply();
 		  }
 	  }
 
 
     private BinaryClient sendCommand(Jedis conn, ProtocolCommand provider, String ...args) {
-        BinaryClient client = conn.getClient();
-        client.sendCommand(provider, args);
-        return client;
+        BinaryClient binaryClient = conn.getClient();
+        binaryClient.sendCommand(provider, args);
+        return binaryClient;
     }
 
-    private Jedis _conn() {
+    private Jedis getConnection() {
         return this.client.getResource();
     }
 }

src/main/java/com/redislabs/redisgraph/impl/RecordImpl.java

@@ -6,8 +6,8 @@
 
 public class RecordImpl implements Record {
 
-    final private List<String> header;
-    final private List<String> values;
+	private final List<String> header;
+	private final List<String> values;
 
     RecordImpl(List<String> header, List<String> values){
     	this.header=header;

src/main/java/com/redislabs/redisgraph/impl/ResultSetImpl.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 
 import com.redislabs.redisgraph.Record;
@@ -12,10 +13,10 @@
 
 public class ResultSetImpl implements ResultSet{
 
-    final private int totalResults;
-    final private List<String> header;
-    final private List<Record> results;
-    final private Statistics statistics;
+	private final int totalResults;
+	private final List<String> header;
+	private final List<Record> results;
+	private final Statistics statistics;
     private int position = 0;
 
     public ResultSetImpl(List<Object> resp) {
@@ -25,21 +26,21 @@ public ResultSetImpl(List<Object> resp) {
     	ArrayList<ArrayList<byte[]>> result = (ArrayList<ArrayList<byte[]>>) resp.get(0);
 
         // Empty result set
-        if(result == null || result.size() == 0) {
+        if(result == null || result.isEmpty()) {
         	header = new ArrayList<>(0);
             totalResults = 0;
-            results = new ArrayList<Record>(0);
+            results = new ArrayList<>(0);
         } else {
         	ArrayList<byte[]> headers = result.get(0);
-        	header = headers.stream().map( h -> new String(h)).collect(Collectors.toList());
+        	header = headers.stream().map( String::new).collect(Collectors.toList());
 
         	// First row is a header row
 	        totalResults = result.size()-1;
-	        results = new ArrayList<Record>(totalResults);
+	        results = new ArrayList<>(totalResults);
 	        // Skips last row (runtime info)
             for (int i = 1; i <= totalResults; i++) {
             	ArrayList<byte[]> row = result.get(i);
-            	Record record = new RecordImpl(header, row.stream().map( h -> SafeEncoder.encode(h)).collect(Collectors.toList()));
+            	Record record = new RecordImpl(header, row.stream().map( SafeEncoder::encode).collect(Collectors.toList()));
             	results.add(record);
             }
         }
@@ -56,6 +57,8 @@ public boolean hasNext() {
 
 	@Override
 	public Record next() {
+        if (!hasNext())
+            throw new NoSuchElementException();
 		return results.get(position++);
 	}
 

src/main/java/com/redislabs/redisgraph/impl/StatisticsImpl.java

@@ -1,6 +1,6 @@
 package com.redislabs.redisgraph.impl;
 
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
@@ -9,12 +9,12 @@
 import redis.clients.jedis.util.SafeEncoder;
 
 public class StatisticsImpl implements Statistics  {
-	final private List<byte[]> raw;
-	final private Map<Statistics.Label, String> statistics;
+	private final List<byte[]> raw;
+	private final Map<Statistics.Label, String> statistics;
 
 	StatisticsImpl(List<byte[]> raw){
 		this.raw = raw;
-		this.statistics = new HashMap<Statistics.Label, String>(raw.size()); // lazy loaded
+		this.statistics = new EnumMap<>(Statistics.Label.class); // lazy loaded
 	}
 
 	@Override