Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,20 @@ static Set<MissingConverter> verify(final Converter<SpreadsheetConverterContext>
);
}

if (scripting) {
final StoragePath storagePathWithout = StoragePath.parse("/path1/file2");
final StoragePath storagePathJson = StoragePath.parse("/path1/file2.json");

verifier.addIfConversionFail(
Lists.of(
storagePathWithout,
storagePathJson
),
Class.class,
SpreadsheetConvertersConverterProvider.STORAGE_PATH_JSON_TO_CLASS
);
}

// text-to-error............................................................................................
if (validation) {
verifier.addIfConversionFail(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.COLOR_TO_NUMBER)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.NUMBER_TO_COLOR)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_JSON_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_STORAGE_PATH)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_FORM_NAME)
Expand All @@ -60,6 +60,7 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat

public final static ConverterAliasSet FORMATTING = ALL.aliasSet()
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_JSON_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_FORM_NAME)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_VALIDATION_ERROR);
Expand All @@ -69,6 +70,7 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.COLOR_TO_NUMBER)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.NUMBER_TO_COLOR)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_JSON_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_FORM_NAME)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_STORAGE_PATH)
Expand All @@ -85,6 +87,7 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.HAS_TEXT_NODE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.NUMBER_TO_COLOR)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_JSON_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_ERROR)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_FORM_NAME)
Expand All @@ -102,6 +105,7 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.HAS_TEXT_NODE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.NUMBER_TO_COLOR)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_JSON_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_STORAGE_PATH)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_TEXT_STYLE_PROPERTY_NAME)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"plugins": "",
"precision": 10,
"roundingMode": "HALF_UP",
"scriptingConverter": "collection(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, json, locale, plugins, spreadsheet-metadata, storage, style, text-node, text-to-line-ending, template, net)",
"scriptingConverter": "collection(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, json, locale, plugins, spreadsheet-metadata, storage, storage-path-json-to-class, style, text-node, text-to-line-ending, template, net)",
"showFormulaEditor": true,
"showFormulas": false,
"showGridLines": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ public Optional<EmailAddress> user() {
RoundingMode.HALF_UP
).set(
SpreadsheetMetadataPropertyName.SCRIPTING_CONVERTER,
ConverterSelector.parse("collection(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, json, locale, plugins, spreadsheet-metadata, storage, style, text-node, text-to-line-ending, template, net)"
ConverterSelector.parse("collection(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, json, locale, plugins, spreadsheet-metadata, storage, storage-path-json-to-class, style, text-node, text-to-line-ending, template, net)"
)
).set(
SpreadsheetMetadataPropertyName.SCRIPTING_FUNCTIONS,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@ public void testToString() {
" \"plugins\": \"\",\n" +
" \"precision\": 10,\n" +
" \"roundingMode\": \"HALF_UP\",\n" +
" \"scriptingConverter\": \"collection(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, json, locale, plugins, spreadsheet-metadata, storage, style, text-node, text-to-line-ending, template, net)\",\n" +
" \"scriptingConverter\": \"collection(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, json, locale, plugins, spreadsheet-metadata, storage, storage-path-json-to-class, style, text-node, text-to-line-ending, template, net)\",\n" +
" \"showFormulaEditor\": true,\n" +
" \"showFormulas\": false,\n" +
" \"showGridLines\": true,\n" +
Expand Down Expand Up @@ -1554,7 +1554,7 @@ public void testToStringMetadataIncludingAllColorNameAndColorNumberProperties()
" \"plugins\": \"\",\n" +
" \"precision\": 10,\n" +
" \"roundingMode\": \"HALF_UP\",\n" +
" \"scriptingConverter\": \"collection(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, json, locale, plugins, spreadsheet-metadata, storage, style, text-node, text-to-line-ending, template, net)\",\n" +
" \"scriptingConverter\": \"collection(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, json, locale, plugins, spreadsheet-metadata, storage, storage-path-json-to-class, style, text-node, text-to-line-ending, template, net)\",\n" +
" \"showFormulaEditor\": true,\n" +
" \"showFormulas\": false,\n" +
" \"showGridLines\": true,\n" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ public void testTreePrint() {
" HALF_UP\n" +
" scriptingConverter\n" +
" collection\n" +
" \"(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, json, locale, plugins, spreadsheet-metadata, storage, style, text-node, text-to-line-ending, template, net)\"\n" +
" \"(text, number, date-time, basic, spreadsheet-value, boolean, error-throwing, color, expression, environment, json, locale, plugins, spreadsheet-metadata, storage, storage-path-json-to-class, style, text-node, text-to-line-ending, template, net)\"\n" +
" scriptingFunctions\n" +
" serverUrl\n" +
" https://example.com (walkingkooka.net.AbsoluteUrl)\n" +
Expand Down
Loading