Merge branch '2.16'

FasterXML · Aug 3, 2023 · e1fcbd8 · e1fcbd8
2 parents c6f3e83 + 758b700
commit e1fcbd8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/afterburner/src/main/java/tools/jackson/module/afterburner/AfterburnerModule.java b/afterburner/src/main/java/tools/jackson/module/afterburner/AfterburnerModule.java
@@ -1,17 +1,15 @@
 package tools.jackson.module.afterburner;
 
 import tools.jackson.core.Version;
-
 import tools.jackson.databind.JacksonModule;
+import tools.jackson.databind.util.NativeImageUtil;
 
 import tools.jackson.module.afterburner.deser.ABDeserializerModifier;
 import tools.jackson.module.afterburner.ser.ABSerializerModifier;
 
 public class AfterburnerModule extends JacksonModule
     implements java.io.Serializable
 {
-    // TODO: replace with jackson-databind/NativeImageUtil.RUNNING_IN_SVM
-    private static final boolean RUNNING_IN_SVM = System.getProperty("org.graalvm.nativeimage.imagecode") != null;
     private static final long serialVersionUID = 1L;
 
     /*
@@ -53,7 +51,8 @@ public AfterburnerModule() { }
     @Override
     public void setupModule(SetupContext context)
     {
-        if (RUNNING_IN_SVM)
+        // [modules-base#191] Since 2.16, Native image detection 
+        if (NativeImageUtil.isInNativeImage())
         {
             return;
         }

diff --git a/blackbird/src/main/java/tools/jackson/module/blackbird/BlackbirdModule.java b/blackbird/src/main/java/tools/jackson/module/blackbird/BlackbirdModule.java
@@ -6,14 +6,15 @@
 import java.util.function.Supplier;
 
 import tools.jackson.core.Version;
+
 import tools.jackson.databind.JacksonModule;
+import tools.jackson.databind.util.NativeImageUtil;
+
 import tools.jackson.module.blackbird.deser.BBDeserializerModifier;
 import tools.jackson.module.blackbird.ser.BBSerializerModifier;
 
 public class BlackbirdModule extends JacksonModule
 {
-    // TODO: replace with jackson-databind/NativeImageUtil.RUNNING_IN_SVM
-    private static final boolean RUNNING_IN_SVM = System.getProperty("org.graalvm.nativeimage.imagecode") != null;
     private Function<Class<?>, Lookup> _lookups;
 
     public BlackbirdModule() {
@@ -37,7 +38,8 @@ public BlackbirdModule(Supplier<MethodHandles.Lookup> lookup) {
     @Override
     public void setupModule(SetupContext context)
     {
-        if (RUNNING_IN_SVM)
+        // [modules-base#191] Since 2.16, Native image detection 
+        if (NativeImageUtil.isInNativeImage())
         {
             return;
         }