- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: add missing i18n key
by Tony CHEMIT 03 Feb '19

03 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 73f3e67b by tchemit at 2019-02-03T11:41:02Z add missing i18n key - - - - - 31fe85c9 by tchemit at 2019-02-03T11:41:09Z update tests - - - - - 4 changed files: - client-core/src/main/i18n/getters/java.getter - test/src/main/resources/db/7.0/dataForTestLongline.sql.gz - test/src/main/resources/db/7.0/dataForTestSeine.sql.gz - test/src/main/resources/db/7.0/referentiel.sql.gz Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -385,6 +385,7 @@ observe.common.FloatlinesCompositionDto.table.lineType.tip observe.common.FloatlinesCompositionDto.table.proportion observe.common.FloatlinesCompositionDto.table.proportion.tip observe.common.GearUseFeatures.delete +observe.common.GearUseFeaturesLonglineDto.table.comment observe.common.GearUseFeaturesLonglineDto.table.comment.tip observe.common.GearUseFeaturesLonglineDto.table.gear observe.common.GearUseFeaturesLonglineDto.table.gear.tip ===================================== test/src/main/resources/db/7.0/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.0/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.0/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.0/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.0/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/referentiel.sql.gz and b/test/src/main/resources/db/7.0/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/87b326265baccd784dd1f9a45b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/87b326265baccd784dd1f9a45b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Problème d'ouverture d'une sauvegarde 5.4 - Closes #1184
by Tony CHEMIT 03 Feb '19

03 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 87b32626 by tchemit at 2019-02-03T11:30:28Z Problème d'ouverture d'une sauvegarde 5.4 - Closes #1184 - - - - - 1 changed file: - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_6_0.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_6_0.java ===================================== @@ -179,6 +179,7 @@ public class DataSourceMigrationForVersion_6_0 extends OldMigrationVersionResour .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470887#0.950930784922093", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470887#0.950930784922093', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'DML', 1, null, 'Dorsal Mantle Length', 'Dorsal Mantle Length', 'Dorsal Mantle Length', null, null, null, null, null, false);") .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499471278#0.425988764036447", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499471278#0.425988764036447', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'CDML', 1, null, 'Curved Dorsal Mantle Length', 'Curved Dorsal Mantle Length', 'Curved Dorsal Mantle Length', null, null, null, null, null, false);") .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499472220#0.885759855154902", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499472220#0.885759855154902', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'PFL', 1, null, 'Pectoral-Fork Length', 'Pectoral-Fork Length', 'Pectoral-Fork Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1479120383659#0.03964411579456617", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1479120383659#0.03964411579456617', 2, '2016-11-14', '2016-12-06 15:54:27.727005', 'SCL', 1, null, 'Straight Carapace Length', 'Straight Carapace Length', 'Straight Carapace Length', null, null, null, null, null, false);") .build(); ImmutableMap<String, String> knownSizeMeasureTypeMapping = ImmutableMap.<String, String>builder() View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/87b326265baccd784dd1f9a45b5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/87b326265baccd784dd1f9a45b5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Problème d'ouverture d'une sauvegarde 5.4 - Closes #1184
by Tony CHEMIT 03 Feb '19

03 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1579f66f by tchemit at 2019-02-03T11:28:23Z Problème d'ouverture d'une sauvegarde 5.4 - Closes #1184 - - - - - 1 changed file: - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_0.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_0.java ===================================== @@ -179,6 +179,7 @@ public class DataSourceMigrationForVersion_6_0 extends OldMigrationVersionResour .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470887#0.950930784922093", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470887#0.950930784922093', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'DML', 1, null, 'Dorsal Mantle Length', 'Dorsal Mantle Length', 'Dorsal Mantle Length', null, null, null, null, null, false);") .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499471278#0.425988764036447", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499471278#0.425988764036447', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'CDML', 1, null, 'Curved Dorsal Mantle Length', 'Curved Dorsal Mantle Length', 'Curved Dorsal Mantle Length', null, null, null, null, null, false);") .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499472220#0.885759855154902", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499472220#0.885759855154902', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'PFL', 1, null, 'Pectoral-Fork Length', 'Pectoral-Fork Length', 'Pectoral-Fork Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1479120383659#0.03964411579456617", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1479120383659#0.03964411579456617', 2, '2016-11-14', '2016-12-06 15:54:27.727005', 'SCL', 1, null, 'Straight Carapace Length', 'Straight Carapace Length', 'Straight Carapace Length', null, null, null, null, null, false);") .build(); ImmutableMap<String, String> knownSizeMeasureTypeMapping = ImmutableMap.<String, String>builder() @@ -258,7 +259,11 @@ public class DataSourceMigrationForVersion_6_0 extends OldMigrationVersionResour Set<String> missingSizeMeasureTypeIds = knownSizeMeasureTypeMapping.values().stream().filter(id -> !existingSizeMeasureMapping.values().contains(id)).collect(Collectors.toSet()); for (String missingSizeMeasureTypeId : missingSizeMeasureTypeIds) { - executor.writeSql(sqlMappingByCode.get(missingSizeMeasureTypeId)); + String sql = sqlMappingByCode.get(missingSizeMeasureTypeId); + if (sql == null) { + throw new IllegalStateException("Can't fin size measure type with id: " + missingSizeMeasureTypeId); + } + executor.writeSql(sql); } ImmutableMap.Builder<String, String> allSizeMeasureTypeMappingBuilder = ImmutableMap.<String, String>builder().putAll(existingSizeMeasureMapping); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1579f66fe41505621c7d07e3569… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1579f66fe41505621c7d07e3569… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] libellé Code simplifié -> Type d'objet simplifié (CECOFAD) - Closes #1208
by Tony CHEMIT 01 Feb '19

