Skip to content

Commit cf2a3e5

Browse files
rashtaorashtao
committed
fixed native tests
1 parent 3e646f4 commit cf2a3e5

File tree

4 files changed

+14
-100
lines changed

4 files changed

+14
-100
lines changed

‎.github/workflows/native.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,11 @@ jobs:
3939
DATABASE_EXTENDED_NAMES: ${{matrix.db-ext-names}}
4040
- name: Info
4141
run: mvn -version
42+
- name: Install
43+
run: mvn --no-transfer-progress install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
4244
- name: Test Native
43-
run: mvn -Pnative --no-transfer-progress -am -pl driver test
45+
working-directory: driver
46+
run: mvn -Pnative --no-transfer-progress test
4447

4548
test-native-ssl:
4649
timeout-minutes: 20
@@ -73,5 +76,8 @@ jobs:
7376
SSL: true
7477
- name: Info
7578
run: mvn -version
79+
- name: Install
80+
run: mvn --no-transfer-progress install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
7681
- name: Test Native
77-
run: mvn -Pnative --no-transfer-progress -Dgroups=ssl -DSslTest=true -am -pl driver test
82+
working-directory: driver
83+
run: mvn -Pnative --no-transfer-progress -Dgroups=ssl -DSslTest=true test

‎driver/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver/native-image.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Args=\
2-
-H:ResourceConfigurationFiles=target/classes/META-INF/native-image/com.arangodb/arangodb-java-driver/resource-config.json \
2+
-H:ResourceConfigurationResources=${.}/resource-config.json \
33
-H:ReflectionConfigurationResources=${.}/reflect-config.json \
44
-H:SerializationConfigurationResources=${.}/serialization-config.json \
55
--initialize-at-run-time=\

‎driver/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver/reflect-config.json‎

