This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 0af7509b63bb0975ed89121692f4e3ecb442388c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 11 12:15:52 2016 +0100 [iso] différentes adaptations suite aux test en mode serveur --- .../menu/storage/ImportStorageFromFileAction.java | 2 +- .../swing/ui/admin/export/ExportUIHandler.java | 5 ++- .../swing/ui/storage/StorageUILauncher.java | 6 +--- .../DataSourceMigrationForVersion_6_0.java | 2 +- .../dto/gson/ArrayListMultimapAdapter.java | 41 +++++---------------- .../services/dto/gson/ImmutableMapAdapter.java | 11 ++---- .../dto/gson/ImmutableMultimapAdapter.java | 11 +----- .../services/dto/gson/ImmutableSetAdapter.java | 6 ++-- ...MapAdapter.java => MultimapAdapterSupport.java} | 32 ++++++++++------- .../dto/gson/ObserveBlobsContainerAdapter.java | 25 +++++++------ .../services/dto/gson/ObserveDtoGsonSupplier.java | 18 +++++++++- .../services/dto/gson/SetMultimapAdapter.java | 42 ++++++---------------- .../dto/referential/LengthLengthParameterDto.java | 10 +++--- .../dto/referential/LengthWeightParameterDto.java | 10 +++--- .../dto/referential/ReferentialMultimap.java | 16 ++++----- .../referential/ReferentialServiceTopia.java | 4 +-- .../services/service/data/NavigationRequest.java | 4 ++- .../services/service/data/NavigationResult.java | 10 +++--- 18 files changed, 112 insertions(+), 143 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ImportStorageFromFileAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ImportStorageFromFileAction.java index 097ee60..5c96c62 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ImportStorageFromFileAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/ImportStorageFromFileAction.java @@ -93,7 +93,7 @@ public class ImportStorageFromFileAction extends AbstractUIAction { @Override protected void doAction(StorageUI ui) { super.doAction(ui); - StorageUIHandler handler = getStorageUIHandler(); + StorageUIHandler handler = ui.getHandler(); handler.doChangeStorage(ui.getModel()); File importDirectory = ui.getModel().getDumpFile().getParentFile(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java index 32748d7..f871165 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java @@ -247,7 +247,6 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa TripManagementService centralTripManagementService = centralDataSource.newTripManagementService(); - ReferentialService centraltReferentialService = centralDataSource.newReferentialService(); // chargement du référentiel de la base centrale @@ -269,8 +268,8 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa if (!insertMissingReferentials && result != null) { // l'export n'est pas possible - UIHelper.displayInfo(t("observe.actions.exportData.error.missingReferentialsId")); - + UIHelper.displayWarning(t("observe.title.can.not.export.data"), t("observe.actions.exportData.error.missingReferentialsId")); + sendMessage(t("observe.actions.exportData.error.missingReferentialsId")); return WizardState.CANCELED; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java index bb3f4e0..50e6cf0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java @@ -102,10 +102,6 @@ public class StorageUILauncher extends WizardUILancher<StorageStep, StorageUIMod super.doAction(ui); } - protected StorageUIHandler getStorageUIHandler() { - return ui.getContextValue(StorageUIHandler.class); - } - @Override protected void doClose(StorageUI ui, boolean wasCanceled) { if (log.isDebugEnabled()) { @@ -153,7 +149,7 @@ public class StorageUILauncher extends WizardUILancher<StorageStep, StorageUIMod model.setCanUseServerService(modes.contains(DbMode.USE_SERVER)); model.updateUniverse(); - model.setDbMode(modes.stream().findFirst().get()); + model.setDbMode(modes.stream().findFirst().orElse(DbMode.USE_LOCAL)); } else { ObserveSwingApplicationConfig config = ObserveSwingApplicationContext.get().getConfig(); diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java index 95958f6..fe55699 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java @@ -96,7 +96,7 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC .put("L1", "PDL") .put("LC", "DL") .put("LT", "TL") -// .put("", "TL") + .put("", "TL") .build(); List<String> lengthMeasureTypes = topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<String>() { diff --git a/services/src/main/java/fr/ird/observe/services/service/data/NavigationRequest.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ArrayListMultimapAdapter.java similarity index 51% copy from services/src/main/java/fr/ird/observe/services/service/data/NavigationRequest.java copy to services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ArrayListMultimapAdapter.java index 4eeb5c2..42c7f3f 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/NavigationRequest.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ArrayListMultimapAdapter.java @@ -1,8 +1,8 @@ -package fr.ird.observe.services.service.data; +package fr.ird.observe.services.dto.gson; -/*- +/* * #%L - * ObServe :: Services + * ObServe :: Services model * %% * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit * %% @@ -22,40 +22,17 @@ package fr.ird.observe.services.service.data; * #L% */ +import com.google.common.collect.ArrayListMultimap; + /** - * Created on 22/11/16. - * * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class NavigationRequest { - - - private boolean loadSeine; - private boolean loadLongline; - private boolean loadEmptyProgram; - - public boolean isLoadSeine() { - return loadSeine; - } - - public void setLoadSeine(boolean loadSeine) { - this.loadSeine = loadSeine; - } - - public boolean isLoadLongline() { - return loadLongline; - } +public class ArrayListMultimapAdapter extends MultimapAdapterSupport<ArrayListMultimap> { - public void setLoadLongline(boolean loadLongline) { - this.loadLongline = loadLongline; + @Override + protected ArrayListMultimap createMultimap() { + return ArrayListMultimap.create(); } - public void setLoadEmptyProgram(boolean loadEmptyProgram) { - this.loadEmptyProgram = loadEmptyProgram; - } - - public boolean isLoadEmptyProgram() { - return loadEmptyProgram; - } } diff --git a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java index 919cf0d..f88c91b 100644 --- a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java @@ -23,7 +23,6 @@ package fr.ird.observe.services.dto.gson; */ import com.google.common.collect.ImmutableMap; -import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; @@ -37,7 +36,7 @@ import java.util.Map; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class ImmutableMapAdapter implements JsonDeserializer<ImmutableMap<?, ?>>{ +public class ImmutableMapAdapter implements JsonDeserializer<ImmutableMap<?, ?>> { @Override public ImmutableMap deserialize(JsonElement json, Type type, JsonDeserializationContext context) throws JsonParseException { @@ -46,16 +45,10 @@ public class ImmutableMapAdapter implements JsonDeserializer<ImmutableMap<?, ?>> Type keyType = actualTypeArguments[0]; Type valueType = actualTypeArguments[1]; - Type type2 = mapOf(TypeToken.of(keyType), TypeToken.of(valueType)).getType(); + Type type2 = ObserveDtoGsonSupplier.mapOf(TypeToken.of(keyType), TypeToken.of(valueType)).getType(); Map map = context.deserialize(json, type2); return ImmutableMap.copyOf(map); } - static <K, V> TypeToken<Map<K, V>> mapOf(TypeToken<K> keyType, TypeToken<V> valueType) { - return new TypeToken<Map<K, V>>() {} - .where(new TypeParameter<K>() {}, keyType) - .where(new TypeParameter<V>() {}, valueType); - } - } diff --git a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java index 204c81a..2a257f7 100644 --- a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java @@ -24,7 +24,6 @@ package fr.ird.observe.services.dto.gson; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSetMultimap; -import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; @@ -35,7 +34,6 @@ import com.google.gson.JsonSerializer; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import java.util.Collection; import java.util.List; import java.util.Map; @@ -59,7 +57,7 @@ public class ImmutableMultimapAdapter implements JsonSerializer<ImmutableMultima Type keyType = actualTypeArguments[0]; Type valueType = actualTypeArguments[1]; - Type type2 = mapOf(TypeToken.of(keyType), TypeToken.of(valueType)).getType(); + Type type2 = ObserveDtoGsonSupplier.mapOf(TypeToken.of(keyType), TypeToken.of(valueType)).getType(); Map map = context.deserialize(json, type2); for (Object key : map.keySet()) { @@ -74,11 +72,4 @@ public class ImmutableMultimapAdapter implements JsonSerializer<ImmutableMultima } - - static <K, V> TypeToken<Map<K, Collection<V>>> mapOf(TypeToken<K> keyType, TypeToken<V> valueType) { - return new TypeToken<Map<K, Collection<V>>>() {} - .where(new TypeParameter<K>() {}, keyType) - .where(new TypeParameter<V>() {}, valueType); - } - } diff --git a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java index f84f0d3..76cfc94 100644 --- a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java @@ -52,7 +52,9 @@ public class ImmutableSetAdapter implements JsonDeserializer<ImmutableSet<?>> { } static <E> TypeToken<Set<E>> setOf(TypeToken<E> subType) { - return new TypeToken<Set<E>>() {} - .where(new TypeParameter<E>() {}, subType); + return new TypeToken<Set<E>>() { + } + .where(new TypeParameter<E>() { + }, subType); } } diff --git a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/MultimapAdapterSupport.java similarity index 59% copy from services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java copy to services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/MultimapAdapterSupport.java index 919cf0d..f2ee6e1 100644 --- a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/MultimapAdapterSupport.java @@ -22,40 +22,48 @@ package fr.ird.observe.services.dto.gson; * #L% */ -import com.google.common.collect.ImmutableMap; -import com.google.common.reflect.TypeParameter; +import com.google.common.collect.Multimap; import com.google.common.reflect.TypeToken; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import java.util.List; import java.util.Map; /** - * @author Sylvain Bavencoff - bavencoff@codelutin.com + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 */ -public class ImmutableMapAdapter implements JsonDeserializer<ImmutableMap<?, ?>>{ +public abstract class MultimapAdapterSupport<M extends Multimap> implements JsonDeserializer<M>, JsonSerializer<M> { + + protected abstract M createMultimap(); @Override - public ImmutableMap deserialize(JsonElement json, Type type, JsonDeserializationContext context) throws JsonParseException { + public M deserialize(JsonElement json, Type type, JsonDeserializationContext context) throws JsonParseException { Type[] actualTypeArguments = ((ParameterizedType) type).getActualTypeArguments(); Type keyType = actualTypeArguments[0]; Type valueType = actualTypeArguments[1]; - Type type2 = mapOf(TypeToken.of(keyType), TypeToken.of(valueType)).getType(); + Type type2 = ObserveDtoGsonSupplier.mapOf(TypeToken.of(keyType), TypeToken.of(valueType)).getType(); Map map = context.deserialize(json, type2); - return ImmutableMap.copyOf(map); + M result = createMultimap(); + for (Object key : map.keySet()) { + List multimapValues = (List) map.get(key); + result.putAll(key, multimapValues); + } + return result; } - static <K, V> TypeToken<Map<K, V>> mapOf(TypeToken<K> keyType, TypeToken<V> valueType) { - return new TypeToken<Map<K, V>>() {} - .where(new TypeParameter<K>() {}, keyType) - .where(new TypeParameter<V>() {}, valueType); + @Override + public JsonElement serialize(M src, Type typeOfSrc, JsonSerializationContext context) { + return context.serialize(src.asMap()); } - } diff --git a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java index 72094a7..91dce46 100644 --- a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java @@ -1,37 +1,42 @@ package fr.ird.observe.services.dto.gson; + import com.google.common.collect.ImmutableMap; -import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import fr.ird.observe.services.dto.ObserveBlobsContainer; + import java.lang.reflect.Type; import java.util.Map; + /** * Created on 10/12/16. * * @author Tony Chemit - chemit@codelutin.com * @since 5.1 */ -public class ObserveBlobsContainerAdapter implements JsonDeserializer<ObserveBlobsContainer> { +public class ObserveBlobsContainerAdapter implements JsonDeserializer<ObserveBlobsContainer>, JsonSerializer<ObserveBlobsContainer> { @Override public ObserveBlobsContainer deserialize(JsonElement json, Type type, JsonDeserializationContext context) throws JsonParseException { JsonObject jsonObject = json.getAsJsonObject(); String tableName = jsonObject.get("tableName").getAsString(); String columnName = jsonObject.get("columnName").getAsString(); - Type mapType = mapOf(TypeToken.of(String.class), TypeToken.of(byte[].class)).getType(); + Type mapType = ObserveDtoGsonSupplier.mapOf(TypeToken.of(String.class), TypeToken.of(byte[].class)).getType(); Map<String, byte[]> blobsById = context.deserialize(jsonObject.get("blobsById"), mapType); return new ObserveBlobsContainer(tableName, columnName, ImmutableMap.copyOf(blobsById)); } - static <K, V> TypeToken<Map<K, V>> mapOf(TypeToken<K> keyType, TypeToken<V> valueType) { - return new TypeToken<Map<K, V>>() { - } - .where(new TypeParameter<K>() { - }, keyType) - .where(new TypeParameter<V>() { - }, valueType); + + @Override + public JsonElement serialize(ObserveBlobsContainer src, Type typeOfSrc, JsonSerializationContext context) { + JsonObject element = new JsonObject(); + element.add("tableName", context.serialize(src.getTableName())); + element.add("columnName", context.serialize(src.getColumnName())); + element.add("blobsById", context.serialize(src.getBlobsById().asMultimap().asMap())); + return element; } } diff --git a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java index 9f653eb..c321c31 100644 --- a/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java @@ -22,10 +22,14 @@ package fr.ird.observe.services.dto.gson; * #L% */ +import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.SetMultimap; +import com.google.common.reflect.TypeParameter; +import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import fr.ird.observe.services.dto.AbstractReference; @@ -47,7 +51,9 @@ import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import org.nuiton.version.Version; import java.sql.Blob; +import java.util.Collection; import java.util.Date; +import java.util.Map; import java.util.function.Supplier; /** @@ -72,6 +78,12 @@ public class ObserveDtoGsonSupplier implements Supplier<Gson> { this.prettyPrint = prettyPrint; } + public static <K, V> TypeToken<Map<K, Collection<V>>> mapOf(TypeToken<K> keyType, TypeToken<V> valueType) { + return new TypeToken<Map<K, Collection<V>>>() {} + .where(new TypeParameter<K>() {}, keyType) + .where(new TypeParameter<V>() {}, valueType); + } + @Override public Gson get() { if (gson == null) { @@ -102,7 +114,12 @@ public class ObserveDtoGsonSupplier implements Supplier<Gson> { gsonBuilder.registerTypeAdapter(ImmutableList.class, new ImmutableListAdapter()); gsonBuilder.registerTypeAdapter(ImmutableSet.class, new ImmutableSetAdapter()); gsonBuilder.registerTypeAdapter(ImmutableMap.class, new ImmutableMapAdapter()); + gsonBuilder.registerTypeAdapter(ImmutableMultimap.class, new ImmutableMultimapAdapter()); + gsonBuilder.registerTypeAdapter(SetMultimap.class, new SetMultimapAdapter()); + gsonBuilder.registerTypeAdapter(ArrayListMultimap.class, new ArrayListMultimapAdapter()); + gsonBuilder.registerTypeAdapter(ReferentialMultimap.class, new ReferentialMultimapAdapter()); + gsonBuilder.registerTypeAdapter(ObserveBlobsContainer.class, new ObserveBlobsContainerAdapter()); gsonBuilder.registerTypeAdapter(DataReference.class, new DataReferenceAdapter()); @@ -116,7 +133,6 @@ public class ObserveDtoGsonSupplier implements Supplier<Gson> { gsonBuilder.registerTypeAdapter(ReportVariable.class, new ReportVariableAdapter()); gsonBuilder.registerTypeAdapter(Version.class, new VersionAdapter()); - gsonBuilder.registerTypeAdapter(ReferentialMultimap.class, new ReferentialMultimapAdapter()); gsonBuilder.enableComplexMapKeySerialization(); } return gsonBuilder; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/NavigationRequest.java b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/SetMultimapAdapter.java similarity index 51% copy from services/src/main/java/fr/ird/observe/services/service/data/NavigationRequest.java copy to services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/SetMultimapAdapter.java index 4eeb5c2..a8afee7 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/NavigationRequest.java +++ b/services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/SetMultimapAdapter.java @@ -1,8 +1,8 @@ -package fr.ird.observe.services.service.data; +package fr.ird.observe.services.dto.gson; -/*- +/* * #%L - * ObServe :: Services + * ObServe :: Services model * %% * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit * %% @@ -22,40 +22,18 @@ package fr.ird.observe.services.service.data; * #L% */ +import com.google.common.collect.HashMultimap; +import com.google.common.collect.SetMultimap; + /** - * Created on 22/11/16. - * * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class NavigationRequest { - - - private boolean loadSeine; - private boolean loadLongline; - private boolean loadEmptyProgram; - - public boolean isLoadSeine() { - return loadSeine; - } - - public void setLoadSeine(boolean loadSeine) { - this.loadSeine = loadSeine; - } - - public boolean isLoadLongline() { - return loadLongline; - } +public class SetMultimapAdapter extends MultimapAdapterSupport<SetMultimap> { - public void setLoadLongline(boolean loadLongline) { - this.loadLongline = loadLongline; + @Override + protected SetMultimap createMultimap() { + return HashMultimap.create(); } - public void setLoadEmptyProgram(boolean loadEmptyProgram) { - this.loadEmptyProgram = loadEmptyProgram; - } - - public boolean isLoadEmptyProgram() { - return loadEmptyProgram; - } } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java index 8d88dd8..69461da 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java @@ -28,12 +28,12 @@ public class LengthLengthParameterDto extends GeneratedLengthLengthParameterDto private static final long serialVersionUID = 1L; - private Map<String, Double> coefficients; + private Map<String, Double> coefficientsValues; @Override public void setCoefficients(String coefficients) { super.setCoefficients(coefficients); - this.coefficients = null; + this.coefficientsValues = null; revalidateFormulaOne(); revalidateFormulaTwo(); } @@ -62,9 +62,9 @@ public class LengthLengthParameterDto extends GeneratedLengthLengthParameterDto @Override public Map<String, Double> getCoefficientValues() { - if (coefficients == null) { - coefficients = FormulaHelper.getCoefficientValues(this); + if (coefficientsValues == null) { + coefficientsValues = FormulaHelper.getCoefficientValues(this); } - return coefficients; + return coefficientsValues; } } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java index 8c45c8b..e7bf3d2 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java @@ -28,12 +28,12 @@ public class LengthWeightParameterDto extends GeneratedLengthWeightParameterDto private static final long serialVersionUID = 1L; - private Map<String, Double> coefficients; + private Map<String, Double> coefficientsValues; @Override public void setCoefficients(String coefficients) { super.setCoefficients(coefficients); - this.coefficients = null; + this.coefficientsValues = null; revalidateFormulaOne(); revalidateFormulaTwo(); } @@ -62,9 +62,9 @@ public class LengthWeightParameterDto extends GeneratedLengthWeightParameterDto @Override public Map<String, Double> getCoefficientValues() { - if (coefficients == null) { - coefficients = FormulaHelper.getCoefficientValues(this); + if (coefficientsValues == null) { + coefficientsValues = FormulaHelper.getCoefficientValues(this); } - return coefficients; + return coefficientsValues; } } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java index f770dbd..4eddb6d 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java @@ -35,14 +35,14 @@ import java.util.Objects; /** * @author smaisonneuve - * Created on 17/08/16. + * Created on 17/08/16. */ public class ReferentialMultimap<K extends ReferentialDto> implements SetMultimap<Class<K>, K> { private ImmutableSetMultimap<Class<K>, K> immutableSetMultimap; public static <K extends ReferentialDto, V> ReferentialMultimap<K> of() { - return new ReferentialMultimap(); + return new ReferentialMultimap<>(); } public static <K extends ReferentialDto> ReferentialMultimap<K> of(Class<K> k1, K v1) { @@ -50,7 +50,7 @@ public class ReferentialMultimap<K extends ReferentialDto> implements SetMultima } public static <K extends ReferentialDto> ReferentialMultimap<K> copyOf(Multimap<Class<K>, K> multimap) { - return new ReferentialMultimap(multimap); + return new ReferentialMultimap<>(multimap); } public static <K extends ReferentialDto> Builder<K> builder() { @@ -58,20 +58,20 @@ public class ReferentialMultimap<K extends ReferentialDto> implements SetMultima } public static class Builder<K extends ReferentialDto> { - private final ImmutableSetMultimap.Builder builder = ImmutableSetMultimap.builder(); + private final ImmutableSetMultimap.Builder<Class<K>, K> builder = ImmutableSetMultimap.builder(); - public <K extends ReferentialDto> Builder add(K referentialDto) { + public Builder<K> add(K referentialDto) { Objects.requireNonNull(referentialDto, "Can't add a null object in ReferentialMultimap"); - builder.put(referentialDto.getClass(), referentialDto); + builder.put((Class) referentialDto.getClass(), referentialDto); return this; } - public <K extends ReferentialDto> Builder put(Class<K> dtoType, K referentialDto) { + public Builder put(Class<K> dtoType, K referentialDto) { builder.putAll(dtoType, referentialDto); return this; } - public <K extends ReferentialDto> Builder putAll(Class<K> dtoType, Collection<K> values) { + public Builder putAll(Class<K> dtoType, Collection<K> values) { builder.putAll(dtoType, values); return this; } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java index 1585de8..2dbceb4 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java @@ -56,10 +56,10 @@ import fr.ird.observe.services.service.referential.ReferenceSetsRequest; import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.ReplaceSqlStatementGenerator; -import fr.ird.observe.services.topia.service.sql.SqlScriptProducerServiceTopia; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDao; @@ -347,7 +347,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } } - SqlScriptProducerServiceTopia sqlScriptProducerService = serviceContext.newService(SqlScriptProducerServiceTopia.class); + SqlScriptProducerService sqlScriptProducerService = serviceContext.newService(SqlScriptProducerService.class); AddSqlScriptProducerResult addSqlScriptProducerResult = sqlScriptProducerService.produceAddSqlScript(request); return MissingReferentialResult.of(missingReferentialIds, addSqlScriptProducerResult.getSqlCode()); diff --git a/services/src/main/java/fr/ird/observe/services/service/data/NavigationRequest.java b/services/src/main/java/fr/ird/observe/services/service/data/NavigationRequest.java index 4eeb5c2..3bf279a 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/NavigationRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/NavigationRequest.java @@ -22,13 +22,15 @@ package fr.ird.observe.services.service.data; * #L% */ +import fr.ird.observe.services.dto.ObserveDto; + /** * Created on 22/11/16. * * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class NavigationRequest { +public class NavigationRequest implements ObserveDto { private boolean loadSeine; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java b/services/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java index 33e7e5f..19748f7 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java @@ -22,9 +22,11 @@ package fr.ird.observe.services.service.data; * #L% */ +import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -36,13 +38,13 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class NavigationResult { +public class NavigationResult implements ObserveDto { private final ImmutableSet<ReferentialReference<ProgramDto>> programs; - private final Multimap<ReferentialReference<ProgramDto>, DataReference<TripSeineDto>> tripsSeineByProgram; - private final Multimap<ReferentialReference<ProgramDto>, DataReference<TripLonglineDto>> tripsLonglineByProgram; + private final ArrayListMultimap<ReferentialReference<ProgramDto>, DataReference<TripSeineDto>> tripsSeineByProgram; + private final ArrayListMultimap<ReferentialReference<ProgramDto>, DataReference<TripLonglineDto>> tripsLonglineByProgram; - public NavigationResult(ImmutableSet<ReferentialReference<ProgramDto>> programs, Multimap<ReferentialReference<ProgramDto>, DataReference<TripSeineDto>> tripsSeineByProgram, Multimap<ReferentialReference<ProgramDto>, DataReference<TripLonglineDto>> tripsLonglineByProgram) { + public NavigationResult(ImmutableSet<ReferentialReference<ProgramDto>> programs, ArrayListMultimap<ReferentialReference<ProgramDto>, DataReference<TripSeineDto>> tripsSeineByProgram, ArrayListMultimap<ReferentialReference<ProgramDto>, DataReference<TripLonglineDto>> tripsLonglineByProgram) { this.programs = programs; this.tripsSeineByProgram = tripsSeineByProgram; this.tripsLonglineByProgram = tripsLonglineByProgram; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.