mP1/walkingkooka-environment#92 EnvironmentContextDelegator.setEnvironmentValue

- mP1/walkingkooka-environment#92
- EnvironmentContextDelegator.setEnvironmentValue

Author: mP1

src/main/java/walkingkooka/spreadsheet/engine/SpreadsheetEngineContextDelegator.java

@@ -151,6 +151,17 @@ default LocaleContext localeContext() {
         return this.spreadsheetEngineContext();
     }
 
+    @Override
+    default <T> SpreadsheetEngineContext setEnvironmentValue(final EnvironmentValueName<T> name,
+                                                             final T value) {
+        this.environmentContext()
+            .setEnvironmentValue(
+                name,
+                value
+            );
+        return this;
+    }
+
     @Override
     default SpreadsheetEngineContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
         this.spreadsheetEngineContext()

src/main/java/walkingkooka/spreadsheet/expression/CellSpreadsheetExpressionEvaluationContext.java

@@ -17,7 +17,6 @@
 
 package walkingkooka.spreadsheet.expression;
 
-import walkingkooka.environment.EnvironmentValueName;
 import walkingkooka.spreadsheet.SpreadsheetCell;
 import walkingkooka.spreadsheet.format.SpreadsheetFormatterContext;
 import walkingkooka.spreadsheet.reference.SpreadsheetCellRangeReference;
@@ -140,16 +139,6 @@ public SpreadsheetValidatorContext validatorContext(final SpreadsheetExpressionR
 
     // EnvironmentContext...............................................................................................
 
-    @Override
-    public <T> SpreadsheetExpressionEvaluationContext setEnvironmentValue(final EnvironmentValueName<T> name,
-                                                                          final T value) {
-        this.context.setEnvironmentValue(
-            name,
-            value
-        );
-        return this;
-    }
-
     private final SpreadsheetExpressionEvaluationContext context;
 
     @Override

src/main/java/walkingkooka/spreadsheet/expression/SpreadsheetExpressionEvaluationContextDelegator.java

@@ -95,9 +95,22 @@ default SpreadsheetExpressionEvaluationContext expressionEvaluationContext() {
 
     // StorageExpressionEvaluationContextDelegator......................................................................
 
+    @Override
+    default <T> SpreadsheetExpressionEvaluationContext setEnvironmentValue(final EnvironmentValueName<T> name,
+                                                                           final T value) {
+        this.spreadsheetExpressionEvaluationContext()
+            .setEnvironmentValue(
+                name,
+                value
+            );
+        return this;
+    }
+
     @Override
     default SpreadsheetExpressionEvaluationContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
-        throw new UnsupportedOperationException();
+        this.spreadsheetExpressionEvaluationContext()
+            .removeEnvironmentValue(name);
+        return this;
     }
 
     @Override

src/main/java/walkingkooka/spreadsheet/format/SpreadsheetFormatterProviderSamplesContextDelegator.java

@@ -38,6 +38,17 @@ default SpreadsheetFormatterContext spreadsheetFormatterContext() {
 
     // ProviderContextDelegator.........................................................................................
 
+    @Override
+    default <T> SpreadsheetFormatterProviderSamplesContext setEnvironmentValue(final EnvironmentValueName<T> name,
+                                                                               final T value) {
+        this.environmentContext()
+            .setEnvironmentValue(
+                name,
+                value
+            );
+        return this;
+    }
+
     @Override
     default SpreadsheetFormatterProviderSamplesContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
         this.spreadsheetFormatterProviderSamplesContext()

src/test/java/walkingkooka/spreadsheet/engine/SpreadsheetEngineContextDelegatorTest.java

@@ -17,14 +17,12 @@
 
 package walkingkooka.spreadsheet.engine;
 
-import walkingkooka.environment.EnvironmentValueName;
 import walkingkooka.plugin.store.PluginStore;
 import walkingkooka.reflect.ClassTesting;
 import walkingkooka.reflect.JavaVisibility;
 import walkingkooka.spreadsheet.reference.SpreadsheetLabelName;
 import walkingkooka.spreadsheet.reference.SpreadsheetSelection;
 
-import java.util.Objects;
 import java.util.Optional;
 
 public final class SpreadsheetEngineContextDelegatorTest implements ClassTesting<SpreadsheetEngineContextDelegator> {
@@ -44,14 +42,6 @@ public PluginStore pluginStore() {
         public Optional<SpreadsheetSelection> resolveLabel(final SpreadsheetLabelName labelName) {
             throw new UnsupportedOperationException();
         }
-
-        @Override
-        public <T> TestSpreadsheetEngineContextDelegator setEnvironmentValue(final EnvironmentValueName<T> name,
-                                                                             final T value) {
-            Objects.requireNonNull(name, "name");
-            Objects.requireNonNull(value, "value");
-            throw new UnsupportedOperationException();
-        }
     }
 
     // class............................................................................................................