Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/main/java/net/coding/ide/config/JpaConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@

package net.coding.ide.config;

import com.zaxxer.hikari.HikariDataSource;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.transaction.annotation.EnableTransactionManagement;

import javax.sql.DataSource;

/**
* Created by vangie on 14/12/4.
*/
Expand All @@ -20,4 +26,22 @@
@EnableTransactionManagement
public class JpaConfig {

/**
* ConfigurationProperties not support spel
* @see <a href="http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-spel-conditions>Spring Boot Reference</a>
*/
@Value("${spring.datasource.url}")
private String url;

@Value("${spring.datasource.driver-class-name}")
private String driverClassName;

@Bean
public DataSource dataSource() {
DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create();
dataSourceBuilder.driverClassName(driverClassName);
dataSourceBuilder.url(url);
dataSourceBuilder.type(HikariDataSource.class);
return dataSourceBuilder.build();
}
}
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ UPLOAD_FILE_SIZE_LIMIT=10
PTY_LIB_FOLDER=src/main/resources/lib

# DATA SOURCE
spring.datasource.url=jdbc:sqlite:ide.db
spring.datasource.url=jdbc:sqlite:${CODING_IDE_HOME}/ide.db
spring.datasource.driver-class-name=org.sqlite.JDBC
spring.datasource.type=com.zaxxer.hikari.HikariDataSource

Expand Down