fix: native image configs for google-http-java-client (#1893)

* fix: native image configs for google-http-java-client
googleapis · Nov 9, 2023 · 1acedf7 · 1acedf7
1 parent 1d37fa3
commit 1acedf7
Show file tree

Hide file tree

Showing 21 changed files with 1,752 additions and 3 deletions.
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -81,12 +81,12 @@ graalvm17)
     ;;
 graalvmA)
     # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-deps test -pl '!google-http-client-appengine'
     RETURN_CODE=$?
     ;;
 graalvmB)
     # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-deps test -pl '!google-http-client-appengine'
     RETURN_CODE=$?
     ;;
 samples)

diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -30,4 +30,4 @@ env_vars: {
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "java-it-service-account"
-}
+}
diff --git a/...-INF/native-image/com.google.http-client/google-http-client-apache-v2/reflect-config.json b/...-INF/native-image/com.google.http-client/google-http-client-apache-v2/reflect-config.json
@@ -0,0 +1,59 @@
+[
+  {
+    "name": "org.apache.commons.logging.impl.LogFactoryImpl",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true,
+    "methods": [
+      {
+        "name": "<init>",
+        "parameterTypes": []
+      }
+    ]
+  },
+  {
+    "name": "org.apache.commons.logging.impl.Log4JLogger",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "org.apache.commons.logging.impl.Jdk14Logger",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "org.apache.commons.logging.impl.SimpleLog",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "org.apache.commons.logging.impl.Jdk13LumberjackLogger",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "org.apache.commons.logging.LogFactory",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  }
+]
diff --git a/.../META-INF/native-image/com.google.http-client/google-http-client-gson/reflect-config.json b/.../META-INF/native-image/com.google.http-client/google-http-client-gson/reflect-config.json
@@ -0,0 +1,22 @@
+[
+  {
+    "name": "com.google.api.client.json.GenericJson",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "com.google.api.client.util.ArrayMap",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true
+  }
+]
diff --git a/...A-INF/native-image/com.google.http-client/google-http-client-jackson2/reflect-config.json b/...A-INF/native-image/com.google.http-client/google-http-client-jackson2/reflect-config.json
@@ -0,0 +1,52 @@
+[
+  {
+    "name": "com.google.api.client.json.GenericJson",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "java.util.HashMap",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "java.util.LinkedList",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "java.lang.Object",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "com.google.api.client.util.ArrayMap",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true
+  }
+]
diff --git a/...F/native-image/com.google.http-client/google-http-client-jackson2/native-image.properties b/...F/native-image/com.google.http-client/google-http-client-jackson2/native-image.properties
@@ -0,0 +1,7 @@
+Args=--initialize-at-build-time=com.google.api.client.json.jackson2.JacksonFactoryTest \
+--initialize-at-build-time=com.google.api.client.json.jackson2.JacksonGeneratorTest \
+--initialize-at-build-time=com.fasterxml.jackson.core.io.SerializedString \
+--initialize-at-build-time=com.fasterxml.jackson.core.io.CharTypes \
+--initialize-at-build-time=com.fasterxml.jackson.core.JsonFactory \
+--initialize-at-build-time=com.fasterxml.jackson.core.io.JsonStringEncoder \
+--initialize-at-build-time=com.google.api.client.util.StringUtils
diff --git a/...A-INF/native-image/com.google.http-client/google-http-client-protobuf/reflect-config.json b/...A-INF/native-image/com.google.http-client/google-http-client-protobuf/reflect-config.json
@@ -0,0 +1,12 @@
+[
+  {
+    "name": "com.google.api.client.protobuf.SimpleProto$TestMessage",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true
+  }
+]
diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml
@@ -71,4 +71,16 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>native-deps</id>
+      <dependencies>
+        <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>