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
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ eg
- [spreadsheet-selection-to-text](https://github.com/mP1/walkingkooka-spreadsheet/blob/master/src/main/java/walkingkooka/spreadsheet/convert/SpreadsheetConverterSpreadsheetSelectionToText.java)
- [spreadsheet-value](https://github.com/mP1/walkingkooka-spreadsheet/blob/master/src/main/java/walkingkooka/spreadsheet/convert/SpreadsheetConverters.java)
- [storage](https://github.com/mP1/walkingkooka-spreadsheet/blob/master/src/main/java/walkingkooka/spreadsheet/convert/SpreadsheetConverters.java)
- [storage-path-properties-to-class](https://github.com/mP1/walkingkooka-storage/blob/master/src/main/java/walkingkooka/storage/convert/StorageConverterStoragePathPropertiesToClass.java)
- [storage-path-txt-to-class](https://github.com/mP1/walkingkooka-storage/blob/master/src/main/java/walkingkooka/storage/convert/StorageConverterStoragePathTxtToClass.java)
- [storage-value-info-list-to-text](https://github.com/mP1/walkingkooka-storage/blob/master/src/main/java/walkingkooka/storage/convert/StorageConverterStorageValueInfoListToText.java)
- [style](https://github.com/mP1/walkingkooka-spreadsheet/blob/master/src/main/java/walkingkooka/spreadsheet/convert/SpreadsheetConverters.java)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -698,19 +698,11 @@ public static Converter<SpreadsheetConverterContext> storage() {
private final static Converter<SpreadsheetConverterContext> STORAGE = namedCollection(
"storage",
textToStoragePath(),
storagePathPropertiesToClass(),
storagePathTxtToClass(),
storageValueInfoListToText(),
binary()
);

/**
* {@see StorageConverters#storagePathPropertiesToClass}
*/
public static Converter<SpreadsheetConverterContext> storagePathPropertiesToClass() {
return StorageConverters.storagePathPropertiesToClass();
}

/**
* {@see StorageConverters#storagePathTxtToClass}
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1394,12 +1394,6 @@ static Set<MissingConverter> verify(final Converter<SpreadsheetConverterContext>
SpreadsheetConvertersConverterProvider.BINARY
);

verifier.addIfConversionFail(
StoragePath.parse("/path1/file2.properties"),
Class.class,
SpreadsheetConvertersConverterProvider.STORAGE_PATH_PROPERTIES_TO_CLASS
);

verifier.addIfConversionFail(
StoragePath.parse("/path1/file2.txt"),
Class.class,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,11 +377,6 @@ public <C extends ConverterContext> Converter<C> converter(final ConverterName n

converter = SpreadsheetConverters.storage();
break;
case STORAGE_PATH_PROPERTIES_TO_CLASS_STRING:
noParameterCheck(copy);

converter = SpreadsheetConverters.storagePathPropertiesToClass();
break;
case STORAGE_PATH_TXT_TO_CLASS_STRING:
noParameterCheck(copy);

Expand Down Expand Up @@ -1010,10 +1005,6 @@ private static void parameterCountCheck(final List<?> values,

final static ConverterName STORAGE = ConverterName.with(STORAGE_STRING);

private final static String STORAGE_PATH_PROPERTIES_TO_CLASS_STRING = "storage-path-properties-to-class";

final static ConverterName STORAGE_PATH_PROPERTIES_TO_CLASS = ConverterName.with(STORAGE_PATH_PROPERTIES_TO_CLASS_STRING);

private final static String STORAGE_PATH_TXT_TO_CLASS_STRING = "storage-path-txt-to-class";

final static ConverterName STORAGE_PATH_TXT_TO_CLASS = ConverterName.with(STORAGE_PATH_TXT_TO_CLASS_STRING);
Expand Down Expand Up @@ -1376,7 +1367,6 @@ public ConverterInfoSet converterInfos() {
converterInfo(SPREADSHEET_SELECTION_TO_TEXT),
converterInfo(SPREADSHEET_VALUE),
converterInfo(STORAGE),
converterInfo(STORAGE_PATH_PROPERTIES_TO_CLASS),
converterInfo(STORAGE_PATH_TXT_TO_CLASS),
converterInfo(STORAGE_VALUE_INFO_LIST_TO_TEXT),
converterInfo(STYLE),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.COLOR_TO_NUMBER)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.NUMBER_TO_COLOR)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_PROPERTIES_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_TXT_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_STORAGE_PATH)
Expand All @@ -61,7 +60,6 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat

public final static ConverterAliasSet FORMATTING = ALL.aliasSet()
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_PROPERTIES_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_TXT_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_FORM_NAME)
Expand All @@ -72,7 +70,6 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.COLOR_TO_NUMBER)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.NUMBER_TO_COLOR)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_PROPERTIES_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_TXT_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_FORM_NAME)
Expand All @@ -90,7 +87,6 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.HAS_TEXT_NODE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.NUMBER_TO_COLOR)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_PROPERTIES_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_TXT_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_ERROR)
Expand All @@ -109,7 +105,6 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.HAS_TEXT_NODE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.NUMBER_TO_COLOR)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_PROPERTIES_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_TXT_TO_CLASS)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.TEXT_TO_STORAGE_PATH)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -652,15 +652,6 @@ public void testConverterSelectorWithStorage() {
);
}

@Test
public void testConverterSelectorWithStoragePathPropertiesToClass() {
this.converterAndCheck(
"storage-path-properties-to-class",
PROVIDER_CONTEXT,
SpreadsheetConverters.storagePathPropertiesToClass()
);
}

@Test
public void testConverterSelectorWithStoragePathTxtToClass() {
this.converterAndCheck(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ public void testToString() {
" \"colorWhite\": 2,\n" +
" \"colorYellow\": 6,\n" +
" \"comparators\": \"date, date-time, day-of-month, day-of-week, hour-of-am-pm, hour-of-day, minute-of-hour, month-of-year, nano-of-second, number, seconds-of-minute, text, text-case-insensitive, time, year\",\n" +
" \"converters\": \"basic, binary, boolean, boolean-to-text, collection, collection-to, collection-to-list, color, color-to-color, color-to-number, currency, currency-code-to-currency, currency-value-to, currency-value-to-number, date-time, date-time-symbols, decimal-number-symbols, environment, error-throwing, error-to-error, error-to-number, expression, form-and-validation, format-pattern-to-string, has-binary-to-string, has-formatter-selector, has-host-address, has-parser-selector, has-properties, has-spreadsheet-selection, has-style, has-text-node, has-validator-selector, has-value-to, json, json-to, locale, locale-to-text, net, null-to-number, number, number-to-color, number-to-currency-value, number-to-number, number-to-text, optional-to, plugins, properties, properties-to-date-time-symbols, properties-to-decimal-number-symbols, properties-to-spreadsheet-metadata, properties-to-text-style, spreadsheet-cell-set, spreadsheet-metadata, spreadsheet-selection-to-spreadsheet-selection, spreadsheet-selection-to-text, spreadsheet-value, storage, storage-path-properties-to-class, storage-path-txt-to-class, storage-value-info-list-to-text, style, system, template, text, text-node, text-to-binary, text-to-boolean-list, text-to-border, text-to-charset, text-to-color, text-to-csv-string-list, text-to-currency, text-to-currency-code, text-to-currency-value, text-to-date-list, text-to-date-time-list, text-to-email-address, text-to-environment-value-name, text-to-error, text-to-expression, text-to-flag, text-to-form-name, text-to-has-host-address, text-to-host-address, text-to-indentation, text-to-json, text-to-line-ending, text-to-locale, text-to-locale-language-tag, text-to-margin, text-to-media-type, text-to-number-list, text-to-object, text-to-padding, text-to-properties, text-to-spreadsheet-color-name, text-to-spreadsheet-formatter-selector, text-to-spreadsheet-id, text-to-spreadsheet-metadata, text-to-spreadsheet-metadata-color, text-to-spreadsheet-metadata-property-name, text-to-spreadsheet-name, text-to-spreadsheet-selection, text-to-spreadsheet-text, text-to-storage-path, text-to-string-list, text-to-template-value-name, text-to-text, text-to-text-node, text-to-text-style, text-to-text-style-property-name, text-to-time-list, text-to-url, text-to-url-fragment, text-to-url-query-string, text-to-validation-error, text-to-validator-selector, text-to-value-type, text-to-zone-offset, to-boolean, to-json-node, to-json-text, to-number, to-string, to-styleable, to-validation-checkbox, to-validation-choice, to-validation-choice-list, to-validation-error-list, url, url-to-hyperlink, url-to-image\",\n" +
" \"converters\": \"basic, binary, boolean, boolean-to-text, collection, collection-to, collection-to-list, color, color-to-color, color-to-number, currency, currency-code-to-currency, currency-value-to, currency-value-to-number, date-time, date-time-symbols, decimal-number-symbols, environment, error-throwing, error-to-error, error-to-number, expression, form-and-validation, format-pattern-to-string, has-binary-to-string, has-formatter-selector, has-host-address, has-parser-selector, has-properties, has-spreadsheet-selection, has-style, has-text-node, has-validator-selector, has-value-to, json, json-to, locale, locale-to-text, net, null-to-number, number, number-to-color, number-to-currency-value, number-to-number, number-to-text, optional-to, plugins, properties, properties-to-date-time-symbols, properties-to-decimal-number-symbols, properties-to-spreadsheet-metadata, properties-to-text-style, spreadsheet-cell-set, spreadsheet-metadata, spreadsheet-selection-to-spreadsheet-selection, spreadsheet-selection-to-text, spreadsheet-value, storage, storage-path-txt-to-class, storage-value-info-list-to-text, style, system, template, text, text-node, text-to-binary, text-to-boolean-list, text-to-border, text-to-charset, text-to-color, text-to-csv-string-list, text-to-currency, text-to-currency-code, text-to-currency-value, text-to-date-list, text-to-date-time-list, text-to-email-address, text-to-environment-value-name, text-to-error, text-to-expression, text-to-flag, text-to-form-name, text-to-has-host-address, text-to-host-address, text-to-indentation, text-to-json, text-to-line-ending, text-to-locale, text-to-locale-language-tag, text-to-margin, text-to-media-type, text-to-number-list, text-to-object, text-to-padding, text-to-properties, text-to-spreadsheet-color-name, text-to-spreadsheet-formatter-selector, text-to-spreadsheet-id, text-to-spreadsheet-metadata, text-to-spreadsheet-metadata-color, text-to-spreadsheet-metadata-property-name, text-to-spreadsheet-name, text-to-spreadsheet-selection, text-to-spreadsheet-text, text-to-storage-path, text-to-string-list, text-to-template-value-name, text-to-text, text-to-text-node, text-to-text-style, text-to-text-style-property-name, text-to-time-list, text-to-url, text-to-url-fragment, text-to-url-query-string, text-to-validation-error, text-to-validator-selector, text-to-value-type, text-to-zone-offset, to-boolean, to-json-node, to-json-text, to-number, to-string, to-styleable, to-validation-checkbox, to-validation-choice, to-validation-choice-list, to-validation-error-list, url, url-to-hyperlink, url-to-image\",\n" +
" \"currency\": \"AUD\",\n" +
" \"dateFormatter\": \"date dddd, d mmmm yyyy\",\n" +
" \"dateParser\": \"date dddd, d mmmm yyyy;dddd, d mmmm yy;dddd, d mmmm;d mmmm yyyy;d mmmm yy;d mmmm;d mmm yyyy;d mmm yy;d mmm;d/m/yy;d/m/yyyy;d/m\",\n" +
Expand Down Expand Up @@ -1516,7 +1516,7 @@ public void testToStringMetadataIncludingAllColorNameAndColorNumberProperties()
" \"colorWhite\": 2,\n" +
" \"colorYellow\": 6,\n" +
" \"comparators\": \"date, date-time, day-of-month, day-of-week, hour-of-am-pm, hour-of-day, minute-of-hour, month-of-year, nano-of-second, number, seconds-of-minute, text, text-case-insensitive, time, year\",\n" +
" \"converters\": \"basic, binary, boolean, boolean-to-text, collection, collection-to, collection-to-list, color, color-to-color, color-to-number, currency, currency-code-to-currency, currency-value-to, currency-value-to-number, date-time, date-time-symbols, decimal-number-symbols, environment, error-throwing, error-to-error, error-to-number, expression, form-and-validation, format-pattern-to-string, has-binary-to-string, has-formatter-selector, has-host-address, has-parser-selector, has-properties, has-spreadsheet-selection, has-style, has-text-node, has-validator-selector, has-value-to, json, json-to, locale, locale-to-text, net, null-to-number, number, number-to-color, number-to-currency-value, number-to-number, number-to-text, optional-to, plugins, properties, properties-to-date-time-symbols, properties-to-decimal-number-symbols, properties-to-spreadsheet-metadata, properties-to-text-style, spreadsheet-cell-set, spreadsheet-metadata, spreadsheet-selection-to-spreadsheet-selection, spreadsheet-selection-to-text, spreadsheet-value, storage, storage-path-properties-to-class, storage-path-txt-to-class, storage-value-info-list-to-text, style, system, template, text, text-node, text-to-binary, text-to-boolean-list, text-to-border, text-to-charset, text-to-color, text-to-csv-string-list, text-to-currency, text-to-currency-code, text-to-currency-value, text-to-date-list, text-to-date-time-list, text-to-email-address, text-to-environment-value-name, text-to-error, text-to-expression, text-to-flag, text-to-form-name, text-to-has-host-address, text-to-host-address, text-to-indentation, text-to-json, text-to-line-ending, text-to-locale, text-to-locale-language-tag, text-to-margin, text-to-media-type, text-to-number-list, text-to-object, text-to-padding, text-to-properties, text-to-spreadsheet-color-name, text-to-spreadsheet-formatter-selector, text-to-spreadsheet-id, text-to-spreadsheet-metadata, text-to-spreadsheet-metadata-color, text-to-spreadsheet-metadata-property-name, text-to-spreadsheet-name, text-to-spreadsheet-selection, text-to-spreadsheet-text, text-to-storage-path, text-to-string-list, text-to-template-value-name, text-to-text, text-to-text-node, text-to-text-style, text-to-text-style-property-name, text-to-time-list, text-to-url, text-to-url-fragment, text-to-url-query-string, text-to-validation-error, text-to-validator-selector, text-to-value-type, text-to-zone-offset, to-boolean, to-json-node, to-json-text, to-number, to-string, to-styleable, to-validation-checkbox, to-validation-choice, to-validation-choice-list, to-validation-error-list, url, url-to-hyperlink, url-to-image\",\n" +
" \"converters\": \"basic, binary, boolean, boolean-to-text, collection, collection-to, collection-to-list, color, color-to-color, color-to-number, currency, currency-code-to-currency, currency-value-to, currency-value-to-number, date-time, date-time-symbols, decimal-number-symbols, environment, error-throwing, error-to-error, error-to-number, expression, form-and-validation, format-pattern-to-string, has-binary-to-string, has-formatter-selector, has-host-address, has-parser-selector, has-properties, has-spreadsheet-selection, has-style, has-text-node, has-validator-selector, has-value-to, json, json-to, locale, locale-to-text, net, null-to-number, number, number-to-color, number-to-currency-value, number-to-number, number-to-text, optional-to, plugins, properties, properties-to-date-time-symbols, properties-to-decimal-number-symbols, properties-to-spreadsheet-metadata, properties-to-text-style, spreadsheet-cell-set, spreadsheet-metadata, spreadsheet-selection-to-spreadsheet-selection, spreadsheet-selection-to-text, spreadsheet-value, storage, storage-path-txt-to-class, storage-value-info-list-to-text, style, system, template, text, text-node, text-to-binary, text-to-boolean-list, text-to-border, text-to-charset, text-to-color, text-to-csv-string-list, text-to-currency, text-to-currency-code, text-to-currency-value, text-to-date-list, text-to-date-time-list, text-to-email-address, text-to-environment-value-name, text-to-error, text-to-expression, text-to-flag, text-to-form-name, text-to-has-host-address, text-to-host-address, text-to-indentation, text-to-json, text-to-line-ending, text-to-locale, text-to-locale-language-tag, text-to-margin, text-to-media-type, text-to-number-list, text-to-object, text-to-padding, text-to-properties, text-to-spreadsheet-color-name, text-to-spreadsheet-formatter-selector, text-to-spreadsheet-id, text-to-spreadsheet-metadata, text-to-spreadsheet-metadata-color, text-to-spreadsheet-metadata-property-name, text-to-spreadsheet-name, text-to-spreadsheet-selection, text-to-spreadsheet-text, text-to-storage-path, text-to-string-list, text-to-template-value-name, text-to-text, text-to-text-node, text-to-text-style, text-to-text-style-property-name, text-to-time-list, text-to-url, text-to-url-fragment, text-to-url-query-string, text-to-validation-error, text-to-validator-selector, text-to-value-type, text-to-zone-offset, to-boolean, to-json-node, to-json-text, to-number, to-string, to-styleable, to-validation-checkbox, to-validation-choice, to-validation-choice-list, to-validation-error-list, url, url-to-hyperlink, url-to-image\",\n" +
" \"currency\": \"AUD\",\n" +
" \"dateFormatter\": \"date dddd, d mmmm yyyy\",\n" +
" \"dateParser\": \"date dddd, d mmmm yyyy;dddd, d mmmm yy;dddd, d mmmm;d mmmm yyyy;d mmmm yy;d mmmm;d mmm yyyy;d mmm yy;d mmm;d/m/yy;d/m/yyyy;d/m\",\n" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,6 @@ public void testTreePrint() {
" spreadsheet-selection-to-text\n" +
" spreadsheet-value\n" +
" storage\n" +
" storage-path-properties-to-class\n" +
" storage-path-txt-to-class\n" +
" storage-value-info-list-to-text\n" +
" style\n" +
Expand Down
Loading
Loading