Merge branch '15.0.x' into master

Author: semaphore-agent-production[bot]

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

@@ -434,14 +434,14 @@ public class ElasticsearchSinkConnectorConfig extends AbstractConfig {
   private static final String TOPIC_TO_EXTERNAL_RESOURCE_MAPPING_DEFAULT = "";
 
   // Error message constants for topic-to-resource mapping validation
-  public static final String INVALID_MAPPING_FORMAT_ERROR = 
+  public static final String INVALID_MAPPING_FORMAT_ERROR =
       "Invalid topic-to-resource mapping format. Expected format: topic:resource";
-  
+
   public static final String DUPLICATE_TOPIC_MAPPING_ERROR_FORMAT =
           "Topic '%s' is mapped to multiple resources. "
           + "Each topic must be mapped to exactly one resource.";
-  
-  public static final String DUPLICATE_RESOURCE_MAPPING_ERROR_FORMAT = 
+
+  public static final String DUPLICATE_RESOURCE_MAPPING_ERROR_FORMAT =
       "Resource '%s' is mapped from multiple topics. "
       + "Each resource must be mapped to exactly one topic.";
 
@@ -985,7 +985,7 @@ public Map<String, String> getTopicToExternalResourceMap() {
     List<String> mappings = topicToExternalResourceMapping();
     Map<String, String> topicToExternalResourceMap = new HashMap<>();
     Set<String> seenResources = new HashSet<>();
-    
+
     for (String mapping : mappings) {
       String[] parts = mapping.split(":");
       if (parts.length != 2) {
@@ -1034,7 +1034,7 @@ public boolean isBasicProxyConfigured() {
   /**
    * Determines if data streams are being used. Checks the external
    * resource usage approach first, then falls back to legacy data stream configs.
-   * 
+   *
    * @return true if data streams are configured, false otherwise
    */
   public boolean isDataStream() {
@@ -1266,7 +1266,7 @@ public ExternalResourceUsage externalResourceUsage() {
 
   /**
    * Checks if external resource usage is enabled.
-   * 
+   *
    * @return true if external resource usage is configured, false if DISABLED
    */
   public boolean isExternalResourceUsageEnabled() {

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");
   }