Lines changed: 2 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -41,36 +41,12 @@
4141
"allDeclaredMethods": true,
4242
"allDeclaredConstructors": true
4343
},
44-
{
45-
"name": "java.lang.Enum",
46-
"allDeclaredFields": true,
47-
"allDeclaredMethods": true,
48-
"allDeclaredConstructors": true
49-
},
50-
{
51-
"name": "java.lang.annotation.Annotation",
52-
"allDeclaredFields": true,
53-
"allDeclaredMethods": true,
54-
"allDeclaredConstructors": true
55-
},
56-
{
57-
"name": "java.lang.Comparable",
58-
"allDeclaredFields": true,
59-
"allDeclaredMethods": true,
60-
"allDeclaredConstructors": true
61-
},
6244
{
6345
"name": "com.arangodb.entity.CollectionEntity",
6446
"allDeclaredFields": true,
6547
"allDeclaredMethods": true,
6648
"allDeclaredConstructors": true
6749
},
68-
{
69-
"name": "java.lang.Object",
70-
"allDeclaredFields": true,
71-
"allDeclaredMethods": true,
72-
"allDeclaredConstructors": true
73-
},
7450
{
7551
"name": "com.arangodb.entity.ReplicationFactor",
7652
"allDeclaredFields": true,
@@ -95,12 +71,6 @@
9571
"allDeclaredMethods": true,
9672
"allDeclaredConstructors": true
9773
},
98-
{
99-
"name": "java.io.Serializable",
100-
"allDeclaredFields": true,
101-
"allDeclaredMethods": true,
102-
"allDeclaredConstructors": true
103-
},
10474
{
10575
"name": "com.arangodb.entity.arangosearch.SearchAliasPropertiesEntity",
10676
"allDeclaredFields": true,
@@ -293,36 +263,6 @@
293263
"allDeclaredMethods": true,
294264
"allDeclaredConstructors": true
295265
},
296-
{
297-
"name": "com.arangodb.entity.Key",
298-
"allDeclaredFields": true,
299-
"allDeclaredMethods": true,
300-
"allDeclaredConstructors": true
301-
},
302-
{
303-
"name": "com.arangodb.entity.Rev",
304-
"allDeclaredFields": true,
305-
"allDeclaredMethods": true,
306-
"allDeclaredConstructors": true
307-
},
308-
{
309-
"name": "com.arangodb.entity.Id",
310-
"allDeclaredFields": true,
311-
"allDeclaredMethods": true,
312-
"allDeclaredConstructors": true
313-
},
314-
{
315-
"name": "com.arangodb.entity.To",
316-
"allDeclaredFields": true,
317-
"allDeclaredMethods": true,
318-
"allDeclaredConstructors": true
319-
},
320-
{
321-
"name": "com.arangodb.entity.From",
322-
"allDeclaredFields": true,
323-
"allDeclaredMethods": true,
324-
"allDeclaredConstructors": true
325-
},
326266
{
327267
"name": "com.arangodb.entity.CollectionRevisionEntity",
328268
"allDeclaredFields": true,
@@ -486,13 +426,13 @@
486426
"allDeclaredConstructors": true
487427
},
488428
{
489-
"name": "com.arangodb.entity.AqlExecutionExplainEntity$ExecutionStats",
429+
"name": "com.arangodb.entity.arangosearch.analyzer.DelimiterAnalyzerProperties",
490430
"allDeclaredFields": true,
491431
"allDeclaredMethods": true,
492432
"allDeclaredConstructors": true
493433
},
494434
{
495-
"name": "com.arangodb.entity.arangosearch.analyzer.DelimiterAnalyzerProperties",
435+
"name": "com.arangodb.entity.AqlExecutionExplainEntity$ExecutionStats",
496436
"allDeclaredFields": true,
497437
"allDeclaredMethods": true,
498438
"allDeclaredConstructors": true
@@ -1043,36 +983,12 @@
1043983
"allDeclaredMethods": true,
1044984
"allDeclaredConstructors": true
1045985
},
1046-
{
1047-
"name": "java.lang.Enum",
1048-
"allDeclaredFields": true,
1049-
"allDeclaredMethods": true,
1050-
"allDeclaredConstructors": true
1051-
},
1052-
{
1053-
"name": "java.lang.Comparable",
1054-
"allDeclaredFields": true,
1055-
"allDeclaredMethods": true,
1056-
"allDeclaredConstructors": true
1057-
},
1058-
{
1059-
"name": "java.lang.Object",
1060-
"allDeclaredFields": true,
1061-
"allDeclaredMethods": true,
1062-
"allDeclaredConstructors": true
1063-
},
1064986
{
1065987
"name": "com.arangodb.model.IndexOptions",
1066988
"allDeclaredFields": true,
1067989
"allDeclaredMethods": true,
1068990
"allDeclaredConstructors": true
1069991
},
1070-
{
1071-
"name": "java.io.Serializable",
1072-
"allDeclaredFields": true,
1073-
"allDeclaredMethods": true,
1074-
"allDeclaredConstructors": true
1075-
},
1076992
{
1077993
"name": "com.arangodb.model.DocumentImportOptions$OnDuplicate",
1078994
"allDeclaredFields": true,
@@ -1559,12 +1475,6 @@
15591475
"allDeclaredMethods": true,
15601476
"allDeclaredConstructors": true
15611477
},
1562-
{
1563-
"name": "java.lang.Object",
1564-
"allDeclaredFields": true,
1565-
"allDeclaredMethods": true,
1566-
"allDeclaredConstructors": true
1567-
},
15681478
{
15691479
"name": "com.arangodb.entity.MetaAware",
15701480
"allDeclaredFields": true,

‎driver/src/test/java/helper/NativeImageHelper.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,12 @@ private static void generateReflectConfig() throws JsonProcessingException {
4343
ObjectMapper mapper = new ObjectMapper();
4444
ArrayNode rootNode = mapper.createArrayNode();
4545

46-
String serdePackage = "com.arangodb.serde";
4746
String internalSerdePackage = "com.arangodb.internal.serde";
48-
Collection<URL> serdeUrls = new HashSet<>();
49-
serdeUrls.addAll(ClasspathHelper.forPackage(serdePackage));
50-
serdeUrls.addAll(ClasspathHelper.forPackage(internalSerdePackage));
47+
Collection<URL> serdeUrls = ClasspathHelper.forPackage(internalSerdePackage);
5148
Reflections r = new Reflections(new ConfigurationBuilder()
5249
.setScanners(new SubTypesScanner(false))
5350
.setUrls(serdeUrls)
54-
.filterInputsBy(new FilterBuilder().includePackage(serdePackage).includePackage(internalSerdePackage)));
51+
.filterInputsBy(new FilterBuilder().includePackage(internalSerdePackage)));
5552
Stream<String> serializers = r.getSubTypesOf(JsonSerializer.class).stream()
5653
.filter(it -> !it.isAnonymousClass())
5754
.map(Class::getName);
@@ -78,6 +75,7 @@ private static void generateReflectConfig() throws JsonProcessingException {
7875
);
7976
});
8077
Stream.concat(serdeClasses, entityClasses)
78+
.filter(className -> className.startsWith("com.arangodb"))
8179
.map(className -> {
8280
ObjectNode entry = mapper.createObjectNode();
8381
entry.put("name", className);

0 commit comments

Comments
 (0)