Skip to content

Commit 9bb5aa5

Browse files
authored
refactor!: resolve all split packages across Maven modules (#987)
* refactor: resolve all split packages across Maven modules Rename packages in leaf/dependent modules so no Java package spans multiple Maven modules. This eliminates duplicate package-info.class in published jars (which broke Android builds) and enables javadoc:aggregate. Package moves: - org.a2aproject.sdk.util (spec) -> org.a2aproject.sdk.spec.util - org.a2aproject.sdk.extras.opentelemetry (server) -> org.a2aproject.sdk.extras.opentelemetry.server - org.a2aproject.sdk.client.http (android) -> org.a2aproject.sdk.client.http.android - org.a2aproject.sdk.client.http (vertx) -> org.a2aproject.sdk.client.http.vertx - org.a2aproject.sdk.compat03.conversion (test) -> org.a2aproject.sdk.compat03.conversion.test - org.a2aproject.sdk.examples.helloworld -> .client / .server sub-packages - org.a2aproject.sdk.test -> org.a2aproject.sdk.bom.test.{sdk,reference,extras} - org.a2aproject.sdk.server.events (test) -> org.a2aproject.sdk.extras.queuemanager.replicated.events - Remove EventQueueTestHelper from org.a2aproject.sdk.server.events in the replicated module (split package with server-common). - Consolidate tapQueue() into server-common's test-jar EventQueueUtil and add a test-jar dependency. This fixes #978
1 parent 0998916 commit 9bb5aa5

127 files changed

Lines changed: 249 additions & 179 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

AGENTS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ mvn clean install
6666
- Use `org.a2aproject.sdk.util.Assert.checkNotNullParam()` in the compact constructor to validate required fields
6767
- Use `List.copyOf()` and `Map.copyOf()` for defensive copying of collections
6868
- Apply the Builder pattern for records with many fields (see `AgentCard.java` as reference)
69+
- Do not split Java packages across Maven modules in production code (each package must belong to exactly one module). Test code may share a package with production code to access package-private members.
6970

7071
### Code generation
7172

boms/extras/src/it/extras-usage-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<goal>java</goal>
159159
</goals>
160160
<configuration>
161-
<mainClass>org.a2aproject.sdk.test.ExtrasBomVerifier</mainClass>
161+
<mainClass>org.a2aproject.sdk.bom.test.extras.ExtrasBomVerifier</mainClass>
162162
</configuration>
163163
</execution>
164164
</executions>

boms/extras/src/it/extras-usage-test/src/main/java/org/a2aproject/sdk/test/ExtrasBomVerifier.java renamed to boms/extras/src/it/extras-usage-test/src/main/java/org/a2aproject/sdk/bom/test/extras/ExtrasBomVerifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.a2aproject.sdk.test;
1+
package org.a2aproject.sdk.bom.test.extras;
22

33
import org.a2aproject.sdk.bom.test.DynamicBomVerifier;
44

boms/reference/src/it/reference-usage-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<goal>java</goal>
156156
</goals>
157157
<configuration>
158-
<mainClass>org.a2aproject.sdk.test.ReferenceBomVerifier</mainClass>
158+
<mainClass>org.a2aproject.sdk.bom.test.reference.ReferenceBomVerifier</mainClass>
159159
</configuration>
160160
</execution>
161161
</executions>

boms/reference/src/it/reference-usage-test/src/main/java/org/a2aproject/sdk/test/ReferenceBomVerifier.java renamed to boms/reference/src/it/reference-usage-test/src/main/java/org/a2aproject/sdk/bom/test/reference/ReferenceBomVerifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.a2aproject.sdk.test;
1+
package org.a2aproject.sdk.bom.test.reference;
22

33
import org.a2aproject.sdk.bom.test.DynamicBomVerifier;
44

boms/sdk/src/it/sdk-usage-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<goal>java</goal>
197197
</goals>
198198
<configuration>
199-
<mainClass>org.a2aproject.sdk.test.SdkBomVerifier</mainClass>
199+
<mainClass>org.a2aproject.sdk.bom.test.sdk.SdkBomVerifier</mainClass>
200200
</configuration>
201201
</execution>
202202
</executions>

boms/sdk/src/it/sdk-usage-test/src/main/java/org/a2aproject/sdk/test/SdkBomVerifier.java renamed to boms/sdk/src/it/sdk-usage-test/src/main/java/org/a2aproject/sdk/bom/test/sdk/SdkBomVerifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.a2aproject.sdk.test;
1+
package org.a2aproject.sdk.bom.test.sdk;
22

33
import org.a2aproject.sdk.bom.test.DynamicBomVerifier;
44

client/base/src/main/java/org/a2aproject/sdk/client/ClientTaskManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.a2aproject.sdk.client;
22

3-
import static org.a2aproject.sdk.util.Utils.appendArtifactToTask;
3+
import static org.a2aproject.sdk.spec.util.Utils.appendArtifactToTask;
44

55
import java.util.ArrayList;
66
import java.util.HashMap;

client/transport/jsonrpc/src/main/java/org/a2aproject/sdk/client/transport/jsonrpc/JSONRPCTransport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
import org.a2aproject.sdk.spec.TaskIdParams;
6666
import org.a2aproject.sdk.spec.TaskPushNotificationConfig;
6767
import org.a2aproject.sdk.spec.TaskQueryParams;
68-
import org.a2aproject.sdk.util.Utils;
68+
import org.a2aproject.sdk.spec.util.Utils;
6969
import org.jspecify.annotations.Nullable;
7070

7171
public class JSONRPCTransport implements ClientTransport {

client/transport/jsonrpc/src/test/java/org/a2aproject/sdk/client/transport/jsonrpc/JSONRPCTransportTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
import org.a2aproject.sdk.spec.TaskQueryParams;
6767
import org.a2aproject.sdk.spec.TaskState;
6868
import org.a2aproject.sdk.spec.TextPart;
69-
import org.a2aproject.sdk.util.Utils;
69+
import org.a2aproject.sdk.spec.util.Utils;
7070
import org.junit.jupiter.api.AfterEach;
7171
import org.junit.jupiter.api.BeforeEach;
7272
import org.junit.jupiter.api.Test;

0 commit comments

Comments
 (0)