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 2020/10/25 20:38:33 UTC
[commons-jexl] branch master updated: Use lambdas.
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
The following commit(s) were added to refs/heads/master by this push:
new 16145ec Use lambdas.
16145ec is described below
commit 16145ecc044d7e68c573409c036e534b9bab3c51
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Oct 25 16:38:29 2020 -0400
Use lambdas.
---
.../jexl3/internal/introspection/ClassMap.java | 8 +---
.../commons/jexl3/introspection/JexlUberspect.java | 46 ++++++++++------------
.../org/apache/commons/jexl3/Issues200Test.java | 6 +--
.../java/org/apache/commons/jexl3/MethodTest.java | 17 ++++----
.../apache/commons/jexl3/ScriptCallableTest.java | 44 ++++++++-------------
5 files changed, 45 insertions(+), 76 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
index 43b9f02..3d6c659 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
@@ -24,7 +24,6 @@ import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -224,12 +223,7 @@ final class ClassMap {
List<Method> lm = new ArrayList<Method>(cache.byKey.size());
lm.addAll(cache.byKey.values());
// sort all methods by name
- lm.sort(new Comparator<Method>() {
- @Override
- public int compare(Method o1, Method o2) {
- return o1.getName().compareTo(o2.getName());
- }
- });
+ lm.sort((o1, o2) -> o1.getName().compareTo(o2.getName()));
// put all lists of methods with same name in byName cache
int start = 0;
while (start < lm.size()) {
diff --git a/src/main/java/org/apache/commons/jexl3/introspection/JexlUberspect.java b/src/main/java/org/apache/commons/jexl3/introspection/JexlUberspect.java
index 41e014c..f546f1b 100644
--- a/src/main/java/org/apache/commons/jexl3/introspection/JexlUberspect.java
+++ b/src/main/java/org/apache/commons/jexl3/introspection/JexlUberspect.java
@@ -159,20 +159,17 @@ public interface JexlUberspect {
* If the operator is '[]' or if the operator is null and the object is a map, use the MAP list of resolvers;
* Other cases use the POJO list of resolvers.
*/
- ResolverStrategy JEXL_STRATEGY = new ResolverStrategy() {
- @Override
- public List<PropertyResolver> apply(JexlOperator op, Object obj) {
- if (op == JexlOperator.ARRAY_GET) {
- return MAP;
- }
- if (op == JexlOperator.ARRAY_SET) {
- return MAP;
- }
- if (op == null && obj instanceof Map) {
- return MAP;
- }
- return POJO;
+ ResolverStrategy JEXL_STRATEGY = (op, obj) -> {
+ if (op == JexlOperator.ARRAY_GET) {
+ return MAP;
+ }
+ if (op == JexlOperator.ARRAY_SET) {
+ return MAP;
+ }
+ if (op == null && obj instanceof Map) {
+ return MAP;
}
+ return POJO;
};
/**
@@ -181,20 +178,17 @@ public interface JexlUberspect {
* <p>If the operator is '[]' or if the object is a map, use the MAP list of resolvers.
* Otherwise, use the POJO list of resolvers.</p>
*/
- ResolverStrategy MAP_STRATEGY = new ResolverStrategy() {
- @Override
- public List<PropertyResolver> apply(JexlOperator op, Object obj) {
- if (op == JexlOperator.ARRAY_GET) {
- return MAP;
- }
- if (op == JexlOperator.ARRAY_SET) {
- return MAP;
- }
- if (obj instanceof Map) {
- return MAP;
- }
- return POJO;
+ ResolverStrategy MAP_STRATEGY = (op, obj) -> {
+ if (op == JexlOperator.ARRAY_GET) {
+ return MAP;
+ }
+ if (op == JexlOperator.ARRAY_SET) {
+ return MAP;
+ }
+ if (obj instanceof Map) {
+ return MAP;
}
+ return POJO;
};
/**
diff --git a/src/test/java/org/apache/commons/jexl3/Issues200Test.java b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
index cdc72f2..0d0afde 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues200Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
@@ -255,11 +255,7 @@ public class Issues200Test extends JexlTestCase {
}
private static void handle(ExecutorService pool, final JexlScript script, final Map<String, Object> payload) {
- pool.submit(new Runnable() {
- @Override public void run() {
- script.execute(new MapContext(payload));
- }
- });
+ pool.submit(() -> script.execute(new MapContext(payload)));
}
@Test
diff --git a/src/test/java/org/apache/commons/jexl3/MethodTest.java b/src/test/java/org/apache/commons/jexl3/MethodTest.java
index b1eb483..5c23505 100644
--- a/src/test/java/org/apache/commons/jexl3/MethodTest.java
+++ b/src/test/java/org/apache/commons/jexl3/MethodTest.java
@@ -688,17 +688,14 @@ public class MethodTest extends JexlTestCase {
return nsScript;
}
if ("functor".equals(name)) {
- return new JexlContext.NamespaceFunctor() {
- @Override
- public Object createFunctor(JexlContext context) {
- Map<String, Object> values = new HashMap<String, Object>();
- if ("gin".equals(context.get("base"))) {
- values.put("drink", "gin fizz");
- } else {
- values.put("drink", "champaign");
- }
- return values;
+ return (NamespaceFunctor) context -> {
+ Map<String, Object> values = new HashMap<String, Object>();
+ if ("gin".equals(context.get("base"))) {
+ values.put("drink", "gin fizz");
+ } else {
+ values.put("drink", "champaign");
}
+ return values;
};
}
return null;
diff --git a/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java b/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
index 390a650..57fe936 100644
--- a/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
@@ -73,12 +73,9 @@ public class ScriptCallableTest extends JexlTestCase {
JexlScript e = JEXL.createScript("latch.release(); while(true);");
final Script.Callable c = (Script.Callable) e.callable(ctxt);
Object t = 42;
- Callable<Object> kc = new Callable<Object>() {
- @Override
- public Object call() throws Exception {
- latch.acquire();
- return c.cancel();
- }
+ Callable<Object> kc = () -> {
+ latch.acquire();
+ return c.cancel();
};
ExecutorService executor = Executors.newFixedThreadPool(2);
Future<?> future = executor.submit(c);
@@ -121,12 +118,9 @@ public class ScriptCallableTest extends JexlTestCase {
JexlScript e = JEXL.createScript("latch.release(); while(true);");
final Script.Callable c = (Script.Callable) e.callable(ctxt);
Object t = 42;
- Callable<Object> kc = new Callable<Object>() {
- @Override
- public Object call() throws Exception {
- latch.acquire();
- return cancel.compareAndSet(false, true);
- }
+ Callable<Object> kc = () -> {
+ latch.acquire();
+ return cancel.compareAndSet(false, true);
};
ExecutorService executor = Executors.newFixedThreadPool(2);
Future<?> future = executor.submit(c);
@@ -462,16 +456,13 @@ public class ScriptCallableTest extends JexlTestCase {
// cancel a sleep
try {
final Future<Object> fc = exec.submit(ssleep.callable(ctxt));
- Runnable cancels = new Runnable() {
- @Override
- public void run() {
- try {
- Thread.sleep(200L);
- } catch (Exception xignore) {
+ Runnable cancels = () -> {
+ try {
+ Thread.sleep(200L);
+ } catch (Exception xignore) {
- }
- fc.cancel(true);
}
+ fc.cancel(true);
};
exec.submit(cancels);
t = f.get(100L, TimeUnit.MILLISECONDS);
@@ -496,16 +487,13 @@ public class ScriptCallableTest extends JexlTestCase {
// cancel a while(true)
try {
final Future<Object> fc = exec.submit(swhile.callable(ctxt));
- Runnable cancels = new Runnable() {
- @Override
- public void run() {
- try {
- Thread.sleep(200L);
- } catch (Exception xignore) {
+ Runnable cancels = () -> {
+ try {
+ Thread.sleep(200L);
+ } catch (Exception xignore) {
- }
- fc.cancel(true);
}
+ fc.cancel(true);
};
exec.submit(cancels);
t = fc.get();