From c258a3995602df3b97990a8933eee2f167beb4df Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 22 Nov 2023 23:04:00 +0800 Subject: [PATCH] style: StringConsts => StringConstants --- .../redisson/autoconfigure/RedissonAutoConfiguration.java | 4 ++-- .../continew/starter/cache/redisson/util/RedisUtils.java | 4 ++-- .../core/autoconfigure/cors/CorsAutoConfiguration.java | 6 +++--- .../constant/{StringConsts.java => StringConstants.java} | 2 +- .../continew/starter/core/util/ExceptionUtils.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/{StringConsts.java => StringConstants.java} (96%) diff --git a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java index 41849e10..895bdead 100644 --- a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java +++ b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import top.charles7c.continew.starter.core.constant.StringConsts; +import top.charles7c.continew.starter.core.constant.StringConstants; import java.util.List; @@ -107,7 +107,7 @@ public class RedissonAutoConfiguration { singleServerConfig.setPassword(redisProperties.getPassword()); } if (StrUtil.isBlank(singleServerConfig.getAddress())) { - singleServerConfig.setAddress(protocol + redisProperties.getHost() + StringConsts.COLON + redisProperties.getPort()); + singleServerConfig.setAddress(protocol + redisProperties.getHost() + StringConstants.COLON + redisProperties.getPort()); } } } diff --git a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/util/RedisUtils.java b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/util/RedisUtils.java index 50475c96..aa9c3b22 100644 --- a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/util/RedisUtils.java +++ b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/util/RedisUtils.java @@ -22,7 +22,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.redisson.api.*; import org.redisson.config.Config; -import top.charles7c.continew.starter.core.constant.StringConsts; +import top.charles7c.continew.starter.core.constant.StringConstants; import java.time.Duration; import java.util.Collection; @@ -150,7 +150,7 @@ public class RedisUtils { * @return 键 */ public static String formatKey(String... subKeys) { - return String.join(StringConsts.COLON, subKeys); + return String.join(StringConstants.COLON, subKeys); } /** diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/cors/CorsAutoConfiguration.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/cors/CorsAutoConfiguration.java index b5f6dce5..2d581af5 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/cors/CorsAutoConfiguration.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/cors/CorsAutoConfiguration.java @@ -27,7 +27,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; -import top.charles7c.continew.starter.core.constant.StringConsts; +import top.charles7c.continew.starter.core.constant.StringConstants; /** * 跨域自动配置 @@ -53,8 +53,8 @@ public class CorsAutoConfiguration { // 设置跨域允许时间 config.setMaxAge(1800L); // 配置允许跨域的域名 - if (properties.getAllowedOrigins().contains(StringConsts.ASTERISK)) { - config.addAllowedOriginPattern(StringConsts.ASTERISK); + if (properties.getAllowedOrigins().contains(StringConstants.ASTERISK)) { + config.addAllowedOriginPattern(StringConstants.ASTERISK); } else { // 配置为 true 后则必须配置允许跨域的域名，且不允许配置为 * config.setAllowCredentials(true); diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/StringConsts.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/StringConstants.java similarity index 96% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/StringConsts.java rename to continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/StringConstants.java index 87240027..ca67757a 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/StringConsts.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/StringConstants.java @@ -27,7 +27,7 @@ import lombok.NoArgsConstructor; * @since 1.0.0 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) -public class StringConsts implements StrPool { +public class StringConstants implements StrPool { /** * 空字符串 diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ExceptionUtils.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ExceptionUtils.java index da06d061..922c71fb 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ExceptionUtils.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ExceptionUtils.java @@ -19,7 +19,7 @@ package top.charles7c.continew.starter.core.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import top.charles7c.continew.starter.core.constant.StringConsts; +import top.charles7c.continew.starter.core.constant.StringConstants; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; @@ -99,7 +99,7 @@ public class ExceptionUtils { * @return / */ public static String exToBlank(ExSupplier exSupplier) { - return exToDefault(exSupplier, StringConsts.EMPTY); + return exToDefault(exSupplier, StringConstants.EMPTY); } /**