[Observe-commits] [Git][ultreiaio/ird-observe][develop] Little improvements on editor APi (use a little more ShortIdDto in it).

23 Feb 2021


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


Commits:
d305908b by Tony Chemit at 2021-02-23T09:35:46+01:00
Little improvements on editor APi (use a little more ShortIdDto in it).

- - - - -


14 changed files:

- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveRequest.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationInitializer.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModelStates.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationInitializer.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationInitializer.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIModelStates.java
- client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/edit/GenerateContentEditUIModel.java
- client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/edit/GenerateContentEditUIModelStates.java
- client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/list/GenerateContentListUIModelStates.java
- client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUIModel.java
- client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUIModelStates.java
- client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIModelHelper.java


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;
  */
 
 import fr.ird.observe.dto.IdDto;
+import fr.ird.observe.dto.ShortIdDto;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
@@ -36,21 +38,19 @@ import java.util.function.Supplier;
  */
 public class SaveRequest {
 
-    private final Class<? extends IdDto> parentType;
-    private final String parentId;
+    private final ShortIdDto parent;
     private final String id;
     private final Supplier<? extends IdDto> beanSupplier;
     private final boolean notPersisted;
     private final Predicate<String> predicate;
     private IdDto bean;
 
-    public SaveRequest(Class<? extends IdDto> parentType, String parentId, String id, Supplier<? extends IdDto> beanSupplier) {
-        this(parentType, parentId, id, beanSupplier, t -> true);
+    public SaveRequest(ShortIdDto  parentId, String id, Supplier<? extends IdDto> beanSupplier) {
+        this(parentId, id, beanSupplier, t -> true);
     }
 
-    public SaveRequest(Class<? extends IdDto> parentType, String parentId, String id, Supplier<? extends IdDto> beanSupplier, Predicate<String> predicate) {
-        this.parentType = Objects.requireNonNull(parentType);
-        this.parentId = Objects.requireNonNull(parentId);
+    public SaveRequest(ShortIdDto parentId, String id, Supplier<? extends IdDto> beanSupplier, Predicate<String> predicate) {
+        this.parent = Objects.requireNonNull(parentId);
         this.id = id;
         this.notPersisted = id == null;
         this.beanSupplier = Objects.requireNonNull(beanSupplier);
@@ -58,20 +58,15 @@ public class SaveRequest {
     }
 
     public SaveRequest(String id, Supplier<? extends IdDto> beanSupplier, Predicate<String> predicate) {
-        this.parentType = null;
-        this.parentId = null;
+        this.parent = null;
         this.id = id;
         this.notPersisted = id == null;
         this.beanSupplier = Objects.requireNonNull(beanSupplier);
         this.predicate = predicate;
     }
 
-    public Class<? extends IdDto> getParentType() {
-        return parentType;
-    }
-
     public String getParentId() {
-        return parentId;
+        return Optional.ofNullable(parent).map(ShortIdDto::getId).orElse(null);
     }
 
     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;
 
 import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUIModelStatesSupport;
 import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUIModelSupport;
+import fr.ird.observe.dto.ShortIdDto;
 import fr.ird.observe.dto.data.EditableDto;
 
+import java.util.Objects;
+
 /**
  * Created on 30/10/2020.
  *
@@ -36,15 +39,19 @@ public class ContentEditUIModelStates<D extends EditableDto> extends ContentSimp
     /**
      * Parent Data id.
      */
-    private final String selectedParentId;
+    private final ShortIdDto selectedParent;
 
-    public ContentEditUIModelStates(ContentSimpleUIModelSupport<D> model, D bean, String selectedId, String selectedParentId) {
+    public ContentEditUIModelStates(ContentSimpleUIModelSupport<D> model, D bean, String selectedId, ShortIdDto selectedParent) {
         super(model, bean, selectedId);
-        this.selectedParentId = selectedParentId;
+        this.selectedParent = Objects.requireNonNull(selectedParent);
+    }
+
+    public final ShortIdDto selectedParent() {
+        return selectedParent;
     }
 
     public final String getSelectedParentId() {
-        return selectedParentId;
+        return selectedParent().getId();
     }
 
 }


=====================================
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;
 import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationContext;
 import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationInitializer;
 import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope;
+import fr.ird.observe.dto.ShortIdDto;
 import fr.ird.observe.dto.reference.DataDtoReference;
 import fr.ird.observe.dto.reference.DtoReference;
 
@@ -78,6 +79,10 @@ public class ContentEditUINavigationInitializer extends NavigationInitializer<Co
         return parentReference;
     }
 
+    public ShortIdDto getParentShortReference() {
+        return parentReference.toShortReference();
+    }
+
     public DataDtoReference getReference() {
         return reference;
     }


=====================================
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;
 import fr.ird.observe.client.datasource.editor.api.content.ContentUIModel;
 import fr.ird.observe.client.datasource.editor.api.content.ContentUIModelStates;
 import fr.ird.observe.dto.IdDto;
+import fr.ird.observe.dto.ShortIdDto;
 import fr.ird.observe.dto.reference.DataDtoReference;
 import fr.ird.observe.dto.reference.DtoReference;
 import org.apache.commons.collections4.CollectionUtils;
@@ -53,16 +54,16 @@ public class ContentListUIModelStates<R extends DataDtoReference> extends Conten
     public static final String PROPERTY_LAYOUT_NAME = "layoutName";
     private static final Logger log = LogManager.getLogger(ContentListUIModelStates.class);
     private final ReferencesCache referenceCache;
-    private final String selectedParentId;
+    private final ShortIdDto selectedParent;
     private final String editNodeId;
     private final boolean parentOpen;
     private List<R> data;
     private List<R> selectedDatas;
     private String layoutName;
 
-    public ContentListUIModelStates(ContentListUIModel<R> model, String selectedParentId, String editNodeId, boolean parentOpen) {
+    public ContentListUIModelStates(ContentListUIModel<R> model, ShortIdDto selectedParent, String editNodeId, boolean parentOpen) {
         this.referenceCache = Objects.requireNonNull(model).getSource().getContext().newReferenceCache();
-        this.selectedParentId = selectedParentId;
+        this.selectedParent = selectedParent;
         this.editNodeId = editNodeId;
         this.parentOpen = parentOpen;
     }
@@ -88,8 +89,7 @@ public class ContentListUIModelStates<R extends DataDtoReference> extends Conten
             }
         });
 
-        String selectedId = getSelectedParentId();
-        log.info(source.getInitializer().getLogPrefix() + "parentSelectedId   = " + selectedId);
+        log.info(String.format("%s parentSelectedId = %s", source.getInitializer().getLogPrefix(), selectedParent()));
         @SuppressWarnings("unchecked") List<R> data = (List<R>) source.getReferences();
         setData(data);
     }
