Fix checkstyle errors

spotify · Dec 5, 2024 · 01d9cc5 · 01d9cc5
1 parent 439fe89
commit 01d9cc5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/dbeam-core/src/main/java/com/spotify/dbeam/avro/JdbcAvroRecord.java b/dbeam-core/src/main/java/com/spotify/dbeam/avro/JdbcAvroRecord.java
@@ -113,10 +113,7 @@ static SqlFunction<ResultSet, Object> computeMapping(
           return resultSet -> nullableBytes(resultSet.getBytes(column));
         }
       case ARRAY:
-        return resultSet -> {
-//          java.sql.Array arr = resultSet.getArray(column);
-          return resultSet.getArray(column);
-        };
+        return resultSet -> resultSet.getArray(column);
       case BINARY:
       case VARBINARY:
       case LONGVARBINARY:

diff --git a/dbeam-core/src/main/java/com/spotify/dbeam/avro/JdbcAvroRecordConverter.java b/dbeam-core/src/main/java/com/spotify/dbeam/avro/JdbcAvroRecordConverter.java
@@ -104,7 +104,8 @@ public ByteBuffer convertResultSetIntoAvroBytes() throws SQLException, IOExcepti
     return ByteBuffer.wrap(out.getBufffer(), 0, out.size());
   }
 
-  private void writeValue(Object value, BinaryEncoder binaryEncoder) throws SQLException, IOException {
+  private void writeValue(Object value, BinaryEncoder binaryEncoder)
+      throws SQLException, IOException {
     if (value instanceof String) {
       binaryEncoder.writeString((String) value);
     } else if (value instanceof Long) {
@@ -121,7 +122,7 @@ private void writeValue(Object value, BinaryEncoder binaryEncoder) throws SQLExc
       binaryEncoder.writeFloat((Float) value);
     } else if (value instanceof java.sql.Array) {
       binaryEncoder.writeArrayStart();
-      Object[] array = (Object[])((java.sql.Array)value).getArray();
+      Object[] array = (Object[]) ((java.sql.Array) value).getArray();
       binaryEncoder.setItemCount(array.length);
       for (Object arrayItem : array) {
         binaryEncoder.startItem();

diff --git a/dbeam-core/src/main/java/com/spotify/dbeam/avro/JdbcAvroSchema.java b/dbeam-core/src/main/java/com/spotify/dbeam/avro/JdbcAvroSchema.java
@@ -162,8 +162,8 @@ private static SchemaBuilder.FieldAssembler<Schema> createAvroFields(
               SchemaBuilder.UnionAccumulator<SchemaBuilder.NullDefault<Schema>>>
           fieldSchemaBuilder = field.type().unionOf().nullBuilder().endNull().and();
 
-      Integer arrayItemType = resultSet.isFirst() && columnType == ARRAY ?
-                                                   resultSet.getArray(i).getBaseType() : null;
+      Integer arrayItemType = resultSet.isFirst() && columnType == ARRAY
+                              ? resultSet.getArray(i).getBaseType() : null;
 
       final SchemaBuilder.UnionAccumulator<SchemaBuilder.NullDefault<Schema>> schemaFieldAssembler =
           setAvroColumnType(

diff --git a/dbeam-core/src/test/java/com/spotify/dbeam/Coffee.java b/dbeam-core/src/test/java/com/spotify/dbeam/Coffee.java
@@ -110,7 +110,7 @@ public String insertStatement() {
         updated().orElse(null),
         uid(),
         rownum(),
-        String.join(",", intArr().stream().map(x -> (CharSequence)x.toString())::iterator),
+        String.join(",", intArr().stream().map(x -> (CharSequence) x.toString())::iterator),
         String.join("','", textArr()));
   }
 
@@ -156,7 +156,9 @@ public static String ddl() {
             add("rock");
             add("scissors");
             add("paper");
-          }});
+          }}
+      );
+
   public static Coffee COFFEE2 =
       create(
           "colombian caffee",
@@ -180,5 +182,6 @@ public static String ddl() {
             add("scissors");
             add("paper");
             add("rock");
-          }});
+          }}
+      );
 }
diff --git a/dbeam-core/src/test/java/com/spotify/dbeam/avro/JdbcAvroRecordTest.java b/dbeam-core/src/test/java/com/spotify/dbeam/avro/JdbcAvroRecordTest.java
@@ -207,7 +207,7 @@ public void shouldEncodeResultSetToValidAvro()
     Assert.assertEquals(14, record.getSchema().getFields().size());
     Assert.assertEquals(schema, record.getSchema());
     List<String> actualTxtArray =
-        ((GenericData.Array<Utf8>)record.get(13)).stream().map(x -> x.toString()).collect(
+        ((GenericData.Array<Utf8>) record.get(13)).stream().map(x -> x.toString()).collect(
         Collectors.toList());
     final Coffee actual =
         Coffee.create(
@@ -223,7 +223,7 @@ public void shouldEncodeResultSetToValidAvro()
             Optional.ofNullable((Long) record.get(9)).map(Timestamp::new),
             TestHelper.byteBufferToUuid((ByteBuffer) record.get(10)),
             (Long) record.get(11),
-            new ArrayList<>((GenericData.Array<Integer>)record.get(12)),
+            new ArrayList<>((GenericData.Array<Integer>) record.get(12)),
             actualTxtArray);
     Assert.assertEquals(Coffee.COFFEE1, actual);
   }