diff --git a/src/main/java/myblog/blog/article/controller/ArticleController.java b/src/main/java/myblog/blog/article/controller/ArticleController.java index aba1fc5..8f90574 100644 --- a/src/main/java/myblog/blog/article/controller/ArticleController.java +++ b/src/main/java/myblog/blog/article/controller/ArticleController.java @@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.stream.Collectors; -import static myblog.blog.infra.utils.MarkdownUtils.*; +import static myblog.blog.base.utils.MarkdownUtils.*; @Controller @RequiredArgsConstructor diff --git a/src/main/java/myblog/blog/article/domain/Article.java b/src/main/java/myblog/blog/article/domain/Article.java index df47010..d9f7b69 100644 --- a/src/main/java/myblog/blog/article/domain/Article.java +++ b/src/main/java/myblog/blog/article/domain/Article.java @@ -3,7 +3,7 @@ package myblog.blog.article.domain; import lombok.Builder; import lombok.Getter; import myblog.blog.article.dto.ArticleForm; -import myblog.blog.infra.BasicEntity; +import myblog.blog.base.BasicEntity; import myblog.blog.category.domain.Category; import myblog.blog.comment.domain.Comment; import myblog.blog.member.doamin.Member; diff --git a/src/main/java/myblog/blog/article/domain/TempArticle.java b/src/main/java/myblog/blog/article/domain/TempArticle.java index 71fe2ad..df3bd77 100644 --- a/src/main/java/myblog/blog/article/domain/TempArticle.java +++ b/src/main/java/myblog/blog/article/domain/TempArticle.java @@ -1,7 +1,7 @@ package myblog.blog.article.domain; import lombok.Getter; -import myblog.blog.infra.BasicEntity; +import myblog.blog.base.BasicEntity; import javax.persistence.*; diff --git a/src/main/java/myblog/blog/infra/BasicEntity.java b/src/main/java/myblog/blog/base/BasicEntity.java similarity index 96% rename from src/main/java/myblog/blog/infra/BasicEntity.java rename to src/main/java/myblog/blog/base/BasicEntity.java index 7b86491..78f6c91 100644 --- a/src/main/java/myblog/blog/infra/BasicEntity.java +++ b/src/main/java/myblog/blog/base/BasicEntity.java @@ -1,4 +1,4 @@ -package myblog.blog.infra; +package myblog.blog.base; import lombok.Getter; import org.springframework.data.annotation.CreatedDate; diff --git a/src/main/java/myblog/blog/infra/MysqlDialectCustom.java b/src/main/java/myblog/blog/base/MysqlDialectCustom.java similarity index 94% rename from src/main/java/myblog/blog/infra/MysqlDialectCustom.java rename to src/main/java/myblog/blog/base/MysqlDialectCustom.java index e874513..70d3943 100644 --- a/src/main/java/myblog/blog/infra/MysqlDialectCustom.java +++ b/src/main/java/myblog/blog/base/MysqlDialectCustom.java @@ -1,4 +1,4 @@ -package myblog.blog.infra; +package myblog.blog.base; import org.hibernate.dialect.MySQL8Dialect; import org.hibernate.dialect.function.SQLFunctionTemplate; diff --git a/src/main/java/myblog/blog/infra/config/AppConfig.java b/src/main/java/myblog/blog/base/config/AppConfig.java similarity index 95% rename from src/main/java/myblog/blog/infra/config/AppConfig.java rename to src/main/java/myblog/blog/base/config/AppConfig.java index 13e6406..eb45292 100644 --- a/src/main/java/myblog/blog/infra/config/AppConfig.java +++ b/src/main/java/myblog/blog/base/config/AppConfig.java @@ -1,4 +1,4 @@ -package myblog.blog.infra.config; +package myblog.blog.base.config; import com.google.gson.Gson; import org.modelmapper.ModelMapper; diff --git a/src/main/java/myblog/blog/infra/config/CacheConfig.java b/src/main/java/myblog/blog/base/config/CacheConfig.java similarity index 99% rename from src/main/java/myblog/blog/infra/config/CacheConfig.java rename to src/main/java/myblog/blog/base/config/CacheConfig.java index 273301b..dc086c7 100644 --- a/src/main/java/myblog/blog/infra/config/CacheConfig.java +++ b/src/main/java/myblog/blog/base/config/CacheConfig.java @@ -1,4 +1,4 @@ -package myblog.blog.infra.config; +package myblog.blog.base.config; import net.sf.ehcache.Cache; import net.sf.ehcache.config.CacheConfiguration; diff --git a/src/main/java/myblog/blog/infra/config/SecurityConfig.java b/src/main/java/myblog/blog/base/config/SecurityConfig.java similarity index 98% rename from src/main/java/myblog/blog/infra/config/SecurityConfig.java rename to src/main/java/myblog/blog/base/config/SecurityConfig.java index 4452d95..433ccd8 100644 --- a/src/main/java/myblog/blog/infra/config/SecurityConfig.java +++ b/src/main/java/myblog/blog/base/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package myblog.blog.infra.config; +package myblog.blog.base.config; import lombok.RequiredArgsConstructor; import myblog.blog.exception.LoginFailHandler; diff --git a/src/main/java/myblog/blog/infra/utils/MarkdownUtils.java b/src/main/java/myblog/blog/base/utils/MarkdownUtils.java similarity index 95% rename from src/main/java/myblog/blog/infra/utils/MarkdownUtils.java rename to src/main/java/myblog/blog/base/utils/MarkdownUtils.java index c14908d..f420e8a 100644 --- a/src/main/java/myblog/blog/infra/utils/MarkdownUtils.java +++ b/src/main/java/myblog/blog/base/utils/MarkdownUtils.java @@ -1,4 +1,4 @@ -package myblog.blog.infra.utils; +package myblog.blog.base.utils; import org.commonmark.ext.gfm.tables.TablesExtension; import org.commonmark.parser.Parser; diff --git a/src/main/java/myblog/blog/category/domain/Category.java b/src/main/java/myblog/blog/category/domain/Category.java index 6c232c3..dab8cb3 100644 --- a/src/main/java/myblog/blog/category/domain/Category.java +++ b/src/main/java/myblog/blog/category/domain/Category.java @@ -4,7 +4,7 @@ package myblog.blog.category.domain; import lombok.Builder; import lombok.Getter; import myblog.blog.article.domain.Article; -import myblog.blog.infra.BasicEntity; +import myblog.blog.base.BasicEntity; import javax.persistence.*; import java.util.ArrayList; diff --git a/src/main/java/myblog/blog/comment/domain/Comment.java b/src/main/java/myblog/blog/comment/domain/Comment.java index 629a067..5c70d2d 100644 --- a/src/main/java/myblog/blog/comment/domain/Comment.java +++ b/src/main/java/myblog/blog/comment/domain/Comment.java @@ -3,7 +3,7 @@ package myblog.blog.comment.domain; import lombok.Builder; import lombok.Getter; import myblog.blog.article.domain.Article; -import myblog.blog.infra.BasicEntity; +import myblog.blog.base.BasicEntity; import myblog.blog.member.doamin.Member; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; diff --git a/src/main/java/myblog/blog/main/MainController.java b/src/main/java/myblog/blog/main/MainController.java index e6f2883..e280a29 100644 --- a/src/main/java/myblog/blog/main/MainController.java +++ b/src/main/java/myblog/blog/main/MainController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.stream.Collectors; -import static myblog.blog.infra.utils.MarkdownUtils.*; +import static myblog.blog.base.utils.MarkdownUtils.*; @Controller @RequiredArgsConstructor diff --git a/src/main/java/myblog/blog/member/doamin/Member.java b/src/main/java/myblog/blog/member/doamin/Member.java index ed622d8..f0e2a18 100644 --- a/src/main/java/myblog/blog/member/doamin/Member.java +++ b/src/main/java/myblog/blog/member/doamin/Member.java @@ -4,7 +4,7 @@ import lombok.Builder; import lombok.Getter; import lombok.Setter; import myblog.blog.article.domain.Article; -import myblog.blog.infra.BasicEntity; +import myblog.blog.base.BasicEntity; import myblog.blog.comment.domain.Comment; import javax.persistence.*; diff --git a/src/main/java/myblog/blog/rss/RssService.java b/src/main/java/myblog/blog/rss/RssService.java index a7f1435..41184f0 100644 --- a/src/main/java/myblog/blog/rss/RssService.java +++ b/src/main/java/myblog/blog/rss/RssService.java @@ -13,7 +13,7 @@ import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.util.*; -import static myblog.blog.infra.utils.MarkdownUtils.*; +import static myblog.blog.base.utils.MarkdownUtils.*; /* - rss 서비스 로직 diff --git a/src/main/java/myblog/blog/tags/domain/ArticleTagList.java b/src/main/java/myblog/blog/tags/domain/ArticleTagList.java index 1bec252..e299420 100644 --- a/src/main/java/myblog/blog/tags/domain/ArticleTagList.java +++ b/src/main/java/myblog/blog/tags/domain/ArticleTagList.java @@ -2,7 +2,7 @@ package myblog.blog.tags.domain; import lombok.*; import myblog.blog.article.domain.Article; -import myblog.blog.infra.BasicEntity; +import myblog.blog.base.BasicEntity; import javax.persistence.*; diff --git a/src/main/java/myblog/blog/tags/domain/Tags.java b/src/main/java/myblog/blog/tags/domain/Tags.java index 9649ba0..680fe24 100644 --- a/src/main/java/myblog/blog/tags/domain/Tags.java +++ b/src/main/java/myblog/blog/tags/domain/Tags.java @@ -1,7 +1,7 @@ package myblog.blog.tags.domain; import lombok.*; -import myblog.blog.infra.BasicEntity; +import myblog.blog.base.BasicEntity; import javax.persistence.*; import java.util.*;