From 6dd2db6ccd90e8a64626b0da904d3af8ae0aa0c7 Mon Sep 17 00:00:00 2001 From: uvok Date: Sat, 12 Jul 2025 12:42:14 +0200 Subject: Add Jackson optional module --- pom.xml | 10 ++++++++-- .../java/de/uvok/tuxguitar/SongsterrFileFormatDetector.java | 3 +++ .../src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java | 4 +++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c14f274..984db89 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ ${java.version} ${java.version} ${java.version} + 2.19.1 @@ -55,12 +56,17 @@ com.fasterxml.jackson.core jackson-core - 2.19.1 + ${uvok.jackson.version} com.fasterxml.jackson.core jackson-databind - 2.19.1 + ${uvok.jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${uvok.jackson.version} diff --git a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrFileFormatDetector.java b/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrFileFormatDetector.java index 3d2c5e7..aed21e8 100644 --- a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrFileFormatDetector.java +++ b/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrFileFormatDetector.java @@ -3,6 +3,8 @@ package de.uvok.tuxguitar; import java.io.InputStream; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; + import org.herac.tuxguitar.io.base.TGFileFormat; import org.herac.tuxguitar.io.base.TGFileFormatDetector; @@ -14,6 +16,7 @@ public class SongsterrFileFormatDetector implements TGFileFormatDetector { public TGFileFormat getFileFormat(InputStream stream) { try { ObjectMapper om = new ObjectMapper(); + om.registerModule(new Jdk8Module()); om.readTree(stream); } catch (Exception e) { System.err.println(e.toString()); diff --git a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java b/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java index dbdec61..b319b47 100644 --- a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java +++ b/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java @@ -11,6 +11,7 @@ import com.fasterxml.jackson.core.StreamReadFeature; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; public class SongsterrInputStream implements TGSongReader { @@ -23,7 +24,8 @@ public class SongsterrInputStream implements TGSongReader { public void read(TGSongReaderHandle arg0) throws TGFileFormatException { InputStream is = arg0.getInputStream(); try { - ObjectMapper om = new ObjectMapper(); //.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + ObjectMapper om = new ObjectMapper(); + om.registerModule(new Jdk8Module()); Song song = om.readValue(is, Song.class); System.out.println(song); } catch (IOException e) { -- cgit v1.2.3