Move theme config handler to new package

src/main/java/run/halo/app/handler/theme/config/ThemeConfigResolver.java

@@ -1,7 +1,7 @@
-package run.halo.app.handler.theme;
+package run.halo.app.handler.theme.config;
 
 import org.springframework.lang.NonNull;
-import run.halo.app.handler.theme.support.Group;
+import run.halo.app.handler.theme.config.support.Group;
 
 import java.io.IOException;
 import java.util.List;

src/main/java/run/halo/app/handler/theme/config/ThemeConfigResolvers.java

@@ -1,10 +1,10 @@
-package run.halo.app.handler.theme;
+package run.halo.app.handler.theme.config;
 
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
-import run.halo.app.handler.theme.impl.YamlThemeConfigResolverImpl;
-import run.halo.app.handler.theme.support.Group;
+import run.halo.app.handler.theme.config.impl.YamlThemeConfigResolverImpl;
+import run.halo.app.handler.theme.config.support.Group;
 
 import java.io.IOException;
 import java.util.List;

src/main/java/run/halo/app/handler/theme/config/ThemePropertyResolver.java

@@ -1,7 +1,7 @@
-package run.halo.app.handler.theme;
+package run.halo.app.handler.theme.config;
 
 import org.springframework.lang.NonNull;
-import run.halo.app.handler.theme.support.ThemeProperty;
+import run.halo.app.handler.theme.config.support.ThemeProperty;
 
 import java.io.IOException;
 

src/main/java/run/halo/app/handler/theme/config/impl/YamlThemeConfigResolverImpl.java

@@ -1,13 +1,13 @@
-package run.halo.app.handler.theme.impl;
+package run.halo.app.handler.theme.config.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Service;
-import run.halo.app.handler.theme.ThemeConfigResolver;
-import run.halo.app.handler.theme.support.Group;
-import run.halo.app.handler.theme.support.Item;
-import run.halo.app.handler.theme.support.Option;
+import run.halo.app.handler.theme.config.ThemeConfigResolver;
+import run.halo.app.handler.theme.config.support.Group;
+import run.halo.app.handler.theme.config.support.Item;
+import run.halo.app.handler.theme.config.support.Option;
 import run.halo.app.model.enums.DataType;
 import run.halo.app.model.enums.InputType;
 

src/main/java/run/halo/app/handler/theme/config/impl/YamlThemePropertyResolver.java

@@ -1,11 +1,11 @@
-package run.halo.app.handler.theme.impl;
+package run.halo.app.handler.theme.config.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
-import run.halo.app.handler.theme.ThemePropertyResolver;
-import run.halo.app.handler.theme.support.ThemeProperty;
+import run.halo.app.handler.theme.config.ThemePropertyResolver;
+import run.halo.app.handler.theme.config.support.ThemeProperty;
 
 import java.io.IOException;
 

src/main/java/run/halo/app/handler/theme/config/impl/YamlThemePropertyResolverTest.java

@@ -1,9 +1,9 @@
-package run.halo.app.handler.theme.impl;
+package run.halo.app.handler.theme.config.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import org.junit.Test;
-import run.halo.app.handler.theme.support.ThemeProperty;
+import run.halo.app.handler.theme.config.support.ThemeProperty;
 
 import java.io.IOException;
 

src/main/java/run/halo/app/handler/theme/config/support/Group.java

@@ -1,4 +1,4 @@
-package run.halo.app.handler.theme.support;
+package run.halo.app.handler.theme.config.support;
 
 import lombok.Data;
 

src/main/java/run/halo/app/handler/theme/config/support/Item.java

@@ -1,4 +1,4 @@
-package run.halo.app.handler.theme.support;
+package run.halo.app.handler.theme.config.support;
 
 import lombok.Data;
 import run.halo.app.model.enums.DataType;

src/main/java/run/halo/app/handler/theme/config/support/Option.java

@@ -1,4 +1,4 @@
-package run.halo.app.handler.theme.support;
+package run.halo.app.handler.theme.config.support;
 
 import lombok.Data;
 

src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java

@@ -1,4 +1,4 @@
-package run.halo.app.handler.theme.support;
+package run.halo.app.handler.theme.config.support;
 
 import lombok.Data;
 

src/main/java/run/halo/app/service/ThemeService.java

@@ -2,8 +2,8 @@ package run.halo.app.service;
 
 import org.springframework.lang.NonNull;
 import org.springframework.web.multipart.MultipartFile;
-import run.halo.app.handler.theme.support.Group;
-import run.halo.app.handler.theme.support.ThemeProperty;
+import run.halo.app.handler.theme.config.support.Group;
+import run.halo.app.handler.theme.config.support.ThemeProperty;
 import run.halo.app.model.support.ThemeFile;
 
 import java.io.File;

src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java

@@ -19,10 +19,10 @@ import org.springframework.web.multipart.MultipartFile;
 import run.halo.app.cache.StringCacheStore;
 import run.halo.app.config.properties.HaloProperties;
 import run.halo.app.exception.*;
-import run.halo.app.handler.theme.ThemeConfigResolver;
-import run.halo.app.handler.theme.ThemePropertyResolver;
-import run.halo.app.handler.theme.support.Group;
-import run.halo.app.handler.theme.support.ThemeProperty;
+import run.halo.app.handler.theme.config.ThemeConfigResolver;
+import run.halo.app.handler.theme.config.ThemePropertyResolver;
+import run.halo.app.handler.theme.config.support.Group;
+import run.halo.app.handler.theme.config.support.ThemeProperty;
 import run.halo.app.model.properties.PrimaryProperties;
 import run.halo.app.model.support.HaloConst;
 import run.halo.app.model.support.ThemeFile;

src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java

@@ -3,10 +3,10 @@ package run.halo.app.web.controller.admin.api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import run.halo.app.handler.theme.support.Group;
+import run.halo.app.handler.theme.config.support.Group;
 import run.halo.app.model.support.BaseResponse;
 import run.halo.app.model.support.ThemeFile;
-import run.halo.app.handler.theme.support.ThemeProperty;
+import run.halo.app.handler.theme.config.support.ThemeProperty;
 import run.halo.app.service.ThemeService;
 import run.halo.app.service.ThemeSettingService;
 

src/test/java/run/halo/app/utils/YamlTest.java

@@ -1,8 +1,8 @@
 package run.halo.app.utils;
 
 import org.junit.Test;
-import run.halo.app.handler.theme.support.Group;
-import run.halo.app.handler.theme.impl.YamlThemeConfigResolverImpl;
+import run.halo.app.handler.theme.config.support.Group;
+import run.halo.app.handler.theme.config.impl.YamlThemeConfigResolverImpl;
 
 import java.io.IOException;
 import java.util.List;