Resolved merge conflicts

Author: swagatika60

build.gradle

@@ -282,7 +282,7 @@ shadowJar {
         exclude {
             it.moduleGroup.startsWith('com.fasterxml.jackson') && !it.moduleName.equals('jackson-datatype-joda')
         }
-exclude "org/slf4j/**"
+        exclude "org/slf4j/**"
     }
 }
 

src/main/java/io/kestra/plugin/azure/batch/job/Create.java

@@ -27,7 +27,7 @@
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-
+import org.slf4j.Logger;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/io/kestra/plugin/azure/batch/models/ContainerRegistry.java

@@ -1,4 +1,3 @@
-
 package io.kestra.plugin.azure.batch.models;
 
 import io.kestra.core.exceptions.IllegalVariableEvaluationException;

src/main/java/io/kestra/plugin/azure/datafactory/CreateRun.java

@@ -33,6 +33,7 @@
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
+import org.slf4j.Logger;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -49,7 +50,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 
-
 @SuperBuilder
 @ToString
 @EqualsAndHashCode

src/main/java/io/kestra/plugin/azure/eventhubs/Consume.java

@@ -33,6 +33,7 @@
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
+import org.slf4j.Logger;
 
 
 import java.io.BufferedOutputStream;
@@ -78,7 +79,6 @@
 @Schema(
     title = "Consume events from Azure Event Hubs."
 )
-
 @SuperBuilder
 @NoArgsConstructor
 @Getter

src/main/java/io/kestra/plugin/azure/eventhubs/EventHubConsumerInterface.java

@@ -1,21 +1,18 @@
 package io.kestra.plugin.azure.eventhubs;
 
-import io.kestra.core.models.annotations.PluginProperty;
 import io.kestra.core.models.property.Property;
 import io.kestra.plugin.azure.eventhubs.serdes.Serdes;
 import io.kestra.plugin.azure.eventhubs.service.consumer.StartingPosition;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import java.time.Duration;
 import java.util.Map;
 
-
 /**
  * Base class for implementing tasks that consume events into EventHubs.
  * This class provides all required and optional parameters.
  */
 public interface EventHubConsumerInterface extends EventHubClientInterface {
-    
+
     // TASK'S PARAMETERS
     @Schema(
         title = "The Deserializer to be used for serializing the event value."

src/main/java/io/kestra/plugin/azure/eventhubs/Produce.java

@@ -86,7 +86,6 @@
 @Schema(
     title = "Publish events to Azure Event Hubs."
 )
-
 @SuperBuilder
 @Getter
 @NoArgsConstructor

src/main/java/io/kestra/plugin/azure/eventhubs/RealtimeTrigger.java

@@ -19,13 +19,11 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import lombok.extern.slf4j.Slf4j;
 import org.reactivestreams.Publisher;
 import org.slf4j.Logger;
 import reactor.core.publisher.Flux;
 
 import java.time.Duration;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -102,7 +100,6 @@
     title = "Trigger a flow on message consumption in real-time from Azure Event Hubs.",
     description = "If you would like to consume multiple messages processed within a given time frame and process them in batch, you can use the [io.kestra.plugin.azure.eventhubs.Trigger](https://kestra.io/plugins/plugin-azure/triggers/io.kestra.plugin.azure.eventhubs.trigger) instead."
 )
-
 @NoArgsConstructor
 @SuperBuilder
 @ToString

src/main/java/io/kestra/plugin/azure/eventhubs/Trigger.java

@@ -13,12 +13,16 @@
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
+<<<<<<< HEAD
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Constructor;
+=======
+
+
+>>>>>>> e183f2959c3e09729b94d38b2f50f323de68532b
 import java.time.Duration;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -67,8 +71,11 @@
 public class Trigger extends AbstractTrigger implements EventHubConsumerInterface, EventHubBatchConsumerInterface, PollingTriggerInterface, TriggerOutput<Consume.Output> {
 
 
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> e183f2959c3e09729b94d38b2f50f323de68532b
     // TRIGGER'S PROPERTIES
     @Builder.Default
     private Duration interval = Duration.ofSeconds(60);

src/main/java/io/kestra/plugin/azure/eventhubs/client/EventHubClientFactory.java

@@ -24,7 +24,6 @@
 import java.util.Optional;
 
 public class EventHubClientFactory {
-
     private static final Logger log = LoggerFactory.getLogger(EventHubClientFactory.class);