Merge pull request #881 from confluentinc/pr_merge_from_14_1_x_to_15_0_x

Merge Conflict Resolution (from 14.1.x to 15.0.x)

Author: jjain1259

src/main/java/io/confluent/connect/elasticsearch/ElasticsearchSinkTaskConfig.java

@@ -26,6 +26,7 @@ public class ElasticsearchSinkTaskConfig extends ElasticsearchSinkConnectorConfi
   public static final String TASK_ID_CONFIG =                   "taskId";
   private static final ConfigDef.Type TASK_ID_TYPE =            ConfigDef.Type.INT;
   public static final ConfigDef.Importance TASK_ID_IMPORTANCE = ConfigDef.Importance.LOW;
+  public static final int TASK_ID_DEFAULT = 0;
 
   /**
    * Return a ConfigDef object used to define this config's fields.
@@ -37,7 +38,7 @@ public static ConfigDef config() {
             .defineInternal(
                     TASK_ID_CONFIG,
                     TASK_ID_TYPE,
-                    ConfigDef.NO_DEFAULT_VALUE,
+                    TASK_ID_DEFAULT,
                     TASK_ID_IMPORTANCE
             );
   }
@@ -47,7 +48,7 @@ public static ConfigDef config() {
    */
   public ElasticsearchSinkTaskConfig(Map<String, String> properties) {
     super(config(), properties);
-    taskId = getInt(TASK_ID_CONFIG);
+    taskId = properties.containsKey(TASK_ID_CONFIG) ? getInt(TASK_ID_CONFIG) : 0;
     connectorName = originalsStrings().get("name");
   }