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

#1123 - 11.1.1 API change - moved PersistBatch, Platform, TxIsolation and TxType to io.ebean.annotation package

Browse Source
This commit is contained in:
rob bygrave
2017-09-15 21:48:53 +12:00
parent 2c436c3af5
commit f2179fca2d
38 changed files with 118 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/org/tests/basic/TestAnnotationBase.java
+1 -1
View File
@@ -2,7 +2,7 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.annotation.Where;
import io.ebean.Platform;
import io.ebean.annotation.Platform;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.parse.AnnotationBase;
src/test/java/org/tests/basic/TestMetaAnnotation.java
+2 -2
View File
@@ -2,7 +2,7 @@ package org.tests.basic;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Platform;
import io.ebean.annotation.Platform;
import io.ebean.annotation.IgnorePlatform;
import org.tests.model.basic.Address;
import org.tests.model.basic.metaannotation.SizeMedium;
@@ -66,7 +66,7 @@ public class TestMetaAnnotation extends BaseTestCase {
* This test writes 101 spaces to "line1" which is meta-annotated with {@link SizeMedium}.
*/
@Test
@IgnorePlatform({Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL})
@IgnorePlatform({Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL})
public void testWrite101SpacesToLine2() {
Address address = new Address();
src/test/java/org/tests/basic/TestQueryForUpdate.java
+1 -1
View File
@@ -4,7 +4,7 @@ import io.ebean.AcquireLockException;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.EbeanServer;
import io.ebean.Platform;
import io.ebean.annotation.Platform;
import io.ebean.Query;
import io.ebean.Transaction;
import io.ebean.annotation.ForPlatform;
src/test/java/org/tests/basic/encrypt/TestEncrypt.java
+2 -2
View File
@@ -2,17 +2,17 @@ package org.tests.basic.encrypt;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Platform;
import io.ebean.SqlQuery;
import io.ebean.SqlRow;
import io.ebean.Update;
import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform;
import io.ebean.config.dbplatform.DbEncrypt;
import io.ebeaninternal.api.SpiEbeanServer;
import org.tests.model.basic.EBasicEncrypt;
import org.ebeantest.LoggedSqlCollector;
import org.junit.Assert;
import org.junit.Test;
import org.tests.model.basic.EBasicEncrypt;
import java.sql.Date;
import java.util.List;
src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java
+34 -1
View File
@@ -5,8 +5,9 @@ import io.ebean.Ebean;
import io.ebean.EbeanServer;
import io.ebean.Transaction;
import io.ebean.annotation.Transactional;
import io.ebean.PersistBatch;
import io.ebean.annotation.PersistBatch;
import org.ebeantest.LoggedSqlCollector;
import org.tests.model.basic.Customer;
import org.tests.model.basic.EBasicVer;
import org.junit.Test;
import org.tests.model.basic.TSDetail;
@@ -70,6 +71,38 @@ public class TestBatchInsertFlush extends BaseTestCase {
}
@Test
@Transactional(batch = PersistBatch.ALL, flushOnQuery = false)
public void transactional_flushOnQueryFalse() {
LoggedSqlCollector.start();
Ebean.save(new EBasicVer("b1"));
Ebean.save(new EBasicVer("b2"));
// does not trigger JDBC batch with flushOnQuery = false
Ebean.find(Customer.class).findCount();
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql.get(0)).contains("select count(*)");
}
@Test
@Transactional(batch = PersistBatch.ALL)
public void transactional_flushOnQuery() {
LoggedSqlCollector.start();
Ebean.save(new EBasicVer("b1"));
Ebean.save(new EBasicVer("b2"));
// by default triggers flush of JDBC batch
Ebean.find(Customer.class).findCount();
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql.get(0)).contains("insert into e_basicver");
}
@Test
@Transactional(batch = PersistBatch.ALL)
public void transactional_flushOnGetId() {
src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
+1 -1
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Transaction;
import io.ebean.annotation.Transactional;
import io.ebean.PersistBatch;
import io.ebean.annotation.PersistBatch;
import org.tests.model.basic.UTDetail;
import org.tests.model.basic.UTMaster;
import org.junit.Test;
src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java
+1 -1
View File
@@ -3,7 +3,7 @@ package org.tests.batchinsert;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Transaction;
import io.ebean.PersistBatch;
import io.ebean.annotation.PersistBatch;
import org.tests.model.basic.OCachedBean;
import org.ebeantest.LoggedSqlCollector;
import org.junit.Test;
src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
+1 -1
View File
@@ -3,7 +3,7 @@ package org.tests.batchinsert;
import io.ebean.BaseTestCase;
import io.ebean.EbeanServer;
import io.ebean.Transaction;
import io.ebean.PersistBatch;
import io.ebean.annotation.PersistBatch;
import io.ebeaninternal.api.SpiTransaction;
import io.ebeaninternal.server.persist.BatchControl;
import org.tests.model.basic.EBasicWithUniqueCon;
src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java
+1 -1
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.EbeanServer;
import io.ebean.Transaction;
import io.ebean.PersistBatch;
import io.ebean.annotation.PersistBatch;
import org.tests.model.basic.Contact;
import org.tests.model.basic.EBasicVer;
import org.tests.model.converstation.Group;
src/test/java/org/tests/idkeys/TestGeneratedKeys.java
+4 -2
View File
@@ -1,9 +1,9 @@
package org.tests.idkeys;
import io.ebean.BaseTestCase;
import io.ebean.Platform;
import io.ebean.Transaction;
import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform;
import io.ebean.config.dbplatform.IdType;
import io.ebeaninternal.api.SpiEbeanServer;
import org.junit.Test;
@@ -14,7 +14,9 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
public class TestGeneratedKeys extends BaseTestCase {
src/test/java/org/tests/model/basic/xtra/DummyDao.java
+2 -2
View File
@@ -2,9 +2,9 @@ package org.tests.model.basic.xtra;
import io.ebean.Ebean;
import io.ebean.Transaction;
import io.ebean.TxType;
import io.ebean.annotation.PersistBatch;
import io.ebean.annotation.Transactional;
import io.ebean.PersistBatch;
import io.ebean.annotation.TxType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java
+1 -1
View File
@@ -3,7 +3,7 @@ package org.tests.model.basic.xtra;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Transaction;
import io.ebean.PersistBatch;
import io.ebean.annotation.PersistBatch;
import org.ebeantest.LoggedSqlCollector;
import org.junit.Test;
src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java
+1 -1
View File
@@ -3,7 +3,7 @@ package org.tests.model.basic.xtra;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Transaction;
import io.ebean.PersistBatch;
import io.ebean.annotation.PersistBatch;
import org.ebeantest.LoggedSqlCollector;
import org.junit.Test;
src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java
+1 -1
View File
@@ -3,7 +3,7 @@ package org.tests.model.basic.xtra;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Transaction;
import io.ebean.PersistBatch;
import io.ebean.annotation.PersistBatch;
import org.ebeantest.LoggedSqlCollector;
import org.junit.Test;
src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java
+3 -3
View File
@@ -2,8 +2,8 @@ package org.tests.model.m2o;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Platform;
import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform;
import io.ebean.annotation.Transactional;
import org.junit.Test;
@@ -23,9 +23,9 @@ public class TestManyToOneAsOne extends BaseTestCase {
runInserts();
}
private void runInserts() {
Addr junk = new Addr();
junk.setName("junk");
Ebean.save(junk);
src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java
+1 -1
View File
@@ -3,7 +3,7 @@ package org.tests.query.sqlquery;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Query;
import io.ebean.Platform;
import io.ebean.annotation.Platform;
import io.ebean.plugin.SpiServer;
import org.tests.model.basic.Customer;
import org.tests.model.basic.ResetBasicData;
src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java
+2 -3
View File
@@ -4,14 +4,13 @@ import io.ebean.BaseTestCase;
import io.ebean.BeanState;
import io.ebean.Ebean;
import io.ebean.EbeanServer;
import io.ebean.Platform;
import io.ebean.Query;
import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform;
import org.junit.Test;
import org.tests.model.basic.Customer;
import org.tests.model.basic.Order;
import org.tests.model.basic.ResetBasicData;
import org.junit.Test;
import java.util.List;
src/test/java/org/tests/softdelete/TestSoftDeleteTop.java
+1 -1
View File
@@ -3,7 +3,7 @@ package org.tests.softdelete;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Transaction;
import io.ebean.PersistBatch;
import io.ebean.annotation.PersistBatch;
import org.tests.model.softdelete.ESoftDelMid;
import org.tests.model.softdelete.ESoftDelTop;
import org.tests.model.softdelete.ESoftDelUp;
src/test/java/org/tests/transaction/TestBatchPersistCascade.java
+1 -1
View File
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.EbeanServer;
import io.ebean.Transaction;
import io.ebean.PersistBatch;
import io.ebean.annotation.PersistBatch;
import org.tests.model.basic.UTDetail;
import org.tests.model.basic.UTMaster;
import org.ebeantest.LoggedSqlCollector;
src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java
+1 -1
View File
@@ -3,7 +3,7 @@ package org.tests.transaction;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Transaction;
import io.ebean.TxIsolation;
import io.ebean.annotation.TxIsolation;
import org.junit.Test;
import javax.persistence.PersistenceException;
src/test/java/org/tests/transaction/TestCommitAndContinue.java
+5 -5
View File
@@ -3,14 +3,14 @@ package org.tests.transaction;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.EbeanServer;
import io.ebean.Platform;
import io.ebean.Transaction;
import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform;
import io.ebean.annotation.Transactional;
import org.tests.model.m2m.MnyB;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.tests.model.m2m.MnyB;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -23,7 +23,7 @@ public class TestCommitAndContinue extends BaseTestCase {
@Transactional
@IgnorePlatform({Platform.SQLSERVER, Platform.HSQLDB}) // they will dead lock
public void transactional_partialSuccess() {
MnyB a = new MnyB("a100");
MnyB b = new MnyB("b200");
@@ -103,7 +103,7 @@ public class TestCommitAndContinue extends BaseTestCase {
@Transactional
@IgnorePlatform({Platform.SQLSERVER, Platform.HSQLDB}) // they will dead lock
public void transactional_partialSuccess_secondTransactionInsert() {
MnyB a = new MnyB("a100");
MnyB b = new MnyB("b200");
MnyB c = new MnyB("c300");
@@ -143,7 +143,7 @@ public class TestCommitAndContinue extends BaseTestCase {
// insert failed after commitAndContinue
assertNull(server.find(MnyB.class, b.getId(), txnForAssert));
// successful insert using txn2
assertNotNull(server.find(MnyB.class, c.getId(), txnForAssert));
}
src/test/java/org/tests/transaction/TestNestedMandatory.java
+1 -1
View File
@@ -3,7 +3,7 @@ package org.tests.transaction;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Transaction;
import io.ebean.TxType;
import io.ebean.annotation.TxType;
import io.ebean.annotation.Transactional;
import org.junit.Test;
import org.slf4j.Logger;
src/test/java/org/tests/transaction/TestTransactionTryResources.java
+1 -2
View File
@@ -3,10 +3,9 @@ package org.tests.transaction;
import io.ebean.BaseTestCase;
import io.ebean.DuplicateKeyException;
import io.ebean.Ebean;
import io.ebean.Platform;
import io.ebean.Transaction;
import io.ebean.annotation.IgnorePlatform;
import io.ebean.annotation.Platform;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;