Skip to content

Commit 72b2ccb

Browse files
AXIS2-6104 Move shared RPC classes to library-agnostic package
Moved Axis2JsonErrorResponse, JsonRpcFaultException, PaginatedResponse, and PaginationRequest from org.apache.axis2.json.gson.rpc to org.apache.axis2.json.rpc — a new shared package that neither gson nor moshi imports depend on. Before: moshi.rpc imported gson.rpc classes, creating a misleading cross-dependency between two implementations that should be independent. After: org.apache.axis2.json.rpc/ ← shared contract (no library imports) org.apache.axis2.json.gson.rpc/ ← Gson-specific receivers + JsonUtils org.apache.axis2.json.moshi.rpc/ ← Moshi-specific receivers + JsonUtils Both gson and moshi receivers import from the shared rpc package. The shared classes contain zero Gson or Moshi imports — they are plain POJOs serializable by any JSON library. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent e2db339 commit 72b2ccb

11 files changed

Lines changed: 13 additions & 10 deletions

File tree

modules/json/src/org/apache/axis2/json/gson/rpc/JsonRpcMessageReceiver.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import org.apache.axis2.description.AxisOperation;
2626
import org.apache.axis2.json.gson.GsonXMLStreamReader;
2727
import org.apache.axis2.json.factory.JsonConstant;
28+
import org.apache.axis2.json.rpc.Axis2JsonErrorResponse;
29+
import org.apache.axis2.json.rpc.JsonRpcFaultException;
2830
import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
2931
import org.apache.commons.logging.Log;
3032
import org.apache.commons.logging.LogFactory;

modules/json/src/org/apache/axis2/json/gson/rpc/JsonUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.axis2.Constants;
3030
import org.apache.axis2.context.MessageContext;
3131
import org.apache.axis2.json.factory.JsonConstant;
32+
import org.apache.axis2.json.rpc.Axis2JsonErrorResponse;
3233

3334
import java.io.IOException;
3435
import java.lang.reflect.InvocationTargetException;

modules/json/src/org/apache/axis2/json/moshi/rpc/JsonRpcMessageReceiver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.apache.axis2.Constants;
2424
import org.apache.axis2.context.MessageContext;
2525
import org.apache.axis2.description.AxisOperation;
26-
import org.apache.axis2.json.gson.rpc.Axis2JsonErrorResponse;
27-
import org.apache.axis2.json.gson.rpc.JsonRpcFaultException;
26+
import org.apache.axis2.json.rpc.Axis2JsonErrorResponse;
27+
import org.apache.axis2.json.rpc.JsonRpcFaultException;
2828
import org.apache.axis2.json.moshi.MoshiXMLStreamReader;
2929
import org.apache.axis2.json.factory.JsonConstant;
3030
import org.apache.axis2.rpc.receivers.RPCMessageReceiver;

modules/json/src/org/apache/axis2/json/moshi/rpc/JsonUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.apache.axis2.Constants;
3333
import org.apache.axis2.context.MessageContext;
3434
import org.apache.axis2.json.factory.JsonConstant;
35-
import org.apache.axis2.json.gson.rpc.Axis2JsonErrorResponse;
35+
import org.apache.axis2.json.rpc.Axis2JsonErrorResponse;
3636

3737
import java.io.IOException;
3838
import java.lang.annotation.Annotation;

modules/json/src/org/apache/axis2/json/gson/rpc/Axis2JsonErrorResponse.java renamed to modules/json/src/org/apache/axis2/json/rpc/Axis2JsonErrorResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.axis2.json.gson.rpc;
20+
package org.apache.axis2.json.rpc;
2121

2222
import java.time.Instant;
2323
import java.util.UUID;

modules/json/src/org/apache/axis2/json/gson/rpc/JsonRpcFaultException.java renamed to modules/json/src/org/apache/axis2/json/rpc/JsonRpcFaultException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.axis2.json.gson.rpc;
20+
package org.apache.axis2.json.rpc;
2121

2222
/**
2323
* Exception thrown by JSON-RPC service methods to signal a structured error

modules/json/src/org/apache/axis2/json/gson/rpc/PaginatedResponse.java renamed to modules/json/src/org/apache/axis2/json/rpc/PaginatedResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.axis2.json.gson.rpc;
20+
package org.apache.axis2.json.rpc;
2121

2222
import java.util.Collections;
2323
import java.util.List;

modules/json/src/org/apache/axis2/json/gson/rpc/PaginationRequest.java renamed to modules/json/src/org/apache/axis2/json/rpc/PaginationRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.axis2.json.gson.rpc;
20+
package org.apache.axis2.json.rpc;
2121

2222
/**
2323
* Pagination parameters that a client sends with a list query.

modules/json/test/org/apache/axis2/json/gson/rpc/PaginatedResponseTest.java renamed to modules/json/test/org/apache/axis2/json/rpc/PaginatedResponseTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.axis2.json.gson.rpc;
20+
package org.apache.axis2.json.rpc;
2121

2222
import org.junit.Test;
2323

modules/samples/userguide/src/userguide/springbootdemo-tomcat11/src/main/java/userguide/springboot/webservices/FinancialBenchmarkService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
package userguide.springboot.webservices;
2020

21-
import org.apache.axis2.json.gson.rpc.JsonRpcFaultException;
21+
import org.apache.axis2.json.rpc.JsonRpcFaultException;
2222
import org.apache.logging.log4j.LogManager;
2323
import org.apache.logging.log4j.Logger;
2424
import org.springframework.stereotype.Component;

0 commit comments

Comments
 (0)