added flyway and use jbdc H2 instance for Person GET

.gitignore

@@ -9,3 +9,4 @@ logs
 *.iml
 *.ipr
 *.iws
+*.db

README.md

@@ -2,4 +2,35 @@
 
 Test project for Dropwizard 7.1 using JDBI to interact with a DB.
 
-Also using Flyway and H2 to create an in memory DB with test data for integration testing.
+Also using Flyway and H2 to create an in memory DB with test data for integration testing.
+
+## Setup H2 DB
+
+Creates an H2 DB populated with the migration scripts in src/main/resources/db/migration
+
+```
+gradle flywayMigrate -i
+```
+
+## Run Dropwizard service
+
+To compile:
+
+```
+gradle oneJar
+```
+
+To run:
+
+```
+java -jar build/libs/dropwizard-jdbi-standalone.jar server config.yml
+```
+
+Running the service will start an embedded H2 instance using the person.mv.db file generated by flyway.
+
+To test:
+
+```
+gradle test
+```
+

build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'java'
+apply plugin: 'flyway'
 apply plugin: 'gradle-one-jar'
 apply plugin: 'application'
 apply plugin: 'idea'
@@ -21,6 +22,8 @@ buildscript {
 
     dependencies {
         classpath 'com.github.rholder:gradle-one-jar:1.0.3'
+        classpath 'com.h2database:h2:1.4.181'
+        classpath 'org.flywaydb:flyway-gradle-plugin:3.0'
     }
 }
 
@@ -37,7 +40,10 @@ repositories {
 dependencies {
     compile (
         'io.dropwizard:dropwizard-core:' + dropwizardVersion,
-        'com.sun.jersey:jersey-core:' + jerseyVersion
+        'io.dropwizard:dropwizard-jdbi:' + dropwizardVersion,
+        'com.sun.jersey:jersey-core:' + jerseyVersion,
+        'com.h2database:h2:1.4.181',
+        'org.flywaydb:flyway-gradle-plugin:3.0'
     )
     testCompile (
         'io.dropwizard:dropwizard-testing:' + dropwizardVersion,
@@ -47,6 +53,12 @@ dependencies {
     )
 }
 
+// Configure flyway
+flyway {
+    url = 'jdbc:h2:file:./persondb'
+    user = 'sa'
+}
+
 // Configure the oneJar task
 task oneJar(type: OneJar) {
     mainClass = mainClassName

config.yml

@@ -4,4 +4,19 @@ server:
       port: 8095
   adminConnectors:
     - type: http
-      port: 8096
+      port: 8096
+
+database:
+  driverClass: org.h2.Driver
+  user: sa
+#  password:
+  url: jdbc:h2:./persondb
+  properties:
+    charSet: UTF-8
+  maxWaitForConnection: 1s
+  validationQuery: "/* MyService Health Check */ SELECT 1"
+  minSize: 8
+  maxSize: 32
+  checkConnectionWhileIdle: false
+  evictionInterval: 10s
+  minIdleTime: 1 minute

src/main/java/com/example/ExampleApplication.java

@@ -1,9 +1,12 @@
 package com.example;
 
+import com.example.dao.PersonDAO;
 import com.example.resources.PersonResource;
 import io.dropwizard.Application;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
+import io.dropwizard.jdbi.DBIFactory;
+import org.skife.jdbi.v2.DBI;
 
 public class ExampleApplication extends Application<ExampleConfiguration> {
     public static void main(String[] args) throws Exception {
@@ -20,8 +23,12 @@ public void initialize(Bootstrap<ExampleConfiguration> bootstrap) {
     }
 
     @Override
-    public void run(ExampleConfiguration configuration, Environment environment) {
-        final PersonResource personResource = new PersonResource();
+    public void run(ExampleConfiguration configuration, Environment environment) throws ClassNotFoundException {
+        final DBIFactory factory = new DBIFactory();
+        final DBI jdbi = factory.build(environment, configuration.getDataSourceFactory(), "h2");
+
+        final PersonDAO personDAO = jdbi.onDemand(PersonDAO.class);
+        final PersonResource personResource = new PersonResource(personDAO);
 
         environment.jersey().register(personResource);
     }

src/main/java/com/example/ExampleConfiguration.java

@@ -1,6 +1,20 @@
 package com.example;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.Configuration;
+import io.dropwizard.db.DataSourceFactory;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 
 public class ExampleConfiguration extends Configuration {
+
+    @Valid
+    @NotNull
+    @JsonProperty("database")
+    private DataSourceFactory database = new DataSourceFactory();
+
+    public DataSourceFactory getDataSourceFactory() {
+        return database;
+    }
 }

src/main/java/com/example/dao/PersonDAO.java

@@ -0,0 +1,9 @@
+package com.example.dao;
+
+import org.skife.jdbi.v2.sqlobject.Bind;
+import org.skife.jdbi.v2.sqlobject.SqlQuery;
+
+public interface PersonDAO {
+    @SqlQuery("select NAME from PERSON where ID = :id")
+    String findNameById(@Bind("id") int id);
+}

src/main/java/com/example/resources/PersonResource.java

@@ -1,6 +1,7 @@
 package com.example.resources;
 
 import com.example.core.Person;
+import com.example.dao.PersonDAO;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -13,6 +14,12 @@
 @Produces({MediaType.APPLICATION_JSON})
 public class PersonResource {
 
+    PersonDAO personDAO;
+
+    public PersonResource(PersonDAO personDAO) {
+        this.personDAO = personDAO;
+    }
+
     @GET
     public List<Person> getAll(){
 
@@ -34,9 +41,11 @@ public List<Person> getAll(){
     @GET
     @Path("/{id}")
     public Person get(@PathParam("id") Integer id){
+        String name = personDAO.findNameById(1);
+
         return new Person()
             .setId(id)
-            .setName("person" + id.toString());
+            .setName(name);
     }
 
     @POST

src/main/resources/db/migration/V1__Create_person_table.sql

@@ -0,0 +1,4 @@
+create table PERSON (
+    ID int not null,
+    NAME varchar(100) not null
+);

src/main/resources/db/migration/V2__Add_people.sql

@@ -0,0 +1,3 @@
+insert into PERSON (ID, NAME) values (1, 'Axel');
+insert into PERSON (ID, NAME) values (2, 'Mr. Foo');
+insert into PERSON (ID, NAME) values (3, 'Ms. Bar');

src/test/java/com/example/resources/PersonResourceTests.java

@@ -2,6 +2,7 @@
 
 import com.example.core.Person;
 import com.example.core.PersonTests;
+import com.example.dao.PersonDAO;
 import com.sun.jersey.api.client.GenericType;
 import io.dropwizard.testing.junit.ResourceTestRule;
 import org.junit.ClassRule;
@@ -14,19 +15,22 @@
 import java.util.logging.Logger;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
 
 /**
  * Tests {@link io.dropwizard.testing.junit.ResourceTestRule}
  */
 public class PersonResourceTests {
 
+    private static final PersonDAO personDAO = mock(PersonDAO.class);
+
     static {
         Logger.getLogger("com.sun.jersey").setLevel(Level.OFF);
     }
 
     @ClassRule
     public static final ResourceTestRule resources = ResourceTestRule.builder()
-            .addResource(new PersonResource())
+            .addResource(new PersonResource(personDAO))
             .build();
 
     @Test
@@ -38,7 +42,10 @@ public void getAll() throws Exception {
 
     @Test
     public void get() throws Exception {
+        when(personDAO.findNameById(1)).thenReturn("person1");
+
         Person person = resources.client().resource("/person/1").get(Person.class);
+
         assertEquals("person1", person.getName());
     }