Fix the code style issues

2021-06-26 13:25:11 +08:00 · 2020-09-03 10:06:57 +08:00
parent a61f523d78
commit 5cd6c0f1e7
35 changed files with 263 additions and 267 deletions
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/pom.xml
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

    <parent>
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java
@@ -31,7 +31,6 @@ import com.alibaba.cloud.dubbo.service.IntrospectiveDubboMetadataService;
 import com.alibaba.cloud.dubbo.util.DubboMetadataUtils;
 import com.alibaba.cloud.dubbo.util.JSONUtils;
 import feign.Contract;
-
 import org.apache.dubbo.config.ProtocolConfig;
 import org.apache.dubbo.config.spring.ServiceBean;
 import org.apache.dubbo.config.spring.context.event.ServiceBeanExportedEvent;
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java
@@ -98,11 +98,12 @@ import static org.springframework.util.StringUtils.hasText;
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(name = "org.springframework.cloud.client.discovery.DiscoveryClient")
@ConditionalOnProperty(name = "spring.cloud.discovery.enabled", matchIfMissing = true)
-@AutoConfigureAfter(name = { EUREKA_CLIENT_AUTO_CONFIGURATION_CLASS_NAME,
-		ZOOKEEPER_DISCOVERY_AUTO_CONFIGURATION_CLASS_NAME,
-		CONSUL_DISCOVERY_AUTO_CONFIGURATION_CLASS_NAME,
-		NACOS_DISCOVERY_AUTO_CONFIGURATION_CLASS_NAME }, value = {
-				DubboServiceRegistrationAutoConfiguration.class })
+@AutoConfigureAfter(
+		name = { EUREKA_CLIENT_AUTO_CONFIGURATION_CLASS_NAME,
+				ZOOKEEPER_DISCOVERY_AUTO_CONFIGURATION_CLASS_NAME,
+				CONSUL_DISCOVERY_AUTO_CONFIGURATION_CLASS_NAME,
+				NACOS_DISCOVERY_AUTO_CONFIGURATION_CLASS_NAME },
+		value = { DubboServiceRegistrationAutoConfiguration.class })
 public class DubboServiceDiscoveryAutoConfiguration {

 	/**
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboCloudProperties.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboCloudProperties.java
@@ -90,4 +90,5 @@ public class DubboCloudProperties {
 	public void setRegistryType(String registryType) {
 		this.registryType = registryType;
 	}
+
 }
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java
@@ -40,9 +40,7 @@ import com.alibaba.cloud.dubbo.util.DubboMetadataUtils;
 import com.alibaba.cloud.dubbo.util.JSONUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-
 import org.apache.dubbo.common.URL;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/RandomServiceInstanceSelector.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/RandomServiceInstanceSelector.java
@@ -1,12 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Copyright 2013-2018 the original author or authors.
 *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.cloud.dubbo.metadata.repository;

 import java.util.List;
@@ -26,7 +26,7 @@ import static java.util.Optional.of;
 import static org.springframework.util.CollectionUtils.isEmpty;

 /**
- * Random {@link ServiceInstanceSelector}
+ * Random {@link ServiceInstanceSelector}.
 *
 * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
 */
@@ -40,4 +40,5 @@ public class RandomServiceInstanceSelector implements ServiceInstanceSelector {
 		ThreadLocalRandom random = ThreadLocalRandom.current();
 		return of(serviceInstances.get(random.nextInt(serviceInstances.size())));
 	}
+
 }
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/DubboCloudRegistry.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/DubboCloudRegistry.java
@@ -1,12 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Copyright 2013-2018 the original author or authors.
 *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.cloud.dubbo.registry;

 import java.util.Collection;
@@ -33,13 +33,10 @@ import com.alibaba.cloud.dubbo.service.DubboMetadataService;
 import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
 import com.alibaba.cloud.dubbo.util.DubboMetadataUtils;
 import com.alibaba.cloud.dubbo.util.JSONUtils;
