Juan Hernandez has uploaded a new change for review. Change subject: restapi: Move JAXB global bindings to external file ......................................................................
restapi: Move JAXB global bindings to external file These bindings aren't part of the specification of the API, but of the implementation, so there is no reason to show them to the users. In addition they cause issues in the generator of the Java SDK, as it tries to use type converters that aren't available there. Change-Id: I0c79ae190d3c811c7d225ff5a293e14c541e688d Bug-Url: https://bugzilla.redhat.com/1063443 Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> --- A backend/manager/modules/restapi/interface/definition/src/main/resources/api.xjb M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd 2 files changed, 32 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/24292/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xjb b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xjb new file mode 100644 index 0000000..d00e739 --- /dev/null +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xjb @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxb:bindings + xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; + version="2.0"> + + <jaxb:globalBindings generateIsSetMethod="true"> + <!-- Replace the default int JAXB parser with one that checks the + values don't overflow the corresponding Java types: --> + <jaxb:javaType + name="int" + xmlType="xs:int" + parseMethod="org.ovirt.engine.api.utils.IntegerParser.parseInt" + /> + <jaxb:javaType + name="long" + xmlType="xs:unsignedInt" + parseMethod="org.ovirt.engine.api.utils.IntegerParser.parseUnsignedInt" + /> + <jaxb:javaType + name="short" + xmlType="xs:short" + parseMethod="org.ovirt.engine.api.utils.IntegerParser.parseShort" + /> + <jaxb:javaType + name="int" + xmlType="xs:unsignedShort" + parseMethod="org.ovirt.engine.api.utils.IntegerParser.parseUnsignedShort" + /> + </jaxb:globalBindings> + +</jaxb:bindings> \ No newline at end of file diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd index f67230d..a849751 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd @@ -4,36 +4,6 @@ xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"; jaxb:version="2.1" jaxb:extensionBindingPrefixes="xjc"> - - <xs:annotation> - <xs:appinfo> - <jaxb:globalBindings generateIsSetMethod="true"> - <!-- Replace the default int JAXB parser with one that checks the values don't overflow the corresponding - Java types: --> - <jaxb:javaType - name="int" - xmlType="xs:int" - parseMethod="org.ovirt.engine.api.utils.IntegerParser.parseInt" - /> - <jaxb:javaType - name="long" - xmlType="xs:unsignedInt" - parseMethod="org.ovirt.engine.api.utils.IntegerParser.parseUnsignedInt" - /> - <jaxb:javaType - name="short" - xmlType="xs:short" - parseMethod="org.ovirt.engine.api.utils.IntegerParser.parseShort" - /> - <jaxb:javaType - name="int" - xmlType="xs:unsignedShort" - parseMethod="org.ovirt.engine.api.utils.IntegerParser.parseUnsignedShort" - /> - </jaxb:globalBindings> - </xs:appinfo> - </xs:annotation> - <!-- Links --> <xs:element name="keyValuePair" type="KeyValuePair"/> -- To view, visit http://gerrit.ovirt.org/24292 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c79ae190d3c811c7d225ff5a293e14c541e688d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
