Skip to content

Commit

Permalink
Miminize changes needed to comply with updated checkstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
@sergiitk
sergiitk committed Jul 20, 2023
1 parent 69e6a48 commit da0bcd5
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 106 deletions.
2 changes: 1 addition & 1 deletion api/src/test/java/io/grpc/MetadataTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ public void verifyToString_usingBinary() {
}

@Test
@SuppressWarnings("StringCaseLocaleUsage")
@SuppressWarnings("StringCaseLocaleUsage") // System locale is exactly what we're testing.
public void testKeyCaseHandling() {
Locale originalLocale = Locale.getDefault();
Locale.setDefault(new Locale("tr", "TR"));
Expand Down
17 changes: 8 additions & 9 deletions api/src/test/java/io/grpc/StatusRuntimeExceptionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,13 @@ public void extendPreservesStack() {
@Test
public void extendAndOverridePreservesStack() {
final StackTraceElement element = new StackTraceElement("a", "b", "c", 4);
StatusRuntimeException exception =
new StatusRuntimeException(Status.CANCELLED, new Metadata()) {
@Override
public synchronized Throwable fillInStackTrace() {
setStackTrace(new StackTraceElement[]{element});
return this;
}
};
assertThat(exception.getStackTrace()).asList().containsExactly(element);
StatusRuntimeException error = new StatusRuntimeException(Status.CANCELLED, new Metadata()) {
@Override
public synchronized Throwable fillInStackTrace() {
setStackTrace(new StackTraceElement[]{element});
return this;
}
};
assertThat(error.getStackTrace()).asList().containsExactly(element);
}
}
88 changes: 45 additions & 43 deletions xds/src/main/java/io/grpc/xds/ControlPlaneClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,59 +383,61 @@ public boolean isReady() {
void start() {
AggregatedDiscoveryServiceGrpc.AggregatedDiscoveryServiceStub stub =
AggregatedDiscoveryServiceGrpc.newStub(channel);
StreamObserver<DiscoveryResponse> responseReader =
new ClientResponseObserver<DiscoveryRequest,DiscoveryResponse>() {

@Override
public void beforeStart(ClientCallStreamObserver<DiscoveryRequest> requestStream) {
requestStream.setOnReadyHandler(ControlPlaneClient.this::readyHandler);
}
final class AdsClientResponseObserver
implements ClientResponseObserver<DiscoveryRequest, DiscoveryResponse> {

@Override
public void beforeStart(ClientCallStreamObserver<DiscoveryRequest> requestStream) {
requestStream.setOnReadyHandler(ControlPlaneClient.this::readyHandler);
}

@Override
public void onNext(final DiscoveryResponse response) {
syncContext.execute(new Runnable() {
@Override
public void onNext(final DiscoveryResponse response) {
syncContext.execute(new Runnable() {
@Override
public void run() {
XdsResourceType<?> type = fromTypeUrl(response.getTypeUrl());
if (logger.isLoggable(XdsLogLevel.DEBUG)) {
logger.log(
XdsLogLevel.DEBUG, "Received {0} response:\n{1}", type,
MessagePrinter.print(response));
}
if (type == null) {
logger.log(
XdsLogLevel.WARNING,
"Ignore an unknown type of DiscoveryResponse: {0}",
response.getTypeUrl());
return;
}
handleRpcResponse(type, response.getVersionInfo(), response.getResourcesList(),
response.getNonce());
}
});
public void run() {
XdsResourceType<?> type = fromTypeUrl(response.getTypeUrl());
if (logger.isLoggable(XdsLogLevel.DEBUG)) {
logger.log(
XdsLogLevel.DEBUG, "Received {0} response:\n{1}", type,
MessagePrinter.print(response));
}
if (type == null) {
logger.log(
XdsLogLevel.WARNING,
"Ignore an unknown type of DiscoveryResponse: {0}",
response.getTypeUrl());
return;
}
handleRpcResponse(type, response.getVersionInfo(), response.getResourcesList(),
response.getNonce());
}
});
}

@Override
public void onError(final Throwable t) {
syncContext.execute(new Runnable() {
@Override
public void onError(final Throwable t) {
syncContext.execute(new Runnable() {
@Override
public void run() {
handleRpcError(t);
}
});
public void run() {
handleRpcError(t);
}
});
}

@Override
public void onCompleted() {
syncContext.execute(new Runnable() {
@Override
public void onCompleted() {
syncContext.execute(new Runnable() {
@Override
public void run() {
handleRpcCompleted();
}
});
public void run() {
handleRpcCompleted();
}
};
requestWriter = stub.streamAggregatedResources(responseReader);
});
}
}

requestWriter = stub.streamAggregatedResources(new AdsClientResponseObserver());
}

@Override
Expand Down
106 changes: 53 additions & 53 deletions xds/src/test/java/io/grpc/xds/XdsTestControlPlaneService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,63 +122,63 @@ public void run() {
@Override
public StreamObserver<DiscoveryRequest> streamAggregatedResources(
final StreamObserver<DiscoveryResponse> responseObserver) {
final StreamObserver<DiscoveryRequest> requestObserver =
new StreamObserver<DiscoveryRequest>() {
@Override
public void onNext(final DiscoveryRequest value) {
syncContext.execute(new Runnable() {
@Override
public void run() {
logger.log(Level.FINEST, "control plane received request {0}", value);
if (value.hasErrorDetail()) {
logger.log(Level.FINE, "control plane received nack resource {0}, error {1}",
new Object[]{value.getResourceNamesList(), value.getErrorDetail()});
return;
}
String resourceType = value.getTypeUrl();
if (!value.getResponseNonce().isEmpty()
&& !String.valueOf(xdsNonces.get(resourceType))
.equals(value.getResponseNonce())) {
logger.log(Level.FINE, "Resource nonce does not match, ignore.");
return;
}
Set<String> requestedResourceNames = new HashSet<>(value.getResourceNamesList());
if (subscribers.get(resourceType).containsKey(responseObserver)
&& subscribers.get(resourceType).get(responseObserver)
.equals(requestedResourceNames)) {
logger.log(Level.FINEST, "control plane received ack for resource: {0}",
value.getResourceNamesList());
return;
}
if (!xdsNonces.get(resourceType).containsKey(responseObserver)) {
xdsNonces.get(resourceType).put(responseObserver, new AtomicInteger(0));
}
DiscoveryResponse response = generateResponse(resourceType,
String.valueOf(xdsVersions.get(resourceType)),
String.valueOf(xdsNonces.get(resourceType).get(responseObserver)),
requestedResourceNames);
responseObserver.onNext(response);
subscribers.get(resourceType).put(responseObserver, requestedResourceNames);
}
});
}

@Override
public void onError(Throwable t) {
logger.log(Level.FINE, "Control plane error: {0} ", t);
onCompleted();
}

final class AdsStreamObserver implements StreamObserver<DiscoveryRequest> {
@Override
public void onNext(final DiscoveryRequest value) {
syncContext.execute(new Runnable() {
@Override
public void onCompleted() {
responseObserver.onCompleted();
for (String type : subscribers.keySet()) {
subscribers.get(type).remove(responseObserver);
xdsNonces.get(type).remove(responseObserver);
public void run() {
logger.log(Level.FINEST, "control plane received request {0}", value);
if (value.hasErrorDetail()) {
logger.log(Level.FINE, "control plane received nack resource {0}, error {1}",
new Object[]{value.getResourceNamesList(), value.getErrorDetail()});
return;
}
String resourceType = value.getTypeUrl();
if (!value.getResponseNonce().isEmpty()
&& !String.valueOf(xdsNonces.get(resourceType)).equals(value.getResponseNonce())) {
logger.log(Level.FINE, "Resource nonce does not match, ignore.");
return;
}
Set<String> requestedResourceNames = new HashSet<>(value.getResourceNamesList());
if (subscribers.get(resourceType).containsKey(responseObserver)
&& subscribers.get(resourceType).get(responseObserver)
.equals(requestedResourceNames)) {
logger.log(Level.FINEST, "control plane received ack for resource: {0}",
value.getResourceNamesList());
return;
}
if (!xdsNonces.get(resourceType).containsKey(responseObserver)) {
xdsNonces.get(resourceType).put(responseObserver, new AtomicInteger(0));
}
DiscoveryResponse response = generateResponse(resourceType,
String.valueOf(xdsVersions.get(resourceType)),
String.valueOf(xdsNonces.get(resourceType).get(responseObserver)),
requestedResourceNames);
responseObserver.onNext(response);
subscribers.get(resourceType).put(responseObserver, requestedResourceNames);
}
};
return requestObserver;
});
}

@Override
public void onError(Throwable t) {
logger.log(Level.FINE, "Control plane error: {0} ", t);
onCompleted();
}

@Override
public void onCompleted() {
responseObserver.onCompleted();
for (String type : subscribers.keySet()) {
subscribers.get(type).remove(responseObserver);
xdsNonces.get(type).remove(responseObserver);
}
}
}

return new AdsStreamObserver();
}

//must run in syncContext
Expand Down

0 comments on commit da0bcd5

Please sign in to comment.