diff --git a/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/DefaultTuple.java b/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/DefaultTuple.java index 4a187c35d..1fb9342ef 100644 --- a/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/DefaultTuple.java +++ b/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/DefaultTuple.java @@ -610,11 +610,14 @@ public class DefaultTuple implements Tuple { this.tupleToStringConverter = tupleToStringConverter; } - @Override /** - * The format is of the form DefaultTuple [names="n1' + * Returns a JSON representation of this Tuple. */ + @Override public String toString() { + if (tupleToStringConverter == null) { + return new TupleToJsonStringConverter().convert(this); + } return tupleToStringConverter.convert(this); } diff --git a/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/JsonNodeToTupleConverter.java b/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/JsonNodeToTupleConverter.java index 9942952a2..3c35aec45 100644 --- a/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/JsonNodeToTupleConverter.java +++ b/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/JsonNodeToTupleConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -24,7 +24,6 @@ import com.fasterxml.jackson.databind.JsonNode; /** * @author David Turanski - * */ public class JsonNodeToTupleConverter implements Converter { @@ -47,15 +46,7 @@ public class JsonNodeToTupleConverter implements Converter { builder.addEntry(name, nodeToList(node)); } else { - if (name.equals("id")) {//NOSONAR - // TODO how should this be handled? - } - else if (name.equals("timestamp")) {//NOSONAR - // TODO how should this be handled? - } - else { - builder.addEntry(name, node.asText()); - } + builder.addEntry(name, node.asText()); } } } diff --git a/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/JsonStringToTupleConverter.java b/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/JsonStringToTupleConverter.java index 051c69c21..bb682328b 100644 --- a/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/JsonStringToTupleConverter.java +++ b/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/JsonStringToTupleConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; /** * @author David Turanski - * */ public class JsonStringToTupleConverter implements Converter { @@ -54,15 +53,7 @@ public class JsonStringToTupleConverter implements Converter { builder.addEntry(name, nodeToList(node)); } else { - if (name.equals("id")) {//NOSONAR - // TODO how should this be handled? - } - else if (name.equals("timestamp")) {//NOSONAR - // TODO how should this be handled? - } - else { - builder.addEntry(name, node.asText()); - } + builder.addEntry(name, node.asText()); } } } diff --git a/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/TupleBuilder.java b/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/TupleBuilder.java index 6a9bb788d..1881b0d62 100644 --- a/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/TupleBuilder.java +++ b/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/TupleBuilder.java @@ -26,9 +26,7 @@ import java.util.Locale; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.ConfigurableConversionService; -import org.springframework.util.AlternativeJdkIdGenerator; import org.springframework.util.Assert; -import org.springframework.util.IdGenerator; /** * Builder class to create Tuple instances. @@ -42,7 +40,6 @@ import org.springframework.util.IdGenerator; * @author David Turanski * @author Michael Minella * @author Gunnar Hillert - * */ public class TupleBuilder { @@ -62,8 +59,6 @@ public class TupleBuilder { private static Converter stringToTupleConverter = new JsonStringToTupleConverter(); - private static final IdGenerator defaultIdGenerator = new AlternativeJdkIdGenerator(); - static { defaultConversionService = new DefaultTupleConversionService(); defaultConversionService.addConverterFactory(new LocaleAwareStringToNumberConverterFactory(NumberFormat @@ -166,7 +161,7 @@ public class TupleBuilder { protected Tuple newTuple(List names, List values) { DefaultTuple tuple; - if(customConversionService != null) { + if (customConversionService != null) { tuple = new DefaultTuple(names, values, customConversionService); } else { @@ -200,12 +195,12 @@ public class TupleBuilder { public TupleBuilder setConfigurableConversionService(ConfigurableConversionService formattingConversionService) { Assert.notNull(formattingConversionService); - if(locale != null) { + if (locale != null) { formattingConversionService.addConverterFactory(new LocaleAwareStringToNumberConverterFactory(NumberFormat .getInstance(locale))); } - if(dateFormat != null) { + if (dateFormat != null) { formattingConversionService.addConverter(new StringToDateConverter(dateFormat)); } diff --git a/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/TupleToJsonStringConverter.java b/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/TupleToJsonStringConverter.java index 48bd7f744..3eac16865 100644 --- a/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/TupleToJsonStringConverter.java +++ b/spring-cloud-stream-tuple/src/main/java/org/springframework/cloud/stream/tuple/TupleToJsonStringConverter.java @@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; * * @author David Turanski * @author Gunnar Hillert - * */ public class TupleToJsonStringConverter implements Converter { @@ -47,8 +46,6 @@ public class TupleToJsonStringConverter implements Converter { private ObjectNode toObjectNode(Tuple source) { ObjectNode root = mapper.createObjectNode(); -// root.put("id", source.getId().toString()); -// root.put("timestamp", source.getTimestamp()); for (int i = 0; i < source.size(); i++) { Object value = source.getValues().get(i); String name = source.getFieldNames().get(i);