diff --git a/src/main/java/io/kestra/plugin/azure/datafactory/CreateRun.java b/src/main/java/io/kestra/plugin/azure/datafactory/CreateRun.java index 2d2b725f..6f0beaf6 100644 --- a/src/main/java/io/kestra/plugin/azure/datafactory/CreateRun.java +++ b/src/main/java/io/kestra/plugin/azure/datafactory/CreateRun.java @@ -32,7 +32,7 @@ import jakarta.validation.constraints.NotNull; import lombok.*; import lombok.experimental.SuperBuilder; -import lombok.extern.slf4j.Slf4j; + import org.slf4j.Logger; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -50,7 +50,6 @@ import java.util.concurrent.atomic.AtomicReference; -@Slf4j @SuperBuilder @ToString @EqualsAndHashCode diff --git a/src/main/java/io/kestra/plugin/azure/eventhubs/Consume.java b/src/main/java/io/kestra/plugin/azure/eventhubs/Consume.java index aa15f540..e35dbd51 100644 --- a/src/main/java/io/kestra/plugin/azure/eventhubs/Consume.java +++ b/src/main/java/io/kestra/plugin/azure/eventhubs/Consume.java @@ -33,9 +33,9 @@ import lombok.NoArgsConstructor; import lombok.ToString; import lombok.experimental.SuperBuilder; -import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; + import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; @@ -79,7 +79,6 @@ @Schema( title = "Consume events from Azure Event Hubs." ) -@Slf4j @SuperBuilder @NoArgsConstructor @Getter diff --git a/src/main/java/io/kestra/plugin/azure/eventhubs/EventHubConsumerInterface.java b/src/main/java/io/kestra/plugin/azure/eventhubs/EventHubConsumerInterface.java index a525894a..d3b9d810 100644 --- a/src/main/java/io/kestra/plugin/azure/eventhubs/EventHubConsumerInterface.java +++ b/src/main/java/io/kestra/plugin/azure/eventhubs/EventHubConsumerInterface.java @@ -1,12 +1,10 @@ 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; /** diff --git a/src/main/java/io/kestra/plugin/azure/eventhubs/Produce.java b/src/main/java/io/kestra/plugin/azure/eventhubs/Produce.java index 9b709488..91e4d108 100644 --- a/src/main/java/io/kestra/plugin/azure/eventhubs/Produce.java +++ b/src/main/java/io/kestra/plugin/azure/eventhubs/Produce.java @@ -22,7 +22,7 @@ import jakarta.validation.constraints.NotNull; import lombok.*; import lombok.experimental.SuperBuilder; -import lombok.extern.slf4j.Slf4j; + import java.io.*; import java.util.HashMap; @@ -86,7 +86,6 @@ @Schema( title = "Publish events to Azure Event Hubs." ) -@Slf4j @SuperBuilder @Getter @NoArgsConstructor diff --git a/src/main/java/io/kestra/plugin/azure/eventhubs/RealtimeTrigger.java b/src/main/java/io/kestra/plugin/azure/eventhubs/RealtimeTrigger.java index e25b1ea4..05b741e2 100644 --- a/src/main/java/io/kestra/plugin/azure/eventhubs/RealtimeTrigger.java +++ b/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." ) -@Slf4j @NoArgsConstructor @SuperBuilder @ToString diff --git a/src/main/java/io/kestra/plugin/azure/eventhubs/Trigger.java b/src/main/java/io/kestra/plugin/azure/eventhubs/Trigger.java index 22cdff3a..1c432ff6 100644 --- a/src/main/java/io/kestra/plugin/azure/eventhubs/Trigger.java +++ b/src/main/java/io/kestra/plugin/azure/eventhubs/Trigger.java @@ -13,10 +13,9 @@ import jakarta.validation.constraints.NotNull; import lombok.*; import lombok.experimental.SuperBuilder; -import lombok.extern.slf4j.Slf4j; + import java.time.Duration; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -56,7 +55,7 @@ title = "Trigger a flow on message consumption periodically from Azure Event Hubs.", description = "If you would like to consume each message from Azure Event Hubs in real-time and create one execution per message, you can use the [io.kestra.plugin.azure.eventhubs.RealtimeTrigger](https://kestra.io/plugins/plugin-azure/triggers/io.kestra.plugin.azure.eventhubs.realtimetrigger) instead." ) -@Slf4j + @NoArgsConstructor @SuperBuilder @ToString diff --git a/src/main/java/io/kestra/plugin/azure/eventhubs/client/EventHubClientFactory.java b/src/main/java/io/kestra/plugin/azure/eventhubs/client/EventHubClientFactory.java index 5448e772..bf47a9f6 100644 --- a/src/main/java/io/kestra/plugin/azure/eventhubs/client/EventHubClientFactory.java +++ b/src/main/java/io/kestra/plugin/azure/eventhubs/client/EventHubClientFactory.java @@ -15,14 +15,17 @@ import io.kestra.plugin.azure.eventhubs.config.BlobContainerClientConfig; import io.kestra.plugin.azure.eventhubs.config.EventHubClientConfig; import io.kestra.plugin.azure.eventhubs.config.EventHubConsumerConfig; -import lombok.extern.slf4j.Slf4j; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.time.Duration; import java.util.Objects; import java.util.Optional; -@Slf4j public class EventHubClientFactory { + private static final Logger log = LoggerFactory.getLogger(EventHubClientFactory.class); + /** * Factory method for constructing a new {@link EventHubClientBuilder} for the given config. diff --git a/src/main/java/io/kestra/plugin/azure/eventhubs/service/consumer/ConsumerContext.java b/src/main/java/io/kestra/plugin/azure/eventhubs/service/consumer/ConsumerContext.java index 3ddb3660..92084c7c 100644 --- a/src/main/java/io/kestra/plugin/azure/eventhubs/service/consumer/ConsumerContext.java +++ b/src/main/java/io/kestra/plugin/azure/eventhubs/service/consumer/ConsumerContext.java @@ -1,7 +1,8 @@ package io.kestra.plugin.azure.eventhubs.service.consumer; +import org.slf4j.Logger; import io.kestra.plugin.azure.eventhubs.service.EventDataObjectConverter; -import org.slf4j.Logger; + import java.time.Duration; diff --git a/src/main/java/io/kestra/plugin/azure/eventhubs/service/consumer/EventHubConsumerService.java b/src/main/java/io/kestra/plugin/azure/eventhubs/service/consumer/EventHubConsumerService.java index 9b81e7bf..340c82f2 100644 --- a/src/main/java/io/kestra/plugin/azure/eventhubs/service/consumer/EventHubConsumerService.java +++ b/src/main/java/io/kestra/plugin/azure/eventhubs/service/consumer/EventHubConsumerService.java @@ -1,4 +1,5 @@ package io.kestra.plugin.azure.eventhubs.service.consumer; +import org.slf4j.Logger; import com.azure.messaging.eventhubs.CheckpointStore; import com.azure.messaging.eventhubs.EventData; @@ -12,8 +13,7 @@ import io.kestra.plugin.azure.eventhubs.client.EventHubClientFactory; import io.kestra.plugin.azure.eventhubs.config.EventHubConsumerConfig; import io.kestra.plugin.azure.eventhubs.model.EventDataObject; -import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; + import java.util.Collection; import java.util.Collections; @@ -31,7 +31,6 @@ import static io.kestra.core.utils.Rethrow.throwFunction; -@Slf4j public final class EventHubConsumerService { private final EventHubClientFactory clientFactory; diff --git a/src/main/java/io/kestra/plugin/azure/eventhubs/service/producer/EventHubProducerService.java b/src/main/java/io/kestra/plugin/azure/eventhubs/service/producer/EventHubProducerService.java index 32851ddd..320070a6 100644 --- a/src/main/java/io/kestra/plugin/azure/eventhubs/service/producer/EventHubProducerService.java +++ b/src/main/java/io/kestra/plugin/azure/eventhubs/service/producer/EventHubProducerService.java @@ -1,4 +1,5 @@ package io.kestra.plugin.azure.eventhubs.service.producer; +import org.slf4j.Logger; import com.azure.messaging.eventhubs.EventData; import com.azure.messaging.eventhubs.EventDataBatch; @@ -10,7 +11,7 @@ import io.kestra.plugin.azure.eventhubs.config.EventHubConsumerConfig; import io.kestra.plugin.azure.eventhubs.model.EventDataObject; import io.kestra.plugin.azure.eventhubs.service.EventDataObjectConverter; -import org.slf4j.Logger; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/src/main/java/io/kestra/plugin/azure/eventhubs/service/producer/ProducerContext.java b/src/main/java/io/kestra/plugin/azure/eventhubs/service/producer/ProducerContext.java index 192045a0..a72fd2e9 100644 --- a/src/main/java/io/kestra/plugin/azure/eventhubs/service/producer/ProducerContext.java +++ b/src/main/java/io/kestra/plugin/azure/eventhubs/service/producer/ProducerContext.java @@ -14,6 +14,6 @@ public record ProducerContext(String bodyContentType, Map eventProperties, Integer maxEventsPerBatch, - Logger logger + Logger logger ) { } diff --git a/src/main/java/io/kestra/plugin/azure/storage/adls/Delete.java b/src/main/java/io/kestra/plugin/azure/storage/adls/Delete.java index af1843e7..c7ae9259 100644 --- a/src/main/java/io/kestra/plugin/azure/storage/adls/Delete.java +++ b/src/main/java/io/kestra/plugin/azure/storage/adls/Delete.java @@ -1,4 +1,5 @@ package io.kestra.plugin.azure.storage.adls; +import org.slf4j.Logger; import com.azure.storage.file.datalake.DataLakeFileClient; import io.kestra.core.models.annotations.Example; diff --git a/src/main/java/io/kestra/plugin/azure/storage/adls/DeleteFiles.java b/src/main/java/io/kestra/plugin/azure/storage/adls/DeleteFiles.java index e3163d6f..a9da6156 100644 --- a/src/main/java/io/kestra/plugin/azure/storage/adls/DeleteFiles.java +++ b/src/main/java/io/kestra/plugin/azure/storage/adls/DeleteFiles.java @@ -1,4 +1,5 @@ package io.kestra.plugin.azure.storage.adls; +import org.slf4j.Logger; import com.azure.storage.file.datalake.DataLakeFileClient; import com.azure.storage.file.datalake.DataLakeFileSystemClient; @@ -21,7 +22,7 @@ import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.tuple.Pair; -import org.slf4j.Logger; + import reactor.core.publisher.Flux; import reactor.core.publisher.FluxSink; import reactor.core.scheduler.Schedulers; diff --git a/src/main/java/io/kestra/plugin/azure/storage/blob/DeleteList.java b/src/main/java/io/kestra/plugin/azure/storage/blob/DeleteList.java index c165b57f..22ed1adf 100644 --- a/src/main/java/io/kestra/plugin/azure/storage/blob/DeleteList.java +++ b/src/main/java/io/kestra/plugin/azure/storage/blob/DeleteList.java @@ -20,12 +20,13 @@ import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.tuple.Pair; -import org.slf4j.Logger; + import java.util.NoSuchElementException; import java.util.function.Function; import jakarta.validation.constraints.Min; +import org.slf4j.Logger; import reactor.core.publisher.Flux; import reactor.core.publisher.FluxSink; import reactor.core.scheduler.Schedulers;