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

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.5.1-SNAPSHOT development[skip ci]
by Tony CHEMIT April 1, 2020

April 1, 2020

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 31b08b24 by tchemit at 2020-04-01T11:49:30+02:00 [jgitflow-maven-plugin]updating poms for 7.5.1-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.0-SNAPSHOT</version> + <version>7.5.1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/31b08b24e10056fcfa6ccc10a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/31b08b24e10056fcfa6ccc10a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.5.0
by Tony CHEMIT April 1, 2020

April 1, 2020

Tony CHEMIT pushed new branch release/7.5.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/7.5.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Erreur sur changement de caractéristique d'équipement de type de donnée différent - Closes #1437
by Tony CHEMIT April 1, 2020

April 1, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d3e61f87 by tchemit at 2020-04-01T11:18:20+02:00 Erreur sur changement de caractéristique d'équipement de type de donnée différent - Closes #1437 - - - - - 3 changed files: - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellEditor.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellRenderer.java - dto/src/main/java/fr/ird/observe/dto/referential/common/GearCaracteristicTypeAware.java Changes: ===================================== client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellEditor.java ===================================== @@ -133,7 +133,7 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { GearCaracteristicTypeReference gearCaracteristicType = caracteristicRef.getGearCaracteristicType(); Map<String, TableCellEditor> editors = getEditorsByGearCaracteristicId(table); editor = editors.get(gearCaracteristicType.getId()); - value = gearCaracteristicType.getTypeValue(value); + value = gearCaracteristicType.getOptionalTypeValue(value).orElse(null); } return editor.getTableCellEditorComponent(table, value, isSelected, row, column); } ===================================== client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellRenderer.java ===================================== @@ -82,7 +82,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer } else { GearCaracteristicTypeReference gearCaracteristicType = caracteristicRef.getGearCaracteristicType(); tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicType.getId()); - value = gearCaracteristicType.getTypeValue(value); + value = gearCaracteristicType.getOptionalTypeValue(value).orElse(null); } return tableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/common/GearCaracteristicTypeAware.java ===================================== @@ -26,7 +26,10 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.DtoAndReferenceAware; import fr.ird.observe.dto.ProtectedIds; import fr.ird.observe.dto.reference.DtoReferenceAware; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import java.util.Optional; import java.util.Set; /** @@ -35,6 +38,8 @@ import java.util.Set; */ public interface GearCaracteristicTypeAware extends DtoReferenceAware, DtoAndReferenceAware { + Logger log = LogManager.getLogger(GearCaracteristicTypeAware.class); + Set<String> INTEGER_IDS = ImmutableSet.of(ProtectedIds.COMMON_GEAR_CARACTERISTIC_TYPE_INTEGER_UNSIGNED, ProtectedIds.COMMON_GEAR_CARACTERISTIC_TYPE_INTEGER_SIGNED); Set<String> FLOAT_IDS = ImmutableSet.of(ProtectedIds.COMMON_GEAR_CARACTERISTIC_TYPE_FLOAT_UNSIGNED, ProtectedIds.COMMON_GEAR_CARACTERISTIC_TYPE_FLOAT_SIGNED); Set<String> BOOLEAN_IDS = ImmutableSet.of(ProtectedIds.COMMON_GEAR_CARACTERISTIC_TYPE_BOOLEAN); @@ -63,4 +68,13 @@ public interface GearCaracteristicTypeAware extends DtoReferenceAware, DtoAndRef } return value; } + + default Optional<Object> getOptionalTypeValue( Object value) { + try { + return Optional.ofNullable(getTypeValue( value)); + } catch (Exception e) { + log.error(String.format("Could not get editor value from: %s", value), e); + return Optional.empty(); + } + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d3e61f870af3a0e57f6cad814… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d3e61f870af3a0e57f6cad814… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Erreur sur changement de caractéristique d'équipement de type de donnée différent - Closes #1437
by Tony CHEMIT April 1, 2020

April 1, 2020

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 24c70bef by tchemit at 2020-04-01T11:14:00+02:00 Erreur sur changement de caractéristique d'équipement de type de donnée différent - Closes #1437 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellEditor.java - client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java - dto/src/main/java/fr/ird/observe/dto/referential/GearCaracteristicTypeHelper.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellEditor.java ===================================== @@ -159,7 +159,7 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { Map<String, TableCellEditor> editors = getEditorsByGearCaracteristicId(table); editor = editors.get(gearCaracteristicTypeId); - value = GearCaracteristicTypeHelper.getTypeValue(gearCaracteristicTypeId, value); + value = GearCaracteristicTypeHelper.getOptionalTypeValue(gearCaracteristicTypeId, value).orElse(null); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java ===================================== @@ -93,7 +93,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicTypeId); - value = GearCaracteristicTypeHelper.getTypeValue(gearCaracteristicTypeId, value); + value = GearCaracteristicTypeHelper.getOptionalTypeValue(gearCaracteristicTypeId, value).orElse(null); } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/GearCaracteristicTypeHelper.java ===================================== @@ -23,11 +23,16 @@ package fr.ird.observe.dto.referential; */ import com.google.common.collect.Sets; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import java.util.Optional; import java.util.Set; public class GearCaracteristicTypeHelper extends GeneratedGearCaracteristicTypeHelper { + private static final Logger log = LogManager.getLogger(GearCaracteristicTypeHelper.class); + private static final Set<String> INTEGER_IDS = Sets.newHashSet( "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3", "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5" @@ -67,6 +72,14 @@ public class GearCaracteristicTypeHelper extends GeneratedGearCaracteristicTypeH return FLOAT_IDS.contains(gearCaracteristicTypeId); } + public static Optional<Object> getOptionalTypeValue(String gearCaracteristicTypeId, Object value) { + try { + return Optional.ofNullable(getTypeValue(gearCaracteristicTypeId, value)); + } catch (Exception e) { + log.error(String.format("Could not get editor value from: %s", value), e); + return Optional.empty(); + } + } public static Object getTypeValue(String gearCaracteristicTypeId, Object value) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/24c70befbebc8a52911c1f44e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/24c70befbebc8a52911c1f44e… You're receiving this email because of your account on gitlab.com.

1 0