Merge pull request #19 from Backbase/BEFOUND-321

Moving to xml changelog for liquibase. Moving to Junit5

Author: SteveWyatt74

service-sdk/13.0.0/add-persistence-to-service/example-service/src/main/resources/application.yaml

@@ -47,7 +47,7 @@ spring:
     generate-ddl: false
   liquibase:
     enabled: true
-    change-log: classpath:db/changelog.yaml
+    change-log: classpath:db/changelog/db.changelog-persistence.xml
 
 buildingblocks:
   security:

service-sdk/13.0.0/add-persistence-to-service/example-service/src/main/resources/db/changelog.yaml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd
+        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+
+    <property dbms="mssql" name="varcharDataType" value="NVARCHAR"/>
+    <property dbms="mysql" name="varcharDataType" value="VARCHAR"/>
+    <property dbms="oracle" name="varcharDataType" value="VARCHAR2"/>
+    <property name="varcharDataType" value="VARCHAR"/>
+
+    <changeSet id="initial_001" context="initial" author="backbase">
+        <comment>create the greeting table</comment>
+        <createTable tableName="greetings" remarks="Table to store the greetings">
+            <column name="id" type="${varcharDataType}(36)">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="pk_greeting"/>
+            </column>
+            <column name="message" type="${varcharDataType}(255)" remarks="Text message">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+
+</databaseChangeLog>

service-sdk/13.0.0/add-persistence-to-service/example-service/src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd
+        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+
+    <include file="db.changelog-1.0.0.xml" relativeToChangelogFile="true"/>
+
+</databaseChangeLog>

service-sdk/13.0.0/add-persistence-to-service/example-service/src/main/resources/db/changelog/db.changelog-persistence.xml

@@ -3,6 +3,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -11,40 +12,41 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.http.MediaType;
-import org.junit.runner.RunWith;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+
 
 /**
  * A wrapper annotation for use with integration tests.
  *
  * By default, assumes the integration test modifies the
- * {@link ApplicationContext} associated with the test/s and will therefore be
+ * {@link org.springframework.context.ApplicationContext} associated with the test/s and will therefore be
  * closed and removed from the context cache at the end of the class.
  */
 @SpringBootTest(classes = Application.class)
 @DirtiesContext(classMode = ClassMode.AFTER_CLASS)
-@RunWith(SpringJUnit4ClassRunner.class)
 @AutoConfigureMockMvc
 @ActiveProfiles("it")
-public class ExampleControllerIT {
+class ExampleControllerIT {
 
     String TOKEN_ATTR_NAME = "org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository.CSRF_TOKEN";
 
@@ -58,7 +60,7 @@ public class ExampleControllerIT {
     private MockMvc mvc;
 
     @Test
-    public void exampleTest() throws Exception {
+    void exampleTest() throws Exception {
         String greetingsId = givenAGreetingExists();
         whenWeGetTheMessageByIdThenTheMessageExists(greetingsId);
         WhenWeGetAllMessagesThenAListOfMessagesIsReturned();