Skip to content

Commit 27b6d91

Browse files
committed
增加非空判断
1 parent 5186ba4 commit 27b6d91

File tree

4 files changed

+33
-17
lines changed

4 files changed

+33
-17
lines changed

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

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

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

20+
import java.util.Objects;
21+
2022
import javax.annotation.PostConstruct;
2123

2224
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,11 +49,13 @@ public class GrpcMetaDataZookeeperConfiguration {
4749

4850
@PostConstruct
4951
public void init() {
50-
final String port = String.valueOf(grpcServerProperties.getPort());
51-
zookeeperRegistration.setPort(0);
52-
if (!GrpcUtils.INTER_PROCESS_DISABLE.equals(port)) {
53-
zookeeperRegistration.getServiceInstance().getPayload().getMetadata()
54-
.put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT, port);
52+
if (!Objects.isNull(zookeeperRegistration)) {
53+
final String port = String.valueOf(grpcServerProperties.getPort());
54+
zookeeperRegistration.setPort(0);
55+
if (!GrpcUtils.INTER_PROCESS_DISABLE.equals(port)) {
56+
zookeeperRegistration.getServiceInstance().getPayload().getMetadata()
57+
.put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT, port);
58+
}
5559
}
5660
}
5761
}

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
@@ -51,12 +51,14 @@ public class GrpcMetadataConsulConfiguration {
5151

5252
@PostConstruct
5353
public void init() {
54-
final String port = String.valueOf(grpcProperties.getPort());
55-
List<String> tags = consulRegistration.getService().getTags();
56-
tags = Objects.isNull(tags) ? new ArrayList<>() : tags;
57-
if (!GrpcUtils.INTER_PROCESS_DISABLE.equals(port)) {
58-
tags.add(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT + "=" + port);
59-
consulRegistration.getService().setTags(tags);
54+
if (!Objects.isNull(consulRegistration)) {
55+
final String port = String.valueOf(grpcProperties.getPort());
56+
List<String> tags = consulRegistration.getService().getTags();
57+
tags = Objects.isNull(tags) ? new ArrayList<>() : tags;
58+
if (!GrpcUtils.INTER_PROCESS_DISABLE.equals(port)) {
59+
tags.add(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT + "=" + port);
60+
consulRegistration.getService().setTags(tags);
61+
}
6062
}
6163
}
6264
}

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

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

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

20+
import java.util.Objects;
21+
2022
import javax.annotation.PostConstruct;
2123

2224
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,9 +49,12 @@ public class GrpcMetadataEurekaConfiguration {
4749

4850
@PostConstruct
4951
public void init() {
50-
final String port = String.valueOf(grpcProperties.getPort());
51-
if (!GrpcUtils.INTER_PROCESS_DISABLE.equals(port)) {
52-
eurekaRegistration.getInstanceConfig().getMetadataMap().put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT, port);
52+
if (!Objects.isNull(eurekaRegistration)) {
53+
final String port = String.valueOf(grpcProperties.getPort());
54+
if (!GrpcUtils.INTER_PROCESS_DISABLE.equals(port)) {
55+
eurekaRegistration.getInstanceConfig().getMetadataMap().put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT,
56+
port);
57+
}
5358
}
5459
}
5560

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

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

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

20+
import java.util.Objects;
21+
2022
import javax.annotation.PostConstruct;
2123

2224
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,10 +49,13 @@ public class GrpcMetadataNacosConfiguration {
4749

4850
@PostConstruct
4951
public void init() {
50-
final String port = String.valueOf(grpcProperties.getPort());
51-
if (!GrpcUtils.INTER_PROCESS_DISABLE.equals(port)) {
52-
nacosRegistration.getMetadata().put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT, port);
52+
if (!Objects.isNull(nacosRegistration)) {
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);
56+
}
5357
}
58+
5459
}
5560

5661
}

0 commit comments

Comments
 (0)