You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/08/04 17:45:43 UTC
[1/4] cxf-xjc-utils git commit: Update to Java 8
Repository: cxf-xjc-utils
Updated Branches:
refs/heads/master 571b6555e -> b836aa823
Update to Java 8
Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/83bc8c65
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/83bc8c65
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/83bc8c65
Branch: refs/heads/master
Commit: 83bc8c653304948eaab88fcbc4db9e077e2f5062
Parents: 571b655
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 13:40:41 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 13:40:41 2017 -0400
----------------------------------------------------------------------
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/83bc8c65/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 448a9b2..24a225d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
</prerequisites>
<properties>
- <jdk.version>1.6</jdk.version>
+ <jdk.version>1.8</jdk.version>
<eclipse.outputDirectory>${basedir}/target/classes</eclipse.outputDirectory>
<downloadSources>true</downloadSources>
@@ -236,10 +236,10 @@
<version>2.9.1</version>
<configuration>
<attach>true</attach>
- <source>1.6</source>
+ <source>${jdk.version}</source>
<quiet>true</quiet>
<bottom>Apache CXF</bottom>
- <javadocVersion>1.6</javadocVersion>
+ <javadocVersion>${jdk.version}</javadocVersion>
<encoding>UTF-8</encoding>
<!--subpackages>org.apache.cxf</subpackages-->
</configuration>
@@ -258,8 +258,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
<maxmem>256M</maxmem>
</configuration>
</plugin>
[4/4] cxf-xjc-utils git commit: Update version numbers to
3.2.0-SNAPSHOT
Posted by dk...@apache.org.
Update version numbers to 3.2.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/b836aa82
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/b836aa82
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/b836aa82
Branch: refs/heads/master
Commit: b836aa82354f8990730deaa924963ab32b7e258c
Parents: 0a64eeb
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 13:45:26 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 13:45:26 2017 -0400
----------------------------------------------------------------------
boolean-test/pom.xml | 2 +-
boolean/pom.xml | 2 +-
bug671/pom.xml | 2 +-
bug986/pom.xml | 2 +-
cxf-xjc-plugin/pom.xml | 2 +-
dv-test/pom.xml | 2 +-
dv/pom.xml | 2 +-
javadoc/pom.xml | 2 +-
pom.xml | 2 +-
property-listener/pom.xml | 2 +-
runtime/pom.xml | 2 +-
ts-test/pom.xml | 2 +-
ts/pom.xml | 2 +-
wsdlextension-test/pom.xml | 2 +-
wsdlextension/pom.xml | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/boolean-test/pom.xml
----------------------------------------------------------------------
diff --git a/boolean-test/pom.xml b/boolean-test/pom.xml
index 5ae0528..1e1074d 100644
--- a/boolean-test/pom.xml
+++ b/boolean-test/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/boolean/pom.xml
----------------------------------------------------------------------
diff --git a/boolean/pom.xml b/boolean/pom.xml
index 9e60d51..25676a8 100644
--- a/boolean/pom.xml
+++ b/boolean/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/bug671/pom.xml
----------------------------------------------------------------------
diff --git a/bug671/pom.xml b/bug671/pom.xml
index 9a838dd..38327ec 100644
--- a/bug671/pom.xml
+++ b/bug671/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/bug986/pom.xml
----------------------------------------------------------------------
diff --git a/bug986/pom.xml b/bug986/pom.xml
index e05711d..91cd487 100644
--- a/bug986/pom.xml
+++ b/bug986/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/cxf-xjc-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml
index 639189f..c565481 100644
--- a/cxf-xjc-plugin/pom.xml
+++ b/cxf-xjc-plugin/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<prerequisites>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/dv-test/pom.xml
----------------------------------------------------------------------
diff --git a/dv-test/pom.xml b/dv-test/pom.xml
index d9f1a2c..9f978ea 100644
--- a/dv-test/pom.xml
+++ b/dv-test/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/dv/pom.xml
----------------------------------------------------------------------
diff --git a/dv/pom.xml b/dv/pom.xml
index 5e4ce54..a976577 100644
--- a/dv/pom.xml
+++ b/dv/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/javadoc/pom.xml b/javadoc/pom.xml
index 3ee7abe..d6fa8c0 100644
--- a/javadoc/pom.xml
+++ b/javadoc/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 24a225d..2e55d6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
<packaging>pom</packaging>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<name>Apache CXF XJC Utils</name>
<url>http://cxf.apache.org</url>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/property-listener/pom.xml
----------------------------------------------------------------------
diff --git a/property-listener/pom.xml b/property-listener/pom.xml
index f47bffd..12f2e9c 100644
--- a/property-listener/pom.xml
+++ b/property-listener/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 78cf95a..494b872 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/ts-test/pom.xml
----------------------------------------------------------------------
diff --git a/ts-test/pom.xml b/ts-test/pom.xml
index a2706a9..df76fc2 100644
--- a/ts-test/pom.xml
+++ b/ts-test/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/ts/pom.xml
----------------------------------------------------------------------
diff --git a/ts/pom.xml b/ts/pom.xml
index 03db6d9..a49c14b 100644
--- a/ts/pom.xml
+++ b/ts/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/wsdlextension-test/pom.xml
----------------------------------------------------------------------
diff --git a/wsdlextension-test/pom.xml b/wsdlextension-test/pom.xml
index e03a2a6..2f18d90 100644
--- a/wsdlextension-test/pom.xml
+++ b/wsdlextension-test/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/b836aa82/wsdlextension/pom.xml
----------------------------------------------------------------------
diff --git a/wsdlextension/pom.xml b/wsdlextension/pom.xml
index da32afb..ee40460 100644
--- a/wsdlextension/pom.xml
+++ b/wsdlextension/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>xjc-utils</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
[2/4] cxf-xjc-utils git commit: [CXFXJC-19, CXFXJC-20,
CXFXJC-21] Fix problems in DV plugin found while enabling it for more
modules in CXF proper
Posted by dk...@apache.org.
[CXFXJC-19, CXFXJC-20, CXFXJC-21] Fix problems in DV plugin found while enabling it for more modules in CXF proper
Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/1a9ba9e5
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/1a9ba9e5
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/1a9ba9e5
Branch: refs/heads/master
Commit: 1a9ba9e54e46ba4aeef598a155c34e7197b229c9
Parents: 83bc8c6
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 13:40:48 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 13:40:48 2017 -0400
----------------------------------------------------------------------
.../apache/cxf/xjc/dv/DefaultValuePlugin.java | 26 ++++++++++++++++----
1 file changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/1a9ba9e5/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
----------------------------------------------------------------------
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 e4bcb93..63d8ca4 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
@@ -68,6 +68,7 @@ public class DefaultValuePlugin {
private static final Logger LOG = Logger.getLogger(DefaultValuePlugin.class.getName()); //NOPMD
private boolean complexTypes;
private boolean active;
+ private boolean attributes;
public DefaultValuePlugin() {
}
@@ -78,6 +79,7 @@ public class DefaultValuePlugin {
public String getUsage() {
return " -Xdv : Initialize fields mapped from elements with their default values\n"
+ + " -Xdv:attributes : Also initialize fields mapped from attributes with their default values\n"
+ " -Xdv:optional : Initialize fields mapped from elements with their default values\n"
+ " for elements with minOccurs=0 but with complexTypes containing \n"
+ " fields with default values.";
@@ -89,9 +91,12 @@ public class DefaultValuePlugin {
if (args[index].startsWith("-Xdv")) {
ret = 1;
- if (args[index].equals("-Xdv:optional")) {
+ if (args[index].indexOf(":optional") != -1) {
complexTypes = true;
}
+ if (args[index].indexOf(":attributes") != -1) {
+ attributes = true;
+ }
if (!opt.activePlugins.contains(plugin)) {
opt.activePlugins.add(plugin);
}
@@ -204,7 +209,7 @@ public class DefaultValuePlugin {
JExpression dvExpr = null;
if (null != xmlDefaultValue && null != xmlDefaultValue.value) {
- dvExpr = getDefaultValueExpression(f, co, outline, xsType, isElement,
+ dvExpr = getDefaultValueExpression(f, co, outline, xsType, isElement | attributes,
xmlDefaultValue, false);
}
@@ -215,11 +220,15 @@ public class DefaultValuePlugin {
.equals(xsType.getOwnerSchema().getTargetNamespace())) {
//non-primitive attribute, may still be able to convert it, but need to do
//a bunch more checks and changes to setters and isSet and such
+
dvExpr =
- getDefaultValueExpression(f, co, outline, xsType, isElement, xmlDefaultValue, true);
+ getDefaultValueExpression(f, co, outline, xsType, isElement | attributes,
+ xmlDefaultValue, true);
- updateSetter(co, f, co.implClass);
- updateGetter(co, f, co.implClass, dvExpr, true);
+ if (dvExpr != null) {
+ updateSetter(co, f, co.implClass);
+ updateGetter(co, f, co.implClass, dvExpr, true);
+ }
} else if (null == dvExpr) {
JType type = f.getRawType();
String typeName = type.fullName();
@@ -424,6 +433,9 @@ public class DefaultValuePlugin {
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Updating setter: " + setterName);
}
+ if (method == null) {
+ return;
+ }
JDocComment doc = method.javadoc();
// remove existing method and define new one
dc.methods().remove(method);
@@ -438,6 +450,10 @@ public class DefaultValuePlugin {
JFieldRef fr = JExpr.ref(fieldName);
method.body().assign(fr, var);
+ method = dc.getMethod("unset" + fo.getPropertyInfo().getName(true), new JType[0]);
+ if (method != null) {
+ dc.methods().remove(method);
+ }
method = dc.method(mods, method.type(), "unset" + fo.getPropertyInfo().getName(true));
method.body().assign(fr, JExpr._null());
[3/4] cxf-xjc-utils git commit: Fix some eclipse warnings
Posted by dk...@apache.org.
Fix some eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/0a64eeb9
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/0a64eeb9
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/0a64eeb9
Branch: refs/heads/master
Commit: 0a64eeb9ee8e6adcb4d9fd68d40622d5ea50f36a
Parents: 1a9ba9e
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 13:43:54 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 13:43:54 2017 -0400
----------------------------------------------------------------------
.../org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java | 3 +--
.../main/java/org/apache/cxf/xjc/javadoc/PropertyJavadoc.java | 5 ++---
.../java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java | 5 ++---
.../java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java | 6 +++---
4 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/0a64eeb9/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
----------------------------------------------------------------------
diff --git a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
index 8d4a087..207a63d 100644
--- a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
+++ b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
@@ -131,9 +131,8 @@ public abstract class AbstractXSDToJavaMojo extends AbstractMojo {
file = new File(s).getAbsoluteFile();
if (file.getParentFile().exists()) {
return file.toURI();
- } else {
- throw use;
}
+ throw use;
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/0a64eeb9/javadoc/src/main/java/org/apache/cxf/xjc/javadoc/PropertyJavadoc.java
----------------------------------------------------------------------
diff --git a/javadoc/src/main/java/org/apache/cxf/xjc/javadoc/PropertyJavadoc.java b/javadoc/src/main/java/org/apache/cxf/xjc/javadoc/PropertyJavadoc.java
index 297d9a0..4ecc890 100644
--- a/javadoc/src/main/java/org/apache/cxf/xjc/javadoc/PropertyJavadoc.java
+++ b/javadoc/src/main/java/org/apache/cxf/xjc/javadoc/PropertyJavadoc.java
@@ -118,10 +118,9 @@ public class PropertyJavadoc {
if (options.enableIntrospection) {
return ((type.isPrimitive() && type.boxify().getPrimitiveType() == codeModel.BOOLEAN)
? "is" : "get") + fieldOutline.getPropertyInfo().getName(true);
- } else {
- return (type.boxify().getPrimitiveType() == codeModel.BOOLEAN ? "is" : "get")
- + fieldOutline.getPropertyInfo().getName(true);
}
+ return (type.boxify().getPrimitiveType() == codeModel.BOOLEAN ? "is" : "get")
+ + fieldOutline.getPropertyInfo().getName(true);
}
}
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/0a64eeb9/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java
----------------------------------------------------------------------
diff --git a/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java b/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java
index f0cf677..94bf373 100644
--- a/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java
+++ b/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java
@@ -21,7 +21,6 @@ package org.apache.cxf.xjc.runtime;
import javax.xml.bind.JAXBElement;
-import org.apache.commons.lang3.SystemUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -55,9 +54,9 @@ class JAXBToStringStyleImpl extends ToStringStyle {
super();
if (multiLine) {
this.setContentStart("[");
- this.setFieldSeparator(SystemUtils.LINE_SEPARATOR + " ");
+ this.setFieldSeparator(System.lineSeparator() + " ");
this.setFieldSeparatorAtStart(true);
- this.setContentEnd(SystemUtils.LINE_SEPARATOR + "]");
+ this.setContentEnd(System.lineSeparator() + "]");
} else {
// simple
this.setUseClassName(false);
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/0a64eeb9/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java
----------------------------------------------------------------------
diff --git a/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java b/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java
index 61a5656..e5fd374 100644
--- a/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java
+++ b/wsdlextension/src/main/java/org/apache/cxf/xjc/wsdlextension/WSDLExtension.java
@@ -35,7 +35,7 @@ import com.sun.codemodel.JExpr;
import com.sun.codemodel.JFieldVar;
import com.sun.codemodel.JMethod;
import com.sun.codemodel.JMod;
-import com.sun.codemodel.JPrimitiveType;
+import com.sun.codemodel.JType;
import com.sun.tools.xjc.BadCommandLineException;
import com.sun.tools.xjc.Options;
import com.sun.tools.xjc.outline.ClassOutline;
@@ -87,7 +87,7 @@ public class WSDLExtension {
"getElementType");
getElementTypeMethod.body()._return(JExpr.direct("elementType"));
- JMethod setElementTypeMethod = implementation.method(JMod.PUBLIC, JPrimitiveType.parse(co
+ JMethod setElementTypeMethod = implementation.method(JMod.PUBLIC, JType.parse(co
.parent().getCodeModel(), "void"), "setElementType");
setElementTypeMethod.param(QName.class, "type");
setElementTypeMethod.body().directStatement("this.elementType = type;");
@@ -96,7 +96,7 @@ public class WSDLExtension {
"getRequired");
getRequiredMethod.body()._return(JExpr.direct("required == null ? false : required"));
- JMethod setRequiredMethod = implementation.method(JMod.PUBLIC, JPrimitiveType.parse(co
+ JMethod setRequiredMethod = implementation.method(JMod.PUBLIC, JType.parse(co
.parent().getCodeModel(), "void"), "setRequired");
setRequiredMethod.param(Boolean.class, "required");
setRequiredMethod.body().directStatement("this.required = required;");