From 3392f5f4eb7c4e8f2fb748149faeb888bb046179 Mon Sep 17 00:00:00 2001 From: Benjamin Van der Smissen Date: Tue, 6 Aug 2024 10:29:34 +0200 Subject: [PATCH] ALFREDAPI-548 [Reformat] --- .../alfresco/build.gradle | 9 +---- .../tests/search/TermHitHighlightingTest.java | 7 ++-- .../model-amp/README.md | 3 +- .../model/apixtest-model.xml | 6 ++-- .../module-context.xml | 34 +++++++++---------- .../alfred-api/context/service-context.xml | 5 +-- .../module/alfred-api/module-context.xml | 2 +- .../module/alfred-api/module-context.xml | 8 ++--- .../src/main/resources/log4j.properties | 1 - .../src/test/resources/log4j.properties | 1 - .../src/test/resources/test-context.xml | 12 +++---- 11 files changed, 42 insertions(+), 46 deletions(-) diff --git a/apix-integrationtests-client/alfresco/build.gradle b/apix-integrationtests-client/alfresco/build.gradle index d73cb366..00148c69 100644 --- a/apix-integrationtests-client/alfresco/build.gradle +++ b/apix-integrationtests-client/alfresco/build.gradle @@ -52,20 +52,13 @@ allprojects { exclude group: 'org.apache.httpcomponents', module: 'httpcore' } // Add services used to the integration test fatjar, since we can't access the ones deployed in Alfresco - testImplementation (project(":apix-impl:apix-impl-${subproject_alfresco_version}")) + testImplementation(project(":apix-impl:apix-impl-${subproject_alfresco_version}")) // Read in the integration-test-server static ApplicationContext + Helperclasses implementation project(path: ":apix-integrationtests-server") } } subprojects { - apply plugin: 'eu.xenit.docker-compose' - - // Subproject of supported Alfresco versions - def subproject_alfresco_version = project.projectDir.name == "alfresco" - ? "231" // minimum supported version - : project.projectDir.name - // Subproject of supported Alfresco versions def projectApixImpl = project(":apix-impl:apix-impl-${project.projectDir.name}") def projectDocker = project(":apix-docker:docker-${project.projectDir.name}") diff --git a/apix-integrationtests-client/alfresco/src/main/java/eu/xenit/apix/tests/search/TermHitHighlightingTest.java b/apix-integrationtests-client/alfresco/src/main/java/eu/xenit/apix/tests/search/TermHitHighlightingTest.java index 4578c3dc..f997a119 100644 --- a/apix-integrationtests-client/alfresco/src/main/java/eu/xenit/apix/tests/search/TermHitHighlightingTest.java +++ b/apix-integrationtests-client/alfresco/src/main/java/eu/xenit/apix/tests/search/TermHitHighlightingTest.java @@ -31,9 +31,10 @@ public class TermHitHighlightingTest extends JavaApiBaseTest { SearchService searchService; RetryingTransactionHelper retryingTransactionHelper; private final SolrTestHelperImpl solrHelper; - private static final String FURIES_TXT = "The furies are at home\nin the mirror; it is their address.\nEven the clearest water,\nif deep enough can drown.\n" - + "\nNever think to surprise them.\nYour face approaching ever\nso friendly is the white flag\nthey ignore. There is no truce\n" - + "\nwith the furies. A mirror’s temperature is always at zero.\n"; + private static final String FURIES_TXT = + "The furies are at home\nin the mirror; it is their address.\nEven the clearest water,\nif deep enough can drown.\n" + + "\nNever think to surprise them.\nYour face approaching ever\nso friendly is the white flag\nthey ignore. There is no truce\n" + + "\nwith the furies. A mirror’s temperature is always at zero.\n"; public TermHitHighlightingTest() { // initialise the local beans diff --git a/apix-integrationtests-client/model-amp/README.md b/apix-integrationtests-client/model-amp/README.md index d4a0ca21..7272a027 100644 --- a/apix-integrationtests-client/model-amp/README.md +++ b/apix-integrationtests-client/model-amp/README.md @@ -4,6 +4,7 @@ This sub project builds an AMP containing the model and messages used in integra The AMP is then added as part of the docker image used for running the tests. ### Rationale ### -This happens via an AMP and not a Bundle because when installed via a bundle, + +This happens via an AMP and not a Bundle because when installed via a bundle, the Docker health check and registration of the bundle's messages keep fighting over the Alfresco dictionary lock, with unwanted timeouts as a consequence. diff --git a/apix-integrationtests-client/model-amp/src/main/amp/config/alfresco/module/apix-integrationtests-model-amp/model/apixtest-model.xml b/apix-integrationtests-client/model-amp/src/main/amp/config/alfresco/module/apix-integrationtests-model-amp/model/apixtest-model.xml index e127f089..cfa542f2 100644 --- a/apix-integrationtests-client/model-amp/src/main/amp/config/alfresco/module/apix-integrationtests-model-amp/model/apixtest-model.xml +++ b/apix-integrationtests-client/model-amp/src/main/amp/config/alfresco/module/apix-integrationtests-model-amp/model/apixtest-model.xml @@ -1,6 +1,8 @@ - + APIX integration tests Metadata Model gb 1 @@ -67,7 +69,7 @@ false - + diff --git a/apix-integrationtests-client/model-amp/src/main/amp/config/alfresco/module/apix-integrationtests-model-amp/module-context.xml b/apix-integrationtests-client/model-amp/src/main/amp/config/alfresco/module/apix-integrationtests-model-amp/module-context.xml index 25023e4f..ef5b9901 100644 --- a/apix-integrationtests-client/model-amp/src/main/amp/config/alfresco/module/apix-integrationtests-model-amp/module-context.xml +++ b/apix-integrationtests-client/model-amp/src/main/amp/config/alfresco/module/apix-integrationtests-model-amp/module-context.xml @@ -1,23 +1,23 @@ - - - - alfresco/module/apix-integrationtests-model-amp/model/apixtest-model.xml - - - - - - alfresco/module/apix-integrationtests-model-amp/messages/apixtest - - - + + + + alfresco/module/apix-integrationtests-model-amp/model/apixtest-model.xml + + + + + + alfresco/module/apix-integrationtests-model-amp/messages/apixtest + + + \ No newline at end of file diff --git a/apix-integrationtests-server/src/main/resources/alfresco/module/alfred-api/context/service-context.xml b/apix-integrationtests-server/src/main/resources/alfresco/module/alfred-api/context/service-context.xml index 1dc502a9..0ecf1d1e 100644 --- a/apix-integrationtests-server/src/main/resources/alfresco/module/alfred-api/context/service-context.xml +++ b/apix-integrationtests-server/src/main/resources/alfresco/module/alfred-api/context/service-context.xml @@ -18,10 +18,11 @@ --> - + - + diff --git a/apix-integrationtests-server/src/main/resources/alfresco/module/alfred-api/module-context.xml b/apix-integrationtests-server/src/main/resources/alfresco/module/alfred-api/module-context.xml index 63330e92..6c5543cd 100644 --- a/apix-integrationtests-server/src/main/resources/alfresco/module/alfred-api/module-context.xml +++ b/apix-integrationtests-server/src/main/resources/alfresco/module/alfred-api/module-context.xml @@ -19,5 +19,5 @@ - + diff --git a/apix-rest-v1/src/main/resources/alfresco/module/alfred-api/module-context.xml b/apix-rest-v1/src/main/resources/alfresco/module/alfred-api/module-context.xml index 697bc273..9ae1a3b7 100644 --- a/apix-rest-v1/src/main/resources/alfresco/module/alfred-api/module-context.xml +++ b/apix-rest-v1/src/main/resources/alfresco/module/alfred-api/module-context.xml @@ -1,8 +1,8 @@ - - + + diff --git a/apix-rest-v1/src/main/resources/log4j.properties b/apix-rest-v1/src/main/resources/log4j.properties index 74996e6b..a9fc1373 100644 --- a/apix-rest-v1/src/main/resources/log4j.properties +++ b/apix-rest-v1/src/main/resources/log4j.properties @@ -3,7 +3,6 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout.ConversionPattern=%t %p [%c] - %m%n log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.threshold=TRACE - #log4j.logger.org.springframework.osgi=DEBUG #log4j.logger.org.springframework=DEBUG log4j.logger.org.springframework.web.servlet.mvc.support=DEBUG \ No newline at end of file diff --git a/apix-rest-v1/src/test/resources/log4j.properties b/apix-rest-v1/src/test/resources/log4j.properties index 18cfaa3f..6a5db80f 100644 --- a/apix-rest-v1/src/test/resources/log4j.properties +++ b/apix-rest-v1/src/test/resources/log4j.properties @@ -3,6 +3,5 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout.ConversionPattern=%t %p [%c] - %m%n log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.threshold=TRACE - #log4j.logger.org.springframework.osgi=DEBUG #log4j.logger.org.springframework=DEBUG \ No newline at end of file diff --git a/apix-rest-v1/src/test/resources/test-context.xml b/apix-rest-v1/src/test/resources/test-context.xml index 333aa1d6..f67454f7 100644 --- a/apix-rest-v1/src/test/resources/test-context.xml +++ b/apix-rest-v1/src/test/resources/test-context.xml @@ -1,9 +1,9 @@ - + - +