branch feature/7458 updated (24ae978 -> c432553)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git from 24ae978 fix tag values new 7a163b9 Dto décrivant les formulaire (refs #7458). new c432553 fix properties (refs #7458). The 2 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 c432553eec78ca869fa2662834e7dd5fa659c36d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Aug 17 18:26:21 2015 +0200 fix properties (refs #7458). commit 7a163b9cf9f1a2c9dd8fcfab81a7f3762a28ecce Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Aug 17 18:25:36 2015 +0200 Dto décrivant les formulaire (refs #7458). Summary of changes: .../services/service/ReferentialService.java | 10 ++++----- .../ReferentialFormDto.java => FormDto.java} | 10 ++++----- .../java/fr/ird/observe/services/dto/FormDtos.java | 15 +++++++++++++ .../dto/referential/ReferentialFormDtos.java | 15 ------------- .../src/main/xmi/observe-services-dto-common.zargo | Bin 32764 -> 33096 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 69590 -> 75970 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 50460 -> 55402 bytes .../services/service/ReferentialServiceRest.java | 10 ++++----- .../services/service/ReferentialServiceTopia.java | 24 ++++++++++----------- 9 files changed, 42 insertions(+), 42 deletions(-) rename observe-services-model/src/main/java/fr/ird/observe/services/dto/{referential/ReferentialFormDto.java => FormDto.java} (65%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDtos.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git commit 7a163b9cf9f1a2c9dd8fcfab81a7f3762a28ecce Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Aug 17 18:25:36 2015 +0200 Dto décrivant les formulaire (refs #7458). --- .../services/service/ReferentialService.java | 10 ++++----- .../ReferentialFormDto.java => FormDto.java} | 10 ++++----- .../java/fr/ird/observe/services/dto/FormDtos.java | 15 +++++++++++++ .../dto/referential/ReferentialFormDtos.java | 15 ------------- .../src/main/xmi/observe-services-dto-common.zargo | Bin 32764 -> 33096 bytes .../xmi/observe-services-dto-longline.properties | 2 +- .../main/xmi/observe-services-dto-longline.zargo | Bin 69590 -> 75970 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 50460 -> 55402 bytes .../services/service/ReferentialServiceRest.java | 10 ++++----- .../services/service/ReferentialServiceTopia.java | 24 ++++++++++----------- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java index adf5ea2..36690b5 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialFormDto; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import fr.ird.observe.services.spi.Write; @@ -17,14 +17,14 @@ public interface ReferentialService extends ObserveService { <R extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<R> type); - <R extends ReferentialDto> ReferentialFormDto<R> loadToRead(Class<R> type, String id); + <R extends ReferentialDto> FormDto<R> loadToRead(Class<R> type, String id); - <R extends ReferentialDto> ReferentialFormDto<R> loadToEdit(Class<R> type, String id); + <R extends ReferentialDto> FormDto<R> loadToEdit(Class<R> type, String id); - <R extends ReferentialDto> ReferentialFormDto<R> preCreate(Class<R> type); + <R extends ReferentialDto> FormDto<R> preCreate(Class<R> type); @Write - <R extends ReferentialDto> String save(ReferentialFormDto<R> form); + <R extends ReferentialDto> String save(FormDto<R> form); @Write <R extends ReferentialDto> void delete(Class<R> type, String id); diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java similarity index 65% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDto.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java index 41f4c78..da5202d 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java @@ -1,23 +1,23 @@ -package fr.ird.observe.services.dto.referential; +package fr.ird.observe.services.dto; import com.google.common.base.Preconditions; -public class ReferentialFormDto<R extends ReferentialDto> extends AbstractReferentialFormDto { +public class FormDto<R extends IdDto> extends AbstractFormDto { private static final long serialVersionUID = 1L; protected final Class<R> type; - public ReferentialFormDto(Class<R> type) { + public FormDto(Class<R> type) { this.type = type; } - public ReferentialFormDto() { + public FormDto() { this(null); } @Override - public void setForm(ReferentialDto form) { + public void setForm(IdDto form) { Preconditions.checkArgument(form.getClass().isAssignableFrom(type), "Bad form type, should be " + type.getName()); super.setForm(form); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java new file mode 100644 index 0000000..7606dc8 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java @@ -0,0 +1,15 @@ +package fr.ird.observe.services.dto; + +/** + * Created on 17/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class FormDtos extends AbstractFormDtos { + + public static <BeanType extends FormDto, R extends IdDto> BeanType newReferentialFormDto(Class<R> source) { + BeanType result = (BeanType) new FormDto<>(source); + return result; + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDtos.java deleted file mode 100644 index edfa012..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDtos.java +++ /dev/null @@ -1,15 +0,0 @@ -package fr.ird.observe.services.dto.referential; - -/** - * Created on 17/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ReferentialFormDtos extends AbstractReferentialFormDtos { - - public static <BeanType extends ReferentialFormDto, R extends ReferentialDto> BeanType newReferentialFormDto(Class<R> source) { - BeanType result = (BeanType) new ReferentialFormDto<>(source); - return result; - } - -} diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 6f3d041..5a51577 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties index d65fee3..2e4bffc 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties @@ -1,6 +1,6 @@ model.tagvalue.version=7.0 -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.IdDto model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index 29c7608..db15039 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 995ba57..fb04fe5 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java index 1cee057..d3d88e6 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java @@ -3,7 +3,7 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveServiceContext; import fr.ird.observe.services.ObserveServiceRest; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialFormDto; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import java.util.Collection; @@ -22,22 +22,22 @@ public class ReferentialServiceRest extends ObserveServiceRest implements Refere } @Override - public <R extends ReferentialDto> ReferentialFormDto<R> loadToRead(Class<R> type, String id) { + public <R extends ReferentialDto> FormDto<R> loadToRead(Class<R> type, String id) { return null; } @Override - public <R extends ReferentialDto> ReferentialFormDto<R> loadToEdit(Class<R> type, String id) { + public <R extends ReferentialDto> FormDto<R> loadToEdit(Class<R> type, String id) { return null; } @Override - public <R extends ReferentialDto> ReferentialFormDto<R> preCreate(Class<R> type) { + public <R extends ReferentialDto> FormDto<R> preCreate(Class<R> type) { return null; } @Override - public <R extends ReferentialDto> String save(ReferentialFormDto<R> form) { + public <R extends ReferentialDto> String save(FormDto<R> form) { return null; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index 2be2542..6213c7a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -32,8 +32,8 @@ import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialFormDto; -import fr.ird.observe.services.dto.referential.ReferentialFormDtos; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.FormDtos; import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -139,35 +139,35 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } @Override - public <D extends ReferentialDto> ReferentialFormDto<D> loadToRead(Class<D> dtoType, String id) { + public <D extends ReferentialDto> FormDto<D> loadToRead(Class<D> dtoType, String id) { Class<? extends TopiaEntity> entityType = getEntityType(dtoType); TopiaEntity entity = null; - ReferentialFormDto<D> form = entityToReferentialFormDto(dtoType, entity); + FormDto<D> form = entityToReferentialFormDto(dtoType, entity); return form; } @Override - public <D extends ReferentialDto> ReferentialFormDto<D> loadToEdit(Class<D> dtoType, String id) { + public <D extends ReferentialDto> FormDto<D> loadToEdit(Class<D> dtoType, String id) { Class<? extends TopiaEntity> entityType = getEntityType(dtoType); TopiaEntity entity = null; - ReferentialFormDto<D> form = entityToReferentialFormDto(dtoType, entity); + FormDto<D> form = entityToReferentialFormDto(dtoType, entity); return form; } @Override - public <D extends ReferentialDto> ReferentialFormDto<D> preCreate(Class<D> dtoType) { + public <D extends ReferentialDto> FormDto<D> preCreate(Class<D> dtoType) { Class<? extends TopiaEntity> entityType = getEntityType(dtoType); TopiaEntity entity = null; - ReferentialFormDto<D> form = entityToReferentialFormDto(dtoType, entity); + FormDto<D> form = entityToReferentialFormDto(dtoType, entity); return form; } @Override - public <D extends ReferentialDto> String save(ReferentialFormDto<D> form) { + public <D extends ReferentialDto> String save(FormDto<D> form) { Class<D> dtoType= form.getType(); TopiaEntity entity = referentialDtoToEntity(form.getForm()); // TODO Save - ReferentialFormDto<D> model = entityToReferentialFormDto(dtoType, entity); + FormDto<D> model = entityToReferentialFormDto(dtoType, entity); return model.getForm().getId(); } @@ -183,9 +183,9 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } - protected <D extends ReferentialDto> ReferentialFormDto<D> entityToReferentialFormDto(Class<D> dtoType, TopiaEntity entity) { + protected <D extends ReferentialDto> FormDto<D> entityToReferentialFormDto(Class<D> dtoType, TopiaEntity entity) { D dto = toDto(dtoType, entity); - ReferentialFormDto<D> form = ReferentialFormDtos.newReferentialFormDto(dtoType); + FormDto<D> form = FormDtos.newReferentialFormDto(dtoType); form.setForm(dto); return form; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git commit c432553eec78ca869fa2662834e7dd5fa659c36d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Aug 17 18:26:21 2015 +0200 fix properties (refs #7458). --- .../src/main/xmi/observe-services-dto-longline.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties index 2e4bffc..d65fee3 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties @@ -1,6 +1,6 @@ model.tagvalue.version=7.0 -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.IdDto +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm