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

[Git][ultreiaio/ird-observe][develop] Dto autoTrim - review some missing autoTrim (mainly on comment)
by Tony CHEMIT (＠tchemit) 14 Feb '23

14 Feb '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3a1e76cb by Tony Chemit at 2023-02-14T10:08:25+01:00 Dto autoTrim - review some missing autoTrim (mainly on comment) - - - - - 15 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModelStates.java - toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java - + toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/AutoTrimGenerator.java - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/DtoTransformer.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java ===================================== @@ -180,10 +180,11 @@ public class ContentTableUIModelStates<D extends DataDto, C extends ContainerChi @Override public D getBeanToSave() { - D bean = super.getBeanToSave(); + D bean = getBean(); if (sortable) { bean.set(getTableModel().getChildrenPropertyName(), getTableModel().getData()); } + bean.autoTrim(); return bean; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIModelStates.java ===================================== @@ -175,13 +175,14 @@ public class SetDetailCompositionUIModelStates extends GeneratedSetDetailComposi @Override public SetDetailCompositionDto getBeanToSave() { - SetDetailCompositionDto bean = super.getBeanToSave(); + SetDetailCompositionDto bean = getBean(); SectionTableModel sectionsTableModel = getSectionsTableModel(); SectionDto selectedSection = sectionsTableModel.getSelectedRow(); if (selectedSection != null) { // flush selected section before save getBasketsTableModel().flushSection(selectedSection, getBranchlinesTableModel()); } + bean.autoTrim(); return bean; } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUIModelStates.java ===================================== @@ -62,9 +62,10 @@ public class SampleUIModelStates extends GeneratedSampleUIModelStates { @Override public SampleDto getBeanToSave() { - SampleDto bean = super.getBeanToSave(); + SampleDto bean = getBean(); // on keep valid well ids bean.setWell(SampleDto.toIds(getWellTableModel().getValidData())); + bean.autoTrim(); return bean; } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyUIModelStates.java ===================================== @@ -65,9 +65,10 @@ public class SurveyUIModelStates extends GeneratedSurveyUIModelStates { @Override public SurveyDto getBeanToSave() { - SurveyDto beanToSave = super.getBeanToSave(); - beanToSave.setSurveyPart(getSurveyPartTableModel().getValidData()); - return beanToSave; + SurveyDto bean = getBean(); + bean.setSurveyPart(getSurveyPartTableModel().getValidData()); + bean.autoTrim(); + return bean; } public SurveyPartTableModel getSurveyPartTableModel() { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIModelStates.java ===================================== @@ -107,11 +107,12 @@ public class FloatingObjectUIModelStates extends GeneratedFloatingObjectUIModelS @Override public FloatingObjectDto getBeanToSave() { - FloatingObjectDto bean = super.getBeanToSave(); + FloatingObjectDto bean = getBean(); recomputeComputedValues(); Set<FloatingObjectPartDto> parts = toParts(); log.info(String.format("will persist %d part(s).", parts.size())); bean.setFloatingObjectPart(new LinkedHashSet<>(parts)); + bean.autoTrim(); return bean; } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIModelStates.java ===================================== @@ -84,8 +84,9 @@ public class SampleUIModelStates extends GeneratedSampleUIModelStates { @Override public SampleDto getBeanToSave() { - SampleDto bean = super.getBeanToSave(); + SampleDto bean = getBean(); bean.setSampleActivity(getSampleActivityTableModel().getValidData()); + bean.autoTrim(); return bean; } } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModelStates.java ===================================== @@ -111,11 +111,12 @@ public class FloatingObjectUIModelStates extends GeneratedFloatingObjectUIModelS @Override public FloatingObjectDto getBeanToSave() { - FloatingObjectDto bean = super.getBeanToSave(); + FloatingObjectDto bean = getBean(); recomputeComputedValues(); Set<FloatingObjectPartDto> parts = toParts(); log.info(String.format("will persist %d part(s).", parts.size())); bean.setFloatingObjectPart(new LinkedHashSet<>(parts)); + bean.autoTrim(); return bean; } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java ===================================== @@ -34,9 +34,7 @@ import java.util.Collection; import java.util.Date; import java.util.Objects; import java.util.Optional; -import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.function.Supplier; /** * Created on 21/07/2021. ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java ===================================== @@ -128,7 +128,7 @@ public abstract class IdDto extends AbstractJavaBean implements ObserveDto, DtoR public void autoTrim() { } - protected void autoTrim(Supplier<String> getter, Consumer<String> setter) { + public static void autoTrim(Supplier<String> getter, Consumer<String> setter) { String stringValue = getter.get(); if (stringValue != null) { String stringTrimmedValue = stringValue.trim(); ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java ===================================== @@ -81,4 +81,9 @@ public abstract class ContainerDto<C extends ContainerChildDto> extends DataDto firePropertyChange(PROPERTY_CHILDREN, oldValue, children); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java ===================================== @@ -55,6 +55,6 @@ public abstract class EditableDto extends DataDto implements WithSimpleComment { @Override public void autoTrim() { super.autoTrim(); - autoTrim(this::getComment, this::setComment); + WithSimpleComment.super.autoTrim(); } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java ===================================== @@ -46,4 +46,9 @@ public abstract class SimpleDto extends DataDto implements WithSimpleComment { firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.dto.data; * #L% */ +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ObserveDto; import io.ultreia.java4all.bean.JavaBean; @@ -37,4 +38,8 @@ public interface WithSimpleComment extends JavaBean, ObserveDto { void setComment(String comment); + default void autoTrim() { + IdDto.autoTrim(this::getComment, this::setComment); + } + } ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/AutoTrimGenerator.java ===================================== @@ -0,0 +1,108 @@ +package fr.ird.observe.toolkit.templates.dto; + +/*- + * #%L + * ObServe Toolkit :: Templates + * %% + * Copyright (C) 2008 - 2023 IRD, 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% + */ + + +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +import fr.ird.observe.toolkit.templates.TemplateContract; +import fr.ird.observe.toolkit.templates.validation.ValidationTagValues; +import io.ultreia.java4all.lang.Strings; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.function.BiPredicate; + +/** + * To generate autoTrim method on a class. + * <p> + * Created on 14/02/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.25 + */ +public class AutoTrimGenerator { + + private final ValidationTagValues validationTagValues; + private final TemplateContract template; + private final ObjectModel model; + + private final BiPredicate<ObjectModelClass, ObjectModelAttribute> compositeAttributePredicate; + + public AutoTrimGenerator(ValidationTagValues validationTagValues, + TemplateContract template, + ObjectModel model, + BiPredicate<ObjectModelClass, ObjectModelAttribute> compositeAttributePredicate) { + this.validationTagValues = validationTagValues; + this.template = template; + this.model = model; + this.compositeAttributePredicate = compositeAttributePredicate; + } + + public void generate(ObjectModelClass input, ObjectModelClass output) { + Collection<ObjectModelAttribute> attributes = new LinkedList<>(input.getAttributes()); + + List<String> stringPropertyNames = TemplateContract.getProperties(input, attributes, (c, a) -> "String".equals(GeneratorUtil.getSimpleName(a.getType())) && validationTagValues.isNotBlank(model.getTagValuesStore(), c, a)); + List<String> compositionPropertyNames = TemplateContract.getProperties(input, attributes, (c, a) -> !GeneratorUtil.isNMultiplicity(a) && compositeAttributePredicate.test(c, a)); + List<String> multipleCompositionPropertyNames = TemplateContract.getProperties(input, attributes, (c, a) -> GeneratorUtil.isNMultiplicity(a) && compositeAttributePredicate.test(c, a)); + if (stringPropertyNames.isEmpty() + && compositionPropertyNames.isEmpty() + && multipleCompositionPropertyNames.isEmpty()) { + return; + } + + ObjectModelOperation autoTrimMethod = template.addOperation(output, "autoTrim", void.class.getName(), ObjectModelJavaModifier.PUBLIC); + template.addAnnotation(output, autoTrimMethod, Override.class); + StringBuilder content = new StringBuilder(""/*{ + super.autoTrim();}*/); + for (String property : stringPropertyNames) { + String capitalize = Strings.capitalize(property); + content.append(""/*{ + autoTrim(this::get<%=capitalize%>, this::set<%=capitalize%>);}*/); + } + for (String property : compositionPropertyNames) { + String capitalize = Strings.capitalize(property); + content.append(""/*{ + if (get<%=capitalize%>() != null) { + get<%=capitalize%>().autoTrim(); + }}*/); + } + for (String property : multipleCompositionPropertyNames) { + String capitalize = Strings.capitalize(property); + content.append(""/*{ + if (isNot<%=capitalize%>Empty()) { + get<%=capitalize%>().forEach(c -> c.autoTrim()); + }}*/); + } + template.setOperationBody(autoTrimMethod, ""/*{<%=content.toString()%> + }*/); + } +} ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/DtoTransformer.java ===================================== @@ -38,6 +38,7 @@ import fr.ird.observe.dto.data.DataGroupByType; import fr.ird.observe.dto.data.EditableDto; import fr.ird.observe.dto.data.InlineDataDto; import fr.ird.observe.dto.data.LayoutAware; +import fr.ird.observe.dto.data.NoValidationDto; import fr.ird.observe.dto.data.OpenableDto; import fr.ird.observe.dto.data.RootOpenableDto; import fr.ird.observe.dto.data.UsingLayout; @@ -132,6 +133,7 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract private Map<String, String> decomposeTimes; private Map<String, String> decomposeDates; private String currentTimestampPropertyName; + private AutoTrimGenerator autoTrimGenerator; public static String getCoordinateField(boolean before, String coordinatePrefix, String type) { return Introspector.decapitalize(before ? (type + coordinatePrefix) : (coordinatePrefix + type)); @@ -530,28 +532,16 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract return <%=content%>; }*/); } - Collection<ObjectModelAttribute> attributes = new LinkedList<>(input.getAttributes()); - List<String> notBlankString = TemplateContract.getProperties(input, attributes, (c, a) -> validationTagValues.isNotBlank(tagValuesStore, c, a) && "String".equals(GeneratorUtil.getSimpleName(a.getType()))); - addAutoTrim(output, notBlankString); - return output; - } - - private void addAutoTrim(ObjectModelClass output, List<String> notBlankString) { - if (notBlankString.isEmpty()) { - return; + if (autoTrimGenerator == null) { + autoTrimGenerator = new AutoTrimGenerator(validationTagValues, this, model, (c, a) -> { + ObjectModelClass aClass = model.getClass(a.getType()); + return aClass != null + && aClass.getSuperclasses().stream().anyMatch(i -> model.getClass(i.getQualifiedName()) != null) + && aClass.getInterfaces().stream().noneMatch(i -> i.getQualifiedName().equals(NoValidationDto.class.getName())); + }); } - - ObjectModelOperation autoTrimMethod = addOperation(output, "autoTrim", void.class, ObjectModelJavaModifier.PUBLIC); - addAnnotation(output, autoTrimMethod, Override.class); - StringBuilder content = new StringBuilder(""); - for (String property : notBlankString) { - String capitalize = Strings.capitalize(property); - content.append(""/*{ - super.autoTrim(); - autoTrim(this::get<%=capitalize%>, this::set<%=capitalize%>);}*/); - } - setOperationBody(autoTrimMethod, ""/*{<%=content.toString()%> - }*/); + autoTrimGenerator.generate(input, output); + return output; } void addGroupBy(ObjectModelClass input, String... groupByList) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3a1e76cb03de1ec0ac9ffe29d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3a1e76cb03de1ec0ac9ffe29d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Dto autoTrim - review some missing autoTrim (mainly on comment)
by Tony CHEMIT (＠tchemit) 14 Feb '23

