From c63fed4093d54a168f5cf7ee4dce0d934acefa73 Mon Sep 17 00:00:00 2001 From: 101 Date: Mon, 18 Mar 2024 11:31:59 +0900 Subject: [PATCH] refactor --- daemawiki-api/build.gradle | 1 - .../domain/file/api/FileController.java | 8 ++++---- .../daemawiki/domain/mail/service/MailSend.java | 6 +++--- daemawiki-common/src/main/java/AppConfig.java | 16 ---------------- 4 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 daemawiki-common/src/main/java/AppConfig.java diff --git a/daemawiki-api/build.gradle b/daemawiki-api/build.gradle index 91f44680..54f208eb 100644 --- a/daemawiki-api/build.gradle +++ b/daemawiki-api/build.gradle @@ -1,7 +1,6 @@ jar.enabled = false bootJar.enabled = true - dependencies { implementation project(':daemawiki-auth') implementation project(':daemawiki-domain') diff --git a/daemawiki-api/src/main/java/org/daemawiki/domain/file/api/FileController.java b/daemawiki-api/src/main/java/org/daemawiki/domain/file/api/FileController.java index 474de511..fdf46eb1 100644 --- a/daemawiki-api/src/main/java/org/daemawiki/domain/file/api/FileController.java +++ b/daemawiki-api/src/main/java/org/daemawiki/domain/file/api/FileController.java @@ -1,12 +1,12 @@ package org.daemawiki.domain.file.api; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; import org.daemawiki.domain.file.component.service.GetFile; import org.daemawiki.domain.file.dto.DeleteFileRequest; import org.daemawiki.domain.file.model.File; -import org.daemawiki.infra.s3.service.S3DeleteObject; -import org.daemawiki.infra.s3.service.S3UploadObject; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; +import org.daemawiki.domain.s3.service.S3DeleteObject; +import org.daemawiki.domain.s3.service.S3UploadObject; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.codec.multipart.FilePart; diff --git a/daemawiki-api/src/main/java/org/daemawiki/domain/mail/service/MailSend.java b/daemawiki-api/src/main/java/org/daemawiki/domain/mail/service/MailSend.java index 46b65182..270a8ec7 100644 --- a/daemawiki-api/src/main/java/org/daemawiki/domain/mail/service/MailSend.java +++ b/daemawiki-api/src/main/java/org/daemawiki/domain/mail/service/MailSend.java @@ -1,5 +1,8 @@ package org.daemawiki.domain.mail.service; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import org.daemawiki.domain.mail.dto.AuthCodeRequest; import org.daemawiki.domain.mail.model.AuthCode; import org.daemawiki.domain.mail.model.type.MailType; @@ -8,9 +11,6 @@ import org.daemawiki.exception.h409.EmailAlreadyExistsException; import org.daemawiki.exception.h500.ExecuteFailedException; import org.daemawiki.exception.h500.MailSendFailedException; -import jakarta.mail.MessagingException; -import jakarta.mail.internet.InternetAddress; -import jakarta.mail.internet.MimeMessage; import org.springframework.beans.factory.annotation.Value; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; diff --git a/daemawiki-common/src/main/java/AppConfig.java b/daemawiki-common/src/main/java/AppConfig.java deleted file mode 100644 index 24cc4f0a..00000000 --- a/daemawiki-common/src/main/java/AppConfig.java +++ /dev/null @@ -1,16 +0,0 @@ -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.reactive.config.EnableWebFlux; -import reactor.core.scheduler.Scheduler; -import reactor.core.scheduler.Schedulers; - -@EnableWebFlux -@Configuration -public class AppConfig { - - @Bean - public Scheduler scheduler() { - return Schedulers.boundedElastic(); - } - -}