Skip to content

Commit 8dc63f5

Browse files
committed
Fix style errors.
1 parent 7032f17 commit 8dc63f5

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

xds/src/main/java/io/grpc/xds/ExternalProcessorFilter.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,8 @@ private boolean validateCompressionSupport(BodyResponse bodyResponse) {
977977
.withDescription("gRPC message compression not supported in ext_proc")
978978
.asRuntimeException();
979979
synchronized (streamLock) {
980-
if (!extProcStreamState.get().isCompleted() && extProcClientCallRequestObserver != null) {
980+
if (!extProcStreamState.get().isCompleted()
981+
&& extProcClientCallRequestObserver != null) {
981982
extProcClientCallRequestObserver.onError(ex);
982983
}
983984
}
@@ -1091,14 +1092,17 @@ public void onNext(ProcessingResponse response) {
10911092
} else if (response.hasRequestBody()) {
10921093
if (expected == EventType.REQUEST_HEADERS) {
10931094
internalOnError(Status.UNAVAILABLE
1094-
.withDescription("Protocol error: received request_body before request_headers response.")
1095+
.withDescription(
1096+
"Protocol error: received request_body before request_headers response.")
10951097
.asRuntimeException());
10961098
return;
10971099
}
10981100
} else if (response.hasResponseBody()) {
1099-
if (expected == EventType.REQUEST_HEADERS || expected == EventType.RESPONSE_HEADERS) {
1101+
if (expected == EventType.REQUEST_HEADERS
1102+
|| expected == EventType.RESPONSE_HEADERS) {
11001103
internalOnError(Status.UNAVAILABLE
1101-
.withDescription("Protocol error: received response_body before headers response.")
1104+
.withDescription(
1105+
"Protocol error: received response_body before headers response.")
11021106
.asRuntimeException());
11031107
return;
11041108
}

xds/src/test/java/io/grpc/xds/ExternalProcessorFilterTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2395,7 +2395,7 @@ public void onCompleted() {
23952395

23962396
@Test
23972397
@SuppressWarnings("unchecked")
2398-
public void givenDeferredHalfClose_whenExtProcRespondsWithEndOfStreamWithoutMessage_thenSuperHalfCloseCalled()
2398+
public void deferredHalfClose_whenExtProcRespondsWithEosWithoutMessage_thenSuperHalfCloseCalled()
23992399
throws Exception {
24002400
String uniqueExtProcServerName = InProcessServerBuilder.generateName();
24012401
String uniqueDataPlaneServerName = InProcessServerBuilder.generateName();
@@ -2717,7 +2717,7 @@ public void halfClose() {
27172717

27182718
@Test
27192719
@SuppressWarnings("unchecked")
2720-
public void givenExtProcRespondsWithEndOfStreamWithoutMessage_whenAppHasNotHalfClosed_thenSuperHalfCloseCalled()
2720+
public void extProcRespondsWithEosWithoutMessage_whenAppNotHalfClosed_thenSuperHalfCloseCalled()
27212721
throws Exception {
27222722
String uniqueExtProcServerName = InProcessServerBuilder.generateName();
27232723
String uniqueDataPlaneServerName = InProcessServerBuilder.generateName();
@@ -3640,7 +3640,8 @@ public void givenObservabilityTrue_whenExtProcBusy_thenIsReadyReturnsFalse()
36403640
assertThat(configOrError.errorDetail).isNull();
36413641
ExternalProcessorFilterConfig filterConfig = configOrError.config;
36423642

3643-
final List<ProcessingRequest> extProcRequests = new java.util.concurrent.CopyOnWriteArrayList<>();
3643+
final List<ProcessingRequest> extProcRequests =
3644+
new java.util.concurrent.CopyOnWriteArrayList<>();
36443645
// External Processor Server
36453646
ExternalProcessorGrpc.ExternalProcessorImplBase extProcImpl;
36463647
extProcImpl = new ExternalProcessorGrpc.ExternalProcessorImplBase() {
@@ -6168,7 +6169,8 @@ public void givenObservabilityModeFalse_whenExtProcBusy_thenIsReadyReturnsFalse(
61686169
assertThat(configOrError.errorDetail).isNull();
61696170
ExternalProcessorFilterConfig filterConfig = configOrError.config;
61706171

6171-
final List<ProcessingRequest> extProcRequests = new java.util.concurrent.CopyOnWriteArrayList<>();
6172+
final List<ProcessingRequest> extProcRequests =
6173+
new java.util.concurrent.CopyOnWriteArrayList<>();
61726174
// Sidecar server
61736175
final CountDownLatch sidecarActionLatch = new CountDownLatch(1);
61746176
ExternalProcessorGrpc.ExternalProcessorImplBase extProcImpl;

0 commit comments

Comments
 (0)