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 d07d9b2d5c8b0c4e593bdfe5651759b33d036830 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 19 14:56:47 2015 +0200 Permettre de générer des binders avec des types différents --- .../java/fr/ird/observe/services/dto/ObserveDtosInitializer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index e7999ea..3f949fa 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -917,7 +917,7 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, ActivitySeineDto.PROPERTY_ERS_ID, ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeineDto.PROPERTY_SOURROUNDING_ACTIVITY, + ActivitySeineDto.PROPERTY_SURROUNDING_ACTIVITY, ActivitySeineDto.PROPERTY_DETECTION_MODE, ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING, ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, @@ -1085,9 +1085,7 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { protected static <R extends ReferentialDto, E extends TopiaEntity> void registerReferentialReferenceDtoBinder(Class<R> dtoType, Class<E> entityType, boolean useDefault, String... extraProperties) { - BinderModelBuilder<R, E> dtoToReferenceBuilder = - newBinderBuilder(dtoType, entityType) - .canTypeMismatch(true); + BinderModelBuilder<R, E> dtoToReferenceBuilder =newBinderBuilder(dtoType, entityType); if (useDefault) { dtoToReferenceBuilder.addSimpleProperties(DEFAULT_REFERENTIAL_REFERENCE_PROPERTIES); @@ -1124,6 +1122,7 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { protected static <Source, Target> BinderModelBuilder<Source, Target> newBinderBuilder(Class<Source> source, Class<Target> target, String... properties) { BinderModelBuilder<Source, Target> builder = BinderModelBuilder.newEmptyBuilder(source, target); + builder.canTypeMismatch(true); builder.addSimpleProperties(properties); return builder; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.