From 17b48ad181157f25f388f120d44c6761b89a889b Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 28 Dec 2019 19:01:39 -0500 Subject: [PATCH] change HibernateConfiguration.showSql from boolean to Boolean --- .../wizard/server/config/HibernateConfiguration.java | 4 +++- .../wizard/spring/config/rdbms/RdbmsConfigCommon.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/HibernateConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/HibernateConfiguration.java index bb4cc38..272f5fa 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/HibernateConfiguration.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/HibernateConfiguration.java @@ -12,7 +12,9 @@ public class HibernateConfiguration { @Getter @Setter private String[] entityPackages; @Getter @Setter private String dialect; - @Getter @Setter private boolean showSql = false; + @Getter @Setter private Boolean showSql = false; + public boolean showSql() { return showSql != null && showSql; } + @Getter @Setter private String hbm2ddlAuto; @Getter @Setter private String validationMode; @Getter @Setter private boolean applyValidatorToDDL = true; diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/spring/config/rdbms/RdbmsConfigCommon.java b/wizard-server/src/main/java/org/cobbzilla/wizard/spring/config/rdbms/RdbmsConfigCommon.java index 431fac8..1f870a2 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/spring/config/rdbms/RdbmsConfigCommon.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/spring/config/rdbms/RdbmsConfigCommon.java @@ -86,7 +86,7 @@ public class RdbmsConfigCommon { final HibernateConfiguration hibernateConfiguration = getDatabase().getHibernate(); final Properties properties = new Properties(); properties.put("hibernate.dialect", hibernateConfiguration.getDialect()); - properties.put("hibernate.show_sql", hibernateConfiguration.isShowSql()); + properties.put("hibernate.show_sql", hibernateConfiguration.showSql()); properties.put("hibernate.hbm2ddl.auto", hibernateConfiguration.getHbm2ddlAuto()); properties.put("hibernate.validator.apply_to_ddl", hibernateConfiguration.isApplyValidatorToDDL()); properties.put("javax.persistence.verification.mode", hibernateConfiguration.getValidationMode());