This is an automated email from the git hooks/post-receive script. New change to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 3ebbf63 Le tableau des types des propriété n'est plus dans l'objet ReferenceDto (see #8124). This branch includes the following new commits: new d0a63e4 A l'utilisation d'un source distante, autoriser le mode serveur en plus du mode base distante (see #8124). new 6d54695 correction du package principal pour les services (see #8124). new 64ecde5 correction du toString si dataIds est null (see #8124). new 0cdb2e9 La cause de l'exception remontée ne peut pas être changée (see #8124). new 932fcf2 utilisé le même format pour les dates pour la contruction de la requêt coté client et son interprétation coté serveur(see #8124). new 3ebbf63 Le tableau des types des propriété n'est plus dans l'objet ReferenceDto (see #8124). The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d0a63e4f5e1c37b9cd377698c129d015f96e5a67 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 14 17:40:29 2016 +0100 A l'utilisation d'un source distante, autoriser le mode serveur en plus du mode base distante (see #8124). commit 6d54695703b134de640051218486d9ea8e43083f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 14 17:42:19 2016 +0100 correction du package principal pour les services (see #8124). commit 64ecde532dd50dc35e4eb744170b56ed999a618f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 14 17:47:37 2016 +0100 correction du toString si dataIds est null (see #8124). commit 0cdb2e9252a5c3c151712759e0f2d5b69e24a9a2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 08:18:17 2016 +0100 La cause de l'exception remontée ne peut pas être changée (see #8124). commit 932fcf21ea4723a2be5aa49ecbbc5d8d763f2621 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 12:15:56 2016 +0100 utilisé le même format pour les dates pour la contruction de la requêt coté client et son interprétation coté serveur(see #8124). commit 3ebbf630b23516149ad40a772d9bf31eda00c5e2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 12:21:11 2016 +0100 Le tableau des types des propriété n'est plus dans l'objet ReferenceDto (see #8124). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit d0a63e4f5e1c37b9cd377698c129d015f96e5a67 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 14 17:40:29 2016 +0100 A l'utilisation d'un source distante, autoriser le mode serveur en plus du mode base distante (see #8124). --- .../observe/ObserveSwingApplicationContext.java | 15 +++++++------- .../observe/ui/actions/ChangeStorageAction.java | 13 +++++++----- .../ird/observe/ui/storage/StorageUILauncher.java | 23 ++++++++++++---------- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index e523539..636449c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -100,8 +100,10 @@ import java.io.Closeable; import java.io.File; import java.io.IOException; import java.util.Arrays; +import java.util.EnumSet; import java.util.List; import java.util.Locale; +import java.util.Set; import java.util.UUID; import static org.nuiton.i18n.I18n.n; @@ -663,24 +665,23 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im log.debug("response : " + reponse); } - DbMode dbMode = null; + Set<DbMode> dbModes = EnumSet.noneOf(DbMode.class); String title = null; if (reponse != JOptionPane.CLOSED_OPTION && reponse < 2) { if (reponse == 1) { // creation de la base locale - dbMode = DbMode.CREATE_LOCAL; + dbModes.add(DbMode.CREATE_LOCAL); title = n("observe.title.create.local.db"); } else { // connexion à une base distante - dbMode = DbMode.USE_REMOTE; + dbModes.add(DbMode.USE_REMOTE); + dbModes.add(DbMode.USE_SERVER); title = n("observe.title.load.remote.db"); } } - if (dbMode != null) { -// uiHandler.launchChangeStorage(getObserveMainUI(), dbMode, title); - - new ChangeStorageAction(getObserveMainUI(), dbMode, title).run(); + if (! dbModes.isEmpty()) { + new ChangeStorageAction(getObserveMainUI(), dbModes, title).run(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java index 7e9a1d7..8a57573 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java @@ -32,6 +32,9 @@ import org.apache.commons.logging.LogFactory; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; +import java.util.EnumSet; +import java.util.Set; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -51,7 +54,7 @@ public class ChangeStorageAction extends AbstractAction { private final ObserveMainUI ui; - private final DbMode dbMode; + private final Set<DbMode> dbModes; private final String title; @@ -59,11 +62,11 @@ public class ChangeStorageAction extends AbstractAction { this(ui, null, null); } - public ChangeStorageAction(ObserveMainUI ui, DbMode dbMode, String title) { + public ChangeStorageAction(ObserveMainUI ui, Set<DbMode> dbModes, String title) { super(t("observe.action.change.storage"), SwingUtil.getUIManagerActionIcon("db-change")); this.ui = ui; - this.dbMode = dbMode; + this.dbModes = dbModes == null ? EnumSet.noneOf(DbMode.class) : dbModes; this.title = title; putValue(SHORT_DESCRIPTION, t("observe.action.change.storage.tip")); putValue(MNEMONIC_KEY, (int) 'C'); @@ -83,10 +86,10 @@ public class ChangeStorageAction extends AbstractAction { if (canContinue) { if (log.isInfoEnabled()) { - log.info("Start change storage with dbMode: " + dbMode); + log.info("Start change storage with dbMode: " + dbModes.stream().map(DbMode::name).collect(Collectors.joining(", "))); } - StorageUILauncher.changeStorage(ui, ui, dbMode, t(title)); + StorageUILauncher.changeStorage(ui, ui, dbModes, t(title)); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java index 9e844ea..4e13da8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java @@ -31,11 +31,14 @@ import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.wizard.BusyChangeListener; import jaxx.runtime.swing.wizard.WizardModel; import jaxx.runtime.swing.wizard.WizardUILancher; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.awt.Window; import java.util.Arrays; +import java.util.Set; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -126,14 +129,14 @@ public class StorageUILauncher extends WizardUILancher<StorageStep, StorageUIMod * * @param rootContext le context applicatif * @param mainUI main ui - * @param mode le mode optionnel à utiliser + * @param modes les modes optionnel à utiliser * @param title le titre de la fenetre * @see StorageUIHandler * @see StorageUI */ public static void changeStorage(final JAXXContext rootContext, final Window mainUI, - final DbMode mode, + final Set<DbMode> modes, final String title) { new StorageUILauncher(rootContext, mainUI, title) { @@ -142,12 +145,12 @@ public class StorageUILauncher extends WizardUILancher<StorageStep, StorageUIMod protected void init(StorageUI ui) { super.init(ui); if (log.isDebugEnabled()) { - log.debug("Incoming dbmode : " + mode); + log.debug("Incoming dbmode : " + modes.stream().map(DbMode::name).collect(Collectors.joining(", "))); } StorageUIModel model = ui.getModel(); - if (mode != null) { + if (CollectionUtils.isNotEmpty(modes)) { if (log.isInfoEnabled()) { - log.info("will use incoming mode " + mode); + log.info("will use incoming mode " + modes.stream().map(DbMode::name).collect(Collectors.joining(", "))); } model.setExcludeSteps( @@ -157,13 +160,13 @@ public class StorageUILauncher extends WizardUILancher<StorageStep, StorageUIMod StorageStep.CONFIG_DATA, StorageStep.ROLES) ); - model.setCanCreateLocalService(DbMode.CREATE_LOCAL.equals(mode)); - model.setCanUseLocalService(DbMode.USE_LOCAL.equals(mode)); - model.setCanUseRemoteService(DbMode.USE_REMOTE.equals(mode)); - model.setCanUseServerService(DbMode.USE_SERVER.equals(mode)); + model.setCanCreateLocalService(modes.contains(DbMode.CREATE_LOCAL)); + model.setCanUseLocalService(modes.contains(DbMode.USE_LOCAL)); + model.setCanUseRemoteService(modes.contains(DbMode.USE_REMOTE)); + model.setCanUseServerService(modes.contains(DbMode.USE_SERVER)); model.updateUniverse(); - model.setDbMode(mode); + model.setDbMode(modes.stream().findFirst().get()); } else { ObserveSwingApplicationConfig config = -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 6d54695703b134de640051218486d9ea8e43083f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 14 17:42:19 2016 +0100 correction du package principal pour les services (see #8124). --- .../configuration/ObserveDataSourceConfigurationRestConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java index 5e83140..2a049a7 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java @@ -29,7 +29,7 @@ package fr.ird.observe.services.configuration; */ public interface ObserveDataSourceConfigurationRestConstants { - Package ROOT_SERVICES_PACKAGE = ObserveDataSourceConfigurationRestConstants.class.getPackage(); + Package ROOT_SERVICES_PACKAGE = Package.getPackage("fr.ird.observe.services.service"); String PARAMETER_DATA_SOURCE_CONFIGURATION = "dataSourceConfiguration"; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 64ecde532dd50dc35e4eb744170b56ed999a618f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 14 17:47:37 2016 +0100 correction du toString si dataIds est null (see #8124). --- .../fr/ird/observe/services/service/SqlScriptProducerRequest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerRequest.java index 7603092..395f2d4 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerRequest.java @@ -1,9 +1,10 @@ package fr.ird.observe.services.service; -import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; +import java.util.stream.Collectors; + /** * Created on 31/12/15. * @@ -81,7 +82,7 @@ public class SqlScriptProducerRequest { .add("addSchema", addSchema) .add("addReferential", addReferential) .add("addData", addData) - .add("dataIds", "[" + Joiner.on(", ").join(dataIds) + "]") + .add("dataIds", dataIds == null ? "" : "[" + dataIds.stream().collect(Collectors.joining(", ")) + "]") .toString(); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 0cdb2e9252a5c3c151712759e0f2d5b69e24a9a2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 08:18:17 2016 +0100 La cause de l'exception remontée ne peut pas être changée (see #8124). --- .../application/web/controller/v1/ObserveWebErrorController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java index 67cd792..b9beb52 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java @@ -89,7 +89,9 @@ public class ObserveWebErrorController extends WebMotionController { } exception.setStackTrace(stackTraceElements.toArray(new StackTraceElement[stackTraceElements.size()])); - exception.initCause(null); + + // FIXME sbavencoff 15/03/2016 si la cause est déjà initialisé il n'est pas possible de la changer + //exception.initCause(null); message = exception.getMessage(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 932fcf21ea4723a2be5aa49ecbbc5d8d763f2621 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 12:15:56 2016 +0100 utilisé le même format pour les dates pour la contruction de la requêt coté client et son interprétation coté serveur(see #8124). --- .../web/ObserveWebApplicationListener.java | 3 ++ .../application/web/injector/DateInjector.java | 52 ++++++++++++++++++++++ ...bserveDataSourceConfigurationRestConstants.java | 5 +++ .../services/ObserveServiceFactoryRest.java | 5 ++- 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java index 7e7e0fd..0ce1488 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -24,10 +24,12 @@ package fr.ird.observe.application.web; import com.google.gson.Gson; import fr.ird.observe.application.web.converter.ObserveDtoConverter; +import fr.ird.observe.application.web.injector.DateInjector; import fr.ird.observe.application.web.injector.ObserveClassInjector; import fr.ird.observe.application.web.injector.ObserveDataSourceConfigurationInjector; import fr.ird.observe.application.web.injector.ObserveDtoInjector; import fr.ird.observe.application.web.injector.ObserveReferenceSetRequestInjector; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.dto.ObserveDbUserDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -64,6 +66,7 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { context.addInjector(new ObserveClassInjector()); context.addInjector(new ObserveDtoInjector(gson)); context.addInjector(new ObserveReferenceSetRequestInjector(gson)); + context.addInjector(new DateInjector(ObserveDataSourceConfigurationRestConstants.DATE_FORMAT)); context.addConverter(new ObserveDtoConverter(gson), ObserveDbUserDto.class); context.getServletContext().setAttribute( diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/DateInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/DateInjector.java new file mode 100644 index 0000000..ae741aa --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/DateInjector.java @@ -0,0 +1,52 @@ +package fr.ird.observe.application.web.injector; + +import com.google.gson.JsonParseException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.debux.webmotion.server.call.Call; +import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; +import org.debux.webmotion.server.mapping.Mapping; + +import java.lang.reflect.Type; +import java.text.DateFormat; +import java.text.ParseException; +import java.util.Date; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class DateInjector implements ExecutorParametersInjectorHandler.Injector{ + + private static final Log log = LogFactory.getLog(DateInjector.class); + + protected DateFormat dateFormat; + + public DateInjector(DateFormat dateFormat) { + this.dateFormat = dateFormat; + } + + @Override + public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { + Date result = null; + + if (type.equals(Date.class)) { + + Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); + + if (parameterTree != null) { + String dateString = ((String[]) parameterTree.getValue())[0]; + try { + result = dateFormat.parse(dateString); + } catch (ParseException e) { + if (log.isErrorEnabled()) { + log.error("An exception occurred", e); + } + throw new JsonParseException("no parse to date from " + dateString, e); + } + } + + } + + return result; + } +} diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java index 2a049a7..fed7969 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java @@ -22,6 +22,9 @@ package fr.ird.observe.services.configuration; * #L% */ +import java.text.DateFormat; +import java.text.SimpleDateFormat; + /** * Created on 04/09/15. * @@ -43,4 +46,6 @@ public interface ObserveDataSourceConfigurationRestConstants { String REQUEST_ADMIN_API_KEY = "adminApiKey"; + DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ"); + } diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java index a695ff0..3c76716 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java @@ -53,6 +53,7 @@ import java.io.IOException; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.util.Collection; +import java.util.Date; /** * Created on 16/08/15. @@ -323,7 +324,9 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl requestBuilder.addParameter(name, (String) value); // Make sure String is not converted to JSON } else if (value != null && value instanceof Collection) { requestBuilder.addParameter(name, (Collection) value); // Make sure List is not converted to JSON - } else { + } else if (value != null && value instanceof Date) { + requestBuilder.addParameter(name, DATE_FORMAT.format(value)); + } else if (value != null) { requestBuilder.addParameter(name, value); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 3ebbf630b23516149ad40a772d9bf31eda00c5e2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 12:21:11 2016 +0100 Le tableau des types des propriété n'est plus dans l'objet ReferenceDto (see #8124). --- .../services/dto/gson/reference/AbstractReferenceAdapter.java | 5 ++--- .../observe/services/dto/gson/reference/DataReferenceAdapter.java | 4 ++-- .../services/dto/gson/reference/ReferentialReferenceAdapter.java | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java index 50f6484..7a8342b 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java @@ -74,7 +74,6 @@ public abstract class AbstractReferenceAdapter<D extends IdDto, R extends Abstra for (int i = 0; i < propertiesSize; i++) { - String name = propertyNames[i]; Class type = propertyTypes[i]; JsonElement jsonValue = jsonPropertyValues.get(i); Serializable value = context.deserialize(jsonValue, type); @@ -82,7 +81,7 @@ public abstract class AbstractReferenceAdapter<D extends IdDto, R extends Abstra } - R reference = newReference(dtoType, propertyNames, propertyTypes, propertyValues); + R reference = newReference(dtoType, propertyNames, propertyValues); String id = context.deserialize(jsonObject.get(AbstractReference.PROPERTY_ID), String.class); reference.setId(id); @@ -126,6 +125,6 @@ public abstract class AbstractReferenceAdapter<D extends IdDto, R extends Abstra protected abstract ReferenceSetDefinition<D> getDefinition(Class<D> dtoType); - protected abstract R newReference(Class<D> dtoType, String[] propertyNames, Class<?>[] propertyTypes, Serializable... propertyValues); + protected abstract R newReference(Class<D> dtoType, String[] propertyNames, Serializable... propertyValues); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java index 9f673b6..de76aaa 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java @@ -40,9 +40,9 @@ public class DataReferenceAdapter<D extends DataDto> extends AbstractReferenceAd } @Override - protected DataReference<D> newReference(Class<D> dtoType, String[] propertyNames, Class<?>[] propertyTypes, Serializable... propertyValues) { + protected DataReference<D> newReference(Class<D> dtoType, String[] propertyNames, Serializable... propertyValues) { DataReference<D> reference = new DataReference<>(); - reference.init(dtoType, propertyNames, propertyTypes, propertyValues); + reference.init(dtoType, propertyNames, propertyValues); return reference; } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java index 5360207..4af234d 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java @@ -91,9 +91,9 @@ public class ReferentialReferenceAdapter<D extends ReferentialDto> extends Abstr } @Override - protected ReferentialReference<D> newReference(Class<D> dtoType, String[] propertyNames, Class<?>[] propertyTypes, Serializable... propertyValues) { + protected ReferentialReference<D> newReference(Class<D> dtoType, String[] propertyNames, Serializable... propertyValues) { ReferentialReference<D> reference = new ReferentialReference<>(); - reference.init(dtoType, propertyNames, propertyTypes, propertyValues); + reference.init(dtoType, propertyNames, propertyValues); return reference; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm