Skip to content

Commit 2dd3f66

Browse files
rbygraverbygrave
committed
Update to API for Ebean 9.3.1
1 parent c9064b4 commit 2dd3f66

File tree

8 files changed

+45
-41
lines changed

8 files changed

+45
-41
lines changed

‎pom.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
<parent>
55
<groupId>org.avaje</groupId>
6-
<artifactId>oss-parent</artifactId>
7-
<version>1.1</version>
6+
<artifactId>java8-parent</artifactId>
7+
<version>1.3</version>
88
</parent>
99

1010
<groupId>org.avaje.ebean</groupId>
1111
<artifactId>ebean-mocker</artifactId>
12-
<version>8.4.2-SNAPSHOT</version>
12+
<version>9.3.1-SNAPSHOT</version>
1313
<name>ebean-mocker</name>
1414

1515
<description>Ability to set a Mockito mock EbeanServer as 'default' EbeanServer</description>
@@ -19,9 +19,7 @@
1919
</properties>
2020

2121
<scm>
22-
<connection>scm:git:https://github.com/ebean-orm/ebean-mocker.git</connection>
23-
<developerConnection>scm:git:https://github.com/ebean-orm/ebean-mocker.git</developerConnection>
24-
<url>https://github.com/ebean-orm/ebean-mocker.git</url>
22+
<developerConnection>scm:git:[email protected]:ebean-orm/ebean-mocker.git</developerConnection>
2523
<tag>HEAD</tag>
2624
</scm>
2725

@@ -45,7 +43,7 @@
4543
<dependency>
4644
<groupId>org.avaje.ebean</groupId>
4745
<artifactId>ebean</artifactId>
48-
<version>8.4.1</version>
46+
<version>9.3.1</version>
4947
<scope>provided</scope>
5048
</dependency>
5149

‎src/main/java/com/avaje/ebean/DelegateEbeanServer.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import java.util.List;
2828
import java.util.Map;
2929
import java.util.Set;
30+
import java.util.function.Consumer;
31+
import java.util.function.Predicate;
3032

