branch develop updated (0436a92 -> 570519b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-validator. See https://gitlab.nuiton.org/nuiton/nuiton-validator.git from 0436a92 prefer use Objects.equals than ObjectUtils.equals new 570519b Revert "prefer use Objects.equals than ObjectUtils.equals" still we stay on java 6. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 570519b5c195ff34ee57f45809c8cd3c357e65d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 27 10:14:18 2016 +0200 Revert "prefer use Objects.equals than ObjectUtils.equals" still we stay on java 6. This reverts commit 0436a929f65bd2e67950a76c8c8875bf1fcee80b. Summary of changes: src/main/java/org/nuiton/validator/bean/AbstractValidator.java | 4 ++-- .../java/org/nuiton/validator/bean/simple/SimpleBeanValidator.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-validator. See https://gitlab.nuiton.org/nuiton/nuiton-validator.git commit 570519b5c195ff34ee57f45809c8cd3c357e65d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 27 10:14:18 2016 +0200 Revert "prefer use Objects.equals than ObjectUtils.equals" still we stay on java 6. This reverts commit 0436a929f65bd2e67950a76c8c8875bf1fcee80b. --- src/main/java/org/nuiton/validator/bean/AbstractValidator.java | 4 ++-- .../java/org/nuiton/validator/bean/simple/SimpleBeanValidator.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/nuiton/validator/bean/AbstractValidator.java b/src/main/java/org/nuiton/validator/bean/AbstractValidator.java index 49e3262..ba8657a 100644 --- a/src/main/java/org/nuiton/validator/bean/AbstractValidator.java +++ b/src/main/java/org/nuiton/validator/bean/AbstractValidator.java @@ -22,6 +22,7 @@ package org.nuiton.validator.bean; */ import com.google.common.base.Preconditions; +import org.apache.commons.lang3.ObjectUtils; import org.nuiton.util.beans.BeanUtil; import org.nuiton.validator.NuitonValidator; import org.nuiton.validator.NuitonValidatorModel; @@ -32,7 +33,6 @@ import javax.swing.event.EventListenerList; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import java.util.Objects; import java.util.Set; /** @@ -205,7 +205,7 @@ public abstract class AbstractValidator<O> { String oldContext = getContext(); - if (Objects.equals(context, oldContext)) { + if (ObjectUtils.equals(context, oldContext)) { // same context do nothing return; diff --git a/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidator.java b/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidator.java index e878e18..2706e02 100644 --- a/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidator.java +++ b/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidator.java @@ -39,7 +39,6 @@ import org.nuiton.validator.bean.AbstractValidator; import java.beans.PropertyChangeListener; import java.util.List; -import java.util.Objects; /** * Validator for a javaBean object. @@ -299,7 +298,7 @@ public class SimpleBeanValidator<O> extends AbstractValidator<O> { @Override public <T> T convert(O bean, String fieldName, String value, Class<T> valueClass) { Preconditions.checkState( - Objects.equals(bean, getBean()), + ObjectUtils.equals(bean, getBean()), "Can not validate the bean [" + bean + "] which is not the one registred [" + bean + "] in this validator."); @@ -354,7 +353,7 @@ public class SimpleBeanValidator<O> extends AbstractValidator<O> { protected void doValidate(O bean) { Preconditions.checkState( - Objects.equals(bean, getBean()), + ObjectUtils.equals(bean, getBean()), "Can not validate the bean [" + bean + "] which is not the one registred [" + bean + "] in this validator."); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm