Remove HikariCP. Add spring-boot-starter-jdbc. Add username, password and driver-class-name to the application.properties

Maksim Vlasov · Maksim Vlasov · commit 2fa7939ec057 · 2020-05-04T12:47:33.000+03:00
diff --git a/pom.xml b/pom.xml
@@ -33,6 +33,10 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-jdbc</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -52,10 +56,6 @@
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.zaxxer</groupId>
-      <artifactId>HikariCP</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>jquery</artifactId>
diff --git a/src/main/java/com/example/Main.java b/src/main/java/com/example/Main.java
@@ -38,9 +38,6 @@
 @SpringBootApplication
 public class Main {
 
-  @Value("${spring.datasource.url}")
-  private String dbUrl;
-
   @Autowired
   private DataSource dataSource;
 
@@ -73,16 +70,4 @@ String db(Map<String, Object> model) {
       return "error";
     }
   }
-
-  @Bean
-  public DataSource dataSource() throws SQLException {
-    if (dbUrl == null || dbUrl.isEmpty()) {
-      return new HikariDataSource();
-    } else {
-      HikariConfig config = new HikariConfig();
-      config.setJdbcUrl(dbUrl);
-      return new HikariDataSource(config);
-    }
-  }
-
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,6 +1,7 @@
-spring.datasource.url: ${JDBC_DATABASE_URL:}
-spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.maximum-pool-size=10
+spring.datasource.url=${JDBC_DATABASE_URL}
+spring.datasource.username=${DATABASE_USERNAME}
+spring.datasource.password=${DATABASE_PASSWORD}
+spring.datasource.driver-class-name=org.postgresql.Driver
 
 spring.thymeleaf.mode=HTML
 