01 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 653bbeaa by tchemit at 2019-02-01T14:13:00Z [PS] libellé Code simplifié -> Type d'objet simplifié (CECOFAD) - Closes #1208 - - - - - 3 changed files: - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -977,7 +977,7 @@ observe.common.EncounterTypeDto.types=Encounter types observe.common.FloatingObjectDto.comment=Floating object comment observe.common.FloatingObjectDto.computedBiodegradable=Biodegradable observe.common.FloatingObjectDto.computedNonEntangling=Non Entangling -observe.common.FloatingObjectDto.computedSimplifiedObjectType=Simplified object type +observe.common.FloatingObjectDto.computedSimplifiedObjectType=Simplified object type (CECOFAD) observe.common.FloatingObjectDto.computedValues=Computed values observe.common.FloatingObjectDto.generalTab=General caracteristics observe.common.FloatingObjectDto.is.a.reference=<html><body>Reference %s ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -977,7 +977,7 @@ observe.common.EncounterTypeDto.types=Tipos de encuentro observe.common.FloatingObjectDto.comment=Comentarios de objeto observe.common.FloatingObjectDto.computedBiodegradable=Biodegradable \#TODO observe.common.FloatingObjectDto.computedNonEntangling=Non Entangling \#TODO -observe.common.FloatingObjectDto.computedSimplifiedObjectType=Code simplifié \#TODO +observe.common.FloatingObjectDto.computedSimplifiedObjectType=Tipo de objeto simplificado (CECOFAD) observe.common.FloatingObjectDto.computedValues=Computed values \#TODO observe.common.FloatingObjectDto.generalTab=Características generales observe.common.FloatingObjectDto.is.a.reference=<html><body>Référence %s \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -977,7 +977,7 @@ observe.common.EncounterTypeDto.types=Types de rencontre observe.common.FloatingObjectDto.comment=Commentaire sur l'objet flottant observe.common.FloatingObjectDto.computedBiodegradable=Biodégradable observe.common.FloatingObjectDto.computedNonEntangling=Non maillant -observe.common.FloatingObjectDto.computedSimplifiedObjectType=Code simplifié +observe.common.FloatingObjectDto.computedSimplifiedObjectType=Type d'objet simplifié (CECOFAD observe.common.FloatingObjectDto.computedValues=Valeurs calculées observe.common.FloatingObjectDto.generalTab=Caractéristiques générales observe.common.FloatingObjectDto.is.a.reference=<html><body>Référence %s View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/653bbeaacf1c60ceea5caa04654… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/653bbeaacf1c60ceea5caa04654… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS] libellé Code simplifié -> Type d'objet simplifié (CECOFAD) - Closes #1208
by Tony CHEMIT 01 Feb '19

01 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f1d83bb1 by tchemit at 2019-02-01T14:11:40Z [PS] libellé Code simplifié -> Type d'objet simplifié (CECOFAD) - Closes #1208 - - - - - 3 changed files: - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -637,7 +637,7 @@ observe.common.EncounterTypeDto.type=Encounter type observe.common.EncounterTypeDto.types=Encounter types observe.common.FloatingObjectDto.computedBiodegradable=Biodegradable observe.common.FloatingObjectDto.computedNonEntangling=Non Entangling -observe.common.FloatingObjectDto.computedSimplifiedObjectType=Simplified object type +observe.common.FloatingObjectDto.computedSimplifiedObjectType=Simplified object type (CECOFAD) observe.common.FloatingObjectDto.computedValues=Computed values observe.common.FloatingObjectDto.generalTab=General caracteristics observe.common.FloatingObjectDto.is.a.reference=<html><body>Reference %s ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -637,7 +637,7 @@ observe.common.EncounterTypeDto.type=Tipo de encuentro observe.common.EncounterTypeDto.types=Tipos de encuentro observe.common.FloatingObjectDto.computedBiodegradable=Biodegradable observe.common.FloatingObjectDto.computedNonEntangling=No enmallante -observe.common.FloatingObjectDto.computedSimplifiedObjectType=Código simplificado +observe.common.FloatingObjectDto.computedSimplifiedObjectType=Tipo de objeto simplificado (CECOFAD) observe.common.FloatingObjectDto.computedValues=Valores asignados observe.common.FloatingObjectDto.generalTab=Características generales observe.common.FloatingObjectDto.is.a.reference=<html><body>Referencia %s ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -637,7 +637,7 @@ observe.common.EncounterTypeDto.type=Type de rencontre observe.common.EncounterTypeDto.types=Types de rencontre observe.common.FloatingObjectDto.computedBiodegradable=Biodégradable observe.common.FloatingObjectDto.computedNonEntangling=Non maillant -observe.common.FloatingObjectDto.computedSimplifiedObjectType=Code simplifié +observe.common.FloatingObjectDto.computedSimplifiedObjectType=Type d'objet simplifié (CECOFAD) observe.common.FloatingObjectDto.computedValues=Valeurs calculées observe.common.FloatingObjectDto.generalTab=Caractéristiques générales observe.common.FloatingObjectDto.is.a.reference=<html><body>Référence %s View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f1d83bb1fd1fca44585cb9c30df… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f1d83bb1fd1fca44585cb9c30df… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Le mode plein écran est disponible (?) et pose des problèmes : le retirer - Closes #1207
by Tony CHEMIT 01 Feb '19

