increase version to 0.6; update to act-0.6

greenlaw110 · greenlaw110 · commit 3afc357b26b7 · 2017-02-23T08:05:00.000+11:00
diff --git a/pom.xml b/pom.xml
@@ -18,6 +18,7 @@
 ********************************************
 *            version history
 ********************************************
+0.6.0 - update act to 0.6.0
 0.5.0 - upgrade to act 0.5.0 (to reserve 0.4.0 for techempower test)
 0.4.0 - upgrade to act 0.4.0
 0.3.1 - upgrade to act 0.3.1
@@ -35,7 +36,7 @@
   <groupId>org.actframework</groupId>
   <artifactId>act-ebean</artifactId>
   <packaging>jar</packaging>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
 
   <name>ACT Ebean</name>
   <description>The Ebean Plugin for Actframework SQL database access</description>
@@ -45,7 +46,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <git.url>git@github.com:actframework/act-ebean.git</git.url>
-    <act.version>0.5.0-SNAPSHOT</act.version>
+    <act.version>0.6.0-SNAPSHOT</act.version>
     <ebean.version>8.8.1</ebean.version>
     <ebean-agent.version>8.1.1</ebean-agent.version>
     <ebean-agent-loader.version>2.1.2</ebean-agent-loader.version>
diff --git a/src/main/java/act/db/ebean/EbeanDao.java b/src/main/java/act/db/ebean/EbeanDao.java
@@ -203,10 +203,10 @@ public MODEL_TYPE save(Transaction tx, MODEL_TYPE entity) {
     }
 
     @Override
-    public void save(Iterable<MODEL_TYPE> iterable) {
+    public List<MODEL_TYPE> save(Iterable<MODEL_TYPE> iterable) {
         List<MODEL_TYPE> list = C.list(iterable);
         if (list.isEmpty()) {
-            return;
+            return list;
         }
         Transaction transaction = ebean().createTransaction(TxIsolation.READ_COMMITED);
         transaction.setBatchMode(true);
@@ -220,6 +220,7 @@ public void save(Iterable<MODEL_TYPE> iterable) {
         } finally {
             transaction.end();
         }
+        return list;
     }
 
     public void save(Transaction tx, Iterable<MODEL_TYPE> iterable) {

Original file line number	Diff line number	Diff line change
`@@ -203,10 +203,10 @@ public MODEL_TYPE save(Transaction tx, MODEL_TYPE entity) {`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`@Override`
`206`		`- public void save(Iterable<MODEL_TYPE> iterable) {`
	`206`	`+ public List<MODEL_TYPE> save(Iterable<MODEL_TYPE> iterable) {`
`207`	`207`	`List<MODEL_TYPE> list = C.list(iterable);`
`208`	`208`	`if (list.isEmpty()) {`
`209`		`- return;`
	`209`	`+ return list;`
`210`	`210`	`}`
`211`	`211`	`Transaction transaction = ebean().createTransaction(TxIsolation.READ_COMMITED);`
`212`	`212`	`transaction.setBatchMode(true);`
`@@ -220,6 +220,7 @@ public void save(Iterable<MODEL_TYPE> iterable) {`
`220`	`220`	`} finally {`
`221`	`221`	`transaction.end();`
`222`	`222`	`}`
	`223`	`+ return list;`
`223`	`224`	`}`
`224`	`225`
`225`	`226`	`public void save(Transaction tx, Iterable<MODEL_TYPE> iterable) {`