From dab11a2c7974a985d3c4daf21496b01dd7d9c7b5 Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Thu, 12 Sep 2019 15:23:30 +0800 Subject: [PATCH] code format --- .../DubboMetadataAutoConfiguration.java | 11 +++++------ .../MetadataServiceInstanceSelector.java | 17 ++++++++--------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java index 6b71ce40..086e4f6e 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java @@ -19,7 +19,6 @@ import java.util.Collection; import java.util.Optional; import java.util.function.Supplier; -import com.alibaba.cloud.dubbo.metadata.repository.MetadataServiceInstanceSelector; import org.apache.dubbo.config.ProtocolConfig; import org.apache.dubbo.config.spring.ServiceBean; import org.apache.dubbo.config.spring.context.event.ServiceBeanExportedEvent; @@ -32,9 +31,11 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.event.ContextClosedEvent; import org.springframework.context.event.EventListener; +import org.springframework.util.CollectionUtils; import com.alibaba.cloud.dubbo.metadata.DubboProtocolConfigSupplier; import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository; +import com.alibaba.cloud.dubbo.metadata.repository.MetadataServiceInstanceSelector; import com.alibaba.cloud.dubbo.metadata.resolver.DubboServiceBeanMetadataResolver; import com.alibaba.cloud.dubbo.metadata.resolver.MetadataResolver; import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory; @@ -44,7 +45,6 @@ import com.alibaba.cloud.dubbo.service.IntrospectiveDubboMetadataService; import com.alibaba.cloud.dubbo.util.JSONUtils; import feign.Contract; -import org.springframework.util.CollectionUtils; /** * Spring Boot Auto-Configuration class for Dubbo Metadata @@ -74,10 +74,9 @@ public class DubboMetadataAutoConfiguration { @Bean @ConditionalOnMissingBean public MetadataServiceInstanceSelector metadataServiceInstanceSelector() { - return serviceInstances -> - CollectionUtils.isEmpty(serviceInstances) - ? Optional.empty() - : serviceInstances.stream().findAny(); + return serviceInstances -> CollectionUtils.isEmpty(serviceInstances) + ? Optional.empty() + : serviceInstances.stream().findAny(); } @Bean diff --git a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/MetadataServiceInstanceSelector.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/MetadataServiceInstanceSelector.java index 3bf1f4e8..f42ba4f9 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/MetadataServiceInstanceSelector.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/MetadataServiceInstanceSelector.java @@ -16,11 +16,11 @@ package com.alibaba.cloud.dubbo.metadata.repository; -import org.springframework.cloud.client.ServiceInstance; - import java.util.List; import java.util.Optional; +import org.springframework.cloud.client.ServiceInstance; + /** * metadata service instance selector * @@ -28,11 +28,10 @@ import java.util.Optional; */ public interface MetadataServiceInstanceSelector { - - /** - * choose a service instance to get metadata - * @param serviceInstances all service instance - * @return the service instance to get metadata - */ - Optional choose(List serviceInstances); + /** + * choose a service instance to get metadata + * @param serviceInstances all service instance + * @return the service instance to get metadata + */ + Optional choose(List serviceInstances); }