-
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.URLBuilder;
-import org.apache.dubbo.metadata.MetadataService;
 import org.apache.dubbo.registry.NotifyListener;
 import org.apache.dubbo.registry.support.FailbackRegistry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -69,7 +66,8 @@ import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataU
 import static org.springframework.util.StringUtils.hasText;

 /**
- * Dubbo Cloud {@link FailbackRegistry} is based on Spring Cloud {@link DiscoveryClient}
+ * Dubbo Cloud {@link FailbackRegistry} is based on Spring Cloud {@link DiscoveryClient}.
+ *
 * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
 */
 public class DubboCloudRegistry extends FailbackRegistry {
@@ -273,7 +271,7 @@ public class DubboCloudRegistry extends FailbackRegistry {
 	}

 	/**
-	 * Clone the subscribed URLs based on the template URLs
+	 * Clone the subscribed URLs based on the template URLs.
 	 * @param subscribedURL the URL to be subscribed
 	 * @param serviceInstances the list of {@link ServiceInstance service instances}
 	 * @return non-null
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistryFactory.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistryFactory.java
@@ -21,7 +21,6 @@ import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepositor
 import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
 import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
 import com.alibaba.cloud.dubbo.util.JSONUtils;
-
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.registry.Registry;
 import org.apache.dubbo.registry.RegistryFactory;
@@ -31,7 +30,6 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.context.ConfigurableApplicationContext;

 import static com.alibaba.cloud.dubbo.util.DubboCloudConstants.SPRING_CLOUD_REGISTRY_PROPERTY_VALUE;
-import static java.lang.System.getProperty;

 /**
 * Dubbo {@link RegistryFactory} uses Spring Cloud Service Registration abstraction, whose
@@ -53,12 +51,6 @@ public class SpringCloudRegistryFactory extends AbstractRegistryFactory {
 	 */
 	public static String ADDRESS = "localhost";

-	public static String MODE = "dubbo.cloud.";
-
-	private static String SERVICES_LOOKUP_SCHEDULER_THREAD_NAME_PREFIX = getProperty(
-			"dubbo.services.lookup.scheduler.thread.name.prefix ",
-			"dubbo-services-lookup-");
-
 	private static ConfigurableApplicationContext applicationContext;

 	private DiscoveryClient discoveryClient;
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceFactory.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceFactory.java
@@ -30,13 +30,11 @@ import javax.annotation.PreDestroy;

 import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata;
 import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
-
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.utils.CollectionUtils;
 import org.apache.dubbo.config.RegistryConfig;
 import org.apache.dubbo.config.spring.ReferenceBean;
 import org.apache.dubbo.rpc.service.GenericService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java
@@ -24,9 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
 import com.alibaba.cloud.dubbo.metadata.repository.ServiceInstanceSelector;
 import com.alibaba.cloud.dubbo.util.DubboMetadataUtils;
-
 import org.apache.dubbo.common.URL;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -82,7 +80,7 @@ public class DubboMetadataServiceProxy implements BeanClassLoaderAware, Disposab
 	}

 	/**
-	 * Get the proxy of {@link DubboMetadataService} if possible
+	 * Get the proxy of {@link DubboMetadataService} if possible.
 	 * @param serviceInstances the instances of {@link DubboMetadataService}
 	 * @return <code>null</code> if initialization can't be done
 	 */
