Update RecordImpl to return none String types

Author: gkorland

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

@@ -8,51 +8,69 @@
  * List records are returned from RedisGraph statement execution, contained within a ResultSet.
  */
 public interface Record {
-	
-	/**
-	 * The value at the given field index (represented as String)
-	 * 
-	 * @param index
-	 * @return string representation of the value
-	 */
-	String getString(int index);
-	
-	/**
-	 * The value at the given field (represented as String)
-	 * 
-	 * @param key header key 
-	 * 
-	 * @return string representation of the value
-	 */
-	String getString(String key);
-	
-	/**
-	 * The keys of the record
-	 * 
-	 * @return list of the record key
-	 */
-	List<String> keys();
-	
-	/**
-	 * The values of the record
-	 * 
-	 * @return list of the record values
-	 */
-	List<String> values();
-	
-	/**
-	 * Check if the record header contains the given key
-	 * 
-	 * @param key header key 
-	 * 
-	 * @return <code>true</code> if the the key exists 
-	 */
-	boolean	containsKey(String key);
-	
-	/**
-	 * The number of fields in this record
-	 * 
-	 * @return the number of fields
-	 */
-	int size();
+
+  /**
+   * The value at the given field index
+   * 
+   * @param index field index
+   * 
+   * @return the value
+   */
+  <T> T getValue(int index);
+
+  /**
+   * The value at the given field
+   * 
+   * @param key header key 
+   * 
+   * @return the value
+   */
+  <T> T getValue(String key);  
+  
+  /**
+   * The value at the given field index (represented as String)
+   * 
+   * @param index
+   * @return string representation of the value
+   */
+  String getString(int index);
+
+  /**
+   * The value at the given field (represented as String)
+   * 
+   * @param key header key 
+   * 
+   * @return string representation of the value
+   */
+  String getString(String key);
+
+  /**
+   * The keys of the record
+   * 
+   * @return list of the record key
+   */
+  List<String> keys();
+
+  /**
+   * The values of the record
+   * 
+   * @return list of the record values
+   */
+  List<Object> values();
+
+  /**
+   * Check if the record header contains the given key
+   * 
+   * @param key header key 
+   * 
+   * @return <code>true</code> if the the key exists 
+   */
+  boolean	containsKey(String key);
+
+  /**
+   * The number of fields in this record
+   * 
+   * @return the number of fields
+   */
+  int size();
 }

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

@@ -5,48 +5,59 @@
 import com.redislabs.redisgraph.Record;
 
 public class RecordImpl implements Record {
-	
-	private final List<String> header;
-	private final List<String> values;
-
-    RecordImpl(List<String> header, List<String> values){
-    	this.header=header;
-    	this.values = values;
-    }
-    
-	@Override
-	public String getString(int index) {
-		return this.values.get(index);
-	}
-
-	@Override
-	public String getString(String key) {
-		return getString(this.header.indexOf(key));
-	}
-
-	@Override
-	public List<String> keys() {
-		return header;
-	}
-
-	@Override
-	public List<String> values() {
-		return this.values;
-	}
-
-	@Override
-	public boolean containsKey(String key) {
-		return this.header.contains(key);
-	}
-
-	@Override
-	public int size() {
-		return this.header.size();
-	}
-	
-	@Override
-	public String toString() {
-		return this.values.toString();
-	}
+
+  private final List<String> header;
+  private final List<Object> values;
+
+  RecordImpl(List<String> header, List<Object> values){
+    this.header=header;
+    this.values = values;
+  }
+
+  @Override
+  public <T> T getValue(int index) {
+    return (T)this.values.get(index);
+  }
+
+  @Override
+  public <T> T getValue(String key) {
+    return getValue(this.header.indexOf(key));
+  }
+
+  @Override
+  public String getString(int index) {
+    return this.values.get(index).toString();
+  }
+
+  @Override
+  public String getString(String key) {
+    return getString(this.header.indexOf(key));
+  }
+
+  @Override
+  public List<String> keys() {
+    return header;
+  }
+
+  @Override
+  public List<Object> values() {
+    return this.values;
+  }
+
+  @Override
+  public boolean containsKey(String key) {
+    return this.header.contains(key);
+  }
+
+  @Override
+  public int size() {
+    return this.header.size();
+  }
+
+  @Override
+  public String toString() {
+    return this.values.toString();
+  }
+
 
 }

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

@@ -23,24 +23,29 @@ public ResultSetImpl(List<Object> resp) {
 
     this.statistics = new StatisticsImpl((List<byte[]>)resp.get(1));
 
-    ArrayList<ArrayList<byte[]>> result = (ArrayList<ArrayList<byte[]>>) resp.get(0);
+    ArrayList<ArrayList<?>> result = (ArrayList<ArrayList<?>>) resp.get(0);
 
     // Empty result set
     if(result == null || result.isEmpty()) {
       header = new ArrayList<>(0);
       totalResults = 0;
       results = new ArrayList<>(0);
     } else {
-      ArrayList<byte[]> headers = result.get(0);
+      ArrayList<byte[]> headers = (ArrayList<byte[]>)result.get(0);
       header = headers.stream().map( String::new).collect(Collectors.toList());
 
       // First row is a header row
       totalResults = result.size()-1;
       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( SafeEncoder::encode).collect(Collectors.toList()));
+        ArrayList<?> row = result.get(i);
+        Record record = new RecordImpl(header, row.stream().map( obj -> {
+          if(obj instanceof byte[]) {
+            return SafeEncoder.encode((byte[])obj);  
+          } 
+          return obj;
+        }).collect(Collectors.toList()));
         results.add(record);
       }
     }

src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java

@@ -101,7 +101,7 @@ public void testQuery(){
         ResultSet resultSet = api.query("MATCH (a:qhuman)-[knows]->(:qhuman) RETURN a");
 
         Assert.assertEquals(Arrays.asList("a.age", "a.name"), resultSet.getHeader());
-        Assert.assertEquals("[a.age, a.name]\n[[32.000000, roi]]\n" + resultSet.getStatistics(), resultSet.toString());        
+        Assert.assertEquals("[a.age, a.name]\n[[32, roi]]\n" + resultSet.getStatistics(), resultSet.toString());        
 
     	Assert.assertTrue(resultSet.hasNext());
     	Assert.assertEquals(0, resultSet.getStatistics().nodesCreated());
@@ -114,15 +114,16 @@ public void testQuery(){
 
     	Record record = resultSet.next();
     	Assert.assertEquals( Arrays.asList("a.age", "a.name"), record.keys());
-    	Assert.assertEquals( Arrays.asList("32.000000", "roi"), record.values());
+    	Assert.assertEquals( Arrays.asList(32L, "roi"), record.values());
     	Assert.assertTrue(record.containsKey("a.name"));
         Assert.assertEquals( 2, record.size());
-        Assert.assertEquals( "[32.000000, roi]", record.toString());
+        Assert.assertEquals( "[32, roi]", record.toString());
 
     	Assert.assertEquals( "roi", record.getString(1));
-    	Assert.assertEquals( "32.000000", record.getString(0));
+    	Assert.assertEquals( "32", record.getString(0));
+    	Assert.assertEquals( 32L, ((Long)record.getValue(0)).longValue());
+    	Assert.assertEquals( 32L, ((Long)record.getValue("a.age")).longValue());
         Assert.assertEquals( "roi", record.getString("a.name"));
-        Assert.assertEquals( "32.000000", record.getString("a.age"));     
-
+        Assert.assertEquals( "32", record.getString("a.age"));     
     }
 }