3133
/**
3234
* Wraps an underlying EbeanServer.
@@ -552,13 +554,13 @@ public <T> int findCount(Query<T> query, Transaction transaction) {
552554
}
553555

554556
@Override
555-
public <A> List<A> findIds(Query<?> query, Transaction transaction) {
557+
public <A,T> List<A> findIds(Query<T> query, Transaction transaction) {
556558
methodCalls.add(MethodCall.of("findIds").with("query", query, "transaction", transaction));
557559
return find.findIds(query, transaction);
558560
}
559561

560562
@Override
561-
public <A> List<A> findSingleAttributeList(Query<?> query, Transaction transaction) {
563+
public <A,T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction) {
562564
methodCalls.add(MethodCall.of("findSingleAttributeList").with("query", query, "transaction", transaction));
563565
return find.findSingleAttributeList(query, transaction); }
564566

@@ -569,13 +571,13 @@ public <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction)
569571
}
570572

571573
@Override
572-
public <T> void findEach(Query<T> query, QueryEachConsumer<T> consumer, Transaction transaction) {
574+
public <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction) {
573575
methodCalls.add(MethodCall.of("findEach").with("query", query, "consumer", consumer, "transaction", transaction));
574576
find.findEach(query, consumer, transaction);
575577
}
576578

577579
@Override
578-
public <T> void findEachWhile(Query<T> query, QueryEachWhileConsumer<T> consumer, Transaction transaction) {
580+
public <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction) {
579581
methodCalls.add(MethodCall.of("findEachWhile").with("query", query, "consumer", consumer, "transaction", transaction));
580582
find.findEachWhile(query, consumer, transaction);
581583
}
@@ -643,13 +645,13 @@ public SqlRow findUnique(SqlQuery sqlQuery, Transaction transaction) {
643645
}
644646

645647
@Override
646-
public void findEach(SqlQuery sqlQuery, QueryEachConsumer<SqlRow> consumer, Transaction transaction) {
648+
public void findEach(SqlQuery sqlQuery, Consumer<SqlRow> consumer, Transaction transaction) {
647649
methodCalls.add(MethodCall.of("findEach").with("sqlQuery", sqlQuery, "consumer", consumer, "transaction", transaction));
648650
findSqlQuery.findEach(sqlQuery, consumer, transaction);
649651
}
650652

651653
@Override
652-
public void findEachWhile(SqlQuery sqlQuery, QueryEachWhileConsumer<SqlRow> consumer, Transaction transaction) {
654+
public void findEachWhile(SqlQuery sqlQuery, Predicate<SqlRow> consumer, Transaction transaction) {
653655
methodCalls.add(MethodCall.of("findEachWhile").with("sqlQuery", sqlQuery, "consumer", consumer, "transaction", transaction));
654656
findSqlQuery.findEachWhile(sqlQuery, consumer, transaction);
655657
}

‎src/main/java/com/avaje/ebean/NoopEbeanServer.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import java.util.List;
1616
import java.util.Map;
1717
import java.util.Set;
18+
import java.util.function.Consumer;
19+
import java.util.function.Predicate;
1820

1921
/**
2022
* This is an EbeanServer implementation that does nothing.
@@ -249,12 +251,12 @@ public <T> int findCount(Query<T> query, Transaction transaction) {
249251
}
250252

251253
@Override
252-
public <A> List<A> findSingleAttributeList(Query<?> query, Transaction transaction) {
254+
public <A,T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction) {
253255
return null;
254256
}
255257

256258
@Override
257-
public <A> List<A> findIds(Query<?> query, Transaction transaction) {
259+
public <A,T> List<A> findIds(Query<T> query, Transaction transaction) {
258260
return Mockito.mock(List.class);
259261
}
260262

@@ -264,12 +266,12 @@ public <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction)
264266
}
265267

266268
@Override
267-
public <T> void findEach(Query<T> query, QueryEachConsumer<T> consumer, Transaction transaction) {
269+
public <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction) {
268270

269271
}
270272

271273
@Override
272-
public <T> void findEachWhile(Query<T> query, QueryEachWhileConsumer<T> consumer, Transaction transaction) {
274+
public <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction) {
273275

274276
}
275277

@@ -319,12 +321,12 @@ public SqlRow findUnique(SqlQuery query, Transaction transaction) {
319321
}
320322

321323
@Override
322-
public void findEach(SqlQuery sqlQuery, QueryEachConsumer<SqlRow> queryEachConsumer, Transaction transaction) {
324+
public void findEach(SqlQuery sqlQuery, Consumer<SqlRow> queryEachConsumer, Transaction transaction) {
323325

324326
}
325327

326328
@Override
327-
public void findEachWhile(SqlQuery sqlQuery, QueryEachWhileConsumer<SqlRow> queryEachWhileConsumer, Transaction transaction) {
329+
public void findEachWhile(SqlQuery sqlQuery, Predicate<SqlRow> queryEachWhileConsumer, Transaction transaction) {
328330

329331
}
330332

‎src/main/java/com/avaje/ebean/TDEbeanServer.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import java.util.List;
1414
import java.util.Map;
1515
import java.util.Set;
16+
import java.util.function.Consumer;
17+
import java.util.function.Predicate;
1618

1719
/**
1820
* Test double for EbeanServer.
@@ -219,12 +221,12 @@ public <T> int findCount(Query<T> query, Transaction transaction) {
219221
}
220222

221223
@Override
222-
public <A> List<A> findIds(Query<?> query, Transaction transaction) {
224+
public <A,T> List<A> findIds(Query<T> query, Transaction transaction) {
223225
return null;
224226
}
225227

226228
@Override
227-
public <A> List<A> findSingleAttributeList(Query<?> query, Transaction transaction) {
229+
public <A,T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction) {
228230
return null;
229231
}
230232

@@ -234,12 +236,12 @@ public <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction)
234236
}
235237

236238
@Override
237-
public <T> void findEach(Query<T> query, QueryEachConsumer<T> consumer, Transaction transaction) {
239+
public <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction) {
238240

239241
}
240242

241243
@Override
242-
public <T> void findEachWhile(Query<T> query, QueryEachWhileConsumer<T> consumer, Transaction transaction) {
244+
public <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction) {
243245

244246
}
245247

@@ -294,12 +296,12 @@ public SqlRow findUnique(SqlQuery query, Transaction transaction) {
294296
}
295297

296298
@Override
297-
public void findEach(SqlQuery sqlQuery, QueryEachConsumer<SqlRow> queryEachConsumer, Transaction transaction) {
299+
public void findEach(SqlQuery sqlQuery, Consumer<SqlRow> queryEachConsumer, Transaction transaction) {
298300

299301
}
300302

301303
@Override
302-
public void findEachWhile(SqlQuery sqlQuery, QueryEachWhileConsumer<SqlRow> queryEachWhileConsumer, Transaction transaction) {
304+
public void findEachWhile(SqlQuery sqlQuery, Predicate<SqlRow> queryEachWhileConsumer, Transaction transaction) {
303305

304306
}
305307

‎src/main/java/com/avaje/ebean/delegate/DelegateFind.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import com.avaje.ebean.FutureRowCount;
77
import com.avaje.ebean.PagedList;
88
import com.avaje.ebean.Query;
9-
import com.avaje.ebean.QueryEachConsumer;
10-
import com.avaje.ebean.QueryEachWhileConsumer;
119
import com.avaje.ebean.QueryIterator;
1210
import com.avaje.ebean.Transaction;
1311
import com.avaje.ebean.Version;
@@ -16,6 +14,8 @@
1614
import java.util.List;
1715
import java.util.Map;
1816
import java.util.Set;
17+
import java.util.function.Consumer;
18+
import java.util.function.Predicate;
1919

2020
/**
2121
* Wraps an underlying EbeanServer.
@@ -77,12 +77,12 @@ public <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction)
7777
}
7878

7979
@Override
80-
public <T> void findEach(Query<T> query, QueryEachConsumer<T> consumer, Transaction transaction) {
80+
public <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction) {
8181
delegate.findEach(query, consumer, transaction);
8282
}
8383

8484
@Override
85-
public <T> void findEachWhile(Query<T> query, QueryEachWhileConsumer<T> consumer, Transaction transaction) {
85+
public <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction) {
8686
delegate.findEachWhile(query, consumer, transaction);
8787
}
8888

‎src/main/java/com/avaje/ebean/delegate/DelegateFindSqlQuery.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.avaje.ebean.delegate;
22

33
import com.avaje.ebean.EbeanServer;
4-
import com.avaje.ebean.QueryEachConsumer;
5-
import com.avaje.ebean.QueryEachWhileConsumer;
64
import com.avaje.ebean.SqlQuery;
75
import com.avaje.ebean.SqlRow;
86
import com.avaje.ebean.Transaction;
97

108
import java.util.List;
9+
import java.util.function.Consumer;
10+
import java.util.function.Predicate;
1111

1212
/**
1313
* Wraps an underlying EbeanServer.
@@ -39,12 +39,12 @@ public SqlRow findUnique(SqlQuery query, Transaction transaction) {
3939
}
4040

4141
@Override
42-
public void findEach(SqlQuery sqlQuery, QueryEachConsumer<SqlRow> consumer, Transaction transaction) {
42+
public void findEach(SqlQuery sqlQuery, Consumer<SqlRow> consumer, Transaction transaction) {
4343
delegate.findEach(sqlQuery, consumer, transaction);
4444
}
4545

4646
@Override
47-
public void findEachWhile(SqlQuery sqlQuery, QueryEachWhileConsumer<SqlRow> consumer, Transaction transaction) {
47+
public void findEachWhile(SqlQuery sqlQuery, Predicate<SqlRow> consumer, Transaction transaction) {
4848
delegate.findEachWhile(sqlQuery, consumer, transaction);
4949
}
5050
}

‎src/main/java/com/avaje/ebean/delegate/InterceptFind.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
import com.avaje.ebean.FutureRowCount;
66
import com.avaje.ebean.PagedList;
77
import com.avaje.ebean.Query;
8-
import com.avaje.ebean.QueryEachConsumer;
9-
import com.avaje.ebean.QueryEachWhileConsumer;
108
import com.avaje.ebean.QueryIterator;
119
import com.avaje.ebean.Transaction;
1210
import com.avaje.ebean.Version;
1311

1412
import java.util.List;
1513
import java.util.Map;
1614
import java.util.Set;
15+
import java.util.function.Consumer;
16+
import java.util.function.Predicate;
1717

1818
/**
1919
* Provides an adaption layer for find methods.
@@ -32,9 +32,9 @@ public interface InterceptFind {
3232

3333
<A> List<A> findIds(Query<?> query, Transaction transaction);
3434

35-
<T> void findEach(Query<T> query, QueryEachConsumer<T> consumer, Transaction transaction);
35+
<T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction);
3636

37-
<T> void findEachWhile(Query<T> query, QueryEachWhileConsumer<T> consumer, Transaction transaction);
37+
<T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction);
3838

3939
<T> List<T> findList(Query<T> query, Transaction transaction);
4040

‎src/main/java/com/avaje/ebean/delegate/InterceptFindSqlQuery.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.avaje.ebean.delegate;
22

3-
import com.avaje.ebean.QueryEachConsumer;
4-
import com.avaje.ebean.QueryEachWhileConsumer;
53
import com.avaje.ebean.SqlQuery;
64
import com.avaje.ebean.SqlRow;
75
import com.avaje.ebean.Transaction;
86

97
import java.util.List;
8+
import java.util.function.Consumer;
9+
import java.util.function.Predicate;
1010

1111
/**
1212
* Interception for SqlQuery.
@@ -17,7 +17,7 @@ public interface InterceptFindSqlQuery {
1717

1818
SqlRow findUnique(SqlQuery query, Transaction transaction);
1919

20-
void findEach(SqlQuery sqlQuery, QueryEachConsumer<SqlRow> consumer, Transaction transaction);
20+
void findEach(SqlQuery sqlQuery, Consumer<SqlRow> consumer, Transaction transaction);
2121

22-
void findEachWhile(SqlQuery sqlQuery, QueryEachWhileConsumer<SqlRow> consumer, Transaction transaction);
22+
void findEachWhile(SqlQuery sqlQuery, Predicate<SqlRow> consumer, Transaction transaction);
2323
}

0 commit comments

Comments
 (0)