github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-23 23:28:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1365 - Regression: property ebean.namingConvention=io.ebean.config.MatchingNamingConvention ... no longer works

Browse Source
This commit is contained in:
Rob Bygrave
2018-04-18 21:24:37 +12:00
parent 12108ada38
commit 756f867ed2
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebean/config/ServerConfig.java
+1 -1
View File
@@ -2871,7 +2871,7 @@ public class ServerConfig {
}
private NamingConvention createNamingConvention(PropertiesWrapper properties, NamingConvention namingConvention) {
NamingConvention nc = properties.createInstance(NamingConvention.class, "namingconvention", null);
NamingConvention nc = properties.createInstance(NamingConvention.class, "namingConvention", null);
return (nc != null) ? nc : namingConvention;
}
src/test/java/io/ebean/config/ServerConfigTest.java
+3
View File
@@ -65,6 +65,8 @@ public class ServerConfigTest {
props.setProperty("notifyL2CacheInForeground", "true");
props.setProperty("idType", "SEQUENCE");
props.setProperty("mappingLocations", "classpath:/foo;bar");
props.setProperty("namingConvention", "io.ebean.config.MatchingNamingConvention");
serverConfig.loadFromProperties(props);
@@ -72,6 +74,7 @@ public class ServerConfigTest {
assertTrue(serverConfig.isNotifyL2CacheInForeground());
assertTrue(serverConfig.isDbOffline());
assertTrue(serverConfig.isAutoReadOnlyDataSource());
assertThat(serverConfig.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
assertEquals(IdType.SEQUENCE, serverConfig.getIdType());
assertEquals(PersistBatch.INSERT, serverConfig.getPersistBatch());