github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#907 - Remove Model.Finder ... migrate to Finder

Browse Source
This commit is contained in:
Rob Bygrave
2016-12-02 21:47:30 +13:00
parent a3754e31f2
commit 0aad285f35
9 changed files with 17 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/tests/model/info/InfoCompany.java
+1
View File
@@ -1,5 +1,6 @@
package com.avaje.tests.model.info;
import com.avaje.ebean.Finder;
import com.avaje.ebean.Model;
import com.avaje.ebean.annotation.JsonIgnore;
src/test/java/com/avaje/tests/model/info/InfoCustomer.java
+1
View File
@@ -1,5 +1,6 @@
package com.avaje.tests.model.info;
import com.avaje.ebean.Finder;
import com.avaje.ebean.Model;
import javax.persistence.CascadeType;
src/test/java/com/avaje/tests/model/onetoone/Account.java
+2 -2
View File
@@ -1,5 +1,6 @@
package com.avaje.tests.model.onetoone;
import com.avaje.ebean.Finder;
import com.avaje.tests.model.BaseModel;
import javax.persistence.Entity;
@@ -10,8 +11,7 @@ import javax.persistence.Table;
@Table(name = "oto_account")
public class Account extends BaseModel {
public static final Find<Long, Account> find = new Find<Long, Account>() {
};
public static final Finder<Long, Account> find = new Finder<>(Account.class);
String name;
src/test/java/com/avaje/tests/model/onetoone/TestOneToOneOptionalRelationship.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase {
LoggedSqlCollector.start();
Account fetchedAccount = Account.find.fetch("user").setId(account.getId()).findUnique();
Account fetchedAccount = Account.find.query().fetch("user").setId(account.getId()).findUnique();
Assert.assertNotNull(fetchedAccount);
Assert.assertNotNull(fetchedAccount.getUser());
src/test/java/com/avaje/tests/model/onetoone/User.java
+2 -2
View File
@@ -1,5 +1,6 @@
package com.avaje.tests.model.onetoone;
import com.avaje.ebean.Finder;
import com.avaje.tests.model.BaseModel;
import javax.persistence.Entity;
@@ -10,8 +11,7 @@ import javax.persistence.Table;
@Table(name = "oto_user")
public class User extends BaseModel {
public static final Find<Long, User> find = new Find<Long, User>() {
};
public static final Finder<Long, User> find = new Finder<>(User.class);
String name;
src/test/java/com/avaje/tests/model/onetoone/album/Album.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.avaje.tests.model.onetoone.album;
import com.avaje.ebean.Model;
import com.avaje.ebean.Finder;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
@@ -10,7 +10,7 @@ import javax.persistence.OneToOne;
@Entity
public class Album extends BaseModel {
public static final Model.Finder<Long, Album> find = new Model.Finder<>(Album.class);
public static final Finder<Long, Album> find = new Finder<>(Album.class);
private String name;
src/test/java/com/avaje/tests/model/onetoone/album/Cover.java
+1
View File
@@ -1,5 +1,6 @@
package com.avaje.tests.model.onetoone.album;
import com.avaje.ebean.Finder;
import com.avaje.ebean.Model;
import com.avaje.ebean.annotation.SoftDelete;
import org.slf4j.Logger;
src/test/java/com/avaje/tests/model/onetoone/album/TestOneToOneHardDelete.java
+2 -2
View File
@@ -23,7 +23,7 @@ public class TestOneToOneHardDelete extends BaseTestCase {
album.setCover(cover);
album.save();
Album found1 = Album.find.where().findUnique();
Album found1 = Album.find.byId(album.getId());
LoggedSqlCollector.start();
@@ -40,7 +40,7 @@ public class TestOneToOneHardDelete extends BaseTestCase {
assertThat(sql.get(1)).contains("update album set deleted=?, last_update=? where id=?");
assertThat(sql.get(2)).contains("update cover set deleted=? where id=?");
Album found2 = Album.find.where().setIncludeSoftDeletes().findUnique();
Album found2 = Album.find.query().setId(album.getId()).setIncludeSoftDeletes().findUnique();
LoggedSqlCollector.start();