ALFREDAPI-548 [Cleanup] Version to 6.0.0

xenit-eu · Jul 23, 2024 · 97e109b · 97e109b
1 parent 717d0df
commit 97e109b
Show file tree

Hide file tree

Showing 47 changed files with 118 additions and 125 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,8 +14,6 @@ Breaking changes:
     * Fix has to be deployed from your tomcat image. You will have to update your META-INF/context.xml in tomcat. See subproject apix-docker. 
   * Dropped all support for older Alfresco version prior to V23.1 just as alfresco-mvc
 
-NOTE This release also drops support for Alfresco 7.x and adds support for 23.1 && 23.2.
-
 * [ALFREDAPI-548](https://xenitsupport.jira.com/browse/ALFREDAPI-548): Support Alfresco V23.1 && V23.2, dropping V7.x
 
 ## 5.0.3 (2024-06-17)

diff --git a/apix-integrationtests-client/alfresco/build.gradle b/apix-integrationtests-client/alfresco/build.gradle
@@ -52,12 +52,7 @@ 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}")) {
-            // Already includes apix-interface, we need to exclude it to avoid Linkage errors from
-            // having 2 of the same classes on the classpath
-            // (1 in Alfresco from apix-impl AMP + 1 in DE from the integration tests fat jar)
-            exclude(group: "eu.xenit.alfred.api", module: "apix-interface")
-        }
+        testImplementation (project(":apix-impl:apix-impl-${subproject_alfresco_version}"))
         // Read in the integration-test-server static ApplicationContext + Helperclasses
         implementation project(path: ":apix-integrationtests-server")
     }

diff --git a/...ategories/CategoryServiceTestJavaApi.java → ...tests/categories/CategoryServiceTest.java b/...ategories/CategoryServiceTestJavaApi.java → ...tests/categories/CategoryServiceTest.java
@@ -17,15 +17,15 @@
 /**
  * Created by Michiel Huygen on 27/11/2015.
  */