@@ -114,7 +112,7 @@ public class DubboMetadataServiceProxy implements BeanClassLoaderAware, Disposab
 	}

 	/**
-	 * Is the {@link DubboMetadataService}'s Proxy initialized or not
+	 * Is the {@link DubboMetadataService}'s Proxy initialized or not.
 	 * @param serviceName the service name
 	 * @return <code>true</code> if initialized , or return <code>false</code>
 	 */
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/util/DubboCloudConstants.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/util/DubboCloudConstants.java
@@ -23,28 +23,29 @@ package com.alibaba.cloud.dubbo.util;
 */
 public final class DubboCloudConstants {

-	private DubboCloudConstants() {
-		throw new AssertionError("Must not instantiate constant utility class");
-	}
-
 	/**
 	 * The property prefix of Configuration.
 	 */
 	public static final String CONFIG_PROPERTY_PREFIX = "dubbo.cloud";

 	/**
-	 * The property name of Registry type
+	 * The property name of Registry type.
 	 */
-	String REGISTRY_TYPE_PROPERTY_NAME = CONFIG_PROPERTY_PREFIX + ".registry-type";
+	public static final String REGISTRY_TYPE_PROPERTY_NAME = CONFIG_PROPERTY_PREFIX
+			+ ".registry-type";

 	/**
-	 * The property value of Spring Cloud Registry
+	 * The property value of Spring Cloud Registry.
 	 */
-	String SPRING_CLOUD_REGISTRY_PROPERTY_VALUE = "spring-cloud";
+	public static final String SPRING_CLOUD_REGISTRY_PROPERTY_VALUE = "spring-cloud";

 	/**
-	 * The property value of Dubbo Cloud Registry
+	 * The property value of Dubbo Cloud Registry.
 	 */
-	String DUBBO_CLOUD_REGISTRY_PROPERTY_VALUE = "dubbo-cloud";
+	public static final String DUBBO_CLOUD_REGISTRY_PROPERTY_VALUE = "dubbo-cloud";
+
+	private DubboCloudConstants() {
+		throw new AssertionError("Must not instantiate constant utility class");
+	}

 }
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/util/DubboMetadataUtils.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/util/DubboMetadataUtils.java
@@ -1,12 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Copyright 2013-2018 the original author or authors.
 *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package com.alibaba.cloud.dubbo.util;

 import java.util.List;
@@ -22,7 +22,6 @@ import java.util.Objects;
 import java.util.stream.Collectors;

 import com.alibaba.cloud.dubbo.service.DubboMetadataService;
-
 import org.apache.dubbo.common.URL;

 import org.springframework.cloud.client.ServiceInstance;
@@ -34,8 +33,8 @@ import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataU
 import static org.springframework.util.StringUtils.hasText;

 /**
- * The utilities class of Dubbo Metadata
- * 
+ * The utilities class of Dubbo Metadata.
+ *
 * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
 */
 public class DubboMetadataUtils {
@@ -59,7 +58,7 @@ public class DubboMetadataUtils {
 	}

 	/**
-	 * Get the current application name
+	 * Get the current application name.
 	 * @return non-null
 	 */
 	public String getCurrentApplicationName() {
@@ -115,4 +114,5 @@ public class DubboMetadataUtils {
 		String protocolPort = metadata.get(protocolProperty);
 		return hasText(protocolPort) ? Integer.valueOf(protocolPort) : null;
 	}
+
 }
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/resources/META-INF/dubbo/default/actuator-endpoints.properties
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/resources/META-INF/dubbo/default/actuator-endpoints.properties
@@ -1,7 +1,6 @@
 # Dubbo Endpoints Default Properties is loaded by @PropertySource with low order,
 # Set enabled for Dubbo Endpoints
-management.endpoint.dubborestmetadata.enabled = true
-
+management.endpoint.dubborestmetadata.enabled=true
 # "management.endpoints.web.base-path" should not be configured in this file
 # Re-defines path-mapping of Dubbo Web Endpoints
-management.endpoints.web.path-mapping.dubborestmetadata = dubbo/rest/metadata
+management.endpoints.web.path-mapping.dubborestmetadata=dubbo/rest/metadata
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/resources/META-INF/spring.factories
@@ -6,12 +6,9 @@ com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationNonWebApplicationA
 com.alibaba.cloud.dubbo.autoconfigure.DubboLoadBalancedRestTemplateAutoConfiguration,\
 com.alibaba.cloud.dubbo.autoconfigure.DubboServiceAutoConfiguration,\
 com.alibaba.cloud.dubbo.autoconfigure.DubboServiceDiscoveryAutoConfiguration
-
 org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration=\
 com.alibaba.cloud.dubbo.actuate.DubboMetadataEndpointAutoConfiguration
-
 org.springframework.context.ApplicationContextInitializer=\
 com.alibaba.cloud.dubbo.context.DubboServiceRegistrationApplicationContextInitializer
-
 org.springframework.boot.env.EnvironmentPostProcessor=\
 com.alibaba.cloud.dubbo.env.DubboNonWebApplicationEnvironmentPostProcessor