diff --git a/src/main/java/walkingkooka/spreadsheet/engine/BasicSpreadsheetEngineContext.java b/src/main/java/walkingkooka/spreadsheet/engine/BasicSpreadsheetEngineContext.java index 669afe892..e2a2add06 100644 --- a/src/main/java/walkingkooka/spreadsheet/engine/BasicSpreadsheetEngineContext.java +++ b/src/main/java/walkingkooka/spreadsheet/engine/BasicSpreadsheetEngineContext.java @@ -21,7 +21,6 @@ import walkingkooka.collect.list.Lists; import walkingkooka.collect.set.SortedSets; import walkingkooka.convert.provider.ConverterSelector; -import walkingkooka.math.Fraction; import walkingkooka.net.AbsoluteUrl; import walkingkooka.plugin.ProviderContext; import walkingkooka.plugin.ProviderContextDelegator; @@ -59,14 +58,12 @@ import walkingkooka.tree.expression.function.provider.ExpressionFunctionAliasSet; import walkingkooka.tree.text.TextNode; -import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.function.BiConsumer; -import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -85,7 +82,6 @@ static BasicSpreadsheetEngineContext with(final AbsoluteUrl serverUrl, final Supplier now, final SpreadsheetMetadata metadata, final SpreadsheetEngine engine, - final Function fractioner, final SpreadsheetStoreRepository storeRepository, final SpreadsheetMetadataPropertyName functionAliases, final SpreadsheetProvider spreadsheetProvider, @@ -94,7 +90,6 @@ static BasicSpreadsheetEngineContext with(final AbsoluteUrl serverUrl, Objects.requireNonNull(now, "now"); Objects.requireNonNull(metadata, "metadata"); Objects.requireNonNull(engine, "engine"); - Objects.requireNonNull(fractioner, "fractioner"); Objects.requireNonNull(storeRepository, "storeRepository"); Objects.requireNonNull(functionAliases, "functionAliases"); Objects.requireNonNull(spreadsheetProvider, "spreadsheetProvider"); @@ -106,7 +101,6 @@ static BasicSpreadsheetEngineContext with(final AbsoluteUrl serverUrl, now, metadata, engine, - fractioner, storeRepository, functionAliases, spreadsheetProvider, @@ -121,7 +115,6 @@ private BasicSpreadsheetEngineContext(final AbsoluteUrl serverUrl, final Supplier now, final SpreadsheetMetadata metadata, final SpreadsheetEngine engine, - final Function fractioner, final SpreadsheetStoreRepository storeRepository, final SpreadsheetMetadataPropertyName functionAliases, final SpreadsheetProvider spreadsheetProvider, @@ -138,7 +131,6 @@ private BasicSpreadsheetEngineContext(final AbsoluteUrl serverUrl, this ); - this.fractioner = fractioner; this.storeRepository = storeRepository; this.labelNameResolver = SpreadsheetLabelNameResolvers.labelStore( @@ -232,7 +224,6 @@ public SpreadsheetEngineContext spreadsheetEngineContext(final SpreadsheetMetada this.now, this.metadata, this.engine, - this.fractioner, this.storeRepository, functionAliases, this.spreadsheetProvider, @@ -334,11 +325,6 @@ public LocalDateTime now() { private final Supplier now; - /** - * Used to convert a number into a fraction within expressions. - */ - private final Function fractioner; - // formatValue...................................................................................................... @Override diff --git a/src/main/java/walkingkooka/spreadsheet/engine/SpreadsheetEngineContexts.java b/src/main/java/walkingkooka/spreadsheet/engine/SpreadsheetEngineContexts.java index f935a5b75..0d9928fdc 100644 --- a/src/main/java/walkingkooka/spreadsheet/engine/SpreadsheetEngineContexts.java +++ b/src/main/java/walkingkooka/spreadsheet/engine/SpreadsheetEngineContexts.java @@ -17,7 +17,6 @@ package walkingkooka.spreadsheet.engine; -import walkingkooka.math.Fraction; import walkingkooka.net.AbsoluteUrl; import walkingkooka.plugin.ProviderContext; import walkingkooka.reflect.PublicStaticHelper; @@ -27,9 +26,7 @@ import walkingkooka.spreadsheet.store.repo.SpreadsheetStoreRepository; import walkingkooka.tree.expression.function.provider.ExpressionFunctionAliasSet; -import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.function.Function; import java.util.function.Supplier; public final class SpreadsheetEngineContexts implements PublicStaticHelper { @@ -41,7 +38,6 @@ public static SpreadsheetEngineContext basic(final AbsoluteUrl serverUrl, final Supplier now, final SpreadsheetMetadata metadata, final SpreadsheetEngine engine, - final Function fractioner, final SpreadsheetStoreRepository storeRepository, final SpreadsheetMetadataPropertyName functionAliases, final SpreadsheetProvider spreadsheetProvider, @@ -51,7 +47,6 @@ public static SpreadsheetEngineContext basic(final AbsoluteUrl serverUrl, now, metadata, engine, - fractioner, storeRepository, functionAliases, spreadsheetProvider, diff --git a/src/test/java/walkingkooka/spreadsheet/engine/BasicSpreadsheetEngineContextTest.java b/src/test/java/walkingkooka/spreadsheet/engine/BasicSpreadsheetEngineContextTest.java index fcae725ac..054795dba 100644 --- a/src/test/java/walkingkooka/spreadsheet/engine/BasicSpreadsheetEngineContextTest.java +++ b/src/test/java/walkingkooka/spreadsheet/engine/BasicSpreadsheetEngineContextTest.java @@ -26,7 +26,6 @@ import walkingkooka.datetime.FakeDateTimeContext; import walkingkooka.math.DecimalNumberContext; import walkingkooka.math.DecimalNumberContexts; -import walkingkooka.math.Fraction; import walkingkooka.net.AbsoluteUrl; import walkingkooka.net.Url; import walkingkooka.plugin.ProviderContext; @@ -91,7 +90,6 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.function.Function; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -292,18 +290,6 @@ public ExpressionFunctionInfoSet expressionFunctionInfos() { private final static SpreadsheetEngine ENGINE = SpreadsheetEngines.fake(); - private final Function FRACTIONER = new Function<>() { - @Override - public Fraction apply(final BigDecimal bigDecimal) { - throw new UnsupportedOperationException(); - } - - @Override - public String toString() { - return "Fractioner123"; - } - }; - private final static SpreadsheetStoreRepository STORE_REPOSITORY = SpreadsheetStoreRepositories.fake(); private final static SpreadsheetMetadataPropertyName FUNCTION_ALIASES = SpreadsheetMetadataPropertyName.FORMULA_FUNCTIONS; @@ -317,7 +303,6 @@ public void testWithNullServerUrlFails() { NOW, METADATA, ENGINE, - FRACTIONER, STORE_REPOSITORY, FUNCTION_ALIASES, SPREADSHEET_PROVIDER, @@ -335,7 +320,6 @@ public void testWithNullNowFails() { null, METADATA, ENGINE, - FRACTIONER, STORE_REPOSITORY, FUNCTION_ALIASES, SPREADSHEET_PROVIDER, @@ -353,7 +337,6 @@ public void testWithNullMetadataFails() { NOW, null, ENGINE, - FRACTIONER, STORE_REPOSITORY, FUNCTION_ALIASES, SPREADSHEET_PROVIDER, @@ -371,25 +354,6 @@ public void testWithNullEngineFails() { NOW, METADATA, null, - FRACTIONER, - STORE_REPOSITORY, - FUNCTION_ALIASES, - SPREADSHEET_PROVIDER, - PROVIDER_CONTEXT - ) - ); - } - - @Test - public void testWithNullFractionerFails() { - assertThrows( - NullPointerException.class, - () -> BasicSpreadsheetEngineContext.with( - SERVER_URL, - NOW, - METADATA, - ENGINE, - null, STORE_REPOSITORY, FUNCTION_ALIASES, SPREADSHEET_PROVIDER, @@ -407,7 +371,6 @@ public void testWithNullStoreRepositoryFails() { NOW, METADATA, ENGINE, - FRACTIONER, null, FUNCTION_ALIASES, SPREADSHEET_PROVIDER, @@ -425,7 +388,6 @@ public void testWithNullFunctionAliasesFails() { NOW, METADATA, ENGINE, - FRACTIONER, STORE_REPOSITORY, null, SPREADSHEET_PROVIDER, @@ -443,7 +405,6 @@ public void testWithNullSpreadsheetProviderFails() { NOW, METADATA, ENGINE, - FRACTIONER, STORE_REPOSITORY, FUNCTION_ALIASES, null, @@ -461,7 +422,6 @@ public void testWithNullProviderContextFails() { NOW, METADATA, ENGINE, - FRACTIONER, STORE_REPOSITORY, FUNCTION_ALIASES, SPREADSHEET_PROVIDER, @@ -1410,7 +1370,6 @@ private BasicSpreadsheetEngineContext createContext(final SpreadsheetMetadata me NOW, metadata, ENGINE, - FRACTIONER, new FakeSpreadsheetStoreRepository() { @Override