This is an automated email from the git hooks/post-receive script. New commit to branch feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour in repository tutti. See http://git.codelutin.com/tutti.git commit 7b927249b2d1d04bbaf4bdf1772b2c2ecc636e11 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 12:01:41 2015 +0100 Revue bis de la configuration des tests --- .../referentiel/LengthWeightParemetersTest.java | 7 ++--- .../services/ApplicationContextResource.java | 24 ++++++--------- .../ird/observe/services/DataSourceResource.java | 28 +++++++++-------- .../observe/services/binder/BinderEngineTest.java | 4 +-- .../services/service/AbstractServiceTopiaTest.java | 8 +++-- .../DataSourceDumpProducerServiceTopiaTest.java | 4 +-- .../service/DataSourceServiceTopiaTest.java | 16 +++++----- .../services/service/MigrateTestsDatabases.java | 12 ++++---- .../service/ReferentialServiceTopiaTest.java | 12 ++++---- .../ConsolidateDataServiceTopiaTest.java | 8 ++--- .../report/AbstractReportServiceTopiaTest.java | 4 +-- .../actions/validate/ValidateServiceTopiaTest.java | 4 +-- ...tLonglineDetailCompositionServiceTopiaTest.java | 10 +++--- .../service/seine/RouteServiceTopiaTest.java | 4 +-- .../seine/TargetSampleServiceTopiaTest.java | 4 +-- .../seine/TripSeineGearUseServiceTopiaTest.java | 8 ++--- .../service/seine/TripSeineServiceTopiaTest.java | 14 ++++----- .../ApplicationContextResourceConfiguration.java | 28 ----------------- .../test/DataSourceResourceConfiguration.java | 36 ---------------------- .../main/java/fr/ird/observe/test/TestHelper.java | 10 ++++++ .../test/spi/CopyDatabaseConfiguration.java | 17 ++++++++++ .../test/spi/DatabaseNameConfiguration.java | 21 +++++++++++++ .../test/spi/DatabaseVersionConfiguration.java | 19 ++++++++++++ 23 files changed, 152 insertions(+), 150 deletions(-) diff --git a/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java b/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java index eb8e803..563339d 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java @@ -26,10 +26,8 @@ import com.opensymphony.xwork2.interceptor.annotations.After; import fr.ird.observe.ObserveTopiaDaoSupplier; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.constants.ReferenceStatus; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; -import fr.ird.observe.test.DataSourceResourceConfiguration; import fr.ird.observe.services.service.AbstractServiceTopiaTest; -import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -45,7 +43,6 @@ import java.util.Date; * @author Tony Chemit - chemit@codelutin.com * @since 1.8 */ -@ApplicationContextResourceConfiguration(dbName = DatabaseName.referentiel, dbVersion = AbstractServiceTopiaTest.DEFAULT_VERSION) public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { /** Logger */ @@ -136,7 +133,7 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { * See http://forge.codelutin.com/issues/7628 */ @Test - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration public void testGetCorrectLengthWeightParameter() { SpeciesTopiaDao speciesDAO = persistenceContext.getSpeciesDao(); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java index 40f097a..c53aa19 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java @@ -33,8 +33,9 @@ import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationExce import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.services.service.DataSourceService; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; import fr.ird.observe.test.TestHelper; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.spi.DatabaseVersionConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -196,11 +197,14 @@ public class ApplicationContextResource implements TestRule { TestHelper.initTest(testClass); - ApplicationContextResourceConfiguration dataSourceTestConfiguration = getApplicationContextTestConfiguration(testClass); + DatabaseNameConfiguration databaseNameConfiguration = TestHelper.getAnnotation(testClass, DatabaseNameConfiguration.class); + if (databaseNameConfiguration != null) { + dbName = databaseNameConfiguration.value().name(); + } - if (dataSourceTestConfiguration != null) { - dbName = dataSourceTestConfiguration.dbName().name(); - dbVersion = dataSourceTestConfiguration.dbVersion(); + DatabaseVersionConfiguration databaseVersionConfiguration = TestHelper.getAnnotation(testClass, DatabaseVersionConfiguration.class); + if (databaseVersionConfiguration != null) { + dbVersion = databaseVersionConfiguration.value(); } } @@ -217,16 +221,6 @@ public class ApplicationContextResource implements TestRule { } - protected ApplicationContextResourceConfiguration getApplicationContextTestConfiguration(Class<?> clazz) { - - ApplicationContextResourceConfiguration dataSourceTestConfiguration = clazz.getAnnotation(ApplicationContextResourceConfiguration.class); - - if (dataSourceTestConfiguration == null && clazz.getSuperclass() != null) { - dataSourceTestConfiguration = getApplicationContextTestConfiguration(clazz.getSuperclass()); - } - return dataSourceTestConfiguration; - } - public void assertSchemaCreated(ObserveTopiaApplicationContext topiaApplicationContext) { try (ObserveTopiaPersistenceContext topiaPersistenceContext = topiaApplicationContext.newPersistenceContext()) { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java index 003422d..c24c43f 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java @@ -37,8 +37,10 @@ import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.ObserveReferentialCache; -import fr.ird.observe.test.DataSourceResourceConfiguration; import fr.ird.observe.test.TestHelper; +import fr.ird.observe.test.spi.CopyDatabaseConfiguration; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.spi.DatabaseVersionConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.rules.TestRule; @@ -52,6 +54,7 @@ import org.nuiton.util.version.Versions; import java.io.File; import java.io.IOException; +import java.lang.reflect.Method; import java.nio.file.Files; import java.nio.file.Path; @@ -242,31 +245,30 @@ public class DataSourceResource implements TestRule { log.debug("Starts " + testClass.getName() + "::" + methodName); } - DataSourceResourceConfiguration dataSourceResourceConfiguration = testClass.getMethod(methodName).getAnnotation(DataSourceResourceConfiguration.class); + Method testClassMethod = testClass.getMethod(methodName); String dbVersionStr; - if (dataSourceResourceConfiguration == null) { - useSharedDatabase = true; - dbName = null; - dbVersionStr = null; + DatabaseNameConfiguration databaseNameConfiguration = testClassMethod.getAnnotation(DatabaseNameConfiguration.class); + if (databaseNameConfiguration != null) { + dbName = databaseNameConfiguration.value().name(); } else { - useSharedDatabase = dataSourceResourceConfiguration.useSharedDatabase(); - dbName = dataSourceResourceConfiguration.dbName().name(); - dbVersionStr = dataSourceResourceConfiguration.dbVersion(); - } - - if (Strings.isNullOrEmpty(dbName)) { dbName = applicationContextResource.getDbName(); } Preconditions.checkState(!Strings.isNullOrEmpty(dbName), "Pas de nom de base spécifié"); - if (Strings.isNullOrEmpty(dbVersionStr)) { + DatabaseVersionConfiguration databaseVersionConfiguration = testClassMethod.getAnnotation(DatabaseVersionConfiguration.class); + if (databaseVersionConfiguration != null) { + dbVersionStr = databaseVersionConfiguration.value(); + } else { dbVersionStr = applicationContextResource.getDbVersion(); } Preconditions.checkState(!Strings.isNullOrEmpty(dbVersionStr), "Pas de version de base spécifié"); dbVersion = Versions.valueOf(dbVersionStr); + CopyDatabaseConfiguration copyDatabaseConfiguration = testClassMethod.getAnnotation(CopyDatabaseConfiguration.class); + useSharedDatabase = copyDatabaseConfiguration == null; + if (log.isDebugEnabled()) { log.debug("Starts " + testClass.getName() + "::" + methodName); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java index a457863..0d95dff 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java @@ -2,7 +2,6 @@ package fr.ird.observe.services.binder; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -125,6 +124,7 @@ import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -140,7 +140,7 @@ import java.util.List; * * @author Tony Chemit - chemit@codelutin.com */ -@ApplicationContextResourceConfiguration(dbName = DatabaseName.dataForTestSeine, dbVersion = AbstractServiceTopiaTest.DEFAULT_VERSION) +@DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class BinderEngineTest extends AbstractServiceTopiaTest { /** Logger. */ diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java index 162e2e9..7e9fe9a 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java @@ -8,6 +8,9 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.spi.DatabaseVersionConfiguration; import org.junit.Assert; import org.junit.ClassRule; import org.junit.Rule; @@ -19,6 +22,8 @@ import java.util.Date; * * @author Tony Chemit - chemit@codelutin.com */ +@DatabaseNameConfiguration(DatabaseName.referentiel) +@DatabaseVersionConfiguration(AbstractServiceTopiaTest.DEFAULT_VERSION) public class AbstractServiceTopiaTest { public static final String OLD_VERSION = "4.0.1"; @@ -33,7 +38,6 @@ public class AbstractServiceTopiaTest { public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234"; - @ClassRule public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(); @@ -42,7 +46,7 @@ public class AbstractServiceTopiaTest { protected Date getLastUpdate(Class entityType) { try (ObserveTopiaPersistenceContext persistenceContext = dataSourceResource.newPersistenceContext()) { - return persistenceContext.getLastUpdate(entityType); + return persistenceContext.getLastUpdateDate(entityType); } } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java index 4d89b4c..78e445f 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java @@ -23,8 +23,8 @@ package fr.ird.observe.services.service; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -37,7 +37,7 @@ import org.junit.Test; * FIXME IT tests */ @Ignore -@ApplicationContextResourceConfiguration(dbName = DatabaseName.dataForTestSeine, dbVersion = AbstractServiceTopiaTest.DEFAULT_VERSION) +@DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class DataSourceDumpProducerServiceTopiaTest extends AbstractServiceTopiaTest { protected DataSourceDumpProducerService service; 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 d62bd99..e95c9ec 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 @@ -25,8 +25,6 @@ package fr.ird.observe.services.service; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; -import fr.ird.observe.test.DataSourceResourceConfiguration; import fr.ird.observe.services.ObserveTopiaApplicationContextFactory; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; @@ -36,6 +34,8 @@ import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationExce import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.TestHelper; +import fr.ird.observe.test.spi.CopyDatabaseConfiguration; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -54,7 +54,7 @@ import java.util.Date; * FIXME IT tests */ @Ignore -@ApplicationContextResourceConfiguration(dbName = DatabaseName.dataSourceTest, dbVersion = AbstractServiceTopiaTest.DEFAULT_VERSION) +@DatabaseNameConfiguration(DatabaseName.dataSourceTest) public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { /** Logger. */ @@ -71,7 +71,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { } - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration @Test(expected = DatabaseNotFoundException.class) public void testOpenNotExistingDatabase() throws IOException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { @@ -157,7 +157,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { } - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration @Test public void testCreateEmptyDataSource() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { @@ -170,7 +170,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { } - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration @Test public void testCreateDataSourceFromImportDatabase() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { @@ -187,7 +187,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { } - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration @Test public void testCreateDataSourceFromImportReferential() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { @@ -211,7 +211,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { } - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration @Test public void testCreateDataSourceFromImportReferentialAndData() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java index dd2b991..71842b6 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java @@ -1,10 +1,10 @@ package fr.ird.observe.services.service; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; -import fr.ird.observe.test.DataSourceResourceConfiguration; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.spi.DatabaseVersionConfiguration; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -21,7 +21,7 @@ import java.nio.file.Files; * @author Tony Chemit - chemit@codelutin.com */ @Ignore -@ApplicationContextResourceConfiguration(dbVersion = MigrateTestsDatabases.FROM_VERSION) +@DatabaseVersionConfiguration(MigrateTestsDatabases.FROM_VERSION) public class MigrateTestsDatabases extends AbstractServiceTopiaTest { /** Logger. */ @@ -31,19 +31,19 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { public static final String TO_VERSION = "5.0-2"; - @DataSourceResourceConfiguration(dbName = DatabaseName.referentiel) + @DatabaseNameConfiguration(DatabaseName.referentiel) @Test public void migrateReferentielDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { migrateReferentielDb(TO_VERSION); } - @DataSourceResourceConfiguration(dbName = DatabaseName.dataForTestSeine) + @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @Test public void migrateDataForTestSeineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { migrateReferentielDb(TO_VERSION); } - @DataSourceResourceConfiguration(dbName = DatabaseName.dataForTestLongline) + @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) @Test public void migrateDataForTestLonglineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { migrateReferentielDb(TO_VERSION); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index 4960b6b..46133ef 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -26,8 +26,6 @@ import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; -import fr.ird.observe.test.DataSourceResourceConfiguration; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdDto; @@ -35,6 +33,8 @@ import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.CopyDatabaseConfiguration; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -51,7 +51,7 @@ import java.util.Date; * * @author Tony Chemit - chemit@codelutin.com */ -@ApplicationContextResourceConfiguration(dbName = DatabaseName.dataForTestSeine, dbVersion = AbstractServiceTopiaTest.DEFAULT_VERSION) +@DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { /** Logger. */ @@ -82,7 +82,7 @@ public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { //FIXME En réutilisant une table de lastUpdateDate @Ignore @Test - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration public void testDelete() throws Exception { ObserveTopiaPersistenceContext tx = dataSourceResource.newPersistenceContext(); @@ -135,13 +135,13 @@ public class ReferentialServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertNotNull(form.getObject()); Assert.assertNotNull(form.getObject().getId()); - Date lastUpdateBefore = persistenceContext.getLastUpdate(entityType); + Date lastUpdateBefore = persistenceContext.getLastUpdateDate(entityType); service.delete(dtoType, entity.getTopiaId()); Assert.assertEquals(expectedCount - 1, dao.count()); - Date lastUpdateAfter = persistenceContext.getLastUpdate(entityType); + Date lastUpdateAfter = persistenceContext.getLastUpdateDate(entityType); Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); try { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java index 248859a..dd08e50 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java @@ -24,10 +24,10 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; -import fr.ird.observe.test.DataSourceResourceConfiguration; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.CopyDatabaseConfiguration; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -39,7 +39,7 @@ import java.util.List; * * @author Tony Chemit - chemit@codelutin.com */ -@ApplicationContextResourceConfiguration(dbName = DatabaseName.dataForTestSeine, dbVersion = AbstractServiceTopiaTest.DEFAULT_VERSION) +@DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class ConsolidateDataServiceTopiaTest extends AbstractServiceTopiaTest { protected ConsolidateDataService service; @@ -50,7 +50,7 @@ public class ConsolidateDataServiceTopiaTest extends AbstractServiceTopiaTest { } @Test - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration public void testConsolidateTripSeines() throws Exception { ObserveTopiaPersistenceContext persistenceContext = dataSourceResource.newPersistenceContext(); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java index 00b4414..73bd3be 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java @@ -23,7 +23,6 @@ package fr.ird.observe.services.service.actions.report; import com.google.common.collect.Iterables; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.actions.report.DataMatrix; import fr.ird.observe.services.dto.actions.report.Report; @@ -31,6 +30,7 @@ import fr.ird.observe.services.dto.actions.report.ReportRequest; import fr.ird.observe.services.dto.actions.report.ReportVariable; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -52,7 +52,7 @@ import java.util.Map; * @author Tony Chemit - chemit@codelutin.com * @since 1.9 */ -@ApplicationContextResourceConfiguration(dbName = DatabaseName.dataForTestSeine, dbVersion = AbstractServiceTopiaTest.DEFAULT_VERSION) +@DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public abstract class AbstractReportServiceTopiaTest extends AbstractServiceTopiaTest { /** Logger */ diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java index d6ddff8..95f5e5d 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java @@ -24,12 +24,12 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -38,7 +38,7 @@ import org.nuiton.validator.NuitonValidatorScope; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -@ApplicationContextResourceConfiguration(dbName = DatabaseName.dataForTestSeine, dbVersion = AbstractServiceTopiaTest.DEFAULT_VERSION) +@DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { protected ValidateService service; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java index effc0a5..d0bef59 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java @@ -26,8 +26,6 @@ import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; -import fr.ird.observe.test.DataSourceResourceConfiguration; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; @@ -42,6 +40,9 @@ import fr.ird.observe.services.dto.referential.longline.HookTypeDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.CopyDatabaseConfiguration; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; +import fr.ird.observe.test.spi.DatabaseVersionConfiguration; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -50,7 +51,8 @@ import org.nuiton.util.DateUtil; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -@ApplicationContextResourceConfiguration(dbName = DatabaseName.dataForTestLongline, dbVersion = AbstractServiceTopiaTest.OLD_VERSION) +@DatabaseVersionConfiguration(AbstractServiceTopiaTest.OLD_VERSION) +@DatabaseNameConfiguration(DatabaseName.dataForTestLongline) public class SetLonglineDetailCompositionServiceTopiaTest extends AbstractServiceTopiaTest { protected SetLonglineDetailCompositionService service; @@ -92,7 +94,7 @@ public class SetLonglineDetailCompositionServiceTopiaTest extends AbstractServic } @Test - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration public void saveTest() { Form<SetLonglineDetailCompositionDto> form = service.loadForm(SET_LONGLINE_ID); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java index 64267f4..fd383e9 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/RouteServiceTopiaTest.java @@ -22,11 +22,11 @@ package fr.ird.observe.services.service.seine; * #L% */ -import fr.ird.observe.test.ApplicationContextResourceConfiguration; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -35,7 +35,7 @@ import org.nuiton.util.DateUtil; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -@ApplicationContextResourceConfiguration(dbName = DatabaseName.dataForTestSeine, dbVersion = AbstractServiceTopiaTest.DEFAULT_VERSION) +@DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class RouteServiceTopiaTest extends AbstractServiceTopiaTest { protected RouteService service; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java index 8aaa1d8..f73dfef 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopiaTest.java @@ -22,11 +22,11 @@ package fr.ird.observe.services.service.seine; * #L% */ -import fr.ird.observe.test.ApplicationContextResourceConfiguration; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -34,7 +34,7 @@ import org.junit.Test; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -@ApplicationContextResourceConfiguration(dbName = DatabaseName.dataForTestSeine, dbVersion = AbstractServiceTopiaTest.DEFAULT_VERSION) +@DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class TargetSampleServiceTopiaTest extends AbstractServiceTopiaTest { public static String SET_SEINE_ID = "fr.ird.observe.entities.seine.SetSeine#1359573677233#0.016313003525718517"; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java index 93134a6..6613642 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopiaTest.java @@ -26,8 +26,6 @@ import com.google.common.collect.Iterables; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; -import fr.ird.observe.test.DataSourceResourceConfiguration; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; @@ -36,6 +34,8 @@ import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.CopyDatabaseConfiguration; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -44,7 +44,7 @@ import org.nuiton.topia.persistence.TopiaEntities; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -@ApplicationContextResourceConfiguration(dbName = DatabaseName.dataForTestSeine, dbVersion = AbstractServiceTopiaTest.DEFAULT_VERSION) +@DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { protected TripSeineGearUseService service; @@ -111,7 +111,7 @@ public class TripSeineGearUseServiceTopiaTest extends AbstractServiceTopiaTest { } @Test - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration public void saveUpdateTest() { Form<TripSeineGearUseDto> form = service.loadForm(TRIP_SEINE_ID_1); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index 5b2400c..0e99d68 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -23,8 +23,6 @@ package fr.ird.observe.services.service.seine; */ import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.test.ApplicationContextResourceConfiguration; -import fr.ird.observe.test.DataSourceResourceConfiguration; import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; @@ -43,6 +41,8 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.CopyDatabaseConfiguration; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -55,7 +55,7 @@ import java.util.Date; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -@ApplicationContextResourceConfiguration(dbName = DatabaseName.dataForTestSeine, dbVersion = AbstractServiceTopiaTest.DEFAULT_VERSION) +@DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { protected TripSeineService service; @@ -180,7 +180,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { } @Test - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration public void saveCreateTest() throws BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { Form<TripSeineDto> form = service.preCreate(PROGRAM_ID); @@ -234,7 +234,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { } @Test - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration public void saveUpdateTest() throws BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { Form<TripSeineDto> form = service.loadForm(TRIP_SEINE_ID_1); @@ -289,7 +289,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { } @Test(expected = ConcurrentModificationException.class) - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration public void saveConcurrentTest() throws BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { Form<TripSeineDto> form = service.loadForm(TRIP_SEINE_ID_1); @@ -319,7 +319,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { //FIXME En réutilisant une table de lastUpdateDate @Ignore @Test - @DataSourceResourceConfiguration(useSharedDatabase = false) + @CopyDatabaseConfiguration public void deleteTest() { Date lastUpdateBefore = getLastUpdate(TripSeine.class); diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/ApplicationContextResourceConfiguration.java b/observe-test-data/src/main/java/fr/ird/observe/test/ApplicationContextResourceConfiguration.java deleted file mode 100644 index 9635276..0000000 --- a/observe-test-data/src/main/java/fr/ird/observe/test/ApplicationContextResourceConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -package fr.ird.observe.test; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * To define how to load a datasource resource on a test class. - * - * Created on 25/12/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface ApplicationContextResourceConfiguration { - - /** - * @return version of database to use. - */ - String dbVersion() default ""; - - /** - * @return Name of database to use. - */ - DatabaseName dbName() default DatabaseName.referentiel; -} diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/DataSourceResourceConfiguration.java b/observe-test-data/src/main/java/fr/ird/observe/test/DataSourceResourceConfiguration.java deleted file mode 100644 index 4356d07..0000000 --- a/observe-test-data/src/main/java/fr/ird/observe/test/DataSourceResourceConfiguration.java +++ /dev/null @@ -1,36 +0,0 @@ -package fr.ird.observe.test; - -import fr.ird.observe.test.DatabaseName; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * To define how to load a datasource resource on a test method. - * - * Created on 25/12/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -public @interface DataSourceResourceConfiguration { - - /** - * @return version of database to use. - */ - String dbVersion() default ""; - - /** - * @return Name of database to use. - */ - DatabaseName dbName() default DatabaseName.referentiel; - - /** - * return {@code true} to use the shared database, otherwise will - * use a copy of the shared database (mainly used when you modify a database). - */ - boolean useSharedDatabase() default true; -} diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java b/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java index f4fc944..aa3defc 100644 --- a/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java +++ b/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java @@ -36,6 +36,7 @@ import org.nuiton.util.version.Versions; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; import java.net.URL; import java.util.Date; @@ -303,4 +304,13 @@ public abstract class TestHelper { } + public static <E extends Annotation> E getAnnotation(Class<?> clazz, Class<E> annotationType) { + + E dataSourceTestConfiguration = clazz.getAnnotation(annotationType); + + if (dataSourceTestConfiguration == null && clazz.getSuperclass() != null) { + dataSourceTestConfiguration = getAnnotation(clazz.getSuperclass(), annotationType); + } + return dataSourceTestConfiguration; + } } diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java b/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java new file mode 100644 index 0000000..f63e548 --- /dev/null +++ b/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java @@ -0,0 +1,17 @@ +package fr.ird.observe.test.spi; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Created on 26/12/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface CopyDatabaseConfiguration { + +} diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java new file mode 100644 index 0000000..5d37dfe --- /dev/null +++ b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java @@ -0,0 +1,21 @@ +package fr.ird.observe.test.spi; + +import fr.ird.observe.test.DatabaseName; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Created on 26/12/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +@Target(value = {ElementType.TYPE, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface DatabaseNameConfiguration { + + DatabaseName value() default DatabaseName.referentiel; + +} diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java new file mode 100644 index 0000000..6bd1c9d --- /dev/null +++ b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java @@ -0,0 +1,19 @@ +package fr.ird.observe.test.spi; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Created on 26/12/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +@Target(value = {ElementType.TYPE, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface DatabaseVersionConfiguration { + + String value() default ""; + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.