diff --git a/src/test/java/com/avaje/tests/model/basic/event/CustomerPersistAdapter.java b/src/test/java/com/avaje/tests/model/basic/event/CustomerPersistAdapter.java index 0fa487234..fce59283f 100644 --- a/src/test/java/com/avaje/tests/model/basic/event/CustomerPersistAdapter.java +++ b/src/test/java/com/avaje/tests/model/basic/event/CustomerPersistAdapter.java @@ -6,19 +6,19 @@ import com.avaje.tests.model.basic.Customer; public class CustomerPersistAdapter extends BeanPersistAdapter { - @Override - public boolean isRegisterFor(Class cls) { - return Customer.class.equals(cls); - } + @Override + public boolean isRegisterFor(Class cls) { + return Customer.class.equals(cls); + } + + @Override + public boolean preInsert(BeanPersistRequest request) { - @Override - public boolean preInsert(BeanPersistRequest request) { - // StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); // request.getTransaction().log("+++++ "+Arrays.toString(stackTrace)); - - return true; - } + + return true; + } @Override public boolean preUpdate(BeanPersistRequest request) { diff --git a/src/test/java/com/avaje/tests/model/basic/event/SimpleTOneQueryAdapter.java b/src/test/java/com/avaje/tests/model/basic/event/SimpleTOneQueryAdapter.java index 44a661978..a46fe852d 100644 --- a/src/test/java/com/avaje/tests/model/basic/event/SimpleTOneQueryAdapter.java +++ b/src/test/java/com/avaje/tests/model/basic/event/SimpleTOneQueryAdapter.java @@ -7,24 +7,24 @@ import com.avaje.tests.model.basic.TOne; public class SimpleTOneQueryAdapter implements BeanQueryAdapter { - public int getExecutionOrder() { - // just return 0 - return 0; - } + public int getExecutionOrder() { + // just return 0 + return 0; + } - public boolean isRegisterFor(Class cls) { - return TOne.class.equals(cls); - } + public boolean isRegisterFor(Class cls) { + return TOne.class.equals(cls); + } + + public void preQuery(BeanQueryRequest request) { + + Query query = request.getQuery(); + + // can get the type of query Bean, List, RowCount, Id's etc + //Type queryType = query.getType(); + + query.where().raw("1=1"); + } - public void preQuery(BeanQueryRequest request) { - - Query query = request.getQuery(); - - // can get the type of query Bean, List, RowCount, Id's etc - //Type queryType = query.getType(); - - query.where().raw("1=1"); - } - } diff --git a/src/test/java/com/avaje/tests/model/basic/finder/CustomerFinder.java b/src/test/java/com/avaje/tests/model/basic/finder/CustomerFinder.java index 12894a023..9554b865d 100644 --- a/src/test/java/com/avaje/tests/model/basic/finder/CustomerFinder.java +++ b/src/test/java/com/avaje/tests/model/basic/finder/CustomerFinder.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.Nullable; /** * Finder methods for Customer. */ -public class CustomerFinder extends Finder { +public class CustomerFinder extends Finder { public CustomerFinder() { super(Customer.class); diff --git a/src/test/java/com/avaje/tests/model/basic/first/Second.java b/src/test/java/com/avaje/tests/model/basic/first/Second.java index 4c5e808b8..589da2be4 100644 --- a/src/test/java/com/avaje/tests/model/basic/first/Second.java +++ b/src/test/java/com/avaje/tests/model/basic/first/Second.java @@ -6,7 +6,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -@AttributeOverride(name="name", column=@Column(name = "mod_name")) +@AttributeOverride(name = "name", column = @Column(name = "mod_name")) @Entity @Table(name = "f_second") public class Second extends SuperSecond { diff --git a/src/test/java/com/avaje/tests/model/basic/first/SuperSecond.java b/src/test/java/com/avaje/tests/model/basic/first/SuperSecond.java index a82a7a4d2..11e6af120 100644 --- a/src/test/java/com/avaje/tests/model/basic/first/SuperSecond.java +++ b/src/test/java/com/avaje/tests/model/basic/first/SuperSecond.java @@ -10,7 +10,7 @@ public abstract class SuperSecond { protected String name; - @OneToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) + @OneToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}) @JoinColumn(name = "first") protected First first; diff --git a/src/test/java/com/avaje/tests/model/basic/first/TestFirstSecond.java b/src/test/java/com/avaje/tests/model/basic/first/TestFirstSecond.java index 3a4c6bd68..8b6678c0b 100644 --- a/src/test/java/com/avaje/tests/model/basic/first/TestFirstSecond.java +++ b/src/test/java/com/avaje/tests/model/basic/first/TestFirstSecond.java @@ -1,9 +1,8 @@ package com.avaje.tests.model.basic.first; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; +import org.junit.Test; public class TestFirstSecond extends BaseTestCase { @@ -20,7 +19,7 @@ public class TestFirstSecond extends BaseTestCase { second.setFirst(first); Ebean.save(second); - + second.getFirst().setName("changed"); Ebean.save(second); Ebean.save(first); diff --git a/src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperActual.java b/src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperActual.java index 13b6bbc68..f4c327070 100644 --- a/src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperActual.java +++ b/src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperActual.java @@ -5,12 +5,12 @@ import javax.persistence.Id; @Entity public class MapSuperActual extends MapSuperNoId { - + @Id Long id; - + String name; - + public Long getId() { return id; } @@ -26,5 +26,5 @@ public class MapSuperActual extends MapSuperNoId { public void setName(String name) { this.name = name; } - + } diff --git a/src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperNoId.java b/src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperNoId.java index 68daae688..3d8a95254 100644 --- a/src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperNoId.java +++ b/src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperNoId.java @@ -1,18 +1,17 @@ package com.avaje.tests.model.basic.mapsuper; -import java.sql.Timestamp; +import com.avaje.ebean.annotation.CreatedTimestamp; import javax.persistence.MappedSuperclass; import javax.persistence.Version; - -import com.avaje.ebean.annotation.CreatedTimestamp; +import java.sql.Timestamp; @MappedSuperclass public class MapSuperNoId { @CreatedTimestamp Timestamp whenCreated; - + @Version Timestamp whenUpdated; @@ -31,5 +30,5 @@ public class MapSuperNoId { public void setWhenUpdated(Timestamp whenUpdated) { this.whenUpdated = whenUpdated; } - + } diff --git a/src/test/java/com/avaje/tests/model/basic/mapsuper/TestMapSuperEquals.java b/src/test/java/com/avaje/tests/model/basic/mapsuper/TestMapSuperEquals.java index 6a13fdb0c..1f916e034 100644 --- a/src/test/java/com/avaje/tests/model/basic/mapsuper/TestMapSuperEquals.java +++ b/src/test/java/com/avaje/tests/model/basic/mapsuper/TestMapSuperEquals.java @@ -1,10 +1,9 @@ package com.avaje.tests.model.basic.mapsuper; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.bean.EntityBean; +import org.junit.Assert; +import org.junit.Test; public class TestMapSuperEquals extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/DummyDao.java b/src/test/java/com/avaje/tests/model/basic/xtra/DummyDao.java index 87eab84a0..f5311159f 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/DummyDao.java +++ b/src/test/java/com/avaje/tests/model/basic/xtra/DummyDao.java @@ -1,35 +1,33 @@ package com.avaje.tests.model.basic.xtra; -import java.util.List; - -import javax.persistence.EntityNotFoundException; - -import com.avaje.ebean.config.PersistBatch; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.avaje.ebean.Ebean; import com.avaje.ebean.Transaction; import com.avaje.ebean.TxType; import com.avaje.ebean.annotation.Transactional; +import com.avaje.ebean.config.PersistBatch; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.persistence.EntityNotFoundException; +import java.util.List; import static org.junit.Assert.assertEquals; public class DummyDao { Logger logger = LoggerFactory.getLogger(DummyDao.class); - + @Transactional(type = TxType.REQUIRES_NEW) public void doSomething() { - + logger.info(" --- in DummyDao.doSomething() with TxType.REQUIRES_NEW"); Transaction txn = Ebean.currentTransaction(); if (txn == null) { logger.error(" NO TRANSACTION ??"); } else { - logger.info(" --- txn - "+txn); + logger.info(" --- txn - " + txn); } - + } @Transactional diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/EdChild.java b/src/test/java/com/avaje/tests/model/basic/xtra/EdChild.java index 0a51317b5..b9cfb33cc 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/EdChild.java +++ b/src/test/java/com/avaje/tests/model/basic/xtra/EdChild.java @@ -8,40 +8,40 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name="td_child") +@Table(name = "td_child") public class EdChild { - @Id - @Column(name="child_id") - private int id; + @Id + @Column(name = "child_id") + private int id; - @Column(name="child_name") - private String name; + @Column(name = "child_name") + private String name; - @ManyToOne - @JoinColumn(name="parent_id", nullable=false ) - EdParent parent; + @ManyToOne + @JoinColumn(name = "parent_id", nullable = false) + EdParent parent; - public int getId() { - return id; - } + public int getId() { + return id; + } - public void setId(int id) { - this.id = id; - } + public void setId(int id) { + this.id = id; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public EdParent getParent() { - return parent; - } + public EdParent getParent() { + return parent; + } - public void setParent(EdParent parent) { - this.parent = parent; - } + public void setParent(EdParent parent) { + this.parent = parent; + } } diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/EdExtendedParent.java b/src/test/java/com/avaje/tests/model/basic/xtra/EdExtendedParent.java index 74f6a4ac5..1f75e811d 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/EdExtendedParent.java +++ b/src/test/java/com/avaje/tests/model/basic/xtra/EdExtendedParent.java @@ -8,14 +8,14 @@ import javax.persistence.Entity; @DiscriminatorValue("EXTENDED") public class EdExtendedParent extends EdParent { - private String extendedName; + private String extendedName; - public String getExtendedName() { - return extendedName; - } + public String getExtendedName() { + return extendedName; + } - public void setExtendedName(String extendedName) { - this.extendedName = extendedName; - } + public void setExtendedName(String extendedName) { + this.extendedName = extendedName; + } } \ No newline at end of file diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/EdParent.java b/src/test/java/com/avaje/tests/model/basic/xtra/EdParent.java index 85ba48f20..cbc5d5351 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/EdParent.java +++ b/src/test/java/com/avaje/tests/model/basic/xtra/EdParent.java @@ -1,9 +1,6 @@ - package com.avaje.tests.model.basic.xtra; -import java.util.List; - import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.DiscriminatorColumn; @@ -16,45 +13,46 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.OneToMany; import javax.persistence.Table; +import java.util.List; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) -@DiscriminatorColumn(discriminatorType=DiscriminatorType.STRING , name="parent_type") +@DiscriminatorColumn(discriminatorType = DiscriminatorType.STRING, name = "parent_type") @DiscriminatorValue("BASIC") -@Table(name="td_parent") +@Table(name = "td_parent") public class EdParent { - @Id - @Column(name="parent_id") - private int id; + @Id + @Column(name = "parent_id") + private int id; - @Column(name="parent_name") - private String name; + @Column(name = "parent_name") + private String name; - @OneToMany(fetch = FetchType.EAGER, mappedBy="parent", cascade=CascadeType.ALL) - List children; + @OneToMany(fetch = FetchType.EAGER, mappedBy = "parent", cascade = CascadeType.ALL) + List children; - public List getChildren() { - return children; - } + public List getChildren() { + return children; + } - public void setChildren(List children) { - this.children = children; - } + public void setChildren(List children) { + this.children = children; + } - public int getId() { - return id; - } + public int getId() { + return id; + } - public void setId(int id) { - this.id = id; - } + public void setId(int id) { + this.id = id; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } } diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java b/src/test/java/com/avaje/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java index 071dbb646..c5981ed4d 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java +++ b/src/test/java/com/avaje/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java @@ -1,47 +1,47 @@ package com.avaje.tests.model.basic.xtra; -import javax.persistence.PersistenceException; - -import org.junit.Assert; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebean.SqlUpdate; import com.avaje.ebean.Transaction; import com.avaje.ebean.annotation.Transactional; import com.avaje.tests.model.basic.EBasicVer; +import org.junit.Assert; + +import javax.persistence.PersistenceException; public class OptimisticLockExceptionThrowingDao { - Transaction inMethodTransaction; - - @Transactional - public void doSomething(EBasicVer v) { - - EbeanServer server = Ebean.getServer(null); - - inMethodTransaction = server.currentTransaction(); - - Transaction t = server.createTransaction(); - SqlUpdate u = server.createSqlUpdate("update e_basicver set last_update = last_update+1 where id = ?"); - u.setParameter(1, v.getId()); - int count = server.execute(u, t); - Assert.assertEquals(1, count); - - t.commit(); - - v.setName("some change"); - try { - Ebean.save(v); - // never get here - Assert.assertTrue(false); - } catch (PersistenceException e){ - throw e; - } - + Transaction inMethodTransaction; + + @Transactional + public void doSomething(EBasicVer v) { + + EbeanServer server = Ebean.getServer(null); + + inMethodTransaction = server.currentTransaction(); + + Transaction t = server.createTransaction(); + SqlUpdate u = server.createSqlUpdate("update e_basicver set last_update = last_update+1 where id = ?"); + u.setParameter(1, v.getId()); + int count = server.execute(u, t); + Assert.assertEquals(1, count); + + t.commit(); + + v.setName("some change"); + try { + Ebean.save(v); + // never get here + Assert.assertTrue(false); + } catch (PersistenceException e) { + throw e; } - public Transaction getInMethodTransaction() { - return inMethodTransaction; - } - + } + + public Transaction getInMethodTransaction() { + return inMethodTransaction; + } + } diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java index b27d248f4..0df57a452 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java +++ b/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java @@ -1,12 +1,11 @@ package com.avaje.tests.model.basic.xtra; -import java.util.ArrayList; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.SqlUpdate; +import org.junit.Test; + +import java.util.ArrayList; public class TestDeleteUnloadedChildren extends BaseTestCase {