@@ -102,8 +102,12 @@ public class ContentListUIModelStates<R extends DataDtoReference> extends Conten
         return editNodeId;
     }
 
+    public ShortIdDto selectedParent() {
+        return selectedParent;
+    }
+
     public String getSelectedParentId() {
-        return selectedParentId;
+        return selectedParent().getId();
     }
 
     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;
 import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationContext;
 import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationInitializer;
 import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope;
+import fr.ird.observe.dto.ShortIdDto;
 import fr.ird.observe.dto.reference.DataDtoReference;
 import fr.ird.observe.dto.reference.DtoReference;
 import fr.ird.observe.dto.reference.LazyDataDtoReferenceSet;
@@ -84,6 +85,10 @@ public class ContentListUINavigationInitializer extends NavigationInitializer<Co
         return parentReference;
     }
 
+    public ShortIdDto getParentShortReference() {
+        return parentReference.toShortReference();
+    }
+
     public final String getSelectedParentId() {
         return getParentReference().getId();
     }


=====================================
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;
 import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUIModelStatesSupport;
 import fr.ird.observe.client.datasource.validation.ClientValidationContext;
 import fr.ird.observe.client.datasource.validation.ClientValidationContextApplicationComponent;
+import fr.ird.observe.dto.ShortIdDto;
 import fr.ird.observe.dto.data.OpenableDto;
 import fr.ird.observe.dto.data.ps.common.TripDto;
 import org.apache.logging.log4j.LogManager;
