Improve code naming

memiiso · Sep 23, 2024 · a800cfd · a800cfd
1 parent 57c7ca4
commit a800cfd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/...bigquery-sinks/src/main/java/io/debezium/server/bigquery/BatchBigqueryChangeConsumer.java b/...bigquery-sinks/src/main/java/io/debezium/server/bigquery/BatchBigqueryChangeConsumer.java
@@ -99,7 +99,7 @@ public long uploadDestination(String destination, List<RecordConverter> data) {
       TableId tableId = getTableId(destination);
 
       RecordConverter sampleEvent = data.get(0);
-      Schema schema = sampleEvent.tableSchema(false, false);
+      Schema schema = sampleEvent.tableSchema(false);
       if (schema == null) {
         schema = bqClient.getTable(tableId).getDefinition().getSchema();
       }

diff --git a/...zium-server-bigquery-sinks/src/main/java/io/debezium/server/bigquery/RecordConverter.java b/...zium-server-bigquery-sinks/src/main/java/io/debezium/server/bigquery/RecordConverter.java
@@ -51,8 +51,7 @@ public RecordConverter(String destination, JsonNode value, JsonNode key, JsonNod
     this.keySchema = keySchema;
   }
 
-  private static ArrayList<Field> schemaFields(JsonNode schemaNode, Boolean binaryAsString,
-                                               boolean isStream) {
+  private static ArrayList<Field> schemaFields(JsonNode schemaNode, Boolean binaryAsString) {
 
     ArrayList<Field> fields = new ArrayList<>();
 
@@ -79,20 +78,20 @@ private static ArrayList<Field> schemaFields(JsonNode schemaNode, Boolean binary
       switch (fieldType) {
         case "struct":
           // recursive call for nested fields
-          ArrayList<Field> subFields = schemaFields(jsonSchemaFieldNode, binaryAsString, isStream);
+          ArrayList<Field> subFields = schemaFields(jsonSchemaFieldNode, binaryAsString);
           fields.add(Field.newBuilder(fieldName, StandardSQLTypeName.STRUCT, FieldList.of(subFields)).build());
           break;
         default:
           // default to String type
-          fields.add(schemaPrimitiveField(fieldType, fieldName, fieldSemanticType, binaryAsString, isStream));
+          fields.add(schemaPrimitiveField(fieldType, fieldName, fieldSemanticType, binaryAsString));
           break;
       }
     }
 
     return fields;
   }
 
-  private static Field schemaPrimitiveField(String fieldType, String fieldName, String fieldSemanticType, boolean binaryAsString, boolean isStream) {
+  private static Field schemaPrimitiveField(String fieldType, String fieldName, String fieldSemanticType, boolean binaryAsString) {
     switch (fieldType) {
       case "int8":
       case "int16":
@@ -292,8 +291,8 @@ public Clustering tableClustering(String clusteringField) {
     }
   }
 
-  public Schema tableSchema(Boolean binaryAsString, boolean isStream) {
-    ArrayList<Field> fields = schemaFields(this.valueSchema(), binaryAsString, isStream);
+  public Schema tableSchema(Boolean binaryAsString) {
+    ArrayList<Field> fields = schemaFields(this.valueSchema(), binaryAsString);
 
     if (fields.isEmpty()) {
       return null;

diff --git a/...igquery-sinks/src/main/java/io/debezium/server/bigquery/StreamBigqueryChangeConsumer.java b/...igquery-sinks/src/main/java/io/debezium/server/bigquery/StreamBigqueryChangeConsumer.java
@@ -250,15 +250,15 @@ private Table getTable(String destination, RecordConverter sampleBqEvent) {
     // create table if missing
     if (createIfNeeded && table == null) {
       table = this.createTable(tableId,
-          sampleBqEvent.tableSchema(true, true),
+          sampleBqEvent.tableSchema(true),
           sampleBqEvent.tableClustering(clusteringField),
           sampleBqEvent.tableConstraints()
       );
     }
 
     // alter table schema add new fields
     if (allowFieldAddition && table != null) {
-      table = this.updateTableSchema(table, sampleBqEvent.tableSchema(true, true), destination);
+      table = this.updateTableSchema(table, sampleBqEvent.tableSchema(true), destination);
     }
     return table;
   }