From dbbba889c056366d2de6c48013948f6511ccdb26 Mon Sep 17 00:00:00 2001 From: lengleng Date: Sun, 3 Jan 2021 10:48:18 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20Improving=20structure=20/=20format=20of?= =?UTF-8?q?=20the=20code.=20=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/cache/DefaultRedisCacheWriter.java | 1 + .../annotation/EnablePigxFeignClients.java | 9 +--- .../GrayLoadBalancerClientConfiguration.java | 3 +- .../GrayReactiveLoadBalancerClientFilter.java | 9 ++-- .../GrayLoadBalancerClientConfiguration.java | 3 +- ...dBalancerClientConfigurationRegistrar.java | 4 +- .../gray/rule/GrayRoundRobinLoadBalancer.java | 46 +++++++++---------- .../daemon/quartz/util/TaskInvokUtil.java | 1 - 8 files changed, 35 insertions(+), 41 deletions(-) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java index b6ba9ec75..500fc86f1 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java @@ -290,4 +290,5 @@ class DefaultRedisCacheWriter implements RedisCacheWriter { public CacheStatistics getCacheStatistics(String s) { return null; } + } diff --git a/pigx-common/pigx-common-feign/src/main/java/com/pig4cloud/pigx/common/feign/annotation/EnablePigxFeignClients.java b/pigx-common/pigx-common-feign/src/main/java/com/pig4cloud/pigx/common/feign/annotation/EnablePigxFeignClients.java index c7f0e9418..819bf9d5d 100644 --- a/pigx-common/pigx-common-feign/src/main/java/com/pig4cloud/pigx/common/feign/annotation/EnablePigxFeignClients.java +++ b/pigx-common/pigx-common-feign/src/main/java/com/pig4cloud/pigx/common/feign/annotation/EnablePigxFeignClients.java @@ -33,15 +33,13 @@ import java.lang.annotation.*; @Documented @EnableFeignClients @Import(PigxFeignClientsRegistrar.class) -@EnableAutoConfiguration(excludeName = - "org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration") +@EnableAutoConfiguration(excludeName = "org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration") public @interface EnablePigxFeignClients { /** * Alias for the {@link #basePackages()} attribute. Allows for more concise annotation * declarations e.g.: {@code @ComponentScan("org.my.pkg")} instead of * {@code @ComponentScan(basePackages="org.my.pkg")}. - * * @return the array of 'basePackages'. */ String[] value() default {}; @@ -53,10 +51,9 @@ public @interface EnablePigxFeignClients { *

* Use {@link #basePackageClasses()} for a type-safe alternative to String-based * package names. - * * @return the array of 'basePackages'. */ - String[] basePackages() default {"com.pig4cloud.pigx"}; + String[] basePackages() default { "com.pig4cloud.pigx" }; /** * Type-safe alternative to {@link #basePackages()} for specifying the packages to @@ -64,7 +61,6 @@ public @interface EnablePigxFeignClients { *

* Consider creating a special no-op marker class or interface in each package that * serves no purpose other than being referenced by this attribute. - * * @return the array of 'basePackageClasses'. */ Class[] basePackageClasses() default {}; @@ -81,7 +77,6 @@ public @interface EnablePigxFeignClients { /** * List of classes annotated with @FeignClient. If not empty, disables classpath * scanning. - * * @return */ Class[] clients() default {}; diff --git a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GrayLoadBalancerClientConfiguration.java b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GrayLoadBalancerClientConfiguration.java index bd2ddb7e4..c97fdeb53 100755 --- a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GrayLoadBalancerClientConfiguration.java +++ b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GrayLoadBalancerClientConfiguration.java @@ -47,8 +47,7 @@ public class GrayLoadBalancerClientConfiguration { @Bean public ReactiveLoadBalancerClientFilter gatewayLoadBalancerClientFilter(GrayLoadBalancer grayLoadBalancer, - LoadBalancerProperties properties, - GatewayLoadBalancerProperties loadBalancerProperties) { + LoadBalancerProperties properties, GatewayLoadBalancerProperties loadBalancerProperties) { return new GrayReactiveLoadBalancerClientFilter(loadBalancerProperties, properties, grayLoadBalancer); } diff --git a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/filter/GrayReactiveLoadBalancerClientFilter.java b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/filter/GrayReactiveLoadBalancerClientFilter.java index 137809481..791dd6eb5 100644 --- a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/filter/GrayReactiveLoadBalancerClientFilter.java +++ b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/filter/GrayReactiveLoadBalancerClientFilter.java @@ -50,9 +50,8 @@ public class GrayReactiveLoadBalancerClientFilter extends ReactiveLoadBalancerCl private GrayLoadBalancer grayLoadBalancer; - - public GrayReactiveLoadBalancerClientFilter(GatewayLoadBalancerProperties loadBalancerProperties - , LoadBalancerProperties properties, GrayLoadBalancer grayLoadBalancer) { + public GrayReactiveLoadBalancerClientFilter(GatewayLoadBalancerProperties loadBalancerProperties, + LoadBalancerProperties properties, GrayLoadBalancer grayLoadBalancer) { super(null, loadBalancerProperties, properties); this.properties = properties; this.grayLoadBalancer = grayLoadBalancer; @@ -81,8 +80,8 @@ public class GrayReactiveLoadBalancerClientFilter extends ReactiveLoadBalancerCl return choose(exchange).doOnNext(response -> { if (!response.hasServer()) { - throw NotFoundException.create(loadBalancerProperties.isUse404() - , "Unable to find instance for " + url.getHost()); + throw NotFoundException.create(loadBalancerProperties.isUse404(), + "Unable to find instance for " + url.getHost()); } URI uri = exchange.getRequest().getURI(); diff --git a/pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayLoadBalancerClientConfiguration.java b/pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayLoadBalancerClientConfiguration.java index 3b82cd1d7..ad8cd85e8 100644 --- a/pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayLoadBalancerClientConfiguration.java +++ b/pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayLoadBalancerClientConfiguration.java @@ -18,9 +18,10 @@ public class GrayLoadBalancerClientConfiguration extends LoadBalancerClientConfi @Bean @ConditionalOnMissingBean public ReactorLoadBalancer reactorServiceInstanceLoadBalancer(Environment environment, - LoadBalancerClientFactory loadBalancerClientFactory) { + LoadBalancerClientFactory loadBalancerClientFactory) { String name = environment.getProperty(LoadBalancerClientFactory.PROPERTY_NAME); return new GrayRoundRobinLoadBalancer( loadBalancerClientFactory.getLazyProvider(name, ServiceInstanceListSupplier.class), name); } + } diff --git a/pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayLoadBalancerClientConfigurationRegistrar.java b/pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayLoadBalancerClientConfigurationRegistrar.java index 84f32ef7c..0fe2f94f3 100755 --- a/pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayLoadBalancerClientConfigurationRegistrar.java +++ b/pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayLoadBalancerClientConfigurationRegistrar.java @@ -16,9 +16,8 @@ import java.lang.reflect.Field; */ public class GrayLoadBalancerClientConfigurationRegistrar implements ImportBeanDefinitionRegistrar { - private static void registerClientConfiguration(BeanDefinitionRegistry registry, Object name, - Object configuration) { + Object configuration) { BeanDefinitionBuilder builder = BeanDefinitionBuilder .genericBeanDefinition(LoadBalancerClientSpecification.class); builder.addConstructorArgValue(name); @@ -36,4 +35,5 @@ public class GrayLoadBalancerClientConfigurationRegistrar implements ImportBeanD registerClientConfiguration(registry, fieldValue, GrayLoadBalancerClientConfiguration.class); } } + } diff --git a/pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayRoundRobinLoadBalancer.java b/pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayRoundRobinLoadBalancer.java index bca85b256..082e51829 100755 --- a/pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayRoundRobinLoadBalancer.java +++ b/pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayRoundRobinLoadBalancer.java @@ -25,31 +25,31 @@ import java.util.Map; @Slf4j public class GrayRoundRobinLoadBalancer extends RoundRobinLoadBalancer { - private ObjectProvider serviceInstanceListSupplierProvider; + private ObjectProvider serviceInstanceListSupplierProvider; - private String serviceId; + private String serviceId; - /** - * @param serviceInstanceListSupplierProvider a provider of - * {@link ServiceInstanceListSupplier} that will be used to get available instances - * @param serviceId id of the service for which to choose an instance - */ - public GrayRoundRobinLoadBalancer(ObjectProvider serviceInstanceListSupplierProvider, String serviceId) { - super(serviceInstanceListSupplierProvider, serviceId); - this.serviceInstanceListSupplierProvider = serviceInstanceListSupplierProvider; - this.serviceId = serviceId; - } + /** + * @param serviceInstanceListSupplierProvider a provider of + * {@link ServiceInstanceListSupplier} that will be used to get available instances + * @param serviceId id of the service for which to choose an instance + */ + public GrayRoundRobinLoadBalancer(ObjectProvider serviceInstanceListSupplierProvider, + String serviceId) { + super(serviceInstanceListSupplierProvider, serviceId); + this.serviceInstanceListSupplierProvider = serviceInstanceListSupplierProvider; + this.serviceId = serviceId; + } + @Override + public Mono> choose(Request request) { + ServiceInstanceListSupplier supplier = serviceInstanceListSupplierProvider + .getIfAvailable(NoopServiceInstanceListSupplier::new); + return supplier.get(request).next().map(serviceInstances -> getInstanceResponse(serviceInstances, request)); - @Override - public Mono> choose(Request request) { - ServiceInstanceListSupplier supplier = serviceInstanceListSupplierProvider - .getIfAvailable(NoopServiceInstanceListSupplier::new); - return supplier.get(request).next().map(serviceInstances -> getInstanceResponse(serviceInstances, request)); + } - } - - Response getInstanceResponse(List instances, Request request) { + Response getInstanceResponse(List instances, Request request) { // 注册中心无可用实例 抛出异常 if (CollUtil.isEmpty(instances)) { @@ -77,8 +77,8 @@ public class GrayRoundRobinLoadBalancer extends RoundRobinLoadBalancer { } } - // 降级策略，使用轮询策略 - return super.choose(request).block(); - } + // 降级策略，使用轮询策略 + return super.choose(request).block(); + } } diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskInvokUtil.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskInvokUtil.java index 1655b09c3..d1fe1b7bd 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskInvokUtil.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/TaskInvokUtil.java @@ -81,7 +81,6 @@ public class TaskInvokUtil { ITaskInvok iTaskInvok = TaskInvokFactory.getInvoker(sysJob.getJobType()); // 确保租户上下文有值，使得当前线程中的多租户特性生效。 TenantBroker.runAs(sysJob.getTenantId(), tenantId -> iTaskInvok.invokMethod(sysJob)); - ; // 记录成功状态 sysJobLog.setJobMessage(PigxQuartzEnum.JOB_LOG_STATUS_SUCCESS.getDescription());