@@ -43,20 +44,24 @@ public class ContentOpenableUIModelStates<D extends OpenableDto> extends Content
     /**
      * Parent Data id.
      */
-    private final String selectedParentId;
+    private final ShortIdDto selectedParent;
 
     /**
      * Historical data (found on trip data).
      */
     private boolean historicalData;
 
-    public ContentOpenableUIModelStates(ContentOpenableUIModel<D> model, D bean, String selectedId, String selectedParentId) {
+    public ContentOpenableUIModelStates(ContentOpenableUIModel<D> model, D bean, String selectedId, ShortIdDto selectedParent) {
         super(model, bean, selectedId);
-        this.selectedParentId = selectedParentId;
+        this.selectedParent = selectedParent;
+    }
+
+    public ShortIdDto selectedParent() {
+        return selectedParent;
     }
 
     public final String getSelectedParentId() {
-        return selectedParentId;
+        return selectedParent().getId();
     }
 
 //    @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;
 import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationContext;
 import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationInitializer;
 import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope;
+import fr.ird.observe.dto.ShortIdDto;
 import fr.ird.observe.dto.reference.DataDtoReference;
 import fr.ird.observe.dto.reference.DtoReference;
 import io.ultreia.java4all.bean.definition.JavaBeanPropertyDefinition;
@@ -90,6 +91,10 @@ public final class ContentOpenableUINavigationInitializer extends NavigationInit
         return parentReference;
     }
 
+    public ShortIdDto getParentShortReference() {
+        return parentReference.toShortReference();
+    }
+
     public final DataDtoReference getReference() {
         return reference;
     }


=====================================
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;
  */
 
 import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveRequest;
+import fr.ird.observe.dto.ShortIdDto;
 import fr.ird.observe.dto.data.ll.logbook.SetDto;
 import fr.ird.observe.dto.data.ll.logbook.SetStubDto;
 import fr.ird.observe.dto.form.Form;
@@ -63,12 +64,12 @@ public class SetUIModelStates extends GeneratedSetUIModelStates {
         firePropertyChange("copySetCandidate", oldValue, copySetCandidate);
     }
 
