From 78912d75e0392c3ca363938427b70db9bc7bae6d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 2 Mar 2018 13:45:31 +1300 Subject: [PATCH] #1306 - No effective change - javadoc update --- .../java/io/ebean/config/ServerConfig.java | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java index 679692b88..b0b341fb8 100644 --- a/src/main/java/io/ebean/config/ServerConfig.java +++ b/src/main/java/io/ebean/config/ServerConfig.java @@ -293,7 +293,7 @@ public class ServerConfig { /** * When true create a read only DataSource using readOnlyDataSourceConfig defaulting values from dataSourceConfig. * I believe this will default to true in some future release (as it has a nice performance benefit). - * + *

* autoReadOnlyDataSource is an unfortunate name for this config option but I haven't come up with a better one. */ private boolean autoReadOnlyDataSource; @@ -483,8 +483,7 @@ public class ServerConfig { /** * Should the javax.validation.constraints.NotNull enforce a notNull column in DB. - * If set to false, you have to use io.ebean.annotation.NotNull to explicityl create - * a not null column. + * If set to false, use io.ebean.annotation.NotNull or Column(nullable=true). */ private boolean useJavaxValidationNotNull = true; @@ -3034,14 +3033,12 @@ public class ServerConfig { } /** - * Controlws when Ebean should generate a NOT NULL column. - * If an io.ebean.annotation.NotNull is present, Ebean generates - * NOT NULL columns - * If set to true (default) Ebean generates also - * NOT NULL columns when a &x64;javax.validation.contstraints.NotNull - * annotation is present (and it is in Default group.) - * If set to false the &x64;javax.validation.contstraints.NotNull is - * ignored + * Controls if Ebean should ignore &x64;javax.validation.contstraints.NotNull + * with respect to generating a NOT NULL column. + *

+ * Normally when Ebean sees javax NotNull annotation it means that column is defined as NOT NULL. + * Set this to false and the javax NotNull annotation is effectively ignored (and + * we instead use Ebean's own NotNull annotation or JPA Column(nullable=false) annotation. */ public void setUseJavaxValidationNotNull(boolean useJavaxValidationNotNull) { this.useJavaxValidationNotNull = useJavaxValidationNotNull; @@ -3091,7 +3088,6 @@ public class ServerConfig { return dataSource; } - /** /** * Specify how UUID is stored. */ @@ -3164,5 +3160,5 @@ public class ServerConfig { VERSION4, VERSION1, VERSION1RND - }; + } }