You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2020/07/08 19:02:48 UTC
[myfaces-tobago] branch master updated: chore: simplify
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new 2714331 chore: simplify
2714331 is described below
commit 2714331c62048567e4d63385e8dbc470f4cf2426
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Jul 8 20:59:52 2020 +0200
chore: simplify
---
.../main/java/org/apache/myfaces/tobago/context/Markup.java | 9 +++------
.../java/org/apache/myfaces/tobago/context/ThemeResource.java | 4 ++--
.../apache/myfaces/tobago/el/ConstantMethodExpression.java | 4 ++--
.../apache/myfaces/tobago/util/ValueExpressionComparator.java | 11 ++++-------
.../tobago/validator/SubmittedValueLengthValidator.java | 9 +++------
5 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
index 721084c..5ea4c99 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
@@ -31,6 +31,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -348,14 +349,10 @@ public final class Markup implements Serializable, Iterable<String> {
final Markup markup = (Markup) o;
- if (value != null ? !value.equals(markup.value) : markup.value != null) {
+ if (!Objects.equals(value, markup.value)) {
return false;
}
- if (!Arrays.equals(values, markup.values)) {
- return false;
- }
-
- return true;
+ return Arrays.equals(values, markup.values);
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResource.java
index 337f88d..bb9ad5d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeResource.java
@@ -20,6 +20,7 @@
package org.apache.myfaces.tobago.context;
import java.io.Serializable;
+import java.util.Objects;
/**
* @since 1.5.0
@@ -56,8 +57,7 @@ public abstract class ThemeResource implements Serializable {
final ThemeResource that = (ThemeResource) o;
- return !(name != null ? !name.equals(that.name) : that.name != null);
-
+ return Objects.equals(name, that.name);
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java
index 8364f41..6a063ec 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java
@@ -25,6 +25,7 @@ import javax.el.MethodExpression;
import javax.el.MethodInfo;
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
+import java.util.Objects;
public class ConstantMethodExpression extends MethodExpression implements StateHolder {
@@ -62,8 +63,7 @@ public class ConstantMethodExpression extends MethodExpression implements StateH
final ConstantMethodExpression that = (ConstantMethodExpression) o;
- return !(outcome != null ? !outcome.equals(that.outcome) : that.outcome != null);
-
+ return Objects.equals(outcome, that.outcome);
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
index e9b7c05..b687500 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
@@ -27,6 +27,7 @@ import javax.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
import java.util.Comparator;
import java.util.Map;
+import java.util.Objects;
public class ValueExpressionComparator extends ComparatorBase {
@@ -60,17 +61,13 @@ public class ValueExpressionComparator extends ComparatorBase {
if (!super.equals(o)) {
return false;
}
- if (facesContext != null ? !facesContext.equals(that.facesContext) : that.facesContext != null) {
+ if (!Objects.equals(facesContext, that.facesContext)) {
return false;
}
- if (valueExpression != null ? !valueExpression.equals(that.valueExpression) : that.valueExpression != null) {
+ if (!Objects.equals(valueExpression, that.valueExpression)) {
return false;
}
- if (var != null ? !var.equals(that.var) : that.var != null) {
- return false;
- }
-
- return true;
+ return Objects.equals(var, that.var);
}
public int hashCode() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java
index 6dad7d3..291db03 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java
@@ -28,6 +28,7 @@ import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.validator.LengthValidator;
import javax.faces.validator.ValidatorException;
+import java.util.Objects;
/**
* <p><strong>SubmittedLengthValidator</strong> is a {@link Validator} that checks
@@ -121,14 +122,10 @@ public class SubmittedValueLengthValidator extends LengthValidator {
final SubmittedValueLengthValidator validator = (SubmittedValueLengthValidator) o;
- if (maximum != null ? !maximum.equals(validator.maximum) : validator.maximum != null) {
+ if (!Objects.equals(maximum, validator.maximum)) {
return false;
}
- if (minimum != null ? !minimum.equals(validator.minimum) : validator.minimum != null) {
- return false;
- }
-
- return true;
+ return Objects.equals(minimum, validator.minimum);
}
public int hashCode() {