-    public String getSetIdToCopy() {
-        return copySetCandidate == null ? null : copySetCandidate.getId();
+    public SaveRequest toSaveRequestWithCopy() {
+        return new SaveRequest(setIdToCopy(), getSelectedId(), this::getBeanToSave);
     }
 
-    public SaveRequest toSaveRequestWithCopy() {
-        return new SaveRequest(SetDto.class, getSetIdToCopy(), getSelectedId(), this::getBeanToSave);
+    private ShortIdDto setIdToCopy() {
+        return copySetCandidate == null ? null : copySetCandidate.toShortReference();
     }
 
     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 {
     public static final String TO_SAVE_REQUEST = "" +
             "    @Override\n" +
             "    public SaveRequest toSaveRequest() {\n" +
-            "        return new SaveRequest(%1$s.class, getStates().getSelectedParentId(), getStates().getSelectedId(), getStates()::getBeanToSave);\n" +
+            "        return new SaveRequest(getStates().selectedParent(), getStates().getSelectedId(), getStates()::getBeanToSave);\n" +
             "    }\n\n";
 
     @Override
     protected String generateAbstractContent0(Path sourceDirectory, Path targetDirectory, Path path, String packageName, String namePrefix) {
-        String save = String.format(TO_SAVE_REQUEST, scopeBuilder.parentDtoReferenceType.getName());
-        return uiModelHelper.generateModelGeneratedContent(dtoType, referenceType, ContentUIModelHelper.generateStates(cleanClassName), save);
+        return uiModelHelper.generateModelGeneratedContent(dtoType, referenceType, ContentUIModelHelper.generateStates(cleanClassName), TO_SAVE_REQUEST);
     }
 
     @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;
 public class GenerateContentEditUIModelStates extends GenerateContentEditUISupport {
     private static final String GENERATED_CONSTRUCTOR = "" +
             "    public Generated%1$sUIModelStates(Generated%1$sUIModel model) {\n" +
-            "        super(model, %1$sDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectId(), model.getSource().getInitializer().getSelectedParentId());\n" +
+            "        super(model, %1$sDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectId(), model.getSource().getInitializer().getParentShortReference());\n" +
             "    }\n\n";
     private static final String CONSTRUCTOR = "" +
             "    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;
 public class GenerateContentListUIModelStates extends GenerateContentListUISupport {
     private static final String GENERATED_CONSTRUCTOR = "" +
             "    public Generated%1$sModelStates(Generated%1$sModel model) {\n" +
-            "        super(model, model.getSource().getInitializer().getSelectedParentId(), model.getSource().getInitializer().getEditNodeId(), model.getSource().getInitializer().isOpen());\n" +
+            "        super(model, model.getSource().getInitializer().getParentShortReference(), model.getSource().getInitializer().getEditNodeId(), model.getSource().getInitializer().isOpen());\n" +
             "    }\n\n";
     private static final String CONSTRUCTOR = "" +
             "    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
     public static final String TO_SAVE_REQUEST = "" +
             "    @Override\n" +
             "    public SaveRequest toSaveRequest() {\n" +
-            "        return new SaveRequest(%1$s.class, getStates().getSelectedParentId(), getStates().getSelectedId(), getStates()::getBeanToSave);\n" +
+            "        return new SaveRequest(getStates().selectedParent(), getStates().getSelectedId(), getStates()::getBeanToSave);\n" +
             "    }\n\n";
 
     @Override
     protected String generateAbstractContent0(Path sourceDirectory, Path targetDirectory, Path path, String packageName, String namePrefix) {
-        String save = String.format(TO_SAVE_REQUEST, scopeBuilder.parentDtoReferenceType.getName());
-        return uiModelHelper.generateModelGeneratedContent(dtoType, referenceType, ContentUIModelHelper.generateStates(cleanClassName), save);
+        return uiModelHelper.generateModelGeneratedContent(dtoType, referenceType, ContentUIModelHelper.generateStates(cleanClassName), TO_SAVE_REQUEST);
     }
 
     @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;
 public class GenerateContentOpenableUIModelStates extends GenerateContentOpenableUISupport {
     private static final String GENERATED_CONSTRUCTOR = "" +
             "    public Generated%1$sUIModelStates(Generated%1$sUIModel model) {\n" +
-            "        super(model, %1$sDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectId(), model.getSource().getInitializer().getSelectedParentId());\n" +
+            "        super(model, %1$sDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectId(), model.getSource().getInitializer().getParentShortReference());\n" +
             "    }\n\n";
     private static final String CONSTRUCTOR = "" +
             "    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 {
             "    @Override\n" +
             "    public MoveRequestBuilder.StepSetParentCandidates toMoveRequest() {\n" +
             "        return MoveRequestBuilder\n" +
-            "                .create(%1$s.class, getSource().getParentReference().toShortReference(), toReference(getStates().getBean()))\n" +
+            "                .create(%1$s.class, getStates().selectedParent(), toReference(getStates().getBean()))\n" +
             "                .setEditNode(getSource().getInitializer().getEditNode());\n" +
             "    }\n\n";
     public static final String TO_MOVE_REQUEST_MULTIPLE = "" +
             "    @Override\n" +
             "    public MoveRequestBuilder.StepSetParentCandidates toMoveRequest() {\n" +
             "        return MoveRequestBuilder\n" +
-            "                .create(%1$s.class, getSource().getParentReference().toShortReference(), getStates().getSelectedDatas())\n" +
+            "                .create(%1$s.class, getStates().selectedParent(), getStates().getSelectedDatas())\n" +
             "                .setEditNode(getSource().getInitializer().getEditNode());\n" +
             "    }\n\n";
     public static final String CREATE_FORM = "" +



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d305908bbab6c3356580228aaf...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d305908bbab6c3356580228aaf...
You're receiving this email because of your account on gitlab.com.

    