Skip to content

Commit 1acedf7

Browse files
mpeddada1mpeddada1
authored
fix: native image configs for google-http-java-client (#1893)
* fix: native image configs for google-http-java-client
1 parent 1d37fa3 commit 1acedf7

21 files changed

Lines changed: 1752 additions & 3 deletions

File tree

‎.kokoro/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ graalvm17)
8181
;;
8282
graalvmA)
8383
# Run Unit and Integration Tests with Native Image
84-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
84+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-deps test -pl '!google-http-client-appengine'
8585
RETURN_CODE=$?
8686
;;
8787
graalvmB)
8888
# Run Unit and Integration Tests with Native Image
89-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
89+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-deps test -pl '!google-http-client-appengine'
9090
RETURN_CODE=$?
9191
;;
9292
samples)

‎.kokoro/presubmit/graalvm-native-a.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ env_vars: {
3030
env_vars: {
3131
key: "SECRET_MANAGER_KEYS"
3232
value: "java-it-service-account"
33-
}
33+
}

‎google-http-client-apache-v2/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-apache-v2/reflect-config.json‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
[
2+
{
3+
"name": "org.apache.commons.logging.impl.LogFactoryImpl",
4+
"queryAllDeclaredConstructors": true,
5+
"queryAllPublicConstructors": true,
6+
"queryAllDeclaredMethods": true,
7+
"allPublicMethods": true,
8+
"allDeclaredFields": true,
9+
"methods": [
10+
{
11+
"name": "<init>",
12+
"parameterTypes": []
13+
}
14+
]
15+
},
16+
{
17+
"name": "org.apache.commons.logging.impl.Log4JLogger",
18+
"queryAllDeclaredConstructors": true,
19+
"queryAllPublicConstructors": true,
20+
"queryAllDeclaredMethods": true,
21+
"allPublicMethods": true,
22+
"allDeclaredFields": true
23+
},
24+
{
25+
"name": "org.apache.commons.logging.impl.Jdk14Logger",
26+
"queryAllDeclaredConstructors": true,
27+
"queryAllPublicConstructors": true,
28+
"queryAllDeclaredMethods": true,
29+
"allPublicMethods": true,
30+
"allDeclaredFields": true
31+
},
32+
{
33+
"name": "org.apache.commons.logging.impl.SimpleLog",
34+
"queryAllDeclaredConstructors": true,
35+
"queryAllPublicConstructors": true,
36+
"queryAllDeclaredMethods": true,
37+
"allDeclaredConstructors": true,
38+
"allPublicConstructors": true,
39+
"allPublicMethods": true,
40+
"allDeclaredFields": true
41+
},
42+
{
43+
"name": "org.apache.commons.logging.impl.Jdk13LumberjackLogger",
44+
"queryAllDeclaredConstructors": true,
45+
"queryAllPublicConstructors": true,
46+
"queryAllDeclaredMethods": true,
47+
"allPublicMethods": true,
48+
"allDeclaredFields": true
49+
},
50+
{
51+
"name": "org.apache.commons.logging.LogFactory",
52+
"allDeclaredConstructors": true,
53+
"allPublicConstructors": true,
54+
"allDeclaredMethods": true,
55+
"allPublicMethods": true,
56+
"allDeclaredClasses": true,
57+
"allPublicClasses": true
58+
}
59+
]

‎google-http-client-gson/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-gson/reflect-config.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[
2+
{
3+
"name": "com.google.api.client.json.GenericJson",
4+
"queryAllDeclaredConstructors": true,
5+
"queryAllPublicConstructors": true,
6+
"queryAllDeclaredMethods": true,
7+
"allDeclaredConstructors": true,
8+
"allPublicConstructors": true,
9+
"allPublicMethods": true,
10+
"allDeclaredFields": true
11+
},
12+
{
13+
"name": "com.google.api.client.util.ArrayMap",
14+
"queryAllDeclaredConstructors": true,
15+
"queryAllPublicConstructors": true,
16+
"queryAllDeclaredMethods": true,
17+
"allDeclaredConstructors": true,
18+
"allPublicConstructors": true,
19+
"allPublicMethods": true,
20+
"allDeclaredFields": true
21+
}
22+
]

