From 3e9b94fe413e58521c88feb8eaf487066c2ec934 Mon Sep 17 00:00:00 2001 From: Vibhatha Lakmal Abeykoon Date: Wed, 20 Mar 2024 18:11:53 +0530 Subject: [PATCH] GH-39752: [Java] Remove Static imports for Utf8 Usage (#40683) ### What changes are included in this PR? Removing static imports of UTF_8. This has been identified as a minor enhancement as documented here: https://github.com/apache/arrow/issues/39752 and discussed in a review [here](https://github.com/apache/arrow/pull/39529#discussion_r1455672602). ### Are these changes tested? Tested by existing test cases. ### Are there any user-facing changes? No * GitHub Issue: #39752 Authored-by: Vibhatha Abeykoon Signed-off-by: David Li --- .../impl/text/ArrowFlightJdbcVarCharVectorAccessor.java | 4 ++-- .../apache/arrow/flight/sql/example/FlightSqlExample.java | 8 ++++---- .../java/org/apache/arrow/vector/ipc/JsonFileReader.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/text/ArrowFlightJdbcVarCharVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/text/ArrowFlightJdbcVarCharVectorAccessor.java index d4075bbb75ee0..56c29492c578b 100644 --- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/text/ArrowFlightJdbcVarCharVectorAccessor.java +++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/text/ArrowFlightJdbcVarCharVectorAccessor.java @@ -18,13 +18,13 @@ package org.apache.arrow.driver.jdbc.accessor.impl.text; import static java.nio.charset.StandardCharsets.US_ASCII; -import static java.nio.charset.StandardCharsets.UTF_8; import java.io.ByteArrayInputStream; import java.io.CharArrayReader; import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; import java.sql.Date; import java.sql.SQLException; import java.sql.Time; @@ -81,7 +81,7 @@ public Class getObjectClass() { @Override public String getObject() { final byte[] bytes = getBytes(); - return bytes == null ? null : new String(bytes, UTF_8); + return bytes == null ? null : new String(bytes, StandardCharsets.UTF_8); } @Override diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java index 1d43728b789f5..52c402efd6f0b 100644 --- a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java +++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java @@ -21,7 +21,6 @@ import static com.google.protobuf.Any.pack; import static com.google.protobuf.ByteString.copyFrom; import static java.lang.String.format; -import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Collections.singletonList; import static java.util.Objects.isNull; import static java.util.UUID.randomUUID; @@ -43,6 +42,7 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.Channels; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.NoSuchFileException; import java.nio.file.Path; @@ -428,7 +428,7 @@ private static int saveToVectors(final Map ve range(0, split.length) .forEach(i -> { - byte[] bytes = split[i].getBytes(UTF_8); + byte[] bytes = split[i].getBytes(StandardCharsets.UTF_8); Preconditions.checkState(bytes.length < 1024, "The amount of bytes is greater than what the ArrowBuf supports"); buf.setBytes(0, bytes); @@ -701,7 +701,7 @@ public void closePreparedStatement(final ActionClosePreparedStatementRequest req @Override public FlightInfo getFlightInfoStatement(final CommandStatementQuery request, final CallContext context, final FlightDescriptor descriptor) { - ByteString handle = copyFrom(randomUUID().toString().getBytes(UTF_8)); + ByteString handle = copyFrom(randomUUID().toString().getBytes(StandardCharsets.UTF_8)); try { // Ownership of the connection will be passed to the context. Do NOT close! @@ -778,7 +778,7 @@ public void createPreparedStatement(final ActionCreatePreparedStatementRequest r // Running on another thread Future unused = executorService.submit(() -> { try { - final ByteString preparedStatementHandle = copyFrom(randomUUID().toString().getBytes(UTF_8)); + final ByteString preparedStatementHandle = copyFrom(randomUUID().toString().getBytes(StandardCharsets.UTF_8)); // Ownership of the connection will be passed to the context. Do NOT close! final Connection connection = dataSource.getConnection(); final PreparedStatement preparedStatement = connection.prepareStatement(request.getQuery(), diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java index 0c23a664f62d6..e927acd4816ad 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java @@ -21,7 +21,6 @@ import static com.fasterxml.jackson.core.JsonToken.END_OBJECT; import static com.fasterxml.jackson.core.JsonToken.START_ARRAY; import static com.fasterxml.jackson.core.JsonToken.START_OBJECT; -import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.arrow.vector.BufferLayout.BufferType.DATA; import static org.apache.arrow.vector.BufferLayout.BufferType.OFFSET; import static org.apache.arrow.vector.BufferLayout.BufferType.TYPE; @@ -31,6 +30,7 @@ import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -538,7 +538,7 @@ ArrowBuf readStringValues( long bufferSize = 0L; for (int i = 0; i < count; i++) { parser.nextToken(); - final byte[] value = parser.getValueAsString().getBytes(UTF_8); + final byte[] value = parser.getValueAsString().getBytes(StandardCharsets.UTF_8); values.add(value); bufferSize += value.length; }