From f31d42479484eea53edf97ac0dcb5354b16d1f77 Mon Sep 17 00:00:00 2001 From: joohyukkim Date: Tue, 1 Aug 2023 00:21:19 +0900 Subject: [PATCH 1/5] Replace with databind method call --- .../jackson/module/afterburner/AfterburnerModule.java | 10 ++++++++-- .../jackson/module/blackbird/BlackbirdModule.java | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java b/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java index c4c6f705..5b1a7fe4 100644 --- a/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java +++ b/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java @@ -2,14 +2,20 @@ import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.Module; +import com.fasterxml.jackson.databind.util.NativeImageUtil; import com.fasterxml.jackson.module.afterburner.ser.SerializerModifier; import com.fasterxml.jackson.module.afterburner.deser.DeserializerModifier; public class AfterburnerModule extends Module implements java.io.Serializable // is this necessary? { - // TODO: replace with jackson-databind/NativeImageUtil.RUNNING_IN_SVM - private static final boolean RUNNING_IN_SVM = System.getProperty("org.graalvm.nativeimage.imagecode") != null; + /** + * [modules-base#191] Native image detection + * + * @since 2.16 + */ + private static final boolean RUNNING_IN_SVM = NativeImageUtil.isRunningInNativeImage(); + private static final long serialVersionUID = 1L; /* diff --git a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java index 26402e1c..a3c571eb 100644 --- a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java +++ b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java @@ -1,5 +1,6 @@ package com.fasterxml.jackson.module.blackbird; +import com.fasterxml.jackson.databind.util.NativeImageUtil; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles.Lookup; import java.util.function.Function; @@ -12,8 +13,13 @@ public class BlackbirdModule extends Module { - // TODO: replace with jackson-databind/NativeImageUtil.RUNNING_IN_SVM - private static final boolean RUNNING_IN_SVM = System.getProperty("org.graalvm.nativeimage.imagecode") != null; + /** + * [modules-base#191] Native image detection + * + * @since 2.16 + */ + private static final boolean RUNNING_IN_SVM = NativeImageUtil.isRunningInNativeImage(); + private Function, Lookup> _lookups; public BlackbirdModule() { From bfcafc4160f656931532fb94c323e7a9ec98a2e3 Mon Sep 17 00:00:00 2001 From: joohyukkim Date: Tue, 1 Aug 2023 13:16:01 +0900 Subject: [PATCH 2/5] Not the check not static --- .../jackson/module/afterburner/AfterburnerModule.java | 10 ++-------- .../jackson/module/blackbird/BlackbirdModule.java | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java b/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java index 5b1a7fe4..0cca5092 100644 --- a/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java +++ b/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java @@ -9,13 +9,6 @@ public class AfterburnerModule extends Module implements java.io.Serializable // is this necessary? { - /** - * [modules-base#191] Native image detection - * - * @since 2.16 - */ - private static final boolean RUNNING_IN_SVM = NativeImageUtil.isRunningInNativeImage(); - private static final long serialVersionUID = 1L; /* @@ -57,7 +50,8 @@ public AfterburnerModule() { } @Override public void setupModule(SetupContext context) { - if (RUNNING_IN_SVM) + // [modules-base#191] Since 2.16, Native image detection + if (NativeImageUtil.isRunningInNativeImage()) { return; } diff --git a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java index a3c571eb..5ea485e6 100644 --- a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java +++ b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java @@ -13,13 +13,6 @@ public class BlackbirdModule extends Module { - /** - * [modules-base#191] Native image detection - * - * @since 2.16 - */ - private static final boolean RUNNING_IN_SVM = NativeImageUtil.isRunningInNativeImage(); - private Function, Lookup> _lookups; public BlackbirdModule() { @@ -43,7 +36,8 @@ public BlackbirdModule(Supplier lookup) { @Override public void setupModule(SetupContext context) { - if (RUNNING_IN_SVM) + // [modules-base#191] Since 2.16, Native image detection + if (NativeImageUtil.isRunningInNativeImage()) { return; } From d28360e49a6df46722e18d4b5dc2aa0423f27cd3 Mon Sep 17 00:00:00 2001 From: joohyukkim Date: Wed, 2 Aug 2023 00:08:10 +0900 Subject: [PATCH 3/5] Adopt new getter name early. --- .../fasterxml/jackson/module/afterburner/AfterburnerModule.java | 2 +- .../com/fasterxml/jackson/module/blackbird/BlackbirdModule.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java b/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java index 0cca5092..7840cb5d 100644 --- a/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java +++ b/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java @@ -51,7 +51,7 @@ public AfterburnerModule() { } public void setupModule(SetupContext context) { // [modules-base#191] Since 2.16, Native image detection - if (NativeImageUtil.isRunningInNativeImage()) + if (NativeImageUtil.isInSVM()) { return; } diff --git a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java index 5ea485e6..3372f01d 100644 --- a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java +++ b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java @@ -37,7 +37,7 @@ public BlackbirdModule(Supplier lookup) { public void setupModule(SetupContext context) { // [modules-base#191] Since 2.16, Native image detection - if (NativeImageUtil.isRunningInNativeImage()) + if (NativeImageUtil.isInSVM()) { return; } From 1ccdf294c4f825b121a3da5fa605a7a08791766f Mon Sep 17 00:00:00 2001 From: joohyukkim Date: Wed, 2 Aug 2023 00:10:19 +0900 Subject: [PATCH 4/5] Update BlackbirdModule.java --- .../com/fasterxml/jackson/module/blackbird/BlackbirdModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java index 3372f01d..2f7d8937 100644 --- a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java +++ b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java @@ -37,7 +37,7 @@ public BlackbirdModule(Supplier lookup) { public void setupModule(SetupContext context) { // [modules-base#191] Since 2.16, Native image detection - if (NativeImageUtil.isInSVM()) + if (NativeImageUtil.isInNativeImage()) { return; } From b0475185412a162bde307eabd151f5c82af0f7f0 Mon Sep 17 00:00:00 2001 From: "Kim, Joo Hyuk" Date: Thu, 3 Aug 2023 11:17:16 +0900 Subject: [PATCH 5/5] Update AfterburnerModule.java --- .../fasterxml/jackson/module/afterburner/AfterburnerModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java b/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java index 7840cb5d..191f00fb 100644 --- a/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java +++ b/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java @@ -51,7 +51,7 @@ public AfterburnerModule() { } public void setupModule(SetupContext context) { // [modules-base#191] Since 2.16, Native image detection - if (NativeImageUtil.isInSVM()) + if (NativeImageUtil.isInNativeImage()) { return; }