14 Feb '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: d4dcac81 by Tony Chemit at 2023-02-14T09:28:46+01:00 Dto autoTrim - review some missing autoTrim (mainly on comment) - - - - - 8 changed files: - toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java - + toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/AutoTrimGenerator.java - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/DtoTransformer.java Changes: ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java ===================================== @@ -34,9 +34,7 @@ import java.util.Collection; import java.util.Date; import java.util.Objects; import java.util.Optional; -import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.function.Supplier; /** * Created on 21/07/2021. ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java ===================================== @@ -128,7 +128,7 @@ public abstract class IdDto extends AbstractJavaBean implements ObserveDto, DtoR public void autoTrim() { } - protected void autoTrim(Supplier<String> getter, Consumer<String> setter) { + public static void autoTrim(Supplier<String> getter, Consumer<String> setter) { String stringValue = getter.get(); if (stringValue != null) { String stringTrimmedValue = stringValue.trim(); ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java ===================================== @@ -81,4 +81,9 @@ public abstract class ContainerDto<C extends ContainerChildDto> extends DataDto firePropertyChange(PROPERTY_CHILDREN, oldValue, children); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java ===================================== @@ -55,6 +55,6 @@ public abstract class EditableDto extends DataDto implements WithSimpleComment { @Override public void autoTrim() { super.autoTrim(); - autoTrim(this::getComment, this::setComment); + WithSimpleComment.super.autoTrim(); } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java ===================================== @@ -46,4 +46,9 @@ public abstract class SimpleDto extends DataDto implements WithSimpleComment { firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.dto.data; * #L% */ +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ObserveDto; import io.ultreia.java4all.bean.JavaBean; @@ -37,4 +38,8 @@ public interface WithSimpleComment extends JavaBean, ObserveDto { void setComment(String comment); + default void autoTrim() { + IdDto.autoTrim(this::getComment, this::setComment); + } + } ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/AutoTrimGenerator.java ===================================== @@ -0,0 +1,108 @@ +package fr.ird.observe.toolkit.templates.dto; + +/*- + * #%L + * ObServe Toolkit :: Templates + * %% + * Copyright (C) 2008 - 2023 IRD, 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% + */ + + +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +import fr.ird.observe.toolkit.templates.TemplateContract; +import fr.ird.observe.toolkit.templates.validation.ValidationTagValues; +import io.ultreia.java4all.lang.Strings; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.function.BiPredicate; + +/** + * To generate autoTrim method on a class. + * <p> + * Created on 14/02/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.25 + */ +public class AutoTrimGenerator { + + private final ValidationTagValues validationTagValues; + private final TemplateContract template; + private final ObjectModel model; + + private final BiPredicate<ObjectModelClass, ObjectModelAttribute> compositeAttributePredicate; + + public AutoTrimGenerator(ValidationTagValues validationTagValues, + TemplateContract template, + ObjectModel model, + BiPredicate<ObjectModelClass, ObjectModelAttribute> compositeAttributePredicate) { + this.validationTagValues = validationTagValues; + this.template = template; + this.model = model; + this.compositeAttributePredicate = compositeAttributePredicate; + } + + public void generate(ObjectModelClass input, ObjectModelClass output) { + Collection<ObjectModelAttribute> attributes = new LinkedList<>(input.getAttributes()); + + List<String> stringPropertyNames = TemplateContract.getProperties(input, attributes, (c, a) -> "String".equals(GeneratorUtil.getSimpleName(a.getType())) && validationTagValues.isNotBlank(model.getTagValuesStore(), c, a)); + List<String> compositionPropertyNames = TemplateContract.getProperties(input, attributes, (c, a) -> !GeneratorUtil.isNMultiplicity(a) && compositeAttributePredicate.test(c, a)); + List<String> multipleCompositionPropertyNames = TemplateContract.getProperties(input, attributes, (c, a) -> GeneratorUtil.isNMultiplicity(a) && compositeAttributePredicate.test(c, a)); + if (stringPropertyNames.isEmpty() + && compositionPropertyNames.isEmpty() + && multipleCompositionPropertyNames.isEmpty()) { + return; + } + + ObjectModelOperation autoTrimMethod = template.addOperation(output, "autoTrim", void.class.getName(), ObjectModelJavaModifier.PUBLIC); + template.addAnnotation(output, autoTrimMethod, Override.class); + StringBuilder content = new StringBuilder(""/*{ + super.autoTrim();}*/); + for (String property : stringPropertyNames) { + String capitalize = Strings.capitalize(property); + content.append(""/*{ + autoTrim(this::get<%=capitalize%>, this::set<%=capitalize%>);}*/); + } + for (String property : compositionPropertyNames) { + String capitalize = Strings.capitalize(property); + content.append(""/*{ + if (get<%=capitalize%>() != null) { + get<%=capitalize%>().autoTrim(); + }}*/); + } + for (String property : multipleCompositionPropertyNames) { + String capitalize = Strings.capitalize(property); + content.append(""/*{ + if (isNot<%=capitalize%>Empty()) { + get<%=capitalize%>().forEach(c -> c.autoTrim()); + }}*/); + } + template.setOperationBody(autoTrimMethod, ""/*{<%=content.toString()%> + }*/); + } +} ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/DtoTransformer.java ===================================== @@ -38,6 +38,7 @@ import fr.ird.observe.dto.data.DataGroupByType; import fr.ird.observe.dto.data.EditableDto; import fr.ird.observe.dto.data.InlineDataDto; import fr.ird.observe.dto.data.LayoutAware; +import fr.ird.observe.dto.data.NoValidationDto; import fr.ird.observe.dto.data.OpenableDto; import fr.ird.observe.dto.data.RootOpenableDto; import fr.ird.observe.dto.data.UsingLayout; @@ -132,6 +133,7 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract private Map<String, String> decomposeTimes; private Map<String, String> decomposeDates; private String currentTimestampPropertyName; + private AutoTrimGenerator autoTrimGenerator; public static String getCoordinateField(boolean before, String coordinatePrefix, String type) { return Introspector.decapitalize(before ? (type + coordinatePrefix) : (coordinatePrefix + type)); @@ -530,28 +532,16 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract return <%=content%>; }*/); } - Collection<ObjectModelAttribute> attributes = new LinkedList<>(input.getAttributes()); - List<String> notBlankString = TemplateContract.getProperties(input, attributes, (c, a) -> validationTagValues.isNotBlank(tagValuesStore, c, a) && "String".equals(GeneratorUtil.getSimpleName(a.getType()))); - addAutoTrim(output, notBlankString); - return output; - } - - private void addAutoTrim(ObjectModelClass output, List<String> notBlankString) { - if (notBlankString.isEmpty()) { - return; + if (autoTrimGenerator == null) { + autoTrimGenerator = new AutoTrimGenerator(validationTagValues, this, model, (c, a) -> { + ObjectModelClass aClass = model.getClass(a.getType()); + return aClass != null + && aClass.getSuperclasses().stream().anyMatch(i -> model.getClass(i.getQualifiedName()) != null) + && aClass.getInterfaces().stream().noneMatch(i -> i.getQualifiedName().equals(NoValidationDto.class.getName())); + }); } - - ObjectModelOperation autoTrimMethod = addOperation(output, "autoTrim", void.class, ObjectModelJavaModifier.PUBLIC); - addAnnotation(output, autoTrimMethod, Override.class); - StringBuilder content = new StringBuilder(""); - for (String property : notBlankString) { - String capitalize = Strings.capitalize(property); - content.append(""/*{ - super.autoTrim(); - autoTrim(this::get<%=capitalize%>, this::set<%=capitalize%>);}*/); - } - setOperationBody(autoTrimMethod, ""/*{<%=content.toString()%> - }*/); + autoTrimGenerator.generate(input, output); + return output; } void addGroupBy(ObjectModelClass input, String... groupByList) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d4dcac813496ff349c66ad4f2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d4dcac813496ff349c66ad4f2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Dto autoTrim - review some missing autoTrim (mainly on comment)
by Tony CHEMIT (＠tchemit) 14 Feb '23

