Skip to content

Commit 85bac8c

Browse files
authored
Merge pull request #2222 from mP1/feature/mP1-walkingkooka-spreadsheet-pull-8597-SpreadsheetMetadata-spreadsheetConverterContext-currentWorkingDirectory-parameter-added
mP1/walkingkooka-spreadsheet#8597 Spreadsheet…
2 parents e5859ce + 2d5ae16 commit 85bac8c

9 files changed

+35
-0
lines changed

src/main/java/walkingkooka/spreadsheet/server/formatter/SpreadsheetFormatterMenuHateosHttpHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public void handle(final HttpRequest request,
7171
(final Optional<Object> v) -> {
7272
throw new UnsupportedOperationException(); // SpreadsheetExpressionEvaluationContext not required
7373
},
74+
context.currentWorkingDirectory(),
7475
context.indentation(),
7576
context, // SpreadsheetLabelNameResolver
7677
context.lineEnding(),

src/main/java/walkingkooka/spreadsheet/server/formatter/SpreadsheetFormatterSelectorEditHateosHttpHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ final SpreadsheetFormatterSelectorEdit produceEdit(final String formatterSelecto
125125
SpreadsheetExpressionEvaluationContext.FORMAT_VALUE,
126126
v
127127
),
128+
context.currentWorkingDirectory(),
128129
context.indentation(),
129130
SpreadsheetLabelNameResolvers.empty(),
130131
context.lineEnding(),

src/main/java/walkingkooka/spreadsheet/server/meta/ConverterSelectorVerifyHateosHttpEntityHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ public HttpEntity handleOne(final SpreadsheetMetadataPropertyName<?> propertyNam
102102
SpreadsheetMetadata.NO_CELL,
103103
SpreadsheetMetadata.NO_VALIDATION_REFERENCE,
104104
Cast.to(propertyName),
105+
context.currentWorkingDirectory(),
105106
context.indentation(),
106107
SpreadsheetLabelNameResolvers.empty(),
107108
context.lineEnding(),

src/main/java/walkingkooka/spreadsheet/server/parser/SpreadsheetParserSelectorEditHateosHttpEntityHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ public HttpEntity handleAll(final HttpEntity httpEntity,
113113
SpreadsheetExpressionEvaluationContext.FORMAT_VALUE,
114114
v
115115
),
116+
context.currentWorkingDirectory(),
116117
context.indentation(),
117118
SpreadsheetLabelNameResolvers.empty(),
118119
context.lineEnding(),

src/test/java/walkingkooka/spreadsheet/server/formatter/SpreadsheetFormatterMenuHateosHttpHandlerTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import walkingkooka.spreadsheet.server.FakeSpreadsheetEngineHateosResourceHandlerContext;
4747
import walkingkooka.spreadsheet.server.SpreadsheetEngineHateosResourceHandlerContext;
4848
import walkingkooka.spreadsheet.value.SpreadsheetCell;
49+
import walkingkooka.storage.StoragePath;
4950
import walkingkooka.text.Indentation;
5051
import walkingkooka.text.LineEnding;
5152
import walkingkooka.tree.json.JsonNode;
@@ -107,6 +108,11 @@ public MediaType contentType() {
107108
return MediaType.APPLICATION_JSON;
108109
}
109110

111+
@Override
112+
public Optional<StoragePath> currentWorkingDirectory() {
113+
return SpreadsheetFormatterMenuHateosHttpHandlerTest.CURRENT_WORKING_DIRECTORY;
114+
}
115+
110116
@Override
111117
public Indentation indentation() {
112118
return SpreadsheetFormatterMenuHateosHttpHandlerTest.INDENTATION;

src/test/java/walkingkooka/spreadsheet/server/formatter/SpreadsheetFormatterSelectorEditHateosHttpHandlerCellTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import walkingkooka.spreadsheet.store.repo.FakeSpreadsheetStoreRepository;
5454
import walkingkooka.spreadsheet.store.repo.SpreadsheetStoreRepository;
5555
import walkingkooka.spreadsheet.value.SpreadsheetCell;
56+
import walkingkooka.storage.StoragePath;
5657
import walkingkooka.text.Indentation;
5758
import walkingkooka.text.LineEnding;
5859
import walkingkooka.tree.json.JsonNode;
@@ -791,6 +792,11 @@ public MediaType contentType() {
791792
return MediaType.APPLICATION_JSON;
792793
}
793794

795+
@Override
796+
public Optional<StoragePath> currentWorkingDirectory() {
797+
return SpreadsheetFormatterSelectorEditHateosHttpHandlerCellTest.CURRENT_WORKING_DIRECTORY;
798+
}
799+
794800
@Override
795801
public Indentation indentation() {
796802
return SpreadsheetFormatterSelectorEditHateosHttpHandlerCellTest.INDENTATION;

src/test/java/walkingkooka/spreadsheet/server/formatter/SpreadsheetFormatterSelectorEditHateosHttpHandlerMetadataTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import walkingkooka.spreadsheet.server.FakeSpreadsheetEngineHateosResourceHandlerContext;
4646
import walkingkooka.spreadsheet.server.SpreadsheetEngineHateosResourceHandlerContext;
4747
import walkingkooka.spreadsheet.value.SpreadsheetCell;
48+
import walkingkooka.storage.StoragePath;
4849
import walkingkooka.text.Indentation;
4950
import walkingkooka.text.LineEnding;
5051
import walkingkooka.tree.json.JsonNode;
@@ -319,6 +320,11 @@ public MediaType contentType() {
319320
return MediaType.APPLICATION_JSON;
320321
}
321322

323+
@Override
324+
public Optional<StoragePath> currentWorkingDirectory() {
325+
return SpreadsheetFormatterSelectorEditHateosHttpHandlerMetadataTest.CURRENT_WORKING_DIRECTORY;
326+
}
327+
322328
@Override
323329
public Indentation indentation() {
324330
return SpreadsheetFormatterSelectorEditHateosHttpHandlerMetadataTest.INDENTATION;

src/test/java/walkingkooka/spreadsheet/server/meta/ConverterSelectorVerifyHateosHttpEntityHandlerTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import walkingkooka.spreadsheet.server.FakeSpreadsheetEngineHateosResourceHandlerContext;
4343
import walkingkooka.spreadsheet.server.SpreadsheetEngineHateosResourceHandlerContext;
4444
import walkingkooka.spreadsheet.server.net.SpreadsheetServerMediaTypes;
45+
import walkingkooka.storage.StoragePath;
4546
import walkingkooka.text.Indentation;
4647
import walkingkooka.text.LineEnding;
4748
import walkingkooka.tree.expression.ExpressionNumberKind;
@@ -129,6 +130,11 @@ public UrlPath path() {
129130
public SpreadsheetEngineHateosResourceHandlerContext context() {
130131
return new FakeSpreadsheetEngineHateosResourceHandlerContext() {
131132

133+
@Override
134+
public Optional<StoragePath> currentWorkingDirectory() {
135+
return ConverterSelectorVerifyHateosHttpEntityHandlerTest.CURRENT_WORKING_DIRECTORY;
136+
}
137+
132138
@Override
133139
public Indentation indentation() {
134140
return ConverterSelectorVerifyHateosHttpEntityHandlerTest.INDENTATION;

src/test/java/walkingkooka/spreadsheet/server/parser/SpreadsheetParserSelectorEditHateosHttpEntityHandlerTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import walkingkooka.spreadsheet.server.FakeSpreadsheetEngineHateosResourceHandlerContext;
5151
import walkingkooka.spreadsheet.server.SpreadsheetEngineHateosResourceHandlerContext;
5252
import walkingkooka.spreadsheet.value.SpreadsheetCell;
53+
import walkingkooka.storage.StoragePath;
5354
import walkingkooka.text.Indentation;
5455
import walkingkooka.text.LineEnding;
5556
import walkingkooka.tree.json.JsonNode;
@@ -152,6 +153,11 @@ public MediaType contentType() {
152153
return MediaType.APPLICATION_JSON;
153154
}
154155

156+
@Override
157+
public Optional<StoragePath> currentWorkingDirectory() {
158+
return SpreadsheetParserSelectorEditHateosHttpEntityHandlerTest.CURRENT_WORKING_DIRECTORY;
159+
}
160+
155161
@Override
156162
public Indentation indentation() {
157163
return SpreadsheetParserSelectorEditHateosHttpEntityHandlerTest.INDENTATION;
@@ -245,6 +251,7 @@ public Optional<TextNode> formatValue(final SpreadsheetCell cell,
245251
(final Optional<Object> v) -> {
246252
throw new UnsupportedOperationException();
247253
},
254+
SpreadsheetParserSelectorEditHateosHttpEntityHandlerTest.CURRENT_WORKING_DIRECTORY,
248255
SpreadsheetParserSelectorEditHateosHttpEntityHandlerTest.INDENTATION,
249256
SpreadsheetLabelNameResolvers.fake(),
250257
SpreadsheetMetadataTesting.LINE_ENDING,

0 commit comments

Comments
 (0)