Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

15 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineDetailCompositionObsUIModel.java
    ... ... @@ -47,10 +47,10 @@ public class SetLonglineDetailCompositionObsUIModel extends SimpleDataFormUIMode
    47 47 
         public static final String PROPERTY_COMPOSITION_TAB_VALID = "compositionTabValid";
    48 48
    49 49 
         public static final Set<String> GENERATE_TAB_PROPERTIES =
    50 
    -            ImmutableSet.<String>of(PROPERTY_GENERATE_TAB_VALID);
    50 
    +            ImmutableSet.of(PROPERTY_GENERATE_TAB_VALID);
    51 51
    52 52 
         public static final Set<String> COMPOSITION_TAB_PROPERTIES =
    53 
    -            ImmutableSet.<String>of(PROPERTY_COMPOSITION_TAB_VALID);
    53 
    +            ImmutableSet.of(PROPERTY_COMPOSITION_TAB_VALID);
    54 54
    55 55 
         public static final Set<String> BRANCHLINE_DETAIL_TAB_PROPERTIES =
    56 56 
                 ImmutableSet.<String>builder()

  • client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineNonTargetCatchUIHandler.java
    ... ... @@ -336,10 +336,7 @@ public class SetSeineNonTargetCatchUIHandler extends ObserveDataTableFormUIHandl
    336 336 
                         canContinue = true;
    337 337 
                         break;
    338 338 
                 }
    339 
    -            if (!canContinue) {
    340 
    -                // l'utilisateur a choisi de ne pas continuer
    341 
    -                return false;
    342 
    -            }
    339 
    +            return canContinue;
    343 340 
             }
    344 341
    345 342 
             return true;

  • client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetCatchDiscardUIHandler.java
    ... ... @@ -260,11 +260,7 @@ class SetSeineTargetCatchDiscardUIHandler extends ObserveDataTableFormUIHandler<
    260 260 
                         break;
    261 261 
                 }
    262 262
    263 
    -            if (!canContinue) {
    264 
    -
    265 
    -                // l'utilisateur a choisi de ne pas continuer
    266 
    -                return false;
    267 
    -            }
    263 
    +            return canContinue;
    268 264 
             }
    269 265
    270 266 
             return true;

  • client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetCatchUIHandler.java
    ... ... @@ -215,11 +215,7 @@ public class SetSeineTargetCatchUIHandler extends ObserveDataTableFormUIHandler<
    215 215 
                         break;
    216 216 
                 }
    217 217
    218 
    -            if (!canContinue) {
    219 
    -
    220 
    -                // l'utilisateur a choisi de ne pas continuer
    221 
    -                return false;
    222 
    -            }
    218 
    +            return canContinue;
    223 219 
             }
    224 220 
             return true;
    225 221 
         }

  • persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java
    ... ... @@ -191,7 +191,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat
    191 191 
                     //TODO Push this back in topia
    192 192 
                     JdbcH2Helper jdbcH2Helper = new JdbcH2Helper(configuration) {
    193 193 
                         @Override
    194 
    -                    public void restore(File file) throws FileNotFoundException {
    194 
    +                    public void restore(File file) {
    195 195 
                             String options = "";
    196 196 
                             try (InputStream in = new BufferedInputStream(new FileInputStream(file))) {
    197 197 
                                 in.mark(2);

  • server/src/main/java/fr/ird/observe/server/ObserveWebApplicationContext.java
    ... ... @@ -85,7 +85,7 @@ public class ObserveWebApplicationContext implements Closeable {
    85 85
    86 86 
         }
    87 87
    88 
    -    public void init(String contextPath) throws InvalidObserveWebDatabaseException, InvalidObserveWebDatabasesException, InvalidObserveWebDatabaseRoleException, InvalidObserveWebUserPermissionException, InvalidObserveWebUsersException, InvalidObserveWebUserException {
    88 
    +    public void init(String contextPath) throws InvalidObserveWebDatabaseException, InvalidObserveWebDatabasesException, InvalidObserveWebDatabaseRoleException, InvalidObserveWebUserPermissionException, InvalidObserveWebUserException {
    89 89
    90 90 
             if (contextPath.startsWith("/")) {
    91 91 
                 contextPath = contextPath.substring(1);
    ... ... @@ -125,7 +125,7 @@ public class ObserveWebApplicationContext implements Closeable {
    125 125
    126 126 
         }
    127 127
    128 
    -    public void reloadConfiguration() throws InvalidObserveWebUserPermissionException, InvalidObserveWebUsersException, InvalidObserveWebUserException, InvalidObserveWebDatabaseException, InvalidObserveWebDatabasesException, InvalidObserveWebDatabaseRoleException {
    128 
    +    public void reloadConfiguration() throws InvalidObserveWebUserPermissionException, InvalidObserveWebUserException, InvalidObserveWebDatabaseException, InvalidObserveWebDatabasesException, InvalidObserveWebDatabaseRoleException {
    129 129
    130 130 
             // init databases
    131 131 
             ObserveWebDatabasesHelper databasesHelper = new ObserveWebDatabasesHelper();

  • server/src/main/java/fr/ird/observe/server/ObserveWebMotionRender.java
    ... ... @@ -46,7 +46,7 @@ public class ObserveWebMotionRender<T> extends Render {
    46 46 
         }
    47 47
    48 48 
         @Override
    49 
    -    public void create(Mapping mapping, Call call) throws IOException, ServletException {
    49 
    +    public void create(Mapping mapping, Call call) throws IOException {
    50 50
    51 51 
             HttpContext context = call.getContext();
    52 52 
             HttpServletResponse response = context.getResponse();

  • server/src/main/java/fr/ird/observe/server/converter/ObserveDtoConverter.java
    ... ... @@ -46,7 +46,7 @@ public class ObserveDtoConverter extends AbstractConverter {
    46 46
    47 47
    48 48 
         @Override
    49 
    -    protected <T> T convertToType(Class<T> type, Object value) throws Throwable {
    49 
    +    protected <T> T convertToType(Class<T> type, Object value) {
    50 50 
             T observeDto;
    51 51
    52 52 
             if (ObserveDto.class.isAssignableFrom(type)) {

  • server/src/main/java/fr/ird/observe/server/injector/ObserveDtoInjector.java
    ... ... @@ -98,7 +98,7 @@ public class ObserveDtoInjector extends AbstractConverter implements ExecutorPar
    98 98 
         }
    99 99
    100 100 
         @Override
    101 
    -    protected <T> T convertToType(Class<T> type, Object value) throws Throwable {
    101 
    +    protected <T> T convertToType(Class<T> type, Object value) {
    102 102 
             T observeDto;
    103 103
    104 104 
             if (ObserveDto.class.isAssignableFrom(type)) {

  • services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java
    ... ... @@ -88,7 +88,7 @@ public abstract class AbstractReportServiceTest extends ServiceTestSupport {
    88 88 
          * @throws Exception pour toute erreur lors de l'execution du report
    89 89 
          */
    90 90 
         @Test
    91 
    -    public final void testReport() throws Exception {
    91 
    +    public final void testReport() {
    92 92
    93 93 
             // test de la syntaxe du report
    94 94 
             testReportSyntax(report);

  • services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java
    ... ... @@ -118,7 +118,7 @@ public class ValidateServiceTest extends ServiceTestSupport {
    118 118 
         }
    119 119
    120 120 
         @Test
    121 
    -    public void testValidateReferential() throws Exception {
    121 
    +    public void testValidateReferential() {
    122 122
    123 123 
             ReferentialValidationRequest request = new ReferentialValidationRequest();
    124 124
    ... ... @@ -268,7 +268,7 @@ public class ValidateServiceTest extends ServiceTestSupport {
    268 268 
         }
    269 269
    270 270 
         @Test
    271 
    -    public void testValidateTripSeines() throws Exception {
    271 
    +    public void testValidateTripSeines() {
    272 272
    273 273 
             DataValidationRequest request = new DataValidationRequest();
    274 274 
             request.setValidationSpeedEnable(true);

  • services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java
    ... ... @@ -66,7 +66,7 @@ public class TripSeineServiceTest extends ServiceTestSupport {
    66 66 
         }
    67 67
    68 68 
         @Test
    69 
    -    public void loadFormTest() throws Exception {
    69 
    +    public void loadFormTest() {
    70 70
    71 71 
             TripSeine tripSeine = getMethodRule().findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1);
    72 72 
             Form<TripSeineDto> form = service.loadForm(LoadFormRequestDto.of(ObserveFixtures.TRIP_SEINE_ID_1));

  • services-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceTest.java
    ... ... @@ -73,7 +73,7 @@ public class ReferentialServiceTest extends ServiceTestSupport {
    73 73 
         }
    74 74
    75 75 
         @Test
    76 
    -    public void testLoadForm() throws Exception {
    76 
    +    public void testLoadForm() {
    77 77 
             for (Class<? extends ReferentialDto> dtoType : DtoModelClasses.REFERENTIAL_TYPES) {
    78 78 
                 loadToEdit(dtoType);
    79 79 
             }
    ... ... @@ -81,13 +81,13 @@ public class ReferentialServiceTest extends ServiceTestSupport {
    81 81
    82 82 
         @Test
    83 83 
         @CopyDatabaseConfiguration
    84 
    -    public void testDelete() throws Exception {
    84 
    +    public void testDelete() {
    85 85 
             delete(ProgramDto.class);
    86 86 
             delete(LengthWeightParameterDto.class);
    87 87 
         }
    88 88
    89 89 
         @Test
    90 
    -    public void testGetTripSeineRequest() throws Exception {
    90 
    +    public void testGetTripSeineRequest() {
    91 91
    92 92 
             FormDefinition<TripSeineDto> dataDefinition = TripSeineDto.formDefinition();
    93 93 
             Class<TripSeineDto> requestName = dataDefinition.getType();
    ... ... @@ -133,7 +133,7 @@ public class ReferentialServiceTest extends ServiceTestSupport {
    133 133 
         //    FIXME!!! Coming from rest See what is going on ?
    134 134 
         @Ignore
    135 135 
         @Test
    136 
    -    public void testGetPrograms() throws IOException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, CloneNotSupportedException, BabModelVersionException {
    136 
    +    public void testGetPrograms() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException {
    137 137
    138 138 
             ReferentialService referentialService = getMethodRule().newService(ReferentialService.class);
    139 139

  • services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java
    ... ... @@ -83,7 +83,7 @@ public class ObserveTestResources {
    83 83 
             return testProperties;
    84 84 
         }
    85 85
    86 
    -    static URL getResourceContentUrl(String scriptPath) throws IOException {
    86 
    +    static URL getResourceContentUrl(String scriptPath) {
    87 87 
             return ObserveTestResources.class.getResource(scriptPath);
    88 88 
         }
    89 89

  • validation/src/main/java/fr/ird/observe/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java
    ... ... @@ -60,7 +60,7 @@ public class SetLonglineUniqueHomeIdDtoValidator extends FieldValidatorSupport {
    60 60 
         }
    61 61
    62 62 
         @Override
    63 
    -    public void validate(Object object) throws ValidationException {
    63 
    +    public void validate(Object object) {
    64 64
    65 65 
             SetLonglineObsDto setLongline = (SetLonglineObsDto) object;
    66 66 
             String homeId = setLongline.getHomeId();

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.