This is an automated email from the git hooks/post-receive script. New commit to branch feature/2892 in repository topia. See http://git.nuiton.org/topia.git commit 2bf5628b0855e1ffcfa9a54af71f2cb5c018916d Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Dec 12 17:02:33 2014 +0100 fix NPE --- .../persistence/TopiaConfigurationBuilder.java | 32 ++++++++++++---------- .../persistence/TopiaConfigurationBuilderTest.java | 2 +- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java index 3209426..bb43a50 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java @@ -5,6 +5,7 @@ import org.apache.commons.lang3.StringUtils; import java.io.File; import java.util.Collections; +import java.util.LinkedHashMap; import java.util.Map; public class TopiaConfigurationBuilder { @@ -90,31 +91,34 @@ public class TopiaConfigurationBuilder { protected static class TopiaConfigurationBean implements TopiaConfiguration { - private String topiaIdFactoryClassName; + protected String topiaIdFactoryClassName; - private String schemaName; + protected String schemaName; - private String jdbcDriverClassName; + protected String jdbcDriverClassName; - private String jdbcConnectionUrl; + protected String jdbcConnectionUrl; - private String jdbcConnectionUser; + protected String jdbcConnectionUser; - private String jdbcConnectionPassword; + protected String jdbcConnectionPassword; - private Map<String, String> hibernateExtraConfiguration; + protected Map<String, String> hibernateExtraConfiguration = + new LinkedHashMap<String, String>(); - private boolean connectionPoolingEnabled; + protected boolean connectionPoolingEnabled; - private Integer connectionPoolMinSize; + protected Integer connectionPoolMinSize; - private boolean initSchema; + protected boolean initSchema; - private Map<String, Class<? extends TopiaService>> declaredServices; + protected Map<String, Class<? extends TopiaService>> declaredServices = + new LinkedHashMap<String, Class<? extends TopiaService>>(); - private Map<String, Map<String, String>> declaredServicesConfiguration; + protected Map<String, Map<String, String>> declaredServicesConfiguration = + new LinkedHashMap<String, Map<String, String>>(); - private Integer connectionPoolMaxSize; + protected Integer connectionPoolMaxSize; @Override public String getTopiaIdFactoryClassName() { @@ -284,7 +288,7 @@ public class TopiaConfigurationBuilder { return new BuildStep(topiaConfigurationBean); } - public BuildStep useHiberateUpdate() { + public BuildStep useHibernateUpdate() { topiaConfigurationBean.addDeclaredService("migration", org.nuiton.topia.persistence.HibernateTopiaMigrationService.class, Collections.<String, String>emptyMap()); return new BuildStep(topiaConfigurationBean); } diff --git a/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaConfigurationBuilderTest.java b/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaConfigurationBuilderTest.java index 75b79f6..2843aab 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaConfigurationBuilderTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaConfigurationBuilderTest.java @@ -10,7 +10,7 @@ public class TopiaConfigurationBuilderTest { TopiaConfiguration topiaConfiguration = TopiaConfigurationBuilder.forH2DatabaseInTempDirectory() .doNotUseConnectionPooling() - .useHiberateUpdate() + .useHibernateUpdate() .build(); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.