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

[Git][ultreiaio/ird-observe][release/9.0.25] 3 commits: [jgitflow-maven-plugin]updating poms for 9.0.26-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 14 Feb '23

14 Feb '23

Tony CHEMIT pushed to branch release/9.0.25 at ultreiaio / ird-observe Commits: 683477d3 by Tony Chemit at 2023-02-14T11:18:24+01:00 [jgitflow-maven-plugin]updating poms for 9.0.26-SNAPSHOT development[skip ci] - - - - - 186ac132 by Tony Chemit at 2023-02-14T11:29:42+01:00 Update Public API Documentation - - - - - 02d32461 by Tony Chemit at 2023-02-14T11:31:35+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.25' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3c802b7a0df62098426f2e5c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3c802b7a0df62098426f2e5c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Update Public API Documentation
by Tony CHEMIT (＠tchemit) 14 Feb '23

14 Feb '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 186ac132 by Tony Chemit at 2023-02-14T11:29:42+01:00 Update Public API Documentation - - - - - 30 changed files: - server/runner/src/main/webResources/doc/api/public/data/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeatures/GenerateId/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeatures/GetOne/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeatures/GetSome/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeatures/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeatures/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeatures/validation-create-warning.xml - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeatures/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeatures/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeatures/validation-update-warning.xml - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeatures/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeaturesMeasurement/GenerateId/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeaturesMeasurement/GetOne/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeaturesMeasurement/GetSome/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeaturesMeasurement/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeaturesMeasurement/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeaturesMeasurement/validation-create-warning.xml - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeaturesMeasurement/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeaturesMeasurement/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeaturesMeasurement/validation-update-warning.xml - server/runner/src/main/webResources/doc/api/public/data/ll/common/GearUseFeaturesMeasurement/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/Create/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/Delete/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/GenerateId/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/GetOne/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/GetSome/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/Update/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/index.html - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/validation-create-warning.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/186ac1322df8204a9aee5d5f0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/186ac1322df8204a9aee5d5f0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] [jgitflow-maven-plugin]updating poms for 9.0.26-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 14 Feb '23

14 Feb '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 683477d3 by Tony Chemit at 2023-02-14T11:18:24+01:00 [jgitflow-maven-plugin]updating poms for 9.0.26-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/683477d3c93a4ba70f2221bf5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/683477d3c93a4ba70f2221bf5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.25
by Tony CHEMIT (＠tchemit) 14 Feb '23

14 Feb '23

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

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Update changelog for v.9.0.25 [skip CI]
by Tony CHEMIT (＠tchemit) 14 Feb '23

14 Feb '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 3c802b7a by Tony Chemit at 2023-02-14T11:17:12+01:00 Update changelog for v.9.0.25 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,23 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-01-25 14:57. + * Last generated at 2023-02-14 11:16. + +## Version [9.0.25](https://gitlab.com/ultreiaio/ird-observe/-/milestones/255) + +**Closed at 2023-02-14.** + +### Download +* [Client (observe-9.0.25-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.25.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.25-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2616]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2616) **Retirer observe.exe qui ne fonctionne pas et induit les utilisateurs en erreur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2625]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2625) **Champ manquant sur un formulaire échantillons** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2622]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2622) **[UI REFERENTIELS] Envisager un auto-trim droite et gauche sur les champs alphanumériques** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2623]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2623) **Amélioration de l'éditeur des matériaux de DCP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2627]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2627) **Sur le formulaire Captures, le champs méthode de mesure de poids doit être accessible uniquement si le poids est renseigné et non calculé** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) ## Version [9.0.24](https://gitlab.com/ultreiaio/ird-observe/-/milestones/254) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3c802b7a0df62098426f2e5c0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3c802b7a0df62098426f2e5c0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.25 [skip CI]
by Tony CHEMIT (＠tchemit) 14 Feb '23

14 Feb '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 96cc8c8b by Tony Chemit at 2023-02-14T11:17:23+01:00 Update changelog for v.9.0.25 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,23 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-01-25 14:57. + * Last generated at 2023-02-14 11:16. + +## Version [9.0.25](https://gitlab.com/ultreiaio/ird-observe/-/milestones/255) + +**Closed at 2023-02-14.** + +### Download +* [Client (observe-9.0.25-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.25.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.25-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2616]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2616) **Retirer observe.exe qui ne fonctionne pas et induit les utilisateurs en erreur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2625]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2625) **Champ manquant sur un formulaire échantillons** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2622]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2622) **[UI REFERENTIELS] Envisager un auto-trim droite et gauche sur les champs alphanumériques** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2623]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2623) **Amélioration de l'éditeur des matériaux de DCP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2627]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2627) **Sur le formulaire Captures, le champs méthode de mesure de poids doit être accessible uniquement si le poids est renseigné et non calculé** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) ## Version [9.0.24](https://gitlab.com/ultreiaio/ird-observe/-/milestones/254) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/96cc8c8b588734e22a37c28ca… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/96cc8c8b588734e22a37c28ca… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Sur le formulaire Captures, le champs méthode de mesure de poids doit être...
by Tony CHEMIT (＠tchemit) 14 Feb '23