14 Feb '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e7dcec51 by Tony Chemit at 2023-02-14T09:28:20+01:00 Dto autoTrim - review some missing autoTrim (mainly on comment) - - - - - 8 changed files: - toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java - + toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/AutoTrimGenerator.java - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/DtoTransformer.java Changes: ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java ===================================== @@ -34,9 +34,7 @@ import java.util.Collection; import java.util.Date; import java.util.Objects; import java.util.Optional; -import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.function.Supplier; /** * Created on 21/07/2021. ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java ===================================== @@ -128,7 +128,7 @@ public abstract class IdDto extends AbstractJavaBean implements ObserveDto, DtoR public void autoTrim() { } - protected void autoTrim(Supplier<String> getter, Consumer<String> setter) { + public static void autoTrim(Supplier<String> getter, Consumer<String> setter) { String stringValue = getter.get(); if (stringValue != null) { String stringTrimmedValue = stringValue.trim(); ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java ===================================== @@ -81,4 +81,9 @@ public abstract class ContainerDto<C extends ContainerChildDto> extends DataDto firePropertyChange(PROPERTY_CHILDREN, oldValue, children); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java ===================================== @@ -55,6 +55,6 @@ public abstract class EditableDto extends DataDto implements WithSimpleComment { @Override public void autoTrim() { super.autoTrim(); - autoTrim(this::getComment, this::setComment); + WithSimpleComment.super.autoTrim(); } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java ===================================== @@ -46,4 +46,9 @@ public abstract class SimpleDto extends DataDto implements WithSimpleComment { firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.dto.data; * #L% */ +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ObserveDto; import io.ultreia.java4all.bean.JavaBean; @@ -37,4 +38,8 @@ public interface WithSimpleComment extends JavaBean, ObserveDto { void setComment(String comment); + default void autoTrim() { + IdDto.autoTrim(this::getComment, this::setComment); + } + } ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/AutoTrimGenerator.java ===================================== @@ -0,0 +1,108 @@ +package fr.ird.observe.toolkit.templates.dto; + +/*- + * #%L + * ObServe Toolkit :: Templates + * %% + * Copyright (C) 2008 - 2023 IRD, 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% + */ + + +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +import fr.ird.observe.toolkit.templates.TemplateContract; +import fr.ird.observe.toolkit.templates.validation.ValidationTagValues; +import io.ultreia.java4all.lang.Strings; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.function.BiPredicate; + +/** + * To generate autoTrim method on a class. + * <p> + * Created on 14/02/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.25 + */ +public class AutoTrimGenerator { + + private final ValidationTagValues validationTagValues; + private final TemplateContract template; + private final ObjectModel model; + + private final BiPredicate<ObjectModelClass, ObjectModelAttribute> compositeAttributePredicate; + + public AutoTrimGenerator(ValidationTagValues validationTagValues, + TemplateContract template, + ObjectModel model, + BiPredicate<ObjectModelClass, ObjectModelAttribute> compositeAttributePredicate) { + this.validationTagValues = validationTagValues; + this.template = template; + this.model = model; + this.compositeAttributePredicate = compositeAttributePredicate; + } + + public void generate(ObjectModelClass input, ObjectModelClass output) { + Collection<ObjectModelAttribute> attributes = new LinkedList<>(input.getAttributes()); + + List<String> stringPropertyNames = TemplateContract.getProperties(input, attributes, (c, a) -> "String".equals(GeneratorUtil.getSimpleName(a.getType())) && validationTagValues.isNotBlank(model.getTagValuesStore(), c, a)); + List<String> compositionPropertyNames = TemplateContract.getProperties(input, attributes, (c, a) -> !GeneratorUtil.isNMultiplicity(a) && compositeAttributePredicate.test(c, a)); + List<String> multipleCompositionPropertyNames = TemplateContract.getProperties(input, attributes, (c, a) -> GeneratorUtil.isNMultiplicity(a) && compositeAttributePredicate.test(c, a)); + if (stringPropertyNames.isEmpty() + && compositionPropertyNames.isEmpty() + && multipleCompositionPropertyNames.isEmpty()) { + return; + } + + ObjectModelOperation autoTrimMethod = template.addOperation(output, "autoTrim", void.class.getName(), ObjectModelJavaModifier.PUBLIC); + template.addAnnotation(output, autoTrimMethod, Override.class); + StringBuilder content = new StringBuilder(""/*{ + super.autoTrim();}*/); + for (String property : stringPropertyNames) { + String capitalize = Strings.capitalize(property); + content.append(""/*{ + autoTrim(this::get<%=capitalize%>, this::set<%=capitalize%>);}*/); + } + for (String property : compositionPropertyNames) { + String capitalize = Strings.capitalize(property); + content.append(""/*{ + if (get<%=capitalize%>() != null) { + get<%=capitalize%>().autoTrim(); + }}*/); + } + for (String property : multipleCompositionPropertyNames) { + String capitalize = Strings.capitalize(property); + content.append(""/*{ + if (isNot<%=capitalize%>Empty()) { + get<%=capitalize%>().forEach(c -> c.autoTrim()); + }}*/); + } + template.setOperationBody(autoTrimMethod, ""/*{<%=content.toString()%> + }*/); + } +} ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/DtoTransformer.java ===================================== @@ -38,6 +38,7 @@ import fr.ird.observe.dto.data.DataGroupByType; import fr.ird.observe.dto.data.EditableDto; import fr.ird.observe.dto.data.InlineDataDto; import fr.ird.observe.dto.data.LayoutAware; +import fr.ird.observe.dto.data.NoValidationDto; import fr.ird.observe.dto.data.OpenableDto; import fr.ird.observe.dto.data.RootOpenableDto; import fr.ird.observe.dto.data.UsingLayout; @@ -132,6 +133,7 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract private Map<String, String> decomposeTimes; private Map<String, String> decomposeDates; private String currentTimestampPropertyName; + private AutoTrimGenerator autoTrimGenerator; public static String getCoordinateField(boolean before, String coordinatePrefix, String type) { return Introspector.decapitalize(before ? (type + coordinatePrefix) : (coordinatePrefix + type)); @@ -530,28 +532,16 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract return <%=content%>; }*/); } - Collection<ObjectModelAttribute> attributes = new LinkedList<>(input.getAttributes()); - List<String> notBlankString = TemplateContract.getProperties(input, attributes, (c, a) -> validationTagValues.isNotBlank(tagValuesStore, c, a) && "String".equals(GeneratorUtil.getSimpleName(a.getType()))); - addAutoTrim(output, notBlankString); - return output; - } - - private void addAutoTrim(ObjectModelClass output, List<String> notBlankString) { - if (notBlankString.isEmpty()) { - return; + if (autoTrimGenerator == null) { + autoTrimGenerator = new AutoTrimGenerator(validationTagValues, this, model, (c, a) -> { + ObjectModelClass aClass = model.getClass(a.getType()); + return aClass != null + && aClass.getSuperclasses().stream().anyMatch(i -> model.getClass(i.getQualifiedName()) != null) + && aClass.getInterfaces().stream().noneMatch(i -> i.getQualifiedName().equals(NoValidationDto.class.getName())); + }); } - - ObjectModelOperation autoTrimMethod = addOperation(output, "autoTrim", void.class, ObjectModelJavaModifier.PUBLIC); - addAnnotation(output, autoTrimMethod, Override.class); - StringBuilder content = new StringBuilder(""); - for (String property : notBlankString) { - String capitalize = Strings.capitalize(property); - content.append(""/*{ - super.autoTrim(); - autoTrim(this::get<%=capitalize%>, this::set<%=capitalize%>);}*/); - } - setOperationBody(autoTrimMethod, ""/*{<%=content.toString()%> - }*/); + autoTrimGenerator.generate(input, output); + return output; } void addGroupBy(ObjectModelClass input, String... groupByList) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e7dcec51f1d872aeb08e31e8b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e7dcec51f1d872aeb08e31e8b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Dto autoTrim - review some missing autoTrim (mainly on comment)
by Tony CHEMIT (＠tchemit) 14 Feb '23

