Skip to content

Commit 1779549

Browse files
authored
Revert deprecating partition decorator syntax (#68)
1 parent a474292 commit 1779549

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

kcbq-connector/src/main/java/com/wepay/kafka/connect/bigquery/config/BigQuerySinkConfig.java

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import java.lang.reflect.Constructor;
3939
import java.lang.reflect.InvocationTargetException;
4040
import java.util.ArrayList;
41-
import java.util.Arrays;
4241
import java.util.Collections;
4342
import java.util.HashMap;
4443
import java.util.List;
@@ -78,8 +77,6 @@ public enum DecimalHandlingMode {
7877
public static final String DEPRECATED_DOC = "(DEPRECATED)";
7978
public static final String GCS_LOAD_DEPRECATION_NOTICE =
8079
"GCS batch loading has been deprecated and will be removed in a future major release.";
81-
public static final String DECORATOR_SYNTAX_DEPRECATION_NOTICE =
82-
"Use of partition decorator syntax has been deprecated and will be removed in a future release.";
8380

8481
// Values taken from https://github.com/apache/kafka/blob/1.1.1/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/SinkConnectorConfig.java#L33
8582
public static final String TOPICS_CONFIG = SinkConnector.TOPICS_CONFIG;
@@ -613,14 +610,6 @@ private void logDeprecationWarnings() {
613610
ENABLE_BATCH_CONFIG
614611
);
615612
}
616-
617-
if (getBoolean(BIGQUERY_PARTITION_DECORATOR_CONFIG)) {
618-
logger.warn(
619-
DECORATOR_SYNTAX_DEPRECATION_NOTICE
620-
+ " To disable this feature, set the {} property to false in the connector configuration",
621-
BIGQUERY_PARTITION_DECORATOR_CONFIG
622-
);
623-
}
624613
}
625614

626615
/**
@@ -852,13 +841,13 @@ public static ConfigDef getConfig() {
852841
BIGQUERY_MESSAGE_TIME_PARTITIONING_CONFIG_TYPE,
853842
BIGQUERY_MESSAGE_TIME_PARTITIONING_DEFAULT,
854843
BIGQUERY_MESSAGE_TIME_PARTITIONING_IMPORTANCE,
855-
deprecatedPartitionSyntaxDoc(BIGQUERY_MESSAGE_TIME_PARTITIONING_DOC)
844+
BIGQUERY_MESSAGE_TIME_PARTITIONING_DOC
856845
).define(
857846
BIGQUERY_PARTITION_DECORATOR_CONFIG,
858847
BIGQUERY_PARTITION_DECORATOR_CONFIG_TYPE,
859848
BIGQUERY_PARTITION_DECORATOR_DEFAULT,
860849
BIGQUERY_PARTITION_DECORATOR_IMPORTANCE,
861-
deprecatedPartitionSyntaxDoc(BIGQUERY_PARTITION_DECORATOR_DOC)
850+
BIGQUERY_PARTITION_DECORATOR_DOC
862851
).define(
863852
BIGQUERY_TIMESTAMP_PARTITION_FIELD_NAME_CONFIG,
864853
BIGQUERY_TIMESTAMP_PARTITION_FIELD_NAME_TYPE,
@@ -1248,10 +1237,6 @@ private static String deprecatedGcsLoadDoc(String doc) {
12481237
return deprecatedDoc(doc, GCS_LOAD_DEPRECATION_NOTICE);
12491238
}
12501239

1251-
public static String deprecatedPartitionSyntaxDoc(String doc) {
1252-
return deprecatedDoc(doc, DECORATOR_SYNTAX_DEPRECATION_NOTICE);
1253-
}
1254-
12551240
private static String deprecatedDoc(String doc, String notice) {
12561241
return DEPRECATED_DOC + " " + doc + " Warning: " + notice;
12571242
}

0 commit comments

Comments
 (0)