From b5615ba06adb00454dec54c8d516cf83ff4f4523 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Mon, 9 May 2022 22:30:43 -0400 Subject: [PATCH 1/6] chore: set Java header during native image runtime --- .../services/AbstractGoogleClientRequest.java | 11 +++++++++++ .../services/AbstractGoogleClientRequestTest.java | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java index 72ab6e937..b632e79ba 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java @@ -37,6 +37,7 @@ import com.google.api.client.http.UriTemplate; import com.google.api.client.util.GenericData; import com.google.api.client.util.Preconditions; +import com.google.common.base.Joiner; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -164,6 +165,16 @@ static class ApiClientVersion { } public String toString() { + // When running the application as a native image, append `-graalvm` to the + // version. + String imageCode = System.getProperty("org.graalvm.nativeimage.imagecode"); + if (imageCode != null && imageCode.equals("runtime")){ + String[] tokens = versionString.split(" "); + if (tokens.length > 0 && tokens[0].startsWith("gl-java")) { + tokens[0] += "-graalvm"; + return Joiner.on(" ").join(tokens); + } + } return versionString; } diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java index 734e3900b..1eefdb139 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java @@ -261,6 +261,14 @@ public void testSetsApiClientHeaderWithOsVersion() { assertTrue("Api version should contain the os version", version.matches(".* my-os/1.2.3")); } + public void testSetsApiClientHeader_NativeImage() throws IOException { + System.setProperty("org.graalvm.nativeimage.imagecode", "runtime"); + System.setProperty("java.version", "11.0.0"); + String version = new ApiClientVersion().toString(); + assertTrue( + "Api version should contain -graalvm suffix", version.matches("gl-java/11.0.0-graalvm.*")); + } + public void testSetsApiClientHeaderWithoutOsVersion() { System.setProperty("os.name", "My OS"); System.clearProperty("os.version"); From 1055ff5de3675837270f9739454829ed0cc14cec Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 10 May 2022 02:34:43 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .../client/googleapis/services/AbstractGoogleClientRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java index b632e79ba..3b8d3cc3d 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java @@ -168,7 +168,7 @@ public String toString() { // When running the application as a native image, append `-graalvm` to the // version. String imageCode = System.getProperty("org.graalvm.nativeimage.imagecode"); - if (imageCode != null && imageCode.equals("runtime")){ + if (imageCode != null && imageCode.equals("runtime")) { String[] tokens = versionString.split(" "); if (tokens.length > 0 && tokens[0].startsWith("gl-java")) { tokens[0] += "-graalvm"; From 939203388ccd850b45c755960d981a3f4066da57 Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Wed, 11 May 2022 10:13:44 -0400 Subject: [PATCH 3/6] use constants --- google-api-client/pom.xml | 5 +++++ .../googleapis/services/AbstractGoogleClientRequest.java | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 06ba94813..2579077cb 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -117,6 +117,11 @@ + + org.graalvm.sdk + graal-sdk + 22.1.0 + com.google.oauth-client google-oauth-client diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java index b632e79ba..c669e283c 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java @@ -14,6 +14,8 @@ import static com.google.common.base.StandardSystemProperty.OS_NAME; import static com.google.common.base.StandardSystemProperty.OS_VERSION; +import static org.graalvm.nativeimage.ImageInfo.PROPERTY_IMAGE_CODE_KEY; +import static org.graalvm.nativeimage.ImageInfo.PROPERTY_IMAGE_CODE_VALUE_RUNTIME; import com.google.api.client.googleapis.GoogleUtils; import com.google.api.client.googleapis.MethodOverride; @@ -167,8 +169,8 @@ static class ApiClientVersion { public String toString() { // When running the application as a native image, append `-graalvm` to the // version. - String imageCode = System.getProperty("org.graalvm.nativeimage.imagecode"); - if (imageCode != null && imageCode.equals("runtime")){ + String imageCode = System.getProperty(PROPERTY_IMAGE_CODE_KEY); + if (imageCode != null && imageCode.equals(PROPERTY_IMAGE_CODE_VALUE_RUNTIME)){ String[] tokens = versionString.split(" "); if (tokens.length > 0 && tokens[0].startsWith("gl-java")) { tokens[0] += "-graalvm"; From 2a9778c6bfd2a032bf3a67da5cfb9d6ec9364a04 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 11 May 2022 14:17:54 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .../client/googleapis/services/AbstractGoogleClientRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java index c669e283c..dd7776f57 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java @@ -170,7 +170,7 @@ public String toString() { // When running the application as a native image, append `-graalvm` to the // version. String imageCode = System.getProperty(PROPERTY_IMAGE_CODE_KEY); - if (imageCode != null && imageCode.equals(PROPERTY_IMAGE_CODE_VALUE_RUNTIME)){ + if (imageCode != null && imageCode.equals(PROPERTY_IMAGE_CODE_VALUE_RUNTIME)) { String[] tokens = versionString.split(" "); if (tokens.length > 0 && tokens[0].startsWith("gl-java")) { tokens[0] += "-graalvm"; From a8e53463f96943eb66ce1f610ea809ad1010a23f Mon Sep 17 00:00:00 2001 From: Mridula Peddada Date: Thu, 12 May 2022 12:03:24 -0400 Subject: [PATCH 5/6] revert usage of constant --- google-api-client/pom.xml | 5 ----- .../googleapis/services/AbstractGoogleClientRequest.java | 6 ++---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 2579077cb..06ba94813 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -117,11 +117,6 @@ - - org.graalvm.sdk - graal-sdk - 22.1.0 - com.google.oauth-client google-oauth-client diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java index c669e283c..b632e79ba 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java @@ -14,8 +14,6 @@ import static com.google.common.base.StandardSystemProperty.OS_NAME; import static com.google.common.base.StandardSystemProperty.OS_VERSION; -import static org.graalvm.nativeimage.ImageInfo.PROPERTY_IMAGE_CODE_KEY; -import static org.graalvm.nativeimage.ImageInfo.PROPERTY_IMAGE_CODE_VALUE_RUNTIME; import com.google.api.client.googleapis.GoogleUtils; import com.google.api.client.googleapis.MethodOverride; @@ -169,8 +167,8 @@ static class ApiClientVersion { public String toString() { // When running the application as a native image, append `-graalvm` to the // version. - String imageCode = System.getProperty(PROPERTY_IMAGE_CODE_KEY); - if (imageCode != null && imageCode.equals(PROPERTY_IMAGE_CODE_VALUE_RUNTIME)){ + String imageCode = System.getProperty("org.graalvm.nativeimage.imagecode"); + if (imageCode != null && imageCode.equals("runtime")){ String[] tokens = versionString.split(" "); if (tokens.length > 0 && tokens[0].startsWith("gl-java")) { tokens[0] += "-graalvm"; From 3d84dfc3e2878d3862e802f3a15be794cd2f44c1 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Thu, 12 May 2022 16:07:00 +0000 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .../client/googleapis/services/AbstractGoogleClientRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java index b632e79ba..3b8d3cc3d 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java @@ -168,7 +168,7 @@ public String toString() { // When running the application as a native image, append `-graalvm` to the // version. String imageCode = System.getProperty("org.graalvm.nativeimage.imagecode"); - if (imageCode != null && imageCode.equals("runtime")){ + if (imageCode != null && imageCode.equals("runtime")) { String[] tokens = versionString.split(" "); if (tokens.length > 0 && tokens[0].startsWith("gl-java")) { tokens[0] += "-graalvm";