diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java index 9fc3ee31fa..4c69d7aec2 100644 --- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java +++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java @@ -546,6 +546,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings { private String dumpMetricsOptions; private LengthCheck lengthCheck = LengthCheck.OFF; + private Function metricNaming = MetricNamingMatch.INSTANCE; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 7dd2e9a33b..5f592a540e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -8,13 +8,10 @@ import io.ebean.bean.MutableValueInfo; import io.ebean.bean.PersistenceContext; import io.ebean.config.EncryptKey; -import io.ebean.config.LengthCheck; import io.ebean.config.dbplatform.DbEncryptFunction; import io.ebean.config.dbplatform.DbPlatformType; -import io.ebean.config.dbplatform.ExtraDbTypes; import io.ebean.core.type.DataReader; import io.ebean.core.type.DocPropertyType; -import io.ebean.core.type.InputStreamInfo; import io.ebean.core.type.ScalarType; import io.ebean.plugin.Property; import io.ebean.text.StringParser; @@ -50,7 +47,6 @@ import java.io.DataOutput; import java.io.IOException; import java.lang.reflect.Field; -import java.nio.charset.StandardCharsets; import java.sql.SQLException; import java.sql.Types; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJsonLength.java b/ebean-test/src/test/java/org/tests/json/TestDbJsonLength.java index 0e35e1f563..0fd9a35865 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJsonLength.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJsonLength.java @@ -11,7 +11,7 @@ class TestDbJsonLength { - /** + /** * The property 'EBasicJsonMap.content' is annotated with @DbJson(length=5000). So we assume, that we cannot save Json-objects * where the serialized form exceed that limit and we would expect an error on save. * The length check works for platforms like h2, as H2 uses a 'varchar(5000)'. So it is impossible to save such long jsons,