zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add db creation.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2023-12-04 20:00:06 -08:00
parent fa06852806
commit e1b517f657
11 changed files with 74 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wise-webapp/src/main/java/com/wisemapping/config/Application.java
View File

@@ -14,15 +14,15 @@ import org.springframework.security.web.firewall.StrictHttpFirewall;
@SpringBootApplication
@ImportResource(value = {"classpath:spring/wisemapping-service.xml"})
@ComponentScan({"com.wisemapping.security", "com.wisemapping.service", "com.wisemapping.dao", "com.wisemapping.util"})
@ComponentScan({"com.wisemapping.security", "com.wisemapping.service", "com.wisemapping.dao", "com.wisemapping.util", "com.wisemapping.model"})
public class Application {
public static void main(String[] args) {
new SpringApplicationBuilder()
.parent(Application.class, HibernateConfig.class, MethodSecurityConfig.class).web(WebApplicationType.NONE)
.child(MvcAppConfig.class, MvcSecurityConfig.class, ServletConfig.class).web(WebApplicationType.SERVLET)
.sibling(RestAppConfig.class).web(WebApplicationType.SERVLET)
.parent(Application.class, MethodSecurityConfig.class).web(WebApplicationType.NONE)
.child(MvcAppConfig.class, MvcSecurityConfig.class, HibernateConfig.class, ServletConfig.class).web(WebApplicationType.SERVLET)
// .sibling(RestAppConfig.class).web(WebApplicationType.SERVLET)
.run(args);
}

30
wise-webapp/src/main/java/com/wisemapping/config/HibernateConfig.java
View File

@@ -8,37 +8,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableTransactionManagement
@EnableJpaRepositories("com.wisemapping.model")
public class HibernateConfig {
// @Value("${database.hibernate.dialect}")
// private String dbDialect;
//
// @Value("${database.driver}")
// private String dbDriver;
//
// @Value("${database.url}")
// private String dbUrl;
//
// @Value("${database.username}")
// private String dbUsername;
// @Value("${database.password}")
// private String dbPassword;
//
// @Value("${database.validation.enabled:true}")
// private boolean dbSetOnBorrow;
//
// @Value("${database.validation.query:SELECT 1}")
// private String dbValQuery;
// @Bean
// public LocalSessionFactoryBean sessionFactory() {
// final LocalSessionFactoryBean result = new LocalSessionFactoryBean();
// result.setPackagesToScan("com.wisemapping.model");
// result.setDataSource(dataSource());
// result.setHibernateProperties(hibernateProperties());
//
// return result;
// }
//
//
// @Bean
// public HibernateTransactionManager hibernateTransactionManager() {
// final HibernateTransactionManager result = new HibernateTransactionManager();

3
wise-webapp/src/main/java/com/wisemapping/dao/LabelManagerImpl.java
View File

@@ -25,6 +25,7 @@ import org.hibernate.SessionFactory;
import org.hibernate.query.SelectionQuery;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -32,7 +33,7 @@ import java.util.List;
@Repository("labelManager")
public class LabelManagerImpl
implements LabelManager {
@Resource
@Autowired
private SessionFactory sessionFactory;
@Override

7
wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
View File

@@ -22,6 +22,7 @@ import com.wisemapping.model.*;
import com.wisemapping.security.DefaultPasswordEncoderFactories;
import com.wisemapping.security.LegacyPasswordEncoder;
import jakarta.annotation.Resource;
import jakarta.persistence.EntityManagerFactory;
import org.hibernate.ObjectNotFoundException;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -39,8 +40,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
@Repository
public class UserManagerImpl
implements UserManager {
// @Autowired
private SessionFactory sessionFactory;
@Autowired
private EntityManagerFactory entityManagerFactory;
@Autowired
private PasswordEncoder passwordEncoder;
@@ -54,7 +55,7 @@ public class UserManagerImpl
}
private Session getSession() {
return sessionFactory.getCurrentSession();
return entityManagerFactory.unwrap(SessionFactory.class).getCurrentSession();
}