-public class CategoryServiceTestJavaApi extends JavaApiBaseTest {
+public class CategoryServiceTest extends JavaApiBaseTest {
 
-    private final static Logger logger = LoggerFactory.getLogger(CategoryServiceTestJavaApi.class);
+    private final static Logger logger = LoggerFactory.getLogger(CategoryServiceTest.class);
     private static final String ADMIN_USER_NAME = "admin";
 
     private QName generalClassifiableQName;
     private ICategoryService categoryService;
 
-    public CategoryServiceTestJavaApi(){
+    public CategoryServiceTest(){
         categoryService = getBean(ICategoryService.class);
     }
 

diff --git a/...s/comments/CommentServiceTestJavaApi.java → ...ix/tests/comments/CommentServiceTest.java b/...s/comments/CommentServiceTestJavaApi.java → ...ix/tests/comments/CommentServiceTest.java
@@ -19,18 +19,16 @@
 import org.alfresco.service.namespace.QName;
 import org.junit.Before;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-public class CommentServiceTestJavaApi extends JavaApiBaseTest {
+public class CommentServiceTest extends JavaApiBaseTest {
     private static final String commentTitle = "testComment";
     private static final String commentContent = "Test Comment";
     private static FileInfo testDocumentNode;
 
     private ICommentService commentService;
     private CommentService alfrescoCommentService;
 
-    public CommentServiceTestJavaApi(){
+    public CommentServiceTest(){
         commentService = getBean(ICommentService.class);
         alfrescoCommentService = getBean("CommentService",CommentService.class);
     }

diff --git a/...ts/content/ContentServiceTestJavaApi.java → ...pix/tests/content/ContentServiceTest.java b/...ts/content/ContentServiceTestJavaApi.java → ...pix/tests/content/ContentServiceTest.java
@@ -29,8 +29,8 @@
 import org.slf4j.LoggerFactory;
 
 
-public class ContentServiceTestJavaApi extends JavaApiBaseTest {
-    private final static Logger logger = LoggerFactory.getLogger(ContentServiceTestJavaApi.class);
+public class ContentServiceTest extends JavaApiBaseTest {
+    private final static Logger logger = LoggerFactory.getLogger(ContentServiceTest.class);
 
     INodeService nodeService;
     IContentService contentService;
@@ -39,7 +39,7 @@ public class ContentServiceTestJavaApi extends JavaApiBaseTest {
     private NodeRef testNode;
     private FileInfo mainTestFolder;
 
-    public ContentServiceTestJavaApi(){
+    public ContentServiceTest(){
         // initialise the local beans
         contentService = getBean(IContentService.class);
         nodeService= getBean(INodeService.class);

diff --git a/...tionary/DictionaryServiceTestJavaApi.java → ...sts/dictionary/DictionaryServiceTest.java b/...tionary/DictionaryServiceTestJavaApi.java → ...sts/dictionary/DictionaryServiceTest.java
@@ -13,11 +13,11 @@
 /**
  * Created by Michiel Huygen on 24/11/2015.
  */
-public class DictionaryServiceTestJavaApi extends JavaApiBaseTest {
+public class DictionaryServiceTest extends JavaApiBaseTest {
 
     private IDictionaryService service;
 
-    public DictionaryServiceTestJavaApi(){
+    public DictionaryServiceTest(){
         service = getBean(IDictionaryService.class);
     }
     @Before

diff --git a/...efolder/FileFolderServiceTestJavaApi.java → ...sts/filefolder/FileFolderServiceTest.java b/...efolder/FileFolderServiceTestJavaApi.java → ...sts/filefolder/FileFolderServiceTest.java
@@ -27,7 +27,7 @@
 /**
  * Created by kenneth on 11.03.16.
  */
-public class FileFolderServiceTestJavaApi extends JavaApiBaseTest {
+public class FileFolderServiceTest extends JavaApiBaseTest {
 
     private final static Logger logger = LoggerFactory.getLogger(JavaApiBaseTest.class);
 
@@ -46,7 +46,7 @@ public class FileFolderServiceTestJavaApi extends JavaApiBaseTest {
     private SolrTestHelperImpl solrHelper;
 
 
-    public FileFolderServiceTestJavaApi(){
+    public FileFolderServiceTest(){
         // initialise the local beans
         service = getBean(IFileFolderService.class);
         fileFolderService = serviceRegistry.getFileFolderService();

diff --git a/...AlfrescoPropertyConvertorTestJavaApi.java → ...tadata/AlfrescoPropertyConvertorTest.java b/...AlfrescoPropertyConvertorTestJavaApi.java → ...tadata/AlfrescoPropertyConvertorTest.java
@@ -10,7 +10,7 @@
 import org.junit.Test;
 
 
-public class AlfrescoPropertyConvertorTestJavaApi extends JavaApiBaseTest {
+public class AlfrescoPropertyConvertorTest extends JavaApiBaseTest {
 
     @Test
     public void testPropertyConvertOnRegisteredConstraint() throws Exception {

diff --git a/...ests/metadata/NodeServiceTestJavaApi.java → .../apix/tests/metadata/NodeServiceTest.java b/...ests/metadata/NodeServiceTestJavaApi.java → .../apix/tests/metadata/NodeServiceTest.java
@@ -53,9 +53,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NodeServiceTestJavaApi extends JavaApiBaseTest {
+public class NodeServiceTest extends JavaApiBaseTest {
 
-    private final static Logger logger = LoggerFactory.getLogger(NodeServiceTestJavaApi.class);
+    private final static Logger logger = LoggerFactory.getLogger(NodeServiceTest.class);
     private static final String TEXT_MIMETYPE = "text/plain";
     StoreRef alfStoreRef = new StoreRef("workspace", "SpacesStore");
     eu.xenit.apix.data.StoreRef apixStoreRef = new eu.xenit.apix.data.StoreRef("workspace", "SpacesStore");
@@ -69,7 +69,7 @@ public class NodeServiceTestJavaApi extends JavaApiBaseTest {
     private Set<NodeRef> roots;
     private ICategoryService categoryService;
 
-    public NodeServiceTestJavaApi(){
+    public NodeServiceTest(){
         // initialise the local beans
         service = getBean(INodeService.class);
         alfrescoNodeService = serviceRegistry.getNodeService();
@@ -533,7 +533,7 @@ public void testCreateNodeCustomTypeWithRequiredProperties() {
      */
     @Test/*(expected = org.apache.http.client.HttpResponseException.class)*/
     public void testCreateNodeCustomTypeWithoutRequiredProperties() {
-        final NodeServiceTestJavaApi self = this;
+        final NodeServiceTest self = this;
 
         try {
             // custom type containing the mandatory property but this property is missing.
@@ -613,7 +613,7 @@ public void testCreateReadContent() throws Exception {
     public void testCreateNodeWithMetadata() throws UnsupportedEncodingException {
         this.cleanUp();
         NodeRef companyHomeRef = repository.getCompanyHome();
-        final NodeServiceTestJavaApi self = this;
+        final NodeServiceTest self = this;
 
         try {
             FileInfo mainTestFolder = this.createMainTestFolder(companyHomeRef);

diff --git a/...ests/people/PeopleServiceTestJavaApi.java → .../apix/tests/people/PeopleServiceTest.java b/...ests/people/PeopleServiceTestJavaApi.java → .../apix/tests/people/PeopleServiceTest.java
@@ -23,14 +23,14 @@
 /**
  * Created by Jasperhilven on 24-Oct-16.
  */
-public class PeopleServiceTestJavaApi extends JavaApiBaseTest {
+public class PeopleServiceTest extends JavaApiBaseTest {
 
-    private final static Logger logger = LoggerFactory.getLogger(PeopleServiceTestJavaApi.class);
+    private final static Logger logger = LoggerFactory.getLogger(PeopleServiceTest.class);
 
     private IPeopleService peopleService;
     private PersonService alfrescoPersonService;
 
-    public PeopleServiceTestJavaApi(){
+    public PeopleServiceTest(){
         // initialise the local beans
         peopleService = getBean(IPeopleService.class);
         alfrescoPersonService = serviceRegistry.getPersonService();
@@ -49,7 +49,7 @@ public void TestGetPerson() {
         final String email = "Email";
         final String firstName = "FirstName";
         final String lastName = "LastName";
-        final PeopleServiceTestJavaApi self = this;
+        final PeopleServiceTest self = this;
         props.put(ContentModel.PROP_EMAIL, email);
         props.put(ContentModel.PROP_FIRSTNAME, firstName);
         props.put(ContentModel.PROP_LASTNAME, lastName);
@@ -115,7 +115,7 @@ public void TestGetPeople() {
         final String emailB = "EmailB";
         final String firstNameB = "FirstNameB";
         final String lastNameB = "LastNameB";
-        final PeopleServiceTestJavaApi self = this;
+        final PeopleServiceTest self = this;
 
         propsA.put(ContentModel.PROP_EMAIL, emailA);
         propsA.put(ContentModel.PROP_FIRSTNAME, firstNameA);

diff --git a/...issions/PermissionServiceTestJavaApi.java → ...ts/permissions/PermissionServiceTest.java b/...issions/PermissionServiceTestJavaApi.java → ...ts/permissions/PermissionServiceTest.java
@@ -32,9 +32,9 @@
 /**
  * Created by kenneth on 10.03.16.
  */
-public class PermissionServiceTestJavaApi extends JavaApiBaseTest {
+public class PermissionServiceTest extends JavaApiBaseTest {
 
-  private final static Logger logger = LoggerFactory.getLogger(PermissionServiceTestJavaApi.class);
+  private final static Logger logger = LoggerFactory.getLogger(PermissionServiceTest.class);
   private static final String ADMIN_USER_NAME = "admin";
 
   private IPermissionService service;
@@ -46,7 +46,7 @@ public class PermissionServiceTestJavaApi extends JavaApiBaseTest {
   private FileFolderService fileFolderService;
   private SolrTestHelperImpl solrHelper;
 
-  public PermissionServiceTestJavaApi(){
+  public PermissionServiceTest(){
     // initialise the local beans
     service = getBean(IPermissionService.class);
     permissionService = serviceRegistry.getPermissionService();

diff --git a/...roperties/PropertyServiceTestJavaApi.java → ...tests/properties/PropertyServiceTest.java b/...roperties/PropertyServiceTestJavaApi.java → ...tests/properties/PropertyServiceTest.java
@@ -13,13 +13,13 @@
 /**
  * Created by Jasperhilven on 24-Jan-17.
  */
-public class PropertyServiceTestJavaApi extends JavaApiBaseTest {
+public class PropertyServiceTest extends JavaApiBaseTest {
 
-    private final static Logger logger = LoggerFactory.getLogger(PropertyServiceTestJavaApi.class);
+    private final static Logger logger = LoggerFactory.getLogger(PropertyServiceTest.class);
 
     private IPropertyService propertyService;
 
-    public PropertyServiceTestJavaApi(){
+    public PropertyServiceTest(){
         // initialise the local beans
         propertyService = getBean(IPropertyService.class);
     }

diff --git a/...earch/SearchServiceFacetsTestJavaApi.java → ...tests/search/SearchServiceFacetsTest.java b/...earch/SearchServiceFacetsTestJavaApi.java → ...tests/search/SearchServiceFacetsTest.java
@@ -26,10 +26,10 @@
  *
  * This class contains tests with facets that were only supported from Alfresco 5+.
  */
-public class SearchServiceFacetsTestJavaApi extends SearchServiceTestJavaApi {
+public class SearchServiceFacetsTest extends SearchServiceTest {
 
     private static final String ADMIN_USER_NAME = "admin";
-    private static final Logger logger = LoggerFactory.getLogger(SearchServiceFacetsTestJavaApi.class);
+    private static final Logger logger = LoggerFactory.getLogger(SearchServiceFacetsTest.class);
 
 
     @Before

diff --git a/...ests/search/SearchServiceTestJavaApi.java → .../apix/tests/search/SearchServiceTest.java b/...ests/search/SearchServiceTestJavaApi.java → .../apix/tests/search/SearchServiceTest.java
@@ -34,13 +34,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class SearchServiceTestJavaApi extends JavaApiBaseTest {
+public abstract class SearchServiceTest extends JavaApiBaseTest {
 
     private static final String LONG_MAX_VALUE = String.valueOf(Long.MAX_VALUE);
     private static final String LONG_MAX_VALUE_PLUS_ONE = new BigInteger(LONG_MAX_VALUE).add(new BigInteger("1"))
             .toString();
 
-    private static final Logger logger = LoggerFactory.getLogger(SearchServiceTestJavaApi.class);
+    private static final Logger logger = LoggerFactory.getLogger(SearchServiceTest.class);
     private static final String ADMIN_USER_NAME = "admin";
     public static final String DESCRIPTION_SET_OF_1001 = "descriptionSetOf1001";
     protected ISearchService searchService;
@@ -49,7 +49,7 @@ public abstract class SearchServiceTestJavaApi extends JavaApiBaseTest {
     protected SolrTestHelperImpl solrHelper;
     protected SolrFacetService facetService;
 
-    public SearchServiceTestJavaApi(){
+    public SearchServiceTest(){
         searchService = getBean(ISearchService.class);
         nodeService = serviceRegistry.getNodeService();
         namespacePrefixResolver = getBean("namespaceService",NamespacePrefixResolver.class);

diff --git a/...earch/TermHitHighlightingTestJavaApi.java → ...tests/search/TermHitHighlightingTest.java b/...earch/TermHitHighlightingTestJavaApi.java → ...tests/search/TermHitHighlightingTest.java
@@ -26,7 +26,7 @@
 import org.junit.Test;
 
 @Ignore("Disabled for GHA build")
-public class TermHitHighlightingTestJavaApi extends JavaApiBaseTest {
+public class TermHitHighlightingTest extends JavaApiBaseTest {
     INodeService nodeService;
     SearchService searchService;
     RetryingTransactionHelper retryingTransactionHelper;
@@ -36,7 +36,7 @@ public class TermHitHighlightingTestJavaApi extends JavaApiBaseTest {
             + "\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 TermHitHighlightingTestJavaApi(){
+    public TermHitHighlightingTest(){
         // initialise the local beans
         nodeService = getBean(INodeService.class);
         retryingTransactionHelper = getBean(RetryingTransactionHelper.class);
@@ -83,7 +83,7 @@ public void searchResponseContainsHighlights() throws InterruptedException {
         // The best we can do is check if there are nodes detected that still need to be indexed.
         // therefore we wait a period for solr to detect the nodes,
         // then use the check to wait until the indexing process is finished.
-        SearchServiceTestJavaApi.waitAWhile(20);
+        SearchServiceTest.waitAWhile(20);
         solrHelper.waitForContentSync(initialCleanDocs);
 
         /* The options set are equivalent to the following JSON:

diff --git a/...action/TransactionServiceTestJavaApi.java → ...s/transaction/TransactionServiceTest.java b/...action/TransactionServiceTestJavaApi.java → ...s/transaction/TransactionServiceTest.java
@@ -12,12 +12,12 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class TransactionServiceTestJavaApi extends JavaApiBaseTest {
+public class TransactionServiceTest extends JavaApiBaseTest {
 
     ITransactionService service;
     IFileFolderService ffservice;
     FileInfo mainTestFolder;
-    public TransactionServiceTestJavaApi(){
+    public TransactionServiceTest(){
         service = getBean(ITransactionService.class);
         ffservice = getBean(IFileFolderService.class);
     }
@@ -33,7 +33,7 @@ public void SetupTransactionServiceTest() {
 
     @Test
     public void TestTransactionService_NotransactionBaseScenario() {
-        final TransactionServiceTestJavaApi me = this;
+        final TransactionServiceTest me = this;
         FileInfo testNode = me.createTestNode(mainTestFolder.getNodeRef(), "testnode");
         assertTrue(testNode.getName().equals("testnode"));
         eu.xenit.apix.data.NodeRef cNR = ffservice.getChildNodeRef(c.apix(mainTestFolder.getNodeRef()), "testnode");
@@ -42,7 +42,7 @@ public void TestTransactionService_NotransactionBaseScenario() {
 
     @Test
     public void TestTransactionServiceSuccessTransaction() {
-        final TransactionServiceTestJavaApi me = this;
+        final TransactionServiceTest me = this;
         final FileInfo shouldExist = service.doInTransaction(new Callable<FileInfo>() {
             @Override
             public FileInfo call() throws Exception {

diff --git a/...lation/TranslationServiceTestJavaApi.java → ...s/translation/TranslationServiceTest.java b/...lation/TranslationServiceTestJavaApi.java → ...s/translation/TranslationServiceTest.java
@@ -19,14 +19,14 @@
 /**
  * Created by Stan on 25-Mar-16.
  */
-public class TranslationServiceTestJavaApi extends JavaApiBaseTest {
+public class TranslationServiceTest extends JavaApiBaseTest {
 
-    private final static Logger logger = LoggerFactory.getLogger(TranslationServiceTestJavaApi.class);
+    private final static Logger logger = LoggerFactory.getLogger(TranslationServiceTest.class);
 
     private static String facet_bucket_month_label = "faceted-search.date.one-month.label";
     private ITranslationService service;
 
-    public TranslationServiceTestJavaApi(){
+    public TranslationServiceTest(){
         service = getBean(ITranslationService.class);
     }