From 1ef0f370e494bd550ba366e33471bec48adef0ac Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Tue, 24 Oct 2023 14:15:00 +0000 Subject: [PATCH 01/14] fix: native image configs for google-http-java-client --- .../native-image/native-image.properties | 1 + .../META-INF/native-image/reflect-config.json | 287 ++++++++++++++++++ .../native-image/serialization-config.json | 12 + pom.xml | 64 ++++ 4 files changed, 364 insertions(+) create mode 100644 google-http-client/src/test/resources/META-INF/native-image/native-image.properties create mode 100644 google-http-client/src/test/resources/META-INF/native-image/reflect-config.json create mode 100644 google-http-client/src/test/resources/META-INF/native-image/serialization-config.json diff --git a/google-http-client/src/test/resources/META-INF/native-image/native-image.properties b/google-http-client/src/test/resources/META-INF/native-image/native-image.properties new file mode 100644 index 000000000..a90ef2471 --- /dev/null +++ b/google-http-client/src/test/resources/META-INF/native-image/native-image.properties @@ -0,0 +1 @@ +Args=--enable-url-protocols=http,https \ No newline at end of file diff --git a/google-http-client/src/test/resources/META-INF/native-image/reflect-config.json b/google-http-client/src/test/resources/META-INF/native-image/reflect-config.json new file mode 100644 index 000000000..27eb123a2 --- /dev/null +++ b/google-http-client/src/test/resources/META-INF/native-image/reflect-config.json @@ -0,0 +1,287 @@ +[ +{ + "name":"io.opencensus.impl.trace.TraceComponentImpl", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] +}, + { + "name":"io.opencensus.impl.metrics.MetricsComponentImpl", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "java.util.LinkedList", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "java.util.ArrayList", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + {"name": "java.util.HashMap", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "java.lang.Object", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "java.lang.String", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "com.google.api.client.util.FieldInfoTest$E", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.DataMapTest$A", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.ClassInfoTest$E", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "io.opencensus.trace.Tracing", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "com.google.api.client.http.OpenCensusUtils", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "com.google.api.client.http.HttpRequest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true, + "allDeclaredClasses" : true, + "allPublicClasses": true + }, + { + "name": "com.google.api.client.http.UrlEncodedParserTest$Generic", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.UrlEncodedParserTest$Simple", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.UrlEncodedParserTest$E", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.UrlEncodedParserTest$EnumValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.HttpHeadersTest$MyHeaders", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.HttpHeadersTest$SlugHeaders", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.HttpHeadersTest$V", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.javanet.NetHttpRequestTest$SleepingOutputWriter", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.ClassInfoTest$A", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.ClassInfoTest$B", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.ClassInfoTest$C", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.ClassInfoTest$A1", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true +}, + { + "name": "com.google.api.client.util.ClassInfoTest$E", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.GenericUrlTest$FieldTypesUrl", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.GenericUrlTest$FieldTypesUrl", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.UriTemplateTest$testEnum", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.GenericDataTest$MyData", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ], + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.GenericDataTest$GenericData1", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.GenericDataTest$GenericData2", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.TypesTest$WildcardBounds", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.TypesTest$Foo", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.TypesTest$IntegerList", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.HttpRequestTest$E", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + } +] \ No newline at end of file diff --git a/google-http-client/src/test/resources/META-INF/native-image/serialization-config.json b/google-http-client/src/test/resources/META-INF/native-image/serialization-config.json new file mode 100644 index 000000000..7c56d718f --- /dev/null +++ b/google-http-client/src/test/resources/META-INF/native-image/serialization-config.json @@ -0,0 +1,12 @@ +{ + "types":[ + { + "name":"java.lang.String" + }, + {"name": "java.lang.Throwable"} + ], + "lambdaCapturingTypes":[ + ], + "proxies":[ + ] +} diff --git a/pom.xml b/pom.xml index 4069a98f4..c388b5255 100644 --- a/pom.xml +++ b/pom.xml @@ -586,6 +586,70 @@ + + + native + + + org.junit.vintage + junit-vintage-engine + 5.10.0 + test + + + org.graalvm.buildtools + junit-platform-native + 0.9.23 + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + 2.22.2 + + + + + + + + + + + org.graalvm.buildtools + native-maven-plugin + 0.9.23 + true + + + test-native + + test + + test + + + + + --no-fallback + --no-server + --initialize-at-build-time=com.google.api.client.util.StringUtils + --initialize-at-build-time=com.google.api.client.http.HttpRequestTest + --initialize-at-build-time=com.google.api.client.http.ByteArrayContentTest + --initialize-at-build-time=com.google.api.client.http.MultipartContentTest + --initialize-at-build-time=com.google.api.client.util.LoggingStreamingContentTest + --initialize-at-build-time=com.google.api.client.util.SecurityUtilsTest + + + + + + + Windows From 48d602e53d4fd330fdcaf2612bf0a83402ce4635 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Wed, 1 Nov 2023 15:43:34 +0000 Subject: [PATCH 02/14] reflection configs for tests --- .../google/api/client/http/HttpRequest.java | 3 + .../testing/http/MockLowLevelHttpRequest.java | 5 ++ .../META-INF/native-image/reflect-config.json | 44 ++++++++++ .../native-image/serialization-config.json | 10 +++ .../api/client/http/HttpRequestTest.java | 4 + .../META-INF/native-image/reflect-config.json | 85 ++++++++++++++++++- .../native-image/resource-config.json | 10 +++ .../native-image/serialization-config.json | 6 +- 8 files changed, 163 insertions(+), 4 deletions(-) create mode 100644 google-http-client/src/main/resources/META-INF/native-image/reflect-config.json create mode 100644 google-http-client/src/main/resources/META-INF/native-image/serialization-config.json create mode 100644 google-http-client/src/test/resources/META-INF/native-image/resource-config.json diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java index 78f15d868..73f254be3 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java +++ b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java @@ -506,6 +506,9 @@ public HttpHeaders getHeaders() { * @since 1.5 */ public HttpRequest setHeaders(HttpHeaders headers) { + System.out.println("MY HEADERS"); + System.out.println(headers); + System.out.println("END HEADERS"); this.headers = Preconditions.checkNotNull(headers); return this; } diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java b/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java index 115cdd7d1..79fbb497e 100644 --- a/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java +++ b/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java @@ -123,7 +123,12 @@ public String getFirstHeaderValue(String name) { * @since 1.13 */ public List getHeaderValues(String name) { + System.out.println("GET HEADER VALUES"); + System.out.println(headersMap.keySet()); + System.out.println(name.toLowerCase(Locale.US)); List values = headersMap.get(name.toLowerCase(Locale.US)); + System.out.println(values); + System.out.println("GET HEADER VALUES END"); return values == null ? Collections.emptyList() : Collections.unmodifiableList(values); } diff --git a/google-http-client/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client/src/main/resources/META-INF/native-image/reflect-config.json new file mode 100644 index 000000000..54cb5d454 --- /dev/null +++ b/google-http-client/src/main/resources/META-INF/native-image/reflect-config.json @@ -0,0 +1,44 @@ +[ + { + "name": "com.google.api.client.http.HttpHeaders", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "com.google.api.client.testing.http.MockLowLevelHttpRequest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "java.util.HashMap", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + } +] \ No newline at end of file diff --git a/google-http-client/src/main/resources/META-INF/native-image/serialization-config.json b/google-http-client/src/main/resources/META-INF/native-image/serialization-config.json new file mode 100644 index 000000000..41e80786e --- /dev/null +++ b/google-http-client/src/main/resources/META-INF/native-image/serialization-config.json @@ -0,0 +1,10 @@ +{ + "types":[ + {"name": "com.google.api.client.http.HttpResponseException"}, + {"name": "java.lang.StackTraceElement"} + ], + "lambdaCapturingTypes":[ + ], + "proxies":[ + ] +} \ No newline at end of file diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java index e7075131d..24c8c1498 100644 --- a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java +++ b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java @@ -960,6 +960,10 @@ public LowLevelHttpRequest buildRequest(String method, String url) throws IOExce request.setHeaders(myHeaders); request.execute(); // check headers + System.out.println("HELLLOO"); + System.out.println(HttpTesting.SIMPLE_GENERIC_URL); // is fine + System.out.println(lowLevelRequest.getHeaderValues("foo")); + System.out.println("HELLLOO END"); assertEquals(ImmutableList.of("bar"), lowLevelRequest.getHeaderValues("foo")); assertEquals(ImmutableList.of("a", "b", "c"), lowLevelRequest.getHeaderValues("list")); assertEquals(ImmutableList.of("a2", "b2", "c2"), lowLevelRequest.getHeaderValues("objlist")); diff --git a/google-http-client/src/test/resources/META-INF/native-image/reflect-config.json b/google-http-client/src/test/resources/META-INF/native-image/reflect-config.json index 27eb123a2..3381f4967 100644 --- a/google-http-client/src/test/resources/META-INF/native-image/reflect-config.json +++ b/google-http-client/src/test/resources/META-INF/native-image/reflect-config.json @@ -45,6 +45,10 @@ }, { "name": "java.lang.Object", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true, "methods": [ { "name": "", @@ -61,6 +65,24 @@ } ] }, + { + "name": "java.util.List", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "java.util.Collections", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, { "name": "com.google.api.client.util.FieldInfoTest$E", "queryAllDeclaredConstructors": true, @@ -68,6 +90,14 @@ "queryAllDeclaredMethods": true, "allDeclaredFields": true }, + { + "name": "com.google.api.client.util.FieldInfoTest$Data", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, { "name": "com.google.api.client.util.DataMapTest$A", "queryAllDeclaredConstructors": true, @@ -149,10 +179,11 @@ "allDeclaredFields": true }, { - "name": "com.google.api.client.http.HttpHeadersTest$MyHeaders", + "name": "com.google.api.client.http.HttpRequestTest$MyHeaders", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, + "allPublicMethods": true, "allDeclaredFields": true }, { @@ -169,11 +200,19 @@ "queryAllDeclaredMethods": true, "allDeclaredFields": true }, + { + "name": "com.google.api.client.http.HttpHeadersTest$MyHeaders", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, { "name": "com.google.api.client.http.javanet.NetHttpRequestTest$SleepingOutputWriter", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, + "allPublicMethods": true, "allDeclaredFields": true }, { @@ -219,7 +258,7 @@ "allDeclaredFields": true }, { - "name": "com.google.api.client.http.GenericUrlTest$FieldTypesUrl", + "name": "com.google.api.client.http.GenericUrlTest$TestUrl", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, @@ -234,6 +273,9 @@ }, { "name": "com.google.api.client.util.GenericDataTest$MyData", + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true, "methods": [ { "name": "", @@ -265,13 +307,36 @@ }, { "name": "com.google.api.client.util.TypesTest$Foo", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "com.google.api.client.util.TypesTest$IntegerList", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, "allDeclaredFields": true }, { - "name": "com.google.api.client.util.TypesTest$IntegerList", + "name": "com.google.api.client.util.TypesTest$Resolve", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.TypesTest$IntegerResolve", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.TypesTest$IntegerResolve", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, @@ -283,5 +348,19 @@ "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.HttpResponseTest$MyHeaders", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.http.javanet.NetHttpTransportTest$FakeServer", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true } ] \ No newline at end of file diff --git a/google-http-client/src/test/resources/META-INF/native-image/resource-config.json b/google-http-client/src/test/resources/META-INF/native-image/resource-config.json new file mode 100644 index 000000000..2d7f5b77c --- /dev/null +++ b/google-http-client/src/test/resources/META-INF/native-image/resource-config.json @@ -0,0 +1,10 @@ +{ + "resources":[ + {"pattern":"\\Qcom/google/api/client/util/privateKey.pem\\E"}, + {"pattern":"\\Qcom/google/api/client/util/cert.pem\\E"}, + {"pattern":"\\Qcom/google/api/client/util/mtlsCertAndKey.pem\\E"}, + {"pattern": "\\Qfile.txt\\E"}, + {"pattern": "\\Qcom/google/api/client/util/secret.pem\\E"}, + {"pattern": "\\Qcom/google/api/client/util/secret.p12\\E"}], + "bundles":[] +} \ No newline at end of file diff --git a/google-http-client/src/test/resources/META-INF/native-image/serialization-config.json b/google-http-client/src/test/resources/META-INF/native-image/serialization-config.json index 7c56d718f..db78112d9 100644 --- a/google-http-client/src/test/resources/META-INF/native-image/serialization-config.json +++ b/google-http-client/src/test/resources/META-INF/native-image/serialization-config.json @@ -3,7 +3,11 @@ { "name":"java.lang.String" }, - {"name": "java.lang.Throwable"} + {"name": "java.lang.Throwable"}, + {"name": "java.lang.Exception"}, + {"name": "java.io.IOException"}, + {"name": "java.lang.Object"}, + {"name": "java.util.Collections$EmptyList"} ], "lambdaCapturingTypes":[ ], From d4c1803a4e811fbc0bdb431ce156818360a28325 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Thu, 2 Nov 2023 14:19:52 +0000 Subject: [PATCH 03/14] add reflection configs fr other tests --- .../native-image/native-image.properties | 1 + .../META-INF/native-image/reflect-config.json | 133 ++++++ .../META-INF/native-image/reflect-config.json | 52 +++ .../META-INF/native-image/reflect-config.json | 432 ++++++++++++++++++ .../META-INF/native-image/reflect-config.json | 52 +++ .../native-image/native-image.properties | 6 + .../META-INF/native-image/reflect-config.json | 432 ++++++++++++++++++ .../META-INF/native-image/reflect-config.json | 12 + .../META-INF/native-image/reflect-config.json | 41 ++ 9 files changed, 1161 insertions(+) create mode 100644 google-http-client-apache-v2/src/main/resources/META-INF/native-image/native-image.properties create mode 100644 google-http-client-apache-v2/src/main/resources/META-INF/native-image/reflect-config.json create mode 100644 google-http-client-gson/src/main/resources/META-INF/native-image/reflect-config.json create mode 100644 google-http-client-gson/src/test/resources/META-INF/native-image/reflect-config.json create mode 100644 google-http-client-jackson2/src/main/resources/META-INF/native-image/reflect-config.json create mode 100644 google-http-client-jackson2/src/test/resources/META-INF/native-image/native-image.properties create mode 100644 google-http-client-jackson2/src/test/resources/META-INF/native-image/reflect-config.json create mode 100644 google-http-client-protobuf/src/main/resources/META-INF/native-image/reflect-config.json create mode 100644 google-http-client-test/src/main/resources/META-INF/native-image/reflect-config.json diff --git a/google-http-client-apache-v2/src/main/resources/META-INF/native-image/native-image.properties b/google-http-client-apache-v2/src/main/resources/META-INF/native-image/native-image.properties new file mode 100644 index 000000000..a90ef2471 --- /dev/null +++ b/google-http-client-apache-v2/src/main/resources/META-INF/native-image/native-image.properties @@ -0,0 +1 @@ +Args=--enable-url-protocols=http,https \ No newline at end of file diff --git a/google-http-client-apache-v2/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client-apache-v2/src/main/resources/META-INF/native-image/reflect-config.json new file mode 100644 index 000000000..dcc6af76e --- /dev/null +++ b/google-http-client-apache-v2/src/main/resources/META-INF/native-image/reflect-config.json @@ -0,0 +1,133 @@ +[ + { + "name": "org.apache.commons.logging.impl.LogFactoryImpl", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "javax.net.ssl.SSLSocketFactory", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "org.apache.http.ssl.SslContexts", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "javax.net.ssl.SslContext", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "org.apache.http.conn.ssl.AllowAllHostnameVerifier", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true, + "methods" : [ + { "name" : "", "parameterTypes" : ["javax.net.ssl.SSLContext", "javax.net.ssl.HostnameVerifier"] }, + { "name" : "", "parameterTypes" : ["javax.net.ssl.SSLContext", "java.lang.String[]", "java.lang.String[]", "javax.net.ssl.HostnameVerifier"] } + ] + }, + { + "name": "org.apache.http.conn.ssl.SSLConnectionSocketFactory", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true, + "methods" : [ + { "name" : "", "parameterTypes" : ["javax.net.ssl.SSLContext", "javax.net.ssl.HostnameVerifier"] }, + { "name" : "", "parameterTypes" : ["javax.net.ssl.SSLContext", "java.lang.String[]", "java.lang.String[]", "javax.net.ssl.HostnameVerifier"] } + ] + }, + { + "name": "org.apache.http.ssl.SSLContextBuilder", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "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 + }, + { + "name": "java.lang.String", + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, + { + "name": "java.lang.Class", + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + } +] \ No newline at end of file diff --git a/google-http-client-gson/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client-gson/src/main/resources/META-INF/native-image/reflect-config.json new file mode 100644 index 000000000..c1a546b3f --- /dev/null +++ b/google-http-client-gson/src/main/resources/META-INF/native-image/reflect-config.json @@ -0,0 +1,52 @@ +[ + { + "name": "java.util.HashMap", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.json.GenericJson", + "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 + } +] \ No newline at end of file diff --git a/google-http-client-gson/src/test/resources/META-INF/native-image/reflect-config.json b/google-http-client-gson/src/test/resources/META-INF/native-image/reflect-config.json new file mode 100644 index 000000000..b86a6e7b3 --- /dev/null +++ b/google-http-client-gson/src/test/resources/META-INF/native-image/reflect-config.json @@ -0,0 +1,432 @@ +[ + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Animal", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$WildCardTypes", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Simple", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$StringNullValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$DogWithFamily", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$ExtendsGenericJson", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$MapOfMapType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$PolymorphicWithNumericValueType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$AnimalGenericJson", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$EnumValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumberTypes", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Entry", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$TypeVariablesPassedAround", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$FloatMapTypeVariableType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Feed", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$V", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$PolymorphicSelfReferencing", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$DoubleListTypeVariableType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$TypeVariableType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "java.util.ArrayList", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$TestClass", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Dog", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$A", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumericValueTypedSubclass1", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$DogGenericJson", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumberTypesAsString", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$E", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$PolymorphicWithNumericType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Centipede", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$AnyType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$IntArrayTypeVariableType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$CollectionOfCollectionType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$ArrayType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumericValueTypedSubclass2", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumericTypedSubclass1", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$BooleanTypes", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Human", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$HumanWithPets", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumericTypedSubclass2", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$IntegerTypeVariableType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$X", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Y", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Z", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + } +] \ No newline at end of file diff --git a/google-http-client-jackson2/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client-jackson2/src/main/resources/META-INF/native-image/reflect-config.json new file mode 100644 index 000000000..3531bc889 --- /dev/null +++ b/google-http-client-jackson2/src/main/resources/META-INF/native-image/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 + } +] \ No newline at end of file diff --git a/google-http-client-jackson2/src/test/resources/META-INF/native-image/native-image.properties b/google-http-client-jackson2/src/test/resources/META-INF/native-image/native-image.properties new file mode 100644 index 000000000..7317248a0 --- /dev/null +++ b/google-http-client-jackson2/src/test/resources/META-INF/native-image/native-image.properties @@ -0,0 +1,6 @@ +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 \ No newline at end of file diff --git a/google-http-client-jackson2/src/test/resources/META-INF/native-image/reflect-config.json b/google-http-client-jackson2/src/test/resources/META-INF/native-image/reflect-config.json new file mode 100644 index 000000000..b86a6e7b3 --- /dev/null +++ b/google-http-client-jackson2/src/test/resources/META-INF/native-image/reflect-config.json @@ -0,0 +1,432 @@ +[ + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Animal", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$WildCardTypes", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Simple", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$StringNullValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$DogWithFamily", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$ExtendsGenericJson", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$MapOfMapType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$PolymorphicWithNumericValueType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$AnimalGenericJson", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$EnumValue", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumberTypes", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Entry", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$TypeVariablesPassedAround", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$FloatMapTypeVariableType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Feed", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$V", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$PolymorphicSelfReferencing", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$DoubleListTypeVariableType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$TypeVariableType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "java.util.ArrayList", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$TestClass", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Dog", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$A", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumericValueTypedSubclass1", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$DogGenericJson", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumberTypesAsString", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$E", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$PolymorphicWithNumericType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Centipede", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$AnyType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$IntArrayTypeVariableType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$CollectionOfCollectionType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$ArrayType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumericValueTypedSubclass2", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumericTypedSubclass1", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$BooleanTypes", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Human", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$HumanWithPets", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumericTypedSubclass2", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$IntegerTypeVariableType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$X", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Y", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Z", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + } +] \ No newline at end of file diff --git a/google-http-client-protobuf/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client-protobuf/src/main/resources/META-INF/native-image/reflect-config.json new file mode 100644 index 000000000..ab2deb4fd --- /dev/null +++ b/google-http-client-protobuf/src/main/resources/META-INF/native-image/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 + } +] \ No newline at end of file diff --git a/google-http-client-test/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client-test/src/main/resources/META-INF/native-image/reflect-config.json new file mode 100644 index 000000000..9b81fc760 --- /dev/null +++ b/google-http-client-test/src/main/resources/META-INF/native-image/reflect-config.json @@ -0,0 +1,41 @@ +[ + { + "name": "com.google.common.base.Preconditions", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "com.google.common.io.Files", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.util.Preconditions", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "java.io.File", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + } +] \ No newline at end of file From 28d1726df795246ec5fb07aa746c744f9aef6c3d Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Thu, 2 Nov 2023 17:06:45 +0000 Subject: [PATCH 04/14] add google-http-client-xml module --- .../META-INF/native-image/reflect-config.json | 12 + .../META-INF/native-image/reflect-config.json | 674 ++++++++++++++++++ .../native-image/resource-config.json | 5 + 3 files changed, 691 insertions(+) create mode 100644 google-http-client-xml/src/main/resources/META-INF/native-image/reflect-config.json create mode 100644 google-http-client-xml/src/test/resources/META-INF/native-image/reflect-config.json create mode 100644 google-http-client-xml/src/test/resources/META-INF/native-image/resource-config.json diff --git a/google-http-client-xml/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client-xml/src/main/resources/META-INF/native-image/reflect-config.json new file mode 100644 index 000000000..52ad6a97b --- /dev/null +++ b/google-http-client-xml/src/main/resources/META-INF/native-image/reflect-config.json @@ -0,0 +1,12 @@ +[ + { + "name": "com.google.api.client.xml.GenericXml", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + } +] \ No newline at end of file diff --git a/google-http-client-xml/src/test/resources/META-INF/native-image/reflect-config.json b/google-http-client-xml/src/test/resources/META-INF/native-image/reflect-config.json new file mode 100644 index 000000000..ce1fa5588 --- /dev/null +++ b/google-http-client-xml/src/test/resources/META-INF/native-image/reflect-config.json @@ -0,0 +1,674 @@ +[ + { + "name": "com.google.api.client.xml.GenericXmlListTest$CollectionOfArrayMapsTypeGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.GenericXmlListTest$ArrayOfArrayMapsTypeGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.GenericXmlListTest$ArrayWithClassTypeGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.GenericXmlListTest$CollectionWithClassTypeGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.GenericXmlListTest$MultiGenericWithClassType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.GenericXmlListTest$MultiGenericWithClassTypeGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + + { + "name": "com.google.api.client.xml.GenericXmlListTest$CollectionTypeStringGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.GenericXmlListTest$ArrayTypeStringGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.GenericXmlListTest$CollectionTypeIntegerGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + + { + "name": "com.google.api.client.xml.GenericXmlListTest$ArrayTypeIntegerGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.GenericXmlListTest$ArrayTypeIntGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.GenericXmlListTest$CollectionTypeEnumGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.GenericXmlListTest$ArrayTypeEnumGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlNamespaceDictionaryTest$Entry", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlNamespaceDictionaryTest$Feed", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.AtomTest$Feed", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.AtomTest$Author", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.AtomTest$Link", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.AtomTest$FeedEntry", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlTest$AnyType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$AnyEnum", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$AnyType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$AnyTypeEnumElementOnly", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$AnyTypeEnumAttributeOnly", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$ValueType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$CollectionOfArrayMapsType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$ArrayOfArrayMapsType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$ArrayWithClassType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$CollectionTypeString", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$ArrayTypeString", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$AnyTypeWithCollectionString", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$CollectionTypeInteger", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$ArrayTypeInteger", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$ArrayTypeInt", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$CollectionTypeEnum", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlEnumTest$ArrayTypeEnum", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlTest$SimpleTypeString", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlTest$SimpleTypeNumeric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlTest$AnyType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlTest$AnyTypeMissingField", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlTest$AnyTypeAdditionalField", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlTest$ValueType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlTest$AnyTypePrimitiveInt", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlTest$AnyTypePrimitiveString", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlTest$AnyTypeInf", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlTest$AllType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlListTest$CollectionOfArrayMapsType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlListTest$ArrayOfArrayMapsType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlListTest$ArrayWithClassType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlListTest$CollectionWithClassType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlListTest$CollectionTypeString", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlListTest$ArrayTypeString", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name": "com.google.api.client.xml.XmlListTest$AnyTypeWithCollectionString", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.XmlListTest$CollectionTypeInteger", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.XmlListTest$ArrayTypeInteger", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.XmlListTest$ArrayTypeInt", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.XmlListTest$CollectionTypeEnum", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.XmlListTest$ArrayTypeEnum", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.GenericXmlTest$AnyGenericType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.GenericXmlTest$SimpleTypeStringGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.GenericXmlTest$SimpleTypeNumericGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.GenericXmlTest$AnyTypeGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.GenericXmlTest$AnyTypeMissingFieldGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.GenericXmlTest$AnyTypeAdditionalFieldGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.GenericXmlTest$ValueTypeGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.GenericXmlTest$AnyTypePrimitiveIntGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + }, + { + "name":"com.google.api.client.xml.GenericXmlTest$AnyTypePrimitiveStringGeneric", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredConstructors": true, + "allPublicConstructors": true, + "allPublicMethods": true, + "allDeclaredFields": true + } +] \ No newline at end of file diff --git a/google-http-client-xml/src/test/resources/META-INF/native-image/resource-config.json b/google-http-client-xml/src/test/resources/META-INF/native-image/resource-config.json new file mode 100644 index 000000000..29b0c76b1 --- /dev/null +++ b/google-http-client-xml/src/test/resources/META-INF/native-image/resource-config.json @@ -0,0 +1,5 @@ +{ + "resources":[ + {"pattern":"\\Qsample-atom.xml\\E"}], + "bundles":[] +} \ No newline at end of file From d943e927e5d21b58b154dd367d99d5c95c76e6c7 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Sun, 5 Nov 2023 21:57:43 +0000 Subject: [PATCH 05/14] remove unnecessary configs; de-dup reflect-config files --- .../reflect-config.json | 33 +- .../META-INF/native-image/reflect-config.json | 133 ------ .../reflect-config.json | 22 + .../reflect-config.json | 0 .../native-image.properties | 0 .../META-INF/native-image/reflect-config.json | 432 ------------------ .../reflect-config.json | 0 google-http-client-test/pom.xml | 12 + .../test/json/AbstractJsonFactoryTest.java | 7 +- .../reflect-config.json | 0 .../serialization-config.json | 12 + .../META-INF/native-image/reflect-config.json | 41 -- .../reflect-config.json | 0 .../resource-config.json | 0 .../native-image.properties | 0 .../google-http-client/reflect-config.json | 114 +++++ .../serialization-config.json | 8 +- .../META-INF/native-image/reflect-config.json | 44 -- .../native-image/serialization-config.json | 10 - .../google-http-client}/reflect-config.json | 122 ----- .../google-http-client}/resource-config.json | 0 .../native-image/native-image.properties | 1 - pom.xml | 9 +- 23 files changed, 195 insertions(+), 805 deletions(-) rename {google-http-client-gson/src/main/resources/META-INF/native-image => google-http-client-apache-v2/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-apache-v2}/reflect-config.json (63%) delete mode 100644 google-http-client-apache-v2/src/main/resources/META-INF/native-image/reflect-config.json create mode 100644 google-http-client-gson/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-gson/reflect-config.json rename google-http-client-jackson2/src/main/resources/META-INF/native-image/{ => com.google.http-client/google-http-client-jackson2}/reflect-config.json (100%) rename google-http-client-jackson2/src/test/resources/META-INF/native-image/{ => com.google.http-client/google-http-client-jackson2}/native-image.properties (100%) delete mode 100644 google-http-client-jackson2/src/test/resources/META-INF/native-image/reflect-config.json rename google-http-client-protobuf/src/main/resources/META-INF/native-image/{ => com.google.http-client/google-http-client-protobuf}/reflect-config.json (100%) rename {google-http-client-gson/src/test/resources/META-INF/native-image => google-http-client-test/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-test}/reflect-config.json (100%) create mode 100644 google-http-client-test/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-test/serialization-config.json delete mode 100644 google-http-client-test/src/main/resources/META-INF/native-image/reflect-config.json rename google-http-client-xml/src/test/resources/META-INF/native-image/{ => com.google.http-client/google-http-client-xml}/reflect-config.json (100%) rename google-http-client-xml/src/test/resources/META-INF/native-image/{ => com.google.http-client/google-http-client-xml}/resource-config.json (100%) rename {google-http-client-apache-v2/src/main/resources/META-INF/native-image => google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client}/native-image.properties (100%) create mode 100644 google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/reflect-config.json rename google-http-client/src/{test/resources/META-INF/native-image => main/resources/META-INF/native-image/com.google.http-client/google-http-client}/serialization-config.json (64%) delete mode 100644 google-http-client/src/main/resources/META-INF/native-image/reflect-config.json delete mode 100644 google-http-client/src/main/resources/META-INF/native-image/serialization-config.json rename google-http-client/src/test/resources/META-INF/native-image/{ => com.google.http-client/google-http-client}/reflect-config.json (75%) rename google-http-client/src/test/resources/META-INF/native-image/{ => com.google.http-client/google-http-client}/resource-config.json (100%) delete mode 100644 google-http-client/src/test/resources/META-INF/native-image/native-image.properties diff --git a/google-http-client-gson/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client-apache-v2/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-apache-v2/reflect-config.json similarity index 63% rename from google-http-client-gson/src/main/resources/META-INF/native-image/reflect-config.json rename to google-http-client-apache-v2/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-apache-v2/reflect-config.json index c1a546b3f..97a9fba46 100644 --- a/google-http-client-gson/src/main/resources/META-INF/native-image/reflect-config.json +++ b/google-http-client-apache-v2/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-apache-v2/reflect-config.json @@ -1,36 +1,36 @@ [ { - "name": "java.util.HashMap", + "name": "org.apache.commons.logging.impl.LogFactoryImpl", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, "allPublicMethods": true, - "allDeclaredFields": true + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] }, { - "name": "com.google.api.client.json.GenericJson", + "name": "org.apache.commons.logging.impl.Log4JLogger", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, "allPublicMethods": true, "allDeclaredFields": true }, { - "name": "java.util.LinkedList", + "name": "org.apache.commons.logging.impl.Jdk14Logger", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, "allPublicMethods": true, "allDeclaredFields": true }, { - "name": "java.lang.Object", + "name": "org.apache.commons.logging.impl.SimpleLog", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, @@ -40,13 +40,20 @@ "allDeclaredFields": true }, { - "name": "com.google.api.client.util.ArrayMap", + "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, - "allDeclaredFields": true + "allDeclaredClasses": true, + "allPublicClasses": true } ] \ No newline at end of file diff --git a/google-http-client-apache-v2/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client-apache-v2/src/main/resources/META-INF/native-image/reflect-config.json deleted file mode 100644 index dcc6af76e..000000000 --- a/google-http-client-apache-v2/src/main/resources/META-INF/native-image/reflect-config.json +++ /dev/null @@ -1,133 +0,0 @@ -[ - { - "name": "org.apache.commons.logging.impl.LogFactoryImpl", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allPublicMethods": true, - "allDeclaredFields": true, - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "javax.net.ssl.SSLSocketFactory", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "org.apache.http.ssl.SslContexts", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "javax.net.ssl.SslContext", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "org.apache.http.conn.ssl.AllowAllHostnameVerifier", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allPublicMethods": true, - "allDeclaredFields": true, - "methods" : [ - { "name" : "", "parameterTypes" : ["javax.net.ssl.SSLContext", "javax.net.ssl.HostnameVerifier"] }, - { "name" : "", "parameterTypes" : ["javax.net.ssl.SSLContext", "java.lang.String[]", "java.lang.String[]", "javax.net.ssl.HostnameVerifier"] } - ] - }, - { - "name": "org.apache.http.conn.ssl.SSLConnectionSocketFactory", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allPublicMethods": true, - "allDeclaredFields": true, - "methods" : [ - { "name" : "", "parameterTypes" : ["javax.net.ssl.SSLContext", "javax.net.ssl.HostnameVerifier"] }, - { "name" : "", "parameterTypes" : ["javax.net.ssl.SSLContext", "java.lang.String[]", "java.lang.String[]", "javax.net.ssl.HostnameVerifier"] } - ] - }, - { - "name": "org.apache.http.ssl.SSLContextBuilder", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "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 - }, - { - "name": "java.lang.String", - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allDeclaredMethods": true, - "allPublicMethods": true, - "allDeclaredClasses": true, - "allPublicClasses": true - }, - { - "name": "java.lang.Class", - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allDeclaredMethods": true, - "allPublicMethods": true, - "allDeclaredClasses": true, - "allPublicClasses": true - } -] \ No newline at end of file diff --git a/google-http-client-gson/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-gson/reflect-config.json b/google-http-client-gson/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-gson/reflect-config.json new file mode 100644 index 000000000..8bb0eb474 --- /dev/null +++ b/google-http-client-gson/src/main/resources/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 + } +] \ No newline at end of file diff --git a/google-http-client-jackson2/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client-jackson2/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-jackson2/reflect-config.json similarity index 100% rename from google-http-client-jackson2/src/main/resources/META-INF/native-image/reflect-config.json rename to google-http-client-jackson2/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-jackson2/reflect-config.json diff --git a/google-http-client-jackson2/src/test/resources/META-INF/native-image/native-image.properties b/google-http-client-jackson2/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client-jackson2/native-image.properties similarity index 100% rename from google-http-client-jackson2/src/test/resources/META-INF/native-image/native-image.properties rename to google-http-client-jackson2/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client-jackson2/native-image.properties diff --git a/google-http-client-jackson2/src/test/resources/META-INF/native-image/reflect-config.json b/google-http-client-jackson2/src/test/resources/META-INF/native-image/reflect-config.json deleted file mode 100644 index b86a6e7b3..000000000 --- a/google-http-client-jackson2/src/test/resources/META-INF/native-image/reflect-config.json +++ /dev/null @@ -1,432 +0,0 @@ -[ - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Animal", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$WildCardTypes", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Simple", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$StringNullValue", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$DogWithFamily", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$ExtendsGenericJson", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$MapOfMapType", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$PolymorphicWithNumericValueType", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$AnimalGenericJson", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$EnumValue", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumberTypes", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Entry", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$TypeVariablesPassedAround", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$FloatMapTypeVariableType", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Feed", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$V", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$PolymorphicSelfReferencing", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$DoubleListTypeVariableType", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$TypeVariableType", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "java.util.ArrayList", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$TestClass", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Dog", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$A", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumericValueTypedSubclass1", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$DogGenericJson", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumberTypesAsString", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$E", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$PolymorphicWithNumericType", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Centipede", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$AnyType", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$IntArrayTypeVariableType", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$CollectionOfCollectionType", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$ArrayType", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumericValueTypedSubclass2", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumericTypedSubclass1", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$BooleanTypes", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Human", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$HumanWithPets", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$NumericTypedSubclass2", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$IntegerTypeVariableType", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$X", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Y", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.test.json.AbstractJsonFactoryTest$Z", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - } -] \ No newline at end of file diff --git a/google-http-client-protobuf/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client-protobuf/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-protobuf/reflect-config.json similarity index 100% rename from google-http-client-protobuf/src/main/resources/META-INF/native-image/reflect-config.json rename to google-http-client-protobuf/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-protobuf/reflect-config.json diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml index f8d5474f5..577606012 100644 --- a/google-http-client-test/pom.xml +++ b/google-http-client-test/pom.xml @@ -71,4 +71,16 @@ provided + + + + native-deps + + + com.google.guava + guava + + + + diff --git a/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java b/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java index 8bf518109..220960d9b 100644 --- a/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java +++ b/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java @@ -684,7 +684,12 @@ public void testParser_doubleListTypeVariableType() throws Exception { parser.nextToken(); DoubleListTypeVariableType result = parser.parse(DoubleListTypeVariableType.class); // serialize - assertEquals(DOUBLE_LIST_TYPE_VARIABLE_TYPE, factory.toString(result)); + System.out.println("******HELLLOOOOOO*******"); + System.out.println(DOUBLE_LIST_TYPE_VARIABLE_TYPE); + System.out.println(result); + System.out.println(result.list); + System.out.println(factory.toString(result)); +// assertEquals(DOUBLE_LIST_TYPE_VARIABLE_TYPE, factory.toString(result)); // check parsed result // array List[][] arr = result.arr; diff --git a/google-http-client-gson/src/test/resources/META-INF/native-image/reflect-config.json b/google-http-client-test/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-test/reflect-config.json similarity index 100% rename from google-http-client-gson/src/test/resources/META-INF/native-image/reflect-config.json rename to google-http-client-test/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-test/reflect-config.json diff --git a/google-http-client-test/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-test/serialization-config.json b/google-http-client-test/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-test/serialization-config.json new file mode 100644 index 000000000..03d931127 --- /dev/null +++ b/google-http-client-test/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-test/serialization-config.json @@ -0,0 +1,12 @@ +{ + "types":[ + {"name":"java.lang.String" + }, + {"name":"java.lang.Boolean"}, + {"name":"java.util.HashMap"} + ], + "lambdaCapturingTypes":[ + ], + "proxies":[ + ] +} \ No newline at end of file diff --git a/google-http-client-test/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client-test/src/main/resources/META-INF/native-image/reflect-config.json deleted file mode 100644 index 9b81fc760..000000000 --- a/google-http-client-test/src/main/resources/META-INF/native-image/reflect-config.json +++ /dev/null @@ -1,41 +0,0 @@ -[ - { - "name": "com.google.common.base.Preconditions", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "com.google.common.io.Files", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "com.google.api.client.util.Preconditions", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - }, - { - "name": "java.io.File", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredConstructors": true, - "allPublicConstructors": true, - "allPublicMethods": true, - "allDeclaredFields": true - } -] \ No newline at end of file diff --git a/google-http-client-xml/src/test/resources/META-INF/native-image/reflect-config.json b/google-http-client-xml/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client-xml/reflect-config.json similarity index 100% rename from google-http-client-xml/src/test/resources/META-INF/native-image/reflect-config.json rename to google-http-client-xml/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client-xml/reflect-config.json diff --git a/google-http-client-xml/src/test/resources/META-INF/native-image/resource-config.json b/google-http-client-xml/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client-xml/resource-config.json similarity index 100% rename from google-http-client-xml/src/test/resources/META-INF/native-image/resource-config.json rename to google-http-client-xml/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client-xml/resource-config.json diff --git a/google-http-client-apache-v2/src/main/resources/META-INF/native-image/native-image.properties b/google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/native-image.properties similarity index 100% rename from google-http-client-apache-v2/src/main/resources/META-INF/native-image/native-image.properties rename to google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/native-image.properties diff --git a/google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/reflect-config.json b/google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/reflect-config.json new file mode 100644 index 000000000..69783d263 --- /dev/null +++ b/google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/reflect-config.json @@ -0,0 +1,114 @@ +[ + { + "name": "com.google.api.client.http.HttpHeaders", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "com.google.api.client.testing.http.MockLowLevelHttpRequest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "com.google.api.client.http.HttpRequest", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true, + "allDeclaredClasses" : true, + "allPublicClasses": true + }, + { + "name": "io.opencensus.trace.Tracing", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "com.google.api.client.http.OpenCensusUtils", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allDeclaredFields": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name":"io.opencensus.impl.trace.TraceComponentImpl", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name":"io.opencensus.impl.metrics.MetricsComponentImpl", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "java.util.LinkedList", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "name": "java.util.ArrayList", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + {"name": "java.util.HashMap", + "methods": [ + { "name": "", "parameterTypes": [] }, + { "name": "", "parameterTypes": ["int", "float"] }, + { "name": "", "parameterTypes": ["int"] }, + { "name": "", "parameterTypes": ["java.util.Map"] }, + { "name" : "writeObject", "parameterTypes" : ["java.io.ObjectOutputStream"] } + + ] + } +] \ No newline at end of file diff --git a/google-http-client/src/test/resources/META-INF/native-image/serialization-config.json b/google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/serialization-config.json similarity index 64% rename from google-http-client/src/test/resources/META-INF/native-image/serialization-config.json rename to google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/serialization-config.json index db78112d9..6b75b6c19 100644 --- a/google-http-client/src/test/resources/META-INF/native-image/serialization-config.json +++ b/google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/serialization-config.json @@ -1,8 +1,8 @@ { "types":[ - { - "name":"java.lang.String" - }, + {"name": "com.google.api.client.http.HttpResponseException"}, + {"name": "java.lang.StackTraceElement"}, + {"name":"java.lang.String"}, {"name": "java.lang.Throwable"}, {"name": "java.lang.Exception"}, {"name": "java.io.IOException"}, @@ -13,4 +13,4 @@ ], "proxies":[ ] -} +} \ No newline at end of file diff --git a/google-http-client/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client/src/main/resources/META-INF/native-image/reflect-config.json deleted file mode 100644 index 54cb5d454..000000000 --- a/google-http-client/src/main/resources/META-INF/native-image/reflect-config.json +++ /dev/null @@ -1,44 +0,0 @@ -[ - { - "name": "com.google.api.client.http.HttpHeaders", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allPublicMethods": true, - "allDeclaredFields": true, - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "com.google.api.client.testing.http.MockLowLevelHttpRequest", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allPublicMethods": true, - "allDeclaredFields": true, - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "java.util.HashMap", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allPublicMethods": true, - "allDeclaredFields": true, - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - } -] \ No newline at end of file diff --git a/google-http-client/src/main/resources/META-INF/native-image/serialization-config.json b/google-http-client/src/main/resources/META-INF/native-image/serialization-config.json deleted file mode 100644 index 41e80786e..000000000 --- a/google-http-client/src/main/resources/META-INF/native-image/serialization-config.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "types":[ - {"name": "com.google.api.client.http.HttpResponseException"}, - {"name": "java.lang.StackTraceElement"} - ], - "lambdaCapturingTypes":[ - ], - "proxies":[ - ] -} \ No newline at end of file diff --git a/google-http-client/src/test/resources/META-INF/native-image/reflect-config.json b/google-http-client/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client/reflect-config.json similarity index 75% rename from google-http-client/src/test/resources/META-INF/native-image/reflect-config.json rename to google-http-client/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client/reflect-config.json index 3381f4967..41fade5e2 100644 --- a/google-http-client/src/test/resources/META-INF/native-image/reflect-config.json +++ b/google-http-client/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client/reflect-config.json @@ -1,88 +1,4 @@ [ -{ - "name":"io.opencensus.impl.trace.TraceComponentImpl", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] -}, - { - "name":"io.opencensus.impl.metrics.MetricsComponentImpl", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "java.util.LinkedList", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "java.util.ArrayList", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - {"name": "java.util.HashMap", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "java.lang.Object", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredFields": true, - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "java.lang.String", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "java.util.List", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "java.util.Collections", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, { "name": "com.google.api.client.util.FieldInfoTest$E", "queryAllDeclaredConstructors": true, @@ -112,44 +28,6 @@ "queryAllDeclaredMethods": true, "allDeclaredFields": true }, - { - "name": "io.opencensus.trace.Tracing", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredFields": true, - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "com.google.api.client.http.OpenCensusUtils", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredFields": true, - "allPublicMethods": true, - "allDeclaredClasses": true, - "allPublicClasses": true, - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "name": "com.google.api.client.http.HttpRequest", - "queryAllDeclaredConstructors": true, - "queryAllPublicConstructors": true, - "queryAllDeclaredMethods": true, - "allDeclaredFields": true, - "allDeclaredClasses" : true, - "allPublicClasses": true - }, { "name": "com.google.api.client.http.UrlEncodedParserTest$Generic", "queryAllDeclaredConstructors": true, diff --git a/google-http-client/src/test/resources/META-INF/native-image/resource-config.json b/google-http-client/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client/resource-config.json similarity index 100% rename from google-http-client/src/test/resources/META-INF/native-image/resource-config.json rename to google-http-client/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client/resource-config.json diff --git a/google-http-client/src/test/resources/META-INF/native-image/native-image.properties b/google-http-client/src/test/resources/META-INF/native-image/native-image.properties deleted file mode 100644 index a90ef2471..000000000 --- a/google-http-client/src/test/resources/META-INF/native-image/native-image.properties +++ /dev/null @@ -1 +0,0 @@ -Args=--enable-url-protocols=http,https \ No newline at end of file diff --git a/pom.xml b/pom.xml index c388b5255..03a7eaf47 100644 --- a/pom.xml +++ b/pom.xml @@ -602,6 +602,11 @@ 0.9.23 test + + com.google.guava + guava + ${project.guava.version} + @@ -613,10 +618,6 @@ - - - - From 371fc84e05366008e7cb9b53af5365aa31471dcb Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Sun, 5 Nov 2023 21:58:46 +0000 Subject: [PATCH 06/14] follow naming convention for config dir --- .../google-http-client-xml}/reflect-config.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename google-http-client-xml/src/main/resources/META-INF/native-image/{ => com.google.http-client/google-http-client-xml}/reflect-config.json (100%) diff --git a/google-http-client-xml/src/main/resources/META-INF/native-image/reflect-config.json b/google-http-client-xml/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-xml/reflect-config.json similarity index 100% rename from google-http-client-xml/src/main/resources/META-INF/native-image/reflect-config.json rename to google-http-client-xml/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client-xml/reflect-config.json From e2c017edad1b7c6f723b9be66adb73e730c4da44 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Mon, 6 Nov 2023 14:53:41 +0000 Subject: [PATCH 07/14] include native tests in ci --- .kokoro/build.sh | 10 ++++++++ .kokoro/presubmit/graalvm-native-a.cfg | 33 ++++++++++++++++++++++++++ .kokoro/presubmit/graalvm-native-b.cfg | 33 ++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 .kokoro/presubmit/graalvm-native-a.cfg create mode 100644 .kokoro/presubmit/graalvm-native-b.cfg diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f9cf38f48..2cbab8923 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -79,6 +79,16 @@ graalvm17) mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test RETURN_CODE=$? ;; +graalvmA) + # Run Unit and Integration Tests with Native Image + 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 -pl '!google-http-client-appengine' + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg new file mode 100644 index 000000000..51dd874f3 --- /dev/null +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.2" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvmA" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg new file mode 100644 index 000000000..a36922385 --- /dev/null +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.2" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvmB" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} \ No newline at end of file From 325af0b3290161b7a22feea6c6f2a2d7c7ca09d2 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Mon, 6 Nov 2023 14:58:05 +0000 Subject: [PATCH 08/14] remove debug statements --- .../api/client/test/json/AbstractJsonFactoryTest.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java b/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java index 220960d9b..8bf518109 100644 --- a/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java +++ b/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java @@ -684,12 +684,7 @@ public void testParser_doubleListTypeVariableType() throws Exception { parser.nextToken(); DoubleListTypeVariableType result = parser.parse(DoubleListTypeVariableType.class); // serialize - System.out.println("******HELLLOOOOOO*******"); - System.out.println(DOUBLE_LIST_TYPE_VARIABLE_TYPE); - System.out.println(result); - System.out.println(result.list); - System.out.println(factory.toString(result)); -// assertEquals(DOUBLE_LIST_TYPE_VARIABLE_TYPE, factory.toString(result)); + assertEquals(DOUBLE_LIST_TYPE_VARIABLE_TYPE, factory.toString(result)); // check parsed result // array List[][] arr = result.arr; From ffc2abc34bf816d2c89ae28f88a631d01e01d4bb Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Mon, 6 Nov 2023 21:44:40 +0000 Subject: [PATCH 09/14] include build time initialization --- .../google-http-client-jackson2/native-image.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/google-http-client-jackson2/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client-jackson2/native-image.properties b/google-http-client-jackson2/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client-jackson2/native-image.properties index 7317248a0..b6b626175 100644 --- a/google-http-client-jackson2/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client-jackson2/native-image.properties +++ b/google-http-client-jackson2/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client-jackson2/native-image.properties @@ -3,4 +3,5 @@ Args=--initialize-at-build-time=com.google.api.client.json.jackson2.JacksonFacto --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 \ No newline at end of file +--initialize-at-build-time=com.fasterxml.jackson.core.io.JsonStringEncoder \ +--initialize-at-build-time=com.google.api.client.util.StringUtils \ No newline at end of file From d4014cd84cb1420a5d1c0d2db876c86c6c926aa9 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Mon, 6 Nov 2023 21:56:12 +0000 Subject: [PATCH 10/14] clean up debug statements --- .../java/com/google/api/client/http/HttpRequest.java | 3 --- .../client/testing/http/MockLowLevelHttpRequest.java | 5 ----- .../com/google/api/client/http/HttpRequestTest.java | 4 ---- .../google-http-client/native-image.properties | 6 ++++++ pom.xml | 11 ----------- 5 files changed, 6 insertions(+), 23 deletions(-) create mode 100644 google-http-client/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client/native-image.properties diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java index 73f254be3..78f15d868 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java +++ b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java @@ -506,9 +506,6 @@ public HttpHeaders getHeaders() { * @since 1.5 */ public HttpRequest setHeaders(HttpHeaders headers) { - System.out.println("MY HEADERS"); - System.out.println(headers); - System.out.println("END HEADERS"); this.headers = Preconditions.checkNotNull(headers); return this; } diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java b/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java index 79fbb497e..115cdd7d1 100644 --- a/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java +++ b/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java @@ -123,12 +123,7 @@ public String getFirstHeaderValue(String name) { * @since 1.13 */ public List getHeaderValues(String name) { - System.out.println("GET HEADER VALUES"); - System.out.println(headersMap.keySet()); - System.out.println(name.toLowerCase(Locale.US)); List values = headersMap.get(name.toLowerCase(Locale.US)); - System.out.println(values); - System.out.println("GET HEADER VALUES END"); return values == null ? Collections.emptyList() : Collections.unmodifiableList(values); } diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java index 24c8c1498..e7075131d 100644 --- a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java +++ b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java @@ -960,10 +960,6 @@ public LowLevelHttpRequest buildRequest(String method, String url) throws IOExce request.setHeaders(myHeaders); request.execute(); // check headers - System.out.println("HELLLOO"); - System.out.println(HttpTesting.SIMPLE_GENERIC_URL); // is fine - System.out.println(lowLevelRequest.getHeaderValues("foo")); - System.out.println("HELLLOO END"); assertEquals(ImmutableList.of("bar"), lowLevelRequest.getHeaderValues("foo")); assertEquals(ImmutableList.of("a", "b", "c"), lowLevelRequest.getHeaderValues("list")); assertEquals(ImmutableList.of("a2", "b2", "c2"), lowLevelRequest.getHeaderValues("objlist")); diff --git a/google-http-client/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client/native-image.properties b/google-http-client/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client/native-image.properties new file mode 100644 index 000000000..7bc87751b --- /dev/null +++ b/google-http-client/src/test/resources/META-INF/native-image/com.google.http-client/google-http-client/native-image.properties @@ -0,0 +1,6 @@ +Args=--initialize-at-build-time=com.google.api.client.util.StringUtils \ +--initialize-at-build-time=com.google.api.client.http.HttpRequestTest \ +--initialize-at-build-time=com.google.api.client.http.ByteArrayContentTest \ +--initialize-at-build-time=com.google.api.client.http.MultipartContentTest \ +--initialize-at-build-time=com.google.api.client.util.LoggingStreamingContentTest \ +--initialize-at-build-time=com.google.api.client.util.SecurityUtilsTest \ No newline at end of file diff --git a/pom.xml b/pom.xml index 03a7eaf47..4835a2460 100644 --- a/pom.xml +++ b/pom.xml @@ -602,11 +602,6 @@ 0.9.23 test - - com.google.guava - guava - ${project.guava.version} - @@ -638,12 +633,6 @@ --no-fallback --no-server - --initialize-at-build-time=com.google.api.client.util.StringUtils - --initialize-at-build-time=com.google.api.client.http.HttpRequestTest - --initialize-at-build-time=com.google.api.client.http.ByteArrayContentTest - --initialize-at-build-time=com.google.api.client.http.MultipartContentTest - --initialize-at-build-time=com.google.api.client.util.LoggingStreamingContentTest - --initialize-at-build-time=com.google.api.client.util.SecurityUtilsTest From 8ccbbe35a0df85b3d6bc44e04851f613803dff4f Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 6 Nov 2023 21:58:38 +0000 Subject: [PATCH 11/14] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20?= =?UTF-8?q?post-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 --- .kokoro/build.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 2cbab8923..f9cf38f48 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -79,16 +79,6 @@ graalvm17) mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test RETURN_CODE=$? ;; -graalvmA) - # Run Unit and Integration Tests with Native Image - 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 -pl '!google-http-client-appengine' - RETURN_CODE=$? - ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. From 7252f222940090b99374ab5c3c1d88acf541c492 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Mon, 6 Nov 2023 22:03:27 +0000 Subject: [PATCH 12/14] run graalvm tests with profile --- .kokoro/build.sh | 10 ++++++++++ owlbot.py | 1 + 2 files changed, 11 insertions(+) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f9cf38f48..5b146924c 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -79,6 +79,16 @@ graalvm17) mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test RETURN_CODE=$? ;; +graalvmA) + # Run Unit and Integration Tests with Native Image + 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 -Pnative-deps test -pl '!google-http-client-appengine' + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/owlbot.py b/owlbot.py index 8a64e3837..6f2484f03 100644 --- a/owlbot.py +++ b/owlbot.py @@ -28,5 +28,6 @@ "checkstyle.xml", "license-checks.xml", ".github/workflows/samples.yaml", + ".kokoro/build.sh" ] ) From b3e6f0aa2a8aac3a52717c206421780e89798a40 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Tue, 7 Nov 2023 14:44:26 +0000 Subject: [PATCH 13/14] clean up cfg --- .kokoro/presubmit/graalvm-native-a.cfg | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index 221249732..07344aef2 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -30,8 +30,4 @@ env_vars: { env_vars: { key: "SECRET_MANAGER_KEYS" value: "java-it-service-account" -<<<<<<< HEAD } -======= -} ->>>>>>> 1d37fa3c2b61b616a975c2c4dfa55ea56d56055a From 2af7844c00247f411b2a960fae128ace2dfbbd89 Mon Sep 17 00:00:00 2001 From: mpeddada1 Date: Tue, 7 Nov 2023 23:52:20 +0000 Subject: [PATCH 14/14] add resource config --- .../google-http-client/resource-config.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/resource-config.json diff --git a/google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/resource-config.json b/google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/resource-config.json new file mode 100644 index 000000000..482eb4389 --- /dev/null +++ b/google-http-client/src/main/resources/META-INF/native-image/com.google.http-client/google-http-client/resource-config.json @@ -0,0 +1,5 @@ +{ + "resources":[ + {"pattern":"\\Qcom/google/api/client/http/google-http-client.properties\\E"}], + "bundles":[] +} \ No newline at end of file