14 Feb '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 36df89ec by Tony Chemit at 2023-02-14T11:12:55+01:00 Sur le formulaire Captures, le champs méthode de mesure de poids doit être accessible uniquement si le poids est renseigné et non calculé - Closes #2627 - - - - - 2 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUITableModel.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jcss ===================================== @@ -24,3 +24,6 @@ _focusComponent:{species}; } +#weightMeasureMethod { + enabled: {tableEditBean.getCatchWeight() != null && tableEditBean.getCatchWeightComputedSource() == null}; +} ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUITableModel.java ===================================== @@ -78,10 +78,7 @@ class SetCatchUITableModel extends GeneratedSetCatchUITableModel { CatchDto source = (CatchDto) evt.getSource(); source.setTotalCountComputedSource(null); }; - catchWeightChanged = evt -> { - CatchDto source = (CatchDto) evt.getSource(); - source.setCatchWeightComputedSource(null); - }; + catchWeightChanged = evt -> onWeightChanged((Float) evt.getNewValue(), !ui.getStates().isResetEdit()); meanWeightChanged = evt -> { CatchDto source = (CatchDto) evt.getSource(); source.setMeanWeightComputedSource(null); @@ -146,6 +143,7 @@ class SetCatchUITableModel extends GeneratedSetCatchUITableModel { @Override protected void onSelectedRowChanged(SetCatchUI ui, int editingRow, CatchDto tableEditBean, CatchDto previousRowBean, boolean notPersisted, boolean newRow) { + super.onSelectedRowChanged(ui, editingRow, tableEditBean, previousRowBean, notPersisted, newRow); tableEditBean.removePropertyChangeListener(CatchDto.PROPERTY_TOTAL_COUNT, totalCountChanged); @@ -176,4 +174,14 @@ class SetCatchUITableModel extends GeneratedSetCatchUITableModel { // No specific message return null; } + + protected void onWeightChanged(Float newValue, boolean realChange) { + CatchDto tableEditBean = getTableEditBean(); + if (realChange) { + tableEditBean.setCatchWeightComputedSource(null); + } + if (newValue == null) { + tableEditBean.setWeightMeasureMethod(null); + } + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/36df89ecfed54893d1c71acb2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/36df89ecfed54893d1c71acb2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Sur le formulaire Captures, le champs méthode de mesure de poids doit être...
by Tony CHEMIT (＠tchemit) 14 Feb '23

14 Feb '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1e517b43 by Tony Chemit at 2023-02-14T11:13:09+01:00 Sur le formulaire Captures, le champs méthode de mesure de poids doit être accessible uniquement si le poids est renseigné et non calculé - Closes #2627 - - - - - 2 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUITableModel.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jcss ===================================== @@ -24,3 +24,6 @@ _focusComponent:{species}; } +#weightMeasureMethod { + enabled: {tableEditBean.getCatchWeight() != null && tableEditBean.getCatchWeightComputedSource() == null}; +} ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUITableModel.java ===================================== @@ -78,10 +78,7 @@ class SetCatchUITableModel extends GeneratedSetCatchUITableModel { CatchDto source = (CatchDto) evt.getSource(); source.setTotalCountComputedSource(null); }; - catchWeightChanged = evt -> { - CatchDto source = (CatchDto) evt.getSource(); - source.setCatchWeightComputedSource(null); - }; + catchWeightChanged = evt -> onWeightChanged((Float) evt.getNewValue(), !ui.getStates().isResetEdit()); meanWeightChanged = evt -> { CatchDto source = (CatchDto) evt.getSource(); source.setMeanWeightComputedSource(null); @@ -146,6 +143,7 @@ class SetCatchUITableModel extends GeneratedSetCatchUITableModel { @Override protected void onSelectedRowChanged(SetCatchUI ui, int editingRow, CatchDto tableEditBean, CatchDto previousRowBean, boolean notPersisted, boolean newRow) { + super.onSelectedRowChanged(ui, editingRow, tableEditBean, previousRowBean, notPersisted, newRow); tableEditBean.removePropertyChangeListener(CatchDto.PROPERTY_TOTAL_COUNT, totalCountChanged); @@ -176,4 +174,14 @@ class SetCatchUITableModel extends GeneratedSetCatchUITableModel { // No specific message return null; } + + protected void onWeightChanged(Float newValue, boolean realChange) { + CatchDto tableEditBean = getTableEditBean(); + if (realChange) { + tableEditBean.setCatchWeightComputedSource(null); + } + if (newValue == null) { + tableEditBean.setWeightMeasureMethod(null); + } + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1e517b4352f6ddb8c06761f69… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1e517b4352f6ddb8c06761f69… 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: 984da686 by Tony Chemit at 2023-02-14T10:08:49+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/984da6863bd24e27c7f96f756… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/984da6863bd24e27c7f96f756… 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: 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