Skip to content

Commit bf253a7

Browse files
committed
Polishing "Update to Spring Boot 3.4.5"
Updates another location in test that was referencing the previous version of Spring Boot.
1 parent f820eab commit bf253a7

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

samples/grpc-client/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ You can also build and run the application as a native image using GraalVM, in t
2525
```
2626
$ ./mvnw -Pnative native:compile
2727
$ ./target/grpc-client-sample
28-
...
28+
...

samples/grpc-oauth2/src/test/java/org/springframework/grpc/sample/GrpcServerApplicationTests.java

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
package org.springframework.grpc.sample;
22

3-
import static org.junit.Assert.assertThrows;
4-
import static org.junit.jupiter.api.Assertions.assertEquals;
3+
import io.grpc.Status.Code;
4+
import io.grpc.StatusRuntimeException;
5+
import io.grpc.reflection.v1.ServerReflectionGrpc;
6+
import io.grpc.reflection.v1.ServerReflectionRequest;
7+
import io.grpc.reflection.v1.ServerReflectionResponse;
8+
import io.grpc.stub.StreamObserver;
59

610
import java.util.List;
711
import java.util.concurrent.atomic.AtomicBoolean;
812
import java.util.concurrent.atomic.AtomicReference;
9-
1013
import org.awaitility.Awaitility;
1114
import org.junit.jupiter.api.Test;
1215
import org.springframework.beans.factory.ObjectProvider;
@@ -21,8 +24,8 @@
2124
import org.springframework.experimental.boot.test.context.EnableDynamicProperty;
2225
import org.springframework.experimental.boot.test.context.OAuth2ClientProviderIssuerUri;
2326
import org.springframework.grpc.client.ChannelBuilderOptions;
24-
import org.springframework.grpc.client.ImportGrpcClients;
2527
import org.springframework.grpc.client.GrpcClientFactoryCustomizer;
28+
import org.springframework.grpc.client.ImportGrpcClients;
2629
import org.springframework.grpc.client.interceptor.security.BearerTokenAuthenticationInterceptor;
2730
import org.springframework.grpc.sample.proto.HelloReply;
2831
import org.springframework.grpc.sample.proto.HelloRequest;
@@ -33,12 +36,8 @@
3336
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
3437
import org.springframework.test.annotation.DirtiesContext;
3538

36-
import io.grpc.Status.Code;
37-
import io.grpc.StatusRuntimeException;
38-
import io.grpc.reflection.v1.ServerReflectionGrpc;
39-
import io.grpc.reflection.v1.ServerReflectionRequest;
40-
import io.grpc.reflection.v1.ServerReflectionResponse;
41-
import io.grpc.stub.StreamObserver;
39+
import static org.junit.Assert.assertThrows;
40+
import static org.junit.jupiter.api.Assertions.assertEquals;
4241

4342
@SpringBootTest(properties = { "spring.grpc.server.port=0",
4443
"spring.grpc.client.default-channel.address=static://0.0.0.0:${local.grpc.port}" })
@@ -126,7 +125,7 @@ static CommonsExecWebServerFactoryBean authServer() {
126125
return CommonsExecWebServerFactoryBean.builder()
127126
.useGenericSpringBootMain()
128127
.classpath(classpath -> classpath.entries(new MavenClasspathEntry(
129-
"org.springframework.boot:spring-boot-starter-oauth2-authorization-server:3.4.4")));
128+
"org.springframework.boot:spring-boot-starter-oauth2-authorization-server:3.4.5")));
130129
}
131130

132131
@Bean

samples/grpc-server-netty-shaded/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ $ ./target/demo
6060
2022-12-08T05:36:54.396-08:00 INFO 554359 --- [ main] com.example.demo.DemoApplication : Started DemoApplication in 0.046 seconds (process running for 0.052)
6161
```
6262

63-
The patches needed to make it work in native were a reflection hint (upstream change: https://github.com/oracle/graalvm-reachability-metadata/pull/148) and some autoconfig metadata (upstream change: https://github.com/yidongnan/grpc-spring-boot-starter/pull/775).
63+
The patches needed to make it work in native were a reflection hint (upstream change: https://github.com/oracle/graalvm-reachability-metadata/pull/148) and some autoconfig metadata (upstream change: https://github.com/yidongnan/grpc-spring-boot-starter/pull/775).

samples/grpc-server/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ $ grpcurl -d '{"name":"Hi"}' -plaintext localhost:9090 Simple.SayHello
3737
## Native Image
3838
[Native Image with Gradle](./HELP-gradle.md)
3939

40-
[Native Image with Maven](./HELP-maven.md)
40+
[Native Image with Maven](./HELP-maven.md)

0 commit comments

Comments
 (0)