From 1106fc43671cee083af81983f3de787806104a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92Sakura=E9=85=B1?= Date: Tue, 22 Jan 2019 19:30:42 +0800 Subject: [PATCH] :beers: Writing code drunkenly.spell error: fegin->feign --- ...nConfiguration.java => PigxFeignConfiguration.java} | 4 ++-- ...ginErrorDecoder.java => PigxFeignErrorDecoder.java} | 10 +++++----- ...PigxFeginException.java => PigxFeignException.java} | 6 +++--- ...lbackFactory.java => PigxFeignFallbackFactory.java} | 4 ++-- .../common/security/feign/PigxFeignFallbackMethod.java | 4 ++-- .../security/feign/PigxHystrixInvocationHandler.java | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/{PigxFeginConfiguration.java => PigxFeignConfiguration.java} (96%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/{PigxFeginErrorDecoder.java => PigxFeignErrorDecoder.java} (93%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/{PigxFeginException.java => PigxFeignException.java} (91%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/{PigxFeginFallbackFactory.java => PigxFeignFallbackFactory.java} (92%) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeginConfiguration.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignConfiguration.java similarity index 96% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeginConfiguration.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignConfiguration.java index 6e90c8464..38b3208bb 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeginConfiguration.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResour */ @Configuration @ConditionalOnClass(Feign.class) -public class PigxFeginConfiguration { +public class PigxFeignConfiguration { @Bean @ConditionalOnProperty("security.oauth2.client.client-id") @@ -61,7 +61,7 @@ public class PigxFeginConfiguration { public Feign.Builder feignHystrixBuilder(FeignContext feignContext) { return PigxHystrixFeign.builder(feignContext) .decode404() - .errorDecoder(new PigxFeginErrorDecoder()); + .errorDecoder(new PigxFeignErrorDecoder()); } } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeginErrorDecoder.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignErrorDecoder.java similarity index 93% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeginErrorDecoder.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignErrorDecoder.java index 6ce2c2ec4..8a2311a22 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeginErrorDecoder.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignErrorDecoder.java @@ -48,30 +48,30 @@ import static java.util.concurrent.TimeUnit.SECONDS; * * @author L.cm */ -public class PigxFeginErrorDecoder extends ErrorDecoder.Default { +public class PigxFeignErrorDecoder extends ErrorDecoder.Default { private final RetryAfterDecoder retryAfterDecoder = new RetryAfterDecoder(); private static final String REGEX = "^[0-9]+$"; @Override public Exception decode(String methodKey, Response response) { - PigxFeginException exception = errorStatus(methodKey, response); + PigxFeignException exception = errorStatus(methodKey, response); Date retryAfter = retryAfterDecoder.apply(firstOrNull(response.headers())); return new RetryableException(exception.getMessage(), exception, retryAfter); } - private static PigxFeginException errorStatus(String methodKey, Response response) { + private static PigxFeignException errorStatus(String methodKey, Response response) { try { if (response.body() != null) { Reader reader = response.body().asReader(); - return new PigxFeginException(R.builder() + return new PigxFeignException(R.builder() .msg(IoUtil.read(reader)) .code(CommonConstants.FAIL).build()); } } catch (IOException ignored) { // NOPMD } String message = format("status %s reading %s", response.status(), methodKey); - return new PigxFeginException(message); + return new PigxFeignException(message); } @Nullable diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeginException.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignException.java similarity index 91% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeginException.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignException.java index e036fe800..352d023c1 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeginException.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignException.java @@ -29,16 +29,16 @@ import lombok.Getter; * * @author L.cm */ -public class PigxFeginException extends RuntimeException { +public class PigxFeignException extends RuntimeException { @Getter private final R result; - public PigxFeginException(R result) { + public PigxFeignException(R result) { super(result.getMsg()); this.result = result; } - public PigxFeginException(String message) { + public PigxFeignException(String message) { super(message); this.result = R.builder() .code(CommonConstants.FAIL) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeginFallbackFactory.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignFallbackFactory.java similarity index 92% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeginFallbackFactory.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignFallbackFactory.java index 97777a01b..a769341b4 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeginFallbackFactory.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignFallbackFactory.java @@ -36,8 +36,8 @@ import java.util.concurrent.ConcurrentMap; */ @Slf4j @NoArgsConstructor -public final class PigxFeginFallbackFactory implements FallbackFactory { - public static final PigxFeginFallbackFactory INSTANCE = new PigxFeginFallbackFactory(); +public final class PigxFeignFallbackFactory implements FallbackFactory { + public static final PigxFeignFallbackFactory INSTANCE = new PigxFeignFallbackFactory(); private static final ConcurrentMap, Object> FALLBACK_MAP = new ConcurrentHashMap<>(); @SuppressWarnings("unchecked") diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignFallbackMethod.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignFallbackMethod.java index 3e6542b58..342c3bcf8 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignFallbackMethod.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignFallbackMethod.java @@ -27,8 +27,8 @@ public class PigxFeignFallbackMethod implements MethodInterceptor { type.getName(), method.getName(), cause.getMessage()); if (R.class == method.getReturnType()) { - final R result = cause instanceof PigxFeginException ? - ((PigxFeginException) cause).getResult() : R.builder() + final R result = cause instanceof PigxFeignException ? + ((PigxFeignException) cause).getResult() : R.builder() .code(CommonConstants.FAIL) .msg(cause.getMessage()).build(); return result; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxHystrixInvocationHandler.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxHystrixInvocationHandler.java index eb1896090..17ed399ac 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxHystrixInvocationHandler.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxHystrixInvocationHandler.java @@ -137,7 +137,7 @@ public final class PigxHystrixInvocationHandler implements InvocationHandler { Object fallback; try { if (fallbackFactory == null) { - fallback = PigxFeginFallbackFactory.INSTANCE.create(target.type(), getExecutionException()); + fallback = PigxFeignFallbackFactory.INSTANCE.create(target.type(), getExecutionException()); } else { fallback = fallbackFactory.create(getExecutionException()); } diff --git a/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories index 19d984da1..9dcf2138b 100644 --- a/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories +++ b/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.pig4cloud.pigx.common.security.feign.PigxFeginConfiguration,\ + com.pig4cloud.pigx.common.security.feign.PigxFeignConfiguration,\ com.pig4cloud.pigx.common.security.service.PigxUserDetailsServiceImpl