14 Feb '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: da32fa30 by Tony Chemit at 2023-02-14T09:16:36+01:00 Dto autoTrim - review some missing autoTrim (mainly on comment) - - - - - 8 changed files: - toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java - + toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/AutoTrimGenerator.java - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/DtoTransformer.java Changes: ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java ===================================== @@ -34,9 +34,7 @@ import java.util.Collection; import java.util.Date; import java.util.Objects; import java.util.Optional; -import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.function.Supplier; /** * Created on 21/07/2021. ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java ===================================== @@ -128,7 +128,7 @@ public abstract class IdDto extends AbstractJavaBean implements ObserveDto, DtoR public void autoTrim() { } - protected void autoTrim(Supplier<String> getter, Consumer<String> setter) { + public static void autoTrim(Supplier<String> getter, Consumer<String> setter) { String stringValue = getter.get(); if (stringValue != null) { String stringTrimmedValue = stringValue.trim(); ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java ===================================== @@ -81,4 +81,9 @@ public abstract class ContainerDto<C extends ContainerChildDto> extends DataDto firePropertyChange(PROPERTY_CHILDREN, oldValue, children); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java ===================================== @@ -55,6 +55,6 @@ public abstract class EditableDto extends DataDto implements WithSimpleComment { @Override public void autoTrim() { super.autoTrim(); - autoTrim(this::getComment, this::setComment); + WithSimpleComment.super.autoTrim(); } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java ===================================== @@ -46,4 +46,9 @@ public abstract class SimpleDto extends DataDto implements WithSimpleComment { firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.dto.data; * #L% */ +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ObserveDto; import io.ultreia.java4all.bean.JavaBean; @@ -37,4 +38,8 @@ public interface WithSimpleComment extends JavaBean, ObserveDto { void setComment(String comment); + default void autoTrim() { + IdDto.autoTrim(this::getComment, this::setComment); + } + } ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/AutoTrimGenerator.java ===================================== @@ -0,0 +1,115 @@ +package fr.ird.observe.toolkit.templates.dto; + +/*- + * #%L + * ObServe Toolkit :: Templates + * %% + * Copyright (C) 2008 - 2023 IRD, 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% + */ + + +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +import fr.ird.observe.dto.data.NoValidationDto; +import fr.ird.observe.toolkit.templates.TemplateContract; +import fr.ird.observe.toolkit.templates.validation.ValidationTagValues; +import io.ultreia.java4all.lang.Strings; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelJavaModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +/** + * To generate autoTrim method on a class. + * <p> + * Created on 14/02/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.25 + */ +public class AutoTrimGenerator { + + private final ValidationTagValues validationTagValues; + private final TemplateContract template; + private final ObjectModel model; + + public AutoTrimGenerator(ValidationTagValues validationTagValues, TemplateContract template, ObjectModel model) { + this.validationTagValues = validationTagValues; + this.template = template; + this.model = model; + } + + public void generate(ObjectModelClass input, ObjectModelClass output) { + Collection<ObjectModelAttribute> attributes = new LinkedList<>(input.getAttributes()); + + List<String> stringPropertyNames = TemplateContract.getProperties(input, attributes, (c, a) -> validationTagValues.isNotBlank(model.getTagValuesStore(), c, a) && "String".equals(GeneratorUtil.getSimpleName(a.getType()))); + List<String> compositionPropertyNames = TemplateContract.getProperties(input, attributes, (c, a) -> { + ObjectModelClass aClass = model.getClass(a.getType()); + return aClass != null + && !GeneratorUtil.isNMultiplicity(a) + && aClass.getSuperclasses().stream().anyMatch(i -> model.getClass(i.getQualifiedName()) != null) + && aClass.getInterfaces().stream().noneMatch(i -> i.getQualifiedName().equals(NoValidationDto.class.getName())); + }); + List<String> multipleCompositionPropertyNames = TemplateContract.getProperties(input, attributes, (c, a) -> { + ObjectModelClass aClass = model.getClass(a.getType()); + return aClass != null + && GeneratorUtil.isNMultiplicity(a) + && aClass.getSuperclasses().stream().anyMatch(i -> model.getClass(i.getQualifiedName()) != null) + && aClass.getInterfaces().stream().noneMatch(i -> i.getQualifiedName().equals(NoValidationDto.class.getName())); + }); + + if (stringPropertyNames.isEmpty() + && compositionPropertyNames.isEmpty() + && multipleCompositionPropertyNames.isEmpty()) { + return; + } + + ObjectModelOperation autoTrimMethod = template.addOperation(output, "autoTrim", void.class.getName(), ObjectModelJavaModifier.PUBLIC); + template.addAnnotation(output, autoTrimMethod, Override.class); + StringBuilder content = new StringBuilder(""/*{ + super.autoTrim();}*/); + for (String property : stringPropertyNames) { + String capitalize = Strings.capitalize(property); + content.append(""/*{ + autoTrim(this::get<%=capitalize%>, this::set<%=capitalize%>);}*/); + } + for (String property : compositionPropertyNames) { + String capitalize = Strings.capitalize(property); + content.append(""/*{ + if (get<%=capitalize%>() != null) { + get<%=capitalize%>().autoTrim(); + }}*/); + } + for (String property : multipleCompositionPropertyNames) { + String capitalize = Strings.capitalize(property); + content.append(""/*{ + if (isNot<%=capitalize%>Empty()) { + get<%=capitalize%>().forEach(c -> c.autoTrim()); + }}*/); + } + template.setOperationBody(autoTrimMethod, ""/*{<%=content.toString()%> + }*/); + } +} ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/dto/DtoTransformer.java ===================================== @@ -132,6 +132,7 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract private Map<String, String> decomposeTimes; private Map<String, String> decomposeDates; private String currentTimestampPropertyName; + private AutoTrimGenerator autoTrimGenerator; public static String getCoordinateField(boolean before, String coordinatePrefix, String type) { return Introspector.decapitalize(before ? (type + coordinatePrefix) : (coordinatePrefix + type)); @@ -530,30 +531,11 @@ public class DtoTransformer extends BeanTransformer implements TemplateContract return <%=content%>; }*/); } - Collection<ObjectModelAttribute> attributes = new LinkedList<>(input.getAttributes()); - List<String> notBlankString = TemplateContract.getProperties(input, attributes, (c, a) -> validationTagValues.isNotBlank(tagValuesStore, c, a) && "String".equals(GeneratorUtil.getSimpleName(a.getType()))); - addAutoTrim(output, notBlankString); + autoTrimGenerator = new AutoTrimGenerator(validationTagValues, this, model); + autoTrimGenerator.generate(input, output); return output; } - private void addAutoTrim(ObjectModelClass output, List<String> notBlankString) { - if (notBlankString.isEmpty()) { - return; - } - - ObjectModelOperation autoTrimMethod = addOperation(output, "autoTrim", void.class, ObjectModelJavaModifier.PUBLIC); - addAnnotation(output, autoTrimMethod, Override.class); - StringBuilder content = new StringBuilder(""); - for (String property : notBlankString) { - String capitalize = Strings.capitalize(property); - content.append(""/*{ - super.autoTrim(); - autoTrim(this::get<%=capitalize%>, this::set<%=capitalize%>);}*/); - } - setOperationBody(autoTrimMethod, ""/*{<%=content.toString()%> - }*/); - } - void addGroupBy(ObjectModelClass input, String... groupByList) { for (String groupByPattern : groupByList) { String groupBy = groupByPattern; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/da32fa30a22ec382bda07d193… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/da32fa30a22ec382bda07d193… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Champ manquant sur un formulaire échantillons - Closes #2625
by Tony CHEMIT (＠tchemit) 13 Feb '23

