Skip to content

Commit

Permalink
refactor: #2366 Change h2 database usage to in mem (#2776)
Browse files Browse the repository at this point in the history
* fix: Change h2 database usage to in mem (#2366)

* #2366 Add delay option
  • Loading branch information
takikuba authored Jan 27, 2024
1 parent 7a966a5 commit 0f39267
Show file tree
Hide file tree
Showing 14 changed files with 37 additions and 13 deletions.
2 changes: 1 addition & 1 deletion dao/src/main/java/com/iluwatar/dao/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
*/
@Slf4j
public class App {
private static final String DB_URL = "jdbc:h2:~/dao";
private static final String DB_URL = "jdbc:h2:mem:dao;DB_CLOSE_DELAY=-1";
private static final String ALL_CUSTOMERS = "customerDao.getAllCustomers(): ";

/**
Expand Down
2 changes: 1 addition & 1 deletion dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
*/
class DbCustomerDaoTest {

private static final String DB_URL = "jdbc:h2:~/dao";
private static final String DB_URL = "jdbc:h2:mem:dao;DB_CLOSE_DELAY=-1";
private DbCustomerDao dao;
private final Customer existingCustomer = new Customer(1, "Freddy", "Krueger");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
*/
public class App {

public static final String H2_DB_URL = "jdbc:h2:~/test";
public static final String H2_DB_URL = "jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1";

public static final String CREATE_SCHEMA_SQL =
"CREATE TABLE CUSTOMERS (name varchar primary key, money decimal);"
Expand Down
2 changes: 1 addition & 1 deletion layers/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
spring.main.web-application-type=none

#datasource settings
spring.datasource.url=jdbc:h2:~/databases/cake
spring.datasource.url=jdbc:h2:mem:databases-cake
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=sa
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public class AppConfig {
public DataSource dataSource() {
var basicDataSource = new BasicDataSource();
basicDataSource.setDriverClassName("org.h2.Driver");
basicDataSource.setUrl("jdbc:h2:~/databases/person");
basicDataSource.setUrl("jdbc:h2:mem:databases-person");
basicDataSource.setUsername("sa");
basicDataSource.setPassword("sa");
return basicDataSource;
Expand Down
2 changes: 1 addition & 1 deletion repository/src/main/resources/applicationContext.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</bean>
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
<property name="driverClassName" value="org.h2.Driver" />
<property name="url" value="jdbc:h2:~/databases/person" />
<property name="url" value="jdbc:h2:mem:databases-person;DB_CLOSE_DELAY=-1" />
<property name="username" value="sa" />
<property name="password" value="sa" />
</bean>
Expand Down
2 changes: 1 addition & 1 deletion serialized-entity/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ methods to read and deserialize data items to `Country` objects.
```java
@Slf4j
public class App {
private static final String DB_URL = "jdbc:h2:~/test";
private static final String DB_URL = "jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1";

private App() {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
*/
@Slf4j
public class App {
private static final String DB_URL = "jdbc:h2:~/test";
private static final String DB_URL = "jdbc:h2:mem:testdb";

private App() {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
/*
* This project is licensed under the MIT license. Module model-view-viewmodel is using ZK framework licensed under LGPL (see lgpl-3.0.txt).
*
* The MIT License
* Copyright © 2014-2022 Ilkka Seppälä
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.iluwatar.serializedentity;

import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
*/
@Slf4j
public final class App {
private static final String DB_URL = "jdbc:h2:~/test";
private static final String DB_URL = "jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1";

/**
* Private constructor.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import static org.junit.jupiter.api.Assertions.assertThrows;

class UserTableModuleTest {
private static final String DB_URL = "jdbc:h2:~/test";
private static final String DB_URL = "jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1";

private static DataSource createDataSource() {
var dataSource = new JdbcDataSource();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
*/
public class App {

private static final String H2_DB_URL = "jdbc:h2:~/test";
private static final String H2_DB_URL = "jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1";
private static final Logger LOGGER = LoggerFactory.getLogger(App.class);

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
*/
class HotelDaoImplTest {

private static final String DB_URL = "jdbc:h2:~/test";
private static final String DB_URL = "jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1";
private HotelDaoImpl dao;
private Room existingRoom = new Room(1, "Single", 50, false);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
*/
class HotelTest {

private static final String H2_DB_URL = "jdbc:h2:~/test";
private static final String H2_DB_URL = "jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1";

private Hotel hotel;
private HotelDaoImpl dao;
Expand Down

0 comments on commit 0f39267

Please sign in to comment.