diff options
| -rw-r--r-- | pom.xml | 10 | ||||
| -rw-r--r-- | songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrFileFormatDetector.java | 3 | ||||
| -rw-r--r-- | songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java | 4 |
3 files changed, 14 insertions, 3 deletions
@@ -37,6 +37,7 @@ <maven.compiler.release>${java.version}</maven.compiler.release> <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> + <uvok.jackson.version>2.19.1</uvok.jackson.version> </properties> <dependencies> @@ -55,12 +56,17 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.19.1</version> + <version>${uvok.jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.19.1</version> + <version>${uvok.jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jdk8</artifactId> + <version>${uvok.jackson.version}</version> </dependency> </dependencies> 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) { |