Merge pull request #26357 from Sanne/oracleMetaWindows

Allow to override the Oracle JDBC metadata for native images also on Windows
quarkusio · Jun 27, 2022 · 5f27683 · 5f27683
2 parents f94a8d0 + 23f43c3
commit 5f27683
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/...e/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java b/...e/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java
@@ -35,7 +35,8 @@
 public final class OracleMetadataOverrides {
 
     static final String DRIVER_JAR_MATCH_REGEX = ".*com\\.oracle\\.database\\.jdbc.*";
-    static final String NATIVE_IMAGE_RESOURCE_MATCH_REGEX = "/META-INF/native-image/(?:native-image\\.properties|reflect-config\\.json)";
+    static final String NATIVE_IMAGE_RESOURCE_MATCH_REGEX = "/META-INF/native-image/native-image\\.properties";
+    static final String NATIVE_IMAGE_REFLECT_CONFIG_MATCH_REGEX = "/META-INF/native-image/reflect-config\\.json";
 
     /**
      * Should match the contents of {@literal reflect-config.json}
@@ -106,9 +107,13 @@ void runtimeInitializeDriver(BuildProducer<RuntimeInitializedClassBuildItem> run
     }
 
     @BuildStep
-    ExcludeConfigBuildItem excludeOracleDirectives() {
-        // Excludes both native-image.properties and reflect-config.json, which are reimplemented above
-        return new ExcludeConfigBuildItem(DRIVER_JAR_MATCH_REGEX, NATIVE_IMAGE_RESOURCE_MATCH_REGEX);
+    void excludeOracleDirectives(BuildProducer<ExcludeConfigBuildItem> nativeImageExclusions) {
+        // Excludes both native-image.properties and reflect-config.json, which are reimplemented above.
+        // N.B. this could be expressed by using a single regex to match both resources,
+        // but such a regex would include a ? char, which breaks arguments parsing on Windows.
+        nativeImageExclusions.produce(new ExcludeConfigBuildItem(DRIVER_JAR_MATCH_REGEX, NATIVE_IMAGE_RESOURCE_MATCH_REGEX));
+        nativeImageExclusions
+                .produce(new ExcludeConfigBuildItem(DRIVER_JAR_MATCH_REGEX, NATIVE_IMAGE_REFLECT_CONFIG_MATCH_REGEX));
     }
 
     @BuildStep

diff --git a/...dbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/RegexMatchTest.java b/...dbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/RegexMatchTest.java
@@ -26,20 +26,33 @@ public void jarRegexIsMatching() {
     }
 
     @Test
-    public void resourceRegexIsMatching() {
-        //We need to exclude both of these:
+    public void nativeImageResourceRegexIsMatching() {
+        //We need to exclude this one:
         final String RES1 = "/META-INF/native-image/native-image.properties";
-        final String RES2 = "/META-INF/native-image/reflect-config.json";
         final Pattern pattern = Pattern.compile(OracleMetadataOverrides.NATIVE_IMAGE_RESOURCE_MATCH_REGEX);
 
         Assert.assertTrue(pattern.matcher(RES1).find());
-        Assert.assertTrue(pattern.matcher(RES2).find());
 
-        //While this one should NOT be ignored:
-        final String RES3 = "/META-INF/native-image/resource-config.json";
-        final String RES4 = "/META-INF/native-image/jni-config.json";
+        //While these should NOT be ignored:
+        final String RES2 = "/META-INF/native-image/resource-config.json";
+        final String RES3 = "/META-INF/native-image/jni-config.json";
+        Assert.assertFalse(pattern.matcher(RES2).find());
+        Assert.assertFalse(pattern.matcher(RES3).find());
+    }
+
+    @Test
+    public void nativeImageReflectConfigRegexIsMatching() {
+        //We need to exclude this one:
+        final String RES1 = "/META-INF/native-image/reflect-config.json";
+        final Pattern pattern = Pattern.compile(OracleMetadataOverrides.NATIVE_IMAGE_REFLECT_CONFIG_MATCH_REGEX);
+
+        Assert.assertTrue(pattern.matcher(RES1).find());
+
+        //While these should NOT be ignored:
+        final String RES2 = "/META-INF/native-image/resource-config.json";
+        final String RES3 = "/META-INF/native-image/jni-config.json";
+        Assert.assertFalse(pattern.matcher(RES2).find());
         Assert.assertFalse(pattern.matcher(RES3).find());
-        Assert.assertFalse(pattern.matcher(RES4).find());
     }
 
 }