github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Move theme config handler to new package

pull/146/head
johnniang 2019-04-18 23:42:51 +08:00
parent 76b3310027
commit 5ebf5653f3
14 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/run/halo/app/handler/theme/ThemeConfigResolver.java → src/main/java/run/halo/app/handler/theme/config/ThemeConfigResolver.java
View File

@ -1,7 +1,7 @@
package run.halo.app.handler.theme; package run.halo.app.handler.theme.config;
import org.springframework.lang.NonNull; 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.io.IOException;
import java.util.List; import java.util.List;

6
src/main/java/run/halo/app/handler/theme/ThemeConfigResolvers.java → src/main/java/run/halo/app/handler/theme/config/ThemeConfigResolvers.java
View File

@ -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.NonNull;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import run.halo.app.handler.theme.impl.YamlThemeConfigResolverImpl; import run.halo.app.handler.theme.config.impl.YamlThemeConfigResolverImpl;
import run.halo.app.handler.theme.support.Group; import run.halo.app.handler.theme.config.support.Group;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;

4
src/main/java/run/halo/app/handler/theme/ThemePropertyResolver.java → src/main/java/run/halo/app/handler/theme/config/ThemePropertyResolver.java
View File

@ -1,7 +1,7 @@
package run.halo.app.handler.theme; package run.halo.app.handler.theme.config;
import org.springframework.lang.NonNull; 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; import java.io.IOException;

10
src/main/java/run/halo/app/handler/theme/impl/YamlThemeConfigResolverImpl.java → src/main/java/run/halo/app/handler/theme/config/impl/YamlThemeConfigResolverImpl.java
View File

@ -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.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import run.halo.app.handler.theme.ThemeConfigResolver; import run.halo.app.handler.theme.config.ThemeConfigResolver;
import run.halo.app.handler.theme.support.Group; import run.halo.app.handler.theme.config.support.Group;
import run.halo.app.handler.theme.support.Item; import run.halo.app.handler.theme.config.support.Item;
import run.halo.app.handler.theme.support.Option; import run.halo.app.handler.theme.config.support.Option;
import run.halo.app.model.enums.DataType; import run.halo.app.model.enums.DataType;
import run.halo.app.model.enums.InputType; import run.halo.app.model.enums.InputType;

6
src/main/java/run/halo/app/handler/theme/impl/YamlThemePropertyResolver.java → src/main/java/run/halo/app/handler/theme/config/impl/YamlThemePropertyResolver.java
View File

@ -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.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import run.halo.app.handler.theme.ThemePropertyResolver; import run.halo.app.handler.theme.config.ThemePropertyResolver;
import run.halo.app.handler.theme.support.ThemeProperty; import run.halo.app.handler.theme.config.support.ThemeProperty;
import java.io.IOException; import java.io.IOException;

4
src/test/java/run/halo/app/handler/theme/impl/YamlThemePropertyResolverTest.java → src/main/java/run/halo/app/handler/theme/config/impl/YamlThemePropertyResolverTest.java
View File

@ -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.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import org.junit.Test; 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; import java.io.IOException;

2
src/main/java/run/halo/app/handler/theme/support/Group.java → src/main/java/run/halo/app/handler/theme/config/support/Group.java
View File

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

2
src/main/java/run/halo/app/handler/theme/support/Item.java → src/main/java/run/halo/app/handler/theme/config/support/Item.java
View File

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

2
src/main/java/run/halo/app/handler/theme/support/Option.java → src/main/java/run/halo/app/handler/theme/config/support/Option.java
View File

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

2
src/main/java/run/halo/app/handler/theme/support/ThemeProperty.java → src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java
View File

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

4
src/main/java/run/halo/app/service/ThemeService.java
View File

@ -2,8 +2,8 @@ package run.halo.app.service;
import org.springframework.lang.NonNull; import org.springframework.lang.NonNull;
import org.springframework.web.multipart.MultipartFile; 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.handler.theme.support.ThemeProperty; import run.halo.app.handler.theme.config.support.ThemeProperty;
import run.halo.app.model.support.ThemeFile; import run.halo.app.model.support.ThemeFile;
import java.io.File; import java.io.File;

8
src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
View File

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

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

@ -3,10 +3,10 @@ package run.halo.app.web.controller.admin.api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; 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.BaseResponse;
import run.halo.app.model.support.ThemeFile; 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.ThemeService;
import run.halo.app.service.ThemeSettingService; import run.halo.app.service.ThemeSettingService;

4
src/test/java/run/halo/app/utils/YamlTest.java
View File

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