Skip to content

Commit 1d0b9f5

Browse files
committed
Take new a2a-java project structure into account
1 parent 35fad3e commit 1d0b9f5

File tree

6 files changed

+22
-16
lines changed

6 files changed

+22
-16
lines changed

a2a-java-sdk-server-jakarta.iml

Lines changed: 0 additions & 9 deletions
This file was deleted.

grpc/src/main/java/org/wildfly/extras/a2a/server/apps/grpc/GrpcBeanInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import jakarta.inject.Inject;
99

1010
import io.a2a.server.PublicAgentCard;
11-
import io.a2a.server.requesthandlers.CallContextFactory;
1211
import io.a2a.server.requesthandlers.RequestHandler;
1312
import io.a2a.spec.AgentCard;
13+
import io.a2a.transport.grpc.handler.CallContextFactory;
1414

1515
/**
1616
* Bean initializer that observes application startup events.

grpc/src/main/java/org/wildfly/extras/a2a/server/apps/grpc/WildFlyGrpcHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.wildfly.extras.a2a.server.apps.grpc;
22

3-
import io.a2a.grpc.handler.GrpcHandler;
4-
import io.a2a.server.requesthandlers.CallContextFactory;
53
import io.a2a.server.requesthandlers.RequestHandler;
64
import io.a2a.spec.AgentCard;
5+
import io.a2a.transport.grpc.handler.CallContextFactory;
6+
import io.a2a.transport.grpc.handler.GrpcHandler;
77

88
/**
99
* WildFly gRPC Handler that uses static cache for CDI beans.

impl/src/main/java/org/wildfly/extras/a2a/server/apps/jakarta/A2AServerResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import com.fasterxml.jackson.core.JsonParseException;
2727
import com.fasterxml.jackson.databind.JsonMappingException;
28-
import io.a2a.jsonrpc.handler.JSONRPCHandler;
2928
import io.a2a.server.ExtendedAgentCard;
3029
import io.a2a.server.ServerCallContext;
3130
import io.a2a.server.auth.UnauthenticatedUser;
@@ -56,6 +55,7 @@
5655
import io.a2a.spec.StreamingJSONRPCRequest;
5756
import io.a2a.spec.TaskResubscriptionRequest;
5857
import io.a2a.spec.UnsupportedOperationError;
58+
import io.a2a.transport.jsonrpc.handler.JSONRPCHandler;
5959
import org.slf4j.Logger;
6060
import org.slf4j.LoggerFactory;
6161

pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<properties>
4646
<jboss.home>${project.build.directory}${file.separator}wildfly</jboss.home>
4747
<version.wildfly>36.0.1.Final</version.wildfly>
48-
<version.sdk>${project.version}</version.sdk>
48+
<version.sdk>0.3.0.Beta1-SNAPSHOT</version.sdk>
4949
<!-- This needs to be same version as used by the sdk -->
5050
<version.mutiny-zero>1.1.1</version.mutiny-zero>
5151
<!-- gRPC version matching the a2a-java-sdk -->
@@ -60,8 +60,7 @@
6060
<version.org.jboss.arquillian.jakarta>10.0.0.Final</version.org.jboss.arquillian.jakarta>
6161
<version.shrinkwrap.resolvers>3.3.4</version.shrinkwrap.resolvers>
6262
<version.rest-assured>5.5.5</version.rest-assured>
63-
<!-- Use SNAPSHOT of gRPC feature pack to get the right versions -->
64-
<version.wildfly.grpc>0.1.12-SNAPSHOT</version.wildfly.grpc>
63+
<version.wildfly.grpc>0.1.12</version.wildfly.grpc>
6564

6665
<jboss.home>${project.build.directory}${file.separator}wildfly</jboss.home>
6766
<arquillian.java.vm.args></arquillian.java.vm.args>

tests/src/test/java/org/wildfly/extras/a2a/server/apps/jakarta/JakartaA2AServerTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import java.util.List;
66

77
import io.a2a.A2A;
8+
import io.a2a.client.http.A2AHttpClient;
89
import io.a2a.server.PublicAgentCard;
910
import io.a2a.server.apps.common.AbstractA2AServerTest;
1011
import io.a2a.spec.Event;
12+
import io.a2a.transport.jsonrpc.handler.JSONRPCHandler;
1113
import io.a2a.util.Assert;
1214
import mutiny.zero.ZeroPublisher;
1315
import org.jboss.arquillian.container.test.api.Deployment;
@@ -26,17 +28,31 @@ public JakartaA2AServerTest() {
2628
super(8080);
2729
}
2830

31+
@Override
32+
protected String getTransportProtocol() {
33+
return "JSONRPC";
34+
}
35+
36+
@Override
37+
protected String getTransportUrl() {
38+
return "http://localhost:8080";
39+
}
40+
2941
@Deployment
3042
public static WebArchive createTestArchive() throws Exception {
3143
final JavaArchive[] libraries = List.of(
3244
// a2a-java-sdk-client.jar
3345
getJarForClass(A2A.class),
3446
// a2a-java-sdk-common.jar
3547
getJarForClass(Assert.class),
48+
// a2a-java-sdk-http-client
49+
getJarForClass(A2AHttpClient.class),
3650
// a2a-java-sdk-server-common.jar
3751
getJarForClass(PublicAgentCard.class),
3852
// a2a-java-sdk-spec.jar
3953
getJarForClass(Event.class),
54+
// a2a-java-sdk-transport-jsonrpc
55+
getJarForClass(JSONRPCHandler.class),
4056
// mutiny-zero.jar. This is provided by some WildFly layers, but not always, and not in
4157
// the server provisioned by Glow when inspecting our war
4258
getJarForClass(ZeroPublisher.class)).toArray(new JavaArchive[0]);

0 commit comments

Comments
 (0)