Skip to content

Commit 755cccd

Browse files
authored
Merge pull request #311 from mikitavaseryn/issue-310
Added loading jakarta.jws.WebParam when javax.jws.WebParam was not found
2 parents eb433ed + b91e345 commit 755cccd

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

src/main/java/com/googlecode/jsonrpc4j/JsonRpcBasicServer.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public class JsonRpcBasicServer {
5050
public static final String VERSION = "2.0";
5151
public static final int CODE_OK = 0;
5252
public static final String WEB_PARAM_ANNOTATION_CLASS_LOADER = "javax.jws.WebParam";
53+
public static final String WEB_PARAM_ANNOTATION_CLASS_LOADER_JAKARTA = "jakarta.jws.WebParam";
5354
public static final String NAME = "name";
5455
public static final String NULL = "null";
5556
private static final Logger logger = LoggerFactory.getLogger(JsonRpcBasicServer.class);
@@ -136,7 +137,15 @@ private static void loadAnnotationSupportEngine() {
136137
WEB_PARAM_ANNOTATION_CLASS = classLoader.loadClass(WEB_PARAM_ANNOTATION_CLASS_LOADER).asSubclass(Annotation.class);
137138
WEB_PARAM_NAME_METHOD = WEB_PARAM_ANNOTATION_CLASS.getMethod(NAME);
138139
} catch (ClassNotFoundException | NoSuchMethodException e) {
139-
logger.debug("Could not find {}.{}", WEB_PARAM_ANNOTATION_CLASS_LOADER, NAME);
140+
logger.debug("Could not find {}.{}", WEB_PARAM_ANNOTATION_CLASS_LOADER, NAME);
141+
logger.debug("Try to load it from jakarta package");
142+
try {
143+
WEB_PARAM_ANNOTATION_CLASS = classLoader.loadClass(WEB_PARAM_ANNOTATION_CLASS_LOADER_JAKARTA).asSubclass(Annotation.class);
144+
WEB_PARAM_NAME_METHOD = WEB_PARAM_ANNOTATION_CLASS.getMethod(NAME);
145+
} catch (ClassNotFoundException | NoSuchMethodException ex) {
146+
logger.debug("Could not find {}.{}", WEB_PARAM_ANNOTATION_CLASS_LOADER_JAKARTA, NAME);
147+
}
148+
140149
}
141150
}
142151

0 commit comments

Comments
 (0)