Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1eb233c5 by Tony CHEMIT at 2017-12-02T21:12:04+01:00 clean up code - - - - - 15 changed files: - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineDetailCompositionObsUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineNonTargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetCatchDiscardUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetCatchUIHandler.java - persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java - server/src/main/java/fr/ird/observe/server/ObserveWebApplicationContext.java - server/src/main/java/fr/ird/observe/server/ObserveWebMotionRender.java - server/src/main/java/fr/ird/observe/server/converter/ObserveDtoConverter.java - server/src/main/java/fr/ird/observe/server/injector/ObserveDtoInjector.java - services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java - services-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceTest.java - services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java - validation/src/main/java/fr/ird/observe/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineDetailCompositionObsUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineDetailCompositionObsUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineDetailCompositionObsUIModel.java @@ -47,10 +47,10 @@ public class SetLonglineDetailCompositionObsUIModel extends SimpleDataFormUIMode public static final String PROPERTY_COMPOSITION_TAB_VALID = "compositionTabValid"; public static final Set<String> GENERATE_TAB_PROPERTIES = - ImmutableSet.<String>of(PROPERTY_GENERATE_TAB_VALID); + ImmutableSet.of(PROPERTY_GENERATE_TAB_VALID); public static final Set<String> COMPOSITION_TAB_PROPERTIES = - ImmutableSet.<String>of(PROPERTY_COMPOSITION_TAB_VALID); + ImmutableSet.of(PROPERTY_COMPOSITION_TAB_VALID); public static final Set<String> BRANCHLINE_DETAIL_TAB_PROPERTIES = ImmutableSet.<String>builder() ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineNonTargetCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineNonTargetCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineNonTargetCatchUIHandler.java @@ -336,10 +336,7 @@ public class SetSeineNonTargetCatchUIHandler extends ObserveDataTableFormUIHandl canContinue = true; break; } - if (!canContinue) { - // l'utilisateur a choisi de ne pas continuer - return false; - } + return canContinue; } return true; ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetCatchDiscardUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetCatchDiscardUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetCatchDiscardUIHandler.java @@ -260,11 +260,7 @@ class SetSeineTargetCatchDiscardUIHandler extends ObserveDataTableFormUIHandler< break; } - if (!canContinue) { - - // l'utilisateur a choisi de ne pas continuer - return false; - } + return canContinue; } return true; ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/table/seine/SetSeineTargetCatchUIHandler.java @@ -215,11 +215,7 @@ public class SetSeineTargetCatchUIHandler extends ObserveDataTableFormUIHandler< break; } - if (!canContinue) { - - // l'utilisateur a choisi de ne pas continuer - return false; - } + return canContinue; } return true; } ===================================== persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java @@ -191,7 +191,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat //TODO Push this back in topia JdbcH2Helper jdbcH2Helper = new JdbcH2Helper(configuration) { @Override - public void restore(File file) throws FileNotFoundException { + public void restore(File file) { String options = ""; try (InputStream in = new BufferedInputStream(new FileInputStream(file))) { in.mark(2); ===================================== server/src/main/java/fr/ird/observe/server/ObserveWebApplicationContext.java ===================================== --- a/server/src/main/java/fr/ird/observe/server/ObserveWebApplicationContext.java +++ b/server/src/main/java/fr/ird/observe/server/ObserveWebApplicationContext.java @@ -85,7 +85,7 @@ public class ObserveWebApplicationContext implements Closeable { } - public void init(String contextPath) throws InvalidObserveWebDatabaseException, InvalidObserveWebDatabasesException, InvalidObserveWebDatabaseRoleException, InvalidObserveWebUserPermissionException, InvalidObserveWebUsersException, InvalidObserveWebUserException { + public void init(String contextPath) throws InvalidObserveWebDatabaseException, InvalidObserveWebDatabasesException, InvalidObserveWebDatabaseRoleException, InvalidObserveWebUserPermissionException, InvalidObserveWebUserException { if (contextPath.startsWith("/")) { contextPath = contextPath.substring(1); @@ -125,7 +125,7 @@ public class ObserveWebApplicationContext implements Closeable { } - public void reloadConfiguration() throws InvalidObserveWebUserPermissionException, InvalidObserveWebUsersException, InvalidObserveWebUserException, InvalidObserveWebDatabaseException, InvalidObserveWebDatabasesException, InvalidObserveWebDatabaseRoleException { + public void reloadConfiguration() throws InvalidObserveWebUserPermissionException, InvalidObserveWebUserException, InvalidObserveWebDatabaseException, InvalidObserveWebDatabasesException, InvalidObserveWebDatabaseRoleException { // init databases ObserveWebDatabasesHelper databasesHelper = new ObserveWebDatabasesHelper(); ===================================== server/src/main/java/fr/ird/observe/server/ObserveWebMotionRender.java ===================================== --- a/server/src/main/java/fr/ird/observe/server/ObserveWebMotionRender.java +++ b/server/src/main/java/fr/ird/observe/server/ObserveWebMotionRender.java @@ -46,7 +46,7 @@ public class ObserveWebMotionRender<T> extends Render { } @Override - public void create(Mapping mapping, Call call) throws IOException, ServletException { + public void create(Mapping mapping, Call call) throws IOException { HttpContext context = call.getContext(); HttpServletResponse response = context.getResponse(); ===================================== server/src/main/java/fr/ird/observe/server/converter/ObserveDtoConverter.java ===================================== --- a/server/src/main/java/fr/ird/observe/server/converter/ObserveDtoConverter.java +++ b/server/src/main/java/fr/ird/observe/server/converter/ObserveDtoConverter.java @@ -46,7 +46,7 @@ public class ObserveDtoConverter extends AbstractConverter { @Override - protected <T> T convertToType(Class<T> type, Object value) throws Throwable { + protected <T> T convertToType(Class<T> type, Object value) { T observeDto; if (ObserveDto.class.isAssignableFrom(type)) { ===================================== server/src/main/java/fr/ird/observe/server/injector/ObserveDtoInjector.java ===================================== --- a/server/src/main/java/fr/ird/observe/server/injector/ObserveDtoInjector.java +++ b/server/src/main/java/fr/ird/observe/server/injector/ObserveDtoInjector.java @@ -98,7 +98,7 @@ public class ObserveDtoInjector extends AbstractConverter implements ExecutorPar } @Override - protected <T> T convertToType(Class<T> type, Object value) throws Throwable { + protected <T> T convertToType(Class<T> type, Object value) { T observeDto; if (ObserveDto.class.isAssignableFrom(type)) { ===================================== services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTest.java @@ -88,7 +88,7 @@ public abstract class AbstractReportServiceTest extends ServiceTestSupport { * @throws Exception pour toute erreur lors de l'execution du report */ @Test - public final void testReport() throws Exception { + public final void testReport() { // test de la syntaxe du report testReportSyntax(report); ===================================== services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java @@ -118,7 +118,7 @@ public class ValidateServiceTest extends ServiceTestSupport { } @Test - public void testValidateReferential() throws Exception { + public void testValidateReferential() { ReferentialValidationRequest request = new ReferentialValidationRequest(); @@ -268,7 +268,7 @@ public class ValidateServiceTest extends ServiceTestSupport { } @Test - public void testValidateTripSeines() throws Exception { + public void testValidateTripSeines() { DataValidationRequest request = new DataValidationRequest(); request.setValidationSpeedEnable(true); ===================================== services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineServiceTest.java @@ -66,7 +66,7 @@ public class TripSeineServiceTest extends ServiceTestSupport { } @Test - public void loadFormTest() throws Exception { + public void loadFormTest() { TripSeine tripSeine = getMethodRule().findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); 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 ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceTest.java @@ -73,7 +73,7 @@ public class ReferentialServiceTest extends ServiceTestSupport { } @Test - public void testLoadForm() throws Exception { + public void testLoadForm() { for (Class<? extends ReferentialDto> dtoType : DtoModelClasses.REFERENTIAL_TYPES) { loadToEdit(dtoType); } @@ -81,13 +81,13 @@ public class ReferentialServiceTest extends ServiceTestSupport { @Test @CopyDatabaseConfiguration - public void testDelete() throws Exception { + public void testDelete() { delete(ProgramDto.class); delete(LengthWeightParameterDto.class); } @Test - public void testGetTripSeineRequest() throws Exception { + public void testGetTripSeineRequest() { FormDefinition<TripSeineDto> dataDefinition = TripSeineDto.formDefinition(); Class<TripSeineDto> requestName = dataDefinition.getType(); @@ -133,7 +133,7 @@ public class ReferentialServiceTest extends ServiceTestSupport { // FIXME!!! Coming from rest See what is going on ? @Ignore @Test - public void testGetPrograms() throws IOException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, CloneNotSupportedException, BabModelVersionException { + public void testGetPrograms() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { ReferentialService referentialService = getMethodRule().newService(ReferentialService.class); ===================================== services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java +++ b/services-test/src/main/java/fr/ird/observe/services/test/ObserveTestResources.java @@ -83,7 +83,7 @@ public class ObserveTestResources { return testProperties; } - static URL getResourceContentUrl(String scriptPath) throws IOException { + static URL getResourceContentUrl(String scriptPath) { return ObserveTestResources.class.getResource(scriptPath); } ===================================== validation/src/main/java/fr/ird/observe/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java ===================================== --- a/validation/src/main/java/fr/ird/observe/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java +++ b/validation/src/main/java/fr/ird/observe/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java @@ -60,7 +60,7 @@ public class SetLonglineUniqueHomeIdDtoValidator extends FieldValidatorSupport { } @Override - public void validate(Object object) throws ValidationException { + public void validate(Object object) { SetLonglineObsDto setLongline = (SetLonglineObsDto) object; String homeId = setLongline.getHomeId(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1eb233c53be0f191a14ae80307fe... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1eb233c53be0f191a14ae80307fe... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT