Skip to content

Commit 80acca8

Browse files
committed
Add configprops to test module
1 parent becf4a3 commit 80acca8

File tree

5 files changed

+16
-3
lines changed

5 files changed

+16
-3
lines changed

spring-grpc-docs/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
<artifactId>spring-grpc-spring-boot-starter</artifactId>
2929
<version>${project.version}</version>
3030
</dependency>
31+
<dependency>
32+
<groupId>org.springframework.grpc</groupId>
33+
<artifactId>spring-grpc-test</artifactId>
34+
<version>${project.version}</version>
35+
</dependency>
3136
<dependency>
3237
<groupId>com.fasterxml.jackson.core</groupId>
3338
<artifactId>jackson-databind</artifactId>

spring-grpc-docs/src/main/antora/modules/ROOT/partials/_configprops.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
|spring.grpc.client.default-channel.max-inbound-metadata-size | `+++8192B+++` | Maximum metadata size allowed to be received by the channel (default 8KiB). Set to '-1' to use the highest possible limit (not recommended).
1717
|spring.grpc.client.default-channel.negotiation-type | `+++plaintext+++` | The negotiation type for the channel.
1818
|spring.grpc.client.default-channel.secure | `+++true+++` | Flag to say that strict SSL checks are not enabled (so the remote certificate could be anonymous).
19-
|spring.grpc.client.default-channel.service-config | | Map representation of the service config to use for the channel
19+
|spring.grpc.client.default-channel.service-config | | Map representation of the service config to use for the channel.
2020
|spring.grpc.client.default-channel.ssl.bundle | | SSL bundle name.
2121
|spring.grpc.client.default-channel.ssl.enabled | | Whether to enable SSL support. Enabled automatically if "bundle" is provided unless specified otherwise.
2222
|spring.grpc.client.default-channel.user-agent | | The custom User-Agent for the channel.
23+
|spring.grpc.client.default-stub-factory | | Default stub factory to use for all channels.
2324
|spring.grpc.client.enabled | `+++true+++` | Whether to enable client autoconfiguration.
2425
|spring.grpc.client.inprocess.enabled | `+++true+++` | Whether to configure the in-process channel factory.
2526
|spring.grpc.client.inprocess.exclusive | `+++true+++` | Whether the inprocess channel factory should be the only channel factory available. When the value is true, no other channel factory will be configured.
@@ -55,5 +56,6 @@
5556
|spring.grpc.server.ssl.client-auth | `+++none+++` | Client authentication mode.
5657
|spring.grpc.server.ssl.enabled | | Whether to enable SSL support. Enabled automatically if "bundle" is provided unless specified otherwise.
5758
|spring.grpc.server.ssl.secure | `+++true+++` | Flag to indicate that client authentication is secure (i.e. certificates are checked). Do not set this to false in production.
59+
|spring.grpc.test.inprocess.enabled | `+++false+++` | Whether to enable the in-process server and client for testing.
5860

5961
|===

spring-grpc-docs/src/main/java/org/springframework/grpc/internal/ConfigurationPropertiesAsciidocGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ protected boolean resourceNameContainsPattern(Resource resource) {
121121

122122
protected Resource[] getResources() throws IOException {
123123
return new PathMatchingResourcePatternResolver()
124-
.getResources("classpath*:/META-INF/spring-configuration-metadata.json");
124+
.getResources("classpath*:/META-INF/*spring-configuration-metadata.json");
125125
}
126126

127127
}

spring-grpc-test/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
</properties>
2626

2727
<dependencies>
28+
<dependency>
29+
<groupId>org.springframework.boot</groupId>
30+
<artifactId>spring-boot-configuration-processor</artifactId>
31+
<version>${spring-boot.version}</version>
32+
<optional>true</optional>
33+
</dependency>
2834
<dependency>
2935
<groupId>org.springframework.grpc</groupId>
3036
<artifactId>spring-grpc-core</artifactId>

spring-grpc-test/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"name": "spring.grpc.test.inprocess.enabled",
66
"type": "java.lang.Boolean",
7-
"description": "Whether to enable the in-process server and client for testing.",
7+
"description": "Whether to enable the in-process server and client for testing. Consider using @AutoConfigInProcessTransport instead.",
88
"defaultValue": false
99
}
1010
]

0 commit comments

Comments
 (0)