Skip to content

Commit d4d93bf

Browse files
committed
SpreadsheetConverters.storagePathJsonToClass() removed
1 parent 51ef8df commit d4d93bf

9 files changed

Lines changed: 4 additions & 44 deletions

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ eg
163163
- [spreadsheet-selection-to-text](https://github.com/mP1/walkingkooka-spreadsheet/blob/master/src/main/java/walkingkooka/spreadsheet/convert/SpreadsheetConverterSpreadsheetSelectionToText.java)
164164
- [spreadsheet-value](https://github.com/mP1/walkingkooka-spreadsheet/blob/master/src/main/java/walkingkooka/spreadsheet/convert/SpreadsheetConverters.java)
165165
- [storage](https://github.com/mP1/walkingkooka-spreadsheet/blob/master/src/main/java/walkingkooka/spreadsheet/convert/SpreadsheetConverters.java)
166-
- [storage-path-json-to-class](https://github.com/mP1/walkingkooka-storage/blob/master/src/main/java/walkingkooka/storage/convert/StorageConverterStoragePathJsonToClass.java)
167166
- [storage-path-properties-to-class](https://github.com/mP1/walkingkooka-storage/blob/master/src/main/java/walkingkooka/storage/convert/StorageConverterStoragePathPropertiesToClass.java)
168167
- [storage-path-txt-to-class](https://github.com/mP1/walkingkooka-storage/blob/master/src/main/java/walkingkooka/storage/convert/StorageConverterStoragePathTxtToClass.java)
169168
- [storage-value-info-list-to-text](https://github.com/mP1/walkingkooka-storage/blob/master/src/main/java/walkingkooka/storage/convert/StorageConverterStorageValueInfoListToText.java)

src/main/java/walkingkooka/spreadsheet/convert/SpreadsheetConverters.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -698,20 +698,12 @@ public static Converter<SpreadsheetConverterContext> storage() {
698698
private final static Converter<SpreadsheetConverterContext> STORAGE = namedCollection(
699699
"storage",
700700
textToStoragePath(),
701-
storagePathJsonToClass(),
702701
storagePathPropertiesToClass(),
703702
storagePathTxtToClass(),
704703
storageValueInfoListToText(),
705704
binary()
706705
);
707706

708-
/**
709-
* {@see StorageConverters#storagePathJsonToClass}
710-
*/
711-
public static Converter<SpreadsheetConverterContext> storagePathJsonToClass() {
712-
return StorageConverters.storagePathJsonToClass();
713-
}
714-
715707
/**
716708
* {@see StorageConverters#storagePathPropertiesToClass}
717709
*/

src/main/java/walkingkooka/spreadsheet/convert/provider/MissingConverterVerifier.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,12 +1394,6 @@ static Set<MissingConverter> verify(final Converter<SpreadsheetConverterContext>
13941394
SpreadsheetConvertersConverterProvider.BINARY
13951395
);
13961396

1397-
verifier.addIfConversionFail(
1398-
StoragePath.parse("/path1/file2.json"),
1399-
Class.class,
1400-
SpreadsheetConvertersConverterProvider.STORAGE_PATH_JSON_TO_CLASS
1401-
);
1402-
14031397
verifier.addIfConversionFail(
14041398
StoragePath.parse("/path1/file2.properties"),
14051399
Class.class,

src/main/java/walkingkooka/spreadsheet/convert/provider/SpreadsheetConvertersConverterProvider.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -377,11 +377,6 @@ public <C extends ConverterContext> Converter<C> converter(final ConverterName n
377377

378378
converter = SpreadsheetConverters.storage();
379379
break;
380-
case STORAGE_PATH_JSON_TO_CLASS_STRING:
381-
noParameterCheck(copy);
382-
383-
converter = SpreadsheetConverters.storagePathJsonToClass();
384-
break;
385380
case STORAGE_PATH_PROPERTIES_TO_CLASS_STRING:
386381
noParameterCheck(copy);
387382

@@ -1015,10 +1010,6 @@ private static void parameterCountCheck(final List<?> values,
10151010

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

1018-
private final static String STORAGE_PATH_JSON_TO_CLASS_STRING = "storage-path-json-to-class";
1019-
1020-
final static ConverterName STORAGE_PATH_JSON_TO_CLASS = ConverterName.with(STORAGE_PATH_JSON_TO_CLASS_STRING);
1021-
10221013
private final static String STORAGE_PATH_PROPERTIES_TO_CLASS_STRING = "storage-path-properties-to-class";
10231014

10241015
final static ConverterName STORAGE_PATH_PROPERTIES_TO_CLASS = ConverterName.with(STORAGE_PATH_PROPERTIES_TO_CLASS_STRING);
@@ -1385,7 +1376,6 @@ public ConverterInfoSet converterInfos() {
13851376
converterInfo(SPREADSHEET_SELECTION_TO_TEXT),
13861377
converterInfo(SPREADSHEET_VALUE),
13871378
converterInfo(STORAGE),
1388-
converterInfo(STORAGE_PATH_JSON_TO_CLASS),
13891379
converterInfo(STORAGE_PATH_PROPERTIES_TO_CLASS),
13901380
converterInfo(STORAGE_PATH_TXT_TO_CLASS),
13911381
converterInfo(STORAGE_VALUE_INFO_LIST_TO_TEXT),

src/main/java/walkingkooka/spreadsheet/convert/provider/SpreadsheetConvertersConverterProviders.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
5050
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.COLOR_TO_NUMBER)
5151
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.NUMBER_TO_COLOR)
5252
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
53-
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_JSON_TO_CLASS)
5453
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_PROPERTIES_TO_CLASS)
5554
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_TXT_TO_CLASS)
5655
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
@@ -62,7 +61,6 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
6261

6362
public final static ConverterAliasSet FORMATTING = ALL.aliasSet()
6463
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
65-
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_JSON_TO_CLASS)
6664
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_PROPERTIES_TO_CLASS)
6765
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_TXT_TO_CLASS)
6866
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
@@ -74,7 +72,6 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
7472
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.COLOR_TO_NUMBER)
7573
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.NUMBER_TO_COLOR)
7674
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
77-
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_JSON_TO_CLASS)
7875
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_PROPERTIES_TO_CLASS)
7976
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_TXT_TO_CLASS)
8077
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
@@ -93,7 +90,6 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
9390
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.HAS_TEXT_NODE)
9491
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.NUMBER_TO_COLOR)
9592
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
96-
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_JSON_TO_CLASS)
9793
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_PROPERTIES_TO_CLASS)
9894
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_TXT_TO_CLASS)
9995
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)
@@ -113,7 +109,6 @@ public final class SpreadsheetConvertersConverterProviders implements PublicStat
113109
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.HAS_TEXT_NODE)
114110
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.NUMBER_TO_COLOR)
115111
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE)
116-
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_JSON_TO_CLASS)
117112
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_PROPERTIES_TO_CLASS)
118113
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_PATH_TXT_TO_CLASS)
119114
.deleteAliasOrName(SpreadsheetConvertersConverterProvider.STORAGE_VALUE_INFO_LIST_TO_TEXT)

