From d00ab0094e3dd0e534683b3297b7bc2cfbe3d1ab Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Fri, 21 Jan 2022 19:07:42 +0100 Subject: [PATCH] Improve integration test setup --- .gitignore | 1 + pom.xml | 21 +++++++- .../core/ElasticsearchTemplateTests.java | 5 +- ...ElasticsearchTemplateIntegrationTests.java | 2 +- .../core/RuntimeFieldsIntegrationTests.java | 2 +- .../index/MappingBuilderIntegrationTests.java | 6 +-- .../query/CriteriaQueryIntegrationTests.java | 2 +- .../junit/jupiter/ClusterConnection.java | 52 ++++++++++++++++++- ...lasticsearchRestTemplateConfiguration.java | 9 ++++ ...lasticsearchRestTemplateConfiguration.java | 13 ++++- .../cdi/ElasticsearchOperationsProducer.java | 15 +++++- ...ustomMethodRepositoryIntegrationTests.java | 2 +- ...epositoryManualWiringIntegrationTests.java | 2 +- ...ustomMethodRepositoryIntegrationTests.java | 7 +-- .../DoubleIDRepositoryIntegrationTests.java | 2 +- ...ppingEntityRepositoryIntegrationTests.java | 2 +- ...ReactiveQueryKeywordsIntegrationTests.java | 2 +- .../utils/IndexNameProvider.java | 9 +++- src/test/resources/logback.xml | 12 ++--- 19 files changed, 130 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 26be4183a..6d39e3ec3 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ target *.ipr *.iws .idea +/.env diff --git a/pom.xml b/pom.xml index edcc7e6cb..02188772a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 7.16.3 - 2.17.0 + 2.17.1 4.1.65.Final 2.7.0-SNAPSHOT 1.16.2 @@ -208,6 +208,25 @@ + + org.slf4j + log4j-over-slf4j + ${slf4j} + test + + + org.apache.logging.log4j + log4j-core + ${log4j} + test + + + org.apache.logging.log4j + log4j-to-slf4j + ${log4j} + test + + io.projectreactor.tools blockhound-junit-platform diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java index d75218eff..981f9e7d8 100755 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java @@ -83,9 +83,6 @@ import org.springframework.data.elasticsearch.annotations.MultiField; import org.springframework.data.elasticsearch.annotations.ScriptedField; import org.springframework.data.elasticsearch.annotations.Setting; -import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; -import org.springframework.data.elasticsearch.core.query.ScriptField; import org.springframework.data.elasticsearch.core.document.Explanation; import org.springframework.data.elasticsearch.core.geo.GeoPoint; import org.springframework.data.elasticsearch.core.index.AliasAction; @@ -150,7 +147,7 @@ public void before() { @Test @Order(java.lang.Integer.MAX_VALUE) void cleanup() { - operations.indexOps(IndexCoordinates.of("*")).delete(); + operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete(); } @Test // DATAES-106 diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateIntegrationTests.java index 0b34f9fa6..7d449b585 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateIntegrationTests.java @@ -125,7 +125,7 @@ public void beforeEach() { @Test @Order(java.lang.Integer.MAX_VALUE) void cleanup() { - operations.indexOps(IndexCoordinates.of("*")).delete().block(); + operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete().block(); } // endregion diff --git a/src/test/java/org/springframework/data/elasticsearch/core/RuntimeFieldsIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/RuntimeFieldsIntegrationTests.java index ca15d2bfe..06dbf157e 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/RuntimeFieldsIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/RuntimeFieldsIntegrationTests.java @@ -55,7 +55,7 @@ void setUp() { @Test @Order(java.lang.Integer.MAX_VALUE) void cleanup() { - operations.indexOps(IndexCoordinates.of("*")).delete(); + operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete(); } @Test // #1971 diff --git a/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java index d54feea38..df29ea339 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java @@ -48,8 +48,6 @@ import org.springframework.context.annotation.Import; import org.springframework.data.annotation.Id; import org.springframework.data.elasticsearch.annotations.*; -import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; -import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.IndexOperations; import org.springframework.data.elasticsearch.core.MappingContextBaseTests; @@ -57,6 +55,8 @@ import org.springframework.data.elasticsearch.core.geo.GeoPoint; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; import org.springframework.data.elasticsearch.core.query.IndexQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; +import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm; import org.springframework.data.elasticsearch.core.suggest.Completion; import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration; @@ -107,7 +107,7 @@ public void before() { @Test @Order(java.lang.Integer.MAX_VALUE) void cleanup() { - operations.indexOps(IndexCoordinates.of("*")).delete(); + operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete(); } @Test diff --git a/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryIntegrationTests.java index c7e8b05f4..5a306b83d 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryIntegrationTests.java @@ -61,7 +61,7 @@ public void before() { @Test @Order(java.lang.Integer.MAX_VALUE) void cleanup() { - operations.indexOps(IndexCoordinates.of("*")).delete(); + operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete(); } @Test // DATAES-706 diff --git a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ClusterConnection.java b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ClusterConnection.java index 5088a222c..2f702c935 100644 --- a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ClusterConnection.java +++ b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ClusterConnection.java @@ -15,6 +15,8 @@ */ package org.springframework.data.elasticsearch.junit.jupiter; +import static org.springframework.util.StringUtils.*; + import java.io.InputStream; import java.util.Collections; import java.util.LinkedHashMap; @@ -24,6 +26,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.extension.ExtensionContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.lang.Nullable; import org.testcontainers.elasticsearch.ElasticsearchContainer; import org.testcontainers.utility.DockerImageName; @@ -40,6 +44,9 @@ public class ClusterConnection implements ExtensionContext.Store.CloseableResour private static final Log LOGGER = LogFactory.getLog(ClusterConnection.class); + private static final String ENV_ELASTICSEARCH_HOST = "DATAES_ELASTICSEARCH_HOST"; + private static final String ENV_ELASTICSEARCH_PORT = "DATAES_ELASTICSEARCH_PORT"; + private static final String SDE_TESTCONTAINER_IMAGE_NAME = "sde.testcontainers.image-name"; private static final String SDE_TESTCONTAINER_IMAGE_VERSION = "sde.testcontainers.image-version"; private static final int ELASTICSEARCH_DEFAULT_PORT = 9200; @@ -52,7 +59,7 @@ public class ClusterConnection implements ExtensionContext.Store.CloseableResour * creates the ClusterConnection, starting a container */ public ClusterConnection() { - clusterConnectionInfo = startElasticsearchContainer(); + clusterConnectionInfo = createClusterConnectionInfo(); if (clusterConnectionInfo != null) { if (LOGGER.isDebugEnabled()) { @@ -79,6 +86,32 @@ public ClusterConnectionInfo getClusterConnectionInfo() { return clusterConnectionInfo; } + @Nullable + private ClusterConnectionInfo createClusterConnectionInfo() { + + String host = System.getenv(ENV_ELASTICSEARCH_HOST); + + if (hasText(host)) { + + String envPort = System.getenv(ENV_ELASTICSEARCH_PORT); + + int port = 9200; + + try { + if (hasText(envPort)) { + port = Integer.parseInt(envPort); + } + } catch (NumberFormatException e) { + LOGGER.warn("DATAES_ELASTICSEARCH_PORT does not contain a number"); + } + + return ClusterConnectionInfo.builder().withIntegrationtestEnvironment(IntegrationtestEnvironment.get()) + .withHostAndPort(host, port).build(); + } + + return startElasticsearchContainer(); + } + @Nullable private ClusterConnectionInfo startElasticsearchContainer() { @@ -97,7 +130,7 @@ private ClusterConnectionInfo startElasticsearchContainer() { DockerImageName dockerImageName = getDockerImageName(testcontainersProperties); - ElasticsearchContainer elasticsearchContainer = new ElasticsearchContainer(dockerImageName) + ElasticsearchContainer elasticsearchContainer = new SpringDataElasticsearchContainer(dockerImageName) .withEnv(testcontainersProperties); elasticsearchContainer.start(); @@ -169,4 +202,19 @@ public void close() { LOGGER.debug("closed"); } } + + private static class SpringDataElasticsearchContainer extends ElasticsearchContainer { + + public SpringDataElasticsearchContainer(DockerImageName dockerImageName) { + super(dockerImageName); + } + + /* + * don't need that fancy docker whale in the logger name, this makes configuration of the log level impossible + */ + @Override + protected Logger logger() { + return LoggerFactory.getLogger(SpringDataElasticsearchContainer.class); + } + } } diff --git a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ElasticsearchRestTemplateConfiguration.java b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ElasticsearchRestTemplateConfiguration.java index b33207e34..1843b7f9f 100644 --- a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ElasticsearchRestTemplateConfiguration.java +++ b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ElasticsearchRestTemplateConfiguration.java @@ -15,6 +15,8 @@ */ package org.springframework.data.elasticsearch.junit.jupiter; +import static org.springframework.util.StringUtils.*; + import java.time.Duration; import org.elasticsearch.client.RestHighLevelClient; @@ -60,6 +62,13 @@ public RestHighLevelClient elasticsearchClient() { .usingSsl(); } + String user = System.getenv("DATAES_ELASTICSEARCH_USER"); + String password = System.getenv("DATAES_ELASTICSEARCH_PASSWORD"); + + if (hasText(user) && hasText(password)) { + configurationBuilder.withBasicAuth(user, password); + } + return RestClients.create(configurationBuilder // .withConnectTimeout(Duration.ofSeconds(20)) // .withSocketTimeout(Duration.ofSeconds(20)) // diff --git a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ReactiveElasticsearchRestTemplateConfiguration.java b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ReactiveElasticsearchRestTemplateConfiguration.java index ef3e30fb3..10254e3ae 100644 --- a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ReactiveElasticsearchRestTemplateConfiguration.java +++ b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ReactiveElasticsearchRestTemplateConfiguration.java @@ -15,14 +15,16 @@ */ package org.springframework.data.elasticsearch.junit.jupiter; +import static org.springframework.util.StringUtils.*; + import java.time.Duration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; -import org.springframework.data.elasticsearch.config.AbstractReactiveElasticsearchConfiguration; import org.springframework.data.elasticsearch.client.ClientConfiguration; +import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient; import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClients; +import org.springframework.data.elasticsearch.config.AbstractReactiveElasticsearchConfiguration; import org.springframework.data.elasticsearch.core.RefreshPolicy; /** @@ -53,6 +55,13 @@ public ReactiveElasticsearchClient reactiveElasticsearchClient() { .usingSsl(); } + String user = System.getenv("DATAES_ELASTICSEARCH_USER"); + String password = System.getenv("DATAES_ELASTICSEARCH_PASSWORD"); + + if (hasText(user) && hasText(password)) { + configurationBuilder.withBasicAuth(user, password); + } + return ReactiveRestClients.create(configurationBuilder // .withConnectTimeout(Duration.ofSeconds(20)) // .withSocketTimeout(Duration.ofSeconds(20)) // diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/cdi/ElasticsearchOperationsProducer.java b/src/test/java/org/springframework/data/elasticsearch/repositories/cdi/ElasticsearchOperationsProducer.java index 5e435cec7..e5e634bfa 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/cdi/ElasticsearchOperationsProducer.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/cdi/ElasticsearchOperationsProducer.java @@ -15,6 +15,8 @@ */ package org.springframework.data.elasticsearch.repositories.cdi; +import static org.springframework.util.StringUtils.*; + import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; @@ -56,8 +58,17 @@ public RestHighLevelClient elasticsearchClient() { // we rely on the tests being run with the SpringDataElasticsearchExtension class that sets up a containerized ES. ClusterConnectionInfo connectionInfo = ClusterConnection.clusterConnectionInfo(); - ClientConfiguration clientConfiguration = ClientConfiguration.builder() // - .connectedTo(connectionInfo.getHost() + ':' + connectionInfo.getHttpPort()) // + ClientConfiguration.TerminalClientConfigurationBuilder configurationBuilder = ClientConfiguration.builder() // + .connectedTo(connectionInfo.getHost() + ':' + connectionInfo.getHttpPort()); + + String user = System.getenv("DATAES_ELASTICSEARCH_USER"); + String password = System.getenv("DATAES_ELASTICSEARCH_PASSWORD"); + + if (hasText(user) && hasText(password)) { + configurationBuilder.withBasicAuth(user, password); + } + + ClientConfiguration clientConfiguration = configurationBuilder // .build(); return RestClients.create(clientConfiguration).rest(); diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/autowiring/ComplexCustomMethodRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/autowiring/ComplexCustomMethodRepositoryIntegrationTests.java index 616f2ffc0..ab28a2a02 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/autowiring/ComplexCustomMethodRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/autowiring/ComplexCustomMethodRepositoryIntegrationTests.java @@ -52,7 +52,7 @@ public void before() { @Test @Order(java.lang.Integer.MAX_VALUE) void cleanup() { - operations.indexOps(IndexCoordinates.of("*")).delete(); + operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete(); } @Test diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/manualwiring/ComplexCustomMethodRepositoryManualWiringIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/manualwiring/ComplexCustomMethodRepositoryManualWiringIntegrationTests.java index 3524d990a..4261c8d35 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/manualwiring/ComplexCustomMethodRepositoryManualWiringIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/complex/custommethod/manualwiring/ComplexCustomMethodRepositoryManualWiringIntegrationTests.java @@ -51,7 +51,7 @@ public void before() { @Test @Order(java.lang.Integer.MAX_VALUE) void cleanup() { - operations.indexOps(IndexCoordinates.of("*")).delete(); + operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete(); } @Test diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java index 71d2e496b..145ce57d8 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java @@ -93,7 +93,7 @@ public void before() { @Test @org.junit.jupiter.api.Order(java.lang.Integer.MAX_VALUE) void cleanup() { - operations.indexOps(IndexCoordinates.of("*")).delete(); + operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete(); } @Test @@ -1654,9 +1654,7 @@ void shouldStreamSearchHitsWithQueryAnnotatedMethod() { void shouldBeAbleToUseCollectionInQueryAnnotatedMethod() { List entities = createSampleEntities("abc", 20); repository.saveAll(entities); - List ids = entities.stream() - .map(SampleEntity::getId) - .limit(7) // Just get subset + List ids = entities.stream().map(SampleEntity::getId).limit(7) // Just get subset .collect(Collectors.toList()); List sampleEntities = repository.getByIds(ids); @@ -1667,7 +1665,6 @@ void shouldBeAbleToUseCollectionInQueryAnnotatedMethod() { assertThat(returnedIds).containsAll(ids); } - private List createSampleEntities(String type, int numberOfEntities) { List entities = new ArrayList<>(); diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/doubleid/DoubleIDRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/doubleid/DoubleIDRepositoryIntegrationTests.java index 32b4f728a..f979e7442 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/doubleid/DoubleIDRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/doubleid/DoubleIDRepositoryIntegrationTests.java @@ -58,7 +58,7 @@ public void before() { @Test @Order(Integer.MAX_VALUE) public void cleanup() { - operations.indexOps(IndexCoordinates.of("*")).delete(); + operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete(); } @Test diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/setting/dynamic/DynamicSettingAndMappingEntityRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/setting/dynamic/DynamicSettingAndMappingEntityRepositoryIntegrationTests.java index 496d44387..451bd5742 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/setting/dynamic/DynamicSettingAndMappingEntityRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/setting/dynamic/DynamicSettingAndMappingEntityRepositoryIntegrationTests.java @@ -64,7 +64,7 @@ public void before() { @Test @Order(Integer.MAX_VALUE) void cleanup() { - operations.indexOps(IndexCoordinates.of("*")).delete(); + operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete(); } @Test // DATAES-64 diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/query/keywords/ReactiveQueryKeywordsIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/query/keywords/ReactiveQueryKeywordsIntegrationTests.java index 370d3575b..316db649a 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/query/keywords/ReactiveQueryKeywordsIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/query/keywords/ReactiveQueryKeywordsIntegrationTests.java @@ -75,7 +75,7 @@ void setUp() { @Test @Order(java.lang.Integer.MAX_VALUE) void cleanup() { - operations.indexOps(IndexCoordinates.of("*")).delete().block(); + operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete().block(); } // endregion diff --git a/src/test/java/org/springframework/data/elasticsearch/utils/IndexNameProvider.java b/src/test/java/org/springframework/data/elasticsearch/utils/IndexNameProvider.java index df01a781d..231803e19 100644 --- a/src/test/java/org/springframework/data/elasticsearch/utils/IndexNameProvider.java +++ b/src/test/java/org/springframework/data/elasticsearch/utils/IndexNameProvider.java @@ -16,7 +16,7 @@ package org.springframework.data.elasticsearch.utils; /** - * Class providing an index name with a prefix and a index number + * Class providing an index name witInCo * * @author Peter-Josef Meisch */ @@ -41,4 +41,11 @@ public void increment() { public String indexName() { return indexName; } + + /** + * @since 4.4 + */ + public String getPrefix() { + return prefix; + } } diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml index 56a051031..aa2f57aac 100644 --- a/src/test/resources/logback.xml +++ b/src/test/resources/logback.xml @@ -15,26 +15,22 @@ ~ limitations under the License. --> + + - %d %5p %40.40c:%4L - %m%n + %d %5p %c - %m%n - - - - - - - +