ALFREDAPI-548 [Reformat]

xenit-eu · Aug 6, 2024 · 3392f5f · 3392f5f
1 parent b2fd670
commit 3392f5f
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 46 deletions.
diff --git 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/...sts-client/alfresco/src/main/java/eu/xenit/apix/tests/search/TermHitHighlightingTest.java b/...sts-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
@@ -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/.../main/amp/config/alfresco/module/apix-integrationtests-model-amp/model/apixtest-model.xml b/.../main/amp/config/alfresco/module/apix-integrationtests-model-amp/model/apixtest-model.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--WARNING THIS IS A DUPLICATE OF THE integrationtests-50 version! EACH INTEGRATIONTESTS should have this file-->
-<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.alfresco.org/model/dictionary/1.0 http://svn.alfresco.com/repos/alfresco-open-mirror/alfresco/HEAD/root/projects/repository/config/alfresco/model/modelSchema.xsd" xmlns="http://www.alfresco.org/model/dictionary/1.0" name="apixtest:model">
+<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.alfresco.org/model/dictionary/1.0 http://svn.alfresco.com/repos/alfresco-open-mirror/alfresco/HEAD/root/projects/repository/config/alfresco/model/modelSchema.xsd"
+        xmlns="http://www.alfresco.org/model/dictionary/1.0" name="apixtest:model">
     <description>APIX integration tests Metadata Model</description>
     <author>gb</author>
     <version>1</version>
@@ -67,7 +69,7 @@
                     <index enabled="true">
                         <tokenised>false</tokenised>
                     </index>
-                </property>                
+                </property>
             </properties>
         </type>
     </types>

diff --git a/...mp/src/main/amp/config/alfresco/module/apix-integrationtests-model-amp/module-context.xml b/...mp/src/main/amp/config/alfresco/module/apix-integrationtests-model-amp/module-context.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.springframework.org/schema/beans
 		http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-  <bean id="eu.xenit.apix.tests.dictionaryBootstrap"
-    parent="dictionaryModelBootstrap"
-    depends-on="dictionaryBootstrap">
-    <property name="models">
-      <list>
-        <value>alfresco/module/apix-integrationtests-model-amp/model/apixtest-model.xml</value>
-      </list>
-    </property>
-    <property name="labels">
-      <list>
-        <!-- Bootstrap Resource Bundles for the content model types, aspects, properties etc -->
-        <value>alfresco/module/apix-integrationtests-model-amp/messages/apixtest</value>
-      </list>
-    </property>
-  </bean>
+    <bean id="eu.xenit.apix.tests.dictionaryBootstrap"
+            parent="dictionaryModelBootstrap"
+            depends-on="dictionaryBootstrap">
+        <property name="models">
+            <list>
+                <value>alfresco/module/apix-integrationtests-model-amp/model/apixtest-model.xml</value>
+            </list>
+        </property>
+        <property name="labels">
+            <list>
+                <!-- Bootstrap Resource Bundles for the content model types, aspects, properties etc -->
+                <value>alfresco/module/apix-integrationtests-model-amp/messages/apixtest</value>
+            </list>
+        </property>
+    </bean>
 
 </beans>
diff --git a/...iontests-server/src/main/resources/alfresco/module/alfred-api/context/service-context.xml b/...iontests-server/src/main/resources/alfresco/module/alfred-api/context/service-context.xml
@@ -18,10 +18,11 @@
 -->
 <beans>
     <!-- Define the CodeRunnerStandaloneServer bean -->
-    <bean id="CodeRunnerStandaloneServer" class="com.github.ruediste.remoteJUnit.codeRunner.CodeRunnerStandaloneServer"/>
+    <bean id="CodeRunnerStandaloneServer"
+            class="com.github.ruediste.remoteJUnit.codeRunner.CodeRunnerStandaloneServer"/>
 
     <!-- Define your custom server bean that references CodeRunnerStandaloneServer -->
     <bean id="eu.xenit.apix.testserver" class="eu.xenit.apix.server.Server">
-        <property name="codeRunnerStandaloneServer" ref="CodeRunnerStandaloneServer" />
+        <property name="codeRunnerStandaloneServer" ref="CodeRunnerStandaloneServer"/>
     </bean>
 </beans>
diff --git a/...-integrationtests-server/src/main/resources/alfresco/module/alfred-api/module-context.xml b/...-integrationtests-server/src/main/resources/alfresco/module/alfred-api/module-context.xml
@@ -19,5 +19,5 @@
 
 <beans>
     <!-- This is filtered by Maven at build time, so that module name is single sourced. -->
-    <import resource="classpath:alfresco/module/alfred-api/context/service-context.xml" />
+    <import resource="classpath:alfresco/module/alfred-api/context/service-context.xml"/>
 </beans>
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
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-    <bean class="eu.xenit.apix.rest.SpringConfig" />
-    <bean class="eu.xenit.apix.rest.CheckTomcatConfiguration" />
+    <bean class="eu.xenit.apix.rest.SpringConfig"/>
+    <bean class="eu.xenit.apix.rest.CheckTomcatConfiguration"/>
 </beans>
diff --git 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
diff --git 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
diff --git a/apix-rest-v1/src/test/resources/test-context.xml b/apix-rest-v1/src/test/resources/test-context.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:aop="http://www.springframework.org/schema/aop"
+        xmlns:context="http://www.springframework.org/schema/context"
+        xsi:schemaLocation="
 http://www.springframework.org/schema/beans
 http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 http://www.springframework.org/schema/aop
@@ -12,10 +12,10 @@ http://www.springframework.org/schema/context
 http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
     <context:annotation-config/>
-    <context:component-scan base-package="com.github.dynamicextensionsalfresco" />
+    <context:component-scan base-package="com.github.dynamicextensionsalfresco"/>
     <bean class="eu.xenit.apix.rest.TestDEWebscript1"/>
     <!--<bean id="webscripts.builder" class="com.github.dynamicextensionsalfresco.webscripts.AnnotationWebScriptBuilder">-->
-        <!--<constructor-arg ref="webscripts.argumentsResolver"/>-->
+    <!--<constructor-arg ref="webscripts.argumentsResolver"/>-->
     <!--</bean>-->