fixed key fields showing up in payloads (hash, string, search, ...)

Author: jruaux

pom.xml

@@ -12,14 +12,14 @@
 
 	<groupId>com.redislabs</groupId>
 	<artifactId>riot</artifactId>
-	<version>0.2.1</version>
+	<version>0.2.2</version>
 	<packaging>jar</packaging>
 	<name>RIOT</name>
 	<description>Redis Input/Output Tool</description>
 
 	<properties>
 		<start-class>com.redislabs.riot.RiotApplication</start-class>
-		<spring.profiles.active>default</spring.profiles.active>
+<!-- 		<spring.profiles.active>default</spring.profiles.active> -->
 	</properties>
 
 	<scm>
@@ -81,16 +81,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.batch</groupId>
-			<artifactId>spring-batch-test</artifactId>
+			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

src/main/java/com/redislabs/riot/redis/RedisConverter.java

@@ -7,30 +7,25 @@
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 
+import lombok.Getter;
 import lombok.Setter;
 
 public class RedisConverter {
 
 	public static final String KEY_SEPARATOR = ":";
 
 	private ConversionService converter = new DefaultConversionService();
+	@Getter
 	@Setter
 	private String keyspace;
+	@Getter
 	@Setter
 	private String[] keys;
 
 	public String id(Map<String, Object> item) {
 		return joinFields(item, keys);
 	}
 
-	public String getKeyspace() {
-		return keyspace;
-	}
-
-	public String[] getKeys() {
-		return keys;
-	}
-
 	public String key(Map<String, Object> item) {
 		return key(id(item));
 	}
@@ -51,7 +46,7 @@ public String joinFields(Map<String, Object> item, String[] fields) {
 		}
 		StringJoiner joiner = new StringJoiner(KEY_SEPARATOR);
 		for (String field : fields) {
-			joiner.add(converter.convert(item.get(field), String.class));
+			joiner.add(converter.convert(item.remove(field), String.class));
 		}
 		return joiner.toString();
 	}

src/main/java/com/redislabs/riot/redis/writer/AbstractRedisItemWriter.java

@@ -13,10 +13,6 @@ public abstract class AbstractRedisItemWriter {
 	@Setter
 	protected RedisCommands commands;
 
-	protected String key(Map<String, Object> item) {
-		return converter.key(item);
-	}
-
 	public abstract Object write(Object redis, Map<String, Object> item);
 
 }

src/main/java/com/redislabs/riot/redis/writer/GeoWriter.java

@@ -23,7 +23,7 @@ public Object write(Object redis, Map<String, Object> item) {
 		}
 		double lon = converter.convert(longitude, Double.class);
 		double lat = converter.convert(latitude, Double.class);
-		return commands.geoadd(redis, key(item), lon, lat, member(item));
+		return commands.geoadd(redis, converter.key(item), lon, lat, member(item));
 	}
 
 }

src/main/java/com/redislabs/riot/redis/writer/HashWriter.java

@@ -6,7 +6,8 @@ public class HashWriter extends AbstractRedisItemWriter {
 
 	@Override
 	public Object write(Object redis, Map<String, Object> item) {
-		return commands.hmset(redis, key(item), item);
+		String key = converter.key(item);
+		return commands.hmset(redis, key, item);
 	}
 
 }

src/main/java/com/redislabs/riot/redis/writer/ListWriter.java

@@ -9,7 +9,7 @@ public class ListWriter extends AbstractCollectionRedisItemWriter {
 
 	@Override
 	public Object write(Object redis, Map<String, Object> item) {
-		return commands.lpush(redis, key(item), member(item));
+		return commands.lpush(redis, converter.key(item), member(item));
 	}
 
 }

src/main/java/com/redislabs/riot/redis/writer/SetWriter.java

@@ -9,7 +9,7 @@ public class SetWriter extends AbstractCollectionRedisItemWriter {
 
 	@Override
 	public Object write(Object redis, Map<String, Object> item) {
-		return commands.sadd(redis, key(item), member(item));
+		return commands.sadd(redis, converter.key(item), member(item));
 	}
 
 }

src/main/java/com/redislabs/riot/redis/writer/StreamWriter.java

