This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 02a3b46f00c [MINOR] Cleanup binary writer (#12027)
02a3b46f00c is described below
commit 02a3b46f00c8ea442d2bb0ffacb0dbcbc47819c8
Author: Nikolay <[email protected]>
AuthorDate: Tue Apr 22 18:13:02 2025 +0300
[MINOR] Cleanup binary writer (#12027)
---
.../internal/binary/BinaryClassDescriptor.java | 48 +++++++++++-----------
.../apache/ignite/internal/binary/BinaryUtils.java | 40 +++++++++---------
.../ignite/internal/binary/BinaryWriterExImpl.java | 48 +++++++++++-----------
.../binary/builder/BinaryBuilderSerializer.java | 4 +-
.../processors/odbc/ClientListenerNioListener.java | 4 +-
.../internal/processors/odbc/SqlListenerUtils.java | 4 +-
6 files changed, 74 insertions(+), 74 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index b0fde3168b6..a8ec88c4210 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -669,102 +669,102 @@ public class BinaryClassDescriptor {
break;
case DECIMAL:
- writer.doWriteDecimal((BigDecimal)obj);
+ writer.writeDecimal((BigDecimal)obj);
break;
case STRING:
- writer.doWriteString((String)obj);
+ writer.writeString((String)obj);
break;
case UUID:
- writer.doWriteUuid((UUID)obj);
+ writer.writeUuid((UUID)obj);
break;
case DATE:
- writer.doWriteDate((Date)obj);
+ writer.writeDate((Date)obj);
break;
case TIMESTAMP:
- writer.doWriteTimestamp((Timestamp)obj);
+ writer.writeTimestamp((Timestamp)obj);
break;
case TIME:
- writer.doWriteTime((Time)obj);
+ writer.writeTime((Time)obj);
break;
case BYTE_ARR:
- writer.doWriteByteArray((byte[])obj);
+ writer.writeByteArray((byte[])obj);
break;
case SHORT_ARR:
- writer.doWriteShortArray((short[])obj);
+ writer.writeShortArray((short[])obj);
break;
case INT_ARR:
- writer.doWriteIntArray((int[])obj);
+ writer.writeIntArray((int[])obj);
break;
case LONG_ARR:
- writer.doWriteLongArray((long[])obj);
+ writer.writeLongArray((long[])obj);
break;
case FLOAT_ARR:
- writer.doWriteFloatArray((float[])obj);
+ writer.writeFloatArray((float[])obj);
break;
case DOUBLE_ARR:
- writer.doWriteDoubleArray((double[])obj);
+ writer.writeDoubleArray((double[])obj);
break;
case CHAR_ARR:
- writer.doWriteCharArray((char[])obj);
+ writer.writeCharArray((char[])obj);
break;
case BOOLEAN_ARR:
- writer.doWriteBooleanArray((boolean[])obj);
+ writer.writeBooleanArray((boolean[])obj);
break;
case DECIMAL_ARR:
- writer.doWriteDecimalArray((BigDecimal[])obj);
+ writer.writeDecimalArray((BigDecimal[])obj);
break;
case STRING_ARR:
- writer.doWriteStringArray((String[])obj);
+ writer.writeStringArray((String[])obj);
break;
case UUID_ARR:
- writer.doWriteUuidArray((UUID[])obj);
+ writer.writeUuidArray((UUID[])obj);
break;
case DATE_ARR:
- writer.doWriteDateArray((Date[])obj);
+ writer.writeDateArray((Date[])obj);
break;
case TIMESTAMP_ARR:
- writer.doWriteTimestampArray((Timestamp[])obj);
+ writer.writeTimestampArray((Timestamp[])obj);
break;
case TIME_ARR:
- writer.doWriteTimeArray((Time[])obj);
+ writer.writeTimeArray((Time[])obj);
break;
@@ -772,22 +772,22 @@ public class BinaryClassDescriptor {
if (obj instanceof BinaryArray)
writer.doWriteBinaryArray(((BinaryArray)obj));
else
- writer.doWriteObjectArray((Object[])obj);
+ writer.writeObjectArray((Object[])obj);
break;
case COL:
- writer.doWriteCollection((Collection<?>)obj);
+ writer.writeCollection((Collection<?>)obj);
break;
case MAP:
- writer.doWriteMap((Map<?, ?>)obj);
+ writer.writeMap((Map<?, ?>)obj);
break;
case ENUM:
- writer.doWriteEnum((Enum<?>)obj);
+ writer.writeEnum((Enum<?>)obj);
break;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index ead54b1c093..976d7ddabfe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -455,102 +455,102 @@ public class BinaryUtils {
break;
case GridBinaryMarshaller.DECIMAL:
- writer.doWriteDecimal((BigDecimal)val);
+ writer.writeDecimal((BigDecimal)val);
break;
case GridBinaryMarshaller.STRING:
- writer.doWriteString((String)val);
+ writer.writeString((String)val);
break;
case GridBinaryMarshaller.UUID:
- writer.doWriteUuid((UUID)val);
+ writer.writeUuid((UUID)val);
break;
case GridBinaryMarshaller.DATE:
- writer.doWriteDate((Date)val);
+ writer.writeDate((Date)val);
break;
case GridBinaryMarshaller.TIMESTAMP:
- writer.doWriteTimestamp((Timestamp)val);
+ writer.writeTimestamp((Timestamp)val);
break;
case GridBinaryMarshaller.TIME:
- writer.doWriteTime((Time)val);
+ writer.writeTime((Time)val);
break;
case GridBinaryMarshaller.BYTE_ARR:
- writer.doWriteByteArray((byte[])val);
+ writer.writeByteArray((byte[])val);
break;
case GridBinaryMarshaller.SHORT_ARR:
- writer.doWriteShortArray((short[])val);
+ writer.writeShortArray((short[])val);
break;
case GridBinaryMarshaller.INT_ARR:
- writer.doWriteIntArray((int[])val);
+ writer.writeIntArray((int[])val);
break;
case GridBinaryMarshaller.LONG_ARR:
- writer.doWriteLongArray((long[])val);
+ writer.writeLongArray((long[])val);
break;
case GridBinaryMarshaller.FLOAT_ARR:
- writer.doWriteFloatArray((float[])val);
+ writer.writeFloatArray((float[])val);
break;
case GridBinaryMarshaller.DOUBLE_ARR:
- writer.doWriteDoubleArray((double[])val);
+ writer.writeDoubleArray((double[])val);
break;
case GridBinaryMarshaller.CHAR_ARR:
- writer.doWriteCharArray((char[])val);
+ writer.writeCharArray((char[])val);
break;
case GridBinaryMarshaller.BOOLEAN_ARR:
- writer.doWriteBooleanArray((boolean[])val);
+ writer.writeBooleanArray((boolean[])val);
break;
case GridBinaryMarshaller.DECIMAL_ARR:
- writer.doWriteDecimalArray((BigDecimal[])val);
+ writer.writeDecimalArray((BigDecimal[])val);
break;
case GridBinaryMarshaller.STRING_ARR:
- writer.doWriteStringArray((String[])val);
+ writer.writeStringArray((String[])val);
break;
case GridBinaryMarshaller.UUID_ARR:
- writer.doWriteUuidArray((UUID[])val);
+ writer.writeUuidArray((UUID[])val);
break;
case GridBinaryMarshaller.DATE_ARR:
- writer.doWriteDateArray((Date[])val);
+ writer.writeDateArray((Date[])val);
break;
case GridBinaryMarshaller.TIMESTAMP_ARR:
- writer.doWriteTimestampArray((Timestamp[])val);
+ writer.writeTimestampArray((Timestamp[])val);
break;
case GridBinaryMarshaller.TIME_ARR:
- writer.doWriteTimeArray((Time[])val);
+ writer.writeTimeArray((Time[])val);
break;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
index 8fefadd3f62..6a176c39cff 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
@@ -412,7 +412,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val String value.
*/
- public void doWriteDecimal(@Nullable BigDecimal val) {
+ private void doWriteDecimal(@Nullable BigDecimal val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -442,7 +442,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val String value.
*/
- public void doWriteString(@Nullable String val) {
+ private void doWriteString(@Nullable String val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -464,7 +464,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param uuid UUID.
*/
- public void doWriteUuid(@Nullable UUID uuid) {
+ private void doWriteUuid(@Nullable UUID uuid) {
if (uuid == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -478,7 +478,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param date Date.
*/
- public void doWriteDate(@Nullable Date date) {
+ private void doWriteDate(@Nullable Date date) {
if (date == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -491,7 +491,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param ts Timestamp.
*/
- public void doWriteTimestamp(@Nullable Timestamp ts) {
+ private void doWriteTimestamp(@Nullable Timestamp ts) {
if (ts == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -505,7 +505,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param time Time.
*/
- public void doWriteTime(@Nullable Time time) {
+ private void doWriteTime(@Nullable Time time) {
if (time == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -521,7 +521,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
* @param obj Object.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
*/
- public void doWriteObject(@Nullable Object obj) throws
BinaryObjectException {
+ private void doWriteObject(@Nullable Object obj) throws
BinaryObjectException {
if (obj == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -536,7 +536,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Byte array.
*/
- void doWriteByteArray(@Nullable byte[] val) {
+ private void doWriteByteArray(@Nullable byte[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -551,7 +551,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Short array.
*/
- void doWriteShortArray(@Nullable short[] val) {
+ private void doWriteShortArray(@Nullable short[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -566,7 +566,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Integer array.
*/
- void doWriteIntArray(@Nullable int[] val) {
+ private void doWriteIntArray(@Nullable int[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -581,7 +581,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Long array.
*/
- void doWriteLongArray(@Nullable long[] val) {
+ private void doWriteLongArray(@Nullable long[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -596,7 +596,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Float array.
*/
- void doWriteFloatArray(@Nullable float[] val) {
+ private void doWriteFloatArray(@Nullable float[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -611,7 +611,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Double array.
*/
- void doWriteDoubleArray(@Nullable double[] val) {
+ private void doWriteDoubleArray(@Nullable double[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -626,7 +626,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Char array.
*/
- void doWriteCharArray(@Nullable char[] val) {
+ private void doWriteCharArray(@Nullable char[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -641,7 +641,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Boolean array.
*/
- void doWriteBooleanArray(@Nullable boolean[] val) {
+ private void doWriteBooleanArray(@Nullable boolean[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -656,7 +656,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Array of strings.
*/
- void doWriteDecimalArray(@Nullable BigDecimal[] val) {
+ private void doWriteDecimalArray(@Nullable BigDecimal[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -688,7 +688,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Array of UUIDs.
*/
- void doWriteUuidArray(@Nullable UUID[] val) {
+ private void doWriteUuidArray(@Nullable UUID[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -704,7 +704,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Array of dates.
*/
- void doWriteDateArray(@Nullable Date[] val) {
+ private void doWriteDateArray(@Nullable Date[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -720,7 +720,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Array of timestamps.
*/
- void doWriteTimestampArray(@Nullable Timestamp[] val) {
+ private void doWriteTimestampArray(@Nullable Timestamp[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -736,7 +736,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Array of time.
*/
- void doWriteTimeArray(@Nullable Time[] val) {
+ private void doWriteTimeArray(@Nullable Time[] val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -753,7 +753,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
* @param val Array of objects.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
*/
- void doWriteObjectArray(@Nullable Object[] val) throws
BinaryObjectException {
+ private void doWriteObjectArray(@Nullable Object[] val) throws
BinaryObjectException {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -815,7 +815,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
* @param col Collection.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
*/
- void doWriteCollection(@Nullable Collection<?> col) throws
BinaryObjectException {
+ private void doWriteCollection(@Nullable Collection<?> col) throws
BinaryObjectException {
if (col == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -836,7 +836,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
* @param map Map.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
*/
- void doWriteMap(@Nullable Map<?, ?> map) throws BinaryObjectException {
+ private void doWriteMap(@Nullable Map<?, ?> map) throws
BinaryObjectException {
if (map == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -858,7 +858,7 @@ public class BinaryWriterExImpl implements BinaryWriter,
BinaryRawWriterEx, Obje
/**
* @param val Value.
*/
- void doWriteEnum(@Nullable Enum<?> val) {
+ private void doWriteEnum(@Nullable Enum<?> val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
index 869b7c211cd..8ba880069df 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
@@ -118,7 +118,7 @@ class BinaryBuilderSerializer {
writer.writeInt(obj.typeId());
if (obj.typeId() == GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
- writer.doWriteString(obj.className());
+ writer.writeString(obj.className());
writer.writeInt(obj.enumOrdinal());
@@ -233,7 +233,7 @@ class BinaryBuilderSerializer {
return;
}
- writer.doWriteObject(val);
+ writer.writeObject(val);
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
index 1d74c1b90e5..609fec1d475 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
@@ -434,7 +434,7 @@ public class ClientListenerNioListener extends
GridNioServerListenerAdapter<Clie
writer.writeShort((short)0);
writer.writeShort((short)0);
- writer.doWriteString(authEx.getMessage());
+ writer.writeString(authEx.getMessage());
if (ver.compareTo(ClientConnectionContext.VER_1_1_0) >= 0)
writer.writeInt(ClientStatus.AUTH_FAILED);
@@ -458,7 +458,7 @@ public class ClientListenerNioListener extends
GridNioServerListenerAdapter<Clie
writer.writeShort(currVer.minor());
writer.writeShort(currVer.maintenance());
- writer.doWriteString(e.getMessage());
+ writer.writeString(e.getMessage());
if (ver.compareTo(ClientConnectionContext.VER_1_1_0) >= 0) {
writer.writeInt(e instanceof
ClientConnectionNodeRecoveryException
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtils.java
index be868c6ad20..ab528c83227 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtils.java
@@ -249,9 +249,9 @@ public abstract class SqlListenerUtils {
else if (cls == Double.class)
writer.writeDoubleFieldPrimitive((Double)obj);
else if (cls == String.class)
- writer.doWriteString((String)obj);
+ writer.writeString((String)obj);
else if (cls == BigDecimal.class)
- writer.doWriteDecimal((BigDecimal)obj);
+ writer.writeDecimal((BigDecimal)obj);
else if (cls == UUID.class)
writer.writeUuid((UUID)obj);
else if (cls == Time.class)