01 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3f3906cf by tchemit at 2019-02-01T14:09:02Z Le mode plein écran est disponible (?) et pose des problèmes : le retirer - Closes #1207 - - - - - 8 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - − client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToFullScreenAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToWindowScreenAction.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -124,10 +124,6 @@ observe.action.test.remote observe.action.test.remote.tip observe.action.test.server observe.action.test.server.tip -observe.action.toFullScreen -observe.action.toFullScreen.tip -observe.action.toWindowScreen -observe.action.toWindowScreen.tip observe.action.translate observe.action.translate.tip observe.actions.consolidate @@ -452,7 +448,6 @@ observe.common.FloatlinesCompositionObsDto.table.lineType.tip observe.common.FloatlinesCompositionObsDto.table.proportion observe.common.FloatlinesCompositionObsDto.table.proportion.tip observe.common.GearUseFeatures.delete -observe.common.GearUseFeaturesLonglineDto.table.comment observe.common.GearUseFeaturesLonglineDto.table.comment.tip observe.common.GearUseFeaturesLonglineDto.table.gear observe.common.GearUseFeaturesLonglineDto.table.gear.tip ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx ===================================== @@ -52,8 +52,6 @@ fr.ird.observe.client.ui.actions.main.menu.config.TranslateAction fr.ird.observe.client.ui.actions.main.menu.file.CloseApplicationAction fr.ird.observe.client.ui.actions.main.menu.file.ReloadApplicationAction - fr.ird.observe.client.ui.actions.main.menu.file.ToFullScreenAction - fr.ird.observe.client.ui.actions.main.menu.file.ToWindowScreenAction fr.ird.observe.client.ui.actions.main.menu.help.GotoSiteAction fr.ird.observe.client.ui.actions.main.menu.help.ShowAboutAction fr.ird.observe.client.ui.actions.main.menu.navigation.SelectCommonReferentialAction @@ -147,8 +145,6 @@ protected void finalize() throws Throwable { <JMenu id='menuFile'> <JMenuItem id='menuFileReloadApplication'/> - <JMenuItem id='menuFileToFullScreen'/> - <JMenuItem id='menuFileToWindowScreen'/> <JMenuItem id='menuFileCloseApplication' enabled="{menuFile.isShowing()}"/> </JMenu> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss ===================================== @@ -47,16 +47,6 @@ JSplitPane { enabled: {model.isFileEnabled()}; } -#menuFileToFullScreen { - _observeAction:{ToFullScreenAction.ACTION_NAME}; - visible:{!model.isFullScreen()} -} - -#menuFileToWindowScreen { - _observeAction:{ToWindowScreenAction.ACTION_NAME}; - visible:{model.isFullScreen()} -} - #menuConfigurationConfiguration { _observeAction:{ShowConfigAction.ACTION_NAME}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToFullScreenAction.java deleted ===================================== @@ -1,59 +0,0 @@ -package fr.ird.observe.client.ui.actions.main.menu.file; - -/*- - * #%L - * ObServe :: Client core - * %% - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.client.ObserveSwingApplicationContext; -import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.ui.ObserveMainUI; -import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; - -import java.awt.event.ActionEvent; - -import static io.ultreia.java4all.i18n.I18n.t; - -/** - * Created on 27/11/16. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 6.0 - */ -public class ToFullScreenAction extends MenuActionSupport { - - private static final long serialVersionUID = 3038774900992805790L; - - public static final String ACTION_NAME = ToFullScreenAction.class.getName(); - - public ToFullScreenAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, t("observe.action.toFullScreen"), t("observe.action.toFullScreen.tip"), "full-screen", 'S'); - } - - @Override - protected void doActionPerformed(ActionEvent event) { - - ClientConfig config = getMainUI().getConfig(); - config.setFullScreen(true); - - getMainUI().getInitializer().reloadUI(ObserveSwingApplicationContext.get(), config); - - } -} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToWindowScreenAction.java deleted ===================================== @@ -1,58 +0,0 @@ -package fr.ird.observe.client.ui.actions.main.menu.file; - -/*- - * #%L - * ObServe :: Client core - * %% - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.client.ObserveSwingApplicationContext; -import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.ui.ObserveMainUI; -import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; - -import java.awt.event.ActionEvent; - -import static io.ultreia.java4all.i18n.I18n.t; - -/** - * Created on 27/11/16. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 6.0 - */ -public class ToWindowScreenAction extends MenuActionSupport { - - private static final long serialVersionUID = 3038774900992805790L; - - public static final String ACTION_NAME = ToWindowScreenAction.class.getName(); - - public ToWindowScreenAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, t("observe.action.toWindowScreen"), t("observe.action.toWindowScreen.tip"), "window-screen", 'S'); - } - - @Override - protected void doActionPerformed(ActionEvent event) { - - ClientConfig config = getMainUI().getConfig(); - config.setFullScreen(false); - getMainUI().getInitializer().reloadUI(ObserveSwingApplicationContext.get(), config); - - } -} ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -156,10 +156,6 @@ observe.action.test.remote=Test connexion observe.action.test.remote.tip=Click here to validate remote connexion observe.action.test.server=Test connexion observe.action.test.server.tip=Click here to validate server connexion -observe.action.toFullScreen=Full screen mode -observe.action.toFullScreen.tip=Reload application in full screen mode -observe.action.toWindowScreen=Window screen mode -observe.action.toWindowScreen.tip=Reload application in wondow screen mode observe.action.translate=Translate observe.action.translate.tip=Translate application observe.action.validate.config.generateReport=Generate validation report ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -156,10 +156,6 @@ observe.action.test.remote=Comprobar la conexión observe.action.test.remote.tip=Pulsar para comprobar la conexión con el servidor remoto observe.action.test.server=Comprobar la conexión observe.action.test.server.tip=Pulsar para comprobar la conexión con el servidor \#TODO -observe.action.toFullScreen=Mode plein écran \#TODO -observe.action.toFullScreen.tip=Recharcher l'application en mode plein écran \#TODO -observe.action.toWindowScreen=Mode fenêtre \#TODO -observe.action.toWindowScreen.tip=Recharger l'application en mode fenêtre \#TODO observe.action.translate=Traduire \#TODO observe.action.translate.tip=Traduire l'application \#TODO observe.action.validate.config.generateReport=Generar un informe de validación ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -156,10 +156,6 @@ observe.action.test.remote=Valider la connexion observe.action.test.remote.tip=Cliquer pour valider la connexion au serveur distant observe.action.test.server=Valider la connexion observe.action.test.server.tip=Cliquer pour valider la connexion au serveur -observe.action.toFullScreen=Mode plein écran -observe.action.toFullScreen.tip=Recharcher l'application en mode plein écran -observe.action.toWindowScreen=Mode fenêtre -observe.action.toWindowScreen.tip=Recharger l'application en mode fenêtre observe.action.translate=Traduire observe.action.translate.tip=Traduire l'application observe.action.validate.config.generateReport=Générer un rapport de validation View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3f3906cf8cadad03cffd1db150a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3f3906cf8cadad03cffd1db150a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Le mode plein écran est disponible (?) et pose des problèmes : le retirer - Closes #1207
by Tony CHEMIT 01 Feb '19

