Author: bago
Date: Tue Jul 15 02:19:38 2008
New Revision: 676846
URL: http://svn.apache.org/viewvc?rev=676846&view=rev
Log:
Renamed parsing streams class tree from:
FilterInputStream
'- BufferingInputStream
|- BufferingInputStreamAdaptor
|- InputBuffer
'- MimeBoundaryInputStream
to:
FilterInputStream
'- LineReaderInputStream (again abstract)
|- LineReaderInputStreamAdaptor (the current Adaptor)
|- BufferedLineReaderInputStream (the refactored InputBuffer)
'- MimeBoundaryInputStream
(related to MIME4J-50 change)
Added:
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferedLineReaderInputStream.java
- copied, changed from r676835,
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/InputBuffer.java
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/LineReaderInputStream.java
- copied, changed from r676835,
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferingInputStream.java
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/LineReaderInputStreamAdaptor.java
- copied, changed from r676835,
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferingInputStreamAdaptor.java
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamBufferTest.java
(contents, props changed)
- copied, changed from r676833,
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/InputBufferTest.java
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamTest.java
- copied, changed from r676835,
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BasicBufferingInputStreamTest.java
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/LineReaderInputStreamAdaptorTest.java
- copied, changed from r676833,
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferingInputStreamAdaptorTest.java
Removed:
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferingInputStream.java
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferingInputStreamAdaptor.java
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/InputBuffer.java
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BasicBufferingInputStreamTest.java
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferingInputStreamAdaptorTest.java
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/InputBufferTest.java
Modified:
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/AbstractEntity.java
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeEntity.java
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeTokenStream.java
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/MimeBoundaryInputStreamTest.java
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/MimeEntityTest.java
Modified:
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/AbstractEntity.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/AbstractEntity.java?rev=676846&r1=676845&r2=676846&view=diff
==============================================================================
---
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/AbstractEntity.java
(original)
+++
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/AbstractEntity.java
Tue Jul 15 02:19:38 2008
@@ -110,13 +110,13 @@
protected abstract int getLineNumber();
- protected abstract BufferingInputStream getDataStream();
+ protected abstract LineReaderInputStream getDataStream();
private void fillFieldBuffer() throws IOException, MimeException {
if (endOfHeader) {
return;
}
- BufferingInputStream instream = getDataStream();
+ LineReaderInputStream instream = getDataStream();
fieldbuf.clear();
for (;;) {
// If there's still data stuck in the line buffer
Copied:
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferedLineReaderInputStream.java
(from r676835,
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/InputBuffer.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferedLineReaderInputStream.java?p2=james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferedLineReaderInputStream.java&p1=james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/InputBuffer.java&r1=676835&r2=676846&rev=676846&view=diff
==============================================================================
---
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/InputBuffer.java
(original)
+++
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferedLineReaderInputStream.java
Tue Jul 15 02:19:38 2008
@@ -26,14 +26,14 @@
* Input buffer that can be used to search for patterns using Quick Search
* algorithm in data read from an [EMAIL PROTECTED] InputStream}.
*/
-public class InputBuffer extends BufferingInputStream {
+public class BufferedLineReaderInputStream extends LineReaderInputStream {
private final byte[] buffer;
private int bufpos;
private int buflen;
- public InputBuffer(final InputStream instream, int buffersize) {
+ public BufferedLineReaderInputStream(final InputStream instream, int
buffersize) {
super(instream);
if (instream == null) {
throw new IllegalArgumentException("Input stream may not be null");
Copied:
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/LineReaderInputStream.java
(from r676835,
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferingInputStream.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/LineReaderInputStream.java?p2=james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/LineReaderInputStream.java&p1=james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferingInputStream.java&r1=676835&r2=676846&rev=676846&view=diff
==============================================================================
---
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferingInputStream.java
(original)
+++
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/LineReaderInputStream.java
Tue Jul 15 02:19:38 2008
@@ -26,9 +26,9 @@
/**
* Input stream capable of reading lines of text.
*/
-public abstract class BufferingInputStream extends FilterInputStream {
+public abstract class LineReaderInputStream extends FilterInputStream {
- protected BufferingInputStream(InputStream in) {
+ protected LineReaderInputStream(InputStream in) {
super(in);
}
Copied:
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/LineReaderInputStreamAdaptor.java
(from r676835,
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferingInputStreamAdaptor.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/LineReaderInputStreamAdaptor.java?p2=james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/LineReaderInputStreamAdaptor.java&p1=james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferingInputStreamAdaptor.java&r1=676835&r2=676846&rev=676846&view=diff
==============================================================================
---
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/BufferingInputStreamAdaptor.java
(original)
+++
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/LineReaderInputStreamAdaptor.java
Tue Jul 15 02:19:38 2008
@@ -29,16 +29,16 @@
*
* @version $Id$
*/
-class BufferingInputStreamAdaptor extends BufferingInputStream {
+class LineReaderInputStreamAdaptor extends LineReaderInputStream {
- private final BufferingInputStream bis;
+ private final LineReaderInputStream bis;
private boolean used = false;
private boolean eof = false;
- public BufferingInputStreamAdaptor(final InputStream is) {
+ public LineReaderInputStreamAdaptor(final InputStream is) {
super(is);
- if (is instanceof BufferingInputStream) {
- this.bis = (BufferingInputStream) is;
+ if (is instanceof LineReaderInputStream) {
+ this.bis = (LineReaderInputStream) is;
} else {
this.bis = null;
}
Modified:
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java?rev=676846&r1=676845&r2=676846&view=diff
==============================================================================
---
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java
(original)
+++
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java
Tue Jul 15 02:19:38 2008
@@ -28,7 +28,7 @@
*
* @version $Id: MimeBoundaryInputStream.java,v 1.2 2004/11/29 13:15:42
ntherning Exp $
*/
-public class MimeBoundaryInputStream extends BufferingInputStream {
+public class MimeBoundaryInputStream extends LineReaderInputStream {
private final byte[] boundary;
@@ -39,17 +39,17 @@
private boolean lastPart;
private boolean completed;
- private InputBuffer buffer;
+ private BufferedLineReaderInputStream buffer;
/**
* Creates a new MimeBoundaryInputStream.
* @param s The underlying stream.
* @param boundary Boundary string (not including leading hyphens).
*/
- public MimeBoundaryInputStream(InputBuffer inbuffer, String boundary)
+ public MimeBoundaryInputStream(BufferedLineReaderInputStream inbuffer,
String boundary)
throws IOException {
super(inbuffer);
- this.buffer = (InputBuffer) in;
+ this.buffer = (BufferedLineReaderInputStream) in;
this.eof = false;
this.limit = -1;
this.atBoundary = false;
Modified:
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeEntity.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeEntity.java?rev=676846&r1=676845&r2=676846&view=diff
==============================================================================
---
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeEntity.java
(original)
+++
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeEntity.java
Tue Jul 15 02:19:38 2008
@@ -19,18 +19,18 @@
private static final int T_IN_MESSAGE = -3;
private final RootInputStream rootStream;
- private final InputBuffer inbuffer;
+ private final BufferedLineReaderInputStream inbuffer;
private int recursionMode;
private MimeBoundaryInputStream mimeStream;
- private BufferingInputStreamAdaptor dataStream;
+ private LineReaderInputStreamAdaptor dataStream;
private boolean skipHeader;
private byte[] tmpbuf;
public MimeEntity(
RootInputStream rootStream,
- InputBuffer inbuffer,
+ BufferedLineReaderInputStream inbuffer,
BodyDescriptor parent,
int startState,
int endState,
@@ -39,13 +39,13 @@
super(parent, startState, endState, maximalBodyDescriptor,
strictParsing);
this.rootStream = rootStream;
this.inbuffer = inbuffer;
- this.dataStream = new BufferingInputStreamAdaptor(inbuffer);
+ this.dataStream = new LineReaderInputStreamAdaptor(inbuffer);
this.skipHeader = false;
}
public MimeEntity(
RootInputStream rootStream,
- InputBuffer inbuffer,
+ BufferedLineReaderInputStream inbuffer,
BodyDescriptor parent,
int startState,
int endState) {
@@ -72,7 +72,7 @@
return rootStream.getLineNumber();
}
- protected BufferingInputStream getDataStream() {
+ protected LineReaderInputStream getDataStream() {
return dataStream;
}
@@ -163,11 +163,11 @@
private void createMimeStream() throws IOException {
if (mimeStream != null) {
- mimeStream = new MimeBoundaryInputStream(new
InputBuffer(mimeStream, 4 * 1024), body.getBoundary());
+ mimeStream = new MimeBoundaryInputStream(new
BufferedLineReaderInputStream(mimeStream, 4 * 1024), body.getBoundary());
} else {
mimeStream = new MimeBoundaryInputStream(inbuffer,
body.getBoundary());
}
- dataStream = new BufferingInputStreamAdaptor(mimeStream);
+ dataStream = new LineReaderInputStreamAdaptor(mimeStream);
// If multipart message is embedded into another multipart message
// make sure to reset parent's mime stream
inbuffer.reset();
@@ -175,7 +175,7 @@
private void clearMimeStream() {
mimeStream = null;
- dataStream = new BufferingInputStreamAdaptor(inbuffer);
+ dataStream = new LineReaderInputStreamAdaptor(inbuffer);
}
private void advanceToBoundary() throws IOException {
@@ -207,7 +207,7 @@
} else {
MimeEntity message = new MimeEntity(
rootStream,
- new InputBuffer(instream, 4 * 1024),
+ new BufferedLineReaderInputStream(instream, 4 * 1024),
body,
EntityStates.T_START_MESSAGE,
EntityStates.T_END_MESSAGE,
@@ -223,7 +223,7 @@
RawEntity message = new RawEntity(mimeStream);
return message;
} else {
- InputBuffer stream = new InputBuffer(mimeStream, 4 * 1024);
+ BufferedLineReaderInputStream stream = new
BufferedLineReaderInputStream(mimeStream, 4 * 1024);
MimeEntity mimeentity = new MimeEntity(
rootStream,
stream,
Modified:
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeTokenStream.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeTokenStream.java?rev=676846&r1=676845&r2=676846&view=diff
==============================================================================
---
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeTokenStream.java
(original)
+++
james/mime4j/branches/streams-refactoring/src/main/java/org/apache/james/mime4j/MimeTokenStream.java
Tue Jul 15 02:19:38 2008
@@ -99,7 +99,7 @@
private int state = T_END_OF_STREAM;
private EntityStateMachine currentStateMachine;
private int recursionMode = M_RECURSE;
- private InputBuffer inbuffer;
+ private BufferedLineReaderInputStream inbuffer;
private RootInputStream rootInputStream;
/**
@@ -144,7 +144,7 @@
private void doParse(InputStream stream, String contentType) {
entities.clear();
rootInputStream = new RootInputStream(stream);
- inbuffer = new InputBuffer(rootInputStream, 4 * 1024);
+ inbuffer = new BufferedLineReaderInputStream(rootInputStream, 4 *
1024);
switch (recursionMode) {
case M_RAW:
RawEntity rawentity = new RawEntity(inbuffer);
Copied:
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamBufferTest.java
(from r676833,
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/InputBufferTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamBufferTest.java?p2=james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamBufferTest.java&p1=james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/InputBufferTest.java&r1=676833&r2=676846&rev=676846&view=diff
==============================================================================
---
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/InputBufferTest.java
(original)
+++
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamBufferTest.java
Tue Jul 15 02:19:38 2008
@@ -23,18 +23,18 @@
import junit.framework.TestCase;
-public class InputBufferTest extends TestCase {
+public class BufferedLineReaderInputStreamBufferTest extends TestCase {
public void testInvalidInput() throws Exception {
String text = "blah blah yada yada";
byte[] b1 = text.getBytes("US-ASCII");
String pattern = "blah";
byte[] b2 = pattern.getBytes("US-ASCII");
- InputBuffer inbuffer = new InputBuffer(new ByteArrayInputStream(b1),
4096);
+ BufferedLineReaderInputStream inbuffer = new
BufferedLineReaderInputStream(new ByteArrayInputStream(b1), 4096);
inbuffer.fillBuffer();
- assertEquals((int)'b', inbuffer.read());
- assertEquals((int)'l', inbuffer.read());
+ assertEquals('b', inbuffer.read());
+ assertEquals('l', inbuffer.read());
try {
inbuffer.charAt(1);
@@ -93,7 +93,7 @@
public void testBasicOperations() throws Exception {
String text = "bla bla yada yada haha haha";
byte[] b1 = text.getBytes("US-ASCII");
- InputBuffer inbuffer = new InputBuffer(new ByteArrayInputStream(b1),
4096);
+ BufferedLineReaderInputStream inbuffer = new
BufferedLineReaderInputStream(new ByteArrayInputStream(b1), 4096);
inbuffer.fillBuffer();
assertEquals(0, inbuffer.pos());
assertEquals(27, inbuffer.limit());
@@ -131,7 +131,7 @@
String pattern = "d";
byte[] b1 = text.getBytes("US-ASCII");
byte[] b2 = pattern.getBytes("US-ASCII");
- InputBuffer inbuffer = new InputBuffer(new ByteArrayInputStream(b1),
4096);
+ BufferedLineReaderInputStream inbuffer = new
BufferedLineReaderInputStream(new ByteArrayInputStream(b1), 4096);
inbuffer.fillBuffer();
int i = inbuffer.indexOf(b2);
assertEquals(7, i);
@@ -142,7 +142,7 @@
String pattern = "siid";
byte[] b1 = text.getBytes("US-ASCII");
byte[] b2 = pattern.getBytes("US-ASCII");
- InputBuffer inbuffer = new InputBuffer(new ByteArrayInputStream(b1),
4096);
+ BufferedLineReaderInputStream inbuffer = new
BufferedLineReaderInputStream(new ByteArrayInputStream(b1), 4096);
inbuffer.fillBuffer();
int i = inbuffer.indexOf(b2);
assertEquals(18, i);
@@ -153,7 +153,7 @@
String pattern = "blah";
byte[] b1 = text.getBytes("US-ASCII");
byte[] b2 = pattern.getBytes("US-ASCII");
- InputBuffer inbuffer = new InputBuffer(new ByteArrayInputStream(b1),
4096);
+ BufferedLineReaderInputStream inbuffer = new
BufferedLineReaderInputStream(new ByteArrayInputStream(b1), 4096);
inbuffer.fillBuffer();
int i = inbuffer.indexOf(b2);
assertEquals(-1, i);
@@ -164,7 +164,7 @@
String pattern = "bla";
byte[] b1 = text.getBytes("US-ASCII");
byte[] b2 = pattern.getBytes("US-ASCII");
- InputBuffer inbuffer = new InputBuffer(new ByteArrayInputStream(b1),
4096);
+ BufferedLineReaderInputStream inbuffer = new
BufferedLineReaderInputStream(new ByteArrayInputStream(b1), 4096);
inbuffer.fillBuffer();
int i = inbuffer.indexOf(b2);
assertEquals(0, i);
@@ -175,7 +175,7 @@
String pattern1 = "bla bla";
byte[] b1 = text.getBytes("US-ASCII");
byte[] b2 = pattern1.getBytes("US-ASCII");
- InputBuffer inbuffer = new InputBuffer(new ByteArrayInputStream(b1),
4096);
+ BufferedLineReaderInputStream inbuffer = new
BufferedLineReaderInputStream(new ByteArrayInputStream(b1), 4096);
inbuffer.fillBuffer();
byte[] tmp = new byte[3];
inbuffer.read(tmp);
@@ -188,7 +188,7 @@
public void testCharOutOfBound() throws Exception {
String text = "zzz blah blah blah ggg";
byte[] b1 = text.getBytes("US-ASCII");
- InputBuffer inbuffer = new InputBuffer(new ByteArrayInputStream(b1),
4096);
+ BufferedLineReaderInputStream inbuffer = new
BufferedLineReaderInputStream(new ByteArrayInputStream(b1), 4096);
inbuffer.fillBuffer();
byte[] tmp = new byte[3];
inbuffer.read(tmp);
Propchange:
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamBufferTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamTest.java
(from r676835,
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BasicBufferingInputStreamTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamTest.java?p2=james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamTest.java&p1=james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BasicBufferingInputStreamTest.java&r1=676835&r2=676846&rev=676846&view=diff
==============================================================================
---
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BasicBufferingInputStreamTest.java
(original)
+++
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamTest.java
Tue Jul 15 02:19:38 2008
@@ -24,12 +24,12 @@
import junit.framework.TestCase;
-public class BasicBufferingInputStreamTest extends TestCase {
+public class BufferedLineReaderInputStreamTest extends TestCase {
public void testBasicOperations() throws Exception {
String text = "ah blahblah";
byte[] b1 = text.getBytes("US-ASCII");
- InputBuffer instream = new InputBuffer(new ByteArrayInputStream(b1),
4096);
+ BufferedLineReaderInputStream instream = new
BufferedLineReaderInputStream(new ByteArrayInputStream(b1), 4096);
assertEquals((byte)'a', instream.read());
assertEquals((byte)'h', instream.read());
@@ -67,7 +67,7 @@
}
byte[] raw = outstream.toByteArray();
- InputBuffer instream = new InputBuffer(new ByteArrayInputStream(raw),
16);
+ BufferedLineReaderInputStream instream = new
BufferedLineReaderInputStream(new ByteArrayInputStream(raw), 16);
ByteArrayBuffer linebuf = new ByteArrayBuffer(8);
for (int i = 0; i < teststrs.length; i++) {
@@ -85,7 +85,7 @@
String teststr = "\n\n\r\n\r\r\n\n\n\n\n\n";
byte[] raw = teststr.getBytes("US-ASCII");
- BufferingInputStream instream = new InputBuffer(new
ByteArrayInputStream(raw), 4);
+ LineReaderInputStream instream = new BufferedLineReaderInputStream(new
ByteArrayInputStream(raw), 4);
ByteArrayBuffer linebuf = new ByteArrayBuffer(8);
linebuf.clear();
Copied:
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/LineReaderInputStreamAdaptorTest.java
(from r676833,
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferingInputStreamAdaptorTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/LineReaderInputStreamAdaptorTest.java?p2=james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/LineReaderInputStreamAdaptorTest.java&p1=james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferingInputStreamAdaptorTest.java&r1=676833&r2=676846&rev=676846&view=diff
==============================================================================
---
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/BufferingInputStreamAdaptorTest.java
(original)
+++
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/LineReaderInputStreamAdaptorTest.java
Tue Jul 15 02:19:38 2008
@@ -24,13 +24,13 @@
import junit.framework.TestCase;
-public class BufferingInputStreamAdaptorTest extends TestCase {
+public class LineReaderInputStreamAdaptorTest extends TestCase {
public void testBasicOperations() throws Exception {
String text = "ah blahblah";
byte[] b1 = text.getBytes("US-ASCII");
- BufferingInputStreamAdaptor instream = new BufferingInputStreamAdaptor(
+ LineReaderInputStreamAdaptor instream = new
LineReaderInputStreamAdaptor(
new ByteArrayInputStream(b1));
assertEquals((byte)'a', instream.read());
@@ -69,7 +69,7 @@
}
byte[] raw = outstream.toByteArray();
- BufferingInputStreamAdaptor instream = new BufferingInputStreamAdaptor(
+ LineReaderInputStreamAdaptor instream = new
LineReaderInputStreamAdaptor(
new ByteArrayInputStream(raw));
ByteArrayBuffer linebuf = new ByteArrayBuffer(8);
@@ -88,7 +88,7 @@
String teststr = "\n\n\r\n\r\r\n\n\n\n\n\n";
byte[] raw = teststr.getBytes("US-ASCII");
- BufferingInputStreamAdaptor instream = new BufferingInputStreamAdaptor(
+ LineReaderInputStreamAdaptor instream = new
LineReaderInputStreamAdaptor(
new ByteArrayInputStream(raw));
ByteArrayBuffer linebuf = new ByteArrayBuffer(8);
Modified:
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/MimeBoundaryInputStreamTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/MimeBoundaryInputStreamTest.java?rev=676846&r1=676845&r2=676846&view=diff
==============================================================================
---
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/MimeBoundaryInputStreamTest.java
(original)
+++
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/MimeBoundaryInputStreamTest.java
Tue Jul 15 02:19:38 2008
@@ -43,7 +43,7 @@
ByteArrayInputStream bis = new
ByteArrayInputStream(text.getBytes("US-ASCII"));
- InputBuffer buffer = new InputBuffer(bis, 4096);
+ BufferedLineReaderInputStream buffer = new
BufferedLineReaderInputStream(bis, 4096);
MimeBoundaryInputStream mime1 = new MimeBoundaryInputStream(buffer,
"boundary");
assertEquals("Line 1\r\nLine 2", read(mime1, 5));
@@ -62,7 +62,7 @@
ByteArrayInputStream bis = new
ByteArrayInputStream(text.getBytes("US-ASCII"));
- InputBuffer buffer = new InputBuffer(bis, 4096);
+ BufferedLineReaderInputStream buffer = new
BufferedLineReaderInputStream(bis, 4096);
MimeBoundaryInputStream mime1 = new MimeBoundaryInputStream(buffer,
"boundary");
assertEquals("Line 1\r\nLine 2", read(mime1, 5));
@@ -81,7 +81,7 @@
ByteArrayInputStream bis = new
ByteArrayInputStream(text.getBytes("US-ASCII"));
- InputBuffer buffer = new InputBuffer(bis, 20);
+ BufferedLineReaderInputStream buffer = new
BufferedLineReaderInputStream(bis, 20);
MimeBoundaryInputStream mime1 = new MimeBoundaryInputStream(buffer,
"boundary");
assertEquals("yadayadayadayadayadayadayadayadayadayadayadayadayadayadayadayada",
@@ -102,7 +102,7 @@
ByteArrayInputStream bis = new
ByteArrayInputStream(text.getBytes("US-ASCII"));
- InputBuffer buffer = new InputBuffer(bis, 20);
+ BufferedLineReaderInputStream buffer = new
BufferedLineReaderInputStream(bis, 20);
MimeBoundaryInputStream mime1 = new MimeBoundaryInputStream(buffer,
"boundary");
@@ -124,7 +124,7 @@
ByteArrayInputStream bis = new
ByteArrayInputStream(text.getBytes("US-ASCII"));
- InputBuffer buffer = new InputBuffer(bis, 4096);
+ BufferedLineReaderInputStream buffer = new
BufferedLineReaderInputStream(bis, 4096);
MimeBoundaryInputStream mime1 = new MimeBoundaryInputStream(buffer,
"boundary");
assertEquals("Line 1\r\nLine 2", readByOneByte(mime1));
@@ -147,7 +147,7 @@
ByteArrayInputStream bis = new
ByteArrayInputStream(text.getBytes("US-ASCII"));
- InputBuffer buffer = new InputBuffer(bis, 4096);
+ BufferedLineReaderInputStream buffer = new
BufferedLineReaderInputStream(bis, 4096);
MimeBoundaryInputStream mime1 = new MimeBoundaryInputStream(buffer,
"boundary");
assertEquals("Line 1\r\nLine 2", read(mime1, 5));
@@ -188,7 +188,7 @@
String text = "--boundary\r\n";
ByteArrayInputStream bis = new ByteArrayInputStream(text.getBytes());
- InputBuffer buffer = new InputBuffer(bis, 4096);
+ BufferedLineReaderInputStream buffer = new
BufferedLineReaderInputStream(bis, 4096);
MimeBoundaryInputStream stream =
new MimeBoundaryInputStream(buffer, "boundary");
@@ -197,7 +197,7 @@
text = "\r\n--boundary\r\n";
bis = new ByteArrayInputStream(text.getBytes());
- buffer = new InputBuffer(bis, 4096);
+ buffer = new BufferedLineReaderInputStream(bis, 4096);
stream =
new MimeBoundaryInputStream(buffer, "boundary");
assertEquals(-1, stream.read());
@@ -210,7 +210,7 @@
String text = "--boundary--\r\n";
ByteArrayInputStream bis = new ByteArrayInputStream(text.getBytes());
- InputBuffer buffer = new InputBuffer(bis, 4096);
+ BufferedLineReaderInputStream buffer = new
BufferedLineReaderInputStream(bis, 4096);
MimeBoundaryInputStream stream =
new MimeBoundaryInputStream(buffer, "boundary");
assertEquals(-1, stream.read());
@@ -224,7 +224,7 @@
String text = "Line 1\r\n\r\n--boundaryyada\r\n";
ByteArrayInputStream bis = new ByteArrayInputStream(text.getBytes());
- InputBuffer buffer = new InputBuffer(bis, 4096);
+ BufferedLineReaderInputStream buffer = new
BufferedLineReaderInputStream(bis, 4096);
MimeBoundaryInputStream stream =
new MimeBoundaryInputStream(buffer, "boundary");
assertEquals("Line 1\r\n", read(stream, 100));
@@ -232,7 +232,7 @@
text = "--boundaryyada\r\n";
bis = new ByteArrayInputStream(text.getBytes());
- buffer = new InputBuffer(bis, 4096);
+ buffer = new BufferedLineReaderInputStream(bis, 4096);
stream = new MimeBoundaryInputStream(buffer, "boundary");
assertEquals(-1, stream.read());
}
@@ -263,8 +263,8 @@
outstream.write(term.getBytes("US-ASCII"));
byte[] raw = outstream.toByteArray();
- InputBuffer inbuffer = new InputBuffer(new ByteArrayInputStream(raw),
20);
- BufferingInputStream instream = new MimeBoundaryInputStream(inbuffer,
"1234");
+ BufferedLineReaderInputStream inbuffer = new
BufferedLineReaderInputStream(new ByteArrayInputStream(raw), 20);
+ LineReaderInputStream instream = new MimeBoundaryInputStream(inbuffer,
"1234");
ByteArrayBuffer linebuf = new ByteArrayBuffer(8);
for (int i = 0; i < teststrs.length; i++) {
@@ -282,8 +282,8 @@
String teststr =
"01234567890123456789\n\n\r\n\r\r\n\n\n\n\n\n--1234\r\n";
byte[] raw = teststr.getBytes("US-ASCII");
- InputBuffer inbuffer = new InputBuffer(new ByteArrayInputStream(raw),
20);
- BufferingInputStream instream = new MimeBoundaryInputStream(inbuffer,
"1234");
+ BufferedLineReaderInputStream inbuffer = new
BufferedLineReaderInputStream(new ByteArrayInputStream(raw), 20);
+ LineReaderInputStream instream = new MimeBoundaryInputStream(inbuffer,
"1234");
ByteArrayBuffer linebuf = new ByteArrayBuffer(8);
linebuf.clear();
Modified:
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/MimeEntityTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/MimeEntityTest.java?rev=676846&r1=676845&r2=676846&view=diff
==============================================================================
---
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/MimeEntityTest.java
(original)
+++
james/mime4j/branches/streams-refactoring/src/test/java/org/apache/james/mime4j/MimeEntityTest.java
Tue Jul 15 02:19:38 2008
@@ -39,7 +39,7 @@
byte[] raw = message.getBytes("US-ASCII");
ByteArrayInputStream instream = new ByteArrayInputStream(raw);
RootInputStream rootStream = new RootInputStream(instream);
- InputBuffer rawstream = new InputBuffer(rootStream, 12);
+ BufferedLineReaderInputStream rawstream = new
BufferedLineReaderInputStream(rootStream, 12);
MimeEntity entity = new MimeEntity(
rootStream,
@@ -126,7 +126,7 @@
byte[] raw = message.getBytes("US-ASCII");
ByteArrayInputStream instream = new ByteArrayInputStream(raw);
RootInputStream rootStream = new RootInputStream(instream);
- InputBuffer rawstream = new InputBuffer(rootStream, 24);
+ BufferedLineReaderInputStream rawstream = new
BufferedLineReaderInputStream(rootStream, 24);
MimeEntity entity = new MimeEntity(
rootStream,
@@ -239,7 +239,7 @@
byte[] raw = message.getBytes("US-ASCII");
ByteArrayInputStream instream = new ByteArrayInputStream(raw);
RootInputStream rootStream = new RootInputStream(instream);
- InputBuffer rawstream = new InputBuffer(rootStream, 24);
+ BufferedLineReaderInputStream rawstream = new
BufferedLineReaderInputStream(rootStream, 24);
MimeEntity entity = new MimeEntity(
rootStream,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
