From 4de7f90904c62e517c6476a1df42b99d8dd03192 Mon Sep 17 00:00:00 2001 From: Marcos Pereira Date: Thu, 21 Dec 2017 17:35:23 -0200 Subject: [PATCH 1/3] Updated with template-control on 2017-12-21T19:35:23.191Z **/build.properties: sbt.version=1.0.4 **/plugins.sbt: addSbtPlugin("com.typesafe.sbt" % "sbt-play-ebean" % "4.1.0") --- project/build.properties | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/build.properties b/project/build.properties index b7dd3cb..394cb75 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.0.2 +sbt.version=1.0.4 diff --git a/project/plugins.sbt b/project/plugins.sbt index d3c8b2a..5eabb89 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,4 +3,4 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/release // The Play plugin addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.9") -addSbtPlugin("com.typesafe.sbt" % "sbt-play-ebean" % "4.0.6") +addSbtPlugin("com.typesafe.sbt" % "sbt-play-ebean" % "4.1.0") From 5ec6f5728072501729d810b7536955ed64a959c3 Mon Sep 17 00:00:00 2001 From: Marcos Pereira Date: Thu, 21 Dec 2017 18:33:03 -0200 Subject: [PATCH 2/3] Update to use new ebean APIs --- app/repository/ComputerRepository.java | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/app/repository/ComputerRepository.java b/app/repository/ComputerRepository.java index c59d9ea..12351e1 100644 --- a/app/repository/ComputerRepository.java +++ b/app/repository/ComputerRepository.java @@ -1,9 +1,6 @@ package repository; -import io.ebean.Ebean; -import io.ebean.EbeanServer; -import io.ebean.PagedList; -import io.ebean.Transaction; +import io.ebean.*; import models.Computer; import play.db.ebean.EbeanConfig; @@ -38,21 +35,18 @@ public ComputerRepository(EbeanConfig ebeanConfig, DatabaseExecutionContext exec * @param filter Filter applied on the name column */ public CompletionStage> page(int page, int pageSize, String sortBy, String order, String filter) { - return supplyAsync(() -> { - return ebeanServer.find(Computer.class).where() + return supplyAsync(() -> + ebeanServer.find(Computer.class).where() .ilike("name", "%" + filter + "%") .orderBy(sortBy + " " + order) .fetch("company") .setFirstRow(page * pageSize) .setMaxRows(pageSize) - .findPagedList(); - } , executionContext); + .findPagedList(), executionContext); } public CompletionStage> lookup(Long id) { - return supplyAsync(() -> { - return Optional.ofNullable(ebeanServer.find(Computer.class).setId(id).findUnique()); - }, executionContext); + return supplyAsync(() -> Optional.ofNullable(ebeanServer.find(Computer.class).setId(id).findOne()), executionContext); } public CompletionStage> update(Long id, Computer newComputerData) { @@ -60,7 +54,7 @@ public CompletionStage> update(Long id, Computer newComputerData) Transaction txn = ebeanServer.beginTransaction(); Optional value = Optional.empty(); try { - Computer savedComputer = ebeanServer.find(Computer.class).setId(id).findUnique(); + Computer savedComputer = ebeanServer.find(Computer.class).setId(id).findOne(); if (savedComputer != null) { savedComputer.company = newComputerData.company; savedComputer.discontinued = newComputerData.discontinued; @@ -81,8 +75,8 @@ public CompletionStage> update(Long id, Computer newComputerData) public CompletionStage> delete(Long id) { return supplyAsync(() -> { try { - final Optional computerOptional = Optional.ofNullable(ebeanServer.find(Computer.class).setId(id).findUnique()); - computerOptional.ifPresent(c -> c.delete()); + final Optional computerOptional = Optional.ofNullable(ebeanServer.find(Computer.class).setId(id).findOne()); + computerOptional.ifPresent(Model::delete); return computerOptional.map(c -> c.id); } catch (Exception e) { return Optional.empty(); From 2078dd5b71b54837038ad717e2a255d5e4f6a08e Mon Sep 17 00:00:00 2001 From: Marcos Pereira Date: Fri, 22 Dec 2017 10:05:20 -0200 Subject: [PATCH 3/3] Update Play to 2.6.10 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5eabb89..ed26b49 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.9") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.10") addSbtPlugin("com.typesafe.sbt" % "sbt-play-ebean" % "4.1.0")