andi-huber commented on code in PR #3263:
URL: https://github.com/apache/causeway/pull/3263#discussion_r2557640309
##########
commons/src/test/java/org/apache/causeway/commons/io/YamlUtilsTest.java:
##########
@@ -66,7 +66,7 @@ void parseRecord() {
var yaml = person.java8Time().interpolator().applyTo(yamlTemplate);
// debug
- //System.err.printf("%s%n", yaml);
+ System.err.printf("%s%n", yaml);
Review Comment:
comment out
##########
commons/src/main/java/org/apache/causeway/commons/io/YamlUtils.java:
##########
@@ -178,46 +177,49 @@ public DumperOptions allowReadOnlyProperties(final
DumperOptions opts) {
* SnakeYaml as of 2.2 does not support Java records. So we use Jackson
instead.
* @param loadCustomizer
*/
- private ObjectMapper createJacksonReader(
+ private YAMLMapper createJacksonReader(
final Optional<YamlLoadCustomizer> loadCustomizer,
final JsonUtils.JacksonCustomizer ... customizers) {
var yamlFactory = YAMLFactory.builder()
- .loaderOptions(loadCustomizer
- .map(YamlUtils::createLoaderOptions)
- .orElseGet(YamlUtils::createLoaderOptions))
+// .loaderOptions(loadCustomizer
+// .map(YamlUtils::createLoaderOptions)
+// .orElseGet(YamlUtils::createLoaderOptions)) // FIXME
.build();
- var mapper = new ObjectMapper(yamlFactory);
- mapper = JsonUtils.jdk8Support(mapper);
- mapper = JsonUtils.readingJavaTimeSupport(mapper);
- mapper = JsonUtils.readingCanSupport(mapper);
+
+ var builder = YAMLMapper.builder(yamlFactory);
+ JsonUtils.readingJavaTimeSupport(builder);
+ JsonUtils.readingCanSupport(builder);
for(JsonUtils.JacksonCustomizer customizer : customizers) {
- mapper = Optional.ofNullable(customizer.apply(mapper))
- .orElse(mapper);
+ Optional.ofNullable(customizer.apply(builder))
+ .orElse(builder);
}
- return mapper;
+ return builder.build();
}
/**
* Use Jackson to write YAML.
*/
- private ObjectMapper createJacksonWriter(
+ private YAMLMapper createJacksonWriter(
final Optional<YamlDumpCustomizer> dumpCustomizer,
final JsonUtils.JacksonCustomizer ... customizers) {
var yamlFactory = YAMLFactory.builder()
- .dumperOptions(dumpCustomizer
- .map(YamlUtils::createDumperOptions)
- .orElseGet(YamlUtils::createDumperOptions))
- .build()
- .disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER);
- var mapper = new ObjectMapper(yamlFactory);
- mapper = JsonUtils.jdk8Support(mapper);
- mapper = JsonUtils.writingJavaTimeSupport(mapper);
- mapper = JsonUtils.writingCanSupport(mapper);
+ .disable(YAMLWriteFeature.WRITE_DOC_START_MARKER)
+// .dumperOptions(dumpCustomizer
Review Comment:
migrate
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
