This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new f5a6c62 CXFXJC-49 cxf-xjc-dv should not generate deprecated code
(#171)
f5a6c62 is described below
commit f5a6c62ed81297e2c5480d1f759d35cf4d36ccd2
Author: Dries <[email protected]>
AuthorDate: Thu Sep 12 22:14:29 2024 +0200
CXFXJC-49 cxf-xjc-dv should not generate deprecated code (#171)
Generate valueOf method instead of deprecated constructors
---
.../org/apache/cxf/xjc/dv/DefaultValuePlugin.java | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
b/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
index 0b67943..d4db556 100644
--- a/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
+++ b/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
@@ -361,25 +361,23 @@ public class DefaultValuePlugin {
if ("java.lang.Boolean".equals(typeName) && isElement) {
dv = JExpr.direct(Boolean.valueOf(defaultValue) ? "Boolean.TRUE" :
"Boolean.FALSE");
} else if ("java.lang.Byte".equals(typeName) && isElement) {
- dv = JExpr._new(type)
- .arg(JExpr.cast(type.unboxify(),
- JExpr.lit(Byte.parseByte(defaultValue))));
+ dv = ((JClass) type).staticInvoke("valueOf")
+ .arg(JExpr.cast(type.unboxify(),
JExpr.lit(Byte.parseByte(defaultValue))));
} else if ("java.lang.Double".equals(typeName) && isElement) {
- dv = JExpr._new(type)
+ dv = ((JClass) type).staticInvoke("valueOf")
.arg(JExpr.lit(Double.parseDouble(defaultValue)));
} else if ("java.lang.Float".equals(typeName) && isElement) {
- dv = JExpr._new(type)
- .arg(JExpr.lit(Float.parseFloat(defaultValue)));
+ dv = ((JClass) type).staticInvoke("valueOf")
+ .arg(JExpr.lit(Float.parseFloat(defaultValue)));
} else if ("java.lang.Integer".equals(typeName) && isElement) {
- dv = JExpr._new(type)
+ dv = ((JClass) type).staticInvoke("valueOf")
.arg(JExpr.lit(Integer.parseInt(defaultValue)));
} else if ("java.lang.Long".equals(typeName) && isElement) {
- dv = JExpr._new(type)
+ dv = ((JClass) type).staticInvoke("valueOf")
.arg(JExpr.lit(Long.parseLong(defaultValue)));
} else if ("java.lang.Short".equals(typeName) && isElement) {
- dv = JExpr._new(type)
- .arg(JExpr.cast(type.unboxify(),
- JExpr.lit(Short.parseShort(defaultValue))));
+ dv = ((JClass) type).staticInvoke("valueOf")
+ .arg(JExpr.cast(type.unboxify(),
JExpr.lit(Short.parseShort(defaultValue))));
} else if ("java.lang.String".equals(type.fullName()) && isElement) {
dv = JExpr.lit(defaultValue);
} else if ("java.math.BigInteger".equals(type.fullName()) &&
isElement) {
