Skip to content

Commit 5186ba4

Browse files
committed
java check fix
1 parent 5602598 commit 5186ba4

File tree

5 files changed

+26
-19
lines changed

5 files changed

+26
-19
lines changed

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/autoconfigure/GrpcMetaDataZookeeperConfiguration.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,23 @@
1717

1818
package net.devh.boot.grpc.server.autoconfigure;
1919

20-
import net.devh.boot.grpc.common.util.GrpcUtils;
21-
import net.devh.boot.grpc.server.config.GrpcServerProperties;
20+
import javax.annotation.PostConstruct;
21+
2222
import org.springframework.beans.factory.annotation.Autowired;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2424
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2525
import org.springframework.cloud.zookeeper.serviceregistry.ZookeeperRegistration;
2626
import org.springframework.context.annotation.Configuration;
2727

28-
import javax.annotation.PostConstruct;
28+
import net.devh.boot.grpc.common.util.GrpcUtils;
29+
import net.devh.boot.grpc.server.config.GrpcServerProperties;
2930

3031
/**
3132
* Configuration class that configures the required beans for grpc discovery via Zookeeper.
3233
*
3334
* @author zhaochunlin ([email protected])
3435
*/
35-
@Configuration
36+
@Configuration(proxyBeanMethods = false)
3637
@EnableConfigurationProperties
3738
@ConditionalOnClass({ZookeeperRegistration.class})
3839
public class GrpcMetaDataZookeeperConfiguration {
@@ -49,7 +50,8 @@ public void init() {
4950
final String port = String.valueOf(grpcServerProperties.getPort());
5051
zookeeperRegistration.setPort(0);
5152
if (!GrpcUtils.INTER_PROCESS_DISABLE.equals(port)) {
52-
zookeeperRegistration.getServiceInstance().getPayload().getMetadata().put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT, port);
53+
zookeeperRegistration.getServiceInstance().getPayload().getMetadata()
54+
.put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT, port);
5355
}
5456
}
5557
}

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/autoconfigure/GrpcMetadataConsulConfiguration.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,20 @@
1717

1818
package net.devh.boot.grpc.server.autoconfigure;
1919

20-
import net.devh.boot.grpc.common.util.GrpcUtils;
21-
import net.devh.boot.grpc.server.config.GrpcServerProperties;
20+
import java.util.ArrayList;
21+
import java.util.List;
22+
import java.util.Objects;
23+
24+
import javax.annotation.PostConstruct;
25+
2226
import org.springframework.beans.factory.annotation.Autowired;
2327
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2428
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2529
import org.springframework.cloud.consul.serviceregistry.ConsulRegistration;
2630
import org.springframework.context.annotation.Configuration;
2731

28-
import javax.annotation.PostConstruct;
29-
import java.util.ArrayList;
30-
import java.util.List;
31-
import java.util.Objects;
32+
import net.devh.boot.grpc.common.util.GrpcUtils;
33+
import net.devh.boot.grpc.server.config.GrpcServerProperties;
3234

3335
/**
3436
* Configuration class that configures the required beans for gRPC discovery via Consul.

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/autoconfigure/GrpcMetadataEurekaConfiguration.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@
1717

1818
package net.devh.boot.grpc.server.autoconfigure;
1919

20-
import net.devh.boot.grpc.common.util.GrpcUtils;
21-
import net.devh.boot.grpc.server.config.GrpcServerProperties;
20+
import javax.annotation.PostConstruct;
21+
2222
import org.springframework.beans.factory.annotation.Autowired;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2424
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2525
import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration;
2626
import org.springframework.context.annotation.Configuration;
2727

28-
import javax.annotation.PostConstruct;
28+
import net.devh.boot.grpc.common.util.GrpcUtils;
29+
import net.devh.boot.grpc.server.config.GrpcServerProperties;
2930

3031
/**
3132
* Configuration class that configures the required beans for grpc discovery via Eureka.

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/autoconfigure/GrpcMetadataNacosConfiguration.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@
1717

1818
package net.devh.boot.grpc.server.autoconfigure;
1919

20-
import com.alibaba.cloud.nacos.registry.NacosRegistration;
21-
import net.devh.boot.grpc.common.util.GrpcUtils;
22-
import net.devh.boot.grpc.server.config.GrpcServerProperties;
20+
import javax.annotation.PostConstruct;
21+
2322
import org.springframework.beans.factory.annotation.Autowired;
2423
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2524
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2625
import org.springframework.context.annotation.Configuration;
2726

28-
import javax.annotation.PostConstruct;
27+
import com.alibaba.cloud.nacos.registry.NacosRegistration;
28+
29+
import net.devh.boot.grpc.common.util.GrpcUtils;
30+
import net.devh.boot.grpc.server.config.GrpcServerProperties;
2931

3032
/**
3133
* Configuration class that configures the required beans for grpc discovery via Nacos.

grpc-server-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
33
net.devh.boot.grpc.server.autoconfigure.GrpcMetadataConsulConfiguration,\
44
net.devh.boot.grpc.server.autoconfigure.GrpcMetadataEurekaConfiguration,\
55
net.devh.boot.grpc.server.autoconfigure.GrpcMetadataNacosConfiguration,\
6-
net.devh.boot.grpc.server.autoconfigure.GrpcMetadataZookeeperConfiguration,\
6+
net.devh.boot.grpc.server.autoconfigure.GrpcMetaDataZookeeperConfiguration,\
77
net.devh.boot.grpc.server.autoconfigure.GrpcServerAutoConfiguration,\
88
net.devh.boot.grpc.server.autoconfigure.GrpcServerFactoryAutoConfiguration,\
99
net.devh.boot.grpc.server.autoconfigure.GrpcServerSecurityAutoConfiguration,\

0 commit comments

Comments
 (0)