Skip to content

Commit f521c36

Browse files
mshimamshima
authored
spring-boot: use ServiceConnection in Neo4J Testcontainer (#32077)
1 parent 7d8d04e commit f521c36

9 files changed

Lines changed: 77 additions & 292 deletions

File tree

‎generators/liquibase/templates/liquibase-changelog-header.ejs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
<databaseChangeLog
33
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
44
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
5+
<%_ if (locals.databaseTypeNeo4j) { _%>
6+
xmlns:neo4j="http://www.liquibase.org/xml/ns/neo4j"
7+
<%_ } _%>
58
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
69
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
710
http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">

‎generators/spring-boot/generators/data-neo4j/__snapshots__/generator.spec.ts.snap‎

Lines changed: 0 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -260,15 +260,9 @@ exports[`generator - neo4j gateway-jwt-reactive(false)-maven-enableTranslation(f
260260
"src/test/java/tech/jhipster/config/CRLFLogConverterTest.java": {
261261
"stateCleared": "modified",
262262
},
263-
"src/test/java/tech/jhipster/config/EmbeddedNeo4j.java": {
264-
"stateCleared": "modified",
265-
},
266263
"src/test/java/tech/jhipster/config/Neo4jTestContainer.java": {
267264
"stateCleared": "modified",
268265
},
269-
"src/test/java/tech/jhipster/config/Neo4jTestContainersSpringContextCustomizerFactory.java": {
270-
"stateCleared": "modified",
271-
},
272266
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
273267
"stateCleared": "modified",
274268
},
@@ -365,9 +359,6 @@ exports[`generator - neo4j gateway-jwt-reactive(false)-maven-enableTranslation(f
365359
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
366360
"stateCleared": "modified",
367361
},
368-
"src/test/resources/META-INF/spring.factories": {
369-
"stateCleared": "modified",
370-
},
371362
"src/test/resources/config/application.yml": {
372363
"stateCleared": "modified",
373364
},
@@ -604,18 +595,12 @@ exports[`generator - neo4j gateway-jwt-reactive(true)-gradle-enableTranslation(t
604595
"src/test/java/com/mycompany/config/AsyncSyncConfiguration.java": {
605596
"stateCleared": "modified",
606597
},
607-
"src/test/java/com/mycompany/config/EmbeddedNeo4j.java": {
608-
"stateCleared": "modified",
609-
},
610598
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
611599
"stateCleared": "modified",
612600
},
613601
"src/test/java/com/mycompany/config/Neo4jTestContainer.java": {
614602
"stateCleared": "modified",
615603
},
616-
"src/test/java/com/mycompany/config/Neo4jTestContainersSpringContextCustomizerFactory.java": {
617-
"stateCleared": "modified",
618-
},
619604
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
620605
"stateCleared": "modified",
621606
},
@@ -679,9 +664,6 @@ exports[`generator - neo4j gateway-jwt-reactive(true)-gradle-enableTranslation(t
679664
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
680665
"stateCleared": "modified",
681666
},
682-
"src/test/resources/META-INF/spring.factories": {
683-
"stateCleared": "modified",
684-
},
685667
"src/test/resources/config/application.yml": {
686668
"stateCleared": "modified",
687669
},
@@ -939,18 +921,12 @@ exports[`generator - neo4j gateway-oauth2-reactive(true)-gradle-enableTranslatio
939921
"src/test/java/com/mycompany/config/AsyncSyncConfiguration.java": {
940922
"stateCleared": "modified",
941923
},
942-
"src/test/java/com/mycompany/config/EmbeddedNeo4j.java": {
943-
"stateCleared": "modified",
944-
},
945924
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
946925
"stateCleared": "modified",
947926
},
948927
"src/test/java/com/mycompany/config/Neo4jTestContainer.java": {
949928
"stateCleared": "modified",
950929
},
951-
"src/test/java/com/mycompany/config/Neo4jTestContainersSpringContextCustomizerFactory.java": {
952-
"stateCleared": "modified",
953-
},
954930
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
955931
"stateCleared": "modified",
956932
},
@@ -1038,9 +1014,6 @@ exports[`generator - neo4j gateway-oauth2-reactive(true)-gradle-enableTranslatio
10381014
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
10391015
"stateCleared": "modified",
10401016
},
1041-
"src/test/resources/META-INF/spring.factories": {
1042-
"stateCleared": "modified",
1043-
},
10441017
"src/test/resources/config/application.yml": {
10451018
"stateCleared": "modified",
10461019
},
@@ -1220,15 +1193,9 @@ exports[`generator - neo4j microservice-jwt-reactive(false)-maven-enableTranslat
12201193
"src/test/java/tech/jhipster/config/CRLFLogConverterTest.java": {
12211194
"stateCleared": "modified",
12221195
},
1223-
"src/test/java/tech/jhipster/config/EmbeddedNeo4j.java": {
1224-
"stateCleared": "modified",
1225-
},
12261196
"src/test/java/tech/jhipster/config/Neo4jTestContainer.java": {
12271197
"stateCleared": "modified",
12281198
},
1229-
"src/test/java/tech/jhipster/config/Neo4jTestContainersSpringContextCustomizerFactory.java": {
1230-
"stateCleared": "modified",
1231-
},
12321199
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
12331200
"stateCleared": "modified",
12341201
},
@@ -1286,9 +1253,6 @@ exports[`generator - neo4j microservice-jwt-reactive(false)-maven-enableTranslat
12861253
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
12871254
"stateCleared": "modified",
12881255
},
1289-
"src/test/resources/META-INF/spring.factories": {
1290-
"stateCleared": "modified",
1291-
},
12921256
"src/test/resources/config/application.yml": {
12931257
"stateCleared": "modified",
12941258
},
@@ -1516,18 +1480,12 @@ exports[`generator - neo4j microservice-jwt-reactive(true)-gradle-enableTranslat
15161480
"src/test/java/com/mycompany/config/AsyncSyncConfiguration.java": {
15171481
"stateCleared": "modified",
15181482
},
1519-
"src/test/java/com/mycompany/config/EmbeddedNeo4j.java": {
1520-
"stateCleared": "modified",
1521-
},
15221483
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
15231484
"stateCleared": "modified",
15241485
},
15251486
"src/test/java/com/mycompany/config/Neo4jTestContainer.java": {
15261487
"stateCleared": "modified",
15271488
},
1528-
"src/test/java/com/mycompany/config/Neo4jTestContainersSpringContextCustomizerFactory.java": {
1529-
"stateCleared": "modified",
1530-
},
15311489
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
15321490
"stateCleared": "modified",
15331491
},
@@ -1582,9 +1540,6 @@ exports[`generator - neo4j microservice-jwt-reactive(true)-gradle-enableTranslat
15821540
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
15831541
"stateCleared": "modified",
15841542
},
1585-
"src/test/resources/META-INF/spring.factories": {
1586-
"stateCleared": "modified",
1587-
},
15881543
"src/test/resources/config/application.yml": {
15891544
"stateCleared": "modified",
15901545
},
@@ -1809,18 +1764,12 @@ exports[`generator - neo4j microservice-oauth2-reactive(true)-gradle-enableTrans
18091764
"src/test/java/com/mycompany/config/AsyncSyncConfiguration.java": {
18101765
"stateCleared": "modified",
18111766
},
1812-
"src/test/java/com/mycompany/config/EmbeddedNeo4j.java": {
1813-
"stateCleared": "modified",
1814-
},
18151767
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
18161768
"stateCleared": "modified",
18171769
},
18181770
"src/test/java/com/mycompany/config/Neo4jTestContainer.java": {
18191771
"stateCleared": "modified",
18201772
},
1821-
"src/test/java/com/mycompany/config/Neo4jTestContainersSpringContextCustomizerFactory.java": {
1822-
"stateCleared": "modified",
1823-
},
18241773
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
18251774
"stateCleared": "modified",
18261775
},
@@ -1875,9 +1824,6 @@ exports[`generator - neo4j microservice-oauth2-reactive(true)-gradle-enableTrans
18751824
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
18761825
"stateCleared": "modified",
18771826
},
1878-
"src/test/resources/META-INF/spring.factories": {
1879-
"stateCleared": "modified",
1880-
},
18811827
"src/test/resources/config/application.yml": {
18821828
"stateCleared": "modified",
18831829
},
@@ -2153,15 +2099,9 @@ exports[`generator - neo4j monolith-jwt-reactive(false)-maven-enableTranslation(
21532099
"src/test/java/tech/jhipster/config/CRLFLogConverterTest.java": {
21542100
"stateCleared": "modified",
21552101
},
2156-
"src/test/java/tech/jhipster/config/EmbeddedNeo4j.java": {
2157-
"stateCleared": "modified",
2158-
},
21592102
"src/test/java/tech/jhipster/config/Neo4jTestContainer.java": {
21602103
"stateCleared": "modified",
21612104
},
2162-
"src/test/java/tech/jhipster/config/Neo4jTestContainersSpringContextCustomizerFactory.java": {
2163-
"stateCleared": "modified",
2164-
},
21652105
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
21662106
"stateCleared": "modified",
21672107
},
@@ -2258,9 +2198,6 @@ exports[`generator - neo4j monolith-jwt-reactive(false)-maven-enableTranslation(
22582198
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
22592199
"stateCleared": "modified",
22602200
},
2261-
"src/test/resources/META-INF/spring.factories": {
2262-
"stateCleared": "modified",
2263-
},
22642201
"src/test/resources/config/application.yml": {
22652202
"stateCleared": "modified",
22662203
},
@@ -2488,18 +2425,12 @@ exports[`generator - neo4j monolith-jwt-reactive(true)-gradle-enableTranslation(
24882425
"src/test/java/com/mycompany/config/AsyncSyncConfiguration.java": {
24892426
"stateCleared": "modified",
24902427
},
2491-
"src/test/java/com/mycompany/config/EmbeddedNeo4j.java": {
2492-
"stateCleared": "modified",
2493-
},
24942428
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
24952429
"stateCleared": "modified",
24962430
},
24972431
"src/test/java/com/mycompany/config/Neo4jTestContainer.java": {
24982432
"stateCleared": "modified",
24992433
},
2500-
"src/test/java/com/mycompany/config/Neo4jTestContainersSpringContextCustomizerFactory.java": {
2501-
"stateCleared": "modified",
2502-
},
25032434
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
25042435
"stateCleared": "modified",
25052436
},
@@ -2563,9 +2494,6 @@ exports[`generator - neo4j monolith-jwt-reactive(true)-gradle-enableTranslation(
25632494
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
25642495
"stateCleared": "modified",
25652496
},
2566-
"src/test/resources/META-INF/spring.factories": {
2567-
"stateCleared": "modified",
2568-
},
25692497
"src/test/resources/config/application.yml": {
25702498
"stateCleared": "modified",
25712499
},
@@ -2745,15 +2673,9 @@ exports[`generator - neo4j monolith-oauth2-reactive(false)-maven-enableTranslati
27452673
"src/test/java/tech/jhipster/config/CRLFLogConverterTest.java": {
27462674
"stateCleared": "modified",
27472675
},
2748-
"src/test/java/tech/jhipster/config/EmbeddedNeo4j.java": {
2749-
"stateCleared": "modified",
2750-
},
27512676
"src/test/java/tech/jhipster/config/Neo4jTestContainer.java": {
27522677
"stateCleared": "modified",
27532678
},
2754-
"src/test/java/tech/jhipster/config/Neo4jTestContainersSpringContextCustomizerFactory.java": {
2755-
"stateCleared": "modified",
2756-
},
27572679
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
27582680
"stateCleared": "modified",
27592681
},
@@ -2820,9 +2742,6 @@ exports[`generator - neo4j monolith-oauth2-reactive(false)-maven-enableTranslati
28202742
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
28212743
"stateCleared": "modified",
28222744
},
2823-
"src/test/resources/META-INF/spring.factories": {
2824-
"stateCleared": "modified",
2825-
},
28262745
"src/test/resources/config/application.yml": {
28272746
"stateCleared": "modified",
28282747
},
@@ -3047,18 +2966,12 @@ exports[`generator - neo4j monolith-oauth2-reactive(true)-gradle-enableTranslati
30472966
"src/test/java/com/mycompany/config/AsyncSyncConfiguration.java": {
30482967
"stateCleared": "modified",
30492968
},
3050-
"src/test/java/com/mycompany/config/EmbeddedNeo4j.java": {
3051-
"stateCleared": "modified",
3052-
},
30532969
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
30542970
"stateCleared": "modified",
30552971
},
30562972
"src/test/java/com/mycompany/config/Neo4jTestContainer.java": {
30572973
"stateCleared": "modified",
30582974
},
3059-
"src/test/java/com/mycompany/config/Neo4jTestContainersSpringContextCustomizerFactory.java": {
3060-
"stateCleared": "modified",
3061-
},
30622975
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
30632976
"stateCleared": "modified",
30642977
},
@@ -3122,9 +3035,6 @@ exports[`generator - neo4j monolith-oauth2-reactive(true)-gradle-enableTranslati
31223035
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
31233036
"stateCleared": "modified",
31243037
},
3125-
"src/test/resources/META-INF/spring.factories": {
3126-
"stateCleared": "modified",
3127-
},
31283038
"src/test/resources/config/application.yml": {
31293039
"stateCleared": "modified",
31303040
},
@@ -3403,15 +3313,9 @@ exports[`generator - neo4j monolith-session-reactive(false)-maven-enableTranslat
34033313
"src/test/java/tech/jhipster/config/CRLFLogConverterTest.java": {
34043314
"stateCleared": "modified",
34053315
},
3406-
"src/test/java/tech/jhipster/config/EmbeddedNeo4j.java": {
3407-
"stateCleared": "modified",
3408-
},
34093316
"src/test/java/tech/jhipster/config/Neo4jTestContainer.java": {
34103317
"stateCleared": "modified",
34113318
},
3412-
"src/test/java/tech/jhipster/config/Neo4jTestContainersSpringContextCustomizerFactory.java": {
3413-
"stateCleared": "modified",
3414-
},
34153319
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
34163320
"stateCleared": "modified",
34173321
},
@@ -3508,9 +3412,6 @@ exports[`generator - neo4j monolith-session-reactive(false)-maven-enableTranslat
35083412
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
35093413
"stateCleared": "modified",
35103414
},
3511-
"src/test/resources/META-INF/spring.factories": {
3512-
"stateCleared": "modified",
3513-
},
35143415
"src/test/resources/config/application.yml": {
35153416
"stateCleared": "modified",
35163417
},
@@ -3744,18 +3645,12 @@ exports[`generator - neo4j monolith-session-reactive(true)-gradle-enableTranslat
37443645
"src/test/java/com/mycompany/config/AsyncSyncConfiguration.java": {
37453646
"stateCleared": "modified",
37463647
},
3747-
"src/test/java/com/mycompany/config/EmbeddedNeo4j.java": {
3748-
"stateCleared": "modified",
3749-
},
37503648
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
37513649
"stateCleared": "modified",
37523650
},
37533651
"src/test/java/com/mycompany/config/Neo4jTestContainer.java": {
37543652
"stateCleared": "modified",
37553653
},
3756-
"src/test/java/com/mycompany/config/Neo4jTestContainersSpringContextCustomizerFactory.java": {
3757-
"stateCleared": "modified",
3758-
},
37593654
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
37603655
"stateCleared": "modified",
37613656
},
@@ -3819,9 +3714,6 @@ exports[`generator - neo4j monolith-session-reactive(true)-gradle-enableTranslat
38193714
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
38203715
"stateCleared": "modified",
38213716
},
3822-
"src/test/resources/META-INF/spring.factories": {
3823-
"stateCleared": "modified",
3824-
},
38253717
"src/test/resources/config/application.yml": {
38263718
"stateCleared": "modified",
38273719
},

‎generators/spring-boot/generators/data-neo4j/files.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@ export const neo4jFiles = asWriteFilesSection<JavaApplication>({
4444
{
4545
path: `${SERVER_TEST_SRC_DIR}_package_/`,
4646
renameTo: moveToJavaPackageTestDir,
47-
templates: [
48-
'config/Neo4jTestContainer.java',
49-
'config/Neo4jTestContainersSpringContextCustomizerFactory.java',
50-
'config/EmbeddedNeo4j.java',
51-
],
47+
templates: ['config/Neo4jTestContainer.java'],
5248
},
5349
],
5450
});

0 commit comments

Comments
 (0)