diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java index 48b6a7be1ff21723cc31a19c268d12e00f9de43f..8d78ff4a5c4621b9e8cc1eb6cea1fd1c847d06b4 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java @@ -2,6 +2,7 @@ package org.apache.bigtop.manager.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -9,6 +10,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableScheduling @EnableAsync @EnableJpaAuditing +@EntityScan("org.apache.bigtop.manager.dao") @SpringBootApplication(scanBasePackages = {"org.apache.bigtop.manager.server", "org.apache.bigtop.manager.common"}) public class ServerApplication { diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/config/DataSourceConfig.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/config/DataSourceConfig.java deleted file mode 100644 index 883531183eea650bffae313e4f1892770e96b541..0000000000000000000000000000000000000000 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/config/DataSourceConfig.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.apache.bigtop.manager.server.config; - -import jakarta.annotation.Resource; -import jakarta.persistence.EntityManagerFactory; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; -import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -import javax.sql.DataSource; - -@Configuration -@EnableTransactionManagement -@EnableJpaRepositories("org.apache.bigtop.manager.dao") -public class DataSourceConfig { - - @Resource - private JpaProperties properties; - - @Bean - public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder, @Qualifier("dataSource") DataSource dataSource) { - return builder.dataSource(dataSource) - .packages("org.apache.bigtop.manager.dao") - .persistenceUnit("bigtop-manager") - .properties(properties.getProperties()) - .build(); - } - - @Bean - public PlatformTransactionManager transactionManager(@Qualifier("entityManagerFactory") EntityManagerFactory entityManagerFactory) { - return new JpaTransactionManager(entityManagerFactory); - } -}