split datasources between xpanse and activiti

Author: WangLiNaruto

modules/api/src/main/java/org/eclipse/xpanse/api/config/DatasourceConfig.java

@@ -0,0 +1,51 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: Huawei Inc.
+ *
+ */
+
+package org.eclipse.xpanse.api.config;
+
+import jakarta.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.transaction.PlatformTransactionManager;
+
+/** Datasource Config. */
+@Configuration
+public class DatasourceConfig {
+
+    @Primary
+    @Bean(name = "dataSource")
+    @ConfigurationProperties(prefix = "spring.datasource")
+    public DataSource dataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    /** EntityManagerFactory Bean. */
+    @Primary
+    @Bean(name = "entityManagerFactory")
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory(
+            EntityManagerFactoryBuilder builder) {
+        return builder.dataSource(dataSource())
+                .packages("org.eclipse.xpanse")
+                .persistenceUnit("xpansePU")
+                .build();
+    }
+
+    @Primary
+    @Bean(name = "transactionManager")
+    public PlatformTransactionManager transactionManager(
+            @Qualifier("entityManagerFactory") EntityManagerFactory entityManagerFactory) {
+        return new JpaTransactionManager(entityManagerFactory);
+    }
+
+}

modules/workflow/src/main/java/org/eclipse/xpanse/modules/workflow/config/ActivitiConfig.java

@@ -25,23 +25,21 @@
 import org.activiti.spring.SpringProcessEngineConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionManager;
 
 /** Activiti configuration class. */
 @Configuration
 public class ActivitiConfig {
 
-    private final DataSource dataSource;
-
-    private final TransactionManager transactionManager;
-
     private final ApplicationContext applicationContext;
 
     @Value("${spring.activiti.history-level}")
@@ -50,23 +48,30 @@ public class ActivitiConfig {
     /** constructor for ActivitiConfig bean. */
     @Autowired
     public ActivitiConfig(
-            DataSource dataSource,
-            TransactionManager transactionManager,
             ApplicationContext applicationContext) {
-        this.dataSource = dataSource;
-        this.transactionManager = transactionManager;
         this.applicationContext = applicationContext;
     }
 
+
+    @Bean(name = "activitiDataSource")
+    @ConfigurationProperties(prefix = "spring.activiti.datasource")
+    public DataSource activitiDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "activitiTransactionManager")
+    public PlatformTransactionManager activitiTransactionManager() {
+        return new DataSourceTransactionManager(activitiDataSource());
+    }
+
     /** Create ProcessEngineConfiguration object into SpringIoc. */
     @Bean
     public ProcessEngineConfiguration processEngineConfiguration() throws IOException {
         SpringProcessEngineConfiguration springProcessEngineConfiguration =
                 new SpringProcessEngineConfiguration();
         springProcessEngineConfiguration.setIdGenerator(strongUuidGenerator());
-        springProcessEngineConfiguration.setDataSource(dataSource);
-        springProcessEngineConfiguration.setTransactionManager(
-                (PlatformTransactionManager) transactionManager);
+        springProcessEngineConfiguration.setDataSource(activitiDataSource());
+        springProcessEngineConfiguration.setTransactionManager(activitiTransactionManager());
         springProcessEngineConfiguration.setDatabaseSchemaUpdate("true");
         springProcessEngineConfiguration.setDeploymentMode("single-resource");
         Resource[] resources =

runtime/src/main/java/org/eclipse/xpanse/runtime/XpanseApplication.java

@@ -23,7 +23,10 @@
 @EnableCaching
 @EnableRetry
 @EnableAsync(proxyTargetClass = true)
-@EnableJpaRepositories(basePackages = "org.eclipse.xpanse")
+@EnableJpaRepositories(
+        basePackages = "org.eclipse.xpanse",
+        entityManagerFactoryRef = "entityManagerFactory",
+        transactionManagerRef = "transactionManager")
 @EntityScan(basePackages = "org.eclipse.xpanse")
 @ComponentScan(basePackages = "org.eclipse.xpanse")
 @EnableJpaAuditing(dateTimeProviderRef = "auditDateTimeProviderConfig")

runtime/src/main/resources/application-mysql.properties

@@ -6,4 +6,6 @@
 spring.datasource.name=mysql
 spring.datasource.url=jdbc:mysql://localhost:3306/xpanse
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+spring.activiti.datasource.jdbcUrl=jdbc:mysql://localhost:3306/activiti
+spring.activiti.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect

runtime/src/main/resources/application.properties

@@ -10,10 +10,14 @@ spring.lifecycle.timeout-per-shutdown-phase=300s
 spring.profiles.active=oauth,zitadel,zitadel-local,terra-boot,tofu-maker
 spring.banner.location=classpath:banner.txt
 spring.datasource.name=h2
-spring.datasource.url=jdbc:h2:file:./xpanse;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.jdbcUrl=jdbc:h2:file:./xpanse;DB_CLOSE_ON_EXIT=FALSE;
 spring.datasource.driverClassName=org.h2.Driver
 spring.datasource.username=xpanse
 spring.datasource.password=Xpanse@2023
+spring.activiti.datasource.jdbcUrl=jdbc:h2:file:./activiti;DB_CLOSE_ON_EXIT=FALSE;
+spring.activiti.datasource.driverClassName=org.h2.Driver
+spring.activiti.datasource.username=activiti
+spring.activiti.datasource.password=Activiti@2023
 spring.jpa.show-sql=false
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect
 spring.jpa.hibernate.ddl-auto=none

runtime/src/test/java/org/eclipse/xpanse/runtime/database/mysql/AbstractMysqlIntegrationTest.java

@@ -33,8 +33,15 @@ public abstract class AbstractMysqlIntegrationTest extends ZitadelTestContainer
 
     @DynamicPropertySource
     static void props(DynamicPropertyRegistry registry) {
-        registry.add("spring.datasource.url", mysqlContainer::getJdbcUrl);
+        registry.add("spring.datasource.jdbcUrl", mysqlContainer::getJdbcUrl);
         registry.add("spring.datasource.username", mysqlContainer::getUsername);
         registry.add("spring.datasource.password", mysqlContainer::getPassword);
     }
+
+    @DynamicPropertySource
+    static void activitiProps(DynamicPropertyRegistry registry) {
+        registry.add("spring.activiti.datasource.jdbcUrl", mysqlContainer::getJdbcUrl);
+        registry.add("spring.activiti.datasource.username", mysqlContainer::getUsername);
+        registry.add("spring.activiti.datasource.password", mysqlContainer::getPassword);
+    }
 }