From ca87662d32e949b65c140bc8148271ec39901975 Mon Sep 17 00:00:00 2001 From: Jared Davis Date: Thu, 11 Jun 2026 08:43:08 -0400 Subject: [PATCH 1/2] Change getAll() to vars() Remove the Collections.unmodifiableMap() from vars() --- .../scijava/parsington/eval/AbstractEvaluator.java | 5 +++-- .../org/scijava/parsington/eval/Evaluator.java | 7 ++++--- .../parsington/eval/AbstractEvaluatorTest.java | 14 +++++++------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/scijava/parsington/eval/AbstractEvaluator.java b/src/main/java/org/scijava/parsington/eval/AbstractEvaluator.java index 82502ba..172f632 100644 --- a/src/main/java/org/scijava/parsington/eval/AbstractEvaluator.java +++ b/src/main/java/org/scijava/parsington/eval/AbstractEvaluator.java @@ -89,9 +89,10 @@ public Object get(final String name) { return new Unresolved(name); } + @Override - public Map getAll() { - return Collections.unmodifiableMap(vars); + public Map vars() { + return vars; } @Override diff --git a/src/main/java/org/scijava/parsington/eval/Evaluator.java b/src/main/java/org/scijava/parsington/eval/Evaluator.java index 1be84d2..4409717 100644 --- a/src/main/java/org/scijava/parsington/eval/Evaluator.java +++ b/src/main/java/org/scijava/parsington/eval/Evaluator.java @@ -168,11 +168,12 @@ default Object get(final Variable v) { } /** - * Gets a map of all variable names and values. + * Gets the Evaluator variables. Not thread-safe. + * A map of all variable names and values. * - * @return A map from variable names to variable values. + * @return The map from variable names to variable values. */ - Map getAll(); + Map vars(); /** * Sets the value of a variable. diff --git a/src/test/java/org/scijava/parsington/eval/AbstractEvaluatorTest.java b/src/test/java/org/scijava/parsington/eval/AbstractEvaluatorTest.java index 62d5fc9..53b443a 100644 --- a/src/test/java/org/scijava/parsington/eval/AbstractEvaluatorTest.java +++ b/src/test/java/org/scijava/parsington/eval/AbstractEvaluatorTest.java @@ -84,16 +84,16 @@ public void testClear() { e.set("a", 1); e.set("b", 2); e.clear(); - assertEquals(new HashMap<>(), e.getAll()); + assertEquals(new HashMap<>(), e.vars()); assertThrows(IllegalArgumentException.class, () -> e.get("a")); assertThrows(IllegalArgumentException.class, () -> e.get("b")); } - /** Tests {@link Evaluator#getAll()} and {@link Evaluator#setAll(Map)}. */ + /** Tests {@link Evaluator#vars()} and {@link Evaluator#setAll(Map)}. */ @Test - public void testGetAllSetAll() { + public void testVarsSetAll() { final Evaluator e = createEvaluator(); - assertEquals(new HashMap<>(), e.getAll()); + assertEquals(new HashMap<>(), e.vars()); final Map vars = new HashMap<>(); vars.put("a", 1); @@ -101,7 +101,7 @@ public void testGetAllSetAll() { vars.put("c", 3.0); e.setAll(vars); - assertEquals(vars, e.getAll()); + assertEquals(vars, e.vars()); // Verify individual get still works after setAll. assertEquals(1, e.get("a")); @@ -110,9 +110,9 @@ public void testGetAllSetAll() { // Verify variables created at evaluation are accessible and correct. e.evaluate("d=a+c"); - assertTrue(e.getAll().containsKey("d")); + assertTrue(e.vars().containsKey("d")); final Object dVal = e.get("d"); assertEquals(4.0, dVal); - assertEquals(dVal, e.getAll().get("d")); + assertEquals(dVal, e.vars().get("d")); } } From e2b2155d0663c5e46e38ad341814441ebd640ba8 Mon Sep 17 00:00:00 2001 From: Jared Davis Date: Thu, 11 Jun 2026 08:43:49 -0400 Subject: [PATCH 2/2] Remove unused import --- src/main/java/org/scijava/parsington/eval/AbstractEvaluator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/scijava/parsington/eval/AbstractEvaluator.java b/src/main/java/org/scijava/parsington/eval/AbstractEvaluator.java index 172f632..229e993 100644 --- a/src/main/java/org/scijava/parsington/eval/AbstractEvaluator.java +++ b/src/main/java/org/scijava/parsington/eval/AbstractEvaluator.java @@ -30,7 +30,6 @@ package org.scijava.parsington.eval; -import java.util.Collections; import java.util.HashMap; import java.util.Map;