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 2796ddd39887c8b6c4b3242924b3bd023bdc00f2
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Nov 28 13:54:39 2022 -0500
Use Java diamonds
---
.../java/org/apache/commons/jexl3/MapContext.java | 2 +-
.../commons/jexl3/internal/ArrayBuilder.java | 4 ++--
.../apache/commons/jexl3/internal/MapBuilder.java | 2 +-
.../apache/commons/jexl3/internal/SetBuilder.java | 2 +-
.../apache/commons/jexl3/internal/SoftCache.java | 6 +++---
.../commons/jexl3/internal/TemplateEngine.java | 2 +-
.../jexl3/internal/introspection/Uberspect.java | 16 +++++++--------
.../org/apache/commons/jexl3/AnnotationTest.java | 2 +-
.../org/apache/commons/jexl3/AntishCallTest.java | 4 ++--
.../commons/jexl3/ArithmeticOperatorTest.java | 12 +++++------
.../org/apache/commons/jexl3/ArithmeticTest.java | 2 +-
.../org/apache/commons/jexl3/ArrayAccessTest.java | 10 ++++-----
.../java/org/apache/commons/jexl3/CacheTest.java | 10 ++++-----
.../java/org/apache/commons/jexl3/CaptureLog.java | 2 +-
.../org/apache/commons/jexl3/ClassCreator.java | 4 ++--
.../org/apache/commons/jexl3/ClassCreatorTest.java | 8 ++++----
.../org/apache/commons/jexl3/ExceptionTest.java | 2 +-
src/test/java/org/apache/commons/jexl3/Foo.java | 2 +-
.../org/apache/commons/jexl3/Issues100Test.java | 4 ++--
.../org/apache/commons/jexl3/Issues200Test.java | 24 +++++++++++-----------
.../org/apache/commons/jexl3/Issues300Test.java | 4 ++--
.../java/org/apache/commons/jexl3/IssuesTest.java | 4 ++--
.../java/org/apache/commons/jexl3/JexlTest.java | 22 ++++++++++----------
.../java/org/apache/commons/jexl3/LexicalTest.java | 2 +-
.../org/apache/commons/jexl3/MapLiteralTest.java | 2 +-
.../java/org/apache/commons/jexl3/MethodTest.java | 14 ++++++-------
.../apache/commons/jexl3/PropertyAccessTest.java | 6 +++---
.../apache/commons/jexl3/ScriptCallableTest.java | 2 +-
.../org/apache/commons/jexl3/SetLiteralTest.java | 2 +-
.../org/apache/commons/jexl3/SideEffectTest.java | 8 ++++----
.../org/apache/commons/jexl3/StrategyTest.java | 2 +-
.../commons/jexl3/SynchronizedArithmetic.java | 2 +-
.../commons/jexl3/SynchronizedOverloadsTest.java | 6 +++---
.../java/org/apache/commons/jexl3/VarTest.java | 12 +++++------
.../apache/commons/jexl3/examples/ArrayTest.java | 2 +-
.../org/apache/commons/jexl3/internal/Util.java | 2 +-
.../internal/introspection/DiscoveryTest.java | 4 ++--
.../internal/introspection/MethodKeyTest.java | 4 ++--
.../commons/jexl3/introspection/SandboxTest.java | 2 +-
.../org/apache/commons/jexl3/junit/Asserter.java | 2 +-
40 files changed, 112 insertions(+), 112 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/MapContext.java
b/src/main/java/org/apache/commons/jexl3/MapContext.java
index 40885887..b62c91f6 100644
--- a/src/main/java/org/apache/commons/jexl3/MapContext.java
+++ b/src/main/java/org/apache/commons/jexl3/MapContext.java
@@ -44,7 +44,7 @@ public class MapContext implements JexlContext {
* @param vars the variable map
*/
public MapContext(final Map<String, Object> vars) {
- map = vars == null ? new HashMap<String, Object>() : vars;
+ map = vars == null ? new HashMap<>() : vars;
}
@Override
diff --git a/src/main/java/org/apache/commons/jexl3/internal/ArrayBuilder.java
b/src/main/java/org/apache/commons/jexl3/internal/ArrayBuilder.java
index 11da9ea4..76188fd4 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/ArrayBuilder.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/ArrayBuilder.java
@@ -34,7 +34,7 @@ public class ArrayBuilder implements
JexlArithmetic.ArrayBuilder {
/** The boxing types to primitive conversion map. */
private static final Map<Class<?>, Class<?>> BOXING_CLASSES;
static {
- BOXING_CLASSES = new IdentityHashMap<Class<?>,
Class<?>>(PRIMITIVE_SIZE);
+ BOXING_CLASSES = new IdentityHashMap<>(PRIMITIVE_SIZE);
BOXING_CLASSES.put(Boolean.class, Boolean.TYPE);
BOXING_CLASSES.put(Byte.class, Byte.TYPE);
BOXING_CLASSES.put(Character.class, Character.TYPE);
@@ -116,7 +116,7 @@ public class ArrayBuilder implements
JexlArithmetic.ArrayBuilder {
return new Object[0];
}
if (extended) {
- final List<Object> list = new ArrayList<Object>(added);
+ final List<Object> list = new ArrayList<>(added);
list.addAll(Arrays.asList(untyped).subList(0, added));
return list;
}
diff --git a/src/main/java/org/apache/commons/jexl3/internal/MapBuilder.java
b/src/main/java/org/apache/commons/jexl3/internal/MapBuilder.java
index 57b27e78..57527c3c 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/MapBuilder.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/MapBuilder.java
@@ -32,7 +32,7 @@ public class MapBuilder implements JexlArithmetic.MapBuilder {
* @param size the expected map size
*/
public MapBuilder(final int size) {
- map = new HashMap<Object, Object>(size);
+ map = new HashMap<>(size);
}
@Override
diff --git a/src/main/java/org/apache/commons/jexl3/internal/SetBuilder.java
b/src/main/java/org/apache/commons/jexl3/internal/SetBuilder.java
index 65430ff4..649f53e3 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/SetBuilder.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/SetBuilder.java
@@ -32,7 +32,7 @@ public class SetBuilder implements JexlArithmetic.SetBuilder {
* @param size the expected set size
*/
public SetBuilder(final int size) {
- set = new HashSet<Object>(size);
+ set = new HashSet<>(size);
}
@Override
diff --git a/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
b/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
index 3028e8a6..8c5d0aa5 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
@@ -111,7 +111,7 @@ public class SoftCache<K, V> {
Map<K, V> map = ref != null ? ref.get() : null;
if (map == null) {
map = createCache(size);
- ref = new SoftReference<Map<K, V>>(map);
+ ref = new SoftReference<>(map);
}
map.put(key, script);
} finally {
@@ -134,9 +134,9 @@ public class SoftCache<K, V> {
return Collections.emptyList();
}
final Set<Map.Entry<K, V>> set = map.entrySet();
- final List<Map.Entry<K, V>> entries = new ArrayList<Map.Entry<K,
V>>(set.size());
+ final List<Map.Entry<K, V>> entries = new ArrayList<>(set.size());
for (final Map.Entry<K, V> e : set) {
- entries.add(new SoftCacheEntry<K, V>(e));
+ entries.add(new SoftCacheEntry<>(e));
}
return entries;
} finally {
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
b/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
index ca0e8e3d..809bd62a 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
@@ -1149,7 +1149,7 @@ public final class TemplateEngine extends JxltEngine {
* @return the list of blocks
*/
protected List<Block> readTemplate(final String prefix, final Reader
source) {
- final ArrayList<Block> blocks = new ArrayList<Block>();
+ final ArrayList<Block> blocks = new ArrayList<>();
final BufferedReader reader;
if (source instanceof BufferedReader) {
reader = (BufferedReader) source;
diff --git
a/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
b/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
index 3f741d2a..768a8bb3 100644
---
a/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
+++
b/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
@@ -93,9 +93,9 @@ public class Uberspect implements JexlUberspect {
logger = runtimeLogger == null? LogFactory.getLog(JexlEngine.class) :
runtimeLogger;
strategy = sty == null? JexlUberspect.JEXL_STRATEGY : sty;
permissions = perms == null? Permissions.RESTRICTED : perms;
- ref = new SoftReference<Introspector>(null);
- loader = new SoftReference<ClassLoader>(getClass().getClassLoader());
- operatorMap = new ConcurrentHashMap<Class<? extends JexlArithmetic>,
Set<JexlOperator>>();
+ ref = new SoftReference<>(null);
+ loader = new SoftReference<>(getClass().getClassLoader());
+ operatorMap = new ConcurrentHashMap<>();
version = new AtomicInteger(0);
}
@@ -114,8 +114,8 @@ public class Uberspect implements JexlUberspect {
intro = ref.get();
if (intro == null) {
intro = new Introspector(logger, loader.get(),
permissions);
- ref = new SoftReference<Introspector>(intro);
- loader = new SoftReference<ClassLoader>(intro.getLoader());
+ ref = new SoftReference<>(intro);
+ loader = new SoftReference<>(intro.getLoader());
version.incrementAndGet();
}
}
@@ -132,9 +132,9 @@ public class Uberspect implements JexlUberspect {
intro.setLoader(nloader);
} else {
intro = new Introspector(logger, nloader, permissions);
- ref = new SoftReference<Introspector>(intro);
+ ref = new SoftReference<>(intro);
}
- loader = new SoftReference<ClassLoader>(intro.getLoader());
+ loader = new SoftReference<>(intro.getLoader());
operatorMap.clear();
version.incrementAndGet();
}
@@ -383,7 +383,7 @@ public class Uberspect implements JexlUberspect {
return ((Map<?, ?>) obj).values().iterator();
}
if (obj instanceof Enumeration<?>) {
- return new EnumerationIterator<Object>((Enumeration<Object>) obj);
+ return new EnumerationIterator<>((Enumeration<Object>) obj);
}
if (obj instanceof Iterable<?>) {
return ((Iterable<?>) obj).iterator();
diff --git a/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
b/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
index 7058e616..4ff9ef24 100644
--- a/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
+++ b/src/test/java/org/apache/commons/jexl3/AnnotationTest.java
@@ -51,7 +51,7 @@ public class AnnotationTest extends JexlTestCase {
public static class AnnotationContext extends MapContext implements
JexlContext.AnnotationProcessor {
private int count = 0;
- private final Set<String> names = new TreeSet<String>();
+ private final Set<String> names = new TreeSet<>();
@Override
public Object processAnnotation(final String name, final Object[]
args, final Callable<Object> statement) throws Exception {
diff --git a/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
b/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
index f85e53f8..e2ced601 100644
--- a/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
+++ b/src/test/java/org/apache/commons/jexl3/AntishCallTest.java
@@ -132,7 +132,7 @@ public class AntishCallTest extends JexlTestCase {
@Test
public void testAntishContextVar() throws Exception {
- final Map<String,Object> lmap = new TreeMap<String,Object>();
+ final Map<String,Object> lmap = new TreeMap<>();
final JexlContext jc = new CallSupportContext(lmap).engine(JEXL);
runTestCall(JEXL, jc);
lmap.put("java.math.BigInteger", new ClassReference(BigInteger.class));
@@ -145,7 +145,7 @@ public class AntishCallTest extends JexlTestCase {
public void testAntishArithmetic() throws Exception {
final CallSupportArithmetic ja = new CallSupportArithmetic(true);
final JexlEngine jexl = new
JexlBuilder().cache(512).arithmetic(ja).create();
- final Map<String,Object> lmap = new TreeMap<String,Object>();
+ final Map<String,Object> lmap = new TreeMap<>();
final JexlContext jc = new MapContext(lmap);
lmap.put("java.math.BigInteger", java.math.BigInteger.class);
runTestCall(jexl, jc);
diff --git a/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
b/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
index 1cc3e86b..930a3d81 100644
--- a/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArithmeticOperatorTest.java
@@ -167,7 +167,7 @@ public class ArithmeticOperatorTest extends JexlTestCase {
private final Set<Integer> values;
public MatchingContainer(final int[] is) {
- values = new HashSet<Integer>();
+ values = new HashSet<>();
for (final int value : is) {
values.add(value);
}
@@ -182,7 +182,7 @@ public class ArithmeticOperatorTest extends JexlTestCase {
private final SortedSet<Integer> values;
public IterableContainer(final int[] is) {
- values = new TreeSet<Integer>();
+ values = new TreeSet<>();
for (final int value : is) {
values.add(value);
}
@@ -235,11 +235,11 @@ public class ArithmeticOperatorTest extends JexlTestCase {
public void testMatch() throws Exception {
// check in/not-in on array, list, map, set and duck-type collection
final int[] ai = {2, 4, 42, 54};
- final List<Integer> al = new ArrayList<Integer>();
+ final List<Integer> al = new ArrayList<>();
for (final int i : ai) {
al.add(i);
}
- final Map<Integer, String> am = new HashMap<Integer, String>();
+ final Map<Integer, String> am = new HashMap<>();
am.put(2, "two");
am.put(4, "four");
am.put(42, "forty-two");
@@ -314,7 +314,7 @@ public class ArithmeticOperatorTest extends JexlTestCase {
@Test
@SuppressWarnings("unchecked")
public void testInterval() throws Exception {
- final Map<String, Object> ns = new HashMap<String, Object>();
+ final Map<String, Object> ns = new HashMap<>();
ns.put("calc", Aggregate.class);
final JexlEngine jexl = new JexlBuilder().namespaces(ns).create();
JexlScript script;
@@ -523,7 +523,7 @@ public class ArithmeticOperatorTest extends JexlTestCase {
@Test
public void testFormatArithmeticJxlt() throws Exception {
- final Map<String, Object> ns = new HashMap<String, Object>();
+ final Map<String, Object> ns = new HashMap<>();
ns.put("calc", Aggregate.class);
final Calendar cal = Calendar.getInstance(UTC);
cal.set(1969, Calendar.AUGUST, 20);
diff --git a/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
b/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
index 5d18c5b0..451e1db1 100644
--- a/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
@@ -1503,7 +1503,7 @@ public class ArithmeticTest extends JexlTestCase {
@Test
public void testInfiniteArithmetic() throws Exception {
- final Map<String, Object> ns = new HashMap<String, Object>();
+ final Map<String, Object> ns = new HashMap<>();
ns.put("math", Math.class);
final JexlEngine jexl = new JexlBuilder().arithmetic(new
Arithmetic132()).namespaces(ns).create();
diff --git a/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
b/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
index a53bb28d..a91af3e6 100644
--- a/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
@@ -66,7 +66,7 @@ public class ArrayAccessTest extends JexlTestCase {
* test List access
*/
- final List<Integer> l = new ArrayList<Integer>();
+ final List<Integer> l = new ArrayList<>();
l.add(new Integer(1));
l.add(new Integer(2));
l.add(new Integer(3));
@@ -94,7 +94,7 @@ public class ArrayAccessTest extends JexlTestCase {
/*
* test map access
*/
- final Map<String, String> m = new HashMap<String, String>();
+ final Map<String, String> m = new HashMap<>();
m.put("foo", "bar");
asserter.setVariable("map", m);
@@ -153,8 +153,8 @@ public class ArrayAccessTest extends JexlTestCase {
@Test
public void testDoubleMaps() throws Exception {
- final Map<Object, Map<Object, Object>> foo = new HashMap<Object,
Map<Object, Object>>();
- final Map<Object, Object> foo0 = new HashMap<Object, Object>();
+ final Map<Object, Map<Object, Object>> foo = new HashMap<>();
+ final Map<Object, Object> foo0 = new HashMap<>();
foo.put(0, foo0);
foo0.put(0, "one");
foo0.put(1, "two");
@@ -221,7 +221,7 @@ public class ArrayAccessTest extends JexlTestCase {
@Test
public void testArrayIdentifierParsing() throws Exception {
- final Map<Object, Number> map = new HashMap<Object, Number>();
+ final Map<Object, Number> map = new HashMap<>();
map.put("00200", -42.42d);
map.put(200, 42.42d);
asserter.setVariable("objects", map);
diff --git a/src/test/java/org/apache/commons/jexl3/CacheTest.java
b/src/test/java/org/apache/commons/jexl3/CacheTest.java
index 439a536e..62b1749a 100644
--- a/src/test/java/org/apache/commons/jexl3/CacheTest.java
+++ b/src/test/java/org/apache/commons/jexl3/CacheTest.java
@@ -294,7 +294,7 @@ public class CacheTest extends JexlTestCase {
jexl = jexlCache;
}
final java.util.concurrent.ExecutorService execs =
java.util.concurrent.Executors.newFixedThreadPool(NTHREADS);
- final List<Callable<Integer>> tasks = new
ArrayList<Callable<Integer>>(NTHREADS);
+ final List<Callable<Integer>> tasks = new ArrayList<>(NTHREADS);
for (int t = 0; t < NTHREADS; ++t) {
tasks.add(jexl.newInstance(ctask, loops));
}
@@ -312,7 +312,7 @@ public class CacheTest extends JexlTestCase {
public abstract static class Task implements Callable<Integer> {
final TestCacheArguments args = new TestCacheArguments();
final int loops;
- final Map<String, Object> vars = new HashMap<String, Object>();
+ final Map<String, Object> vars = new HashMap<>();
final JexlEvalContext jc = new JexlEvalContext(vars);
Task(final int loops) {
@@ -451,7 +451,7 @@ public class CacheTest extends JexlTestCase {
/** The actual test function. */
private Integer runAssignList() {
args.value = new Object[]{"foo"};
- final java.util.ArrayList<String> c1 = new
java.util.ArrayList<String>(2);
+ final java.util.ArrayList<String> c1 = new
java.util.ArrayList<>(2);
c1.add("foo");
c1.add("bar");
args.ca = new Object[]{
@@ -641,8 +641,8 @@ public class CacheTest extends JexlTestCase {
if (!cache) {
jexl.clearCache();
}
- final Map<String, Object> vars = new HashMap<String, Object>();
- final java.util.Map<String, Object> funcs = new
java.util.HashMap<String, Object>();
+ final Map<String, Object> vars = new HashMap<>();
+ final java.util.Map<String, Object> funcs = new java.util.HashMap<>();
final JexlEvalContext jc = new JexlContextNS(vars, funcs);
final JexlExpression compute2 =
jexl.createExpression("cached:COMPUTE(a0, a1)");
final JexlExpression compute1 =
jexl.createExpression("cached:COMPUTE(a0)");
diff --git a/src/test/java/org/apache/commons/jexl3/CaptureLog.java
b/src/test/java/org/apache/commons/jexl3/CaptureLog.java
index 227c7ae0..0aca8512 100644
--- a/src/test/java/org/apache/commons/jexl3/CaptureLog.java
+++ b/src/test/java/org/apache/commons/jexl3/CaptureLog.java
@@ -23,7 +23,7 @@ import org.apache.commons.logging.Log;
* A log implementation to help control tests results.
*/
public class CaptureLog implements Log {
- private final List<Object[]> captured = new ArrayList<Object[]>();
+ private final List<Object[]> captured = new ArrayList<>();
static Object caller() {
final StackTraceElement[] stack = new
Exception().fillInStackTrace().getStackTrace();
diff --git a/src/test/java/org/apache/commons/jexl3/ClassCreator.java
b/src/test/java/org/apache/commons/jexl3/ClassCreator.java
index bdff9686..987d8aa5 100644
--- a/src/test/java/org/apache/commons/jexl3/ClassCreator.java
+++ b/src/test/java/org/apache/commons/jexl3/ClassCreator.java
@@ -191,12 +191,12 @@ public class ClassCreator {
Class<?> compile() throws Exception {
final String source = packageDir.getPath() + "/" + sourceName;
final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
- final DiagnosticCollector<JavaFileObject> diagnosticsCollector = new
DiagnosticCollector<JavaFileObject>();
+ final DiagnosticCollector<JavaFileObject> diagnosticsCollector = new
DiagnosticCollector<>();
final StandardJavaFileManager fileManager =
compiler.getStandardFileManager(diagnosticsCollector, null, null);
final Iterable<? extends JavaFileObject> compilationUnits = fileManager
.getJavaFileObjectsFromStrings(Collections.singletonList(source));
- final List<String> options = new ArrayList<String>();
+ final List<String> options = new ArrayList<>();
options.add("-classpath");
// only add hbase classes to classpath. This is a little bit tricky:
assume
// the classpath is {hbaseSrc}/target/classes.
diff --git a/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
b/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
index f778fae3..5ff6dcec 100644
--- a/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
@@ -186,7 +186,7 @@ public class ClassCreatorTest extends JexlTestCase {
void functorTwo(final Object nstest) throws Exception {
// create jexl2 with a 'test' namespace
- final Map<String, Object> ns = new HashMap<String, Object>();
+ final Map<String, Object> ns = new HashMap<>();
ns.put("test", nstest);
final JexlEngine jexl2 = new JexlBuilder().namespaces(ns).create();
final JexlContext ctxt = new MapContext();
@@ -241,7 +241,7 @@ public class ClassCreatorTest extends JexlTestCase {
jexl.setClassLoader(cctor.getClassLoader());
cctor.clear();
- final Map<String, Object> ns = new HashMap<String, Object>();
+ final Map<String, Object> ns = new HashMap<>();
ns.put("test", foo1);
final JexlEngine jexl2 = new JexlBuilder().namespaces(ns).create();
@@ -272,8 +272,8 @@ public class ClassCreatorTest extends JexlTestCase {
}
int pass = 0;
int gced = -1;
- final ReferenceQueue<Object> queue = new ReferenceQueue<Object>();
- final List<Reference<?>> stuff = new ArrayList<Reference<?>>();
+ final ReferenceQueue<Object> queue = new ReferenceQueue<>();
+ final List<Reference<?>> stuff = new ArrayList<>();
// keeping a reference on methods prevent classes from being GCed
// List<Object> mm = new ArrayList<Object>();
final JexlExpression expr = jexl.createExpression("foo.value");
diff --git a/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
b/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
index ed851dd0..d913070f 100644
--- a/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ExceptionTest.java
@@ -55,7 +55,7 @@ public class ExceptionTest extends JexlTestCase {
public void testWrappedEx() throws Exception {
final JexlEngine jexl = new Engine();
final JexlExpression e = jexl.createExpression("npe()");
- final JexlContext jc = new ObjectContext<ThrowNPE>(jexl, new
ThrowNPE());
+ final JexlContext jc = new ObjectContext<>(jexl, new ThrowNPE());
try {
e.evaluate(jc);
Assert.fail("Should have thrown NPE");
diff --git a/src/test/java/org/apache/commons/jexl3/Foo.java
b/src/test/java/org/apache/commons/jexl3/Foo.java
index d37a154d..ef4a29ea 100644
--- a/src/test/java/org/apache/commons/jexl3/Foo.java
+++ b/src/test/java/org/apache/commons/jexl3/Foo.java
@@ -70,7 +70,7 @@ public class Foo {
public List<String> getCheeseList()
{
- final ArrayList<String> answer = new ArrayList<String>();
+ final ArrayList<String> answer = new ArrayList<>();
answer.add("cheddar");
answer.add("edam");
answer.add("brie");
diff --git a/src/test/java/org/apache/commons/jexl3/Issues100Test.java
b/src/test/java/org/apache/commons/jexl3/Issues100Test.java
index 2741dece..eaceaca6 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues100Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues100Test.java
@@ -389,7 +389,7 @@ public class Issues100Test extends JexlTestCase {
final JexlContext jc = new MapContext();
JexlScript script;
Object result;
- final Map<Integer, Object> foo = new HashMap<Integer, Object>();
+ final Map<Integer, Object> foo = new HashMap<>();
foo.put(3, 42);
jc.set("state", foo);
@@ -640,7 +640,7 @@ public class Issues100Test extends JexlTestCase {
}
public List<Integer> asList(final int[] array) {
- final List<Integer> l = new ArrayList<Integer>(array.length);
+ final List<Integer> l = new ArrayList<>(array.length);
for (final int i : array) {
l.add(i);
}
diff --git a/src/test/java/org/apache/commons/jexl3/Issues200Test.java
b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
index 4b1e701f..268255df 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues200Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
@@ -71,7 +71,7 @@ public class Issues200Test extends JexlTestCase {
@Test
public void test200() throws Exception {
final JexlContext jc = new MapContext();
- final Map<String, Object> funcs = new HashMap<String, Object>();
+ final Map<String, Object> funcs = new HashMap<>();
final Eval eval = new Eval();
funcs.put(null, eval);
final JexlEngine jexl = new JexlBuilder().namespaces(funcs).create();
@@ -164,7 +164,7 @@ public class Issues200Test extends JexlTestCase {
@Test
public void test221() throws Exception {
final JexlEvalContext jc = new JexlEvalContext();
- final Map<String, Integer> map = new HashMap<String, Integer>();
+ final Map<String, Integer> map = new HashMap<>();
map.put("one", 1);
jc.set("map", map);
final JexlEngine jexl = new JexlBuilder().cache(256).create();
@@ -216,7 +216,7 @@ public class Issues200Test extends JexlTestCase {
@Test
public void test224() throws Exception {
final List<String> a0 = Arrays.asList("one", "two");
- final Set<String> a1 = new TreeSet<String>(a0);
+ final Set<String> a1 = new TreeSet<>(a0);
final JexlContext jc = new MapContext();
final JexlEngine jexl = new JexlBuilder().arithmetic(new
JexlArithmetic224(true)).create();
Object r;
@@ -250,7 +250,7 @@ public class Issues200Test extends JexlTestCase {
final JexlExpression expression = jexl.createExpression("bar()");
Assert.assertEquals("bar", expression.evaluate(df));
- final ObjectContext<Object> context = new ObjectContext<Object>(jexl,
df);
+ final ObjectContext<Object> context = new ObjectContext<>(jexl, df);
Assert.assertEquals("bar", expression.evaluate(context));
}
@@ -265,9 +265,9 @@ public class Issues200Test extends JexlTestCase {
pool = Executors.newFixedThreadPool(4);
- final Map<String, Object> m1 = new HashMap<String, Object>();
+ final Map<String, Object> m1 = new HashMap<>();
m1.put("item", "A");
- final Map<String, Object> m2 = new HashMap<String, Object>();
+ final Map<String, Object> m2 = new HashMap<>();
m2.put("item", "B");
handle(pool, script, m1);
@@ -483,7 +483,7 @@ public class Issues200Test extends JexlTestCase {
static final ThreadLocal<Deque<Iterator266>> TLS_FOREACH = new
ThreadLocal<Deque<Iterator266>>() {
@Override
public Deque<Iterator266> initialValue() {
- return new LinkedList<Iterator266>();
+ return new LinkedList<>();
}
};
public Arithmetic266(final boolean strict) {
@@ -526,14 +526,14 @@ public class Issues200Test extends JexlTestCase {
final JexlEngine jexl = new JexlBuilder().arithmetic(new
Arithmetic266(true)).create();
final JexlContext ctxt = new MapContext();
- final List<Integer> li = new ArrayList<Integer>(Arrays.asList(1, 2, 3,
4, 5 ,6));
+ final List<Integer> li = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5
,6));
ctxt.set("list", li);
script = jexl.createScript("for (var item : list) { if (item <= 3)
remove(); } return size(list)");
result = script.execute(ctxt);
Assert.assertEquals(3, result);
Assert.assertEquals(3, li.size());
- final Map<String, Integer> msi = new HashMap<String, Integer>();
+ final Map<String, Integer> msi = new HashMap<>();
msi.put("a", 1);
msi.put("b", 2);
msi.put("c", 3);
@@ -799,7 +799,7 @@ public class Issues200Test extends JexlTestCase {
@Test
public void test285() throws Exception {
- final List<String> out = new ArrayList<String>(6);
+ final List<String> out = new ArrayList<>(6);
final JexlContext ctxt = new MapContext();
ctxt.set("$out", out);
final String src = "for(var b: ['g','h','i']) {\n"
@@ -827,7 +827,7 @@ public class Issues200Test extends JexlTestCase {
@Test
public void test285a() throws Exception {
- final List<String> out = new ArrayList<String>(6);
+ final List<String> out = new ArrayList<>(6);
final JexlContext ctxt = new MapContext();
ctxt.set("$out", out);
final String src =
@@ -845,7 +845,7 @@ public class Issues200Test extends JexlTestCase {
@Test
public void test285b() throws Exception {
- final List<String> out = new ArrayList<String>(6);
+ final List<String> out = new ArrayList<>(6);
final JexlContext ctxt = new MapContext();
ctxt.set("$out", out);
final String src =
diff --git a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
index cab32c2e..d88919c1 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
@@ -820,7 +820,7 @@ public class Issues300Test {
@Test public void test370() {
Var370 var370 = new Var370();
JexlEngine jexl = new JexlBuilder().safe(true).create();
- ObjectContext<Var370> ctxt = new ObjectContext<Var370>(jexl, var370);
+ ObjectContext<Var370> ctxt = new ObjectContext<>(jexl, var370);
JexlExpression get = jexl.createExpression("name");
// not null
var370.setName("John");
@@ -866,7 +866,7 @@ public class Issues300Test {
// Create an object with getter for name
TestObject374 myObject = new TestObject374();
myObject.setName("John");
- JexlContext context = new ObjectContext<TestObject374>(engine,
myObject);
+ JexlContext context = new ObjectContext<>(engine, myObject);
// Expect an exception because nested is null, so we are doing
null.name
try {
Object result = expr.evaluate(context);
diff --git a/src/test/java/org/apache/commons/jexl3/IssuesTest.java
b/src/test/java/org/apache/commons/jexl3/IssuesTest.java
index f72b1891..c1731e63 100644
--- a/src/test/java/org/apache/commons/jexl3/IssuesTest.java
+++ b/src/test/java/org/apache/commons/jexl3/IssuesTest.java
@@ -46,7 +46,7 @@ public class IssuesTest extends JexlTestCase {
@Test
public void test49() throws Exception {
final JexlEngine jexl = new Engine();
- final Map<String, Object> vars = new HashMap<String, Object>();
+ final Map<String, Object> vars = new HashMap<>();
final JexlContext ctxt = new MapContext(vars);
final String stmt = "a = 'b'; c = 'd';";
final JexlScript expr = jexl.createScript(stmt);
@@ -384,7 +384,7 @@ public class IssuesTest extends JexlTestCase {
"fn:replace(\"DOMAIN\\somename\", \"\\\\\", \"\\\\\\\\\")",
"fn:replace('DOMAIN\\somename', '\\u005c', '\\u005c\\u005c')"
};
- final Map<String, Object> funcs = new HashMap<String, Object>();
+ final Map<String, Object> funcs = new HashMap<>();
funcs.put("fn", new fn98());
final JexlEngine jexl = new JexlBuilder().namespaces(funcs).create();
for (final String expr : exprs) {
diff --git a/src/test/java/org/apache/commons/jexl3/JexlTest.java
b/src/test/java/org/apache/commons/jexl3/JexlTest.java
index 11c11f2d..2178b33c 100644
--- a/src/test/java/org/apache/commons/jexl3/JexlTest.java
+++ b/src/test/java/org/apache/commons/jexl3/JexlTest.java
@@ -165,8 +165,8 @@ public final class JexlTest extends JexlTestCase {
jc.set("string", "");
jc.set("array", new Object[0]);
jc.set("map", new HashMap<>());
- jc.set("list", new ArrayList<Object>());
- jc.set("set", (new HashMap<Object, Object>()).keySet());
+ jc.set("list", new ArrayList<>());
+ jc.set("set", (new HashMap<>()).keySet());
jc.set("longstring", "thingthing");
/*
@@ -190,7 +190,7 @@ public final class JexlTest extends JexlTestCase {
jc.set("s", "five!");
jc.set("array", new Object[5]);
- final Map<String, Integer> map = new HashMap<String, Integer>();
+ final Map<String, Integer> map = new HashMap<>();
map.put("1", new Integer(1));
map.put("2", new Integer(2));
@@ -200,7 +200,7 @@ public final class JexlTest extends JexlTestCase {
jc.set("map", map);
- final List<String> list = new ArrayList<String>();
+ final List<String> list = new ArrayList<>();
list.add("1");
list.add("2");
@@ -211,7 +211,7 @@ public final class JexlTest extends JexlTestCase {
jc.set("list", list);
// 30652 - support for set
- final Set<String> set = new HashSet<String>(list);
+ final Set<String> set = new HashSet<>(list);
set.add("1");
jc.set("set", set);
@@ -239,7 +239,7 @@ public final class JexlTest extends JexlTestCase {
@Test
public void testSizeAsProperty() throws Exception {
final JexlContext jc = new MapContext();
- final Map<String, Object> map = new HashMap<String, Object>();
+ final Map<String, Object> map = new HashMap<>();
map.put("size", "cheese");
map.put("si & ze", "cheese");
jc.set("map", map);
@@ -316,8 +316,8 @@ public final class JexlTest extends JexlTestCase {
jc.set("aChar", new Character('A'));
jc.set("aBool", Boolean.TRUE);
final StringBuilder buffer = new StringBuilder("abc");
- final List<Object> list = new ArrayList<Object>();
- final List<Object> list2 = new LinkedList<Object>();
+ final List<Object> list = new ArrayList<>();
+ final List<Object> list2 = new LinkedList<>();
jc.set("aBuffer", buffer);
jc.set("aList", list);
jc.set("bList", list2);
@@ -491,7 +491,7 @@ public final class JexlTest extends JexlTestCase {
*/
@Test
public void testMapDot() throws Exception {
- final Map<String, String> foo = new HashMap<String, String>();
+ final Map<String, String> foo = new HashMap<>();
foo.put("bar", "123");
final JexlContext jc = new MapContext();
@@ -574,8 +574,8 @@ public final class JexlTest extends JexlTestCase {
@Test
public void testEmptySubListOfMap() throws Exception {
final JexlContext jc = new MapContext();
- final Map<String, ArrayList<?>> m = new HashMap<String,
ArrayList<?>>();
- m.put("aList", new ArrayList<Object>());
+ final Map<String, ArrayList<?>> m = new HashMap<>();
+ m.put("aList", new ArrayList<>());
jc.set("aMap", m);
diff --git a/src/test/java/org/apache/commons/jexl3/LexicalTest.java
b/src/test/java/org/apache/commons/jexl3/LexicalTest.java
index c8eb26c1..7dd7924d 100644
--- a/src/test/java/org/apache/commons/jexl3/LexicalTest.java
+++ b/src/test/java/org/apache/commons/jexl3/LexicalTest.java
@@ -761,7 +761,7 @@ public class LexicalTest {
}
final JexlEngine jexl = new JexlBuilder().features(features).create();
final JexlScript script = jexl.createScript(src);
- final List<Integer> out = new ArrayList<Integer>(10);
+ final List<Integer> out = new ArrayList<>(10);
vars.set("$out", out);
final Object result = script.execute(vars);
Assert.assertEquals(true, result);
diff --git a/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java
b/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java
index 8249b609..3322b58f 100644
--- a/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java
+++ b/src/test/java/org/apache/commons/jexl3/MapLiteralTest.java
@@ -46,7 +46,7 @@ public class MapLiteralTest extends JexlTestCase {
final JexlExpression e = JEXL.createExpression("{ 'foo' : 'bar', 'eat'
: 'food' }");
final JexlContext jc = new MapContext();
- final Map<String, String> expected = new HashMap<String, String>();
+ final Map<String, String> expected = new HashMap<>();
expected.put("foo", "bar");
expected.put("eat", "food");
diff --git a/src/test/java/org/apache/commons/jexl3/MethodTest.java
b/src/test/java/org/apache/commons/jexl3/MethodTest.java
index 47f98ff5..36cbe663 100644
--- a/src/test/java/org/apache/commons/jexl3/MethodTest.java
+++ b/src/test/java/org/apache/commons/jexl3/MethodTest.java
@@ -478,7 +478,7 @@ public class MethodTest extends JexlTestCase {
@Test
public void testTopLevelCall() throws Exception {
- final java.util.Map<String, Object> funcs = new
java.util.HashMap<String, Object>();
+ final java.util.Map<String, Object> funcs = new java.util.HashMap<>();
funcs.put(null, new Functor());
funcs.put("math", new MyMath());
funcs.put("cx", ContextualFunctor.class);
@@ -509,7 +509,7 @@ public class MethodTest extends JexlTestCase {
@Test
public void testNamespaceCall() throws Exception {
- final java.util.Map<String, Object> funcs = new
java.util.HashMap<String, Object>();
+ final java.util.Map<String, Object> funcs = new java.util.HashMap<>();
funcs.put("func", new Functor());
funcs.put("FUNC", Functor.class);
@@ -604,7 +604,7 @@ public class MethodTest extends JexlTestCase {
@Test
public void testNamespaceCallEdge() throws Exception {
- final java.util.Map<String, Object> funcs = new
java.util.HashMap<String, Object>();
+ final java.util.Map<String, Object> funcs = new java.util.HashMap<>();
final Edge func = new Edge();
funcs.put("func", func);
@@ -687,7 +687,7 @@ public class MethodTest extends JexlTestCase {
}
if ("functor".equals(name)) {
return (NamespaceFunctor) context -> {
- final Map<String, Object> values = new HashMap<String,
Object>();
+ final Map<String, Object> values = new HashMap<>();
if ("gin".equals(context.get("base"))) {
values.put("drink", "gin fizz");
} else {
@@ -709,7 +709,7 @@ public class MethodTest extends JexlTestCase {
Object o = forty2.execute(context);
Assert.assertEquals("Result is not 42", new Integer(42), o);
- final Map<String, Object> foo = new HashMap<String, Object>();
+ final Map<String, Object> foo = new HashMap<>();
foo.put("plus", plus);
context.set("foo", foo);
forty2 = JEXL.createScript("foo.plus(4, 2) * foo.plus(4, 3)");
@@ -823,8 +823,8 @@ public class MethodTest extends JexlTestCase {
@Test
public void testVariousFunctionLocation() throws Exception {
// see JEXL-190
- final Map<String, Object> vars = new HashMap<String, Object>();
- final Map<String,Object> funcs = new HashMap<String,Object>();
+ final Map<String, Object> vars = new HashMap<>();
+ final Map<String,Object> funcs = new HashMap<>();
funcs.put(null, new ZSpace());
final JexlEngine jexl = new
JexlBuilder().namespaces(funcs).arithmetic(new ZArithmetic(true)).create();
diff --git a/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
b/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
index b250fc36..94445f01 100644
--- a/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
+++ b/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
@@ -299,7 +299,7 @@ public class PropertyAccessTest extends JexlTestCase {
@Test
public void testStringIdentifier() throws Exception {
- final Map<String, String> foo = new HashMap<String, String>();
+ final Map<String, String> foo = new HashMap<>();
final JexlContext jc = new MapContext();
jc.set("foo", foo);
@@ -381,7 +381,7 @@ public class PropertyAccessTest extends JexlTestCase {
@Test
public void test250() throws Exception {
final MapContext ctx = new MapContext();
- final HashMap<Object, Object> x = new HashMap<Object, Object>();
+ final HashMap<Object, Object> x = new HashMap<>();
x.put(2, "123456789");
ctx.set("x", x);
final JexlEngine engine = new JexlBuilder()
@@ -444,7 +444,7 @@ public class PropertyAccessTest extends JexlTestCase {
}
public static class Prompt {
- private final Map<String, PromptValue> values = new HashMap<String,
PromptValue>();
+ private final Map<String, PromptValue> values = new HashMap<>();
public Object get(final String name) {
final PromptValue v = values.get(name);
diff --git a/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
b/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
index 476963c2..829246d0 100644
--- a/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java
@@ -45,7 +45,7 @@ public class ScriptCallableTest extends JexlTestCase {
@Test
public void testFuture() throws Exception {
final JexlScript e = JEXL.createScript("while(true);");
- final FutureTask<Object> future = new
FutureTask<Object>(e.callable(null));
+ final FutureTask<Object> future = new FutureTask<>(e.callable(null));
final ExecutorService executor = Executors.newFixedThreadPool(1);
executor.submit(future);
diff --git a/src/test/java/org/apache/commons/jexl3/SetLiteralTest.java
b/src/test/java/org/apache/commons/jexl3/SetLiteralTest.java
index 3b758ff9..09993d34 100644
--- a/src/test/java/org/apache/commons/jexl3/SetLiteralTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SetLiteralTest.java
@@ -35,7 +35,7 @@ public class SetLiteralTest extends JexlTestCase {
}
private static Set<?> createSet(final Object... args) {
- return new HashSet<Object>(Arrays.asList(args));
+ return new HashSet<>(Arrays.asList(args));
}
@Test
diff --git a/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
b/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
index 022f22d3..2e44dea9 100644
--- a/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
@@ -709,7 +709,7 @@ public class SideEffectTest extends JexlTestCase {
public Object selfAdd(final Object c, final String item) throws
IOException {
if (c == null) {
- return new ArrayList<String>(Collections.singletonList(item));
+ return new ArrayList<>(Collections.singletonList(item));
}
if (c instanceof Appendable) {
((Appendable) c).append(item);
@@ -737,7 +737,7 @@ public class SideEffectTest extends JexlTestCase {
final JexlEngine jexl = new
JexlBuilder().arithmetic(j246).cache(32).debug(true).logger(log246).create();
final JexlScript script = jexl.createScript("z += x", "x");
final MapContext ctx = new MapContext();
- List<String> z = new ArrayList<String>(1);
+ List<String> z = new ArrayList<>(1);
// no ambiguous, std case
ctx.set("z", z);
@@ -774,7 +774,7 @@ public class SideEffectTest extends JexlTestCase {
}
public Object arrayGet(final List<?> list, final Collection<Integer>
range) {
- final List<Object> rl = new ArrayList<Object>(range.size());
+ final List<Object> rl = new ArrayList<>(range.size());
for(final int i : range) {
rl.add(list.get(i));
}
@@ -792,7 +792,7 @@ public class SideEffectTest extends JexlTestCase {
@Test
public void test248() throws Exception {
final MapContext ctx = new MapContext();
- final List<Object> foo = new ArrayList<Object>(Arrays.asList(10, 20,
30, 40));
+ final List<Object> foo = new ArrayList<>(Arrays.asList(10, 20, 30,
40));
ctx.set("foo", foo);
final JexlEngine engine = new JexlBuilder().arithmetic(new
Arithmetic248(true)).create();
diff --git a/src/test/java/org/apache/commons/jexl3/StrategyTest.java
b/src/test/java/org/apache/commons/jexl3/StrategyTest.java
index dd00c1ba..c10080d7 100644
--- a/src/test/java/org/apache/commons/jexl3/StrategyTest.java
+++ b/src/test/java/org/apache/commons/jexl3/StrategyTest.java
@@ -97,7 +97,7 @@ public class StrategyTest extends JexlTestCase {
public void run171(final JexlEngine jexl, final boolean std) throws
Exception {
Object result;
- final Map<String, Object> i = new HashMap<String, Object>();
+ final Map<String, Object> i = new HashMap<>();
i.put("class", 42);
result = jexl.createScript("i['class'] ",
"i").execute((JexlContext)null, i);
diff --git a/src/test/java/org/apache/commons/jexl3/SynchronizedArithmetic.java
b/src/test/java/org/apache/commons/jexl3/SynchronizedArithmetic.java
index a851d128..aeae5632 100644
--- a/src/test/java/org/apache/commons/jexl3/SynchronizedArithmetic.java
+++ b/src/test/java/org/apache/commons/jexl3/SynchronizedArithmetic.java
@@ -123,7 +123,7 @@ public class SynchronizedArithmetic extends JexlArithmetic {
* Crude monitor replacement...
*/
static class SafeMonitor extends Monitor {
- private final Map<Object, Object> monitored = new
IdentityHashMap<Object, Object>();
+ private final Map<Object, Object> monitored = new IdentityHashMap<>();
@Override
protected void monitorEnter(final Object o) {
diff --git
a/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
b/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
index 7372b937..65812325 100644
--- a/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
@@ -43,7 +43,7 @@ public class SynchronizedOverloadsTest extends JexlTestCase {
@Test
public void testSynchronizer() throws Exception {
- final Map<String, Object> ns = new TreeMap<String, Object>();
+ final Map<String, Object> ns = new TreeMap<>();
ns.put("synchronized", SynchronizedContext.class);
final JexlContext jc = new MapContext();
final JexlEngine jexl = new JexlBuilder().namespaces(ns).create();
@@ -54,7 +54,7 @@ public class SynchronizedOverloadsTest extends JexlTestCase {
@Test
public void testSynchronized() throws Exception {
- final Map<String, Object> ns = new TreeMap<String, Object>();
+ final Map<String, Object> ns = new TreeMap<>();
final JexlContext jc = new SynchronizedContext(new MapContext());
final JexlEngine jexl = new JexlBuilder().namespaces(ns).create();
final JexlScript js0 = jexl.createScript("@synchronized(y) {return
y.size(); }", "y");
@@ -65,7 +65,7 @@ public class SynchronizedOverloadsTest extends JexlTestCase {
@Test
public void testUnsafeMonitor() throws Exception {
final SynchronizedArithmetic.Monitor monitor = new
SynchronizedArithmetic.SafeMonitor();
- final Map<String, Object> foo = new TreeMap<String, Object>();
+ final Map<String, Object> foo = new TreeMap<>();
foo.put("one", 1);
foo.put("two", 2);
foo.put("three", 3);
diff --git a/src/test/java/org/apache/commons/jexl3/VarTest.java
b/src/test/java/org/apache/commons/jexl3/VarTest.java
index 736708a1..6b165fc0 100644
--- a/src/test/java/org/apache/commons/jexl3/VarTest.java
+++ b/src/test/java/org/apache/commons/jexl3/VarTest.java
@@ -167,7 +167,7 @@ public class VarTest extends JexlTestCase {
* @return the set of variables
*/
Set<List<String>> mkref(final String[][] refs) {
- final Set<List<String>> set = new HashSet<List<String>>();
+ final Set<List<String>> set = new HashSet<>();
for(final String[] ref : refs) {
set.add(Arrays.asList(ref));
}
@@ -197,7 +197,7 @@ public class VarTest extends JexlTestCase {
}
List<String> stringify(final Set<List<String>> sls) {
- final List<String> ls = new ArrayList<String>();
+ final List<String> ls = new ArrayList<>();
for(final List<String> l : sls) {
final StringBuilder strb = new StringBuilder();
for(final String s : l) {
@@ -426,7 +426,7 @@ public class VarTest extends JexlTestCase {
* @return the property values
*/
public List<String> get(final List<String> keys) {
- final List<String> values = new ArrayList<String>();
+ final List<String> values = new ArrayList<>();
for(final String key : keys) {
final String value = get(key);
if (value != null) {
@@ -444,7 +444,7 @@ public class VarTest extends JexlTestCase {
* @return the alia map
*/
public Map<String,Object> get(final Map<String,String> map) {
- final Map<String,Object> values = new
LinkedHashMap<String,Object>();
+ final Map<String,Object> values = new LinkedHashMap<>();
for(final Map.Entry<String,String> entry : map.entrySet()) {
final String value = get(entry.getKey());
if (value != null) {
@@ -461,7 +461,7 @@ public class VarTest extends JexlTestCase {
* @return the properties array
*/
private static String[] readIdentifiers(final String str) {
- final List<String> ids = new ArrayList<String>();
+ final List<String> ids = new ArrayList<>();
StringBuilder strb = null;
String id = null;
char kind = 0; // array, set or map kind using first char
@@ -616,7 +616,7 @@ public class VarTest extends JexlTestCase {
@Test
public void testObjectContext() throws Exception {
final TheVarContext vars = new TheVarContext();
- final JexlContext jc = new ObjectContext<TheVarContext>(JEXL, vars);
+ final JexlContext jc = new ObjectContext<>(JEXL, vars);
try {
JexlScript script;
Object result;
diff --git a/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java
b/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java
index f75adad9..4896427d 100644
--- a/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java
+++ b/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java
@@ -47,7 +47,7 @@ public class ArrayTest {
*/
final JexlContext jc = new MapContext();
- final List<Object> l = new ArrayList<Object>();
+ final List<Object> l = new ArrayList<>();
l.add("Hello from location 0");
final Integer two = 2;
l.add(two);
diff --git a/src/test/java/org/apache/commons/jexl3/internal/Util.java
b/src/test/java/org/apache/commons/jexl3/internal/Util.java
index 8e082ef6..dfb8887f 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/Util.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/Util.java
@@ -83,7 +83,7 @@ public class Util {
* @return the descendants-and-self list
*/
protected static ArrayList<JexlNode> flatten(final JexlNode node) {
- final ArrayList<JexlNode> list = new ArrayList<JexlNode>();
+ final ArrayList<JexlNode> list = new ArrayList<>();
flatten(list, node);
return list;
}
diff --git
a/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java
b/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java
index 816cc47a..1e454354 100644
---
a/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java
+++
b/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java
@@ -164,7 +164,7 @@ public class DiscoveryTest extends JexlTestCase {
@Test
public void testListIntrospection() throws Exception {
final Uberspect uber = Engine.getUberspect(null, null);
- final List<Object> list = new ArrayList<Object>();
+ final List<Object> list = new ArrayList<>();
list.add("LIST");
list.add("TSIL");
@@ -195,7 +195,7 @@ public class DiscoveryTest extends JexlTestCase {
@Test
public void testMapIntrospection() throws Exception {
final Uberspect uber = Engine.getUberspect(null, null);
- final Map<String, Object> map = new HashMap<String, Object>();
+ final Map<String, Object> map = new HashMap<>();
map.put("value", "MAP");
map.put("eulav", "PAM");
diff --git
a/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java
b/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java
index e94c0161..92110504 100644
---
a/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java
+++
b/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java
@@ -92,8 +92,8 @@ public class MethodKeyTest {
/* Generate a list of method*(prims*), method(prims*, prims*),
method*(prims*,prims*,prims*) */
static {
- BY_KEY = new java.util.HashMap< MethodKey, String>();
- BY_STRING = new java.util.HashMap<String, MethodKey>();
+ BY_KEY = new java.util.HashMap<>();
+ BY_STRING = new java.util.HashMap<>();
for (final String method : METHODS) {
for (final Class<?> value : PRIMS) {
final Class<?>[] arg0 = {value};
diff --git
a/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
b/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
index 6b634b40..2af59a6e 100644
--- a/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
+++ b/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
@@ -392,7 +392,7 @@ public class SandboxTest extends JexlTestCase {
public void testSandboxInherit0() throws Exception {
Object result;
final JexlContext ctxt = null;
- final List<String> foo = new ArrayList<String>();
+ final List<String> foo = new ArrayList<>();
final JexlSandbox sandbox = new JexlSandbox(false, true);
sandbox.allow(java.util.List.class.getName());
diff --git a/src/test/java/org/apache/commons/jexl3/junit/Asserter.java
b/src/test/java/org/apache/commons/jexl3/junit/Asserter.java
index 8d5db9a5..a4197ac1 100644
--- a/src/test/java/org/apache/commons/jexl3/junit/Asserter.java
+++ b/src/test/java/org/apache/commons/jexl3/junit/Asserter.java
@@ -41,7 +41,7 @@ import org.junit.Assert;
*/
public class Asserter extends Assert {
/** variables used during asserts. */
- private final Map<String, Object> variables = new HashMap<String,
Object>();
+ private final Map<String, Object> variables = new HashMap<>();
/** context to use during asserts. */
private final JexlEvalContext context = new JexlEvalContext(variables);
/** JEXL engine to use during Asserts. */
