Skip to content

Commit 113a421

Browse files
committed
fix 代码格式问题
1 parent 535a825 commit 113a421

File tree

6 files changed

+18
-23
lines changed

6 files changed

+18
-23
lines changed

grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/util/GrpcUtils.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ public final class GrpcUtils {
3131
*/
3232
public static final String CLOUD_DISCOVERY_METADATA_PORT = "gRPC.port";
3333

34-
35-
public static final String INTER_PROCESS_DISABLE = "-1";
34+
/**
35+
* The constant for the grpc server port, -1 represents don't start an inter process server.
36+
*/
37+
public static final int INTER_PROCESS_DISABLE = -1;
3638

3739
/**
3840
* Extracts the service name from the given method.

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import java.util.ArrayList;
2121
import java.util.List;
22-
import java.util.Objects;
2322

2423
import javax.annotation.PostConstruct;
2524

@@ -52,10 +51,10 @@ public class GrpcMetadataConsulConfiguration {
5251
@PostConstruct
5352
public void init() {
5453
if (consulRegistration != null) {
55-
final String port = String.valueOf(grpcProperties.getPort());
54+
final int port = grpcProperties.getPort();
5655
List<String> tags = consulRegistration.getService().getTags();
5756
tags = tags==null ? new ArrayList<>() : tags;
58-
if (!GrpcUtils.INTER_PROCESS_DISABLE.equals(port)) {
57+
if (GrpcUtils.INTER_PROCESS_DISABLE != port) {
5958
tags.add(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT + "=" + port);
6059
consulRegistration.getService().setTags(tags);
6160
}

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

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

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

20-
import java.util.Objects;
21-
2220
import javax.annotation.PostConstruct;
2321

2422
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,10 +48,10 @@ public class GrpcMetadataEurekaConfiguration {
5048
@PostConstruct
5149
public void init() {
5250
if (eurekaRegistration != null) {
53-
final String port = String.valueOf(grpcProperties.getPort());
54-
if (!GrpcUtils.INTER_PROCESS_DISABLE.equals(port)) {
51+
final int port = grpcProperties.getPort();
52+
if (GrpcUtils.INTER_PROCESS_DISABLE != port) {
5553
eurekaRegistration.getInstanceConfig().getMetadataMap().put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT,
56-
port);
54+
Integer.toString(port));
5755
}
5856
}
5957
}

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

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

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

20-
import java.util.Objects;
21-
2220
import javax.annotation.PostConstruct;
2321

2422
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,9 +48,9 @@ public class GrpcMetadataNacosConfiguration {
5048
@PostConstruct
5149
public void init() {
5250
if (nacosRegistration != null) {
53-
final String port = String.valueOf(grpcProperties.getPort());
54-
if (!GrpcUtils.INTER_PROCESS_DISABLE.equals(port)) {
55-
nacosRegistration.getMetadata().put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT, port);
51+
final int port = grpcProperties.getPort();
52+
if (GrpcUtils.INTER_PROCESS_DISABLE != port) {
53+
nacosRegistration.getMetadata().put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT, Integer.toString(port));
5654
}
5755
}
5856

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

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

20-
import java.util.Objects;
21-
2220
import javax.annotation.PostConstruct;
2321

2422
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,10 +36,10 @@
3836
@Configuration(proxyBeanMethods = false)
3937
@EnableConfigurationProperties
4038
@ConditionalOnClass({ZookeeperRegistration.class})
41-
public class GrpcMetaDataZookeeperConfiguration {
39+
public class GrpcMetadataZookeeperConfiguration {
4240

4341
@Autowired(required = false)
44-
ZookeeperRegistration zookeeperRegistration;
42+
private ZookeeperRegistration zookeeperRegistration;
4543

4644
@Autowired
4745
private GrpcServerProperties grpcServerProperties;
@@ -50,11 +48,11 @@ public class GrpcMetaDataZookeeperConfiguration {
5048
@PostConstruct
5149
public void init() {
5250
if (zookeeperRegistration != null) {
53-
final String port = String.valueOf(grpcServerProperties.getPort());
51+
final int port = grpcServerProperties.getPort();
5452
zookeeperRegistration.setPort(0);
55-
if (!GrpcUtils.INTER_PROCESS_DISABLE.equals(port)) {
53+
if (GrpcUtils.INTER_PROCESS_DISABLE != port) {
5654
zookeeperRegistration.getServiceInstance().getPayload().getMetadata()
57-
.put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT, port);
55+
.put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT, Integer.toString(port));
5856
}
5957
}
6058
}

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)