This is an automated email from the git hooks/post-receive script. New commit to branch master in repository topia-sample-project. See https://gitlab.nuiton.org/nuiton/topia-sample-project.git commit 40d6e5b74532ac21d1e30efc451d0fb855b15766 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jun 12 15:45:46 2015 +0200 Make the project more buildable --- pom.xml | 8 +++++++- src/main/java/com/company/MyLibraryApplication.java | 14 +++++++++----- .../com/company/app/MyLibraryTopiaApplicationContext.java | 11 +++-------- src/test/java/com/company/SampleTest.java | 15 ++++++++++++--- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index e197597..5f95d4b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <properties> <eugeneVersion>2.13</eugeneVersion> - <topiaVersion>[3.0-beta-14,)</topiaVersion> + <topiaVersion>3.0-beta-17</topiaVersion> </properties> <dependencies> @@ -21,6 +21,12 @@ <version>${topiaVersion}</version> </dependency> <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.3.176</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/src/main/java/com/company/MyLibraryApplication.java b/src/main/java/com/company/MyLibraryApplication.java index aab3031..be74b49 100644 --- a/src/main/java/com/company/MyLibraryApplication.java +++ b/src/main/java/com/company/MyLibraryApplication.java @@ -8,9 +8,8 @@ import com.company.app.entities.Book; import com.company.app.entities.BookTopiaDao; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; - -import java.util.HashMap; -import java.util.Map; +import org.nuiton.topia.persistence.TopiaConfiguration; +import org.nuiton.topia.persistence.TopiaConfigurationBuilder; /** * This is a minimal sample application that start topia. @@ -19,10 +18,15 @@ public class MyLibraryApplication { public static void main(String[] args) { - Map<String, String> configuration = new HashMap<String, String>(); + TopiaConfigurationBuilder topiaConfigurationBuilder = new TopiaConfigurationBuilder(); + TopiaConfiguration topiaConfiguration = topiaConfigurationBuilder + . forH2DatabaseInTempDirectory() + . onlyCreateSchemaIfDatabaseIsEmpty() + . doNotValidateSchemaOnStartup() + . build(); MyLibraryTopiaApplicationContext applicationContext = - new MyLibraryTopiaApplicationContext(configuration); + new MyLibraryTopiaApplicationContext(topiaConfiguration); MyLibraryTopiaPersistenceContext persistenceContext = applicationContext.newPersistenceContext(); diff --git a/src/main/java/com/company/app/MyLibraryTopiaApplicationContext.java b/src/main/java/com/company/app/MyLibraryTopiaApplicationContext.java index 67c696b..c18c471 100644 --- a/src/main/java/com/company/app/MyLibraryTopiaApplicationContext.java +++ b/src/main/java/com/company/app/MyLibraryTopiaApplicationContext.java @@ -1,19 +1,14 @@ package com.company.app; -import java.util.Map; -import java.util.Properties; +import org.nuiton.topia.persistence.TopiaConfiguration; /** * A class to add some methods on this project's {@link org.nuiton.topia.persistence.TopiaApplicationContext}. */ public class MyLibraryTopiaApplicationContext extends AbstractMyLibraryTopiaApplicationContext { - public MyLibraryTopiaApplicationContext(Properties properties) { - super(properties); - } - - public MyLibraryTopiaApplicationContext(Map<String, String> configuration) { - super(configuration); + public MyLibraryTopiaApplicationContext(TopiaConfiguration topiaConfiguration) { + super(topiaConfiguration); } public void doSomethingOnThisApplicationContext() { diff --git a/src/test/java/com/company/SampleTest.java b/src/test/java/com/company/SampleTest.java index 59d5b85..23d3631 100644 --- a/src/test/java/com/company/SampleTest.java +++ b/src/test/java/com/company/SampleTest.java @@ -16,6 +16,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.topia.persistence.TopiaConfiguration; +import org.nuiton.topia.persistence.TopiaConfigurationBuilder; import java.util.HashMap; import java.util.List; @@ -33,8 +35,13 @@ public class SampleTest { @BeforeClass public static void createApplicationContext() { - Map<String, String> configuration = new HashMap<String, String>(); - applicationContext = new MyLibraryTopiaApplicationContext(configuration); + TopiaConfigurationBuilder topiaConfigurationBuilder = new TopiaConfigurationBuilder(); + TopiaConfiguration topiaConfiguration = topiaConfigurationBuilder + . forH2DatabaseInTempDirectory() + . onlyCreateSchemaIfDatabaseIsEmpty() + . doNotValidateSchemaOnStartup() + . build(); + applicationContext = new MyLibraryTopiaApplicationContext(topiaConfiguration); } @AfterClass @@ -50,7 +57,7 @@ public class SampleTest { } @After - public void clonePersistenceContext() { + public void closePersistenceContext() { persistenceContext.close(); } @@ -91,6 +98,8 @@ public class SampleTest { @Test public void testRetrieveEntities() { + testCreateEntities(); + Author platon = authorDao . forNameEquals("Platon") . findUnique(); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.