diff --git a/src/main/java/kr/re/etri/autoflow/batch/BatchScheduler.java b/src/main/java/kr/re/etri/autoflow/batch/BatchScheduler.java index edcac4e..db225fa 100644 --- a/src/main/java/kr/re/etri/autoflow/batch/BatchScheduler.java +++ b/src/main/java/kr/re/etri/autoflow/batch/BatchScheduler.java @@ -17,7 +17,7 @@ public class BatchScheduler { private final JobLauncher jobLauncher; private final Job runSyncJob; // Spring Batch의 Job 타입 - @Scheduled(fixedDelay = 30000) // 30초마다 실행 + @Scheduled(fixedDelay = 300000) // 30초마다 실행 public void runJob() throws Exception { JobParameters params = new JobParametersBuilder() .addLong("timestamp", System.currentTimeMillis()) // 중복 실행 방지 diff --git a/src/main/java/kr/re/etri/autoflow/service/EdgeSWUploadService.java b/src/main/java/kr/re/etri/autoflow/service/EdgeSWUploadService.java index 979f12c..9b9ca49 100644 --- a/src/main/java/kr/re/etri/autoflow/service/EdgeSWUploadService.java +++ b/src/main/java/kr/re/etri/autoflow/service/EdgeSWUploadService.java @@ -112,7 +112,6 @@ public class EdgeSWUploadService { default -> throw new IllegalArgumentException("Invalid sw_type: " + sw_type); } - jsonBody.put("sw_id", edgeSWVO.getSw_id()); jsonBody.put("sw_version", edgeSWVO.getSw_version()); jsonBody.put("sw_name", edgeSWVO.getSw_name()); diff --git a/src/main/java/kr/re/etri/autoflow/specification/DataGroupSpecification.java b/src/main/java/kr/re/etri/autoflow/specification/DataGroupSpecification.java index 0e45aab..6aa2166 100644 --- a/src/main/java/kr/re/etri/autoflow/specification/DataGroupSpecification.java +++ b/src/main/java/kr/re/etri/autoflow/specification/DataGroupSpecification.java @@ -7,6 +7,7 @@ import jakarta.persistence.metamodel.Attribute; import jakarta.persistence.metamodel.EntityType; import jakarta.persistence.metamodel.Metamodel; import kr.re.etri.autoflow.entity.DataGroupEntity; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Component; @@ -17,16 +18,13 @@ import java.util.stream.Collectors; @Slf4j @Component +@RequiredArgsConstructor public class DataGroupSpecification { private final EntityManager entityManager; private Set stringFields; - public DataGroupSpecification(EntityManager entityManager) { - this.entityManager = entityManager; - } - // 스프링 빈 초기화 후 실행 @PostConstruct public void init() { diff --git a/src/main/java/kr/re/etri/autoflow/specification/ExperimentsSpecification.java b/src/main/java/kr/re/etri/autoflow/specification/ExperimentsSpecification.java index 7c4b249..987f2cb 100644 --- a/src/main/java/kr/re/etri/autoflow/specification/ExperimentsSpecification.java +++ b/src/main/java/kr/re/etri/autoflow/specification/ExperimentsSpecification.java @@ -7,6 +7,7 @@ import jakarta.persistence.metamodel.Attribute; import jakarta.persistence.metamodel.EntityType; import jakarta.persistence.metamodel.Metamodel; import kr.re.etri.autoflow.entity.ExperimentsEntity; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Component; @@ -16,14 +17,12 @@ import java.util.stream.Collectors; @Slf4j @Component +@RequiredArgsConstructor public class ExperimentsSpecification { private final EntityManager entityManager; private Set stringFields; - public ExperimentsSpecification(EntityManager entityManager) { - this.entityManager = entityManager; - } @PostConstruct public void init() { diff --git a/src/main/java/kr/re/etri/autoflow/specification/KubeflowRunSpecification.java b/src/main/java/kr/re/etri/autoflow/specification/KubeflowRunSpecification.java index 5a75c2f..6de8c9a 100644 --- a/src/main/java/kr/re/etri/autoflow/specification/KubeflowRunSpecification.java +++ b/src/main/java/kr/re/etri/autoflow/specification/KubeflowRunSpecification.java @@ -80,6 +80,7 @@ import jakarta.persistence.metamodel.EntityType; import jakarta.persistence.metamodel.Metamodel; import kr.re.etri.autoflow.entity.ProjectEntity; import kr.re.etri.autoflow.entity.KubeflowRunEntity; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Component; @@ -91,16 +92,14 @@ import java.util.stream.Collectors; @Slf4j @Component +@RequiredArgsConstructor + public class KubeflowRunSpecification { private final EntityManager entityManager; private Set stringFields; - public KubeflowRunSpecification(EntityManager entityManager) { - this.entityManager = entityManager; - } - // 스프링 빈 초기화 후 실행 @PostConstruct public void init() { diff --git a/src/main/java/kr/re/etri/autoflow/specification/MinioAttachmentSpecification.java b/src/main/java/kr/re/etri/autoflow/specification/MinioAttachmentSpecification.java index c9f0a1a..53edeb4 100644 --- a/src/main/java/kr/re/etri/autoflow/specification/MinioAttachmentSpecification.java +++ b/src/main/java/kr/re/etri/autoflow/specification/MinioAttachmentSpecification.java @@ -7,6 +7,7 @@ import jakarta.persistence.metamodel.Attribute; import jakarta.persistence.metamodel.EntityType; import jakarta.persistence.metamodel.Metamodel; import kr.re.etri.autoflow.entity.MinioAttachmentEntity; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Component; @@ -17,16 +18,14 @@ import java.util.stream.Collectors; @Slf4j @Component +@RequiredArgsConstructor + public class MinioAttachmentSpecification { private final EntityManager entityManager; private Set stringFields; - public MinioAttachmentSpecification(EntityManager entityManager) { - this.entityManager = entityManager; - } - @PostConstruct public void init() { Metamodel metamodel = entityManager.getMetamodel(); diff --git a/src/main/java/kr/re/etri/autoflow/specification/ProjectSpecification.java b/src/main/java/kr/re/etri/autoflow/specification/ProjectSpecification.java index f2ed377..6332b02 100644 --- a/src/main/java/kr/re/etri/autoflow/specification/ProjectSpecification.java +++ b/src/main/java/kr/re/etri/autoflow/specification/ProjectSpecification.java @@ -6,6 +6,7 @@ import jakarta.persistence.metamodel.Attribute; import jakarta.persistence.metamodel.EntityType; import jakarta.persistence.metamodel.Metamodel; import kr.re.etri.autoflow.entity.ProjectEntity; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Component; @@ -17,16 +18,13 @@ import java.util.stream.Collectors; @Slf4j @Component +@RequiredArgsConstructor public class ProjectSpecification { private final EntityManager entityManager; private Set stringFields; - public ProjectSpecification(EntityManager entityManager) { - this.entityManager = entityManager; - } - // 스프링 빈 초기화 후 실행 @PostConstruct public void init() { diff --git a/src/main/java/kr/re/etri/autoflow/specification/WorkflowSpecification.java b/src/main/java/kr/re/etri/autoflow/specification/WorkflowSpecification.java index 41171b4..53c31e9 100644 --- a/src/main/java/kr/re/etri/autoflow/specification/WorkflowSpecification.java +++ b/src/main/java/kr/re/etri/autoflow/specification/WorkflowSpecification.java @@ -7,6 +7,7 @@ import jakarta.persistence.metamodel.EntityType; import jakarta.persistence.metamodel.Metamodel; import kr.re.etri.autoflow.entity.ProjectEntity; import kr.re.etri.autoflow.entity.WorkflowEntity; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Component; @@ -18,16 +19,13 @@ import java.util.stream.Collectors; @Slf4j @Component +@RequiredArgsConstructor public class WorkflowSpecification { private final EntityManager entityManager; private Set stringFields; - public WorkflowSpecification(EntityManager entityManager) { - this.entityManager = entityManager; - } - // 스프링 빈 초기화 후 실행 @PostConstruct public void init() {