13 Feb '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cbccc232 by Tony Chemit at 2023-02-13T16:35:10+01:00 Champ manquant sur un formulaire échantillons - Closes #2625 - - - - - c8c7907d by Tony Chemit at 2023-02-13T16:35:15+01:00 Dto autoTrim - review some missing autoTrim (mainly on comment) - - - - - 8 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jcss - toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx ===================================== @@ -117,6 +117,14 @@ </JPanel> </cell> </row> + <row> + <cell> + <JLabel id='sizeMeasureMethodLabel'/> + </cell> + <cell weightx='0.5' anchor='east'> + <FilterableComboBox id='sizeMeasureMethod' genericType='SizeMeasureMethodReference'/> + </cell> + </row> <row> <cell> <JLabel id='weightMeasureMethodLabel'/> @@ -125,6 +133,7 @@ <FilterableComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> </cell> </row> + <row> <cell> <JLabel id='sexLabel'/> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jcss ===================================== @@ -27,6 +27,10 @@ disabledIcon:{getStates().getSourceInformationIcon(tableEditBean.isIsLengthComputed())}; } +#sizeMeasureMethod { + enabled: {tableEditBean.getLength() != null && !tableEditBean.isIsLengthComputed()}; +} + #weightSourceInformation { enabled: {tableEditBean.getAcquisitionMode() == 1 && tableEditBean.isIsWeightComputed()}; toolTipText:{getStates().getWeightDataTip(tableEditBean.isIsWeightComputed())}; ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java ===================================== @@ -34,9 +34,7 @@ import java.util.Collection; import java.util.Date; import java.util.Objects; import java.util.Optional; -import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.function.Supplier; /** * Created on 21/07/2021. ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java ===================================== @@ -128,7 +128,7 @@ public abstract class IdDto extends AbstractJavaBean implements ObserveDto, DtoR public void autoTrim() { } - protected void autoTrim(Supplier<String> getter, Consumer<String> setter) { + public static void autoTrim(Supplier<String> getter, Consumer<String> setter) { String stringValue = getter.get(); if (stringValue != null) { String stringTrimmedValue = stringValue.trim(); ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java ===================================== @@ -81,4 +81,9 @@ public abstract class ContainerDto<C extends ContainerChildDto> extends DataDto firePropertyChange(PROPERTY_CHILDREN, oldValue, children); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java ===================================== @@ -55,6 +55,6 @@ public abstract class EditableDto extends DataDto implements WithSimpleComment { @Override public void autoTrim() { super.autoTrim(); - autoTrim(this::getComment, this::setComment); + WithSimpleComment.super.autoTrim(); } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java ===================================== @@ -46,4 +46,9 @@ public abstract class SimpleDto extends DataDto implements WithSimpleComment { firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.dto.data; * #L% */ +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ObserveDto; import io.ultreia.java4all.bean.JavaBean; @@ -37,4 +38,8 @@ public interface WithSimpleComment extends JavaBean, ObserveDto { void setComment(String comment); + default void autoTrim() { + IdDto.autoTrim(this::getComment, this::setComment); + } + } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6ad2de7ec5f6e247653b8d45… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6ad2de7ec5f6e247653b8d45… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: Champ manquant sur un formulaire échantillons - Closes #2625
by Tony CHEMIT (＠tchemit) 13 Feb '23

