chore: remove use of Substitution for GaxProperties (#1675)

* chore: replace use of Substitution for GaxProperties

Author: mpeddada1

gax/build.gradle

@@ -21,7 +21,8 @@ dependencies {
   testImplementation(libraries['maven.junit_junit'],
     libraries['maven.org_mockito_mockito_core'],
     libraries['maven.com_google_truth_truth'],
-    libraries['maven.com_google_auto_value_auto_value'])
+    libraries['maven.com_google_auto_value_auto_value'],
+          libraries['maven.org_graalvm_sdk'])
 
   annotationProcessor libraries['maven.com_google_auto_value_auto_value']
   testAnnotationProcessor libraries['maven.com_google_auto_value_auto_value']

gax/src/main/java/com/google/api/gax/core/GaxProperties.java

@@ -29,6 +29,9 @@
  */
 package com.google.api.gax.core;
 
+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.core.InternalApi;
 import java.io.IOException;
 import java.io.InputStream;
@@ -81,6 +84,12 @@ public static String getLibraryVersion(Class<?> libraryClass, String propertyNam
 
   /** Returns the version of the running JVM */
   public static String getJavaVersion() {
+    // 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)) {
+      return System.getProperty("java.version") + "-graalvm";
+    }
     return JAVA_VERSION;
   }
 

gax/src/main/java/com/google/api/gax/nativeimage/substitutions/GaxPropertiesSubstitutions.java

@@ -29,6 +29,8 @@
  */
 package com.google.api.gax.core;
 
+import static org.graalvm.nativeimage.ImageInfo.PROPERTY_IMAGE_CODE_KEY;
+import static org.graalvm.nativeimage.ImageInfo.PROPERTY_IMAGE_CODE_VALUE_RUNTIME;
 import static org.junit.Assert.assertTrue;
 
 import java.util.regex.Pattern;
@@ -54,4 +56,11 @@ public void testGaxVersion() {
       assertTrue(minor >= 56);
     }
   }
+
+  @Test
+  public void testGetVersion_nativeImage() {
+    System.setProperty(PROPERTY_IMAGE_CODE_KEY, PROPERTY_IMAGE_CODE_VALUE_RUNTIME);
+    String javaVersion = GaxProperties.getJavaVersion();
+    assertTrue(javaVersion.endsWith("-graalvm"));
+  }
 }