diff --git a/src/main/java/run/halo/app/cache/AbstractCacheStore.java b/src/main/java/run/halo/app/cache/AbstractCacheStore.java index ba3dca6d0..c5e0b377b 100644 --- a/src/main/java/run/halo/app/cache/AbstractCacheStore.java +++ b/src/main/java/run/halo/app/cache/AbstractCacheStore.java @@ -49,7 +49,7 @@ public abstract class AbstractCacheStore implements CacheStore { abstract Boolean putInternalIfAbsent(@NonNull K key, @NonNull CacheWrapper cacheWrapper); @Override - public Optional get(K key) { + public @NonNull Optional get(@NonNull K key) { Assert.notNull(key, "Cache key must not be blank"); return getInternal(key).map(cacheWrapper -> { @@ -70,17 +70,17 @@ public abstract class AbstractCacheStore implements CacheStore { } @Override - public void put(K key, V value, long timeout, TimeUnit timeUnit) { + public void put(@NonNull K key, @NonNull V value, long timeout, @NonNull TimeUnit timeUnit) { putInternal(key, buildCacheWrapper(value, timeout, timeUnit)); } @Override - public Boolean putIfAbsent(K key, V value, long timeout, TimeUnit timeUnit) { + public Boolean putIfAbsent(@NonNull K key, @NonNull V value, long timeout, @NonNull TimeUnit timeUnit) { return putInternalIfAbsent(key, buildCacheWrapper(value, timeout, timeUnit)); } @Override - public void put(K key, V value) { + public void put(@NonNull K key, @NonNull V value) { putInternal(key, buildCacheWrapper(value, 0, null)); } diff --git a/src/main/java/run/halo/app/cache/InMemoryCacheStore.java b/src/main/java/run/halo/app/cache/InMemoryCacheStore.java index b6914bd70..c4ff2ff75 100644 --- a/src/main/java/run/halo/app/cache/InMemoryCacheStore.java +++ b/src/main/java/run/halo/app/cache/InMemoryCacheStore.java @@ -1,6 +1,7 @@ package run.halo.app.cache; import lombok.extern.slf4j.Slf4j; +import org.springframework.lang.NonNull; import org.springframework.util.Assert; import javax.annotation.PreDestroy; @@ -43,14 +44,15 @@ public class InMemoryCacheStore extends AbstractStringCacheStore { } @Override - Optional> getInternal(String key) { + @NonNull + Optional> getInternal(@NonNull String key) { Assert.hasText(key, "Cache key must not be blank"); return Optional.ofNullable(CACHE_CONTAINER.get(key)); } @Override - void putInternal(String key, CacheWrapper cacheWrapper) { + void putInternal(@NonNull String key, @NonNull CacheWrapper cacheWrapper) { Assert.hasText(key, "Cache key must not be blank"); Assert.notNull(cacheWrapper, "Cache wrapper must not be null"); @@ -61,7 +63,7 @@ public class InMemoryCacheStore extends AbstractStringCacheStore { } @Override - Boolean putInternalIfAbsent(String key, CacheWrapper cacheWrapper) { + Boolean putInternalIfAbsent(@NonNull String key, @NonNull CacheWrapper cacheWrapper) { Assert.hasText(key, "Cache key must not be blank"); Assert.notNull(cacheWrapper, "Cache wrapper must not be null"); @@ -87,7 +89,7 @@ public class InMemoryCacheStore extends AbstractStringCacheStore { } @Override - public void delete(String key) { + public void delete(@NonNull String key) { Assert.hasText(key, "Cache key must not be blank"); CACHE_CONTAINER.remove(key); diff --git a/src/main/java/run/halo/app/cache/LevelCacheStore.java b/src/main/java/run/halo/app/cache/LevelCacheStore.java index fc880f3d6..8ca40b9d2 100644 --- a/src/main/java/run/halo/app/cache/LevelCacheStore.java +++ b/src/main/java/run/halo/app/cache/LevelCacheStore.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import lombok.extern.slf4j.Slf4j; import org.iq80.leveldb.*; import org.iq80.leveldb.impl.Iq80DBFactory; +import org.springframework.lang.NonNull; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import run.halo.app.config.properties.HaloProperties; @@ -69,7 +70,8 @@ public class LevelCacheStore extends AbstractStringCacheStore { } @Override - Optional> getInternal(String key) { + @NonNull + Optional> getInternal(@NonNull String key) { Assert.hasText(key, "Cache key must not be blank"); byte[] bytes = LEVEL_DB.get(stringToBytes(key)); if (bytes != null) { @@ -80,12 +82,12 @@ public class LevelCacheStore extends AbstractStringCacheStore { } @Override - void putInternal(String key, CacheWrapper cacheWrapper) { + void putInternal(@NonNull String key, @NonNull CacheWrapper cacheWrapper) { putInternalIfAbsent(key, cacheWrapper); } @Override - Boolean putInternalIfAbsent(String key, CacheWrapper cacheWrapper) { + Boolean putInternalIfAbsent(@NonNull String key, @NonNull CacheWrapper cacheWrapper) { Assert.hasText(key, "Cache key must not be blank"); Assert.notNull(cacheWrapper, "Cache wrapper must not be null"); try { @@ -102,7 +104,7 @@ public class LevelCacheStore extends AbstractStringCacheStore { } @Override - public void delete(String key) { + public void delete(@NonNull String key) { LEVEL_DB.delete(stringToBytes(key)); log.debug("cache remove key: [{}]", key); } diff --git a/src/main/java/run/halo/app/config/properties/HaloProperties.java b/src/main/java/run/halo/app/config/properties/HaloProperties.java index ea2aafd41..e69c772a7 100644 --- a/src/main/java/run/halo/app/config/properties/HaloProperties.java +++ b/src/main/java/run/halo/app/config/properties/HaloProperties.java @@ -5,8 +5,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import run.halo.app.model.enums.Mode; import java.time.Duration; -import java.util.ArrayList; -import java.util.List; import static run.halo.app.model.support.HaloConst.*; import static run.halo.app.utils.HaloUtils.ensureSuffix; @@ -84,19 +82,4 @@ public class HaloProperties { * level */ private String cache = "memory"; - - private List cacheRedisNodes = new ArrayList<>(); - - private String cacheRedisPassword = ""; - - /** - * hazelcast cache store impl - * memory - * level - */ - private List hazelcastMembers = new ArrayList<>(); - - private String hazelcastGroupName; - - private int initialBackoffSeconds = 5; } diff --git a/src/main/java/run/halo/app/controller/admin/api/AdminController.java b/src/main/java/run/halo/app/controller/admin/api/AdminController.java index 3f4a9413c..893a2ebbb 100644 --- a/src/main/java/run/halo/app/controller/admin/api/AdminController.java +++ b/src/main/java/run/halo/app/controller/admin/api/AdminController.java @@ -106,13 +106,6 @@ public class AdminController { return adminService.getEnvironments(); } - @PutMapping("halo-admin") - @ApiOperation("Updates halo-admin manually") - @Deprecated - public void updateAdmin() { - adminService.updateAdminAssets(); - } - @GetMapping(value = "halo/logfile") @ApiOperation("Gets halo log file content") @DisableOnCondition diff --git a/src/main/java/run/halo/app/core/CommonResultControllerAdvice.java b/src/main/java/run/halo/app/core/CommonResultControllerAdvice.java index a0caa5c44..b5d7cda46 100644 --- a/src/main/java/run/halo/app/core/CommonResultControllerAdvice.java +++ b/src/main/java/run/halo/app/core/CommonResultControllerAdvice.java @@ -1,6 +1,6 @@ package run.halo.app.core; -import org.jetbrains.annotations.NotNull; +import org.springframework.lang.NonNull; import org.springframework.core.MethodParameter; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -9,7 +9,6 @@ import org.springframework.http.converter.json.AbstractJackson2HttpMessageConver import org.springframework.http.converter.json.MappingJacksonValue; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; -import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; @@ -24,18 +23,18 @@ import run.halo.app.model.support.BaseResponse; public class CommonResultControllerAdvice implements ResponseBodyAdvice { @Override - public boolean supports(MethodParameter returnType, @NotNull Class> converterType) { + public boolean supports(@NonNull MethodParameter returnType, @NonNull Class> converterType) { return AbstractJackson2HttpMessageConverter.class.isAssignableFrom(converterType); } @Override @NonNull public final Object beforeBodyWrite(@Nullable Object body, - @NotNull MethodParameter returnType, - @NotNull MediaType contentType, - @NotNull Class> converterType, - @NotNull ServerHttpRequest request, - @NotNull ServerHttpResponse response) { + @NonNull MethodParameter returnType, + @NonNull MediaType contentType, + @NonNull Class> converterType, + @NonNull ServerHttpRequest request, + @NonNull ServerHttpResponse response) { MappingJacksonValue container = getOrCreateContainer(body); // The contain body will never be null beforeBodyWriteInternal(container, contentType, returnType, request, response); diff --git a/src/main/java/run/halo/app/factory/StringToEnumConverterFactory.java b/src/main/java/run/halo/app/factory/StringToEnumConverterFactory.java index 13a4d72b5..8e7e04012 100644 --- a/src/main/java/run/halo/app/factory/StringToEnumConverterFactory.java +++ b/src/main/java/run/halo/app/factory/StringToEnumConverterFactory.java @@ -1,9 +1,8 @@ package run.halo.app.factory; -import org.jetbrains.annotations.NotNull; +import org.springframework.lang.NonNull; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.ConverterFactory; -import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; /** @@ -15,7 +14,7 @@ public class StringToEnumConverterFactory implements ConverterFactory> Converter getConverter(@NotNull Class targetType) { + public > Converter getConverter(@NonNull Class targetType) { return new StringToEnumConverter(targetType); } diff --git a/src/main/java/run/halo/app/handler/file/AliOssFileHandler.java b/src/main/java/run/halo/app/handler/file/AliOssFileHandler.java index d84b2db91..2c1043124 100644 --- a/src/main/java/run/halo/app/handler/file/AliOssFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/AliOssFileHandler.java @@ -6,7 +6,7 @@ import com.aliyun.oss.model.DeleteObjectsRequest; import com.aliyun.oss.model.PutObjectResult; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; +import org.springframework.lang.NonNull; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; import org.springframework.util.Assert; @@ -41,7 +41,7 @@ public class AliOssFileHandler implements FileHandler { } @Override - public @NotNull UploadResult upload(@NotNull MultipartFile file) { + public @NonNull UploadResult upload(@NonNull MultipartFile file) { Assert.notNull(file, "Multipart file must not be null"); // Get config @@ -127,7 +127,7 @@ public class AliOssFileHandler implements FileHandler { } @Override - public void delete(@NotNull String key) { + public void delete(@NonNull String key) { Assert.notNull(key, "File key must not be blank"); // Get config diff --git a/src/main/java/run/halo/app/handler/file/HuaweiObsFileHandler.java b/src/main/java/run/halo/app/handler/file/HuaweiObsFileHandler.java index e486e347c..4c15af9ba 100644 --- a/src/main/java/run/halo/app/handler/file/HuaweiObsFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/HuaweiObsFileHandler.java @@ -4,7 +4,7 @@ import com.obs.services.ObsClient; import com.obs.services.model.PutObjectResult; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; +import org.springframework.lang.NonNull; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; import org.springframework.util.Assert; @@ -39,7 +39,7 @@ public class HuaweiObsFileHandler implements FileHandler { } @Override - public @NotNull UploadResult upload(@NotNull MultipartFile file) { + public @NonNull UploadResult upload(@NonNull MultipartFile file) { Assert.notNull(file, "Multipart file must not be null"); // Get config @@ -126,7 +126,7 @@ public class HuaweiObsFileHandler implements FileHandler { } @Override - public void delete(@NotNull String key) { + public void delete(@NonNull String key) { Assert.notNull(key, "File key must not be blank"); // Get config diff --git a/src/main/java/run/halo/app/handler/file/MinioFileHandler.java b/src/main/java/run/halo/app/handler/file/MinioFileHandler.java index 5ee619abf..84c8ff510 100644 --- a/src/main/java/run/halo/app/handler/file/MinioFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/MinioFileHandler.java @@ -5,7 +5,7 @@ import io.minio.PutObjectArgs; import io.minio.RemoveObjectArgs; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; +import org.springframework.lang.NonNull; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; import org.springframework.util.Assert; @@ -37,9 +37,9 @@ public class MinioFileHandler implements FileHandler { this.optionService = optionService; } - @NotNull + @NonNull @Override - public UploadResult upload(@NotNull MultipartFile file) { + public UploadResult upload(@NonNull MultipartFile file) { Assert.notNull(file, "Multipart file must not be null"); // Get config String endpoint = optionService.getByPropertyOfNonNull(MinioProperties.ENDPOINT).toString(); @@ -90,7 +90,7 @@ public class MinioFileHandler implements FileHandler { } @Override - public void delete(@NotNull String key) { + public void delete(@NonNull String key) { Assert.notNull(key, "File key must not be blank"); String endPoint = optionService.getByPropertyOfNonNull(MinioProperties.ENDPOINT).toString(); diff --git a/src/main/java/run/halo/app/model/support/HaloConst.java b/src/main/java/run/halo/app/model/support/HaloConst.java index a68f700b8..603ac524c 100644 --- a/src/main/java/run/halo/app/model/support/HaloConst.java +++ b/src/main/java/run/halo/app/model/support/HaloConst.java @@ -109,16 +109,6 @@ public class HaloConst { * YouTube 视频正则表达式 */ public static final String YOUTUBE_VIDEO_REG_PATTERN = "\\[youtube:(\\w+)\\,(\\d+)\\,(\\d+)\\]"; - /** - * Github Api url for halo-admin release. - */ - public final static String HALO_ADMIN_RELEASES_LATEST = "https://api.github.com/repos/halo-dev/halo-admin/releases/latest"; - /** - * Halo admin version regex. - */ - public final static String HALO_ADMIN_VERSION_REGEX = "halo-admin-\\d+\\.\\d+(\\.\\d+)?(-\\S*)?\\.zip"; - public final static String HALO_ADMIN_RELATIVE_PATH = "templates/admin/"; - public final static String HALO_ADMIN_RELATIVE_BACKUP_PATH = "templates/admin-backup/"; /** * Content token header name. */ @@ -131,10 +121,6 @@ public class HaloConst { * Admin token param name. */ public final static String ADMIN_TOKEN_QUERY_NAME = "admin_token"; - /** - * Temporary token. - */ - public final static String TEMP_TOKEN = "temp_token"; /** * Content api token param name */ @@ -155,10 +141,6 @@ public class HaloConst { * Database product name. */ public static String DATABASE_PRODUCT_NAME = null; - /** - * user_session - */ - public static String USER_SESSION_KEY = "user_session"; static { // Set version diff --git a/src/main/java/run/halo/app/service/AdminService.java b/src/main/java/run/halo/app/service/AdminService.java index df0dc85cb..d58dd38f0 100644 --- a/src/main/java/run/halo/app/service/AdminService.java +++ b/src/main/java/run/halo/app/service/AdminService.java @@ -90,11 +90,6 @@ public interface AdminService { @NonNull AuthToken refreshToken(@NonNull String refreshToken); - /** - * Updates halo admin assets. - */ - void updateAdminAssets(); - /** * Get halo logs content. * diff --git a/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java b/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java index df3fb9569..a8d079455 100644 --- a/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.http.ResponseEntity; import org.springframework.lang.NonNull; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -35,7 +34,6 @@ import run.halo.app.security.context.SecurityContextHolder; import run.halo.app.security.token.AuthToken; import run.halo.app.security.util.SecurityUtils; import run.halo.app.service.*; -import run.halo.app.utils.FileUtils; import run.halo.app.utils.HaloUtils; import run.halo.app.utils.TwoFactorAuthUtils; @@ -44,16 +42,12 @@ import java.io.IOException; import java.io.RandomAccessFile; import java.lang.management.ManagementFactory; import java.nio.charset.StandardCharsets; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.concurrent.TimeUnit; -import java.util.function.Predicate; -import static run.halo.app.model.support.HaloConst.*; +import static run.halo.app.model.support.HaloConst.DATABASE_PRODUCT_NAME; /** * Admin service implementation. @@ -340,101 +334,6 @@ public class AdminServiceImpl implements AdminService { return buildAuthToken(user); } - @Override - @SuppressWarnings("unchecked") - public void updateAdminAssets() { - // Request github api - ResponseEntity responseEntity = restTemplate.getForEntity(HaloConst.HALO_ADMIN_RELEASES_LATEST, Map.class); - - if (responseEntity.getStatusCode().isError() || responseEntity.getBody() == null) { - log.debug("Failed to request remote url: [{}]", HALO_ADMIN_RELEASES_LATEST); - throw new ServiceException("系统无法访问到 Github 的 API").setErrorData(HALO_ADMIN_RELEASES_LATEST); - } - - Object assetsObject = responseEntity.getBody().get("assets"); - - if (!(assetsObject instanceof List)) { - throw new ServiceException("Github API 返回内容有误").setErrorData(assetsObject); - } - - try { - List assets = (List) assetsObject; - Map assetMap = (Map) assets.stream() - .filter(assetPredicate()) - .findFirst() - .orElseThrow(() -> new ServiceException("Halo admin 最新版暂无资源文件，请稍后再试")); - - Object browserDownloadUrl = assetMap.getOrDefault("browser_download_url", ""); - // Download the assets - ResponseEntity downloadResponseEntity = restTemplate.getForEntity(browserDownloadUrl.toString(), byte[].class); - - if (downloadResponseEntity.getStatusCode().isError() || downloadResponseEntity.getBody() == null) { - throw new ServiceException("Failed to request remote url: " + browserDownloadUrl.toString()).setErrorData(browserDownloadUrl.toString()); - } - - String adminTargetName = haloProperties.getWorkDir() + HALO_ADMIN_RELATIVE_PATH; - - Path adminPath = Paths.get(adminTargetName); - Path adminBackupPath = Paths.get(haloProperties.getWorkDir(), HALO_ADMIN_RELATIVE_BACKUP_PATH); - - backupAndClearAdminAssetsIfPresent(adminPath, adminBackupPath); - - // Create temp folder - Path assetTempPath = FileUtils.createTempDirectory() - .resolve(assetMap.getOrDefault("name", "halo-admin-latest.zip").toString()); - - // Unzip - FileUtils.unzip(downloadResponseEntity.getBody(), assetTempPath); - - // find root folder - Path adminRootPath = FileUtils.findRootPath(assetTempPath, - path -> StringUtils.equalsIgnoreCase("index.html", path.getFileName().toString())) - .orElseThrow(() -> new BadRequestException("无法准确定位到压缩包的根路径，请确认包含 index.html 文件。")); - - // Copy it to template/admin folder - FileUtils.copyFolder(adminRootPath, adminPath); - } catch (Throwable t) { - throw new ServiceException("更新 Halo admin 失败，" + t.getMessage(), t); - } - } - - @NonNull - @SuppressWarnings("unchecked") - private Predicate assetPredicate() { - return asset -> { - if (!(asset instanceof Map)) { - return false; - } - Map aAssetMap = (Map) asset; - // Get content-type - String contentType = aAssetMap.getOrDefault("content_type", "").toString(); - - Object name = aAssetMap.getOrDefault("name", ""); - return name.toString().matches(HALO_ADMIN_VERSION_REGEX) && "application/zip".equalsIgnoreCase(contentType); - }; - } - - private void backupAndClearAdminAssetsIfPresent(@NonNull Path sourcePath, @NonNull Path backupPath) throws IOException { - Assert.notNull(sourcePath, "Source path must not be null"); - Assert.notNull(backupPath, "Backup path must not be null"); - - if (!FileUtils.isEmpty(sourcePath)) { - // Clone this assets - Path adminPathBackup = Paths.get(haloProperties.getWorkDir(), HALO_ADMIN_RELATIVE_BACKUP_PATH); - - // Delete backup - FileUtils.deleteFolder(backupPath); - - // Copy older assets into backup - FileUtils.copyFolder(sourcePath, backupPath); - - // Delete older assets - FileUtils.deleteFolder(sourcePath); - } else { - FileUtils.createIfAbsent(sourcePath); - } - } - /** * Builds authentication token. * diff --git a/src/main/java/run/halo/app/service/impl/BaseMetaServiceImpl.java b/src/main/java/run/halo/app/service/impl/BaseMetaServiceImpl.java index 6395c7413..dda48ee7c 100644 --- a/src/main/java/run/halo/app/service/impl/BaseMetaServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/BaseMetaServiceImpl.java @@ -2,7 +2,7 @@ package run.halo.app.service.impl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; +import org.springframework.lang.NonNull; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; @@ -37,7 +37,7 @@ public abstract class BaseMetaServiceImpl extends Abstrac @Override @Transactional - public List createOrUpdateByPostId(@NotNull Integer postId, Set metas) { + public List createOrUpdateByPostId(@NonNull Integer postId, Set metas) { Assert.notNull(postId, "Post id must not be null"); // firstly remove post metas by post id @@ -58,13 +58,13 @@ public abstract class BaseMetaServiceImpl extends Abstrac } @Override - public List removeByPostId(@NotNull Integer postId) { + public List removeByPostId(@NonNull Integer postId) { Assert.notNull(postId, "Post id must not be null of removeByPostId"); return baseMetaRepository.deleteByPostId(postId); } @Override - public Map> listPostMetaAsMap(@NotNull Set postIds) { + public Map> listPostMetaAsMap(@NonNull Set postIds) { Assert.notNull(postIds, "Post ids must not be null"); if (CollectionUtils.isEmpty(postIds)) { return Collections.emptyMap(); @@ -87,13 +87,13 @@ public abstract class BaseMetaServiceImpl extends Abstrac } @Override - public @NotNull List listBy(@NotNull Integer postId) { + public @NonNull List listBy(@NonNull Integer postId) { Assert.notNull(postId, "Post id must not be null"); return baseMetaRepository.findAllByPostId(postId); } @Override - public @NotNull META create(@NotNull META meta) { + public @NonNull META create(@NonNull META meta) { Assert.notNull(meta, "Domain must not be null"); // Check post id @@ -106,7 +106,7 @@ public abstract class BaseMetaServiceImpl extends Abstrac } @Override - public @NotNull META createBy(@NotNull BaseMetaParam metaParam) { + public @NonNull META createBy(@NonNull BaseMetaParam metaParam) { Assert.notNull(metaParam, "Meta param must not be null"); return create(metaParam.convertTo()); } @@ -118,14 +118,14 @@ public abstract class BaseMetaServiceImpl extends Abstrac @Override - public @NotNull BaseMetaDTO convertTo(@NotNull META postMeta) { + public @NonNull BaseMetaDTO convertTo(@NonNull META postMeta) { Assert.notNull(postMeta, "Category must not be null"); return new BaseMetaDTO().convertFrom(postMeta); } @Override - public @NotNull List convertTo(@NotNull List postMetaList) { + public @NonNull List convertTo(@NonNull List postMetaList) { if (CollectionUtils.isEmpty(postMetaList)) { return Collections.emptyList(); } diff --git a/src/main/java/run/halo/app/service/impl/LinkServiceImpl.java b/src/main/java/run/halo/app/service/impl/LinkServiceImpl.java index b5cd33908..4e8926a66 100644 --- a/src/main/java/run/halo/app/service/impl/LinkServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/LinkServiceImpl.java @@ -1,6 +1,5 @@ package run.halo.app.service.impl; -import org.jetbrains.annotations.NotNull; import org.springframework.data.domain.Example; import org.springframework.data.domain.Sort; import org.springframework.lang.NonNull; @@ -38,14 +37,14 @@ public class LinkServiceImpl extends AbstractCrudService implemen } @Override - public @NotNull List listDtos(@NotNull Sort sort) { + public @NonNull List listDtos(@NonNull Sort sort) { Assert.notNull(sort, "Sort info must not be null"); return convertTo(listAll(sort)); } @Override - public @NotNull List listTeamVos(@NotNull Sort sort) { + public @NonNull List listTeamVos(@NonNull Sort sort) { Assert.notNull(sort, "Sort info must not be null"); // List all links @@ -74,7 +73,7 @@ public class LinkServiceImpl extends AbstractCrudService implemen } @Override - public @NotNull List listTeamVosByRandom(@NotNull Sort sort) { + public @NonNull List listTeamVosByRandom(@NonNull Sort sort) { Assert.notNull(sort, "Sort info must not be null"); List links = listDtos(sort); Set teams = ServiceUtils.fetchProperty(links, LinkDTO::getTeam); @@ -91,7 +90,7 @@ public class LinkServiceImpl extends AbstractCrudService implemen } @Override - public @NotNull Link createBy(@NotNull LinkParam linkParam) { + public @NonNull Link createBy(@NonNull LinkParam linkParam) { Assert.notNull(linkParam, "Link param must not be null"); // Check the name @@ -112,7 +111,7 @@ public class LinkServiceImpl extends AbstractCrudService implemen } @Override - public @NotNull Link updateBy(Integer id, @NotNull LinkParam linkParam) { + public @NonNull Link updateBy(Integer id, @NonNull LinkParam linkParam) { Assert.notNull(id, "Id must not be null"); Assert.notNull(linkParam, "Link param must not be null"); @@ -158,7 +157,7 @@ public class LinkServiceImpl extends AbstractCrudService implemen } @Override - public @NotNull List listAllByRandom() { + public @NonNull List listAllByRandom() { List allLink = linkRepository.findAll(); Collections.shuffle(allLink); return allLink; diff --git a/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java b/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java index f91f2f84b..17f5af8ca 100644 --- a/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java @@ -1,6 +1,5 @@ package run.halo.app.service.impl; -import org.jetbrains.annotations.NotNull; import org.springframework.data.domain.Sort; import org.springframework.lang.NonNull; import org.springframework.stereotype.Service; @@ -37,14 +36,14 @@ public class MenuServiceImpl extends AbstractCrudService implemen } @Override - public @NotNull List listDtos(@NotNull Sort sort) { + public @NonNull List listDtos(@NonNull Sort sort) { Assert.notNull(sort, "Sort info must not be null"); return convertTo(listAll(sort)); } @Override - public @NotNull List listTeamVos(@NotNull Sort sort) { + public @NonNull List listTeamVos(@NonNull Sort sort) { Assert.notNull(sort, "Sort info must not be null"); // List all menus @@ -73,13 +72,13 @@ public class MenuServiceImpl extends AbstractCrudService implemen } @Override - public List listByTeam(@NotNull String team, Sort sort) { + public List listByTeam(@NonNull String team, Sort sort) { List menus = menuRepository.findByTeam(team, sort); return menus.stream().map(menu -> (MenuDTO) new MenuDTO().convertFrom(menu)).collect(Collectors.toList()); } @Override - public List listByTeamAsTree(@NotNull String team, Sort sort) { + public List listByTeamAsTree(@NonNull String team, Sort sort) { Assert.notNull(team, "Team must not be null"); List menus = menuRepository.findByTeam(team, sort); @@ -96,7 +95,7 @@ public class MenuServiceImpl extends AbstractCrudService implemen } @Override - public @NotNull Menu createBy(@NotNull MenuParam menuParam) { + public @NonNull Menu createBy(@NonNull MenuParam menuParam) { Assert.notNull(menuParam, "Menu param must not be null"); // Create an return @@ -104,7 +103,7 @@ public class MenuServiceImpl extends AbstractCrudService implemen } @Override - public List listAsTree(@NotNull Sort sort) { + public List listAsTree(@NonNull Sort sort) { Assert.notNull(sort, "Sort info must not be null"); // List all menu @@ -124,7 +123,7 @@ public class MenuServiceImpl extends AbstractCrudService implemen } @Override - public List listByParentId(@NotNull Integer id) { + public List listByParentId(@NonNull Integer id) { Assert.notNull(id, "Menu parent id must not be null"); return menuRepository.findByParentId(id); @@ -136,12 +135,12 @@ public class MenuServiceImpl extends AbstractCrudService implemen } @Override - public @NotNull Menu create(@NotNull Menu menu) { + public @NonNull Menu create(@NonNull Menu menu) { return super.create(menu); } @Override - public @NotNull Menu update(@NotNull Menu menu) { + public @NonNull Menu update(@NonNull Menu menu) { return super.update(menu); } diff --git a/src/main/java/run/halo/app/service/impl/PostMetaServiceImpl.java b/src/main/java/run/halo/app/service/impl/PostMetaServiceImpl.java index 0d7501614..249083359 100644 --- a/src/main/java/run/halo/app/service/impl/PostMetaServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/PostMetaServiceImpl.java @@ -1,7 +1,7 @@ package run.halo.app.service.impl; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; +import org.springframework.lang.NonNull; import org.springframework.stereotype.Service; import run.halo.app.exception.NotFoundException; import run.halo.app.model.entity.PostMeta; @@ -29,7 +29,7 @@ public class PostMetaServiceImpl extends BaseMetaServiceImpl implement } @Override - public void validateTarget(@NotNull Integer postId) { + public void validateTarget(@NonNull Integer postId) { postRepository.findById(postId) .orElseThrow(() -> new NotFoundException("查询不到该文章的信息").setErrorData(postId)); } diff --git a/src/main/java/run/halo/app/service/impl/SheetMetaServiceImpl.java b/src/main/java/run/halo/app/service/impl/SheetMetaServiceImpl.java index 9c70a6097..c87eda868 100644 --- a/src/main/java/run/halo/app/service/impl/SheetMetaServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/SheetMetaServiceImpl.java @@ -1,7 +1,7 @@ package run.halo.app.service.impl; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; +import org.springframework.lang.NonNull; import org.springframework.stereotype.Service; import run.halo.app.exception.NotFoundException; import run.halo.app.model.entity.SheetMeta; @@ -32,7 +32,7 @@ public class SheetMetaServiceImpl extends BaseMetaServiceImpl impleme } @Override - public void validateTarget(@NotNull Integer sheetId) { + public void validateTarget(@NonNull Integer sheetId) { sheetRepository.findById(sheetId) .orElseThrow(() -> new NotFoundException("查询不到该页面的信息").setErrorData(sheetId)); } diff --git a/src/main/java/run/halo/app/utils/Version.java b/src/main/java/run/halo/app/utils/Version.java index f5ee356af..062a858da 100644 --- a/src/main/java/run/halo/app/utils/Version.java +++ b/src/main/java/run/halo/app/utils/Version.java @@ -5,7 +5,6 @@ import lombok.Getter; import lombok.ToString; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; import run.halo.app.model.support.HaloConst; @@ -157,7 +156,7 @@ public class Version implements Comparable { } @Override - public int compareTo(@NotNull Version anotherVersion) { + public int compareTo(@NonNull Version anotherVersion) { // compare major int majorCompare = Long.compare(major, anotherVersion.major); if (majorCompare != 0) { diff --git a/src/test/java/run/halo/app/utils/GithubTest.java b/src/test/java/run/halo/app/utils/GithubTest.java deleted file mode 100644 index 14eb271b1..000000000 --- a/src/test/java/run/halo/app/utils/GithubTest.java +++ /dev/null @@ -1,94 +0,0 @@ -package run.halo.app.utils; - -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.http.ResponseEntity; -import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; -import org.springframework.web.client.RestTemplate; -import run.halo.app.exception.BadRequestException; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -/** - * Github api test. - * - * @author johnniang - * @date 19-5-21 - */ -@Slf4j -@Disabled("Due to time-consumption") -class GithubTest { - - final static String API_URL = "https://api.github.com/repos/halo-dev/halo-admin/releases/latest"; - final static String HALO_ADMIN_REGEX = "halo-admin-\\d+\\.\\d+(\\.\\d+)?(-\\S*)?\\.zip"; - final Path tempPath; - final RestTemplate restTemplate; - - GithubTest() throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException, IOException { - tempPath = Files.createTempDirectory("git-test"); - this.restTemplate = new RestTemplate(new HttpComponentsClientHttpRequestFactory(HttpClientUtils.createHttpsClient(5000))); - } - - @Test - @SuppressWarnings("unchecked") - void getLatestReleaseTest() throws Throwable { - ResponseEntity responseEntity = restTemplate.getForEntity(API_URL, Map.class); - log.debug("Response: " + responseEntity); - Object assetsObject = responseEntity.getBody().get("assets"); - log.debug("Assets class: " + assetsObject.getClass()); - log.debug("Assets: " + assetsObject); - if (assetsObject instanceof List) { - List assets = (List) assetsObject; - Map assetMap = (Map) assets.stream().filter(aAsset -> { - if (!(aAsset instanceof Map)) { - return false; - } - Map aAssetMap = (Map) aAsset; - Object name = aAssetMap.getOrDefault("name", ""); - return name.toString().matches(HALO_ADMIN_REGEX); - }) - .findFirst() - .orElseThrow(() -> new BadRequestException("Halo admin has no assets available")); - - Object name = assetMap.getOrDefault("name", ""); - Object browserDownloadUrl = assetMap.getOrDefault("browser_download_url", ""); - // Download the assets - ResponseEntity downloadResponseEntity = restTemplate.getForEntity(browserDownloadUrl.toString(), byte[].class); - log.debug("Download response entity status: " + downloadResponseEntity.getStatusCode()); - - Path downloadedPath = Files.write(tempPath.resolve(name.toString()), downloadResponseEntity.getBody()); - - log.debug("Downloaded path: " + downloadedPath.toString()); - } - } - - @Test - void nameMatchTEst() { - String name = "halo-admin-1.0.0-beta.1.zip"; - - assertTrue(name.matches(HALO_ADMIN_REGEX)); - - name = "halo-admin-1.0.zip"; - assertTrue(name.matches(HALO_ADMIN_REGEX)); - - name = "halo-admin-1.0.0.zip"; - assertTrue(name.matches(HALO_ADMIN_REGEX)); - - name = "halo-admin-v1.0.0-beta.zip"; - assertFalse(name.matches(HALO_ADMIN_REGEX)); - - name = "halo-admin.zip"; - assertFalse(name.matches(HALO_ADMIN_REGEX)); - } -}