diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestCopyFrom.java b/java/vector/src/test/java/org/apache/arrow/vector/TestCopyFrom.java index ce484d432224f..97420c415f0db 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestCopyFrom.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestCopyFrom.java @@ -100,8 +100,7 @@ public void testCopyFromWithNulls() { if (i % 3 == 0) { assertNull(vector.getObject(i)); } else { - assertEquals(Integer.toString(i), vector.getObject(i).toString(), - "unexpected value at index: " + i); + assertEquals(Integer.toString(i), vector.getObject(i).toString(), "unexpected value at index: " + i); } } @@ -115,8 +114,7 @@ public void testCopyFromWithNulls() { if (i % 3 == 0) { assertNull(vector2.getObject(i)); } else { - assertEquals(Integer.toString(i), vector2.getObject(i).toString(), - "unexpected value at index: " + i); + assertEquals(Integer.toString(i), vector2.getObject(i).toString(), "unexpected value at index: " + i); } } @@ -130,8 +128,7 @@ public void testCopyFromWithNulls() { if (i % 3 == 0) { assertNull(vector2.getObject(i)); } else { - assertEquals(Integer.toString(i), vector2.getObject(i).toString(), - "unexpected value at index: " + i); + assertEquals(Integer.toString(i), vector2.getObject(i).toString(), "unexpected value at index: " + i); } } } @@ -501,8 +498,7 @@ public void testCopyFromWithNulls6() { if ((i & 1) == 0) { assertNull(vector1.getObject(i)); } else { - assertEquals(123456.7865 + (double) i, vector1.get(i), 0, - "unexpected value at index: " + i); + assertEquals(123456.7865 + (double) i, vector1.get(i), 0, "unexpected value at index: " + i); } } @@ -529,10 +525,7 @@ public void testCopyFromWithNulls6() { if (((i & 1) == 0) || (i >= initialCapacity)) { assertNull(vector2.getObject(i)); } else { - assertEquals( - 123456.7865 + (double) i, - vector2.get(i), 0, - "unexpected value at index: " + i); + assertEquals(123456.7865 + (double) i, vector2.get(i), 0, "unexpected value at index: " + i); } } } diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestDecimal256Vector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestDecimal256Vector.java index 3e412a14e74da..6886abcc63cdf 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestDecimal256Vector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestDecimal256Vector.java @@ -104,8 +104,7 @@ public void testDecimal256DifferentScaleAndPrecision() { BigDecimal decimal = new BigDecimal(BigInteger.valueOf(12345), 2); UnsupportedOperationException ue = assertThrows(UnsupportedOperationException.class, () -> decimalVector.setSafe(0, decimal)); - assertEquals("BigDecimal precision cannot be greater than that in the Arrow vector: 5 > 4", ue - .getMessage()); + assertEquals("BigDecimal precision cannot be greater than that in the Arrow vector: 5 > 4", ue.getMessage()); } } } diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java index eb1a05a591a65..19dd8c23abfa9 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java @@ -130,10 +130,10 @@ public void testSetOffset() { duv.setValueCount(4); - assertEquals(duv.getObject(0), 42); - assertEquals(duv.getObject(1), 43); - assertEquals(duv.getObject(2), 3.14); - assertEquals(duv.getObject(3), 44); + assertEquals(42, duv.getObject(0)); + assertEquals(43, duv.getObject(1)); + assertEquals(3.14, duv.getObject(2)); + assertEquals(44, duv.getObject(3)); } } diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java index 7d3c66ddea934..79e894ab3d457 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java @@ -944,8 +944,7 @@ public void testWriterUsingHolderGetTimestampMilliTZField() { holder.value = 77777; IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> writer.timeStampMilliTZ().write(holder)); - assertEquals("holder.timezone: AsdfTimeZone not equal to vector timezone: SomeFakeTimeZone", - ex.getMessage()); + assertEquals("holder.timezone: AsdfTimeZone not equal to vector timezone: SomeFakeTimeZone", ex.getMessage()); writer.endList(); vector.setValueCount(1); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java index 15730deda10f2..038e7a4e47c3c 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java @@ -284,7 +284,7 @@ public void testSplitAndTransfer() throws Exception { /* check the toVector output after doing the splitAndTransfer */ for (int i = 0; i < length; i++) { assertEquals(sourceVector.getObject(start + i), toVector.getObject(i), - "Different data at indexes: " + (start + i) + "and " + i); + "Different data at indexes: " + (start + i) + "and " + i); } } } @@ -505,23 +505,19 @@ public void testCreateNewVectorWithoutTypeExceptionThrown() { new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) { IllegalArgumentException e1 = assertThrows(IllegalArgumentException.class, () -> vector.getTimeStampMilliTZVector()); - assertEquals("No TimeStampMilliTZ present. Provide ArrowType argument to create a new vector", - e1.getMessage()); + assertEquals("No TimeStampMilliTZ present. Provide ArrowType argument to create a new vector", e1.getMessage()); IllegalArgumentException e2 = assertThrows(IllegalArgumentException.class, () -> vector.getDurationVector()); - assertEquals("No Duration present. Provide ArrowType argument to create a new vector", - e2.getMessage()); + assertEquals("No Duration present. Provide ArrowType argument to create a new vector", e2.getMessage()); IllegalArgumentException e3 = assertThrows(IllegalArgumentException.class, () -> vector.getFixedSizeBinaryVector()); - assertEquals("No FixedSizeBinary present. Provide ArrowType argument to create a new vector", - e3.getMessage()); + assertEquals("No FixedSizeBinary present. Provide ArrowType argument to create a new vector", e3.getMessage()); IllegalArgumentException e4 = assertThrows(IllegalArgumentException.class, () -> vector.getDecimalVector()); - assertEquals("No Decimal present. Provide ArrowType argument to create a new vector", - e4.getMessage()); + assertEquals("No Decimal present. Provide ArrowType argument to create a new vector", e4.getMessage()); } } diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java index a0d7a6bb26448..b0d316070a335 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java @@ -2142,8 +2142,7 @@ public void testVectorLoadUnload() { try ( ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch(); - BufferAllocator finalVectorsAllocator = allocator.newChildAllocator("new vector", 0, - Long.MAX_VALUE); + BufferAllocator finalVectorsAllocator = allocator.newChildAllocator("new vector", 0, Long.MAX_VALUE); VectorSchemaRoot schemaRoot2 = VectorSchemaRoot.create(schema, finalVectorsAllocator); ) { @@ -2382,14 +2381,12 @@ public void testSetInitialCapacity() { vector.setInitialCapacity(defaultCapacity, 0.1); vector.allocateNew(); assertEquals(defaultCapacity, vector.getValueCapacity()); - assertEquals(CommonUtil.nextPowerOfTwo((int) (defaultCapacity * 0.1)), vector.getDataBuffer() - .capacity()); + assertEquals(CommonUtil.nextPowerOfTwo((int) (defaultCapacity * 0.1)), vector.getDataBuffer().capacity()); vector.setInitialCapacity(defaultCapacity, 0.01); vector.allocateNew(); assertEquals(defaultCapacity, vector.getValueCapacity()); - assertEquals(CommonUtil.nextPowerOfTwo((int) (defaultCapacity * 0.01)), vector.getDataBuffer() - .capacity()); + assertEquals(CommonUtil.nextPowerOfTwo((int) (defaultCapacity * 0.01)), vector.getDataBuffer().capacity()); vector.setInitialCapacity(5, 0.01); vector.allocateNew(); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java index bc2f6e6ff9ed9..21cbefae45161 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java @@ -259,8 +259,7 @@ public void testVarCharAllocateNew() throws Exception { // verify that the validity buffer and value buffer have capacity for at least 'count' elements. assertTrue(vector.getValidityBuffer().capacity() >= DataSizeRoundingUtil.divideBy8Ceil(count)); - assertTrue(vector.getOffsetBuffer().capacity() >= (count + 1) * BaseVariableWidthVector - .OFFSET_WIDTH); + assertTrue(vector.getOffsetBuffer().capacity() >= (count + 1) * BaseVariableWidthVector.OFFSET_WIDTH); } } @@ -273,8 +272,7 @@ public void testLargeVarCharAllocateNew() throws Exception { // verify that the validity buffer and value buffer have capacity for at least 'count' elements. assertTrue(vector.getValidityBuffer().capacity() >= DataSizeRoundingUtil.divideBy8Ceil(count)); - assertTrue(vector.getOffsetBuffer().capacity() >= (count + 1) * BaseLargeVariableWidthVector - .OFFSET_WIDTH); + assertTrue(vector.getOffsetBuffer().capacity() >= (count + 1) * BaseLargeVariableWidthVector.OFFSET_WIDTH); } } @@ -287,8 +285,7 @@ public void testVarCharAllocateNewUsingHelper() throws Exception { // verify that the validity buffer and value buffer have capacity for at least 'count' elements. assertTrue(vector.getValidityBuffer().capacity() >= DataSizeRoundingUtil.divideBy8Ceil(count)); - assertTrue(vector.getOffsetBuffer().capacity() >= (count + 1) * BaseVariableWidthVector - .OFFSET_WIDTH); + assertTrue(vector.getOffsetBuffer().capacity() >= (count + 1) * BaseVariableWidthVector.OFFSET_WIDTH); } } @@ -301,8 +298,7 @@ public void testLargeVarCharAllocateNewUsingHelper() throws Exception { // verify that the validity buffer and value buffer have capacity for at least 'count' elements. assertTrue(vector.getValidityBuffer().capacity() >= DataSizeRoundingUtil.divideBy8Ceil(count)); - assertTrue(vector.getOffsetBuffer().capacity() >= (count + 1) * BaseLargeVariableWidthVector - .OFFSET_WIDTH); + assertTrue(vector.getOffsetBuffer().capacity() >= (count + 1) * BaseLargeVariableWidthVector.OFFSET_WIDTH); } } @@ -345,8 +341,7 @@ public void testVariableRepeatedClearAndSet() throws Exception { @Test public void testRepeatedValueVectorClearAndSet() throws Exception { - try (final ListVector vector = new ListVector("", allocator, FieldType.nullable(MinorType.INT.getType()), - null)) { + try (final ListVector vector = new ListVector("", allocator, FieldType.nullable(MinorType.INT.getType()), null)) { vector.allocateNewSafe(); // Initial allocation UnionListWriter writer = vector.getWriter(); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/complex/TestDenseUnionBufferSize.java b/java/vector/src/test/java/org/apache/arrow/vector/complex/TestDenseUnionBufferSize.java index 4d4fe4b02b977..0e24fd0af6806 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/complex/TestDenseUnionBufferSize.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/complex/TestDenseUnionBufferSize.java @@ -74,8 +74,7 @@ public void testBufferSize() { assertEquals(overhead * count + intVector.getBufferSize() + varBinaryVector.getBufferSize(), duv.getBufferSize()); - assertEquals(overhead * (aCount + 1) + intVector.getBufferSizeFor(aCount) + varBinaryVector - .getBufferSizeFor(1), + assertEquals(overhead * (aCount + 1) + intVector.getBufferSizeFor(aCount) + varBinaryVector.getBufferSizeFor(1), duv.getBufferSizeFor(aCount + 1)); } diff --git a/java/vector/src/test/java/org/apache/arrow/vector/complex/impl/TestPromotableWriter.java b/java/vector/src/test/java/org/apache/arrow/vector/complex/impl/TestPromotableWriter.java index 89d08399e30c9..e19b227f65e97 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/complex/impl/TestPromotableWriter.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/complex/impl/TestPromotableWriter.java @@ -129,34 +129,34 @@ public void testPromoteToUnion() throws Exception { final UnionVector uv = v.getChild("A", UnionVector.class); assertFalse(uv.isNull(0), "0 shouldn't be null"); - assertEquals(uv.getObject(0), false); + assertEquals(false, uv.getObject(0)); assertFalse(uv.isNull(1), "1 shouldn't be null"); - assertEquals(uv.getObject(1), true); + assertEquals(true, uv.getObject(1)); assertFalse(uv.isNull(2), "2 shouldn't be null"); - assertEquals(uv.getObject(2), 10); + assertEquals(10, uv.getObject(2)); assertNull(uv.getObject(3), "3 should be null"); assertFalse(uv.isNull(4), "4 shouldn't be null"); - assertEquals(uv.getObject(4), 100); + assertEquals(100, uv.getObject(4)); assertFalse(uv.isNull(5), "5 shouldn't be null"); - assertEquals(uv.getObject(5), 123123L); + assertEquals(123123L, uv.getObject(5)); assertFalse(uv.isNull(6), "6 shouldn't be null"); NullableTimeStampMilliTZHolder readBackHolder = new NullableTimeStampMilliTZHolder(); uv.getTimeStampMilliTZVector().get(6, readBackHolder); - assertEquals(readBackHolder.value, 12345L); - assertEquals(readBackHolder.timezone, "UTC"); + assertEquals(12345L, readBackHolder.value); + assertEquals("UTC", readBackHolder.timezone); assertFalse(uv.isNull(7), "7 shouldn't be null"); - assertEquals(((java.time.Duration) uv.getObject(7)).getSeconds(), 444413L); + assertEquals(444413L, ((java.time.Duration) uv.getObject(7)).getSeconds()); assertFalse(uv.isNull(8), "8 shouldn't be null"); - assertEquals(ByteBuffer.wrap(uv.getFixedSizeBinaryVector().get(8)).order(ByteOrder.nativeOrder()) - .getInt(), 18978); + assertEquals(18978, + ByteBuffer.wrap(uv.getFixedSizeBinaryVector().get(8)).order(ByteOrder.nativeOrder()).getInt()); container.clear(); container.allocateNew(); @@ -203,8 +203,7 @@ public void testNoPromoteFloat4ToUnionWithNull() throws Exception { ListVector lv = ListVector.empty("name", allocator); lv.addOrGetVector(childTypeOfListInContainer); assertEquals(childTypeOfListInContainer.getType(), Types.MinorType.NULL.getType()); - assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.NULL - .getType()); + assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.NULL.getType()); writer.start(); writer.list("list").startList(); @@ -221,8 +220,7 @@ public void testNoPromoteFloat4ToUnionWithNull() throws Exception { // we expect same behaviour from listvector lv.addOrGetVector(childTypeOfListInContainer); assertEquals(childTypeOfListInContainer.getType(), Types.MinorType.FLOAT4.getType()); - assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.FLOAT4 - .getType()); + assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.FLOAT4.getType()); lv.close(); } @@ -250,8 +248,7 @@ public void testNoPromoteTimeStampMilliTZToUnionWithNull() throws Exception { ListVector lv = ListVector.empty("name", allocator); lv.addOrGetVector(childTypeOfListInContainer); assertEquals(childTypeOfListInContainer.getType(), Types.MinorType.NULL.getType()); - assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.NULL - .getType()); + assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.NULL.getType()); writer.start(); writer.list("list").startList(); @@ -264,8 +261,7 @@ public void testNoPromoteTimeStampMilliTZToUnionWithNull() throws Exception { holder.timezone = "SomeTimeZone"; IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> writer.list("list").timeStampMilliTZ().write(holder)); - assertEquals("holder.timezone: SomeTimeZone not equal to vector timezone: FakeTimeZone", - ex.getMessage()); + assertEquals("holder.timezone: SomeTimeZone not equal to vector timezone: FakeTimeZone", ex.getMessage()); writer.list("list").endList(); writer.end(); @@ -309,8 +305,7 @@ public void testNoPromoteDurationToUnionWithNull() throws Exception { ListVector lv = ListVector.empty("name", allocator); lv.addOrGetVector(childTypeOfListInContainer); assertEquals(childTypeOfListInContainer.getType(), Types.MinorType.NULL.getType()); - assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.NULL - .getType()); + assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.NULL.getType()); writer.start(); writer.list("list").startList(); @@ -367,8 +362,7 @@ public void testNoPromoteFixedSizeBinaryToUnionWithNull() throws Exception { ListVector lv = ListVector.empty("name", allocator); lv.addOrGetVector(childTypeOfListInContainer); assertEquals(childTypeOfListInContainer.getType(), Types.MinorType.NULL.getType()); - assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.NULL - .getType()); + assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.NULL.getType()); writer.start(); writer.list("list").startList(); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java b/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java index 2791925fb8cbd..c7ed893d4c340 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java @@ -219,7 +219,7 @@ private void checkNullableStruct(NonNullableStructVector structVector) { if (i % 2 == 0) { assertTrue(struct.isSet(), "index is set: " + i); assertNotNull(struct.readObject(), "index is set: " + i); - assertEquals(struct.reader("nested").readLong().longValue(), i); + assertEquals(i, struct.reader("nested").readLong().longValue()); } else { assertFalse(struct.isSet(), "index is not set: " + i); assertNull(struct.readObject(), "index is not set: " + i); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/BaseFileTest.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/BaseFileTest.java index 40c0ab3dd27e5..d6ba4b797e481 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/BaseFileTest.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/BaseFileTest.java @@ -286,8 +286,7 @@ protected void validateDateTimeContent(int count, VectorSchemaRoot root) { Object timestampMilliVal = root.getVector("timestamp-milli").getObject(i); assertEquals(dtMilli, timestampMilliVal); Object timestampMilliTZVal = root.getVector("timestamp-milliTZ").getObject(i); - assertEquals(dt.atZone(ZoneId.of("Europe/Paris")).toInstant().toEpochMilli(), - timestampMilliTZVal); + assertEquals(dt.atZone(ZoneId.of("Europe/Paris")).toInstant().toEpochMilli(), timestampMilliTZVal); Object timestampNanoVal = root.getVector("timestamp-nano").getObject(i); assertEquals(dt, timestampNanoVal); } diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowReaderWriter.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowReaderWriter.java index 5b16a22e66f3b..8c4d842a99b93 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowReaderWriter.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowReaderWriter.java @@ -386,18 +386,19 @@ public void testWriteReadWithStructDictionaries() throws IOException { assertEquals(dictionaryVector4.getValueCount(), readDictionaryVector.getValueCount()); final BiFunction typeComparatorIgnoreName = (v1, v2) -> new TypeEqualsVisitor(v1, false, true).equals(v2); - assertTrue(new RangeEqualsVisitor(dictionaryVector4, readDictionaryVector, - typeComparatorIgnoreName).rangeEquals(new Range(0, 0, - dictionaryVector4.getValueCount())), - "Dictionary vectors are not equal"); + assertTrue( + new RangeEqualsVisitor(dictionaryVector4, readDictionaryVector, typeComparatorIgnoreName) + .rangeEquals(new Range(0, 0, dictionaryVector4.getValueCount())), + "Dictionary vectors are not equal"); // Assert the decoded vector is correct try (final ValueVector readVector = DictionaryEncoder.decode(readEncoded, readDictionary)) { assertEquals(vector.getValueCount(), readVector.getValueCount()); - assertTrue(new RangeEqualsVisitor(vector, readVector, typeComparatorIgnoreName) + assertTrue( + new RangeEqualsVisitor(vector, readVector, typeComparatorIgnoreName) .rangeEquals(new Range(0, 0, vector.getValueCount())), - "Decoded vectors are not equal"); + "Decoded vectors are not equal"); } } } diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestUIntDictionaryRoundTrip.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestUIntDictionaryRoundTrip.java index b81fbe35f2ef6..302c404527f6d 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestUIntDictionaryRoundTrip.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestUIntDictionaryRoundTrip.java @@ -168,8 +168,7 @@ public void testUInt1RoundTrip(boolean streamMode) throws IOException { byte[] data = writeData(streamMode, encodedVector1); readData( streamMode, data, encodedVector1.getField(), - (vector, index) -> (int) ((UInt1Vector) vector).getValueAsLong(index), - 8L, indices, dictionaryItems); + (vector, index) -> (int) ((UInt1Vector) vector).getValueAsLong(index), 8L, indices, dictionaryItems); } } @@ -189,8 +188,7 @@ public void testUInt2RoundTrip(boolean streamMode) throws IOException { byte[] data = writeData(streamMode, encodedVector2); readData(streamMode, data, encodedVector2.getField(), - (vector, index) -> (int) ((UInt2Vector) vector).getValueAsLong(index), - 16L, indices, dictItems); + (vector, index) -> (int) ((UInt2Vector) vector).getValueAsLong(index), 16L, indices, dictItems); } } @@ -212,8 +210,7 @@ public void testUInt4RoundTrip(boolean streamMode) throws IOException { setVector(encodedVector4, 1, 3, 5, 7, 9); byte[] data = writeData(streamMode, encodedVector4); readData(streamMode, data, encodedVector4.getField(), - (vector, index) -> (int) ((UInt4Vector) vector).getValueAsLong(index), - 32L, indices, dictItems); + (vector, index) -> (int) ((UInt4Vector) vector).getValueAsLong(index), 32L, indices, dictItems); } } @@ -234,8 +231,7 @@ public void testUInt8RoundTrip(boolean streamMode) throws IOException { byte[] data = writeData(streamMode, encodedVector8); readData(streamMode, data, encodedVector8.getField(), - (vector, index) -> (int) ((UInt8Vector) vector).getValueAsLong(index), - 64L, indices, dictItems); + (vector, index) -> (int) ((UInt8Vector) vector).getValueAsLong(index), 64L, indices, dictItems); } } diff --git a/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestExtensionType.java b/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestExtensionType.java index 7c01a92895d2e..bd832be88b044 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestExtensionType.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestExtensionType.java @@ -141,8 +141,7 @@ public void readUnderlyingType() throws IOException { final VectorSchemaRoot readerRoot = reader.getVectorSchemaRoot(); assertEquals(1, readerRoot.getSchema().getFields().size()); assertEquals("a", readerRoot.getSchema().getFields().get(0).getName()); - assertTrue(readerRoot.getSchema().getFields().get(0).getType() instanceof ArrowType - .FixedSizeBinary); + assertTrue(readerRoot.getSchema().getFields().get(0).getType() instanceof ArrowType.FixedSizeBinary); assertEquals(16, ((ArrowType.FixedSizeBinary) readerRoot.getSchema().getFields().get(0).getType()).getByteWidth()); @@ -216,10 +215,8 @@ public void roundtripLocation() throws IOException { final Field field = readerRoot.getSchema().getFields().get(0); final LocationType expectedType = new LocationType(); - assertEquals(field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_NAME), - expectedType.extensionName()); - assertEquals(field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_METADATA), - expectedType.serialize()); + assertEquals(field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_NAME), expectedType.extensionName()); + assertEquals(field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_METADATA), expectedType.serialize()); final ExtensionTypeVector deserialized = (ExtensionTypeVector) readerRoot.getFieldVectors().get(0); assertTrue(deserialized instanceof LocationVector); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/TestReusableByteArray.java b/java/vector/src/test/java/org/apache/arrow/vector/util/TestReusableByteArray.java index 148cbbedcead9..80420608c3912 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/util/TestReusableByteArray.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/util/TestReusableByteArray.java @@ -60,11 +60,9 @@ public void testSetByteArrayRepeatedly() { assertEquals(str.getBytes(StandardCharsets.UTF_8).length, byteArray.getLength()); assertArrayEquals(str.getBytes(StandardCharsets.UTF_8), Arrays.copyOfRange(byteArray.getBuffer(), 0, (int) byteArray.getLength())); - assertEquals(Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8)), - byteArray.toString()); + assertEquals(Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8)), byteArray.toString()); assertEquals(new ReusableByteArray(str.getBytes(StandardCharsets.UTF_8)), byteArray); - assertEquals(new ReusableByteArray(str.getBytes(StandardCharsets.UTF_8)).hashCode(), - byteArray.hashCode()); + assertEquals(new ReusableByteArray(str.getBytes(StandardCharsets.UTF_8)).hashCode(), byteArray.hashCode()); // Test a longer string. Should require reallocation. final String str2 = "test_longer"; @@ -75,11 +73,9 @@ public void testSetByteArrayRepeatedly() { assertEquals(str2.getBytes(StandardCharsets.UTF_8).length, byteArray.getLength()); assertArrayEquals(str2.getBytes(StandardCharsets.UTF_8), Arrays.copyOfRange(byteArray.getBuffer(), 0, (int) byteArray.getLength())); - assertEquals(Base64.getEncoder().encodeToString(str2.getBytes(StandardCharsets.UTF_8)), - byteArray.toString()); + assertEquals(Base64.getEncoder().encodeToString(str2.getBytes(StandardCharsets.UTF_8)), byteArray.toString()); assertEquals(new ReusableByteArray(str2.getBytes(StandardCharsets.UTF_8)), byteArray); - assertEquals(new ReusableByteArray(str2.getBytes(StandardCharsets.UTF_8)).hashCode(), - byteArray.hashCode()); + assertEquals(new ReusableByteArray(str2.getBytes(StandardCharsets.UTF_8)).hashCode(), byteArray.hashCode()); // Verify reallocation needed. assertNotSame(oldBuffer, byteArray.getBuffer()); @@ -94,11 +90,9 @@ public void testSetByteArrayRepeatedly() { assertEquals(str3.getBytes(StandardCharsets.UTF_8).length, byteArray.getLength()); assertArrayEquals(str3.getBytes(StandardCharsets.UTF_8), Arrays.copyOfRange(byteArray.getBuffer(), 0, (int) byteArray.getLength())); - assertEquals(Base64.getEncoder().encodeToString(str3.getBytes(StandardCharsets.UTF_8)), - byteArray.toString()); + assertEquals(Base64.getEncoder().encodeToString(str3.getBytes(StandardCharsets.UTF_8)), byteArray.toString()); assertEquals(new ReusableByteArray(str3.getBytes(StandardCharsets.UTF_8)), byteArray); - assertEquals(new ReusableByteArray(str3.getBytes(StandardCharsets.UTF_8)).hashCode(), - byteArray.hashCode()); + assertEquals(new ReusableByteArray(str3.getBytes(StandardCharsets.UTF_8)).hashCode(), byteArray.hashCode()); // Verify reallocation was not needed. assertSame(oldBuffer, byteArray.getBuffer()); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorFull.java b/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorFull.java index da7e72b024216..76c8956e555f2 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorFull.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorFull.java @@ -79,8 +79,7 @@ public void testBaseVariableWidthVector() { ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(vector)); - assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are " + - "decreasing")); + assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are decreasing")); } } @@ -97,8 +96,7 @@ public void testBaseLargeVariableWidthVector() { ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(vector)); - assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the large offset buffer are " + - "decreasing")); + assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the large offset buffer are decreasing")); } } @@ -115,8 +113,7 @@ public void testListVector() { ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(vector)); - assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are " + - "decreasing")); + assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are decreasing")); } } @@ -133,8 +130,7 @@ public void testLargeListVector() { ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(vector)); - assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the large offset buffer are " + - "decreasing")); + assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the large offset buffer are decreasing")); } } @@ -164,13 +160,11 @@ public void testStructVectorRangeEquals() { ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(strVector)); - assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are " + - "decreasing")); + assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are decreasing")); e = assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(vector)); - assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are " + - "")); + assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are decreasing")); } } diff --git a/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorSchemaRoot.java b/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorSchemaRoot.java index 0573f02552315..bdb9ad3e8e530 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorSchemaRoot.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorSchemaRoot.java @@ -95,8 +95,7 @@ public void testValidateNegative() { validate(root); e = assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(root)); - assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are " + - "decreasing")); + assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are decreasing")); } } }