Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
7e7eb06e
by Tony CHEMIT at 2017-09-10T09:38:26+00:00
-
93ecc2b2
by Tony CHEMIT at 2017-09-10T09:40:12+00:00
11 changed files:
- client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java
- dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
- server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java
- services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java
- services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java
- services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java
- services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java
Changes:
| ... | ... | @@ -656,12 +656,19 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U |
| 656 | 656 |
|
| 657 | 657 |
}
|
| 658 | 658 |
|
| 659 |
- protected void loadReferentialReferenceSetsInModel(FormDefinition<E> formDefinition) {
|
|
| 659 |
+ public <E extends IdDto> void loadReferentialReferenceSetsInModel(FormDefinition<E> formDefinition) {
|
|
| 660 |
+ loadReferentialReferenceSetsInModel(formDefinition, true);
|
|
| 661 |
+ }
|
|
| 662 |
+ protected <E extends IdDto> void loadReferentialReferenceSetsInModel(FormDefinition<E> formDefinition, boolean clear) {
|
|
| 660 | 663 |
|
| 661 | 664 |
Class<E> dtoType = formDefinition.getType();
|
| 662 | 665 |
|
| 663 | 666 |
ImmutableMap.Builder<String, ReferentialDtoReferenceSet<?>> modelReferentialReferenceSets = ImmutableMap.builder();
|
| 664 | 667 |
|
| 668 |
+ if (!clear) {
|
|
| 669 |
+ modelReferentialReferenceSets.putAll(getModel().getReferentialReferenceSets());
|
|
| 670 |
+ }
|
|
| 671 |
+ |
|
| 665 | 672 |
log.debug("Update referential reference sets for: " + dtoType);
|
| 666 | 673 |
|
| 667 | 674 |
// mettre à jour le cache de référentiel
|
| ... | ... | @@ -36,9 +36,6 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; |
| 36 | 36 |
import fr.ird.observe.client.ui.tree.navigation.nodes.longline.TripLonglineNavigationTreeNode;
|
| 37 | 37 |
import fr.ird.observe.client.ui.util.UIHelper;
|
| 38 | 38 |
import fr.ird.observe.client.ui.util.table.AutotSelectRowAndShowPopupActionSupport;
|
| 39 |
-import fr.ird.observe.dto.decoration.DecoratorService;
|
|
| 40 |
-import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator;
|
|
| 41 |
-import fr.ird.observe.dto.form.Form;
|
|
| 42 | 39 |
import fr.ird.observe.dto.data.longline.BasketReference;
|
| 43 | 40 |
import fr.ird.observe.dto.data.longline.BranchlineDto;
|
| 44 | 41 |
import fr.ird.observe.dto.data.longline.BranchlineHelper;
|
| ... | ... | @@ -50,6 +47,10 @@ import fr.ird.observe.dto.data.longline.SetLonglineCatchHelper; |
| 50 | 47 |
import fr.ird.observe.dto.data.longline.SizeMeasureDto;
|
| 51 | 48 |
import fr.ird.observe.dto.data.longline.TripLonglineReference;
|
| 52 | 49 |
import fr.ird.observe.dto.data.longline.WeightMeasureDto;
|
| 50 |
+import fr.ird.observe.dto.decoration.DecoratorService;
|
|
| 51 |
+import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator;
|
|
| 52 |
+import fr.ird.observe.dto.form.Form;
|
|
| 53 |
+import fr.ird.observe.dto.form.FormDefinition;
|
|
| 53 | 54 |
import fr.ird.observe.dto.reference.DtoReferenceCollection;
|
| 54 | 55 |
import fr.ird.observe.dto.referential.SizeMeasureTypeReference;
|
| 55 | 56 |
import fr.ird.observe.dto.referential.SpeciesDto;
|
| ... | ... | @@ -58,12 +59,14 @@ import fr.ird.observe.dto.referential.WeightMeasureTypeReference; |
| 58 | 59 |
import fr.ird.observe.dto.referential.longline.CatchFateLonglineReference;
|
| 59 | 60 |
import fr.ird.observe.dto.referential.longline.HealthnessReference;
|
| 60 | 61 |
import fr.ird.observe.dto.result.SaveResultDto;
|
| 62 |
+import fr.ird.observe.spi.DtoModelHelper;
|
|
| 61 | 63 |
import java.beans.PropertyChangeListener;
|
| 62 | 64 |
import java.util.Calendar;
|
| 63 | 65 |
import java.util.Collections;
|
| 64 | 66 |
import java.util.Date;
|
| 65 | 67 |
import java.util.HashSet;
|
| 66 | 68 |
import java.util.List;
|
| 69 |
+import java.util.Optional;
|
|
| 67 | 70 |
import java.util.Set;
|
| 68 | 71 |
import javax.swing.JComponent;
|
| 69 | 72 |
import javax.swing.JOptionPane;
|
| ... | ... | @@ -651,6 +654,9 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat |
| 651 | 654 |
|
| 652 | 655 |
loadReferentialReferenceSetsInModel(form);
|
| 653 | 656 |
|
| 657 |
+ Optional<FormDefinition<BranchlineDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BranchlineDto.class);
|
|
| 658 |
+ optionalFormDefinition.ifPresent(branchlineDtoFormDefinition -> loadReferentialReferenceSetsInModel(branchlineDtoFormDefinition, false));
|
|
| 659 |
+ |
|
| 654 | 660 |
model.setForm(form);
|
| 655 | 661 |
|
| 656 | 662 |
LonglinePositionHelper<CatchLonglineDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi());
|
| ... | ... | @@ -35,6 +35,7 @@ import fr.ird.observe.client.ui.content.ContentUIHandler; |
| 35 | 35 |
import fr.ird.observe.client.ui.content.ContentUIModel;
|
| 36 | 36 |
import fr.ird.observe.client.ui.content.list.ContentListUIModel;
|
| 37 | 37 |
import fr.ird.observe.client.ui.util.JVetoableTabbedPane;
|
| 38 |
+import fr.ird.observe.dto.data.longline.BaitsCompositionDto;
|
|
| 38 | 39 |
import fr.ird.observe.dto.form.Form;
|
| 39 | 40 |
import fr.ird.observe.dto.data.longline.ActivityLonglineDto;
|
| 40 | 41 |
import fr.ird.observe.dto.data.longline.BasketDto;
|
| ... | ... | @@ -45,13 +46,16 @@ import fr.ird.observe.dto.data.longline.SectionWithTemplate; |
| 45 | 46 |
import fr.ird.observe.dto.data.longline.SectionWithTemplateHelper;
|
| 46 | 47 |
import fr.ird.observe.dto.data.longline.SetLonglineDetailCompositionDto;
|
| 47 | 48 |
import fr.ird.observe.dto.data.longline.SetLonglineDetailCompositionHelper;
|
| 49 |
+import fr.ird.observe.dto.form.FormDefinition;
|
|
| 48 | 50 |
import fr.ird.observe.dto.result.SaveResultDto;
|
| 49 | 51 |
import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService;
|
| 52 |
+import fr.ird.observe.spi.DtoModelHelper;
|
|
| 50 | 53 |
import java.beans.PropertyChangeListener;
|
| 51 | 54 |
import java.util.ArrayList;
|
| 52 | 55 |
import java.util.LinkedHashSet;
|
| 53 | 56 |
import java.util.LinkedList;
|
| 54 | 57 |
import java.util.List;
|
| 58 |
+import java.util.Optional;
|
|
| 55 | 59 |
import java.util.stream.Collectors;
|
| 56 | 60 |
import javax.swing.JComboBox;
|
| 57 | 61 |
import javax.swing.JOptionPane;
|
| ... | ... | @@ -378,7 +382,11 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong |
| 378 | 382 |
Form<BranchlineDto> branchlineDtoForm = Form.newFormDto(BranchlineDto.class, null);
|
| 379 | 383 |
|
| 380 | 384 |
BranchlineUIModel branchlineUIModel = getUi().getBranchlineDetailUI().getModel();
|
| 381 |
- branchlineUIModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets());
|
|
| 385 |
+// branchlineUIModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets());
|
|
| 386 |
+ |
|
| 387 |
+ Optional<FormDefinition<BranchlineDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BranchlineDto.class);
|
|
| 388 |
+ optionalFormDefinition.ifPresent(getUi().getBranchlineDetailUI().getHandler()::loadReferentialReferenceSetsInModel);
|
|
| 389 |
+ |
|
| 382 | 390 |
branchlineUIModel.setForm(branchlineDtoForm);
|
| 383 | 391 |
|
| 384 | 392 |
//FIXME Validate this default date
|
| ... | ... | @@ -27,11 +27,18 @@ import fr.ird.observe.client.db.ObserveSwingDataSource; |
| 27 | 27 |
import fr.ird.observe.client.db.constants.DataContextType;
|
| 28 | 28 |
import fr.ird.observe.client.ui.content.ContentMode;
|
| 29 | 29 |
import fr.ird.observe.client.ui.content.ContentUIHandler;
|
| 30 |
-import fr.ird.observe.dto.form.Form;
|
|
| 31 | 30 |
import fr.ird.observe.dto.data.longline.ActivityLonglineDto;
|
| 31 |
+import fr.ird.observe.dto.data.longline.BaitsCompositionDto;
|
|
| 32 |
+import fr.ird.observe.dto.data.longline.BranchlinesCompositionDto;
|
|
| 33 |
+import fr.ird.observe.dto.data.longline.FloatlinesCompositionDto;
|
|
| 34 |
+import fr.ird.observe.dto.data.longline.HooksCompositionDto;
|
|
| 32 | 35 |
import fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionDto;
|
| 33 | 36 |
import fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionHelper;
|
| 37 |
+import fr.ird.observe.dto.form.Form;
|
|
| 38 |
+import fr.ird.observe.dto.form.FormDefinition;
|
|
| 34 | 39 |
import fr.ird.observe.dto.result.SaveResultDto;
|
| 40 |
+import fr.ird.observe.spi.DtoModelHelper;
|
|
| 41 |
+import java.util.Optional;
|
|
| 35 | 42 |
import org.apache.commons.logging.Log;
|
| 36 | 43 |
import org.apache.commons.logging.LogFactory;
|
| 37 | 44 |
import org.nuiton.jaxx.runtime.spi.UIHandler;
|
| ... | ... | @@ -147,7 +154,11 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong |
| 147 | 154 |
{
|
| 148 | 155 |
// open floatlinesComposition tab
|
| 149 | 156 |
FloatlinesCompositionUIModel floatlinesCompositionModel = getUi().getFloatlinesCompositionModel();
|
| 150 |
- floatlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets());
|
|
| 157 |
+// floatlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets());
|
|
| 158 |
+ |
|
| 159 |
+ Optional<FormDefinition<FloatlinesCompositionDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(FloatlinesCompositionDto.class);
|
|
| 160 |
+ optionalFormDefinition.ifPresent(getUi().getFloatlinesCompositionUI().getHandler()::loadReferentialReferenceSetsInModel);
|
|
| 161 |
+ |
|
| 151 | 162 |
floatlinesCompositionModel.setForm(form);
|
| 152 | 163 |
SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), floatlinesCompositionModel.getBean());
|
| 153 | 164 |
|
| ... | ... | @@ -159,7 +170,12 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong |
| 159 | 170 |
{
|
| 160 | 171 |
// open branchlinesComposition tab
|
| 161 | 172 |
BranchlinesCompositionUIModel branchlinesCompositionModel = getUi().getBranchlinesCompositionModel();
|
| 162 |
- branchlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets());
|
|
| 173 |
+ |
|
| 174 |
+// branchlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets());
|
|
| 175 |
+ |
|
| 176 |
+ Optional<FormDefinition<BranchlinesCompositionDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BranchlinesCompositionDto.class);
|
|
| 177 |
+ optionalFormDefinition.ifPresent(getUi().getBranchlinesCompositionUI().getHandler()::loadReferentialReferenceSetsInModel);
|
|
| 178 |
+ |
|
| 163 | 179 |
branchlinesCompositionModel.setForm(form);
|
| 164 | 180 |
SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), branchlinesCompositionModel.getBean());
|
| 165 | 181 |
|
| ... | ... | @@ -171,7 +187,10 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong |
| 171 | 187 |
{
|
| 172 | 188 |
// open hooksComposition tab
|
| 173 | 189 |
HooksCompositionUIModel hooksCompositionModel = getUi().getHooksCompositionModel();
|
| 174 |
- hooksCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets());
|
|
| 190 |
+// hooksCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets());
|
|
| 191 |
+ Optional<FormDefinition<HooksCompositionDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(HooksCompositionDto.class);
|
|
| 192 |
+ optionalFormDefinition.ifPresent(getUi().getHooksCompositionUI().getHandler()::loadReferentialReferenceSetsInModel);
|
|
| 193 |
+ |
|
| 175 | 194 |
hooksCompositionModel.setForm(form);
|
| 176 | 195 |
SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), hooksCompositionModel.getBean());
|
| 177 | 196 |
|
| ... | ... | @@ -183,7 +202,10 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong |
| 183 | 202 |
{
|
| 184 | 203 |
// open baitsComposition tab
|
| 185 | 204 |
BaitsCompositionUIModel baitsCompositionModel = getUi().getBaitsCompositionModel();
|
| 186 |
- baitsCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets());
|
|
| 205 |
+// baitsCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets());
|
|
| 206 |
+ Optional<FormDefinition<BaitsCompositionDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BaitsCompositionDto.class);
|
|
| 207 |
+ optionalFormDefinition.ifPresent(getUi().getBaitsCompositionUI().getHandler()::loadReferentialReferenceSetsInModel);
|
|
| 208 |
+ |
|
| 187 | 209 |
baitsCompositionModel.setForm(form);
|
| 188 | 210 |
SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), baitsCompositionModel.getBean());
|
| 189 | 211 |
|
| ... | ... | @@ -226,7 +226,9 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U |
| 226 | 226 |
Dimension preferredSize = ui.getPreferredSize();
|
| 227 | 227 |
|
| 228 | 228 |
JSplitPane parentContainer = ui.getParentContainer(JSplitPane.class);
|
| 229 |
- ui.setMinimumSize(new Dimension(preferredSize.width, parentContainer.getPreferredSize().height-200));
|
|
| 229 |
+ if (parentContainer!=null) {
|
|
| 230 |
+ ui.setMinimumSize(new Dimension(preferredSize.width, parentContainer.getPreferredSize().height-200));
|
|
| 231 |
+ }
|
|
| 230 | 232 |
|
| 231 | 233 |
// parentContainer.getRightComponent().setMinimumSize(new Dimension(preferredSize.width, 200));
|
| 232 | 234 |
}
|
| ... | ... | @@ -491,7 +491,7 @@ public class DecoratorService extends DecoratorProvider { |
| 491 | 491 |
public void initTripLonglineDto() {
|
| 492 | 492 |
registerDecorator(new TripLonglineDecorator());
|
| 493 | 493 |
registerDataReferenceDecorator(TripLonglineReference.class,
|
| 494 |
- "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel}$s##${observer}$s");
|
|
| 494 |
+ "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vesselLabel}$s##${observerLabel}$s");
|
|
| 495 | 495 |
}
|
| 496 | 496 |
|
| 497 | 497 |
@Override
|
| ... | ... | @@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFactory; |
| 32 | 32 |
import org.debux.webmotion.server.call.Call;
|
| 33 | 33 |
import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler;
|
| 34 | 34 |
import org.debux.webmotion.server.mapping.Mapping;
|
| 35 |
+import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
|
|
| 35 | 36 |
|
| 36 | 37 |
/**
|
| 37 | 38 |
* Cet injecteur a été mis en place pour permettre la conversion des immutableSet arrivant dans une requete.
|
| ... | ... | @@ -70,8 +71,17 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I |
| 70 | 71 |
Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
|
| 71 | 72 |
|
| 72 | 73 |
String[] values = (String[]) parameterTree.getValue();
|
| 73 |
- Collection o = gson.fromJson(values[0], generic);
|
|
| 74 |
- builder.addAll(o);
|
|
| 74 |
+ String value = values[0];
|
|
| 75 |
+ if (!value.isEmpty() && !value.contains("[")) {
|
|
| 76 |
+ if (((ParameterizedTypeImpl) generic).getActualTypeArguments()[0].equals(String.class)) {
|
|
| 77 |
+ value = "\"" + value + "\"";
|
|
| 78 |
+ }
|
|
| 79 |
+ value = "[" + value + "]";
|
|
| 80 |
+ }
|
|
| 81 |
+ Collection o = gson.fromJson(value, generic);
|
|
| 82 |
+ if (o != null) {
|
|
| 83 |
+ builder.addAll(o);
|
|
| 84 |
+ }
|
|
| 75 | 85 |
}
|
| 76 | 86 |
result = builder.build();
|
| 77 | 87 |
|
| ... | ... | @@ -33,6 +33,7 @@ import fr.ird.observe.services.service.referential.ReferenceSetsRequest; |
| 33 | 33 |
import fr.ird.observe.services.service.referential.ReferentialService;
|
| 34 | 34 |
import fr.ird.observe.spi.DtoModelHelper;
|
| 35 | 35 |
import fr.ird.observe.spi.map.ImmutableDtoMap;
|
| 36 |
+import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName;
|
|
| 36 | 37 |
import java.util.Date;
|
| 37 | 38 |
import org.junit.Assert;
|
| 38 | 39 |
import org.junit.Before;
|
| ... | ... | @@ -67,7 +68,7 @@ public class ReferenceValuesSetServiceClientTest extends ServiceClientTestSuppor |
| 67 | 68 |
//FIXME
|
| 68 | 69 |
ReferenceSetsRequest<TripSeineDto> request = new ReferenceSetsRequest<>();
|
| 69 | 70 |
request.setRequestName(requestName);
|
| 70 |
- request.setLastUpdateDates(ImmutableDtoMap.<Date>builder().build());
|
|
| 71 |
+ request.setLastUpdateDates(ImmutableDtoMapDtoSimplifiedName.<Date>builder().build());
|
|
| 71 | 72 |
|
| 72 | 73 |
ImmutableSet<ReferentialDtoReferenceSet<?>> referenceSetResult = service.getReferentialReferenceSets(request);
|
| 73 | 74 |
Assert.assertNotNull(referenceSetResult);
|
| ... | ... | @@ -61,7 +61,7 @@ import fr.ird.observe.spi.DtoModelHelper; |
| 61 | 61 |
import fr.ird.observe.spi.context.ReferentialDtoEntityContext;
|
| 62 | 62 |
import fr.ird.observe.spi.context.ReferentialEntityContext;
|
| 63 | 63 |
import fr.ird.observe.spi.context.ReferentialReferenceEntityContext;
|
| 64 |
-import fr.ird.observe.spi.map.ImmutableDtoMap;
|
|
| 64 |
+import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName;
|
|
| 65 | 65 |
import fr.ird.observe.spi.map.ImmutableSetDtoMap;
|
| 66 | 66 |
import java.util.Arrays;
|
| 67 | 67 |
import java.util.Collections;
|
| ... | ... | @@ -143,7 +143,7 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe |
| 143 | 143 |
|
| 144 | 144 |
FormDefinition<D> requestDefinition = optionalRequestDefinition.get();
|
| 145 | 145 |
|
| 146 |
- ImmutableDtoMap<Date> lastUpdateDates = request.getLastUpdateDates();
|
|
| 146 |
+ ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates = request.getLastUpdateDates();
|
|
| 147 | 147 |
Objects.requireNonNull(lastUpdateDates);
|
| 148 | 148 |
|
| 149 | 149 |
for (Class propertyType : requestDefinition.getPropertiesTypes()) {
|
| ... | ... | @@ -30,6 +30,7 @@ import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; |
| 30 | 30 |
import fr.ird.observe.dto.referential.ReferentialDto;
|
| 31 | 31 |
import fr.ird.observe.spi.DtoModelHelper;
|
| 32 | 32 |
import fr.ird.observe.spi.map.ImmutableDtoMap;
|
| 33 |
+import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName;
|
|
| 33 | 34 |
import fr.ird.observe.spi.map.MutableDtoMap;
|
| 34 | 35 |
import java.io.Closeable;
|
| 35 | 36 |
import java.io.Serializable;
|
| ... | ... | @@ -93,7 +94,7 @@ public class ObserveReferentialCache implements Closeable, Serializable { |
| 93 | 94 |
FormDefinition<D> formDefinition = optionalRequestDefinition.get();
|
| 94 | 95 |
log.info(String.format("Loading %d referential dependencies for: %s", formDefinition.getProperties().size(), dtoType.getName()));
|
| 95 | 96 |
|
| 96 |
- ImmutableDtoMap<Date> lastUpdateDates = getLastUpdateDates(formDefinition);
|
|
| 97 |
+ ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates = getLastUpdateDates(formDefinition);
|
|
| 97 | 98 |
|
| 98 | 99 |
ReferenceSetsRequest<D> request = new ReferenceSetsRequest<>();
|
| 99 | 100 |
request.setRequestName(dtoType);
|
| ... | ... | @@ -125,9 +126,9 @@ public class ObserveReferentialCache implements Closeable, Serializable { |
| 125 | 126 |
* @param formDefinition la définition de requète
|
| 126 | 127 |
* @return le dictionnaire des dates de dernières mises à jour pour chaque ensemble de référentiels
|
| 127 | 128 |
*/
|
| 128 |
- private ImmutableDtoMap<Date> getLastUpdateDates(FormDefinition<?> formDefinition) {
|
|
| 129 |
+ private ImmutableDtoMapDtoSimplifiedName<Date> getLastUpdateDates(FormDefinition<?> formDefinition) {
|
|
| 129 | 130 |
|
| 130 |
- ImmutableDtoMap.Builder<Date> builder = ImmutableDtoMap.builder();
|
|
| 131 |
+ ImmutableDtoMapDtoSimplifiedName.Builder<Date> builder = ImmutableDtoMapDtoSimplifiedName.builder();
|
|
| 131 | 132 |
|
| 132 | 133 |
for (Class type : formDefinition.getPropertiesTypes()) {
|
| 133 | 134 |
|
| ... | ... | @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.referential; |
| 24 | 24 |
|
| 25 | 25 |
import fr.ird.observe.dto.IdDto;
|
| 26 | 26 |
import fr.ird.observe.dto.ObserveDto;
|
| 27 |
-import fr.ird.observe.spi.map.ImmutableDtoMap;
|
|
| 27 |
+import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName;
|
|
| 28 | 28 |
import java.util.Date;
|
| 29 | 29 |
|
| 30 | 30 |
/**
|
| ... | ... | @@ -39,7 +39,7 @@ public class ReferenceSetsRequest<D extends IdDto> implements ObserveDto { |
| 39 | 39 |
|
| 40 | 40 |
private Class<D> requestName;
|
| 41 | 41 |
|
| 42 |
- private ImmutableDtoMap<Date> lastUpdateDates;
|
|
| 42 |
+ private ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates;
|
|
| 43 | 43 |
|
| 44 | 44 |
public Class<D> getDtoType() {
|
| 45 | 45 |
return requestName;
|
| ... | ... | @@ -49,11 +49,11 @@ public class ReferenceSetsRequest<D extends IdDto> implements ObserveDto { |
| 49 | 49 |
this.requestName = requestName;
|
| 50 | 50 |
}
|
| 51 | 51 |
|
| 52 |
- public ImmutableDtoMap<Date> getLastUpdateDates() {
|
|
| 52 |
+ public ImmutableDtoMapDtoSimplifiedName<Date> getLastUpdateDates() {
|
|
| 53 | 53 |
return lastUpdateDates;
|
| 54 | 54 |
}
|
| 55 | 55 |
|
| 56 |
- public void setLastUpdateDates(ImmutableDtoMap<Date> lastUpdateDates) {
|
|
| 56 |
+ public void setLastUpdateDates(ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates) {
|
|
| 57 | 57 |
this.lastUpdateDates = lastUpdateDates;
|
| 58 | 58 |
}
|
| 59 | 59 |
|