[prev in list] [next in list] [prev in thread] [next in thread]
List: httpcomponents-commits
Subject: svn commit: r325980 - in /jakarta/httpclient/trunk/http-common/src:
From: olegk () apache ! org
Date: 2005-10-17 20:39:37
Message-ID: 20051017203940.12158.qmail () minotaur ! apache ! org
[Download RAW message or body]
Author: olegk
Date: Mon Oct 17 13:39:18 2005
New Revision: 325980
URL: http://svn.apache.org/viewcvs?rev=325980&view=rev
Log:
Renamed EncodingUtil to EncodingUtils and ExceptionUtil to ExceptionUtils for \
consistency with other util classes
Added:
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/EncodingUtils.java
- copied, changed from r322507, \
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/EncodingUtil.java \
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/ExceptionUtils.java
- copied, changed from r322507, \
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/ExceptionUtil.java \
Removed: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/EncodingUtil.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/ExceptionUtil.java
Modified:
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpException.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/ChunkedInputStream.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/io/TestChunkCoding.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/io/TestContentLengthInputStream.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestEncodingUtils.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestExceptionUtils.java
Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpException.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpException.java?rev=325980&r1=325979&r2=325980&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpException.java \
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/HttpException.java \
Mon Oct 17 13:39:18 2005 @@ -29,7 +29,7 @@
package org.apache.http;
-import org.apache.http.util.ExceptionUtil;
+import org.apache.http.util.ExceptionUtils;
/**
* Signals that an HTTP exception has occurred.
@@ -69,7 +69,7 @@
*/
public HttpException(final String message, final Throwable cause) {
super(message);
- ExceptionUtil.initCause(this, cause);
+ ExceptionUtils.initCause(this, cause);
}
}
Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/a \
pache/http/impl/io/AbstractHttpDataReceiver.java?rev=325980&r1=325979&r2=325980&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java \
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java \
Mon Oct 17 13:39:18 2005 @@ -36,7 +36,7 @@
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.util.ByteArrayBuffer;
-import org.apache.http.util.EncodingUtil;
+import org.apache.http.util.EncodingUtils;
/**
* <p>Classic IO Compatibility wrapper</p>
@@ -202,7 +202,7 @@
}
}
}
- return EncodingUtil.getString(
+ return EncodingUtils.getString(
this.linebuffer.getBuffer(), 0, this.linebuffer.length(), \
this.charset); }
@@ -215,7 +215,7 @@
pos--;
}
len = pos - off;
- return EncodingUtil.getString(this.buffer, off, len, this.charset);
+ return EncodingUtils.getString(this.buffer, off, len, this.charset);
}
public void reset(final HttpParams params) {
Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/ChunkedInputStream.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/ChunkedInputStream.java?rev=325980&r1=325979&r2=325980&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/ChunkedInputStream.java \
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/io/ChunkedInputStream.java \
Mon Oct 17 13:39:18 2005 @@ -34,7 +34,7 @@
import org.apache.http.Header;
import org.apache.http.HttpException;
-import org.apache.http.util.ExceptionUtil;
+import org.apache.http.util.ExceptionUtils;
import org.apache.http.util.HeadersParser;
/**
@@ -291,7 +291,7 @@
} catch (HttpException e) {
IOException ioe = new MalformedChunkCodingException("Invalid footer: "
+ e.getMessage());
- ExceptionUtil.initCause(ioe, e);
+ ExceptionUtils.initCause(ioe, e);
throw ioe;
}
}
Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/EncodingUtils.java \
(from r322507, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/EncodingUtil.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/a \
pache/http/util/EncodingUtils.java?p2=jakarta/httpclient/trunk/http-common/src/java/or \
g/apache/http/util/EncodingUtils.java&p1=jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/EncodingUtil.java&r1=322507&r2=325980&rev=325980&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/EncodingUtil.java \
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/EncodingUtils.java \
Mon Oct 17 13:39:18 2005 @@ -38,7 +38,7 @@
*
* @since 2.0 final
*/
-public class EncodingUtil {
+public class EncodingUtils {
/** ASCII chatset */
private static final String ASCII_CHARSET = "US-ASCII";
@@ -190,7 +190,7 @@
/**
* This class should not be instantiated.
*/
- private EncodingUtil() {
+ private EncodingUtils() {
super();
}
Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/ExceptionUtils.java \
(from r322507, jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/ExceptionUtil.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/a \
pache/http/util/ExceptionUtils.java?p2=jakarta/httpclient/trunk/http-common/src/java/o \
rg/apache/http/util/ExceptionUtils.java&p1=jakarta/httpclient/trunk/http-common/src/ja \
va/org/apache/http/util/ExceptionUtil.java&r1=322507&r2=325980&rev=325980&view=diff \
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/ExceptionUtil.java \
(original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/util/ExceptionUtils.java \
Mon Oct 17 13:39:18 2005 @@ -38,7 +38,7 @@
*
* @since 3.0
*/
-public class ExceptionUtil {
+public class ExceptionUtils {
/** A reference to Throwable's initCause method, or null if it's not there in \
this JVM */ static private final Method INIT_CAUSE_METHOD = getInitCauseMethod();
Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/io/TestChunkCoding.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/io/TestChunkCoding.java?rev=325980&r1=325979&r2=325980&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/io/TestChunkCoding.java \
(original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/io/TestChunkCoding.java \
Mon Oct 17 13:39:18 2005 @@ -36,7 +36,7 @@
import org.apache.http.Header;
import org.apache.http.mockup.HttpDataReceiverMockup;
import org.apache.http.mockup.HttpDataTransmitterMockup;
-import org.apache.http.util.EncodingUtil;
+import org.apache.http.util.EncodingUtils;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -83,7 +83,7 @@
public void testChunkedInputStreamLargeBuffer() throws IOException {
ChunkedInputStream in = new ChunkedInputStream(
new HttpDataReceiverMockup(
- EncodingUtil.getBytes(CHUNKED_INPUT, CONTENT_CHARSET)));
+ EncodingUtils.getBytes(CHUNKED_INPUT, CONTENT_CHARSET)));
byte[] buffer = new byte[300];
ByteArrayOutputStream out = new ByteArrayOutputStream();
int len;
@@ -95,7 +95,7 @@
in.close();
- String result = EncodingUtil.getString(out.toByteArray(), CONTENT_CHARSET);
+ String result = EncodingUtils.getString(out.toByteArray(), CONTENT_CHARSET);
assertEquals(result, CHUNKED_RESULT);
Header[] footers = in.getFooters();
@@ -111,7 +111,7 @@
public void testChunkedInputStreamSmallBuffer() throws IOException {
ChunkedInputStream in = new ChunkedInputStream(
new HttpDataReceiverMockup(
- EncodingUtil.getBytes(CHUNKED_INPUT, CONTENT_CHARSET)));
+ EncodingUtils.getBytes(CHUNKED_INPUT, \
CONTENT_CHARSET)));
byte[] buffer = new byte[7];
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -124,7 +124,7 @@
in.close();
- EncodingUtil.getString(out.toByteArray(), CONTENT_CHARSET);
+ EncodingUtils.getString(out.toByteArray(), CONTENT_CHARSET);
Header[] footers = in.getFooters();
assertNotNull(footers);
assertEquals(2, footers.length);
@@ -139,7 +139,7 @@
String s = "5\r\n01234\r\n5\r\n56789\r\n0\r\n";
ChunkedInputStream in = new ChunkedInputStream(
new HttpDataReceiverMockup(
- EncodingUtil.getBytes(s, CONTENT_CHARSET)));
+ EncodingUtils.getBytes(s, CONTENT_CHARSET)));
int ch;
int i = '0';
while ((ch = in.read()) != -1) {
@@ -156,7 +156,7 @@
String s = "5\r\n01234\r\n5\r\n56789\r\n0\r\n";
ChunkedInputStream in = new ChunkedInputStream(
new HttpDataReceiverMockup(
- EncodingUtil.getBytes(s, CONTENT_CHARSET)));
+ EncodingUtils.getBytes(s, CONTENT_CHARSET)));
in.close();
in.close();
try {
@@ -204,7 +204,7 @@
String s = "5\r\n012345\r\n56789\r\n0\r\n";
InputStream in = new ChunkedInputStream(
new HttpDataReceiverMockup(
- EncodingUtil.getBytes(s, CONTENT_CHARSET)));
+ EncodingUtils.getBytes(s, CONTENT_CHARSET)));
byte[] buffer = new byte[300];
ByteArrayOutputStream out = new ByteArrayOutputStream();
int len;
@@ -223,7 +223,7 @@
String s = "5\r01234\r\n5\r\n56789\r\n0\r\n";
InputStream in = new ChunkedInputStream(
new HttpDataReceiverMockup(
- EncodingUtil.getBytes(s, CONTENT_CHARSET)));
+ EncodingUtils.getBytes(s, CONTENT_CHARSET)));
try {
in.read();
fail("MalformedChunkCodingException should have been thrown");
@@ -249,7 +249,7 @@
String s = "whatever\r\n01234\r\n5\r\n56789\r\n0\r\n";
InputStream in = new ChunkedInputStream(
new HttpDataReceiverMockup(
- EncodingUtil.getBytes(s, CONTENT_CHARSET)));
+ EncodingUtils.getBytes(s, CONTENT_CHARSET)));
try {
in.read();
fail("MalformedChunkCodingException should have been thrown");
@@ -263,7 +263,7 @@
String s = "1\r\n0\r\n0\r\nstuff\r\n";
InputStream in = new ChunkedInputStream(
new HttpDataReceiverMockup(
- EncodingUtil.getBytes(s, CONTENT_CHARSET)));
+ EncodingUtils.getBytes(s, CONTENT_CHARSET)));
try {
in.read();
in.read();
@@ -277,7 +277,7 @@
String input = "0\r\n";
InputStream in = new ChunkedInputStream(
new HttpDataReceiverMockup(
- EncodingUtil.getBytes(input, CONTENT_CHARSET)));
+ EncodingUtils.getBytes(input, CONTENT_CHARSET)));
byte[] buffer = new byte[300];
ByteArrayOutputStream out = new ByteArrayOutputStream();
int len;
@@ -291,7 +291,7 @@
String input = \
"76126;27823abcd;:q38a-\nkjc\rk%1ad\tkh/asdui\r\njkh+?\\suweb"; \
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
OutputStream out = new ChunkedOutputStream(new \
HttpDataTransmitterMockup(buffer));
- out.write(EncodingUtil.getBytes(input, CONTENT_CHARSET));
+ out.write(EncodingUtils.getBytes(input, CONTENT_CHARSET));
out.flush();
out.close();
out.close();
@@ -307,7 +307,7 @@
result.write(d, 0, len);
}
- String output = EncodingUtil.getString(result.toByteArray(), \
CONTENT_CHARSET); + String output = \
EncodingUtils.getString(result.toByteArray(), CONTENT_CHARSET); assertEquals(input, \
output); }
Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/io/TestContentLengthInputStream.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/a \
pache/http/io/TestContentLengthInputStream.java?rev=325980&r1=325979&r2=325980&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/io/TestContentLengthInputStream.java \
(original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/io/TestContentLengthInputStream.java \
Mon Oct 17 13:39:18 2005 @@ -33,7 +33,7 @@
import java.io.InputStream;
import org.apache.http.mockup.HttpDataReceiverMockup;
-import org.apache.http.util.EncodingUtil;
+import org.apache.http.util.EncodingUtils;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -78,7 +78,7 @@
public void testBasics() throws IOException {
String correct = "1234567890123456";
InputStream in = new ContentLengthInputStream(new HttpDataReceiverMockup(
- EncodingUtil.getBytes(correct, CONTENT_CHARSET)), 10L);
+ EncodingUtils.getBytes(correct, CONTENT_CHARSET)), 10L);
ByteArrayOutputStream out = new ByteArrayOutputStream();
byte[] buffer = new byte[50];
@@ -87,7 +87,7 @@
len = in.read(buffer);
out.write(buffer, 0, len);
- String result = EncodingUtil.getString(out.toByteArray(), CONTENT_CHARSET);
+ String result = EncodingUtils.getString(out.toByteArray(), CONTENT_CHARSET);
assertEquals(result, "1234567890");
}
@@ -116,7 +116,7 @@
public void testClose() throws IOException {
String correct = "1234567890123456";
InputStream in = new ContentLengthInputStream(new HttpDataReceiverMockup(
- EncodingUtil.getBytes(correct, CONTENT_CHARSET)), 10L);
+ EncodingUtils.getBytes(correct, CONTENT_CHARSET)), 10L);
in.close();
in.close();
try {
Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestEncodingUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestEncodingUtils.java?rev=325980&r1=325979&r2=325980&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestEncodingUtils.java \
(original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestEncodingUtils.java \
Mon Oct 17 13:39:18 2005 @@ -73,34 +73,34 @@
byte[] latin1 = s.getBytes("ISO-8859-1");
byte[] def = s.getBytes();
- String s1 = EncodingUtil.getString(utf, "UTF-8");
- String s2 = EncodingUtil.getString(latin1, "ISO-8859-1");
- String s3 = EncodingUtil.getString(def, "THIS JUST DOES NOT SEEM RIGHT");
+ String s1 = EncodingUtils.getString(utf, "UTF-8");
+ String s2 = EncodingUtils.getString(latin1, "ISO-8859-1");
+ String s3 = EncodingUtils.getString(def, "THIS JUST DOES NOT SEEM RIGHT");
assertEquals(s, s1);
assertEquals(s, s2);
assertEquals(s, s3);
try {
- EncodingUtil.getString(null, 0, 0, "UTF-8");
+ EncodingUtils.getString(null, 0, 0, "UTF-8");
fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
// expected
}
try {
- EncodingUtil.getString(null, "UTF-8");
+ EncodingUtils.getString(null, "UTF-8");
fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
// expected
}
try {
- EncodingUtil.getString(new byte[] {}, null);
+ EncodingUtils.getString(new byte[] {}, null);
fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
// expected
}
try {
- EncodingUtil.getString(new byte[] {}, "");
+ EncodingUtils.getString(new byte[] {}, "");
fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
// expected
@@ -113,9 +113,9 @@
byte[] latin1 = s.getBytes("ISO-8859-1");
byte[] def = s.getBytes();
- byte[] data1 = EncodingUtil.getBytes(s, "UTF-8");
- byte[] data2 = EncodingUtil.getBytes(s, "ISO-8859-1");
- byte[] data3 = EncodingUtil.getBytes(s, "THIS JUST DOES NOT SEEM RIGHT");
+ byte[] data1 = EncodingUtils.getBytes(s, "UTF-8");
+ byte[] data2 = EncodingUtils.getBytes(s, "ISO-8859-1");
+ byte[] data3 = EncodingUtils.getBytes(s, "THIS JUST DOES NOT SEEM RIGHT");
assertNotNull(data1);
assertEquals(utf.length, data1.length);
@@ -134,19 +134,19 @@
}
try {
- EncodingUtil.getBytes(null, "UTF-8");
+ EncodingUtils.getBytes(null, "UTF-8");
fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
// expected
}
try {
- EncodingUtil.getBytes("what not", null);
+ EncodingUtils.getBytes("what not", null);
fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
// expected
}
try {
- EncodingUtil.getBytes("what not", "");
+ EncodingUtils.getBytes("what not", "");
fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
// expected
@@ -155,15 +155,15 @@
public void testAsciiBytesToString() throws Exception {
String s = "ascii only, I mean it!";
- assertEquals(s, EncodingUtil.getAsciiString(s.getBytes("US-ASCII")));
+ assertEquals(s, EncodingUtils.getAsciiString(s.getBytes("US-ASCII")));
try {
- EncodingUtil.getAsciiString(null);
+ EncodingUtils.getAsciiString(null);
fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
// expected
}
try {
- EncodingUtil.getAsciiString(null, 0, 0);
+ EncodingUtils.getAsciiString(null, 0, 0);
fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
// expected
@@ -173,7 +173,7 @@
public void testAsciiStringToBytes() throws Exception {
String s = "ascii only, I mean it!";
byte[] ascii = s.getBytes("US-ASCII");
- byte[] data = EncodingUtil.getAsciiBytes(s);
+ byte[] data = EncodingUtils.getAsciiBytes(s);
assertNotNull(data);
assertEquals(ascii.length, data.length);
@@ -181,7 +181,7 @@
assertEquals(ascii[i], data[i]);
}
try {
- EncodingUtil.getAsciiBytes(null);
+ EncodingUtils.getAsciiBytes(null);
fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
// expected
Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestExceptionUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestExceptionUtils.java?rev=325980&r1=325979&r2=325980&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestExceptionUtils.java \
(original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestExceptionUtils.java \
Mon Oct 17 13:39:18 2005 @@ -56,7 +56,7 @@
public void testExceptionChaining() throws Exception {
Exception ex1 = new Exception();
Exception ex2 = new Exception();
- ExceptionUtil.initCause(ex1, ex2);
+ ExceptionUtils.initCause(ex1, ex2);
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic