Skip to content
Snippets Groups Projects
Commit 07850b41 authored by Ludovic Claude's avatar Ludovic Claude
Browse files

Fix spring configuration

parent 6d50c839
No related branches found
No related tags found
1 merge request!2[pull] master from LREN-CHUV:master
......@@ -21,6 +21,10 @@ spring:
username: {{ default .Env.FEATURES_DB_USER "postgres" }}
password: {{ .Env.FEATURES_DB_PASSWORD }}
driver-class-name: org.postgresql.Driver
data:
jpa:
repositories:
bootstrap-mode: default
jpa:
hibernate:
dialect: org.hibernate.dialect.PostgreSQL9Dialect
......
......@@ -27,7 +27,7 @@
<asciidoctor.maven.plugin.version>1.5.5</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>1.5.0-alpha.15</asciidoctorj.pdf.version>
<asciidoctorj.version>1.5.5</asciidoctorj.version>
<spring-data-commons.version>1.13.17.RELEASE</spring-data-commons.version>
<spring-data-commons.version>1.12.11.RELEASE</spring-data-commons.version>
<angularjs.version>1.5.7</angularjs.version>
<jquery.version>3.0.0</jquery.version>
<bootstrap.version>3.3.7</bootstrap.version>
......
......@@ -4,10 +4,19 @@
package eu.hbp.mip;
import eu.hbp.mip.configuration.*;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@SpringBootApplication
@Configuration
@EnableAutoConfiguration(exclude = { ValidationAutoConfiguration.class })
@Import({ AkkaConfiguration.class, BugsnagConfiguration.class,
CacheConfiguration.class, PersistenceConfiguration.class,
SecurityConfiguration.class, WebConfiguration.class})
public class MIPApplication {
public static void main(String[] args) {
......
......@@ -27,7 +27,7 @@ import static eu.hbp.mip.akka.SpringExtension.SPRING_EXTENSION_PROVIDER;
@Configuration
@ComponentScan
class AkkaConfiguration {
public class AkkaConfiguration {
protected final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
......
......@@ -8,7 +8,7 @@ import org.springframework.context.annotation.Import;
@Configuration
@Import(BugsnagSpringConfiguration.class)
public class BugsnagConfig {
public class BugsnagConfiguration {
@Bean
public Bugsnag bugsnag() {
return new Bugsnag("dff301aa15eb795a6d8b22b600586f77");
......
......@@ -11,9 +11,12 @@ import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.*;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.JpaVendorAdapter;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.sql.DataSource;
......@@ -22,7 +25,8 @@ import javax.sql.DataSource;
*/
@Configuration
@EnableJpaRepositories(value = "eu.hbp.mip.repositories")
@EnableJpaRepositories("eu.hbp.mip.repositories")
@EnableTransactionManagement
@EntityScan(basePackages = "eu.hbp.mip.model")
public class PersistenceConfiguration {
......@@ -67,11 +71,20 @@ public class PersistenceConfiguration {
public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
em.setDataSource(portalDataSource());
em.setPackagesToScan("eu.hbp.mip.model");
em.setPersistenceUnitName("portal");
JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
em.setJpaVendorAdapter(vendorAdapter);
return em;
}
@Bean
public PlatformTransactionManager transactionManager() {
JpaTransactionManager txManager = new JpaTransactionManager();
txManager.setEntityManagerFactory(entityManagerFactory().getNativeEntityManagerFactory());
return txManager;
}
@Bean(name = "flyway", initMethod = "migrate")
public Flyway migrations() {
Flyway flyway = new Flyway();
......
......@@ -7,6 +7,7 @@ package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import org.springframework.validation.annotation.Validated;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
......@@ -19,6 +20,7 @@ import java.util.List;
@Table(name = "`article`")
@ApiModel
@JsonInclude(JsonInclude.Include.NON_NULL)
@Validated
public class Article {
@Id
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment