Skip to content

Commit 900ebcd

Browse files
danepitkinkou
authored andcommittedNov 25, 2024
MINOR: [Java] Bump com.puppycrawl.tools:checkstyle from 8.29 to 10.17.0 in /java (#43311)
### Rationale for this change Now that Java 8 is deprecated, we can bump checkstyle to latest version. ### What changes are included in this PR? * Bump checkstyle to 10.17.0 * Update checkstyle.xml to fix backwards-breaking changes * Fix new check errors ### Are these changes tested? CI ### Are there any user-facing changes? No Authored-by: Dane Pitkin <dpitkin@apache.org> Signed-off-by: Dane Pitkin <dpitkin@apache.org>
1 parent 3aa1c1a commit 900ebcd

16 files changed

+28
-15
lines changed
 

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.gitattributes export-ignore
22
.gitignore export-ignore
3+
* text=auto eol=lf

‎dev/checkstyle/checkstyle.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
181181
</module>
182182
<module name="JavadocMethod">
183-
<property name="scope" value="public"/>
183+
<property name="accessModifiers" value="public"/>
184184
<property name="allowMissingParamTags" value="true"/>
185185
<property name="allowMissingReturnTag" value="true"/>
186186
<property name="allowedAnnotations" value="Override, Test"/>

‎flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java

+11
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ class Builder {
4444
private final List<Field> newFields = new ArrayList<>();
4545
private final Collection<Task> tasks = new ArrayList<>();
4646

47+
/**
48+
* Constructor for the VectorSchemaRootTransformer's Builder.
49+
*
50+
* @param schema The Arrow schema.
51+
* @param bufferAllocator The BufferAllocator to use for allocating memory.
52+
*/
4753
public Builder(final Schema schema, final BufferAllocator bufferAllocator) {
4854
this.schema = schema;
4955
this.bufferAllocator =
@@ -127,6 +133,11 @@ public Builder addEmptyField(final String fieldName, final ArrowType fieldType)
127133
return this;
128134
}
129135

136+
/**
137+
* Build the {@link VectorSchemaRoot} with applied transformation tasks.
138+
*
139+
* @return The built {@link VectorSchemaRoot}.
140+
*/
130141
public VectorSchemaRootTransformer build() {
131142
return (originalRoot, transformedRoot) -> {
132143
if (transformedRoot == null) {

‎pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ under the License.
105105
<dep.avro.version>1.11.3</dep.avro.version>
106106
<arrow.vector.classifier></arrow.vector.classifier>
107107
<forkCount>2</forkCount>
108+
<checkstyle.version>10.17.0</checkstyle.version>
108109
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
109110
<error_prone_core.version>2.29.2</error_prone_core.version>
110111
<mockito.core.version>5.11.0</mockito.core.version>
@@ -719,7 +720,7 @@ under the License.
719720
<dependency>
720721
<groupId>com.puppycrawl.tools</groupId>
721722
<artifactId>checkstyle</artifactId>
722-
<version>8.29</version>
723+
<version>${checkstyle.version}</version>
723724
</dependency>
724725
<dependency>
725726
<groupId>org.slf4j</groupId>

‎vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -453,9 +453,9 @@ public void reAlloc() {
453453
/**
454454
* Get the inner vectors.
455455
*
456+
* @return the inner vectors for this field as defined by the TypeLayout
456457
* @deprecated This API will be removed as the current implementations no longer support inner
457458
* vectors.
458-
* @return the inner vectors for this field as defined by the TypeLayout
459459
*/
460460
@Deprecated
461461
@Override

‎vector/src/main/java/org/apache/arrow/vector/BaseLargeVariableWidthVector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,9 @@ public void clear() {
259259
/**
260260
* Get the inner vectors.
261261
*
262+
* @return the inner vectors for this field as defined by the TypeLayout
262263
* @deprecated This API will be removed as the current implementations no longer support inner
263264
* vectors.
264-
* @return the inner vectors for this field as defined by the TypeLayout
265265
*/
266266
@Override
267267
@Deprecated

‎vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,9 @@ public void clear() {
275275
/**
276276
* Get the inner vectors.
277277
*
278+
* @return the inner vectors for this field as defined by the TypeLayout
278279
* @deprecated This API will be removed as the current implementations no longer support inner
279280
* vectors.
280-
* @return the inner vectors for this field as defined by the TypeLayout
281281
*/
282282
@Deprecated
283283
@Override

‎vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthViewVector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -315,9 +315,9 @@ public void clearDataBuffers() {
315315
/**
316316
* Get the inner vectors.
317317
*
318+
* @return the inner vectors for this field as defined by the TypeLayout
318319
* @deprecated This API will be removed as the current implementations no longer support inner
319320
* vectors.
320-
* @return the inner vectors for this field as defined by the TypeLayout
321321
*/
322322
@Deprecated
323323
@Override

‎vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,9 @@ public List<ArrowBuf> getFieldBuffers() {
233233
/**
234234
* Get the inner vectors.
235235
*
236+
* @return the inner vectors for this field as defined by the TypeLayout
236237
* @deprecated This API will be removed as the current implementations no longer support inner
237238
* vectors.
238-
* @return the inner vectors for this field as defined by the TypeLayout
239239
*/
240240
@Deprecated
241241
@Override

‎vector/src/main/java/org/apache/arrow/vector/FieldVector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ default void exportCDataBuffers(List<ArrowBuf> buffers, ArrowBuf buffersPtr, lon
111111
/**
112112
* Get the inner vectors.
113113
*
114+
* @return the inner vectors for this field as defined by the TypeLayout
114115
* @deprecated This API will be removed as the current implementations no longer support inner
115116
* vectors.
116-
* @return the inner vectors for this field as defined by the TypeLayout
117117
*/
118118
@Deprecated
119119
List<BufferBacked> getFieldInnerVectors();

‎vector/src/main/java/org/apache/arrow/vector/NullVector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ public List<ArrowBuf> getFieldBuffers() {
224224
/**
225225
* Get the inner vectors.
226226
*
227+
* @return the inner vectors for this field as defined by the TypeLayout
227228
* @deprecated This API will be removed as the current implementations no longer support inner
228229
* vectors.
229-
* @return the inner vectors for this field as defined by the TypeLayout
230230
*/
231231
@Deprecated
232232
@Override

‎vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ protected void reallocOffsetBuffer() {
142142
/**
143143
* Get the offset vector.
144144
*
145+
* @return the underlying offset vector or null if none exists.
145146
* @deprecated This API will be removed, as the current implementations no longer hold inner
146147
* offset vectors.
147-
* @return the underlying offset vector or null if none exists.
148148
*/
149149
@Override
150150
@Deprecated

‎vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,9 @@ private void setReaderAndWriterIndex() {
319319
/**
320320
* Get the inner vectors.
321321
*
322+
* @return the inner vectors for this field as defined by the TypeLayout
322323
* @deprecated This API will be removed as the current implementations no longer support inner
323324
* vectors.
324-
* @return the inner vectors for this field as defined by the TypeLayout
325325
*/
326326
@Deprecated
327327
@Override
@@ -494,9 +494,9 @@ public void copyFrom(int inIndex, int outIndex, ValueVector from) {
494494
/**
495495
* Get the offset vector.
496496
*
497+
* @return the underlying offset vector or null if none exists.
497498
* @deprecated This API will be removed, as the current implementations no longer hold inner
498499
* offset vectors.
499-
* @return the underlying offset vector or null if none exists.
500500
*/
501501
@Override
502502
@Deprecated

‎vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,9 @@ private void setReaderAndWriterIndex() {
277277
/**
278278
* Get the inner vectors.
279279
*
280+
* @return the inner vectors for this field as defined by the TypeLayout
280281
* @deprecated This API will be removed as the current implementations no longer support inner
281282
* vectors.
282-
* @return the inner vectors for this field as defined by the TypeLayout
283283
*/
284284
@Deprecated
285285
@Override

‎vector/src/main/java/org/apache/arrow/vector/complex/RepeatedValueVector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public interface RepeatedValueVector extends ValueVector, DensityAwareVector {
3535
/**
3636
* Get the offset vector.
3737
*
38+
* @return the underlying offset vector or null if none exists.
3839
* @deprecated This API will be removed, as the current implementations no longer hold inner
3940
* offset vectors.
40-
* @return the underlying offset vector or null if none exists.
4141
*/
4242
@Deprecated
4343
UInt4Vector getOffsetVector();

‎vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ private void setReaderAndWriterIndex() {
188188
/**
189189
* Get the inner vectors.
190190
*
191+
* @return the inner vectors for this field as defined by the TypeLayout
191192
* @deprecated This API will be removed as the current implementations no longer support inner
192193
* vectors.
193-
* @return the inner vectors for this field as defined by the TypeLayout
194194
*/
195195
@Deprecated
196196
@Override

0 commit comments

Comments
 (0)