Skip to content
Permalink
Browse files
adding bean validation 3 naming handling for descriptors
  • Loading branch information
rmannibucau committed Apr 30, 2021
1 parent f695449 commit 98cd7f9bbf6d497ffaef3973e3a535ab2e648595
Showing 6 changed files with 444 additions and 9 deletions.
@@ -82,7 +82,7 @@
public class XmlBuilder {
//@formatter:off
public enum Version {
v10("1.0"), v11("1.1"), v20("2.0");
v10("1.0"), v11("1.1"), v20("2.0"), v30("3.0");
//@formatter:on

static Version of(ConstraintMappingsType constraintMappings) {
@@ -21,6 +21,8 @@
import java.net.URL;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.SortedMap;
@@ -59,15 +61,15 @@
*/
public class SchemaManager {
public static class Builder {
private final SortedMap<Key, Lazy<Schema>> data = new TreeMap<>();
private final Map<Key, Lazy<Schema>> data = new LinkedHashMap<>();

public Builder add(String version, String ns, String resource) {
data.put(new Key(version, ns), new Lazy<>(() -> SchemaManager.loadSchema(resource)));
return this;
}

public SchemaManager build() {
return new SchemaManager(new TreeMap<>(data));
return new SchemaManager(data);
}
}

@@ -132,7 +134,7 @@ public void setContentHandler(ContentHandler handler) {
@Override
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
if (getContentHandler() == ch) {
final String version = Objects.toString(atts.getValue("version"), data.firstKey().getVersion());
final String version = Objects.toString(atts.getValue("version"), data.keySet().iterator().next().getVersion());
final Key schemaKey = new Key(version, uri);
Exceptions.raiseUnless(data.containsKey(schemaKey), ValidationException::new,
"Unknown validation schema %s", schemaKey);
@@ -181,7 +183,7 @@ private class SchemaRewriter extends XMLFilterImpl {
@Override
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
final Key schemaKey =
new Key(Objects.toString(atts.getValue("version"), data.firstKey().getVersion()), uri);
new Key(Objects.toString(atts.getValue("version"), data.keySet().iterator().next().getVersion()), uri);

if (!target.equals(schemaKey) && data.containsKey(schemaKey)) {
uri = target.ns;
@@ -244,13 +246,13 @@ private static Class<?> getObjectFactory(Class<?> type) throws ClassNotFoundExce
}

private final Key target;
private final SortedMap<Key, Lazy<Schema>> data;
private final Map<Key, Lazy<Schema>> data;
private final String description;

private SchemaManager(SortedMap<Key, Lazy<Schema>> data) {
private SchemaManager(Map<Key, Lazy<Schema>> data) {
super();
this.data = Collections.unmodifiableSortedMap(data);
this.target = data.lastKey();
this.data = Collections.unmodifiableMap(data);
this.target = data.keySet().stream().skip(data.size() - 1).findFirst().orElseThrow(IllegalStateException::new);
this.description = target.ns.substring(target.ns.lastIndexOf('/') + 1);
}

@@ -57,6 +57,8 @@ public class ValidationMappingParser implements MetadataSource {
"META-INF/validation-mapping-1.0.xsd")
.add(XmlBuilder.Version.v11.getId(), "http://jboss.org/xml/ns/javax/validation/mapping",
"META-INF/validation-mapping-1.1.xsd")
.add(XmlBuilder.Version.v30.getId(), "https://jakarta.ee/xml/ns/validation/mapping",
"META-INF/validation-mapping-3.0.xsd")
.add(XmlBuilder.Version.v20.getId(), "http://xmlns.jcp.org/xml/ns/validation/mapping",
"META-INF/validation-mapping-2.0.xsd")
.build();
@@ -62,6 +62,8 @@ public class ValidationParser {
"META-INF/validation-configuration-1.0.xsd")
.add(XmlBuilder.Version.v11.getId(), "http://jboss.org/xml/ns/javax/validation/configuration",
"META-INF/validation-configuration-1.1.xsd")
.add(XmlBuilder.Version.v30.getId(), "https://jakarta.ee/xml/ns/validation/configuration",
"META-INF/validation-configuration-3.0.xsd")
.add(XmlBuilder.Version.v20.getId(), "http://xmlns.jcp.org/xml/ns/validation/configuration",
"META-INF/validation-configuration-2.0.xsd")
.build();
@@ -0,0 +1,108 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<xs:schema attributeFormDefault="unqualified"
elementFormDefault="qualified"
targetNamespace="https://jakarta.ee/xml/ns/validation/configuration"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:config="https://jakarta.ee/xml/ns/validation/configuration"
version="3.0">

<xs:annotation>
<xs:documentation><![CDATA[
This is the XML Schema for the Jakarta Bean Validation configuration file.
The configuration file must be named "META-INF/validation.xml".
Jakarta Bean Validation configuration files must indicate the Jakarta Bean Validation
XML schema by using the validation namespace:
https://jakarta.ee/xml/ns/validation/configuration
and indicate the version of the schema by using the version attribute
as shown below:
<validation-config
xmlns="https://jakarta.ee/xml/ns/validation/configuration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
https://jakarta.ee/xml/ns/validation/configuration
https://jakarta.ee/xml/ns/validation/validation-configuration-3.0.xsd"
version="3.0">
[...]
</validation-config>
]]>
</xs:documentation>
</xs:annotation>

<xs:element name="validation-config" type="config:validation-configType"/>
<xs:complexType name="validation-configType">
<xs:sequence>
<xs:element type="xs:string" name="default-provider" minOccurs="0"/>
<xs:element type="xs:string" name="message-interpolator" minOccurs="0"/>
<xs:element type="xs:string" name="traversable-resolver" minOccurs="0"/>
<xs:element type="xs:string" name="constraint-validator-factory" minOccurs="0"/>
<xs:element type="xs:string" name="parameter-name-provider" minOccurs="0"/>
<xs:element type="xs:string" name="clock-provider" minOccurs="0"/>
<xs:element type="xs:string" name="value-extractor" maxOccurs="unbounded"
minOccurs="0"/>
<xs:element type="config:executable-validationType" name="executable-validation"
minOccurs="0"/>
<xs:element type="xs:string" name="constraint-mapping" maxOccurs="unbounded"
minOccurs="0"/>
<xs:element type="config:propertyType" name="property" maxOccurs="unbounded"
minOccurs="0"/>
</xs:sequence>
<xs:attribute name="version" type="config:versionType" fixed="3.0" use="required"/>
</xs:complexType>

<xs:complexType name="executable-validationType">
<xs:sequence>
<xs:element type="config:default-validated-executable-typesType"
name="default-validated-executable-types" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="enabled" use="optional" type="xs:boolean" default="true"/>
</xs:complexType>
<xs:complexType name="default-validated-executable-typesType">
<xs:sequence>
<xs:element name="executable-type" maxOccurs="unbounded" minOccurs="1">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="NONE"/>
<xs:enumeration value="CONSTRUCTORS"/>
<xs:enumeration value="NON_GETTER_METHODS"/>
<xs:enumeration value="GETTER_METHODS"/>
<xs:enumeration value="ALL"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="propertyType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="name" use="required" type="xs:string"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="versionType">
<xs:restriction base="xs:token">
<xs:pattern value="[0-9]+(\.[0-9]+)*" />
</xs:restriction>
</xs:simpleType>
</xs:schema>

0 comments on commit 98cd7f9

Please sign in to comment.