diff --git a/droptools-example/pom.xml b/droptools-example/pom.xml index 0db2499e..d925b56d 100644 --- a/droptools-example/pom.xml +++ b/droptools-example/pom.xml @@ -16,7 +16,7 @@ 1.0-rc1 - 1.0.0 + 1.3.5 0.9.2-3 ${project.parent.version} 4.12 @@ -24,7 +24,7 @@ 0.23 4.0.3 - 9.3-1101-jdbc41 + 42.2.4 @@ -73,7 +73,7 @@ org.jooq jooq-codegen-maven - 3.4.2 + 3.11.3 @@ -100,29 +100,13 @@ - org.jooq.util.DefaultGenerator false - org.jooq.util.postgres.PostgresDatabase + org.jooq.meta.postgres.PostgresDatabase .* ex - - - - DateTime - org.joda.time.DateTime - com.bendb.dropwizard.jooq.JodaDateTimeConverter - - - - - - DateTime - (?i:timestamp).* - - com.bendb.example.db diff --git a/droptools-example/src/main/java/com/bendb/example/core/BlogPost.java b/droptools-example/src/main/java/com/bendb/example/core/BlogPost.java index 52929f94..2a728c52 100644 --- a/droptools-example/src/main/java/com/bendb/example/core/BlogPost.java +++ b/droptools-example/src/main/java/com/bendb/example/core/BlogPost.java @@ -4,7 +4,7 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import io.dropwizard.jackson.JsonSnakeCase; -import org.joda.time.DateTime; +import java.time.OffsetDateTime; import java.util.List; @@ -18,7 +18,7 @@ public abstract class BlogPost { public abstract String text(); @JsonProperty - public abstract DateTime createdAt(); + public abstract OffsetDateTime createdAt(); @JsonProperty public abstract ImmutableList tags(); @@ -28,7 +28,7 @@ public abstract class BlogPost { public static BlogPost create( int postId, String text, - DateTime createdAt, + OffsetDateTime createdAt, List tags) { return new AutoValue_BlogPost(postId, text, createdAt, immutableCopy(tags)); } diff --git a/droptools-example/src/main/java/com/bendb/example/resources/PostsResource.java b/droptools-example/src/main/java/com/bendb/example/resources/PostsResource.java index 644c0186..bd0621d9 100644 --- a/droptools-example/src/main/java/com/bendb/example/resources/PostsResource.java +++ b/droptools-example/src/main/java/com/bendb/example/resources/PostsResource.java @@ -6,7 +6,7 @@ import com.bendb.example.db.tables.records.BlogPostRecord; import com.bendb.example.db.tables.records.PostTagRecord; import io.dropwizard.jersey.params.IntParam; -import org.joda.time.DateTime; +import java.time.OffsetDateTime; import org.jooq.*; import org.jooq.impl.DSL; import javax.ws.rs.*; @@ -44,12 +44,12 @@ public List findPostsByTag(@QueryParam("tag") String tag, @JooqInject( .where(field("id").equal(BLOG_POST.ID))) .groupBy(BLOG_POST.ID, BLOG_POST.BODY, BLOG_POST.CREATED_AT) .orderBy(BLOG_POST.CREATED_AT.desc()) - .fetch(new RecordMapper, BlogPost>() { + .fetch(new RecordMapper, BlogPost>() { @Override - public BlogPost map(Record4 record) { + public BlogPost map(Record4 record) { final Integer postId = record.value1(); final String text = record.value2(); - final DateTime createdAt = record.value3(); + final OffsetDateTime createdAt = record.value3(); final List tags = Arrays.asList(record.value4()); return BlogPost.create(postId, text, createdAt, tags); @@ -96,7 +96,7 @@ public Response run(Configuration configuration) throws Exception { @GET @Path("/{id}") public BlogPost getPost(@PathParam("id") IntParam id, @Context DSLContext create) { - final Record4 record = create + final Record4 record = create .select(BLOG_POST.ID, BLOG_POST.BODY, BLOG_POST.CREATED_AT, arrayAgg(POST_TAG.TAG_NAME)) .from(BLOG_POST) .leftOuterJoin(POST_TAG) @@ -111,7 +111,7 @@ public BlogPost getPost(@PathParam("id") IntParam id, @Context DSLContext create final Integer postId = record.value1(); final String text = record.value2(); - final DateTime createdAt = record.value3(); + final OffsetDateTime createdAt = record.value3(); final List tags = Arrays.asList(record.value4()); return BlogPost.create(postId, text, createdAt, tags); diff --git a/dropwizard-jooq/pom.xml b/dropwizard-jooq/pom.xml index 888eed98..d6c0d9d7 100644 --- a/dropwizard-jooq/pom.xml +++ b/dropwizard-jooq/pom.xml @@ -19,7 +19,7 @@ Addon bundle for Dropwizard to support jOOQ for database access - 3.9.1 + 3.11.3 diff --git a/pom.xml b/pom.xml index 317840f1..1f2b0eed 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ UTF-8 - 1.2.0 + 1.3.5 2.7 github