Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
portal-backend
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
HBP Medical Informatics Platform
portal-backend
Commits
ff5dc1bf
Commit
ff5dc1bf
authored
9 years ago
by
Mirco Nasuti
Browse files
Options
Downloads
Patches
Plain Diff
clean more again datasource configuration import
parent
ad12037c
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
+5
-13
5 additions, 13 deletions
...a/org/hbp/mip/configuration/PersistenceConfiguration.java
with
5 additions
and
13 deletions
src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
+
5
−
13
View file @
ff5dc1bf
package
org.hbp.mip.configuration
;
package
org.hbp.mip.configuration
;
import
org.hbp.mip.utils.CSVUtil
;
import
org.hbp.mip.utils.CSVUtil
;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
import
org.springframework.boot.orm.jpa.EntityScan
;
import
org.springframework.boot.orm.jpa.EntityScan
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Primary
;
import
org.springframework.data.jpa.repository.config.EnableJpaRepositories
;
import
org.springframework.data.jpa.repository.config.EnableJpaRepositories
;
import
org.springframework.orm.jpa.JpaVendorAdapter
;
import
org.springframework.orm.jpa.JpaVendorAdapter
;
import
org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean
;
import
org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean
;
...
@@ -24,6 +22,9 @@ import java.util.Properties;
...
@@ -24,6 +22,9 @@ import java.util.Properties;
@EntityScan
(
basePackages
=
"org.hbp.mip.model"
)
@EntityScan
(
basePackages
=
"org.hbp.mip.model"
)
public
class
PersistenceConfiguration
{
public
class
PersistenceConfiguration
{
@Autowired
DataSource
dataSource
;
@Bean
@Bean
public
CSVUtil
csvUtil
()
{
public
CSVUtil
csvUtil
()
{
return
new
CSVUtil
();
return
new
CSVUtil
();
...
@@ -32,7 +33,7 @@ public class PersistenceConfiguration {
...
@@ -32,7 +33,7 @@ public class PersistenceConfiguration {
@Bean
@Bean
public
LocalContainerEntityManagerFactoryBean
entityManagerFactory
()
{
public
LocalContainerEntityManagerFactoryBean
entityManagerFactory
()
{
LocalContainerEntityManagerFactoryBean
em
=
new
LocalContainerEntityManagerFactoryBean
();
LocalContainerEntityManagerFactoryBean
em
=
new
LocalContainerEntityManagerFactoryBean
();
em
.
setDataSource
(
dataSource
()
);
em
.
setDataSource
(
dataSource
);
JpaVendorAdapter
vendorAdapter
=
new
HibernateJpaVendorAdapter
();
JpaVendorAdapter
vendorAdapter
=
new
HibernateJpaVendorAdapter
();
em
.
setJpaVendorAdapter
(
vendorAdapter
);
em
.
setJpaVendorAdapter
(
vendorAdapter
);
em
.
setJpaProperties
(
additionalProperties
());
em
.
setJpaProperties
(
additionalProperties
());
...
@@ -44,13 +45,4 @@ public class PersistenceConfiguration {
...
@@ -44,13 +45,4 @@ public class PersistenceConfiguration {
properties
.
setProperty
(
"hibernate.show_sql"
,
"true"
);
properties
.
setProperty
(
"hibernate.show_sql"
,
"true"
);
return
properties
;
return
properties
;
}
}
@ConfigurationProperties
(
"spring.datasource"
)
@Bean
@Primary
public
DataSource
dataSource
()
{
return
DataSourceBuilder
.
create
()
.
build
();
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment