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 54d559618857654ae0939daecab4046f15672d81 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 7 18:02:32 2016 +0200 Remove some fixes --- .../configuration/ObserveDataSourceConnection.java | 1 - .../dto/reference/DataReferenceSetDefinitions.java | 1 - .../request/ReferenceSetRequestDefinitions.java | 1 - ...ect-service-objectSchoolEstimate-error-validation.xml | 1 - .../validators/SetLonglineUniqueHomeIdValidator.java | 4 ---- .../validators/SetLonglineUniqueNumberValidator.java | 4 ---- .../fr/ird/observe/services/topia/ObserveJdbcHelper.java | 2 -- .../observe/services/topia/ObserveSecurityHelper.java | 2 -- .../services/topia/ObserveServiceContextTopia.java | 1 - .../service/actions/validate/ValidateServiceTopia.java | 5 +---- .../services/topia/service/seine/RouteServiceTopia.java | 4 ---- .../topia/service/seine/SetSeineServiceTopia.java | 3 --- .../service/seine/TargetSampleServiceTopiaTest.java | 16 ---------------- .../service/sql/batch/actions/AbstractSqlAction.java | 1 - 14 files changed, 1 insertion(+), 45 deletions(-) diff --git a/services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java b/services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java index fee369c..5e36d1d 100644 --- a/services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java +++ b/services-configuration/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java @@ -60,7 +60,6 @@ public interface ObserveDataSourceConnection extends Serializable { */ boolean canWriteData(); - //FIXME Version of what ? Version getVersion(); } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index a7ca61c..023560c 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -136,7 +136,6 @@ public enum DataReferenceSetDefinitions { CATCH_LONGLINE(newDefinitionBuilder(CatchLonglineDto.class) .addProperty(String.class, CatchLonglineDto.PROPERTY_HOME_ID)), - //FIXME Voir ce qu'on ajouter d'autre (peut-être utiliser l'activité ?) SET_LONGLINE(newDefinitionBuilder(SetLonglineDto.class) .addProperty(String.class, SetLonglineDto.PROPERTY_HOME_ID)), diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java index 24e4652..b68ded4 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java @@ -178,7 +178,6 @@ import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefin import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.WIND; /** - * //FIXME Renommer et spliter car il s'agit aussi de définition * Contient les définitions de tous les requêtes que les services proposent. * * Pour chaque type qui correspond à un formulaire, on décrit ici que les référentiels à utiliser, pour les données diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-objectSchoolEstimate-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-objectSchoolEstimate-error-validation.xml index 69e0bbd..24f8c17 100644 --- a/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-objectSchoolEstimate-error-validation.xml +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-objectSchoolEstimate-error-validation.xml @@ -36,7 +36,6 @@ <!-- comment requis si l'species en a besoin --> <field-validator type="collectionFieldExpression"> - <!--FIXME il faut ajouter une propriete dans le validateur --> <param name="collectionFieldName">schoolEstimate</param> <param name="mode">ALL</param> <param name="useSensitiveContext">true</param> diff --git a/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueHomeIdValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueHomeIdValidator.java index d147a58..3fad57c 100644 --- a/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueHomeIdValidator.java +++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueHomeIdValidator.java @@ -73,10 +73,6 @@ public class SetLonglineUniqueHomeIdValidator extends FieldValidatorSupport { notValid = true; - //FIXME -// DecoratorService provider = ObserveServiceHelper.getDecoratorService(); -// Decorator<?> decorator = provider.getDecorator(activityLongline); - stack.set("duplicatedActivity", activityLongline); break; diff --git a/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueNumberValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueNumberValidator.java index ffe61b4..711bdf8 100644 --- a/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueNumberValidator.java +++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueNumberValidator.java @@ -73,10 +73,6 @@ public class SetLonglineUniqueNumberValidator extends FieldValidatorSupport { notValid = true; - //FIXME -// DecoratorService provider = ObserveServiceHelper.getDecoratorService(); -// Decorator<?> decorator = provider.getDecorator(activityLongline); - stack.set("duplicatedActivity", activityLongline); break; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveJdbcHelper.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveJdbcHelper.java index e4d2347..e044a6e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveJdbcHelper.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveJdbcHelper.java @@ -46,8 +46,6 @@ import java.util.List; import java.util.Set; /** - * FIXME Ca sert à quoi? - * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class ObserveJdbcHelper extends JdbcHelper { diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java index 9e1a65d..4b257f9 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java @@ -48,8 +48,6 @@ import java.util.function.Function; import java.util.stream.Collectors; /** - * FIXME Ca sert à quoi? - * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class ObserveSecurityHelper { diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java index 872bc02..f129356 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java @@ -153,7 +153,6 @@ public class ObserveServiceContextTopia { try { return Files.createTempDirectory(getTemporaryDirectoryRoot().toPath(), prefix, fileAttribute).toFile(); } catch (IOException e) { - //TODO Avoir une exception plus concrete throw new RuntimeException("Could not create temporary directory with preifx: " + prefix, e); } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java index fc611ac..b4a737f 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java @@ -119,10 +119,7 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat request.getValidationContext(), request.getScopes(), Entities.DATA_ENTITIES); - - //FIXME On ne peut pas charger cela avant d'avoir détecter un premier validateur - //FIXME Il faudrait mieux initialier de manière explicite le ActionContext - + ReferentialLocale referenceLocale = getReferentialLocale(); initValidationEngine(validationDataContext); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java index 96d9b71..456259c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/RouteServiceTopia.java @@ -129,11 +129,7 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } Route route = loadEntity(RouteDto.class, routeId); - - //FIXME -// bindFindeVeilleProperties(route.getActivitySeine(), referenceDto.getForm().getActivitySeine()); return toReference(route); - } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SetSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SetSeineServiceTopia.java index f26eac5..618e4ef 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SetSeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/SetSeineServiceTopia.java @@ -178,9 +178,6 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein activitySeine.setSetSeine(null); - //FIXME kmorin : faudrait pas sauver quelquechose là ? parcequ'on n'a rien supprimé... - //FIXME tchemit: normalement c'est une composition donc ça doit être supprimé tout seul (à vérifier) - } } diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java index 10347ea..d6704e6 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/seine/TargetSampleServiceTopiaTest.java @@ -31,21 +31,11 @@ import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; /** - * //FIXME je comprend pas pk on a un - * - * <pre> - * java.lang.IllegalArgumentException: object is not an instance of declaring class - * at fr.ird.observe.services.topia.service.seine.TargetSampleServiceTopiaTest.canUseTargetSampleTest(TargetSampleServiceTopiaTest.java:54) - * - * </pre> - * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -@Ignore @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) public class TargetSampleServiceTopiaTest extends AbstractServiceTopiaTest { @@ -79,12 +69,6 @@ public class TargetSampleServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertFalse(targetSampleDto.getDiscarded()); Assert.assertTrue(targetSampleDto.isTargetLengthEmpty()); - //FIXME -// ReferenceSetDto<SpeciesDto> speciesDtoReferenceSetDto = formDto.getReferenceSetDto(SpeciesDto.class, TargetLengthDto.PROPERTY_SPECIES); -// Assert.assertEquals(1, speciesDtoReferenceSetDto.sizeReference()); -// ReferenceDto referenceDto = speciesDtoReferenceSetDto.getReferences(0); -// Assert.assertEquals("fr.ird.observe.entities.referentiel.Species#1239832685474#0.8943253454598569", referenceDto.getId()); - } } diff --git a/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSqlAction.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSqlAction.java index f14c7e1..353f859 100644 --- a/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSqlAction.java +++ b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/AbstractSqlAction.java @@ -201,7 +201,6 @@ public abstract class AbstractSqlAction<R extends AbstractSqlRequest> implements endTime = TIME_LOG.log(startTime, "Action failed", getClass().getName()); - //FIXME throw new TopiaException(e); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.