Skip to content

Commit 24bf717

Browse files
mshimamshima
committed
elasticsearch: use testcontainers with DynamicPropertySource
1 parent 93ef73b commit 24bf717

File tree

8 files changed

+44
-220
lines changed

8 files changed

+44
-220
lines changed

‎generators/spring-boot/files.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ export const baseServerFiles = asWriteFilesSection<SpringBootApplication>({
378378
],
379379
serverJavaUserManagement: [
380380
{
381-
condition: generator => generator.searchEngineElasticsearch || generator.databaseTypeCouchbase || generator.searchEngineCouchbase,
381+
condition: generator => generator.databaseTypeCouchbase || generator.searchEngineCouchbase,
382382
path: `${SERVER_TEST_SRC_DIR}_package_/`,
383383
renameTo: moveToJavaPackageTestDir,
384384
templates: ['config/TestContainersSpringContextCustomizerFactory.java'],

‎generators/spring-boot/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ public class TestContainersSpringContextCustomizerFactory implements ContextCust
3838

3939
private Logger log = LoggerFactory.getLogger(TestContainersSpringContextCustomizerFactory.class);
4040

41-
<%_ if (searchEngineElasticsearch) { _%>
42-
private static ElasticsearchTestContainer elasticsearchBean;
43-
<%_ } _%>
4441
<%_ if (databaseTypeCouchbase || searchEngineCouchbase) { _%>
4542
private static CouchbaseTestContainer couchbaseBean;
4643
<%_ } _%>
@@ -70,32 +67,13 @@ public class TestContainersSpringContextCustomizerFactory implements ContextCust
7067
testValues = testValues.and("jhipster.database.couchbase.bucket-name=" + couchbaseBean.getBucketName());
7168
testValues = testValues.and("jhipster.database.couchbase.scope-name=testScope");
7269
}
73-
<%_ } _%>
74-
<%_ if (searchEngineElasticsearch) { _%>
75-
EmbeddedElasticsearch elasticsearchAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedElasticsearch.class);
76-
if (null != elasticsearchAnnotation) {
77-
log.debug("detected the EmbeddedElasticsearch annotation on class {}", testClass.getName());
78-
log.info("Warming up the elastic database");
79-
if (null == elasticsearchBean) {
80-
elasticsearchBean = beanFactory.createBean(ElasticsearchTestContainer.class);
81-
beanFactory.registerSingleton(ElasticsearchTestContainer.class.getName(), elasticsearchBean);
82-
// ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(ElasticsearchTestContainer.class.getName(), elasticsearchBean);
83-
}
84-
testValues =
85-
testValues.and(
86-
"spring.elasticsearch.uris=http://" + elasticsearchBean.getElasticsearchContainer().getHttpHostAddress()
87-
);
88-
}
8970
<%_ } _%>
9071
testValues.applyTo(context);
9172
}
9273

