Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 15 commits into from
Nov 9, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1ef0f37
fix: native image configs for google-http-java-client
mpeddada1 Oct 24, 2023
48d602e
reflection configs for tests
mpeddada1 Nov 1, 2023
d4c1803
add reflection configs fr other tests
mpeddada1 Nov 2, 2023
28d1726
add google-http-client-xml module
mpeddada1 Nov 2, 2023
d943e92
remove unnecessary configs; de-dup reflect-config files
mpeddada1 Nov 5, 2023
371fc84
follow naming convention for config dir
mpeddada1 Nov 5, 2023
e2c017e
include native tests in ci
mpeddada1 Nov 6, 2023
325af0b
remove debug statements
mpeddada1 Nov 6, 2023
ffc2abc
include build time initialization
mpeddada1 Nov 6, 2023
d4014cd
clean up debug statements
mpeddada1 Nov 6, 2023
8ccbbe3
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Nov 6, 2023
7252f22
run graalvm tests with profile
mpeddada1 Nov 6, 2023
728993e
rebase with main
mpeddada1 Nov 7, 2023
b3e6f0a
clean up cfg
mpeddada1 Nov 7, 2023
2af7844
add resource config
mpeddada1 Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .kokoro/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-a.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ env_vars: {
env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-it-service-account"
}
}
59 changes: 59 additions & 0 deletions ...-INF/native-image/com.google.http-client/google-http-client-apache-v2/reflect-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
]
22 changes: 22 additions & 0 deletions .../META-INF/native-image/com.google.http-client/google-http-client-gson/reflect-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
]
52 changes: 52 additions & 0 deletions ...A-INF/native-image/com.google.http-client/google-http-client-jackson2/reflect-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
]
7 changes: 7 additions & 0 deletions ...F/native-image/com.google.http-client/google-http-client-jackson2/native-image.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
12 changes: 12 additions & 0 deletions ...A-INF/native-image/com.google.http-client/google-http-client-protobuf/reflect-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
]
12 changes: 12 additions & 0 deletions google-http-client-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading
Loading