‎google-http-client-jackson2/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-jackson2/reflect-config.json‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
[
2+
{
3+
"name": "com.google.api.client.json.GenericJson",
4+
"queryAllDeclaredConstructors": true,
5+
"queryAllPublicConstructors": true,
6+
"queryAllDeclaredMethods": true,
7+
"allDeclaredConstructors": true,
8+
"allPublicConstructors": true,
9+
"allPublicMethods": true,
10+
"allDeclaredFields": true
11+
},
12+
{
13+
"name": "java.util.HashMap",
14+
"queryAllDeclaredConstructors": true,
15+
"queryAllPublicConstructors": true,
16+
"queryAllDeclaredMethods": true,
17+
"allDeclaredConstructors": true,
18+
"allPublicConstructors": true,
19+
"allPublicMethods": true,
20+
"allDeclaredFields": true
21+
},
22+
{
23+
"name": "java.util.LinkedList",
24+
"queryAllDeclaredConstructors": true,
25+
"queryAllPublicConstructors": true,
26+
"queryAllDeclaredMethods": true,
27+
"allDeclaredConstructors": true,
28+
"allPublicConstructors": true,
29+
"allPublicMethods": true,
30+
"allDeclaredFields": true
31+
},
32+
{
33+
"name": "java.lang.Object",
34+
"queryAllDeclaredConstructors": true,
35+
"queryAllPublicConstructors": true,
36+
"queryAllDeclaredMethods": true,
37+
"allDeclaredConstructors": true,
38+
"allPublicConstructors": true,
39+
"allPublicMethods": true,
40+
"allDeclaredFields": true
41+
},
42+
{
43+
"name": "com.google.api.client.util.ArrayMap",
44+
"queryAllDeclaredConstructors": true,
45+
"queryAllPublicConstructors": true,
46+
"queryAllDeclaredMethods": true,
47+
"allDeclaredConstructors": true,
48+
"allPublicConstructors": true,
49+
"allPublicMethods": true,
50+
"allDeclaredFields": true
51+
}
52+
]

‎google-http-client-jackson2/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client-jackson2/native-image.properties‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Args=--initialize-at-build-time=com.google.api.client.json.jackson2.JacksonFactoryTest \
2+
--initialize-at-build-time=com.google.api.client.json.jackson2.JacksonGeneratorTest \
3+
--initialize-at-build-time=com.fasterxml.jackson.core.io.SerializedString \
4+
--initialize-at-build-time=com.fasterxml.jackson.core.io.CharTypes \
5+
--initialize-at-build-time=com.fasterxml.jackson.core.JsonFactory \
6+
--initialize-at-build-time=com.fasterxml.jackson.core.io.JsonStringEncoder \
7+
--initialize-at-build-time=com.google.api.client.util.StringUtils

‎google-http-client-protobuf/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-protobuf/reflect-config.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[
2+
{
3+
"name": "com.google.api.client.protobuf.SimpleProto$TestMessage",
4+
"queryAllDeclaredConstructors": true,
5+
"queryAllPublicConstructors": true,
6+
"queryAllDeclaredMethods": true,
7+
"allDeclaredConstructors": true,
8+
"allPublicConstructors": true,
9+
"allPublicMethods": true,
10+
"allDeclaredFields": true
11+
}
12+
]

‎google-http-client-test/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,16 @@
7171
<scope>provided</scope>
7272
</dependency>
7373
</dependencies>
74+
75+
<profiles>
76+
<profile>
77+
<id>native-deps</id>
78+
<dependencies>
79+
<dependency>
80+
<groupId>com.google.guava</groupId>
81+
<artifactId>guava</artifactId>
82+
</dependency>
83+
</dependencies>
84+
</profile>
85+
</profiles>
7486
</project>

0 commit comments

Comments
 (0)