Skip to content

Commit 66de0c5

Browse files
authored
chore: rename logger fields to LOGGER (a2aproject#1131)
Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com>
1 parent dbc2ad0 commit 66de0c5

26 files changed

Lines changed: 152 additions & 152 deletions

File tree

‎client/transport/grpc/src/main/java/org/a2aproject/sdk/client/transport/grpc/EventStreamObserver.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
public class EventStreamObserver implements StreamObserver<StreamResponse> {
1414

15-
private static final Logger log = Logger.getLogger(EventStreamObserver.class.getName());
15+
private static final Logger LOGGER = Logger.getLogger(EventStreamObserver.class.getName());
1616
private final Consumer<StreamingEventKind> eventHandler;
1717
private final Consumer<Throwable> errorHandler;
1818

@@ -38,7 +38,7 @@ public void onNext(StreamResponse response) {
3838
event = FromProto.taskArtifactUpdateEvent(response.getArtifactUpdate());
3939
break;
4040
default:
41-
log.warning("Invalid stream response " + response.getPayloadCase());
41+
LOGGER.warning("Invalid stream response " + response.getPayloadCase());
4242
errorHandler.accept(new IllegalStateException("Invalid stream response from server: " + response.getPayloadCase()));
4343
return;
4444
}

‎client/transport/jsonrpc/src/main/java/org/a2aproject/sdk/client/transport/jsonrpc/sse/SSEEventListener.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
public class SSEEventListener extends AbstractSSEEventListener {
2222

23-
private static final Logger log = Logger.getLogger(SSEEventListener.class.getName());
23+
private static final Logger LOGGER = Logger.getLogger(SSEEventListener.class.getName());
2424
private volatile boolean completed = false;
2525

2626
public SSEEventListener(Consumer<StreamingEventKind> eventHandler,
@@ -36,18 +36,18 @@ public void onMessage(ServerSentEvent event, @Nullable Future<Void> completableF
3636
public void onComplete() {
3737
// Idempotent: only signal completion once, even if called multiple times
3838
if (completed) {
39-
log.fine("SSEEventListener.onComplete() called again - ignoring (already completed)");
39+
LOGGER.fine("SSEEventListener.onComplete() called again - ignoring (already completed)");
4040
return;
4141
}
4242
completed = true;
4343

4444
// Signal normal stream completion (null error means successful completion)
45-
log.fine("SSEEventListener.onComplete() called - signaling successful stream completion");
45+
LOGGER.fine("SSEEventListener.onComplete() called - signaling successful stream completion");
4646
if (getErrorHandler() != null) {
47-
log.fine("Calling errorHandler.accept(null) to signal successful completion");
47+
LOGGER.fine("Calling errorHandler.accept(null) to signal successful completion");
4848
getErrorHandler().accept(null);
4949
} else {
50-
log.warning("errorHandler is null, cannot signal completion");
50+
LOGGER.warning("errorHandler is null, cannot signal completion");
5151
}
5252
}
5353

‎client/transport/rest/src/main/java/org/a2aproject/sdk/client/transport/rest/RestTransport.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666
public class RestTransport implements ClientTransport {
6767

68-
private static final Logger log = Logger.getLogger(RestTransport.class.getName());
68+
private static final Logger LOGGER = Logger.getLogger(RestTransport.class.getName());
6969
private final A2AHttpClient httpClient;
7070
private final AgentInterface agentInterface;
7171
private @Nullable final List<ClientCallInterceptor> interceptors;
@@ -432,14 +432,14 @@ private PayloadAndHeaders applyInterceptors(String methodName, @Nullable Message
432432
private String sendPostRequest(String url, PayloadAndHeaders payloadAndHeaders) throws IOException, InterruptedException, JsonProcessingException {
433433
MessageOrBuilder payload = (MessageOrBuilder) payloadAndHeaders.getPayload();
434434
String body = payload != null ? ProtoJsonUtils.toJson(JsonFormat.printer(), payload) : "";
435-
if (log.isLoggable(Level.FINE)) {
436-
log.fine(body);
435+
if (LOGGER.isLoggable(Level.FINE)) {
436+
LOGGER.fine(body);
437437
}
438438
A2AHttpClient.PostBuilder builder = buildPost(url, payloadAndHeaders, body);
439439
A2AHttpResponse response = builder.post();
440440
if (!response.success()) {
441-
if (log.isLoggable(Level.FINE)) {
442-
log.fine("Error on POST processing " + body);
441+
if (LOGGER.isLoggable(Level.FINE)) {
442+
LOGGER.fine("Error on POST processing " + body);
443443
}
444444
throw RestErrorMapper.mapRestError(response);
445445
}
@@ -448,8 +448,8 @@ private String sendPostRequest(String url, PayloadAndHeaders payloadAndHeaders)
448448

449449
private A2AHttpClient.PostBuilder createPostBuilder(String url, PayloadAndHeaders payloadAndHeaders) throws JsonProcessingException, InvalidProtocolBufferException {
450450
String body = ProtoJsonUtils.toJson(JsonFormat.printer(), (MessageOrBuilder) payloadAndHeaders.getPayload());
451-
if (log.isLoggable(Level.FINE)) {
452-
log.fine(body);
451+
if (LOGGER.isLoggable(Level.FINE)) {
452+
LOGGER.fine(body);
453453
}
454454
return buildPost(url, payloadAndHeaders, body);
455455
}

‎client/transport/rest/src/main/java/org/a2aproject/sdk/client/transport/rest/sse/SSEEventListener.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
public class SSEEventListener extends AbstractSSEEventListener {
2222

23-
private static final Logger log = Logger.getLogger(SSEEventListener.class.getName());
23+
private static final Logger LOGGER = Logger.getLogger(SSEEventListener.class.getName());
2424

2525
public SSEEventListener(Consumer<StreamingEventKind> eventHandler,
2626
@Nullable Consumer<Throwable> errorHandler) {
@@ -30,7 +30,7 @@ public SSEEventListener(Consumer<StreamingEventKind> eventHandler,
3030
@Override
3131
public void onMessage(ServerSentEvent event, @Nullable Future<Void> completableFuture) {
3232
try {
33-
log.fine("REST SSE raw data: " + event.data());
33+
LOGGER.fine("REST SSE raw data: " + event.data());
3434
org.a2aproject.sdk.grpc.StreamResponse.Builder builder = org.a2aproject.sdk.grpc.StreamResponse.newBuilder();
3535
JsonFormat.parser().merge(event.data(), builder);
3636
parseAndHandleMessage(builder.build(), completableFuture);
@@ -59,7 +59,7 @@ private void parseAndHandleMessage(StreamResponse response, @Nullable Future<Voi
5959
case ARTIFACT_UPDATE ->
6060
event = ProtoUtils.FromProto.taskArtifactUpdateEvent(response.getArtifactUpdate());
6161
default -> {
62-
log.warning("Invalid stream response " + response.getPayloadCase());
62+
LOGGER.warning("Invalid stream response " + response.getPayloadCase());
6363
if (getErrorHandler() != null) {
6464
getErrorHandler().accept(new IllegalStateException("Invalid stream response from server: " + response.getPayloadCase()));
6565
}

‎client/transport/rest/src/test/java/org/a2aproject/sdk/client/transport/rest/RestTransportTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
public class RestTransportTest {
7070

71-
private static final Logger log = Logger.getLogger(RestTransportTest.class.getName());
71+
private static final Logger LOGGER = Logger.getLogger(RestTransportTest.class.getName());
7272
private ClientAndServer server;
7373
private static final AgentCard CARD = AgentCard.builder()
7474
.name("Hello World Agent")
@@ -288,7 +288,7 @@ public void testSendMessageStreaming() throws Exception {
288288
*/
289289
@Test
290290
public void testCreateTaskPushNotificationConfiguration() throws Exception {
291-
log.info("Testing CreateTaskPushNotificationConfiguration");
291+
LOGGER.info("Testing CreateTaskPushNotificationConfiguration");
292292
this.server.when(
293293
request()
294294
.withMethod("POST")
@@ -380,7 +380,7 @@ public void testListTaskPushNotificationConfigurations() throws Exception {
380380
*/
381381
@Test
382382
public void testDeleteTaskPushNotificationConfigurations() throws Exception {
383-
log.info("Testing deleteTaskPushNotificationConfigurations");
383+
LOGGER.info("Testing deleteTaskPushNotificationConfigurations");
384384
this.server.when(
385385
request()
386386
.withMethod("DELETE")
@@ -400,7 +400,7 @@ public void testDeleteTaskPushNotificationConfigurations() throws Exception {
400400
*/
401401
@Test
402402
public void testSubscribe() throws Exception {
403-
log.info("Testing subscribeToTask");
403+
LOGGER.info("Testing subscribeToTask");
404404

405405
this.server.when(
406406
request()
@@ -451,7 +451,7 @@ public void testSubscribe() throws Exception {
451451
*/
452452
@Test
453453
public void testExtensionSupportRequiredErrorUnmarshalling() throws Exception {
454-
log.info("Testing ExtensionSupportRequiredError unmarshalling");
454+
LOGGER.info("Testing ExtensionSupportRequiredError unmarshalling");
455455

456456
// Mock server returns HTTP 400 with ExtensionSupportRequiredError
457457
String errorResponseBody = """
@@ -499,7 +499,7 @@ public void testExtensionSupportRequiredErrorUnmarshalling() throws Exception {
499499
*/
500500
@Test
501501
public void testVersionNotSupportedErrorUnmarshalling() throws Exception {
502-
log.info("Testing VersionNotSupportedError unmarshalling");
502+
LOGGER.info("Testing VersionNotSupportedError unmarshalling");
503503

504504
// Mock server returns HTTP 501 with VersionNotSupportedError
505505
String errorResponseBody = """
@@ -548,7 +548,7 @@ public void testVersionNotSupportedErrorUnmarshalling() throws Exception {
548548
*/
549549
@Test
550550
public void testVersionNotSupportedErrorUnmarshallingStreaming() throws Exception {
551-
log.info("Testing VersionNotSupportedError unmarshalling in streaming");
551+
LOGGER.info("Testing VersionNotSupportedError unmarshalling in streaming");
552552

553553
// Mock server returns HTTP 200 with error event in SSE stream
554554
String streamResponseBody = """

‎client/transport/spi/src/main/java/org/a2aproject/sdk/client/transport/spi/sse/AbstractSSEEventListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
public abstract class AbstractSSEEventListener {
2323

24-
private static final Logger log = Logger.getLogger(AbstractSSEEventListener.class.getName());
24+
private static final Logger LOGGER = Logger.getLogger(AbstractSSEEventListener.class.getName());
2525

2626
private final Consumer<StreamingEventKind> eventHandler;
2727
private final @Nullable Consumer<Throwable> errorHandler;
@@ -96,7 +96,7 @@ protected void handleEvent(StreamingEventKind event, @Nullable Future<Void> futu
9696
// Handles both TaskStatusUpdateEvent and Task objects with final states
9797
// This covers late subscriptions to completed tasks and ensures no connection leaks
9898
if (shouldAutoClose(event) && future != null) {
99-
log.fine("Auto-closing SSE connection for final event: " + event.getClass().getSimpleName());
99+
LOGGER.fine("Auto-closing SSE connection for final event: " + event.getClass().getSimpleName());
100100
future.cancel(true); // close SSE channel
101101
}
102102
}

‎compat-0.3/client/transport/grpc/src/main/java/org/a2aproject/sdk/compat03/client/transport/grpc/EventStreamObserver_v0_3.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
public class EventStreamObserver_v0_3 implements StreamObserver<StreamResponse> {
1414

15-
private static final Logger log = Logger.getLogger(EventStreamObserver_v0_3.class.getName());
15+
private static final Logger LOGGER = Logger.getLogger(EventStreamObserver_v0_3.class.getName());
1616
private final Consumer<StreamingEventKind_v0_3> eventHandler;
1717
private final Consumer<Throwable> errorHandler;
1818

@@ -38,7 +38,7 @@ public void onNext(StreamResponse response) {
3838
event = FromProto.taskArtifactUpdateEvent(response.getArtifactUpdate());
3939
break;
4040
default:
41-
log.warning("Invalid stream response " + response.getPayloadCase());
41+
LOGGER.warning("Invalid stream response " + response.getPayloadCase());
4242
errorHandler.accept(new IllegalStateException("Invalid stream response from server: " + response.getPayloadCase()));
4343
return;
4444
}

‎compat-0.3/client/transport/jsonrpc/src/main/java/org/a2aproject/sdk/compat03/client/transport/jsonrpc/sse/SSEEventListener_v0_3.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.logging.Logger;
1515

1616
public class SSEEventListener_v0_3 {
17-
private static final Logger log = Logger.getLogger(SSEEventListener_v0_3.class.getName());
17+
private static final Logger LOGGER = Logger.getLogger(SSEEventListener_v0_3.class.getName());
1818
private final Consumer<StreamingEventKind_v0_3> eventHandler;
1919
private final Consumer<Throwable> errorHandler;
2020
private volatile boolean completed = false;
@@ -29,11 +29,11 @@ public void onMessage(String message, Future<Void> completableFuture) {
2929
try {
3030
handleMessage(JsonParser.parseString(message).getAsJsonObject(), completableFuture);
3131
} catch (JsonSyntaxException e) {
32-
log.warning("Failed to parse JSON message: " + message);
32+
LOGGER.warning("Failed to parse JSON message: " + message);
3333
} catch (JsonProcessingException_v0_3 e) {
34-
log.warning("Failed to process JSON message: " + message);
34+
LOGGER.warning("Failed to process JSON message: " + message);
3535
} catch (IllegalArgumentException e) {
36-
log.warning("Invalid message format: " + message);
36+
LOGGER.warning("Invalid message format: " + message);
3737
if (errorHandler != null) {
3838
errorHandler.accept(e);
3939
}
@@ -51,18 +51,18 @@ public void onError(Throwable throwable, Future<Void> future) {
5151
public void onComplete() {
5252
// Idempotent: only signal completion once, even if called multiple times
5353
if (completed) {
54-
log.fine("SSEEventListener.onComplete() called again - ignoring (already completed)");
54+
LOGGER.fine("SSEEventListener.onComplete() called again - ignoring (already completed)");
5555
return;
5656
}
5757
completed = true;
5858

5959
// Signal normal stream completion (null error means successful completion)
60-
log.fine("SSEEventListener.onComplete() called - signaling successful stream completion");
60+
LOGGER.fine("SSEEventListener.onComplete() called - signaling successful stream completion");
6161
if (errorHandler != null) {
62-
log.fine("Calling errorHandler.accept(null) to signal successful completion");
62+
LOGGER.fine("Calling errorHandler.accept(null) to signal successful completion");
6363
errorHandler.accept(null);
6464
} else {
65-
log.warning("errorHandler is null, cannot signal completion");
65+
LOGGER.warning("errorHandler is null, cannot signal completion");
6666
}
6767
}
6868

‎compat-0.3/client/transport/rest/src/main/java/org/a2aproject/sdk/compat03/client/transport/rest/RestTransport_v0_3.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
public class RestTransport_v0_3 implements ClientTransport_v0_3 {
6363

64-
private static final Logger log = Logger.getLogger(RestTransport_v0_3.class.getName());
64+
private static final Logger LOGGER = Logger.getLogger(RestTransport_v0_3.class.getName());
6565
private final A2AHttpClient httpClient;
6666
private final String agentUrl;
6767
private @Nullable final List<ClientCallInterceptor_v0_3> interceptors;
@@ -377,14 +377,14 @@ private PayloadAndHeaders_v0_3 applyInterceptors(String methodName, @Nullable Me
377377
private String sendPostRequest(String url, PayloadAndHeaders_v0_3 payloadAndHeaders) throws IOException, InterruptedException, JsonProcessingException_v0_3 {
378378
MessageOrBuilder payload = (MessageOrBuilder) payloadAndHeaders.getPayload();
379379
String body = payload != null ? ProtoJsonUtils.toJson(JsonFormat.printer(), payload) : "";
380-
if (log.isLoggable(Level.FINE)) {
381-
log.fine(body);
380+
if (LOGGER.isLoggable(Level.FINE)) {
381+
LOGGER.fine(body);
382382
}
383383
A2AHttpClient.PostBuilder builder = buildPost(url, payloadAndHeaders, body);
384384
A2AHttpResponse response = builder.post();
385385
if (!response.success()) {
386-
if (log.isLoggable(Level.FINE)) {
387-
log.fine("Error on POST processing " + body);
386+
if (LOGGER.isLoggable(Level.FINE)) {
387+
LOGGER.fine("Error on POST processing " + body);
388388
}
389389
throw RestErrorMapper_v0_3.mapRestError(response);
390390
}
@@ -393,8 +393,8 @@ private String sendPostRequest(String url, PayloadAndHeaders_v0_3 payloadAndHead
393393

394394
private A2AHttpClient.PostBuilder createPostBuilder(String url, PayloadAndHeaders_v0_3 payloadAndHeaders) throws JsonProcessingException_v0_3, InvalidProtocolBufferException {
395395
String body = ProtoJsonUtils_v0_3.toJson(JsonFormat.printer(), (MessageOrBuilder) payloadAndHeaders.getPayload());
396-
if (log.isLoggable(Level.FINE)) {
397-
log.fine(body);
396+
if (LOGGER.isLoggable(Level.FINE)) {
397+
LOGGER.fine(body);
398398
}
399399
return buildPost(url, payloadAndHeaders, body);
400400
}

‎compat-0.3/client/transport/rest/src/main/java/org/a2aproject/sdk/compat03/client/transport/rest/sse/RestSSEEventListener_v0_3.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
public class RestSSEEventListener_v0_3 {
1616

17-
private static final Logger log = Logger.getLogger(RestSSEEventListener_v0_3.class.getName());
17+
private static final Logger LOGGER = Logger.getLogger(RestSSEEventListener_v0_3.class.getName());
1818
private final Consumer<StreamingEventKind_v0_3> eventHandler;
1919
private final Consumer<Throwable> errorHandler;
2020

@@ -26,7 +26,7 @@ public RestSSEEventListener_v0_3(Consumer<StreamingEventKind_v0_3> eventHandler,
2626

2727
public void onMessage(String message, @Nullable Future<Void> completableFuture) {
2828
try {
29-
log.fine("Streaming message received: " + message);
29+
LOGGER.fine("Streaming message received: " + message);
3030
org.a2aproject.sdk.compat03.grpc.StreamResponse.Builder builder = org.a2aproject.sdk.compat03.grpc.StreamResponse.newBuilder();
3131
JsonFormat.parser().merge(message, builder);
3232
handleMessage(builder.build());
@@ -56,7 +56,7 @@ private void handleMessage(StreamResponse response) {
5656
case ARTIFACT_UPDATE ->
5757
event = ProtoUtils_v0_3.FromProto.taskArtifactUpdateEvent(response.getArtifactUpdate());
5858
default -> {
59-
log.warning("Invalid stream response " + response.getPayloadCase());
59+
LOGGER.warning("Invalid stream response " + response.getPayloadCase());
6060
errorHandler.accept(new IllegalStateException("Invalid stream response from server: " + response.getPayloadCase()));
6161
return;
6262
}

0 commit comments

Comments
 (0)