Renamed ByteStreamSource and CharacterStreamSource to include "reading" in their names.

This commit is contained in:
Mark Fisher
2008-11-03 15:42:20 +00:00
parent 838916f61d
commit b65605ba64
5 changed files with 16 additions and 16 deletions

View File

@@ -30,7 +30,7 @@ import org.springframework.integration.message.MessageSource;
*
* @author Mark Fisher
*/
public class ByteStreamSource implements MessageSource<byte[]> {
public class ByteStreamReadingMessageSource implements MessageSource<byte[]> {
private BufferedInputStream stream;
@@ -41,11 +41,11 @@ public class ByteStreamSource implements MessageSource<byte[]> {
private boolean shouldTruncate = true;
public ByteStreamSource(InputStream stream) {
public ByteStreamReadingMessageSource(InputStream stream) {
this(stream, -1);
}
public ByteStreamSource(InputStream stream, int bufferSize) {
public ByteStreamReadingMessageSource(InputStream stream, int bufferSize) {
this.streamMonitor = stream;
if (stream instanceof BufferedInputStream) {
this.stream = (BufferedInputStream) stream;

View File

@@ -32,18 +32,18 @@ import org.springframework.util.Assert;
*
* @author Mark Fisher
*/
public class CharacterStreamSource implements MessageSource<String> {
public class CharacterStreamReadingMessageSource implements MessageSource<String> {
private final BufferedReader reader;
private final Object monitor;
public CharacterStreamSource(Reader reader) {
public CharacterStreamReadingMessageSource(Reader reader) {
this(reader, -1);
}
public CharacterStreamSource(Reader reader, int bufferSize) {
public CharacterStreamReadingMessageSource(Reader reader, int bufferSize) {
Assert.notNull(reader, "reader must not be null");
this.monitor = reader;
if (reader instanceof BufferedReader) {
@@ -74,13 +74,13 @@ public class CharacterStreamSource implements MessageSource<String> {
}
public static final CharacterStreamSource stdin() {
return new CharacterStreamSource(new InputStreamReader(System.in));
public static final CharacterStreamReadingMessageSource stdin() {
return new CharacterStreamReadingMessageSource(new InputStreamReader(System.in));
}
public static final CharacterStreamSource stdin(String charsetName) {
public static final CharacterStreamReadingMessageSource stdin(String charsetName) {
try {
return new CharacterStreamSource(new InputStreamReader(System.in, charsetName));
return new CharacterStreamReadingMessageSource(new InputStreamReader(System.in, charsetName));
}
catch (UnsupportedEncodingException e) {
throw new IllegalArgumentException("unsupported encoding: " + charsetName, e);

View File

@@ -22,7 +22,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.config.xml.AbstractPollingInboundChannelAdapterParser;
import org.springframework.integration.stream.CharacterStreamSource;
import org.springframework.integration.stream.CharacterStreamReadingMessageSource;
import org.springframework.util.StringUtils;
/**
@@ -34,7 +34,7 @@ public class ConsoleInboundChannelAdapterParser extends AbstractPollingInboundCh
@Override
protected String parseSource(Element element, ParserContext parserContext) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CharacterStreamSource.class);
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CharacterStreamReadingMessageSource.class);
builder.setFactoryMethod("stdin");
String charsetName = element.getAttribute("charset");
if (StringUtils.hasText(charsetName)) {