Rename 'qualify.table.names' to 'table.names.qualify'

Author: C0urante

src/integrationTest/java/io/aiven/kafka/connect/jdbc/postgres/UnqualifiedTableNamesIntegrationTest.java

@@ -182,7 +182,7 @@ private Map<String, String> basicSourceConnectorConfig() {
         final Map<String, String> config = super.basicConnectorConfig();
         config.put("name", CONNECTOR_NAME);
         config.put("topic.prefix", "");
-        config.put("qualify.table.names", "false");
+        config.put("table.names.qualify", "false");
         config.put("poll.interval.ms", "1000"); // Poll quickly for shorter tests
         config.put("whitelist", TABLE);
         config.put("connector.class", JdbcSourceConnector.class.getName());

src/main/java/io/aiven/connect/jdbc/JdbcSourceConnector.java

@@ -103,7 +103,7 @@ public void start(final Map<String, String> properties) throws ConnectException
         Set<String> whitelistSet = whitelist.isEmpty() ? null : new HashSet<>(whitelist);
         final List<String> blacklist = config.getList(JdbcSourceConnectorConfig.TABLE_BLACKLIST_CONFIG);
         final Set<String> blacklistSet = blacklist.isEmpty() ? null : new HashSet<>(blacklist);
-        final boolean qualifyTableNames = config.getBoolean(JdbcSourceConnectorConfig.QUALIFY_TABLE_NAMES_CONFIG);
+        final boolean qualifyTableNames = config.getBoolean(JdbcSourceConnectorConfig.TABLE_NAMES_QUALIFY_CONFIG);
 
         if (whitelistSet != null && blacklistSet != null) {
             throw new ConnectException(JdbcSourceConnectorConfig.TABLE_WHITELIST_CONFIG + " and "

src/main/java/io/aiven/connect/jdbc/source/JdbcSourceConnectorConfig.java

@@ -263,15 +263,15 @@ public class JdbcSourceConnectorConfig extends JdbcConfig {
     private static final String TABLE_TYPE_DISPLAY = "Table Types";
 
 
-    public static final String QUALIFY_TABLE_NAMES_CONFIG = "qualify.table.names";
-    private static final String QUALIFY_TABLE_NAMES_DOC =
+    public static final String TABLE_NAMES_QUALIFY_CONFIG = "table.names.qualify";
+    private static final String TABLE_NAMES_QUALIFY_DOC =
             "Whether to use fully-qualified table names when querying the database. If disabled, "
                     + "queries will be performed with unqualified table names. This may be useful if the "
                     + "database has been configured with a search path to automatically direct unqualified "
                     + "queries to the correct table when there are multiple tables available with the same "
                     + "unqualified name";
-    public static final boolean QUALIFY_TABLE_NAMES_DEFAULT = true;
-    private static final String QUALIFY_TABLE_NAMES_DISPLAY = "Qualify table names";
+    public static final boolean TABLE_NAMES_QUALIFY_DEFAULT = true;
+    private static final String TABLE_NAMES_QUALIFY_DISPLAY = "Qualify table names";
 
     public static ConfigDef baseConfigDef() {
         final ConfigDef config = new ConfigDef();
@@ -373,15 +373,15 @@ private static final void addDatabaseOptions(final ConfigDef config) {
             NUMERIC_MAPPING_DISPLAY,
             NUMERIC_MAPPING_RECOMMENDER
         ).define(
-            QUALIFY_TABLE_NAMES_CONFIG,
+                TABLE_NAMES_QUALIFY_CONFIG,
             Type.BOOLEAN,
-            QUALIFY_TABLE_NAMES_DEFAULT,
+                TABLE_NAMES_QUALIFY_DEFAULT,
             Importance.LOW,
-            QUALIFY_TABLE_NAMES_DOC,
+                TABLE_NAMES_QUALIFY_DOC,
             DATABASE_GROUP,
             ++orderInGroup,
             Width.SHORT,
-            QUALIFY_TABLE_NAMES_DISPLAY
+                TABLE_NAMES_QUALIFY_DISPLAY
         );
 
         defineDbTimezone(config, ++orderInGroup);

src/main/java/io/aiven/connect/jdbc/source/TableMonitorThread.java

@@ -38,7 +38,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static io.aiven.connect.jdbc.source.JdbcSourceConnectorConfig.QUALIFY_TABLE_NAMES_CONFIG;
+import static io.aiven.connect.jdbc.source.JdbcSourceConnectorConfig.TABLE_NAMES_QUALIFY_CONFIG;
 
 /**
  * Thread that monitors the database for changes to the set of tables in the database that this
@@ -134,7 +134,7 @@ public synchronized List<TableId> tables() {
                 + "JDBC Source connector fails to start when it detects duplicate table name "
                 + "configurations. Update the connector's " + configText + " config to include exactly "
                 + "one table in each of the tables listed below or, to use unqualified table names, consider "
-                + "setting " +  QUALIFY_TABLE_NAMES_CONFIG + " to 'false'.\n\t";
+                + "setting " + TABLE_NAMES_QUALIFY_CONFIG + " to 'false'.\n\t";
             throw new ConnectException(msg + duplicates.values());
         }
         return tables;

src/test/java/io/aiven/connect/jdbc/JdbcSourceConnectorTest.java

@@ -174,7 +174,7 @@ public void testPartitioningManyTables() throws Exception {
 
     @Test
     public void testPartitioningUnqualifiedTables() throws Exception {
-        connProps.put(JdbcSourceConnectorConfig.QUALIFY_TABLE_NAMES_CONFIG, "false");
+        connProps.put(JdbcSourceConnectorConfig.TABLE_NAMES_QUALIFY_CONFIG, "false");
         // Tests distributing tables across multiple tasks, in this case unevenly
         db.createTable("test1", "id", "INT NOT NULL");
         db.createTable("test2", "id", "INT NOT NULL");
@@ -222,7 +222,7 @@ public void testConflictingQueryTableSettings() {
 
         connector = new JdbcSourceConnector();
         connProps.remove(JdbcSourceConnectorConfig.QUERY_CONFIG);
-        connProps.put(JdbcSourceConnectorConfig.QUALIFY_TABLE_NAMES_CONFIG, "false");
+        connProps.put(JdbcSourceConnectorConfig.TABLE_NAMES_QUALIFY_CONFIG, "false");
         connProps.put(JdbcSourceConnectorConfig.MODE_CONFIG, JdbcSourceConnectorConfig.MODE_INCREMENTING);
         assertThrows(ConnectException.class, () -> connector.start(connProps));