fix(jdbc): abstract class should not be singleton

kestra-io · Jul 10, 2024 · ca39794 · ca39794
1 parent fc506c4
commit ca39794
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 18 deletions.
diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcExecutionRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcExecutionRepository.java
@@ -23,7 +23,6 @@
 import io.micronaut.data.model.Pageable;
 import io.micronaut.inject.qualifiers.Qualifiers;
 import jakarta.annotation.Nullable;
-import jakarta.inject.Singleton;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.tuple.Pair;
 import org.jooq.Condition;
@@ -59,7 +58,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-@Singleton
 public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcRepository implements ExecutionRepositoryInterface, JdbcIndexerInterface<Execution> {
     protected final io.kestra.jdbc.AbstractJdbcRepository<Execution> jdbcRepository;
     private final ApplicationEventPublisher<CrudEvent<Execution>> eventPublisher;

diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcLogRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcLogRepository.java
@@ -9,7 +9,6 @@
 import io.kestra.jdbc.runner.JdbcIndexerInterface;
 import io.micronaut.data.model.Pageable;
 import jakarta.annotation.Nullable;
-import jakarta.inject.Singleton;
 import org.jooq.Record;
 import org.jooq.*;
 import org.jooq.impl.DSL;
@@ -25,7 +24,6 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Singleton
 public abstract class AbstractJdbcLogRepository extends AbstractJdbcRepository implements LogRepositoryInterface, JdbcIndexerInterface<LogEntry> {
     protected io.kestra.jdbc.AbstractJdbcRepository<LogEntry> jdbcRepository;
 

diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcMetricRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcMetricRepository.java
@@ -10,7 +10,6 @@
 import io.kestra.jdbc.runner.JdbcIndexerInterface;
 import io.micrometer.common.lang.Nullable;
 import io.micronaut.data.model.Pageable;
-import jakarta.inject.Singleton;
 import org.jooq.*;
 import org.jooq.impl.DSL;
 
@@ -24,7 +23,6 @@
 import java.util.Map;
 import java.util.function.Function;
 
-@Singleton
 public abstract class AbstractJdbcMetricRepository extends AbstractJdbcRepository implements MetricRepositoryInterface, JdbcIndexerInterface<MetricEntry> {
     protected io.kestra.jdbc.AbstractJdbcRepository<MetricEntry> jdbcRepository;
 

diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcRepository.java
@@ -2,7 +2,6 @@
 
 import io.kestra.core.utils.DateUtils;
 import io.micronaut.core.annotation.Nullable;
-import jakarta.inject.Singleton;
 import org.jooq.Condition;
 import org.jooq.Field;
 import org.jooq.impl.DSL;
@@ -12,7 +11,6 @@
 import java.util.Date;
 import java.util.List;
 
-@Singleton
 public abstract class AbstractJdbcRepository {
     protected Condition defaultFilter() {
         return field("deleted", Boolean.class).eq(false);

diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcServiceInstanceRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcServiceInstanceRepository.java
@@ -6,7 +6,6 @@
 import io.kestra.core.server.ServiceInstance;
 import io.kestra.core.server.ServiceStateTransition;
 import io.micronaut.data.model.Pageable;
-import jakarta.inject.Singleton;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -30,7 +29,6 @@
 
 import static org.jooq.impl.DSL.using;
 
-@Singleton
 @Getter
 @Slf4j
 public abstract class AbstractJdbcServiceInstanceRepository extends AbstractJdbcRepository implements ServiceInstanceRepositoryInterface {

diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcSettingRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcSettingRepository.java
@@ -6,7 +6,6 @@
 import io.kestra.core.repositories.SettingRepositoryInterface;
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.context.event.ApplicationEventPublisher;
-import jakarta.inject.Singleton;
 import lombok.SneakyThrows;
 import org.jooq.Field;
 import org.jooq.Record1;
@@ -18,7 +17,6 @@
 import java.util.Map;
 import java.util.Optional;
 
-@Singleton
 public abstract class AbstractJdbcSettingRepository extends AbstractJdbcRepository implements SettingRepositoryInterface {
     protected final io.kestra.jdbc.AbstractJdbcRepository<Setting> jdbcRepository;
     private final ApplicationEventPublisher<CrudEvent<Setting>> eventPublisher;

diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcTemplateRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcTemplateRepository.java
@@ -11,7 +11,6 @@
 import io.micronaut.context.event.ApplicationEventPublisher;
 import io.micronaut.data.model.Pageable;
 import io.micronaut.inject.qualifiers.Qualifiers;
-import jakarta.inject.Singleton;
 import org.jooq.*;
 import org.jooq.impl.DSL;
 
@@ -20,7 +19,6 @@
 import jakarta.annotation.Nullable;
 import jakarta.validation.ConstraintViolationException;
 
-@Singleton
 public abstract class AbstractJdbcTemplateRepository extends AbstractJdbcRepository implements TemplateRepositoryInterface {
     private final QueueInterface<Template> templateQueue;
     private final ApplicationEventPublisher<CrudEvent<Template>> eventPublisher;

diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcTriggerRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcTriggerRepository.java
@@ -12,7 +12,6 @@
 import io.kestra.jdbc.runner.JdbcIndexerInterface;
 import io.kestra.jdbc.runner.JdbcSchedulerContext;
 import io.micronaut.data.model.Pageable;
-import jakarta.inject.Singleton;
 import org.jooq.*;
 import org.jooq.impl.DSL;
 import reactor.core.publisher.Flux;
@@ -24,7 +23,6 @@
 import java.util.Optional;
 import java.util.function.Function;
 
-@Singleton
 public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcRepository implements TriggerRepositoryInterface, JdbcIndexerInterface<Trigger> {
     protected io.kestra.jdbc.AbstractJdbcRepository<Trigger> jdbcRepository;
 

diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcWorkerJobRunningRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcWorkerJobRunningRepository.java
@@ -2,7 +2,6 @@
 
 import io.kestra.core.repositories.WorkerJobRunningRepositoryInterface;
 import io.kestra.core.runners.WorkerJobRunning;
-import jakarta.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import org.jooq.DSLContext;
 import org.jooq.Record1;
@@ -12,7 +11,6 @@
 import java.util.List;
 import java.util.Optional;
 
-@Singleton
 @Slf4j
 public abstract class AbstractJdbcWorkerJobRunningRepository extends AbstractJdbcRepository implements WorkerJobRunningRepositoryInterface {
     protected io.kestra.jdbc.AbstractJdbcRepository<WorkerJobRunning> jdbcRepository;