vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-12-12 14:01:08 +01:00
Code Issues Releases Wiki Activity

Introduce FormFieldChildElement and make FormField immutable

Browse source
This commit is contained in:
Florian Schmaus 2019-06-10 16:58:38 +02:00
parent 1a99801501
commit 4d36e3b521
36 changed files with 1191 additions and 490 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/XDataValidationManager.java
View file

@ -21,11 +21,15 @@ import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPConnectionRegistry;
import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
import org.jivesoftware.smackx.xdata.provider.FormFieldChildElementProviderManager;
import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement;
import org.jivesoftware.smackx.xdatavalidation.provider.DataValidationProvider;
public class XDataValidationManager {
static {
FormFieldChildElementProviderManager.addFormFieldChildElementProvider(new DataValidationProvider());
XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() {
@Override
public void connectionCreated(XMPPConnection connection) {

43
smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java
View file

@ -16,13 +16,15 @@
*/
package org.jivesoftware.smackx.xdatavalidation.packet;
import org.jivesoftware.smack.packet.ExtensionElement;
import javax.xml.namespace.QName;
import org.jivesoftware.smack.packet.NamedElement;
import org.jivesoftware.smack.util.NumberUtil;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smack.util.XmlStringBuilder;
import org.jivesoftware.smackx.xdata.FormField;
import org.jivesoftware.smackx.xdata.FormFieldChildElement;
import org.jivesoftware.smackx.xdata.packet.DataForm;
import org.jivesoftware.smackx.xdatavalidation.ValidationConsistencyException;
@ -34,12 +36,14 @@ import org.jivesoftware.smackx.xdatavalidation.ValidationConsistencyException;
*
* @author Anno van Vliet
*/
public abstract class ValidateElement implements ExtensionElement {
public abstract class ValidateElement implements FormFieldChildElement {
public static final String DATATYPE_XS_STRING = "xs:string";
public static final String ELEMENT = "validate";
public static final String NAMESPACE = "http://jabber.org/protocol/xdata-validate";
public static final QName QNAME = new QName(NAMESPACE, ELEMENT);
private final String datatype;
private ListRange listRange;
@ -82,9 +86,19 @@ public abstract class ValidateElement implements ExtensionElement {
return NAMESPACE;
}
@Override
public QName getQName() {
return QNAME;
}
@Override
public final boolean mustBeOnlyOfHisKind() {
return true;
}
@Override
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder buf = new XmlStringBuilder(this);
XmlStringBuilder buf = new XmlStringBuilder(this, enclosingNamespace);
buf.optAttribute("datatype", datatype);
buf.rightAngleBracket();
appendXML(buf);
@ -115,11 +129,16 @@ public abstract class ValidateElement implements ExtensionElement {
}
/**
* Check if this element is consistent according to the business rules in XEP=0122.
* Check if this element is consistent according to the business rules in XEP-0122.
*
* @param formField
* @param formFieldBuilder the builder used to construct the form field.
*/
public abstract void checkConsistency(FormField formField);
@Override
public abstract void checkConsistency(FormField.Builder formFieldBuilder);
public static ValidateElement from(FormField formField) {
return (ValidateElement) formField.getFormFieldChildElement(QNAME);
}
/**
* Validation only against the datatype itself. Indicates that the value(s) should simply match the field type and
@ -146,7 +165,7 @@ public abstract class ValidateElement implements ExtensionElement {
}
@Override
public void checkConsistency(FormField formField) {
public void checkConsistency(FormField.Builder formField) {
checkListRangeConsistency(formField);
if (formField.getType() != null) {
switch (formField.getType()) {
@ -189,7 +208,7 @@ public abstract class ValidateElement implements ExtensionElement {
}
@Override
public void checkConsistency(FormField formField) {
public void checkConsistency(FormField.Builder formField) {
checkListRangeConsistency(formField);
if (formField.getType() != null) {
switch (formField.getType()) {
@ -257,7 +276,7 @@ public abstract class ValidateElement implements ExtensionElement {
}
@Override
public void checkConsistency(FormField formField) {
public void checkConsistency(FormField.Builder formField) {
checkNonMultiConsistency(formField, METHOD);
if (getDatatype().equals(ValidateElement.DATATYPE_XS_STRING)) {
throw new ValidationConsistencyException(String.format(
@ -307,7 +326,7 @@ public abstract class ValidateElement implements ExtensionElement {
}
@Override
public void checkConsistency(FormField formField) {
public void checkConsistency(FormField.Builder formField) {
checkNonMultiConsistency(formField, METHOD);
}
@ -385,7 +404,7 @@ public abstract class ValidateElement implements ExtensionElement {
*
* @param formField
*/
protected void checkListRangeConsistency(FormField formField) {
protected void checkListRangeConsistency(FormField.Builder formField) {
ListRange listRange = getListRange();
if (listRange == null) {
return;
@ -403,7 +422,7 @@ public abstract class ValidateElement implements ExtensionElement {
* @param formField
* @param method
*/
protected void checkNonMultiConsistency(FormField formField, String method) {
protected void checkNonMultiConsistency(FormField.Builder formField, String method) {
checkListRangeConsistency(formField);
if (formField.getType() != null) {
switch (formField.getType()) {

16
smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationProvider.java
View file

@ -19,10 +19,14 @@ package org.jivesoftware.smackx.xdatavalidation.provider;
import java.io.IOException;
import java.util.logging.Logger;
import javax.xml.namespace.QName;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jivesoftware.smackx.xdata.provider.FormFieldChildElementProvider;
import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement;
import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.BasicValidateElement;
import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.ListRange;
@ -36,11 +40,12 @@ import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.RegexValid
* @author Anno van Vliet
*
*/
public class DataValidationProvider {
public class DataValidationProvider extends FormFieldChildElementProvider<ValidateElement> {
private static final Logger LOGGER = Logger.getLogger(DataValidationProvider.class.getName());
public static ValidateElement parse(XmlPullParser parser) throws XmlPullParserException, IOException {
final int initialDepth = parser.getDepth();
@Override
public ValidateElement parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
throws XmlPullParserException, IOException {
final String dataType = parser.getAttributeValue("", "datatype");
ValidateElement dataValidation = null;
ListRange listRange = null;
@ -98,4 +103,9 @@ public class DataValidationProvider {
return dataValidation;
}
@Override
public QName getQName() {
return ValidateElement.QNAME;
}
}