chore(merge): release-10.2.0 into dev

bonitasoft · Sep 17, 2024 · 7b9a195 · 7b9a195
2 parents bf6f24b + 1aae95b
commit 7b9a195
Show file tree

Hide file tree

Showing 13 changed files with 165 additions and 89 deletions.
diff --git a/...-tests-client/src/main/java/org/bonitasoft/engine/business/data/ClassloaderRefresher.java b/...-tests-client/src/main/java/org/bonitasoft/engine/business/data/ClassloaderRefresher.java
@@ -15,7 +15,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
@@ -42,9 +41,9 @@ public class ClassloaderRefresher {
      */
     public ClassLoader loadClientModelInClassloader(final byte[] clientZipContent, final ClassLoader contextClassLoader,
             final String modelClass,
-            final File fsFolderToPutJars) throws IOException, MalformedURLException {
+            final File fsFolderToPutJars) throws IOException {
         final Map<String, byte[]> ressources = IOUtils.unzip(clientZipContent);
-        final List<URL> urls = new ArrayList<URL>();
+        final List<URL> urls = new ArrayList<>();
         for (final Entry<String, byte[]> e : ressources.entrySet()) {
             final File file = new File(fsFolderToPutJars, e.getKey());
             if (file.getName().endsWith(".jar")) {
@@ -58,7 +57,7 @@ public ClassLoader loadClientModelInClassloader(final byte[] clientZipContent, f
                 }
                 if (file.getName().contains("dao")) {
                     try {
-                        contextClassLoader.loadClass(modelClass + "DAO");
+                        contextClassLoader.loadClass(modelClass + "DAOImpl");
                     } catch (final ClassNotFoundException e1) {
                         FileUtils.writeByteArrayToFile(file, e.getValue());
                         urls.add(file.toURI().toURL());
@@ -76,7 +75,7 @@ public ClassLoader loadClientModelInClassloader(final byte[] clientZipContent, f
         }
         ClassLoader classLoaderWithBDM = contextClassLoader;
         if (!urls.isEmpty()) {
-            classLoaderWithBDM = new URLClassLoader(urls.toArray(new URL[urls.size()]), contextClassLoader);
+            classLoaderWithBDM = new URLClassLoader(urls.toArray(new URL[0]), contextClassLoader);
         }
         return classLoaderWithBDM;
     }

diff --git a/...tegration-tests-client/src/test/java/org/bonitasoft/engine/business/data/BDMUpdateIT.java b/...tegration-tests-client/src/test/java/org/bonitasoft/engine/business/data/BDMUpdateIT.java
@@ -32,17 +32,15 @@
 import org.bonitasoft.engine.tenant.TenantResource;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
 /**
- * Those tests fail because after installing the second BDM version, Hibernate is not aware of
+ * Those tests fail on MySQL and SQLServer because after installing the second BDM version, Hibernate is not aware of
  * previous FK_ that stay in database, so it does not drop them, and then the 'drop table' fails on test cleanup.
  * Those cases should be handled when we support more "BDM update" scenarios, leveraging Hibernate poor level of
  * support on HBM2DDL.
  */
-@Ignore("FIXME: Not working on mysql and sql server")
 public class BDMUpdateIT extends CommonAPIIT {
 
     public static final String DOT = ".";

diff --git a/...cal/src/test/java/org/bonitasoft/engine/application/installer/ApplicationInstallerIT.java b/...cal/src/test/java/org/bonitasoft/engine/application/installer/ApplicationInstallerIT.java
@@ -22,16 +22,7 @@
 import org.bonitasoft.engine.api.impl.application.installer.ApplicationArchive;
 import org.bonitasoft.engine.api.impl.application.installer.ApplicationArchiveReader;
 import org.bonitasoft.engine.api.impl.application.installer.ApplicationInstaller;
-import org.bonitasoft.engine.api.impl.application.installer.detector.ArtifactTypeDetector;
-import org.bonitasoft.engine.api.impl.application.installer.detector.BdmDetector;
-import org.bonitasoft.engine.api.impl.application.installer.detector.CustomPageDetector;
-import org.bonitasoft.engine.api.impl.application.installer.detector.IconDetector;
-import org.bonitasoft.engine.api.impl.application.installer.detector.LayoutDetector;
-import org.bonitasoft.engine.api.impl.application.installer.detector.LivingApplicationDetector;
-import org.bonitasoft.engine.api.impl.application.installer.detector.OrganizationDetector;
-import org.bonitasoft.engine.api.impl.application.installer.detector.PageAndFormDetector;
-import org.bonitasoft.engine.api.impl.application.installer.detector.ProcessDetector;
-import org.bonitasoft.engine.api.impl.application.installer.detector.ThemeDetector;
+import org.bonitasoft.engine.api.impl.application.installer.detector.*;
 import org.bonitasoft.engine.bpm.process.ActivationState;
 import org.bonitasoft.engine.bpm.process.ConfigurationState;
 import org.bonitasoft.engine.bpm.process.ProcessDeploymentInfo;
@@ -55,6 +46,11 @@ public void before() throws Exception {
 
     @After
     public void after() throws Exception {
+        if (!getTenantAdministrationAPI().isPaused()) {
+            getTenantAdministrationAPI().pause();
+            getTenantAdministrationAPI().cleanAndUninstallBusinessDataModel();
+            getTenantAdministrationAPI().resume();
+        }
         logoutOnTenant();
     }
 

diff --git a/...c/test/java/org/bonitasoft/engine/application/installer/ApplicationInstallerUpdateIT.java b/...c/test/java/org/bonitasoft/engine/application/installer/ApplicationInstallerUpdateIT.java
@@ -75,12 +75,16 @@ public void before() throws Exception {
                         new LivingApplicationDetector(), new OrganizationDetector(), new CustomPageDetector(),
                         new ProcessDetector(), new ThemeDetector(), new PageAndFormDetector(), new LayoutDetector(),
                         new IconDetector()));
-
         initFirstInstall();
     }
 
     @After
     public void after() throws Exception {
+        if (!getTenantAdministrationAPI().isPaused()) {
+            getTenantAdministrationAPI().pause();
+            getTenantAdministrationAPI().cleanAndUninstallBusinessDataModel();
+            getTenantAdministrationAPI().resume();
+        }
         logoutOnTenant();
     }
 

diff --git a/.../src/test/java/org/bonitasoft/engine/bpm/event/LocalInterruptingTimerBoundaryEventIT.java b/.../src/test/java/org/bonitasoft/engine/bpm/event/LocalInterruptingTimerBoundaryEventIT.java
@@ -370,8 +370,7 @@ public void timerBoundaryEvent_should_not_trigger_and_be_deleted_at_flownode_abo
         waitForUserTask(processInstance.getId(), "step1");
         waitForUserTaskAssignAndExecuteIt(processInstance, "step2", user, Map.of());
         waitForProcessToFinish(processInstance);
-        List<String> allJobs = schedulerService.getAllJobs();
-        assertThat(allJobs).isEmpty();
+        assertThat(schedulerService.getAllJobs()).isEmpty();
         disableAndDeleteProcess(processDefinition);
     }
 

diff --git a/.../test/java/org/bonitasoft/engine/business/application/importer/ApplicationImporterIT.java b/.../test/java/org/bonitasoft/engine/business/application/importer/ApplicationImporterIT.java
@@ -25,6 +25,8 @@
 import org.bonitasoft.engine.business.application.model.SApplicationState;
 import org.bonitasoft.engine.page.PageService;
 import org.bonitasoft.engine.page.SPage;
+import org.bonitasoft.engine.profile.ProfileService;
+import org.bonitasoft.engine.profile.model.SProfile;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -34,6 +36,7 @@ public class ApplicationImporterIT extends CommonBPMServicesTest {
     private ApplicationImporter applicationImporter;
     private ApplicationService applicationService;
     private PageService pageService;
+    private ProfileService profileService;
 
     private static final String APP_1_TOKEN = "app1";
     private static final String APP_2_TOKEN = "app2";
@@ -45,6 +48,7 @@ public void setUp() {
         applicationImporter = getServiceAccessor().getApplicationImporter();
         applicationService = getServiceAccessor().getApplicationService();
         pageService = getServiceAccessor().getPageService();
+        profileService = getServiceAccessor().getProfileService();
     }
 
     @After
@@ -222,7 +226,7 @@ private void assertAppLink1() throws Exception {
         assertThat(app.getIconPath()).isEqualTo("/app1.jpg");
         assertThat(app.getCreatedBy()).isEqualTo(-1L);
         assertThat(app.getState()).isEqualTo(SApplicationState.ACTIVATED.name());
-        assertThat(app.getProfileId()).isEqualTo(1L);
+        assertThat(getProfile(app.getProfileId()).getName()).isEqualTo("User");
         assertThat(app.getInternalProfile()).isNull();
         assertThat(app.getHomePageId()).isNull();
         assertThat(app.getLayoutId()).isNull();
@@ -231,6 +235,10 @@ private void assertAppLink1() throws Exception {
         assertThat(app.isLink()).isTrue();
     }
 
+    private SProfile getProfile(Long profileId) throws Exception {
+        return getTransactionService().executeInTransaction(() -> profileService.getProfile(profileId));
+    }
+
     private void assertAppLink2() throws Exception {
         SApplication app = getTransactionService()
                 .executeInTransaction(() -> applicationService.getApplicationByToken(APP_2_TOKEN));
@@ -261,7 +269,7 @@ private void assertAppLink3() throws Exception {
         assertThat(app.getCreatedBy()).isEqualTo(-1L);
         assertThat(app.getState()).isEqualTo(SApplicationState.ACTIVATED.name());
         assertThat(app.getHomePageId()).isNotNull();
-        assertThat(app.getProfileId()).isEqualTo(1L);
+        assertThat(getProfile(app.getProfileId()).getName()).isEqualTo("User");
         assertThat(app.getInternalProfile()).isNull();
         assertThat(app.getLayoutId()).isNotNull();
         assertThat(app.getThemeId()).isNotNull();

diff --git a/bonita-test-api/src/main/java/org/bonitasoft/engine/test/junit/BonitaEngineRule.java b/bonita-test-api/src/main/java/org/bonitasoft/engine/test/junit/BonitaEngineRule.java
@@ -13,6 +13,8 @@
  **/
 package org.bonitasoft.engine.test.junit;
 
+import java.lang.reflect.InvocationTargetException;
+
 import org.bonitasoft.engine.test.TestEngine;
 import org.bonitasoft.engine.test.TestEngineImpl;
 import org.junit.rules.MethodRule;
@@ -32,6 +34,16 @@ protected BonitaEngineRule(TestEngine testEngine) {
     }
 
     public static BonitaEngineRule create() {
+        try {
+            var testEngineSpClazz = BonitaEngineRule.class.getClassLoader()
+                    .loadClass("com.bonitasoft.engine.test.TestEngineSP");
+            TestEngine testEngineSpInstance = (TestEngine) testEngineSpClazz.getMethod("getInstance").invoke(null);
+            return new BonitaEngineRule(testEngineSpInstance);
+        } catch (ClassNotFoundException e) {
+            // Use Community TestEngine
+        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
         return new BonitaEngineRule(TestEngineImpl.getInstance());
     }
 

diff --git a/...ore/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/ServerAPIImpl.java b/...ore/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/ServerAPIImpl.java
@@ -135,17 +135,21 @@ public Object invokeMethod(final Map<String, Serializable> options, final String
             }
         } catch (final BonitaRuntimeException | BonitaException bre) {
             fillGlobalContextForException(session, bre);
+            // reset class loader
+            Thread.currentThread().setContextClassLoader(baseClassLoader);
             throw createServerWrappedException(bre);
         } catch (final UndeclaredThrowableException ute) {
+            // reset class loader
+            Thread.currentThread().setContextClassLoader(baseClassLoader);
             throw createServerWrappedException(ute);
         } catch (final Throwable cause) {
             final BonitaRuntimeException throwableToWrap = wrapThrowable(cause);
             fillGlobalContextForException(session, throwableToWrap);
+            // reset class loader
+            Thread.currentThread().setContextClassLoader(baseClassLoader);
             throw createServerWrappedException(throwableToWrap);
         } finally {
             cleanSessionIfNeeded(sessionAccessor);
-            // reset class loader
-            Thread.currentThread().setContextClassLoader(baseClassLoader);
             logger.trace("End Server API call {} {}", apiInterfaceName, methodName);
         }
     }

diff --git a/...Src/src/main/groovy/org/bonitasoft/engine/gradle/docker/DatabaseExtraConfiguration.groovy b/...Src/src/main/groovy/org/bonitasoft/engine/gradle/docker/DatabaseExtraConfiguration.groovy
@@ -0,0 +1,33 @@
+package org.bonitasoft.engine.gradle.docker
+
+import groovy.transform.Canonical
+import org.gradle.api.Project
+
+@Canonical
+class DatabaseExtraConfiguration {
+   /**
+     * Include an additional module in the test classpath
+     */
+    Project includeTestModule
+    /**
+     * Excludes test class patterns
+     */
+    List<String> excludes
+    /**
+     * Enable or disable the execution of the test task for this database configuration
+     */
+    boolean enabled = false
+
+    def excludes(String... excludes) {
+        this.excludes = []
+        this.excludes.addAll(excludes)
+    }
+
+    def exclude(String excludes) {
+        if (this.excludes == null) {
+            this.excludes = []
+        }
+        this.excludes.add(excludes)
+    }
+
+}
diff --git a/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DatabasePluginExtension.groovy b/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DatabasePluginExtension.groovy
@@ -13,12 +13,28 @@
  **/
 package org.bonitasoft.engine.gradle.docker
 
-/**
- * @author Baptiste Mesta
- */
 class DatabasePluginExtension {
 
+    /**
+     * Include test class patterns
+     */
     List<String> includes
+    /**
+     * Extra configuration for the postgres database
+     */
+    DatabaseExtraConfiguration postgres = new DatabaseExtraConfiguration(enabled: true)
+    /**
+     * Extra configuration for the mysql database
+     */
+    DatabaseExtraConfiguration mysql = new DatabaseExtraConfiguration()
+    /**
+     * Extra configuration for the oracle database
+     */
+    DatabaseExtraConfiguration oracle = new DatabaseExtraConfiguration()
+    /**
+     * Extra configuration for the sqlserver database
+     */
+    DatabaseExtraConfiguration sqlserver = new DatabaseExtraConfiguration()
 
     def includes(String... includes) {
         this.includes = []
@@ -32,4 +48,28 @@ class DatabasePluginExtension {
         this.includes.add(include)
     }
 
+    def postgres(Closure closure) {
+        closure.delegate = postgres
+        closure.resolveStrategy = Closure.DELEGATE_FIRST
+        closure()
+    }
+
+    def mysql(Closure closure) {
+        closure.delegate = mysql
+        closure.resolveStrategy = Closure.DELEGATE_FIRST
+        closure()
+    }
+
+    def oracle(Closure closure) {
+        closure.delegate = oracle
+        closure.resolveStrategy = Closure.DELEGATE_FIRST
+        closure()
+    }
+
+    def sqlserver(Closure closure) {
+        closure.delegate = sqlserver
+        closure.resolveStrategy = Closure.DELEGATE_FIRST
+        closure()
+    }
+
 }