13 Feb '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: b324e41e by Tony Chemit at 2023-02-13T16:32:55+01:00 Champ manquant sur un formulaire échantillons - Closes #2625 - - - - - f20b1d86 by Tony Chemit at 2023-02-13T16:33:44+01:00 Dto autoTrim - review some missing autoTrim (mainly on comment) - - - - - 8 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jcss - toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx ===================================== @@ -117,6 +117,14 @@ </JPanel> </cell> </row> + <row> + <cell> + <JLabel id='lengthMeasureMethodLabel'/> + </cell> + <cell weightx='0.5' anchor='east'> + <FilterableComboBox id='lengthMeasureMethod' genericType='LengthMeasureMethodReference'/> + </cell> + </row> <row> <cell> <JLabel id='weightMeasureMethodLabel'/> @@ -125,6 +133,7 @@ <FilterableComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> </cell> </row> + <row> <cell> <JLabel id='sexLabel'/> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jcss ===================================== @@ -27,6 +27,10 @@ disabledIcon:{getStates().getSourceInformationIcon(tableEditBean.isIsLengthComputed())}; } +#lengthMeasureMethod { + enabled: {tableEditBean.getLength() != null && !tableEditBean.isIsLengthComputed()}; +} + #weightSourceInformation { enabled: {tableEditBean.getAcquisitionMode() == 1 && tableEditBean.isIsWeightComputed()}; toolTipText:{getStates().getWeightDataTip(tableEditBean.isIsWeightComputed())}; ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java ===================================== @@ -34,9 +34,7 @@ import java.util.Collection; import java.util.Date; import java.util.Objects; import java.util.Optional; -import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.function.Supplier; /** * Created on 21/07/2021. ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java ===================================== @@ -128,7 +128,7 @@ public abstract class IdDto extends AbstractJavaBean implements ObserveDto, DtoR public void autoTrim() { } - protected void autoTrim(Supplier<String> getter, Consumer<String> setter) { + public static void autoTrim(Supplier<String> getter, Consumer<String> setter) { String stringValue = getter.get(); if (stringValue != null) { String stringTrimmedValue = stringValue.trim(); ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java ===================================== @@ -81,4 +81,9 @@ public abstract class ContainerDto<C extends ContainerChildDto> extends DataDto firePropertyChange(PROPERTY_CHILDREN, oldValue, children); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java ===================================== @@ -55,6 +55,6 @@ public abstract class EditableDto extends DataDto implements WithSimpleComment { @Override public void autoTrim() { super.autoTrim(); - autoTrim(this::getComment, this::setComment); + WithSimpleComment.super.autoTrim(); } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java ===================================== @@ -46,4 +46,9 @@ public abstract class SimpleDto extends DataDto implements WithSimpleComment { firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.dto.data; * #L% */ +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ObserveDto; import io.ultreia.java4all.bean.JavaBean; @@ -37,4 +38,8 @@ public interface WithSimpleComment extends JavaBean, ObserveDto { void setComment(String comment); + default void autoTrim() { + IdDto.autoTrim(this::getComment, this::setComment); + } + } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9f8ae853d737ff3bd7993a3a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9f8ae853d737ff3bd7993a3a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: Api Dto - Introduce NoValidationDto for model classes that does not required...
by Tony CHEMIT (＠tchemit) 12 Feb '23

12 Feb '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 849901a5 by Tony Chemit at 2023-02-12T14:43:13+01:00 Api Dto - Introduce NoValidationDto for model classes that does not required any validation (mainly XXXStub classes), as a side effect they are not in the business project either - - - - - dc006e9f by Tony Chemit at 2023-02-12T14:43:13+01:00 Templates - Let's add notBlank tag-values on any String attributes in dto model at extract tag-values phase - - - - - 5ae21fc7 by Tony Chemit at 2023-02-12T14:43:13+01:00 Api Dto - Improve dto autoTrim method (use now inheritance), and manage referential special attribute code - - - - - 656473e2 by Tony Chemit at 2023-02-12T14:43:13+01:00 Model - Update notBlank tag-value (now generated by model) - - - - - 2363ac07 by Tony Chemit at 2023-02-12T14:46:36+01:00 Validation - Update validators (for notBlank tag-value fields) - - - - - b65ccd82 by Tony Chemit at 2023-02-12T14:46:36+01:00 Referential UI - do autoTrim on getBeanToSave method - - - - - ba78a5be by Tony Chemit at 2023-02-12T15:06:13+01:00 Validation - Update validators (for notBlank tag-value fields) - - - - - 6ad2de7e by Tony Chemit at 2023-02-12T15:15:58+01:00 Merge branch 'feature/issue_2622' into develop [UI REFERENTIELS] Envisager un auto-trim droite et gauche sur les champs alphanumériques - Closes #2622 - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingPartDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingPartDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivitySampleDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivitySampleDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/BaitsCompositionDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/BaitsCompositionDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/BranchlinesCompositionDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/BranchlinesCompositionDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/CatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/CatchDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/FloatlinesCompositionDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/FloatlinesCompositionDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/HooksCompositionDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/HooksCompositionDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SampleDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SampleDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SamplePartDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SamplePartDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetGlobalCompositionDto-create-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cb7584b776e42d92ff9a991b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cb7584b776e42d92ff9a991b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 7 commits: Api Dto - Introduce NoValidationDto for model classes that does not required...
by Tony CHEMIT (＠tchemit) 12 Feb '23