src/test/java/walkingkooka/spreadsheet/convert/provider/SpreadsheetConvertersConverterProviderTest.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -652,15 +652,6 @@ public void testConverterSelectorWithStorage() {
652652
);
653653
}
654654

655-
@Test
656-
public void testConverterSelectorWithStoragePathJsonToClass() {
657-
this.converterAndCheck(
658-
"storage-path-json-to-class",
659-
PROVIDER_CONTEXT,
660-
SpreadsheetConverters.storagePathJsonToClass()
661-
);
662-
}
663-
664655
@Test
665656
public void testConverterSelectorWithStoragePathPropertiesToClass() {
666657
this.converterAndCheck(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,7 @@ public void testToString() {
12901290
" \"colorWhite\": 2,\n" +
12911291
" \"colorYellow\": 6,\n" +
12921292
" \"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" +
1293-
" \"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-json-to-class, 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" +
1293+
" \"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" +
12941294
" \"currency\": \"AUD\",\n" +
12951295
" \"dateFormatter\": \"date dddd, d mmmm yyyy\",\n" +
12961296
" \"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" +
@@ -1516,7 +1516,7 @@ public void testToStringMetadataIncludingAllColorNameAndColorNumberProperties()
15161516
" \"colorWhite\": 2,\n" +
15171517
" \"colorYellow\": 6,\n" +
15181518
" \"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" +
1519-
" \"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-json-to-class, 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" +
1519+
" \"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" +
15201520
" \"currency\": \"AUD\",\n" +
15211521
" \"dateFormatter\": \"date dddd, d mmmm yyyy\",\n" +
15221522
" \"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" +

0 commit comments

Comments
 (0)