01 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5032d7a0 by tchemit at 2019-02-01T14:07:21Z Le mode plein écran est disponible (?) et pose des problèmes : le retirer - Closes #1207 - - - - - 8 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - − client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToFullScreenAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToWindowScreenAction.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -109,10 +109,6 @@ observe.action.test.remote observe.action.test.remote.tip observe.action.test.server observe.action.test.server.tip -observe.action.toFullScreen -observe.action.toFullScreen.tip -observe.action.toWindowScreen -observe.action.toWindowScreen.tip observe.action.translate observe.action.translate.tip observe.actions.consolidate @@ -389,7 +385,6 @@ observe.common.FloatlinesCompositionDto.table.lineType.tip observe.common.FloatlinesCompositionDto.table.proportion observe.common.FloatlinesCompositionDto.table.proportion.tip observe.common.GearUseFeatures.delete -observe.common.GearUseFeaturesLonglineDto.table.comment observe.common.GearUseFeaturesLonglineDto.table.comment.tip observe.common.GearUseFeaturesLonglineDto.table.gear observe.common.GearUseFeaturesLonglineDto.table.gear.tip ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx ===================================== @@ -52,8 +52,6 @@ fr.ird.observe.client.ui.actions.main.menu.config.TranslateAction fr.ird.observe.client.ui.actions.main.menu.file.CloseApplicationAction fr.ird.observe.client.ui.actions.main.menu.file.ReloadApplicationAction - fr.ird.observe.client.ui.actions.main.menu.file.ToFullScreenAction - fr.ird.observe.client.ui.actions.main.menu.file.ToWindowScreenAction fr.ird.observe.client.ui.actions.main.menu.help.GotoSiteAction fr.ird.observe.client.ui.actions.main.menu.help.ShowAboutAction fr.ird.observe.client.ui.actions.main.menu.navigation.GotoOpenProgramAction @@ -152,8 +150,6 @@ protected void finalize() throws Throwable { <JMenu id='menuFile'> <JMenuItem id='menuFileReloadApplication'/> - <JMenuItem id='menuFileToFullScreen'/> - <JMenuItem id='menuFileToWindowScreen'/> <JMenuItem id='menuFileCloseApplication' enabled="{menuFile.isShowing()}"/> </JMenu> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss ===================================== @@ -67,16 +67,6 @@ JSplitPane { enabled: {model.isFileEnabled()}; } -#menuFileToFullScreen { - _observeAction:{ToFullScreenAction.ACTION_NAME}; - visible:{!model.isFullScreen()} -} - -#menuFileToWindowScreen { - _observeAction:{ToWindowScreenAction.ACTION_NAME}; - visible:{model.isFullScreen()} -} - #menuConfigurationConfiguration { _observeAction:{ShowConfigAction.ACTION_NAME}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToFullScreenAction.java deleted ===================================== @@ -1,59 +0,0 @@ -package fr.ird.observe.client.ui.actions.main.menu.file; - -/*- - * #%L - * ObServe :: Client core - * %% - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.client.ObserveSwingApplicationContext; -import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.ui.ObserveMainUI; -import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; - -import java.awt.event.ActionEvent; - -import static io.ultreia.java4all.i18n.I18n.t; - -/** - * Created on 27/11/16. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 6.0 - */ -public class ToFullScreenAction extends MenuActionSupport { - - private static final long serialVersionUID = 3038774900992805790L; - - public static final String ACTION_NAME = ToFullScreenAction.class.getName(); - - public ToFullScreenAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, t("observe.action.toFullScreen"), t("observe.action.toFullScreen.tip"), "full-screen", 'S'); - } - - @Override - protected void doActionPerformed(ActionEvent event) { - - ClientConfig config = getMainUI().getConfig(); - config.setFullScreen(true); - - getMainUI().getInitializer().reloadUI(ObserveSwingApplicationContext.get(), config); - - } -} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToWindowScreenAction.java deleted ===================================== @@ -1,58 +0,0 @@ -package fr.ird.observe.client.ui.actions.main.menu.file; - -/*- - * #%L - * ObServe :: Client core - * %% - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.client.ObserveSwingApplicationContext; -import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.ui.ObserveMainUI; -import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; - -import java.awt.event.ActionEvent; - -import static io.ultreia.java4all.i18n.I18n.t; - -/** - * Created on 27/11/16. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 6.0 - */ -public class ToWindowScreenAction extends MenuActionSupport { - - private static final long serialVersionUID = 3038774900992805790L; - - public static final String ACTION_NAME = ToWindowScreenAction.class.getName(); - - public ToWindowScreenAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, t("observe.action.toWindowScreen"), t("observe.action.toWindowScreen.tip"), "window-screen", 'S'); - } - - @Override - protected void doActionPerformed(ActionEvent event) { - - ClientConfig config = getMainUI().getConfig(); - config.setFullScreen(false); - getMainUI().getInitializer().reloadUI(ObserveSwingApplicationContext.get(), config); - - } -} ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -144,10 +144,6 @@ observe.action.test.remote=Test connexion observe.action.test.remote.tip=Click here to validate remote connexion observe.action.test.server=Test connexion observe.action.test.server.tip=Click here to validate server connexion -observe.action.toFullScreen=Full screen mode -observe.action.toFullScreen.tip=Reload application in full screen mode -observe.action.toWindowScreen=Window screen mode -observe.action.toWindowScreen.tip=Reload application in wondow screen mode observe.action.translate=Translate observe.action.translate.tip=Translate application observe.action.validate.config.generateReport=Generate validation report ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -144,10 +144,6 @@ observe.action.test.remote=Comprobar la conexión observe.action.test.remote.tip=Pulsar para comprobar la conexión con el servidor remoto observe.action.test.server=Comprobar la conexión observe.action.test.server.tip=Pulsar para comprobar la conexión con el servidor -observe.action.toFullScreen=Modo pantalla completa -observe.action.toFullScreen.tip=Recargar la aplicación en modo pantalla completa -observe.action.toWindowScreen=Modo ventana -observe.action.toWindowScreen.tip=Recargar la aplicación en modo ventana observe.action.translate=Traducir observe.action.translate.tip=Traducir la aplicación observe.action.validate.config.generateReport=Generar un informe de verificación ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -144,10 +144,6 @@ observe.action.test.remote=Valider la connexion observe.action.test.remote.tip=Cliquer pour valider la connexion au serveur distant observe.action.test.server=Valider la connexion observe.action.test.server.tip=Cliquer pour valider la connexion au serveur -observe.action.toFullScreen=Mode plein écran -observe.action.toFullScreen.tip=Recharcher l'application en mode plein écran -observe.action.toWindowScreen=Mode fenêtre -observe.action.toWindowScreen.tip=Recharger l'application en mode fenêtre observe.action.translate=Traduire observe.action.translate.tip=Traduire l'application observe.action.validate.config.generateReport=Générer un rapport de validation View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5032d7a0b96f83e93d13072fa0c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5032d7a0b96f83e93d13072fa0c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Alignement des anciennes versions de migration
by Tony CHEMIT 01 Feb '19

