From 79c2173e2d6c1f652cafd1856e5718e06d205aa7 Mon Sep 17 00:00:00 2001 From: Melloware Date: Thu, 15 Aug 2024 08:19:31 -0400 Subject: [PATCH 1/2] Fix #199: Config Mapping update --- .../io/quarkus/tika/runtime/TikaConfiguration.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/runtime/src/main/java/io/quarkus/tika/runtime/TikaConfiguration.java b/runtime/src/main/java/io/quarkus/tika/runtime/TikaConfiguration.java index 0a4cc97..73b0252 100644 --- a/runtime/src/main/java/io/quarkus/tika/runtime/TikaConfiguration.java +++ b/runtime/src/main/java/io/quarkus/tika/runtime/TikaConfiguration.java @@ -3,19 +3,20 @@ import java.util.Map; import java.util.Optional; -import io.quarkus.runtime.annotations.ConfigItem; import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; +import io.smallrye.config.ConfigMapping; +import io.smallrye.config.WithDefault; /** * Tika parser configuration */ +@ConfigMapping(prefix = "quarkus.tika") @ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED) public class TikaConfiguration { /** * The resource path within the application artifact to the {@code tika-config.xml} file. */ - @ConfigItem public Optional tikaConfigPath; /** @@ -40,7 +41,6 @@ public class TikaConfiguration { * * This property will have no effect if the `tikaConfigPath' property has been set. */ - @ConfigItem public Optional parsers; /** @@ -51,7 +51,6 @@ public class TikaConfiguration { * quarkus.tika.parsers = pdf,odf * quarkus.tika.parser-options.pdf.sort-by-position = true */ - @ConfigItem public Map> parserOptions; /** @@ -62,7 +61,6 @@ public class TikaConfiguration { * quarkus.tika.parsers = classparser * quarkus.tika.parser.classparser = org.apache.tika.parser.asm.ClassParser */ - @ConfigItem public Map parser; /** @@ -71,6 +69,6 @@ public class TikaConfiguration { * Setting this property to false makes the content of each of the embedded documents * available separately. */ - @ConfigItem(defaultValue = "true") + @WithDefault("true") public boolean appendEmbeddedContent; } From 9fcea350a26be142a5207c2c775e0200921f407a Mon Sep 17 00:00:00 2001 From: Melloware Date: Thu, 15 Aug 2024 08:20:20 -0400 Subject: [PATCH 2/2] Update TikaConfiguration.java --- .../io/quarkus/tika/runtime/TikaConfiguration.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runtime/src/main/java/io/quarkus/tika/runtime/TikaConfiguration.java b/runtime/src/main/java/io/quarkus/tika/runtime/TikaConfiguration.java index 73b0252..90d209f 100644 --- a/runtime/src/main/java/io/quarkus/tika/runtime/TikaConfiguration.java +++ b/runtime/src/main/java/io/quarkus/tika/runtime/TikaConfiguration.java @@ -13,11 +13,11 @@ */ @ConfigMapping(prefix = "quarkus.tika") @ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED) -public class TikaConfiguration { +public interface TikaConfiguration { /** * The resource path within the application artifact to the {@code tika-config.xml} file. */ - public Optional tikaConfigPath; + Optional tikaConfigPath; /** * Comma separated list of the parsers which must be supported. @@ -41,7 +41,7 @@ public class TikaConfiguration { * * This property will have no effect if the `tikaConfigPath' property has been set. */ - public Optional parsers; + Optional parsers; /** * Configuration of the individual parsers. @@ -51,7 +51,7 @@ public class TikaConfiguration { * quarkus.tika.parsers = pdf,odf * quarkus.tika.parser-options.pdf.sort-by-position = true */ - public Map> parserOptions; + Map> parserOptions; /** * Full parser class name for a given parser abbreviation. @@ -61,7 +61,7 @@ public class TikaConfiguration { * quarkus.tika.parsers = classparser * quarkus.tika.parser.classparser = org.apache.tika.parser.asm.ClassParser */ - public Map parser; + Map parser; /** * Controls how the content of the embedded documents is parsed. @@ -70,5 +70,5 @@ public class TikaConfiguration { * available separately. */ @WithDefault("true") - public boolean appendEmbeddedContent; + boolean appendEmbeddedContent; }