12 Feb '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 59915b16 by Tony Chemit at 2023-02-12T13:57:36+01:00 Api Dto - Introduce NoValidationDto for model classes that does not required any validation (mainly XXXStub classes), as a side effect they are not in the business project either - - - - - 5b75fdc5 by Tony Chemit at 2023-02-12T13:57:36+01:00 Templates - Let's add notBlank tag-values on any String attributes in dto model at extract tag-values phase - - - - - 42148260 by Tony Chemit at 2023-02-12T13:57:36+01:00 Api Dto - Improve dto autoTrim method (use now inheritance), and manage referential special attribute code - - - - - 9fd6af25 by Tony Chemit at 2023-02-12T13:57:36+01:00 Model - Update notBlank tag-value (now generated by model) - - - - - f3cf64a9 by Tony Chemit at 2023-02-12T13:57:36+01:00 Validation - Update validators (for notBlank tag-value fields) - - - - - 31e6a3d9 by Tony Chemit at 2023-02-12T13:57:36+01:00 Referential UI - do autoTrim on getBeanToSave method - - - - - 9f8ae853 by Tony Chemit at 2023-02-12T14:33:23+01:00 Merge branch 'feature/issue_2622' into develop-9.0.x [UI REFERENTIELS] Envisager un auto-trim droite et gauche sur les champs alphanumériques - Closes #2622 - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingPartDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingPartDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivitySampleDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivitySampleDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/BaitsCompositionDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/BaitsCompositionDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/BranchlinesCompositionDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/BranchlinesCompositionDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/CatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/CatchDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/FloatlinesCompositionDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/FloatlinesCompositionDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/HooksCompositionDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/HooksCompositionDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SampleDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SampleDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SamplePartDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SamplePartDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetGlobalCompositionDto-create-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/395e074cf1a6a7d89652896d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/395e074cf1a6a7d89652896d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 3 commits: Avdth - add fallback for Destination that does not exist in version 9.0.x
by Tony CHEMIT (＠tchemit) 12 Feb '23

12 Feb '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: de629db7 by Tony Chemit at 2023-02-12T13:35:42+01:00 Avdth - add fallback for Destination that does not exist in version 9.0.x - - - - - 364e76a5 by Tony Chemit at 2023-02-12T13:35:46+01:00 update pom Retirer observe.exe qui ne fonctionne pas et induit les utilisateurs en erreur - Closes #2616 - - - - - 395e074c by Tony Chemit at 2023-02-12T13:57:23+01:00 I18n - use common label for FloatingObjectPart.whenXXX properties - - - - - 4 changed files: - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/DestinationInterceptor.java - model/src/main/models/Observe/dto/class/i18nLabels.properties - pom.xml Changes: ===================================== core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties ===================================== @@ -20,7 +20,7 @@ # #L% ### #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo -#Fri Dec 23 08:00:24 CET 2022 +#Sun Feb 12 12:28:43 CET 2023 observe.Business.createDate=observe.Common.createDate observe.Business.homeId=observe.Common.homeId observe.Business.id=observe.Common.id @@ -1488,6 +1488,8 @@ observe.data.ps.logbook.FloatingObjectPart.id=observe.Common.id observe.data.ps.logbook.FloatingObjectPart.label=observe.Common.label observe.data.ps.logbook.FloatingObjectPart.lastUpdateDate=observe.Common.lastUpdateDate observe.data.ps.logbook.FloatingObjectPart.version=observe.Common.version +observe.data.ps.logbook.FloatingObjectPart.whenArriving=observe.Common.whenArriving +observe.data.ps.logbook.FloatingObjectPart.whenLeaving=observe.Common.whenLeaving observe.data.ps.logbook.Route.comment=observe.Common.comment observe.data.ps.logbook.Route.createDate=observe.Common.createDate observe.data.ps.logbook.Route.homeId=observe.Common.homeId @@ -1663,6 +1665,8 @@ observe.data.ps.observation.FloatingObjectPart.id=observe.Common.id observe.data.ps.observation.FloatingObjectPart.label=observe.Common.label observe.data.ps.observation.FloatingObjectPart.lastUpdateDate=observe.Common.lastUpdateDate observe.data.ps.observation.FloatingObjectPart.version=observe.Common.version +observe.data.ps.observation.FloatingObjectPart.whenArriving=observe.Common.whenArriving +observe.data.ps.observation.FloatingObjectPart.whenLeaving=observe.Common.whenLeaving observe.data.ps.observation.NonTargetCatchRelease.comment=observe.Common.comment observe.data.ps.observation.NonTargetCatchRelease.comment.short=observe.Common.comment.short observe.data.ps.observation.NonTargetCatchRelease.createDate=observe.Common.createDate ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/DestinationInterceptor.java ===================================== @@ -40,6 +40,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; import java.util.Map; +import java.util.TreeMap; /** * Created on 22/05/2021. @@ -80,6 +81,15 @@ public class DestinationInterceptor extends ReferentialInterceptor<Destination, super(context, Destination.SPI); } + @Override + protected Map<String, Destination> existingIndex(ObserveTopiaPersistenceContext persistenceContext) { + Map<String, Destination> result = new TreeMap<>(super.existingIndex(persistenceContext)); + //Warning: This is added in 9.0.x to simulate a missing referential added in 9.1.x + result.put("28", result.get("1")); + result.put("29", result.get("1")); + return result; + } + @Override public Destination read(ResultSet resultSet, Map<String, Destination> existingIndex, SqlScriptWriter sqlWriter) throws SQLException { Destination entity = super.read(resultSet, existingIndex, sqlWriter); ===================================== model/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -73,6 +73,7 @@ data.ps.logbook.Activity=date,observedSystem.available,observedSystem.selected,c data.ps.logbook.ActivityStub=date,comment,latitude,longitude,number,quadrant,seaSurfaceTemperature,time,vesselActivity data.ps.logbook.Catch=comment,species,speciesFate,weight,weightCategory,weightMeasureMethod,well,weight.validation.required,weightMeasureMethod.validation.required data.ps.logbook.FloatingObject=materialsValid,objectOperation,quadrant,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short +data.ps.logbook.FloatingObjectPart=whenArriving,whenLeaving data.ps.logbook.Route=activity,comment,date,fishingTime,timeAtSea data.ps.logbook.Sample=number,activity,bigsWeight,comment,person,sampleQuality,sampleType,smallsWeight,superSample,totalWeight,well,generalTab,activityTab,notSuperSample.with.moreThanOne.sampleSpecies.message,notSuperSample.with.moreThanOne.sampleSpecies.title,personTab,psSampler.available,psSampler.selected data.ps.logbook.SampleActivity=activity,weightedWeight @@ -84,6 +85,7 @@ data.ps.logbook.WellPlan=activity,species,weight,weightCategory,well,wellSamplin data.ps.observation.Activity=date,coordinate,observedSystem.available,observedSystem.selected,comment,comment2,currentFpaZone,dataQuality,detectionMode,ersId,floatingObjectEmpty,latitude,longitude,nextFpaZone,nonTargetCatchSpecies,observedSystem,observedSystemDistance,previousFpaZone,quadrant,reasonForNoFishing,seaSurfaceTemperature,surroundingActivity,time,vesselActivity,vesselSpeed,wind,generalTab,error.no.activity.6,measurementsTab,observedSystemTab data.ps.observation.Catch=catchWeight,catchWeightTotalCount,meanWeightMeanLength,comment,informationSource,lengthMeasureMethod,meanLength,minWeight,maxWeight,meanWeight,minMaxWeight,reasonForDiscard,species,speciesFate,totalCount,weightMeasureMethod,well,catchWeightComputed.computed.tip,catchWeightComputed.observed.tip,meanLengthComputed.computed.tip,meanLengthComputed.observed.tip,meanWeightComputed.computed.tip,meanWeightComputed.observed.tip,totalCountComputed.computed.tip,totalCountComputed.observed.tip data.ps.observation.FloatingObject=materialsValid,objectOperation,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short +data.ps.observation.FloatingObjectPart=whenArriving,whenLeaving data.ps.observation.NonTargetCatchRelease=comment,conformity,count,length,lengthMeasureMethod,releasingTime,sex,status,species,speciesGroupReleaseMode,message.cantAdd data.ps.observation.ObjectObservedSpecies=count,species,speciesStatus data.ps.observation.ObjectSchoolEstimate=species,totalWeight,weightMeasureMethod ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.5</version> + <version>2023.6</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/996ddb15bf24c8d8c7e795ea… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/996ddb15bf24c8d8c7e795ea… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT (＠tchemit) 12 Feb '23

