Skip to content

Commit 1c97def

Browse files
committed
use StandardCharsets
1 parent 3f9a384 commit 1c97def

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

reactivesocket-aeron/src/test/java/io/reactivesocket/aeron/TestUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.agrona.MutableDirectBuffer;
2222

2323
import java.nio.ByteBuffer;
24-
import java.nio.charset.Charset;
24+
import java.nio.charset.StandardCharsets;
2525

2626
public class TestUtil
2727
{
@@ -60,12 +60,12 @@ public static String byteToString(final ByteBuffer byteBuffer)
6060
{
6161
final byte[] bytes = new byte[byteBuffer.capacity()];
6262
byteBuffer.get(bytes);
63-
return new String(bytes, Charset.forName("UTF-8"));
63+
return new String(bytes, StandardCharsets.UTF_8);
6464
}
6565

6666
public static ByteBuffer byteBufferFromUtf8String(final String data)
6767
{
68-
final byte[] bytes = data.getBytes(Charset.forName("UTF-8"));
68+
final byte[] bytes = data.getBytes(StandardCharsets.UTF_8);
6969
return ByteBuffer.wrap(bytes);
7070
}
7171

reactivesocket-jsr-356/src/test/java/io/reactivesocket/javax/websocket/TestUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.agrona.MutableDirectBuffer;
2222

2323
import java.nio.ByteBuffer;
24-
import java.nio.charset.Charset;
24+
import java.nio.charset.StandardCharsets;
2525

2626
public class TestUtil
2727
{
@@ -60,12 +60,12 @@ public static String byteToString(final ByteBuffer byteBuffer)
6060
{
6161
final byte[] bytes = new byte[byteBuffer.remaining()];
6262
byteBuffer.get(bytes);
63-
return new String(bytes, Charset.forName("UTF-8"));
63+
return new String(bytes, StandardCharsets.UTF_8);
6464
}
6565

6666
public static ByteBuffer byteBufferFromUtf8String(final String data)
6767
{
68-
final byte[] bytes = data.getBytes(Charset.forName("UTF-8"));
68+
final byte[] bytes = data.getBytes(StandardCharsets.UTF_8);
6969
return ByteBuffer.wrap(bytes);
7070
}
7171

reactivesocket-local/src/test/java/io/reactivesocket/local/TestUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.agrona.MutableDirectBuffer;
2222

2323
import java.nio.ByteBuffer;
24-
import java.nio.charset.Charset;
24+
import java.nio.charset.StandardCharsets;
2525

2626
public class TestUtil
2727
{
@@ -60,12 +60,12 @@ public static String byteToString(final ByteBuffer byteBuffer)
6060
{
6161
final byte[] bytes = new byte[byteBuffer.remaining()];
6262
byteBuffer.get(bytes);
63-
return new String(bytes, Charset.forName("UTF-8"));
63+
return new String(bytes, StandardCharsets.UTF_8);
6464
}
6565

6666
public static ByteBuffer byteBufferFromUtf8String(final String data)
6767
{
68-
final byte[] bytes = data.getBytes(Charset.forName("UTF-8"));
68+
final byte[] bytes = data.getBytes(StandardCharsets.UTF_8);
6969
return ByteBuffer.wrap(bytes);
7070
}
7171

reactivesocket-netty/src/main/java/io/reactivesocket/netty/MutableDirectByteBuf.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import java.nio.ByteBuffer;
2424
import java.nio.ByteOrder;
25-
import java.nio.charset.Charset;
25+
import java.nio.charset.StandardCharsets;
2626

2727
public class MutableDirectByteBuf implements MutableDirectBuffer
2828
{
@@ -358,19 +358,19 @@ public void getBytes(int index, ByteBuffer dstBuffer, int length)
358358
public String getStringUtf8(int offset, ByteOrder byteOrder)
359359
{
360360
final int length = getInt(offset, byteOrder);
361-
return byteBuf.toString(offset + BitUtil.SIZE_OF_INT, length, Charset.forName("UTF-8"));
361+
return byteBuf.toString(offset + BitUtil.SIZE_OF_INT, length, StandardCharsets.UTF_8);
362362
}
363363

364364
@Override
365365
public String getStringUtf8(int offset, int length)
366366
{
367-
return byteBuf.toString(offset, length, Charset.forName("UTF-8"));
367+
return byteBuf.toString(offset, length, StandardCharsets.UTF_8);
368368
}
369369

370370
@Override
371371
public String getStringWithoutLengthUtf8(int offset, int length)
372372
{
373-
return byteBuf.toString(offset, length, Charset.forName("UTF-8"));
373+
return byteBuf.toString(offset, length, StandardCharsets.UTF_8);
374374
}
375375

376376
@Override

reactivesocket-netty/src/test/java/io/reactivesocket/netty/TestUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.agrona.MutableDirectBuffer;
2323

2424
import java.nio.ByteBuffer;
25-
import java.nio.charset.Charset;
25+
import java.nio.charset.StandardCharsets;
2626

2727
public class TestUtil
2828
{
@@ -61,12 +61,12 @@ public static String byteToString(final ByteBuffer byteBuffer)
6161
{
6262
final byte[] bytes = new byte[byteBuffer.remaining()];
6363
byteBuffer.get(bytes);
64-
return new String(bytes, Charset.forName("UTF-8"));
64+
return new String(bytes, StandardCharsets.UTF_8);
6565
}
6666

6767
public static ByteBuffer byteBufferFromUtf8String(final String data)
6868
{
69-
final byte[] bytes = data.getBytes(Charset.forName("UTF-8"));
69+
final byte[] bytes = data.getBytes(StandardCharsets.UTF_8);
7070
return ByteBuffer.wrap(bytes);
7171
}
7272

0 commit comments

Comments
 (0)