01 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: b7395c07 by tchemit at 2019-02-01T14:03:49Z Alignement des anciennes versions de migration - - - - - 30 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java → persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_5_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java → persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_6_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java → persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_6_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_2.java → persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_6_2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_3.java → persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_6_3.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_4.java → persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_6_4.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_5.java → persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_6_5.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_6.java → persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_6_6.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/old/OldMigrationVersionResource.java - persistence/src/main/resources/db/migration/5.0/01_remove_open_field-H2.sql → persistence/src/main/resources/db/migration/old/5.0/01_remove_open_field-H2.sql - persistence/src/main/resources/db/migration/5.0/01_remove_open_field-PG.sql → persistence/src/main/resources/db/migration/old/5.0/01_remove_open_field-PG.sql - persistence/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-H2.sql → persistence/src/main/resources/db/migration/old/5.0/02_add_lastUpdateDate_field-H2.sql - persistence/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-PG.sql → persistence/src/main/resources/db/migration/old/5.0/02_add_lastUpdateDate_field-PG.sql - persistence/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-H2.sql → persistence/src/main/resources/db/migration/old/5.0/03_add_lastUpdateDate_table-H2.sql - persistence/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-PG.sql → persistence/src/main/resources/db/migration/old/5.0/03_add_lastUpdateDate_table-PG.sql - persistence/src/main/resources/db/migration/5.0/04_remove_unit_field-common.sql → persistence/src/main/resources/db/migration/old/5.0/04_remove_unit_field-common.sql - persistence/src/main/resources/db/migration/5.0/05_remove_gender_field-common.sql → persistence/src/main/resources/db/migration/old/5.0/05_remove_gender_field-common.sql - persistence/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-H2.sql → persistence/src/main/resources/db/migration/old/5.0/06_remove_duplicate_rows-H2.sql - persistence/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-PG.sql → persistence/src/main/resources/db/migration/old/5.0/06_remove_duplicate_rows-PG.sql - persistence/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-common.sql → persistence/src/main/resources/db/migration/old/5.0/07_drop_not_null_constraint_gearUseFeatures-common.sql - persistence/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-common.sql → persistence/src/main/resources/db/migration/old/5.0/08_drop_not_null_constraint_hauling_identifier-common.sql - persistence/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-common.sql → persistence/src/main/resources/db/migration/old/5.0/09_add_non_target_length_sex_fk-common.sql - persistence/src/main/resources/db/migration/6.0/00_fix_trigger-PG.sql → persistence/src/main/resources/db/migration/old/6.0/00_fix_trigger-PG.sql - persistence/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-common.sql → persistence/src/main/resources/db/migration/old/6.0/01_evol_8374_delete_sonarUsed-common.sql - persistence/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-common.sql → persistence/src/main/resources/db/migration/old/6.0/02_evol_7886_catch_add_set_idx-common.sql - persistence/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-common.sql → persistence/src/main/resources/db/migration/old/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-common.sql - persistence/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-common.sql → persistence/src/main/resources/db/migration/old/6.0/05_evol_6999_nonTargetCatch_add_well-common.sql - persistence/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-common.sql → persistence/src/main/resources/db/migration/old/6.0/06_evol_8375_setSeine_add_booleans-common.sql - persistence/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-H2.sql → persistence/src/main/resources/db/migration/old/6.0/07_evol_8389_rename_source_columns-H2.sql - persistence/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-PG.sql → persistence/src/main/resources/db/migration/old/6.0/07_evol_8389_rename_source_columns-PG.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b7395c079c77efbee3f9e9cdcdb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b7395c079c77efbee3f9e9cdcdb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Alignement des anciennes versions de migration
by Tony CHEMIT 01 Feb '19