12 Feb '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0df63ae0 by Tony Chemit at 2023-02-12T13:58:53+01:00 update pom Retirer observe.exe qui ne fonctionne pas et induit les utilisateurs en erreur - Closes #2616 - - - - - cb7584b7 by Tony Chemit at 2023-02-12T14:01:42+01:00 I18n - use common label for FloatingObjectPart.whenXXX properties - - - - - 3 changed files: - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - model/src/main/models/Observe/dto/class/i18nLabels.properties - pom.xml Changes: ===================================== core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties ===================================== @@ -20,7 +20,7 @@ # #L% ### #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo -#Fri Feb 03 18:33:01 CET 2023 +#Sun Feb 12 12:28:43 CET 2023 observe.Business.createDate=observe.Common.createDate observe.Business.homeId=observe.Common.homeId observe.Business.id=observe.Common.id @@ -1488,6 +1488,8 @@ observe.data.ps.logbook.FloatingObjectPart.id=observe.Common.id observe.data.ps.logbook.FloatingObjectPart.label=observe.Common.label observe.data.ps.logbook.FloatingObjectPart.lastUpdateDate=observe.Common.lastUpdateDate observe.data.ps.logbook.FloatingObjectPart.version=observe.Common.version +observe.data.ps.logbook.FloatingObjectPart.whenArriving=observe.Common.whenArriving +observe.data.ps.logbook.FloatingObjectPart.whenLeaving=observe.Common.whenLeaving observe.data.ps.logbook.Route.comment=observe.Common.comment observe.data.ps.logbook.Route.createDate=observe.Common.createDate observe.data.ps.logbook.Route.homeId=observe.Common.homeId @@ -1694,6 +1696,8 @@ observe.data.ps.observation.FloatingObjectPart.id=observe.Common.id observe.data.ps.observation.FloatingObjectPart.label=observe.Common.label observe.data.ps.observation.FloatingObjectPart.lastUpdateDate=observe.Common.lastUpdateDate observe.data.ps.observation.FloatingObjectPart.version=observe.Common.version +observe.data.ps.observation.FloatingObjectPart.whenArriving=observe.Common.whenArriving +observe.data.ps.observation.FloatingObjectPart.whenLeaving=observe.Common.whenLeaving observe.data.ps.observation.NonTargetCatchRelease.comment=observe.Common.comment observe.data.ps.observation.NonTargetCatchRelease.comment.short=observe.Common.comment.short observe.data.ps.observation.NonTargetCatchRelease.createDate=observe.Common.createDate ===================================== model/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -73,6 +73,7 @@ data.ps.logbook.Activity=date,observedSystem.available,observedSystem.selected,c data.ps.logbook.ActivityStub=date,comment,latitude,longitude,number,quadrant,seaSurfaceTemperature,time,vesselActivity data.ps.logbook.Catch=comment,species,speciesFate,weight,weightCategory,weightMeasureMethod,well,weight.validation.required,weightMeasureMethod.validation.required data.ps.logbook.FloatingObject=materialsValid,objectOperation,quadrant,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short +data.ps.logbook.FloatingObjectPart=whenArriving,whenLeaving data.ps.logbook.Route=activity,comment,date,fishingTime,timeAtSea data.ps.logbook.Sample=number,activity,bigsWeight,comment,person,sampleQuality,sampleType,smallsWeight,superSample,totalWeight,well,generalTab,activityTab,notSuperSample.with.moreThanOne.sampleSpecies.message,notSuperSample.with.moreThanOne.sampleSpecies.title,personTab,psSampler.available,psSampler.selected data.ps.logbook.SampleActivity=activity,weightedWeight @@ -86,6 +87,7 @@ data.ps.logbook.WellActivitySpecies=species,weight,weightCategory,count,setSpeci data.ps.observation.Activity=date,coordinate,observedSystem.available,observedSystem.selected,comment,comment2,currentFpaZone,dataQuality,detectionMode,ersId,floatingObjectEmpty,latitude,longitude,nextFpaZone,nonTargetCatchSpecies,observedSystem,observedSystemDistance,previousFpaZone,quadrant,reasonForNoFishing,seaSurfaceTemperature,surroundingActivity,time,vesselActivity,vesselSpeed,wind,generalTab,error.no.activity.6,measurementsTab,observedSystemTab data.ps.observation.Catch=catchWeight,catchWeightTotalCount,meanWeightMeanLength,comment,informationSource,sizeMeasureMethod,meanLength,minWeight,maxWeight,meanWeight,minMaxWeight,reasonForDiscard,species,speciesFate,totalCount,weightMeasureMethod,well,catchWeightComputed.computed.tip,catchWeightComputed.observed.tip,meanLengthComputed.computed.tip,meanLengthComputed.observed.tip,meanWeightComputed.computed.tip,meanWeightComputed.observed.tip,totalCountComputed.computed.tip,totalCountComputed.observed.tip data.ps.observation.FloatingObject=materialsValid,objectOperation,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short +data.ps.observation.FloatingObjectPart=whenArriving,whenLeaving data.ps.observation.NonTargetCatchRelease=comment,conformity,count,length,sizeMeasureMethod,releasingTime,sex,status,species,speciesGroupReleaseMode,message.cantAdd data.ps.observation.ObjectObservedSpecies=count,species,speciesStatus data.ps.observation.ObjectSchoolEstimate=species,totalWeight,weightMeasureMethod ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.5</version> + <version>2023.6</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f585d278f339953df789178e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f585d278f339953df789178e… You're receiving this email because of your account on gitlab.com.

1 0