Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

14 changed files:

Changes:

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveRequest.java
    ... ... @@ -23,8 +23,10 @@ package fr.ird.observe.client.datasource.editor.api.content.actions.save;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.dto.IdDto;
    26 
    +import fr.ird.observe.dto.ShortIdDto;
    26 27
    27 28 
     import java.util.Objects;
    29 
    +import java.util.Optional;
    28 30 
     import java.util.function.Predicate;
    29 31 
     import java.util.function.Supplier;
    30 32
    ... ... @@ -36,21 +38,19 @@ import java.util.function.Supplier;
    36 38 
      */
    37 39 
     public class SaveRequest {
    38 40
    39 
    -    private final Class<? extends IdDto> parentType;
    40 
    -    private final String parentId;
    41 
    +    private final ShortIdDto parent;
    41 42 
         private final String id;
    42 43 
         private final Supplier<? extends IdDto> beanSupplier;
    43 44 
         private final boolean notPersisted;
    44 45 
         private final Predicate<String> predicate;
    45 46 
         private IdDto bean;
    46 47
    47 
    -    public SaveRequest(Class<? extends IdDto> parentType, String parentId, String id, Supplier<? extends IdDto> beanSupplier) {
    48 
    -        this(parentType, parentId, id, beanSupplier, t -> true);
    48 
    +    public SaveRequest(ShortIdDto  parentId, String id, Supplier<? extends IdDto> beanSupplier) {
    49 
    +        this(parentId, id, beanSupplier, t -> true);
    49 50 
         }
    50 51
    51 
    -    public SaveRequest(Class<? extends IdDto> parentType, String parentId, String id, Supplier<? extends IdDto> beanSupplier, Predicate<String> predicate) {
    52 
    -        this.parentType = Objects.requireNonNull(parentType);
    53 
    -        this.parentId = Objects.requireNonNull(parentId);
    52 
    +    public SaveRequest(ShortIdDto parentId, String id, Supplier<? extends IdDto> beanSupplier, Predicate<String> predicate) {
    53 
    +        this.parent = Objects.requireNonNull(parentId);
    54 54 
             this.id = id;
    55 55 
             this.notPersisted = id == null;
    56 56 
             this.beanSupplier = Objects.requireNonNull(beanSupplier);
    ... ... @@ -58,20 +58,15 @@ public class SaveRequest {
    58 58 
         }
    59 59
    60 60 
         public SaveRequest(String id, Supplier<? extends IdDto> beanSupplier, Predicate<String> predicate) {
    61 
    -        this.parentType = null;
    62 
    -        this.parentId = null;
    61 
    +        this.parent = null;
    63 62 
             this.id = id;
    64 63 
             this.notPersisted = id == null;
    65 64 
             this.beanSupplier = Objects.requireNonNull(beanSupplier);
    66 65 
             this.predicate = predicate;
    67 66 
         }
    68 67
    69 
    -    public Class<? extends IdDto> getParentType() {
    70 
    -        return parentType;
    71 
    -    }
    72 
    -
    73 68 
         public String getParentId() {
    74 
    -        return parentId;
    69 
    +        return Optional.ofNullable(parent).map(ShortIdDto::getId).orElse(null);
    75 70 
         }
    76 71
    77 72 
         public String getId() {

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java
    ... ... @@ -24,8 +24,11 @@ package fr.ird.observe.client.datasource.editor.api.content.data.edit;
    24 24
    25 25 
     import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUIModelStatesSupport;
    26 26 
     import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUIModelSupport;
    27 
    +import fr.ird.observe.dto.ShortIdDto;
    27 28 
     import fr.ird.observe.dto.data.EditableDto;
    28 29
    30 
    +import java.util.Objects;
    31 
    +
    29 32 
     /**
    30 33 
      * Created on 30/10/2020.
    31 34 
      *
    ... ... @@ -36,15 +39,19 @@ public class ContentEditUIModelStates<D extends EditableDto> extends ContentSimp
    36 39 
         /**
    37 40 
          * Parent Data id.
    38 41 
          */
    39 
    -    private final String selectedParentId;
    42 
    +    private final ShortIdDto selectedParent;
    40 43
    41 
    -    public ContentEditUIModelStates(ContentSimpleUIModelSupport<D> model, D bean, String selectedId, String selectedParentId) {
    44 
    +    public ContentEditUIModelStates(ContentSimpleUIModelSupport<D> model, D bean, String selectedId, ShortIdDto selectedParent) {
    42 45 
             super(model, bean, selectedId);
    43 
    -        this.selectedParentId = selectedParentId;
    46 
    +        this.selectedParent = Objects.requireNonNull(selectedParent);
    47 
    +    }
    48 
    +
    49 
    +    public final ShortIdDto selectedParent() {
    50 
    +        return selectedParent;
    44 51 
         }
    45 52
    46 53 
         public final String getSelectedParentId() {
    47 
    -        return selectedParentId;
    54 
    +        return selectedParent().getId();
    48 55 
         }
    49 56
    50 57 
     }

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationInitializer.java
    ... ... @@ -25,6 +25,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.edit;
    25 25 
     import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationContext;
    26 26 
     import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationInitializer;
    27 27 
     import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope;
    28 
    +import fr.ird.observe.dto.ShortIdDto;
    28 29 
     import fr.ird.observe.dto.reference.DataDtoReference;
    29 30 
     import fr.ird.observe.dto.reference.DtoReference;
    30 31
    ... ... @@ -78,6 +79,10 @@ public class ContentEditUINavigationInitializer extends NavigationInitializer<Co
    78 79 
             return parentReference;
    79 80 
         }
    80 81
    82 
    +    public ShortIdDto getParentShortReference() {
    83 
    +        return parentReference.toShortReference();
    84 
    +    }
    85 
    +
    81 86 
         public DataDtoReference getReference() {
    82 87 
             return reference;
    83 88 
         }

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModelStates.java
    ... ... @@ -28,6 +28,7 @@ import fr.ird.observe.client.datasource.editor.api.content.ContentMode;
    28 28 
     import fr.ird.observe.client.datasource.editor.api.content.ContentUIModel;
    29 29 
     import fr.ird.observe.client.datasource.editor.api.content.ContentUIModelStates;
    30 30 
     import fr.ird.observe.dto.IdDto;
    31 
    +import fr.ird.observe.dto.ShortIdDto;
    31 32 
     import fr.ird.observe.dto.reference.DataDtoReference;
    32 33 
     import fr.ird.observe.dto.reference.DtoReference;
    33 34 
     import org.apache.commons.collections4.CollectionUtils;
    ... ... @@ -53,16 +54,16 @@ public class ContentListUIModelStates<R extends DataDtoReference> extends Conten
    53 54 
         public static final String PROPERTY_LAYOUT_NAME = "layoutName";
    54 55 
         private static final Logger log = LogManager.getLogger(ContentListUIModelStates.class);
    55 56 
         private final ReferencesCache referenceCache;
    56 
    -    private final String selectedParentId;
    57 
    +    private final ShortIdDto selectedParent;
    57 58 
         private final String editNodeId;
    58 59 
         private final boolean parentOpen;
    59 60 
         private List<R> data;
    60 61 
         private List<R> selectedDatas;
    61 62 
         private String layoutName;
    62 63
    63 
    -    public ContentListUIModelStates(ContentListUIModel<R> model, String selectedParentId, String editNodeId, boolean parentOpen) {
    64 
    +    public ContentListUIModelStates(ContentListUIModel<R> model, ShortIdDto selectedParent, String editNodeId, boolean parentOpen) {
    64 65 
             this.referenceCache = Objects.requireNonNull(model).getSource().getContext().newReferenceCache();
    65 
    -        this.selectedParentId = selectedParentId;
    66 
    +        this.selectedParent = selectedParent;
    66 67 
             this.editNodeId = editNodeId;
    67 68 
             this.parentOpen = parentOpen;
    68 69 
         }
    ... ... @@ -88,8 +89,7 @@ public class ContentListUIModelStates<R extends DataDtoReference> extends Conten
    88 89 
                 }
    89 90 
             });
    90 91
    91 
    -        String selectedId = getSelectedParentId();
    92 
    -        log.info(source.getInitializer().getLogPrefix() + "parentSelectedId   = " + selectedId);
    92 
    +        log.info(String.format("%s parentSelectedId = %s", source.getInitializer().getLogPrefix(), selectedParent()));
    93 93 
             @SuppressWarnings("unchecked") List<R> data = (List<R>) source.getReferences();
    94 94 
             setData(data);
    95 95 
         }
    ... ... @@ -102,8 +102,12 @@ public class ContentListUIModelStates<R extends DataDtoReference> extends Conten
    102 102 
             return editNodeId;
    103 103 
         }
    104 104
    105 
    +    public ShortIdDto selectedParent() {
    106 
    +        return selectedParent;
    107 
    +    }
    108 
    +
    105 109 
         public String getSelectedParentId() {
    106 
    -        return selectedParentId;
    110 
    +        return selectedParent().getId();
    107 111 
         }
    108 112
    109 113 
         public List<R> getData() {

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationInitializer.java
    ... ... @@ -25,6 +25,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.list;
    25 25 
     import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationContext;
    26 26 
     import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationInitializer;
    27 27 
     import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope;
    28 
    +import fr.ird.observe.dto.ShortIdDto;
    28 29 
     import fr.ird.observe.dto.reference.DataDtoReference;
    29 30 
     import fr.ird.observe.dto.reference.DtoReference;
    30 31 
     import fr.ird.observe.dto.reference.LazyDataDtoReferenceSet;
    ... ... @@ -84,6 +85,10 @@ public class ContentListUINavigationInitializer extends NavigationInitializer<Co
    84 85 
             return parentReference;
    85 86 
         }
    86 87
    88 
    +    public ShortIdDto getParentShortReference() {
    89 
    +        return parentReference.toShortReference();
    90 
    +    }
    91 
    +
    87 92 
         public final String getSelectedParentId() {
    88 93 
             return getParentReference().getId();
    89 94 
         }

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java
    ... ... @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.editor.api.content.ContentUIModel;
    26 26 
     import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUIModelStatesSupport;
    27 27 
     import fr.ird.observe.client.datasource.validation.ClientValidationContext;
    28 28 
     import fr.ird.observe.client.datasource.validation.ClientValidationContextApplicationComponent;
    29 
    +import fr.ird.observe.dto.ShortIdDto;
    29 30 
     import fr.ird.observe.dto.data.OpenableDto;
    30 31 
     import fr.ird.observe.dto.data.ps.common.TripDto;
    31 32 
     import org.apache.logging.log4j.LogManager;
    ... ... @@ -43,20 +44,24 @@ public class ContentOpenableUIModelStates<D extends OpenableDto> extends Content
    43 44 
         /**
    44 45 
          * Parent Data id.
    45 46 
          */
    46 
    -    private final String selectedParentId;
    47 
    +    private final ShortIdDto selectedParent;
    47 48
    48 49 
         /**
    49 50 
          * Historical data (found on trip data).
    50 51 
          */
    51 52 
         private boolean historicalData;
    52 53
    53 
    -    public ContentOpenableUIModelStates(ContentOpenableUIModel<D> model, D bean, String selectedId, String selectedParentId) {
    54 
    +    public ContentOpenableUIModelStates(ContentOpenableUIModel<D> model, D bean, String selectedId, ShortIdDto selectedParent) {
    54 55 
             super(model, bean, selectedId);
    55 
    -        this.selectedParentId = selectedParentId;
    56 
    +        this.selectedParent = selectedParent;
    57 
    +    }
    58 
    +
    59 
    +    public ShortIdDto selectedParent() {
    60 
    +        return selectedParent;
    56 61 
         }
    57 62
    58 63 
         public final String getSelectedParentId() {
    59 
    -        return selectedParentId;
    64 
    +        return selectedParent().getId();
    60 65 
         }
    61 66
    62 67 
     //    @Override

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationInitializer.java
    ... ... @@ -25,6 +25,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.open;
    25 25 
     import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationContext;
    26 26 
     import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationInitializer;
    27 27 
     import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope;
    28 
    +import fr.ird.observe.dto.ShortIdDto;
    28 29 
     import fr.ird.observe.dto.reference.DataDtoReference;
    29 30 
     import fr.ird.observe.dto.reference.DtoReference;
    30 31 
     import io.ultreia.java4all.bean.definition.JavaBeanPropertyDefinition;
    ... ... @@ -90,6 +91,10 @@ public final class ContentOpenableUINavigationInitializer extends NavigationInit
    90 91 
             return parentReference;
    91 92 
         }
    92 93
    94 
    +    public ShortIdDto getParentShortReference() {
    95 
    +        return parentReference.toShortReference();
    96 
    +    }
    97 
    +
    93 98 
         public final DataDtoReference getReference() {
    94 99 
             return reference;
    95 100 
         }

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIModelStates.java
    ... ... @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.logbook;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveRequest;
    26 
    +import fr.ird.observe.dto.ShortIdDto;
    26 27 
     import fr.ird.observe.dto.data.ll.logbook.SetDto;
    27 28 
     import fr.ird.observe.dto.data.ll.logbook.SetStubDto;
    28 29 
     import fr.ird.observe.dto.form.Form;
    ... ... @@ -63,12 +64,12 @@ public class SetUIModelStates extends GeneratedSetUIModelStates {
    63 64 
             firePropertyChange("copySetCandidate", oldValue, copySetCandidate);
    64 65 
         }
    65 66
    66 
    -    public String getSetIdToCopy() {
    67 
    -        return copySetCandidate == null ? null : copySetCandidate.getId();
    67 
    +    public SaveRequest toSaveRequestWithCopy() {
    68 
    +        return new SaveRequest(setIdToCopy(), getSelectedId(), this::getBeanToSave);
    68 69 
         }
    69 70
    70 
    -    public SaveRequest toSaveRequestWithCopy() {
    71 
    -        return new SaveRequest(SetDto.class, getSetIdToCopy(), getSelectedId(), this::getBeanToSave);
    71 
    +    private ShortIdDto setIdToCopy() {
    72 
    +        return copySetCandidate == null ? null : copySetCandidate.toShortReference();
    72 73 
         }
    73 74
    74 75 
         private void updateCopySetCandidate(Date newValue) {

  • client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/edit/GenerateContentEditUIModel.java
    ... ... @@ -37,13 +37,12 @@ public class GenerateContentEditUIModel extends GenerateContentEditUISupport {
    37 37 
         public static final String TO_SAVE_REQUEST = "" +
    38 38 
                 "    @Override\n" +
    39 39 
                 "    public SaveRequest toSaveRequest() {\n" +
    40 
    -            "        return new SaveRequest(%1$s.class, getStates().getSelectedParentId(), getStates().getSelectedId(), getStates()::getBeanToSave);\n" +
    40 
    +            "        return new SaveRequest(getStates().selectedParent(), getStates().getSelectedId(), getStates()::getBeanToSave);\n" +
    41 41 
                 "    }\n\n";
    42 42
    43 43 
         @Override
    44 44 
         protected String generateAbstractContent0(Path sourceDirectory, Path targetDirectory, Path path, String packageName, String namePrefix) {
    45 
    -        String save = String.format(TO_SAVE_REQUEST, scopeBuilder.parentDtoReferenceType.getName());
    46 
    -        return uiModelHelper.generateModelGeneratedContent(dtoType, referenceType, ContentUIModelHelper.generateStates(cleanClassName), save);
    45 
    +        return uiModelHelper.generateModelGeneratedContent(dtoType, referenceType, ContentUIModelHelper.generateStates(cleanClassName), TO_SAVE_REQUEST);
    47 46 
         }
    48 47
    49 48 
         @Override

  • client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/edit/GenerateContentEditUIModelStates.java
    ... ... @@ -37,7 +37,7 @@ import java.util.List;
    37 37 
     public class GenerateContentEditUIModelStates extends GenerateContentEditUISupport {
    38 38 
         private static final String GENERATED_CONSTRUCTOR = "" +
    39 39 
                 "    public Generated%1$sUIModelStates(Generated%1$sUIModel model) {\n" +
    40 
    -            "        super(model, %1$sDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectId(), model.getSource().getInitializer().getSelectedParentId());\n" +
    40 
    +            "        super(model, %1$sDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectId(), model.getSource().getInitializer().getParentShortReference());\n" +
    41 41 
                 "    }\n\n";
    42 42 
         private static final String CONSTRUCTOR = "" +
    43 43 
                 "    public %1$sUIModelStates(Generated%1$sUIModel model) {\n" +

  • client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/list/GenerateContentListUIModelStates.java
    ... ... @@ -37,7 +37,7 @@ import java.util.List;
    37 37 
     public class GenerateContentListUIModelStates extends GenerateContentListUISupport {
    38 38 
         private static final String GENERATED_CONSTRUCTOR = "" +
    39 39 
                 "    public Generated%1$sModelStates(Generated%1$sModel model) {\n" +
    40 
    -            "        super(model, model.getSource().getInitializer().getSelectedParentId(), model.getSource().getInitializer().getEditNodeId(), model.getSource().getInitializer().isOpen());\n" +
    40 
    +            "        super(model, model.getSource().getInitializer().getParentShortReference(), model.getSource().getInitializer().getEditNodeId(), model.getSource().getInitializer().isOpen());\n" +
    41 41 
                 "    }\n\n";
    42 42 
         private static final String CONSTRUCTOR = "" +
    43 43 
                 "    public %1$sModelStates(Generated%1$sModel model) {\n" +

  • client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUIModel.java
    ... ... @@ -37,13 +37,12 @@ public class GenerateContentOpenableUIModel extends GenerateContentOpenableUISup
    37 37 
         public static final String TO_SAVE_REQUEST = "" +
    38 38 
                 "    @Override\n" +
    39 39 
                 "    public SaveRequest toSaveRequest() {\n" +
    40 
    -            "        return new SaveRequest(%1$s.class, getStates().getSelectedParentId(), getStates().getSelectedId(), getStates()::getBeanToSave);\n" +
    40 
    +            "        return new SaveRequest(getStates().selectedParent(), getStates().getSelectedId(), getStates()::getBeanToSave);\n" +
    41 41 
                 "    }\n\n";
    42 42
    43 43 
         @Override
    44 44 
         protected String generateAbstractContent0(Path sourceDirectory, Path targetDirectory, Path path, String packageName, String namePrefix) {
    45 
    -        String save = String.format(TO_SAVE_REQUEST, scopeBuilder.parentDtoReferenceType.getName());
    46 
    -        return uiModelHelper.generateModelGeneratedContent(dtoType, referenceType, ContentUIModelHelper.generateStates(cleanClassName), save);
    45 
    +        return uiModelHelper.generateModelGeneratedContent(dtoType, referenceType, ContentUIModelHelper.generateStates(cleanClassName), TO_SAVE_REQUEST);
    47 46 
         }
    48 47
    49 48 
         @Override

  • client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUIModelStates.java
    ... ... @@ -37,7 +37,7 @@ import java.util.List;
    37 37 
     public class GenerateContentOpenableUIModelStates extends GenerateContentOpenableUISupport {
    38 38 
         private static final String GENERATED_CONSTRUCTOR = "" +
    39 39 
                 "    public Generated%1$sUIModelStates(Generated%1$sUIModel model) {\n" +
    40 
    -            "        super(model, %1$sDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectId(), model.getSource().getInitializer().getSelectedParentId());\n" +
    40 
    +            "        super(model, %1$sDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectId(), model.getSource().getInitializer().getParentShortReference());\n" +
    41 41 
                 "    }\n\n";
    42 42 
         private static final String CONSTRUCTOR = "" +
    43 43 
                 "    public %1$sUIModelStates(Generated%1$sUIModel model) {\n" +

  • client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIModelHelper.java
    ... ... @@ -120,14 +120,14 @@ public class ContentUIModelHelper extends ContentUIHelperSupport {
    120 120 
                 "    @Override\n" +
    121 121 
                 "    public MoveRequestBuilder.StepSetParentCandidates toMoveRequest() {\n" +
    122 122 
                 "        return MoveRequestBuilder\n" +
    123 
    -            "                .create(%1$s.class, getSource().getParentReference().toShortReference(), toReference(getStates().getBean()))\n" +
    123 
    +            "                .create(%1$s.class, getStates().selectedParent(), toReference(getStates().getBean()))\n" +
    124 124 
                 "                .setEditNode(getSource().getInitializer().getEditNode());\n" +
    125 125 
                 "    }\n\n";
    126 126 
         public static final String TO_MOVE_REQUEST_MULTIPLE = "" +
    127 127 
                 "    @Override\n" +
    128 128 
                 "    public MoveRequestBuilder.StepSetParentCandidates toMoveRequest() {\n" +
    129 129 
                 "        return MoveRequestBuilder\n" +
    130 
    -            "                .create(%1$s.class, getSource().getParentReference().toShortReference(), getStates().getSelectedDatas())\n" +
    130 
    +            "                .create(%1$s.class, getStates().selectedParent(), getStates().getSelectedDatas())\n" +
    131 131 
                 "                .setEditNode(getSource().getInitializer().getEditNode());\n" +
    132 132 
                 "    }\n\n";
    133 133 
         public static final String CREATE_FORM = "" +

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.