01 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 329ed26f by tchemit at 2019-02-01T13:40:24Z Alignement des anciennes versions de migration - - - - - 30 changed files: - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_5_0.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_0.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_1.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_1.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_2.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_2.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_3.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_3.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_4.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_4.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_5.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_5.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_6.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_6.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/LegacyMigrationVersionResource.java - + persistence/src/main/java/fr/ird/observe/entities/migration/old/OldMigrationVersionResource.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.entities.migration.old; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -44,7 +44,7 @@ import java.util.List; * @since 3.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_1 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_3_1 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_1() { super(Versions.valueOf("3.1")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.10 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_10 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_3_10 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_10() { super(Versions.valueOf("3.10")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.11 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_11 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_3_11 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_11() { super(Versions.valueOf("3.11")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.12 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_12 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_3_12 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_12() { super(Versions.valueOf("3.12")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.14 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_14 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_3_14 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_14() { super(Versions.valueOf("3.14")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.15 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_15 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_3_15 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_15() { super(Versions.valueOf("3.15")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java ===================================== @@ -43,7 +43,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_16 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_3_16 extends LegacyMigrationVersionResource { /** Logger. */ private static final Logger log = LogManager.getLogger(DataSourceMigrationForVersion_3_16.class); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java ===================================== @@ -36,7 +36,7 @@ import java.util.Set; * @since 4.0 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_5 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_3_5 extends LegacyMigrationVersionResource { private static final String[] TABLES = new String[]{ "ParametrageTaillePoidsFaune", ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.7 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_7 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_3_7 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_7() { super(Versions.valueOf("3.7")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.8 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_8 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_3_8 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_8() { super(Versions.valueOf("3.8")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.9 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_9 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_3_9 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_9() { super(Versions.valueOf("3.9")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_4_0 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0() { super(Versions.valueOf("4.0")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java ===================================== @@ -45,7 +45,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_1 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_4_0_1 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_1() { super(Versions.valueOf("4.0.1")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_2 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_4_0_2 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_2() { super(Versions.valueOf("4.0.2")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_4 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_4_0_4 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_4() { super(Versions.valueOf("4.0.4")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java ===================================== @@ -42,7 +42,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC2 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_4_0_RC2 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_RC2() { super(Versions.valueOf("4.0-RC2")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java ===================================== @@ -44,7 +44,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC3 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_4_0_RC3 extends LegacyMigrationVersionResource { private static final Logger log = LogManager.getLogger(DataSourceMigrationForVersion_4_0_RC3.class); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0-RC4 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC4 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_4_0_RC4 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_RC4() { super(Versions.valueOf("4.0-RC4")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0-RC6 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC6 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_4_0_RC6 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_RC6() { super(Versions.valueOf("4.0-RC6")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0-RC7 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC7 extends LegacyMigrationVersionResource{ +public class DataSourceMigrationForVersion_4_0_RC7 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_RC7() { super(Versions.valueOf("4.0-RC7")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_5_0.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -36,7 +36,7 @@ import java.util.stream.Collectors; * @author Tony Chemit - dev(a)tchemit.fr */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_5_0 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_5_0 extends OldMigrationVersionResource { public DataSourceMigrationForVersion_5_0() { super(Versions.valueOf("5.0")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_0.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.entities.migration.old; /*- * #%L @@ -49,7 +49,7 @@ import java.util.stream.Collectors; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_6_0 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_6_0 extends OldMigrationVersionResource { public DataSourceMigrationForVersion_6_0() { super(Versions.valueOf("6.0")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_1.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_1.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.entities.migration.old; /*- * #%L @@ -38,7 +38,7 @@ import java.util.TreeMap; * @since 6.0 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_6_1 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_6_1 extends OldMigrationVersionResource { public DataSourceMigrationForVersion_6_1() { super(Versions.valueOf("6.1")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_2.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_2.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.entities.migration.old; /*- * #%L @@ -50,7 +50,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_6_2 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_6_2 extends OldMigrationVersionResource { private static final String INSERT_FLOATING_OBJECT_PART = "INSERT INTO observe_seine.FloatingObjectPart(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, objectMaterial, floatingObject, whenArriving, whenLeaving) VALUES( '%s', 0, CURRENT_DATE, CURRENT_TIMESTAMP, '%s', '%s', %s, %s );"; private static final String SELECT_DCP_AND_TYPE_IDS_FOR_OPERATION = "SELECT topiaid, objectType FROM observe_seine.FloatingObject WHERE objectOperation = '%s'"; ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_3.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_3.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.entities.migration.old; /*- * #%L @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 6.0 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_6_3 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_6_3 extends OldMigrationVersionResource { public DataSourceMigrationForVersion_6_3() { super(Versions.valueOf("6.3")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_4.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_4.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.entities.migration.old; /*- * #%L @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 6.0 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_6_4 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_6_4 extends OldMigrationVersionResource { public DataSourceMigrationForVersion_6_4() { super(Versions.valueOf("6.4")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_5.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_5.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.entities.migration.old; /*- * #%L @@ -42,7 +42,7 @@ import java.util.List; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_6_5 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_6_5 extends OldMigrationVersionResource { public DataSourceMigrationForVersion_6_5() { super(Versions.valueOf("6.5")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_6.java → persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_6_6.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.entities.migration.old; /*- * #%L @@ -32,9 +32,8 @@ import org.nuiton.version.Versions; * * @author Tony Chemit - dev(a)tchemit.fr */ -@SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_6_6 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_6_6 extends OldMigrationVersionResource { public DataSourceMigrationForVersion_6_6() { super(Versions.valueOf("6.6")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/LegacyMigrationVersionResource.java ===================================== @@ -32,7 +32,7 @@ import org.nuiton.version.Version; * @author Tony Chemit - dev(a)tchemit.fr * @since 7 */ -public abstract class LegacyMigrationVersionResource extends MigrationVersionResource{ +public abstract class LegacyMigrationVersionResource extends MigrationVersionResource { public LegacyMigrationVersionResource(Version version) { super(version, new LegacyMigrationVersionResourceScriptLayout()); } ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/OldMigrationVersionResource.java ===================================== @@ -0,0 +1,26 @@ +package fr.ird.observe.entities.migration.old; + +import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceScriptLayout; +import org.nuiton.version.Version; + +/** + * Created on 01/02/19. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since ? + */ +public abstract class OldMigrationVersionResource extends MigrationVersionResource { + + public OldMigrationVersionResource(Version version) { + super(version, new OldMigrationVersionResourceScriptLayout()); + } + + static class OldMigrationVersionResourceScriptLayout implements MigrationVersionResourceScriptLayout { + @Override + public String getScriptPath(Version version, String rank, String prefix, String classifier) { + String migrationScript = String.format("%s-%s.sql", prefix, classifier); + return String.format("/db/migration/old/%s/%s_%s", version, rank, migrationScript); + } + } +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/329ed26fdabf7cb165aafcdf73b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/329ed26fdabf7cb165aafcdf73b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] La migration v3 vers v7 ne passe pas (fichier mal localisé) - Closes #1209
by Tony CHEMIT 01 Feb '19

01 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 980be722 by tchemit at 2019-02-01T13:34:53Z La migration v3 vers v7 ne passe pas (fichier mal localisé) - Closes #1209 - - - - - 21 changed files: - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java - + persistence/src/main/java/fr/ird/observe/entities/migration/old/LegacyMigrationVersionResource.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java ===================================== @@ -44,7 +44,7 @@ import java.util.List; * @since 3.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_1 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_1 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_1() { super(Versions.valueOf("3.1")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.10 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_10 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_10 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_10() { super(Versions.valueOf("3.10")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.11 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_11 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_11 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_11() { super(Versions.valueOf("3.11")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.12 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_12 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_12 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_12() { super(Versions.valueOf("3.12")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.14 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_14 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_14 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_14() { super(Versions.valueOf("3.14")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.15 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_15 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_15 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_15() { super(Versions.valueOf("3.15")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java ===================================== @@ -43,7 +43,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_16 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_16 extends LegacyMigrationVersionResource{ /** Logger. */ private static final Logger log = LogManager.getLogger(DataSourceMigrationForVersion_3_16.class); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java ===================================== @@ -36,7 +36,7 @@ import java.util.Set; * @since 4.0 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_5 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_5 extends LegacyMigrationVersionResource{ private static final String[] TABLES = new String[]{ "ParametrageTaillePoidsFaune", ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.7 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_7 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_7 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_7() { super(Versions.valueOf("3.7")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.8 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_8 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_8 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_8() { super(Versions.valueOf("3.8")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.9 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_9 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_9 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_9() { super(Versions.valueOf("3.9")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0() { super(Versions.valueOf("4.0")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java ===================================== @@ -45,7 +45,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_1 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_1 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_1() { super(Versions.valueOf("4.0.1")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_2 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_2 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_2() { super(Versions.valueOf("4.0.2")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_4 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_4 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_4() { super(Versions.valueOf("4.0.4")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java ===================================== @@ -42,7 +42,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC2 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC2 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_RC2() { super(Versions.valueOf("4.0-RC2")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java ===================================== @@ -44,7 +44,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC3 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC3 extends LegacyMigrationVersionResource{ private static final Logger log = LogManager.getLogger(DataSourceMigrationForVersion_4_0_RC3.class); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0-RC4 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC4 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC4 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_RC4() { super(Versions.valueOf("4.0-RC4")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0-RC6 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC6 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC6 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_RC6() { super(Versions.valueOf("4.0-RC6")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0-RC7 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC7 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC7 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_RC7() { super(Versions.valueOf("4.0-RC7")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/LegacyMigrationVersionResource.java ===================================== @@ -0,0 +1,47 @@ +package fr.ird.observe.entities.migration.old; + +/* + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceScriptLayout; +import org.nuiton.version.Version; + +/** + * Created on 01/02/19. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 7 + */ +public abstract class LegacyMigrationVersionResource extends MigrationVersionResource{ + public LegacyMigrationVersionResource(Version version) { + super(version, new LegacyMigrationVersionResourceScriptLayout()); + } + + static class LegacyMigrationVersionResourceScriptLayout implements MigrationVersionResourceScriptLayout { + @Override + public String getScriptPath(Version version, String rank, String prefix, String classifier) { + String migrationScript = String.format("%s-%s.sql", prefix, classifier); + return String.format("/db/migration/old/%s/V%s_%s_%s", version, version.getValidName(), rank, migrationScript); + } + } +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/980be722a2d0a08047cdd601eea… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/980be722a2d0a08047cdd601eea… You're receiving this email because of your account on gitlab.com.

1 0