diff --git a/project-board/Procfile b/project-board/Procfile new file mode 100644 index 0000000..eb53fdb --- /dev/null +++ b/project-board/Procfile @@ -0,0 +1 @@ +web: java $JAVA_OPTS -Dserver.port=$PORT -Dspring.profiles.active=cloudtype -jar build/libs/project-board-v1.1.jar diff --git a/project-board/build.gradle b/project-board/build.gradle index 88d5a46..abc8761 100644 --- a/project-board/build.gradle +++ b/project-board/build.gradle @@ -13,7 +13,7 @@ plugins { } group = 'com.study' -version = '0.0.1-SNAPSHOT' +version = 'v1.1' sourceCompatibility = '11' configurations { @@ -44,6 +44,7 @@ dependencies { runtimeOnly 'com.h2database:h2' runtimeOnly 'com.mysql:mysql-connector-j' + runtimeOnly 'org.mariadb.jdbc:mariadb-java-client' compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' annotationProcessor 'org.projectlombok:lombok' diff --git a/project-board/src/main/resources/application.yaml b/project-board/src/main/resources/application.yaml index 9852bb5..7b3248b 100644 --- a/project-board/src/main/resources/application.yaml +++ b/project-board/src/main/resources/application.yaml @@ -42,4 +42,19 @@ spring: # url: jdbc:h2:mem:board;mode=mysql # driverClassName: org.h2.Driver # sql.init.mode: always -# test.database.replace: none \ No newline at end of file +# test.database.replace: none + +spring: + config.activate.on-profile: cloudType + datasource: + driver-class-name: org.mariadb.jdbc.Driver + url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/board?characterEncoding=UTF-8&serverTimezone=UTC + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + jpa: + hibernate.ddl-auto: create + properties: + hibernate.dialect: org.hibernate.dialect.MariaDBDialect + sql.init.mode: always + + diff --git a/project-board/src/test/java/com/study/projectboard/util/FormDataEncoderTest.java b/project-board/src/test/java/com/study/projectboard/util/FormDataEncoderTest.java index 7cc734b..898ae7e 100644 --- a/project-board/src/test/java/com/study/projectboard/util/FormDataEncoderTest.java +++ b/project-board/src/test/java/com/study/projectboard/util/FormDataEncoderTest.java @@ -1,8 +1,6 @@ package com.study.projectboard.util; import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.AllArgsConstructor; -import lombok.Data; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -60,8 +58,7 @@ void givenObject_whenEncoding_thenReturnsFormEncodedString() { ); } - @Data - @AllArgsConstructor + static class TestObject { String str; String listStr1; @@ -72,6 +69,54 @@ static class TestObject { Boolean bool; BigDecimal bigDecimal; TestEnum testEnum; + + public TestObject(String str, String listStr1, String listStr2, String nullStr, Integer number, Double floatingNumber, Boolean bool, BigDecimal bigDecimal, TestEnum testEnum) { + this.str = str; + this.listStr1 = listStr1; + this.listStr2 = listStr2; + this.nullStr = nullStr; + this.number = number; + this.floatingNumber = floatingNumber; + this.bool = bool; + this.bigDecimal = bigDecimal; + this.testEnum = testEnum; + } + + public String getStr() { + return str; + } + + public String getListStr1() { + return listStr1; + } + + public String getListStr2() { + return listStr2; + } + + public String getNullStr() { + return nullStr; + } + + public Integer getNumber() { + return number; + } + + public Double getFloatingNumber() { + return floatingNumber; + } + + public Boolean getBool() { + return bool; + } + + public BigDecimal getBigDecimal() { + return bigDecimal; + } + + public TestEnum getTestEnum() { + return testEnum; + } } enum TestEnum { diff --git a/project-board/system.properties b/project-board/system.properties new file mode 100644 index 0000000..180a273 --- /dev/null +++ b/project-board/system.properties @@ -0,0 +1 @@ +java.runtime.version=11 \ No newline at end of file