From 756f867ed2ddb80a7785abe3985a82545b4f560b Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 18 Apr 2018 21:24:37 +1200 Subject: [PATCH] #1365 - Regression: property ebean.namingConvention=io.ebean.config.MatchingNamingConvention ... no longer works --- src/main/java/io/ebean/config/ServerConfig.java | 2 +- src/test/java/io/ebean/config/ServerConfigTest.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java index 8ef5bf831..5b14d2bfc 100644 --- a/src/main/java/io/ebean/config/ServerConfig.java +++ b/src/main/java/io/ebean/config/ServerConfig.java @@ -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; } diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java index 03c86481d..b404b7451 100644 --- a/src/test/java/io/ebean/config/ServerConfigTest.java +++ b/src/test/java/io/ebean/config/ServerConfigTest.java @@ -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());