You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2014/11/01 15:39:35 UTC
svn commit: r1635958 - in /httpcomponents/httpcore/trunk:
httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/
httpcore-nio/src/test/java/org/apache/http/nio/util/
httpcore/src/main/java/org/apache/http/protocol/
httpcore/src/main/java/org/apach...
Author: olegk
Date: Sat Nov 1 14:39:34 2014
New Revision: 1635958
URL: http://svn.apache.org/r1635958
Log:
Removed EncodingUtils
Removed:
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/EncodingUtils.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEncodingUtils.java
Modified:
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/CodecTestUtils.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/CodecTestUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/CodecTestUtils.java?rev=1635958&r1=1635957&r2=1635958&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/CodecTestUtils.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/CodecTestUtils.java Sat Nov 1 14:39:34 2014
@@ -32,12 +32,12 @@ import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.nio.ByteBuffer;
-import org.apache.http.util.EncodingUtils;
+import org.apache.http.Consts;
class CodecTestUtils {
public static ByteBuffer wrap(final String s) {
- return ByteBuffer.wrap(EncodingUtils.getAsciiBytes(s));
+ return ByteBuffer.wrap(s.getBytes(Consts.ASCII));
}
public static String convert(final ByteBuffer src) {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java?rev=1635958&r1=1635957&r2=1635958&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java Sat Nov 1 14:39:34 2014
@@ -39,7 +39,6 @@ import org.apache.http.ReadableByteChann
import org.apache.http.impl.io.HttpTransportMetricsImpl;
import org.apache.http.impl.nio.reactor.SessionInputBufferImpl;
import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.util.EncodingUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
@@ -222,7 +221,7 @@ public class TestIdentityDecoder {
final int i = inbuf.fill(channel);
Assert.assertEquals(7, i);
- final byte[] beginning = EncodingUtils.getAsciiBytes("beginning; ");
+ final byte[] beginning = "beginning; ".getBytes(Consts.ASCII);
createTempFile();
RandomAccessFile testfile = new RandomAccessFile(this.tmpfile, "rw");
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java?rev=1635958&r1=1635957&r2=1635958&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java Sat Nov 1 14:39:34 2014
@@ -40,7 +40,6 @@ import org.apache.http.ReadableByteChann
import org.apache.http.impl.io.HttpTransportMetricsImpl;
import org.apache.http.impl.nio.reactor.SessionInputBufferImpl;
import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.util.EncodingUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
@@ -330,7 +329,7 @@ public class TestLengthDelimitedDecoder
final int i = inbuf.fill(channel);
Assert.assertEquals(7, i);
- final byte[] beginning = EncodingUtils.getAsciiBytes("beginning; ");
+ final byte[] beginning = "beginning; ".getBytes(Consts.ASCII);
createTempFile();
RandomAccessFile testfile = new RandomAccessFile(this.tmpfile, "rw");
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java?rev=1635958&r1=1635957&r2=1635958&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java Sat Nov 1 14:39:34 2014
@@ -41,7 +41,6 @@ import org.apache.http.impl.nio.reactor.
import org.apache.http.nio.ContentDecoder;
import org.apache.http.nio.ContentEncoder;
import org.apache.http.nio.reactor.SessionOutputBuffer;
-import org.apache.http.util.EncodingUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -65,7 +64,7 @@ public class TestBuffers {
final byte[] b1 = new byte[5];
int len = buffer.read(b1);
- Assert.assertEquals("stuff", EncodingUtils.getAsciiString(b1, 0, len));
+ Assert.assertEquals("stuff", new String(b1, 0, len, Consts.ASCII));
final int c = buffer.read();
Assert.assertEquals(';', c);
@@ -73,7 +72,7 @@ public class TestBuffers {
final byte[] b2 = new byte[1024];
len = buffer.read(b2);
- Assert.assertEquals("more stuff", EncodingUtils.getAsciiString(b2, 0, len));
+ Assert.assertEquals("more stuff", new String(b2, 0, len, Consts.ASCII));
Assert.assertEquals(-1, buffer.read());
Assert.assertEquals(-1, buffer.read(b2));
@@ -95,16 +94,16 @@ public class TestBuffers {
final SimpleOutputBuffer buffer = new SimpleOutputBuffer(4, DirectByteBufferAllocator.INSTANCE);
- buffer.write(EncodingUtils.getAsciiBytes("stuff"));
+ buffer.write("stuff".getBytes(Consts.ASCII));
buffer.write(';');
buffer.produceContent(encoder);
- buffer.write(EncodingUtils.getAsciiBytes("more "));
- buffer.write(EncodingUtils.getAsciiBytes("stuff"));
+ buffer.write("more ".getBytes(Consts.ASCII));
+ buffer.write("stuff".getBytes(Consts.ASCII));
buffer.produceContent(encoder);
final byte[] content = outstream.toByteArray();
- Assert.assertEquals("stuff;more stuff", EncodingUtils.getAsciiString(content));
+ Assert.assertEquals("stuff;more stuff", new String(content, Consts.ASCII));
}
@Test
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java?rev=1635958&r1=1635957&r2=1635958&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java Sat Nov 1 14:39:34 2014
@@ -43,11 +43,11 @@ import org.apache.http.MethodNotSupporte
import org.apache.http.ProtocolException;
import org.apache.http.UnsupportedHttpVersionException;
import org.apache.http.annotation.Immutable;
-import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
import org.apache.http.util.Args;
-import org.apache.http.util.EncodingUtils;
import org.apache.http.util.EntityUtils;
/**
@@ -244,9 +244,7 @@ public class HttpService {
if (message == null) {
message = ex.toString();
}
- final byte[] msg = EncodingUtils.getAsciiBytes(message);
- final ByteArrayEntity entity = new ByteArrayEntity(msg);
- entity.setContentType("text/plain; charset=US-ASCII");
+ final StringEntity entity = new StringEntity(message, ContentType.TEXT_PLAIN);
response.setEntity(entity);
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java?rev=1635958&r1=1635957&r2=1635958&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java Sat Nov 1 14:39:34 2014
@@ -66,7 +66,6 @@ import org.apache.http.protocol.RequestT
import org.apache.http.protocol.RequestUserAgent;
import org.apache.http.testserver.HttpClient;
import org.apache.http.testserver.HttpServer;
-import org.apache.http.util.EncodingUtils;
import org.apache.http.util.EntityUtils;
import org.junit.After;
import org.junit.Assert;
@@ -552,9 +551,8 @@ public class TestSyncHttp {
}
if (secretNumber < 2) {
response.setStatusCode(HttpStatus.SC_EXPECTATION_FAILED);
- final ByteArrayEntity outgoing = new ByteArrayEntity(
- EncodingUtils.getAsciiBytes("Wrong secret number"));
- response.setEntity(outgoing);
+ response.setEntity(
+ new StringEntity("Wrong secret number", ContentType.TEXT_PLAIN));
}
}
}
@@ -574,9 +572,7 @@ public class TestSyncHttp {
final BasicHttpEntityEnclosingRequest post = new BasicHttpEntityEnclosingRequest("POST", "/");
post.addHeader("Secret", Integer.toString(r));
- final ByteArrayEntity outgoing = new ByteArrayEntity(
- EncodingUtils.getAsciiBytes("No content " + r));
- post.setEntity(outgoing);
+ post.setEntity(new StringEntity("No content " + r, ContentType.TEXT_PLAIN));
final HttpResponse response = this.client.execute(post, host, conn);