Skip to content

Commit da2d03d

Browse files
committed
update to act-1.6
1 parent 02ff3b1 commit da2d03d

File tree

4 files changed

+34
-4
lines changed

4 files changed

+34
-4
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<groupId>org.actframework</groupId>
2222
<artifactId>act-ebean</artifactId>
2323
<packaging>jar</packaging>
24-
<version>1.2.4-SNAPSHOT</version>
24+
<version>1.3.0-SNAPSHOT</version>
2525

2626
<name>ACT Ebean</name>
2727
<description>Provides SQL database access through Ebean ORM library (java 7+)</description>
@@ -66,8 +66,8 @@
6666
<ebean-agent.version>8.1.1</ebean-agent.version>
6767
<ebean-agent-loader.version>2.1.2</ebean-agent-loader.version>
6868

69-
<act.version>1.4.11</act.version>
70-
<act-sql-common.version>1.1.2</act-sql-common.version>
69+
<act.version>1.6.0-SNAPSHOT</act.version>
70+
<act-sql-common.version>1.2.0-SNAPSHOT</act-sql-common.version>
7171

7272
</properties>
7373

src/main/java/act/db/ebean/EbeanDao.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,16 @@ public List<MODEL_TYPE> findAllAsList() {
195195
return q().findList();
196196
}
197197

198+
@Override
199+
public MODEL_TYPE findLatest() {
200+
throw E.unsupport();
201+
}
202+
203+
@Override
204+
public MODEL_TYPE findLastModified() {
205+
throw E.unsupport();
206+
}
207+
198208
@Override
199209
public MODEL_TYPE reload(MODEL_TYPE entity) {
200210
ebean().refresh(entity);

src/main/java/act/db/ebean/EbeanService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public final class EbeanService extends SqlDbService {
5959
public EbeanService(final String dbId, final App app, final Map<String, String> config) {
6060
super(dbId, app, config);
6161
String s = config.get("agentPackage");
62-
final String agentPackage = null == s ? S.string(app().config().get(AppConfigKey.SCAN_PACKAGE)) : S.string(s).trim();
62+
final String agentPackage = null == s ? S.string(app().config().get(AppConfigKey.SCAN_PACKAGE, null)) : S.string(s).trim();
6363
E.invalidConfigurationIf(S.blank(agentPackage), "\"agentPackage\" not configured");
6464
if (isTraceEnabled()) {
6565
trace("\"agentPackage\" configured: %s", agentPackage);

src/test/java/act/db/ebean/VersionTest.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
package act.db.ebean;
22

3+
/*-
4+
* #%L
5+
* ACT Ebean
6+
* %%
7+
* Copyright (C) 2015 - 2017 ActFramework
8+
* %%
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
* #L%
21+
*/
22+
323
import org.junit.Test;
424
import org.osgl.ut.TestBase;
525

0 commit comments

Comments
 (0)