diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/form/ConfigureFormReader.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/form/ConfigureFormReader.java index 0184c41d8..865c3e834 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/form/ConfigureFormReader.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/form/ConfigureFormReader.java @@ -90,7 +90,7 @@ public interface ConfigureFormReader extends FormReader { * @return List of the whitelist */ default List getChildrenAssociationWhitelist() { - FormField formField = read(ConfigureNodeFields.children_association_whitelist.getFieldName()); + FormField formField = getField(ConfigureNodeFields.children_association_whitelist.getFieldName()); if (formField == null) { Collections.emptyList(); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/form/FillableForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/form/FillableForm.java index 39b1f4efd..62fd32540 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/form/FillableForm.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/form/FillableForm.java @@ -243,13 +243,13 @@ public class FillableForm extends FilledForm { } @Override - public FormField read(String fieldName) { + public FormField getField(String fieldName) { FormField filledField = filledFields.get(fieldName); if (filledField != null) { return filledField; } - return super.read(fieldName); + return super.getField(fieldName); } public DataForm getDataFormToSubmit() { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/form/FilledForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/form/FilledForm.java index baa768f39..7624eab80 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/form/FilledForm.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/form/FilledForm.java @@ -43,7 +43,7 @@ public abstract class FilledForm implements FormReader { } @Override - public FormField read(String fieldName) { + public FormField getField(String fieldName) { return dataForm.getField(fieldName); } @@ -74,10 +74,6 @@ public abstract class FilledForm implements FormReader { return dataForm.hasField(fieldName); } - public FormField getField(String fieldName) { - return dataForm.getField(fieldName); - } - protected FormField getFieldOrThrow(String fieldName) { FormField formField = getField(fieldName); if (formField == null) { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/form/FormReader.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/form/FormReader.java index 6a04fff46..493abd25a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/form/FormReader.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/form/FormReader.java @@ -30,10 +30,10 @@ import org.jxmpp.util.XmppDateTime; public interface FormReader { - FormField read(String fieldName); + FormField getField(String fieldName); default String readFirstValue(String fieldName) { - FormField formField = read(fieldName); + FormField formField = getField(fieldName); if (formField == null) { return null; } @@ -41,7 +41,7 @@ public interface FormReader { } default List readValues(String fieldName) { - FormField formField = read(fieldName); + FormField formField = getField(fieldName); if (formField == null) { return Collections.emptyList(); } @@ -49,7 +49,7 @@ public interface FormReader { } default List readStringValues(String fieldName) { - FormField formField = read(fieldName); + FormField formField = getField(fieldName); if (formField == null) { return Collections.emptyList(); } @@ -58,7 +58,7 @@ public interface FormReader { } default Boolean readBoolean(String fieldName) { - FormField formField = read(fieldName); + FormField formField = getField(fieldName); if (formField == null) { return null; } @@ -67,7 +67,7 @@ public interface FormReader { } default Integer readInteger(String fieldName) { - FormField formField = read(fieldName); + FormField formField = getField(fieldName); if (formField == null) { return null; } @@ -76,7 +76,7 @@ public interface FormReader { } default Date readDate(String fieldName) throws ParseException { - FormField formField = read(fieldName); + FormField formField = getField(fieldName); if (formField == null) { return null; }