This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 737af7e9114e3330a5da48d9cf00b20ee050eb8b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 26 12:45:03 2015 +0200 Ajout d'un drapeau pour pouvoir créer des bases h2 vides --- .../dto/DataSourceCreateConfigurationDto.java | 15 ++++++++++++++- .../service/DataSourceServiceTopiaTest.java | 22 ++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java index 983f7b1..ec129f9 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java @@ -32,6 +32,19 @@ public class DataSourceCreateConfigurationDto extends AbstractObserveDto { */ protected String[] optionalImportDataIds; + /** + * Pour autoriser la création d'une base vide (utilisé pour les bases temporaires) + */ + protected boolean canCreateEmptyDatabase; + + public boolean isCanCreateEmptyDatabase() { + return canCreateEmptyDatabase; + } + + public void setCanCreateEmptyDatabase(boolean canCreateEmptyDatabase) { + this.canCreateEmptyDatabase = canCreateEmptyDatabase; + } + public boolean isImportDatabase() { return optionalImportDatabase != null; } @@ -90,7 +103,7 @@ public class DataSourceCreateConfigurationDto extends AbstractObserveDto { } else { - if (!isImportReferential()) { + if (!isCanCreateEmptyDatabase() && !isImportReferential()) { // on n'autorise pas la création d'une base sans référentiel. throw new DataSourceCreateWithNoReferentialImportException(this); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java index 4361709..4441b80 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java @@ -59,15 +59,8 @@ public class DataSourceServiceTopiaTest { @Test public void testOpen() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto() { - - private static final long serialVersionUID = 1L; - - @Override - public void validateConfiguration() { - // no validation - } - }; + DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto(); + dataSourceCreateConfiguration.setCanCreateEmptyDatabase(true); service.create(dataSourceCreateConfiguration); service.open(); @@ -78,15 +71,8 @@ public class DataSourceServiceTopiaTest { @Test public void testCreateEmptyDataSource() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { - DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto() { - - private static final long serialVersionUID = 1L; - - @Override - public void validateConfiguration() { - // no validation - } - }; + DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto(); + dataSourceCreateConfiguration.setCanCreateEmptyDatabase(true); service.create(dataSourceCreateConfiguration); assertSchemaCreated(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.