9374
@Override
9475
public int hashCode() {
9576
return
96-
<%_ if (searchEngineElasticsearch) { _%>
97-
ElasticsearchTestContainer.class.getName().hashCode() <% if (databaseTypeCouchbase || searchEngineCouchbase) { %> + <% } else { %>;<% } %>
98-
<%_ } _%>
9977
<%_ if (databaseTypeCouchbase || searchEngineCouchbase) { _%>
10078
CouchbaseTestContainer.class.getName().hashCode();
10179
<%_ } _%>

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

Lines changed: 0 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -284,18 +284,12 @@ exports[`generator - elasticsearch gateway-jwt-reactive(false)-maven-enableTrans
284284
"src/test/java/tech/jhipster/config/ElasticsearchTestContainer.java": {
285285
"stateCleared": "modified",
286286
},
287-
"src/test/java/tech/jhipster/config/EmbeddedElasticsearch.java": {
288-
"stateCleared": "modified",
289-
},
290287
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
291288
"stateCleared": "modified",
292289
},
293290
"src/test/java/tech/jhipster/config/StaticResourcesWebConfigurerTest.java": {
294291
"stateCleared": "modified",
295292
},
296-
"src/test/java/tech/jhipster/config/TestContainersSpringContextCustomizerFactory.java": {
297-
"stateCleared": "modified",
298-
},
299293
"src/test/java/tech/jhipster/config/WebConfigurerTest.java": {
300294
"stateCleared": "modified",
301295
},
@@ -404,9 +398,6 @@ exports[`generator - elasticsearch gateway-jwt-reactive(false)-maven-enableTrans
404398
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
405399
"stateCleared": "modified",
406400
},
407-
"src/test/resources/META-INF/spring.factories": {
408-
"stateCleared": "modified",
409-
},
410401
"src/test/resources/config/application.yml": {
411402
"stateCleared": "modified",
412403
},
@@ -667,18 +658,12 @@ exports[`generator - elasticsearch gateway-jwt-reactive(true)-gradle-enableTrans
667658
"src/test/java/com/mycompany/config/ElasticsearchTestContainer.java": {
668659
"stateCleared": "modified",
669660
},
670-
"src/test/java/com/mycompany/config/EmbeddedElasticsearch.java": {
671-
"stateCleared": "modified",
672-
},
673661
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
674662
"stateCleared": "modified",
675663
},
676664
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
677665
"stateCleared": "modified",
678666
},
679-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
680-
"stateCleared": "modified",
681-
},
682667
"src/test/java/com/mycompany/custom/domain/EntityWithCustomIdAsserts.java": {
683668
"stateCleared": "modified",
684669
},
@@ -754,9 +739,6 @@ exports[`generator - elasticsearch gateway-jwt-reactive(true)-gradle-enableTrans
754739
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
755740
"stateCleared": "modified",
756741
},
757-
"src/test/resources/META-INF/spring.factories": {
758-
"stateCleared": "modified",
759-
},
760742
"src/test/resources/config/application.yml": {
761743
"stateCleared": "modified",
762744
},
@@ -1026,18 +1008,12 @@ exports[`generator - elasticsearch gateway-oauth2-reactive(true)-gradle-enableTr
10261008
"src/test/java/com/mycompany/config/ElasticsearchTestContainer.java": {
10271009
"stateCleared": "modified",
10281010
},
1029-
"src/test/java/com/mycompany/config/EmbeddedElasticsearch.java": {
1030-
"stateCleared": "modified",
1031-
},
10321011
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
10331012
"stateCleared": "modified",
10341013
},
10351014
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
10361015
"stateCleared": "modified",
10371016
},
1038-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
1039-
"stateCleared": "modified",
1040-
},
10411017
"src/test/java/com/mycompany/custom/domain/EntityWithCustomIdAsserts.java": {
10421018
"stateCleared": "modified",
10431019
},
@@ -1137,9 +1113,6 @@ exports[`generator - elasticsearch gateway-oauth2-reactive(true)-gradle-enableTr
11371113
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
11381114
"stateCleared": "modified",
11391115
},
1140-
"src/test/resources/META-INF/spring.factories": {
1141-
"stateCleared": "modified",
1142-
},
11431116
"src/test/resources/config/application.yml": {
11441117
"stateCleared": "modified",
11451118
},
@@ -1349,15 +1322,9 @@ exports[`generator - elasticsearch microservice-jwt-reactive(false)-maven-enable
13491322
"src/test/java/tech/jhipster/config/ElasticsearchTestContainer.java": {
13501323
"stateCleared": "modified",
13511324
},
1352-
"src/test/java/tech/jhipster/config/EmbeddedElasticsearch.java": {
1353-
"stateCleared": "modified",
1354-
},
13551325
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
13561326
"stateCleared": "modified",
13571327
},
1358-
"src/test/java/tech/jhipster/config/TestContainersSpringContextCustomizerFactory.java": {
1359-
"stateCleared": "modified",
1360-
},
13611328
"src/test/java/tech/jhipster/config/WebConfigurerTest.java": {
13621329
"stateCleared": "modified",
13631330
},
@@ -1442,9 +1409,6 @@ exports[`generator - elasticsearch microservice-jwt-reactive(false)-maven-enable
14421409
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
14431410
"stateCleared": "modified",
14441411
},
1445-
"src/test/resources/META-INF/spring.factories": {
1446-
"stateCleared": "modified",
1447-
},
14481412
"src/test/resources/config/application.yml": {
14491413
"stateCleared": "modified",
14501414
},
@@ -1696,18 +1660,12 @@ exports[`generator - elasticsearch microservice-jwt-reactive(true)-gradle-enable
16961660
"src/test/java/com/mycompany/config/ElasticsearchTestContainer.java": {
16971661
"stateCleared": "modified",
16981662
},
1699-
"src/test/java/com/mycompany/config/EmbeddedElasticsearch.java": {
1700-
"stateCleared": "modified",
1701-
},
17021663
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
17031664
"stateCleared": "modified",
17041665
},
17051666
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
17061667
"stateCleared": "modified",
17071668
},
1708-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
1709-
"stateCleared": "modified",
1710-
},
17111669
"src/test/java/com/mycompany/custom/domain/EntityWithCustomIdAsserts.java": {
17121670
"stateCleared": "modified",
17131671
},
@@ -1786,9 +1744,6 @@ exports[`generator - elasticsearch microservice-jwt-reactive(true)-gradle-enable
17861744
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
17871745
"stateCleared": "modified",
17881746
},
1789-
"src/test/resources/META-INF/spring.factories": {
1790-
"stateCleared": "modified",
1791-
},
17921747
"src/test/resources/config/application.yml": {
17931748
"stateCleared": "modified",
17941749
},
@@ -2037,18 +1992,12 @@ exports[`generator - elasticsearch microservice-oauth2-reactive(true)-gradle-ena
20371992
"src/test/java/com/mycompany/config/ElasticsearchTestContainer.java": {
20381993
"stateCleared": "modified",
20391994
},
2040-
"src/test/java/com/mycompany/config/EmbeddedElasticsearch.java": {
2041-
"stateCleared": "modified",
2042-
},
20431995
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
20441996
"stateCleared": "modified",
20451997
},
20461998
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
20471999
"stateCleared": "modified",
20482000
},
2049-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
2050-
"stateCleared": "modified",
2051-
},
20522001
"src/test/java/com/mycompany/custom/domain/EntityWithCustomIdAsserts.java": {
20532002
"stateCleared": "modified",
20542003
},
@@ -2127,9 +2076,6 @@ exports[`generator - elasticsearch microservice-oauth2-reactive(true)-gradle-ena
21272076
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
21282077
"stateCleared": "modified",
21292078
},
2130-
"src/test/resources/META-INF/spring.factories": {
2131-
"stateCleared": "modified",
2132-
},
21332079
"src/test/resources/config/application.yml": {
21342080
"stateCleared": "modified",
21352081
},
@@ -2420,18 +2366,12 @@ exports[`generator - elasticsearch monolith-jwt-reactive(false)-maven-enableTran
24202366
"src/test/java/tech/jhipster/config/ElasticsearchTestContainer.java": {
24212367
"stateCleared": "modified",
24222368
},
2423-
"src/test/java/tech/jhipster/config/EmbeddedElasticsearch.java": {
2424-
"stateCleared": "modified",
2425-
},
24262369
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
24272370
"stateCleared": "modified",
24282371
},
24292372
"src/test/java/tech/jhipster/config/StaticResourcesWebConfigurerTest.java": {
24302373
"stateCleared": "modified",
24312374
},
2432-
"src/test/java/tech/jhipster/config/TestContainersSpringContextCustomizerFactory.java": {
2433-
"stateCleared": "modified",
2434-
},
24352375
"src/test/java/tech/jhipster/config/WebConfigurerTest.java": {
24362376
"stateCleared": "modified",
24372377
},
@@ -2534,9 +2474,6 @@ exports[`generator - elasticsearch monolith-jwt-reactive(false)-maven-enableTran
25342474
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
25352475
"stateCleared": "modified",
25362476
},
2537-
"src/test/resources/META-INF/spring.factories": {
2538-
"stateCleared": "modified",
2539-
},
25402477
"src/test/resources/config/application.yml": {
25412478
"stateCleared": "modified",
25422479
},
@@ -2797,18 +2734,12 @@ exports[`generator - elasticsearch monolith-jwt-reactive(true)-gradle-enableTran
27972734
"src/test/java/com/mycompany/config/ElasticsearchTestContainer.java": {
27982735
"stateCleared": "modified",
27992736
},
2800-
"src/test/java/com/mycompany/config/EmbeddedElasticsearch.java": {
2801-
"stateCleared": "modified",
2802-
},
28032737
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
28042738
"stateCleared": "modified",
28052739
},
28062740
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
28072741
"stateCleared": "modified",
28082742
},
2809-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
2810-
"stateCleared": "modified",
2811-
},
28122743
"src/test/java/com/mycompany/custom/domain/EntityWithCustomIdAsserts.java": {
28132744
"stateCleared": "modified",
28142745
},
@@ -2896,9 +2827,6 @@ exports[`generator - elasticsearch monolith-jwt-reactive(true)-gradle-enableTran
28962827
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
28972828
"stateCleared": "modified",
28982829
},
2899-
"src/test/resources/META-INF/spring.factories": {
2900-
"stateCleared": "modified",
2901-
},
29022830
"src/test/resources/config/application.yml": {
29032831
"stateCleared": "modified",
29042832
},
@@ -3117,18 +3045,12 @@ exports[`generator - elasticsearch monolith-oauth2-reactive(false)-maven-enableT
31173045
"src/test/java/tech/jhipster/config/ElasticsearchTestContainer.java": {
31183046
"stateCleared": "modified",
31193047
},
3120-
"src/test/java/tech/jhipster/config/EmbeddedElasticsearch.java": {
3121-
"stateCleared": "modified",
3122-
},
31233048
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
31243049
"stateCleared": "modified",
31253050
},
31263051
"src/test/java/tech/jhipster/config/StaticResourcesWebConfigurerTest.java": {
31273052
"stateCleared": "modified",
31283053
},
3129-
"src/test/java/tech/jhipster/config/TestContainersSpringContextCustomizerFactory.java": {
3130-
"stateCleared": "modified",
3131-
},
31323054
"src/test/java/tech/jhipster/config/WebConfigurerTest.java": {
31333055
"stateCleared": "modified",
31343056
},
@@ -3219,9 +3141,6 @@ exports[`generator - elasticsearch monolith-oauth2-reactive(false)-maven-enableT
32193141
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
32203142
"stateCleared": "modified",
32213143
},
3222-
"src/test/resources/META-INF/spring.factories": {
3223-
"stateCleared": "modified",
3224-
},
32253144
"src/test/resources/config/application.yml": {
32263145
"stateCleared": "modified",
32273146
},
@@ -3479,18 +3398,12 @@ exports[`generator - elasticsearch monolith-oauth2-reactive(true)-gradle-enableT
34793398
"src/test/java/com/mycompany/config/ElasticsearchTestContainer.java": {
34803399
"stateCleared": "modified",
34813400
},
3482-
"src/test/java/com/mycompany/config/EmbeddedElasticsearch.java": {
3483-
"stateCleared": "modified",
3484-
},
34853401
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
34863402
"stateCleared": "modified",
34873403
},
34883404
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
34893405
"stateCleared": "modified",
34903406
},
3491-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
3492-
"stateCleared": "modified",
3493-
},
34943407
"src/test/java/com/mycompany/custom/domain/EntityWithCustomIdAsserts.java": {
34953408
"stateCleared": "modified",
34963409
},
@@ -3578,9 +3491,6 @@ exports[`generator - elasticsearch monolith-oauth2-reactive(true)-gradle-enableT
35783491
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
35793492
"stateCleared": "modified",
35803493
},
3581-
"src/test/resources/META-INF/spring.factories": {
3582-
"stateCleared": "modified",
3583-
},
35843494
"src/test/resources/config/application.yml": {
35853495
"stateCleared": "modified",
35863496
},
@@ -3889,18 +3799,12 @@ exports[`generator - elasticsearch monolith-session-reactive(false)-maven-enable
38893799
"src/test/java/tech/jhipster/config/ElasticsearchTestContainer.java": {
38903800
"stateCleared": "modified",
38913801
},
3892-
"src/test/java/tech/jhipster/config/EmbeddedElasticsearch.java": {
3893-
"stateCleared": "modified",
3894-
},
38953802
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
38963803
"stateCleared": "modified",
38973804
},
38983805
"src/test/java/tech/jhipster/config/StaticResourcesWebConfigurerTest.java": {
38993806
"stateCleared": "modified",
39003807
},
3901-
"src/test/java/tech/jhipster/config/TestContainersSpringContextCustomizerFactory.java": {
3902-
"stateCleared": "modified",
3903-
},
39043808
"src/test/java/tech/jhipster/config/WebConfigurerTest.java": {
39053809
"stateCleared": "modified",
39063810
},
@@ -4021,9 +3925,6 @@ exports[`generator - elasticsearch monolith-session-reactive(false)-maven-enable
40213925
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
40223926
"stateCleared": "modified",
40233927
},
4024-
"src/test/resources/META-INF/spring.factories": {
4025-
"stateCleared": "modified",
4026-
},
40273928
"src/test/resources/config/application.yml": {
40283929
"stateCleared": "modified",
40293930
},
@@ -4290,18 +4191,12 @@ exports[`generator - elasticsearch monolith-session-reactive(true)-gradle-enable
42904191
"src/test/java/com/mycompany/config/ElasticsearchTestContainer.java": {
42914192
"stateCleared": "modified",
42924193
},
4293-
"src/test/java/com/mycompany/config/EmbeddedElasticsearch.java": {
4294-
"stateCleared": "modified",
4295-
},
42964194
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
42974195
"stateCleared": "modified",
42984196
},
42994197
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
43004198
"stateCleared": "modified",
43014199
},
4302-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
4303-
"stateCleared": "modified",
4304-
},
43054200
"src/test/java/com/mycompany/custom/domain/EntityWithCustomIdAsserts.java": {
43064201
"stateCleared": "modified",
43074202
},
@@ -4389,9 +4284,6 @@ exports[`generator - elasticsearch monolith-session-reactive(true)-gradle-enable
43894284
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
43904285
"stateCleared": "modified",
43914286
},
4392-
"src/test/resources/META-INF/spring.factories": {
4393-
"stateCleared": "modified",
4394-
},
43954287
"src/test/resources/config/application.yml": {
43964288
"stateCleared": "modified",
43974289
},

0 commit comments

Comments
 (0)