@@ -13,14 +13,14 @@ public class StreamWriter extends AbstractRedisItemWriter {
 
 	@Override
 	public Object write(Object redis, Map<String, Object> item) {
-		String key = key(item);
+		String key = converter.key(item);
 		if (idField == null) {
 			if (maxlen == null) {
 				return commands.xadd(redis, key, item);
 			}
 			return commands.xadd(redis, key, item, maxlen, approximateTrimming);
 		}
-		String id = converter.convert(item.getOrDefault(idField, idField), String.class);
+		String id = converter.convert(item.remove(idField), String.class);
 		if (maxlen == null) {
 			return commands.xadd(redis, key, id, item);
 		}

src/main/java/com/redislabs/riot/redis/writer/StringWriter.java

@@ -32,8 +32,9 @@ private ObjectWriter objectWriter(StringFormat format) {
 
 	@Override
 	public Object write(Object redis, Map<String, Object> item) {
+		String key = converter.key(item);
 		try {
-			return commands.set(redis, key(item), objectWriter.writeValueAsString(item));
+			return commands.set(redis, key, objectWriter.writeValueAsString(item));
 		} catch (JsonProcessingException e) {
 			log.error("Could not serialize value: {}", item, e);
 			return null;

src/main/java/com/redislabs/riot/redis/writer/ZSetWriter.java

@@ -14,7 +14,7 @@ public class ZSetWriter extends AbstractCollectionRedisItemWriter {
 	@Override
 	public Object write(Object redis, Map<String, Object> item) {
 		double score = score(item);
-		return commands.zadd(redis, key(item), score, member(item));
+		return commands.zadd(redis, converter.key(item), score, member(item));
 	}
 
 	private double score(Map<String, Object> item) {

src/main/java/com/redislabs/riot/redis/writer/search/SearchAddWriter.java

@@ -31,7 +31,7 @@ private String payload(Map<String, Object> item) {
 		if (payloadField == null) {
 			return null;
 		}
-		return converter.convert(item.get(payloadField), String.class);
+		return converter.convert(item.remove(payloadField), String.class);
 	}
 
 }

src/main/java/com/redislabs/riot/redis/writer/search/SuggestWriter.java

@@ -31,7 +31,7 @@ private String payload(Map<String, Object> item) {
 		if (payloadField == null) {
 			return null;
 		}
-		return converter.convert(item.get(payloadField), String.class);
+		return converter.convert(item.remove(payloadField), String.class);
 	}
 
 }

src/test/java/com/redislabs/riot/ImportCSV.java renamed to src/test/java/com/redislabs/riot/TestImportCSV.java

@@ -5,7 +5,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ImportCSV extends BaseTest {
+public class TestImportCSV extends BaseTest {
 
 	@Test
 	public void importHashes() throws Exception {

src/test/java/com/redislabs/riot/ImportJSON.java renamed to src/test/java/com/redislabs/riot/TestImportJSON.java

@@ -8,7 +8,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ImportJSON extends BaseTest {
+public class TestImportJSON extends BaseTest {
 
 	@Test
 	public void importJSON() throws MalformedURLException, URISyntaxException {

src/test/java/com/redislabs/riot/ImportToRediSearch.java renamed to src/test/java/com/redislabs/riot/TestImportToRediSearch.java

@@ -11,7 +11,7 @@
 import com.redislabs.lettusearch.search.field.PhoneticMatcher;
 import com.redislabs.lettusearch.search.field.TextField;
 
-public class ImportToRediSearch extends BaseTest {
+public class TestImportToRediSearch extends BaseTest {
 
 	@Test
 	public void importBeers() throws Exception {
@@ -28,7 +28,7 @@ public void importBeers() throws Exception {
 		schema.field(NumericField.builder().name(FIELD_ABV).sortable(true).build());
 		schema.field(NumericField.builder().name(FIELD_OUNCES).sortable(true).build());
 		commands.create(INDEX, schema.build());
-		run("import csv --header --included-fields=1,3,4,5,6 --url https://raw.githubusercontent.com/nickhould/craft-beers-dataset/master/data/processed/beers.csv search --index beerIdx --keys id");
+		run("import csv --header --included-fields 1 3 4 5 6 --url https://raw.githubusercontent.com/nickhould/craft-beers-dataset/master/data/processed/beers.csv search --index beerIdx --keys id");
 		SearchResults<String, String> results = connection.sync().search(INDEX, "*");
 		Assert.assertEquals(2410, results.getCount());
 	}