From 462eff2daa3c09fa6cf5bd514b34a486fcf947fb Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Mon, 7 Dec 2020 17:23:11 +0100 Subject: [PATCH] Move Tika substitutions to proper package Also add a comment about removing the PDFBox one when migrating to GraalVM 21. --- .../graal}/CleanerNotSupportedSubstitution.java | 2 +- .../tika/{graalvm => runtime/graal}/PDFBoxSubstitutions.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename extensions/tika/runtime/src/main/java/io/quarkus/tika/{graalvm => runtime/graal}/CleanerNotSupportedSubstitution.java (95%) rename extensions/tika/runtime/src/main/java/io/quarkus/tika/{graalvm => runtime/graal}/PDFBoxSubstitutions.java (91%) diff --git a/extensions/tika/runtime/src/main/java/io/quarkus/tika/graalvm/CleanerNotSupportedSubstitution.java b/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/graal/CleanerNotSupportedSubstitution.java similarity index 95% rename from extensions/tika/runtime/src/main/java/io/quarkus/tika/graalvm/CleanerNotSupportedSubstitution.java rename to extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/graal/CleanerNotSupportedSubstitution.java index f882e8676806c..151359302285c 100644 --- a/extensions/tika/runtime/src/main/java/io/quarkus/tika/graalvm/CleanerNotSupportedSubstitution.java +++ b/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/graal/CleanerNotSupportedSubstitution.java @@ -1,4 +1,4 @@ -package io.quarkus.tika.graalvm; +package io.quarkus.tika.runtime.graal; @com.oracle.svm.core.annotate.Substitute @com.oracle.svm.core.annotate.TargetClass(className = "org.apache.poi.poifs.nio.CleanerUtil") diff --git a/extensions/tika/runtime/src/main/java/io/quarkus/tika/graalvm/PDFBoxSubstitutions.java b/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/graal/PDFBoxSubstitutions.java similarity index 91% rename from extensions/tika/runtime/src/main/java/io/quarkus/tika/graalvm/PDFBoxSubstitutions.java rename to extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/graal/PDFBoxSubstitutions.java index 76ed8d0726111..b8441b5d728eb 100644 --- a/extensions/tika/runtime/src/main/java/io/quarkus/tika/graalvm/PDFBoxSubstitutions.java +++ b/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/graal/PDFBoxSubstitutions.java @@ -1,4 +1,4 @@ -package io.quarkus.tika.graalvm; +package io.quarkus.tika.runtime.graal; import java.awt.color.ColorSpace; import java.awt.color.ICC_ColorSpace; @@ -31,6 +31,7 @@ final class Target_org_apache_pdfbox_pdmodel_graphics_color_PDICCBased { // Substitutions to prevent ICC_ColorSpace instances from appearing in the native image when using Apache Tika // See https://github.com/quarkusio/quarkus/pull/13644 +// These substitutions can be removed when moving from GraalVM 20.3 to GraalVM 21.0. class PDFBoxSubstitutions { }