BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-06 05:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Java] Replace Table.UTF8_CHARSET with StandardCharsets.UTF_8 (#5696)

Browse Source 
StandardCharsets.UTF_8 is already used in FlexBuffersBuilder.
This commit is contained in:
dreifachstein
2020-01-07 01:28:19 +08:00
committed by Wouter van Oortmerssen
parent 3b458f7a17
commit 35daaf83d3
5 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/com/google/flatbuffers/Table.java
View File

@@ -19,7 +19,6 @@ package com.google.flatbuffers;
import static com.google.flatbuffers.Constants.*;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.charset.Charset;
/// @cond FLATBUFFERS_INTERNAL
@@ -27,12 +26,6 @@ import java.nio.charset.Charset;
* All tables in the generated code derive from this class, and add their own accessors.
*/
public class Table {
public final static ThreadLocal<Charset> UTF8_CHARSET = new ThreadLocal<Charset>() {
@Override
protected Charset initialValue() {
return Charset.forName("UTF-8");
}
};
/** Used to hold the position of the `bb` buffer. */
protected int bb_pos;
/** The underlying ByteBuffer to hold the data of the Table. */

2
src/idl_gen_java.cpp
View File

@@ -1134,7 +1134,7 @@ class JavaGenerator : public BaseGenerator {
code += " key, ByteBuffer bb) {\n";
if (key_field->value.type.base_type == BASE_TYPE_STRING) {
code += " byte[] byteKey = ";
code += "key.getBytes(Table.UTF8_CHARSET.get());\n";
code += "key.getBytes(java.nio.charset.StandardCharsets.UTF_8);\n";
}
code += " int span = ";
code += "bb.getInt(vectorLocation - 4);\n";

2
src/idl_gen_kotlin.cpp
View File

@@ -522,7 +522,7 @@ class KotlinGenerator : public BaseGenerator {
if (base_type == BASE_TYPE_STRING) {
writer +=
"val byteKey = key."
"toByteArray(Table.UTF8_CHARSET.get()!!)";
"toByteArray(java.nio.charset.StandardCharsets.UTF_8)";
}
writer += "var span = bb.getInt(vectorLocation - 4)";
writer += "var start = 0";

2
tests/MyGame/Example/Monster.java
View File

@@ -293,7 +293,7 @@ public final class Monster extends Table {
protected int keysCompare(Integer o1, Integer o2, ByteBuffer _bb) { return compareStrings(__offset(10, o1, _bb), __offset(10, o2, _bb), _bb); }
public static Monster __lookup_by_key(Monster obj, int vectorLocation, String key, ByteBuffer bb) {
byte[] byteKey = key.getBytes(Table.UTF8_CHARSET.get());
byte[] byteKey = key.getBytes(java.nio.charset.StandardCharsets.UTF_8);
int span = bb.getInt(vectorLocation - 4);
int start = 0;
while (span != 0) {

2
tests/MyGame/Example/Monster.kt
View File

@@ -964,7 +964,7 @@ class Monster : Table() {
fun finishMonsterBuffer(builder: FlatBufferBuilder, offset: Int) = builder.finish(offset, "MONS")
fun finishSizePrefixedMonsterBuffer(builder: FlatBufferBuilder, offset: Int) = builder.finishSizePrefixed(offset, "MONS")
fun __lookup_by_key(obj: Monster?, vectorLocation: Int, key: String, bb: ByteBuffer) : Monster? {
val byteKey = key.toByteArray(Table.UTF8_CHARSET.get()!!)
val byteKey = key.toByteArray(java.nio.charset.StandardCharsets.UTF_8)
var span = bb.getInt(vectorLocation - 4)
var start = 0
while (span != 0) {