You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/11/28 19:17:36 UTC
[commons-jexl] 02/15: No need to nest
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
commit d5e243b331e9ac9c109a1805dcb74b96f275c16a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 28 13:54:47 2022 -0500
No need to nest
---
src/main/java/org/apache/commons/jexl3/internal/Operators.java | 3 +--
.../apache/commons/jexl3/internal/introspection/Permissions.java | 3 +--
.../java/org/apache/commons/jexl3/introspection/JexlSandbox.java | 6 ++----
src/main/java/org/apache/commons/jexl3/parser/JexlParser.java | 9 ++++-----
4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Operators.java b/src/main/java/org/apache/commons/jexl3/internal/Operators.java
index b81d1540..831b1ad6 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Operators.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Operators.java
@@ -102,9 +102,8 @@ public class Operators {
// check operator only once if it is not strict
if (arithmetic.isStrict(operator)) {
throw new JexlArithmetic.NullOperand();
- } else {
- break;
}
+ break;
}
}
}
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/Permissions.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/Permissions.java
index 02788748..95879ff8 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/Permissions.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/Permissions.java
@@ -118,9 +118,8 @@ public class Permissions implements JexlPermissions {
if (keyb != null) {
keyb.append(clazz.getSimpleName());
return keyb.toString();
- } else {
- return clazz.getSimpleName();
}
+ return clazz.getSimpleName();
}
/**
diff --git a/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java b/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
index 1bdadfbb..fa8438b3 100644
--- a/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
+++ b/src/main/java/org/apache/commons/jexl3/introspection/JexlSandbox.java
@@ -651,9 +651,8 @@ public final class JexlSandbox {
if (permissions != null) {
if (permissions.isInheritable()) {
break;
- } else {
- permissions = null;
}
+ permissions = null;
}
}
// nothing defined yet, find first superclass that defines permissions
@@ -666,9 +665,8 @@ public final class JexlSandbox {
if (permissions != null) {
if (permissions.isInheritable()) {
break;
- } else {
- permissions = null;
}
+ permissions = null;
}
zuper = zuper.getSuperclass();
}
diff --git a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
index a86119dc..56f65876 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
@@ -537,12 +537,11 @@ public abstract class JexlParser extends StringParser {
if (previous instanceof Set<?>) {
((Set<Object>) previous).add(newValue);
return previous;
- } else {
- Set<Object> values = new LinkedHashSet<>();
- values.add(previous);
- values.add(newValue);
- return values;
}
+ Set<Object> values = new LinkedHashSet<>();
+ values.add(previous);
+ values.add(newValue);
+ return values;
});
}