This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git commit 6cf362b76f2d25baaf2648f3ed8201104f3d5c2f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 3 16:18:08 2015 +0200 premier controleur pour le serveur web (refs #7463) --- .../ObserveWebApplicationConfiguration.java | 37 ++++++++-------- .../v1/ReferentialServiceController.java | 4 -- ...tivitySeineObservedSystemServiceController.java | 30 +++++++++++++ .../v1/seine/ActivitySeineServiceController.java | 46 ++++++++++++++++++++ .../v1/seine/TripSeineServiceController.java | 49 ++++++++++++++++++++++ observe-application-web/src/main/resources/mapping | 8 ++-- .../service/seine/TripSeineServiceTopia.java | 3 ++ 7 files changed, 151 insertions(+), 26 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java index 8570f7b..794f34d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java @@ -50,24 +50,6 @@ public class ObserveWebApplicationConfiguration { ApplicationConfigProvider applicationConfigProvider = ApplicationConfigHelper.getProvider(getClass().getClassLoader(), ObserveWebApplicationConfigurationProvider.OBSERVE_WEB_CONFIGURATION_PROVIDER_NAME); applicationConfig.loadDefaultOptions(applicationConfigProvider.getOptions()); - if (isDevMode()) { - - // on utilise un répertoire temporaire comme basedir - File basedir; - - try { - Set<PosixFilePermission> posixFilePermissions = PosixFilePermissions.fromString("rwxr-x---"); - FileAttribute<Set<PosixFilePermission>> fileAttribute = PosixFilePermissions.asFileAttribute(posixFilePermissions); - basedir = Files.createTempDirectory("observeweb", fileAttribute).toFile(); - } catch (IOException e) { - throw new ObserveWebApplicationConfigurationInitException("could not create temporary basedir", e); - } - if (log.isInfoEnabled()) { - log.info("Dev mode detected, use temporary basedir: " + basedir); - } - applicationConfig.setOption(ObserveWebApplicationConfigurationOption.BASE_DIRECTORY.getKey(), basedir.getAbsolutePath()); - - } } public boolean isDevMode() { @@ -113,12 +95,29 @@ public class ObserveWebApplicationConfiguration { throw new ObserveWebApplicationConfigurationInitException("could not parse configuration", e); } + File applicationBaseDirectory = getBaseDirectory(); + + if (isDevMode() && !applicationBaseDirectory.exists()) { + // on utilise un répertoire temporaire comme basedir + + try { + Set<PosixFilePermission> posixFilePermissions = PosixFilePermissions.fromString("rwxr-x---"); + FileAttribute<Set<PosixFilePermission>> fileAttribute = PosixFilePermissions.asFileAttribute(posixFilePermissions); + applicationBaseDirectory = Files.createTempDirectory("observeweb", fileAttribute).toFile(); + } catch (IOException e) { + throw new ObserveWebApplicationConfigurationInitException("could not create temporary basedir", e); + } + if (log.isInfoEnabled()) { + log.info("Dev mode detected, use temporary basedir: " + applicationBaseDirectory); + } + applicationConfig.setOption(ObserveWebApplicationConfigurationOption.BASE_DIRECTORY.getKey(), applicationBaseDirectory.getAbsolutePath()); + } + if (log.isInfoEnabled()) { String message = getConfigurationDescription(); log.info(message); } - File applicationBaseDirectory = getBaseDirectory(); try { createDirectory(applicationBaseDirectory); } catch (IOException e) { diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java index 502e370..1901580 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java @@ -5,7 +5,6 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.spi.Write; import org.debux.webmotion.server.WebMotionContextable; import java.util.Collection; @@ -48,19 +47,16 @@ public class ReferentialServiceController extends ObserveServiceControllerSuppor } @Override - @Write public <R extends ReferentialDto> String save(FormDto<R> form) { return service.save(form); } @Override - @Write public <R extends ReferentialDto> void delete(Class<R> type, String id) throws DataNotFoundException { service.delete(type, id); } @Override - @Write public <R extends ReferentialDto> void delete(Class<R> type, Collection<String> ids) throws DataNotFoundException { service.delete(type, ids); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java new file mode 100644 index 0000000..4d3571c --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java @@ -0,0 +1,30 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; +import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; +import fr.ird.observe.services.spi.Write; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ActivitySeineObservedSystemServiceController extends ObserveServiceControllerSupport<ActivitySeineObservedSystemService> implements ActivitySeineObservedSystemService { + + public ActivitySeineObservedSystemServiceController() { + super(ActivitySeineObservedSystemService.class); + } + + public FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId) { + return service.loadToRead(activitySeineId); + } + + public FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId) { + return service.loadToEdit(activitySeineId); + } + + @Write + public String save(FormDto<ActivitySeineObservedSystemDto> form) { + return service.save(form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java new file mode 100644 index 0000000..51df759 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java @@ -0,0 +1,46 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; +import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.spi.Write; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ActivitySeineServiceController extends ObserveServiceControllerSupport<ActivitySeineService> implements ActivitySeineService { + + public ActivitySeineServiceController() { + super(ActivitySeineService.class); + } + + public List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { + return service.getActivitySeineStubByRoute(routeId); + } + + public FormDto<ActivitySeineDto> loadToRead(String activitySeineId) { + return service.loadToRead(activitySeineId); + } + + public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { + return service.loadToEdit(activitySeineId); + } + + public FormDto<ActivitySeineDto> preCreate(String routeId) { + return service.preCreate(routeId); + } + + @Write + public String save(String routeId, FormDto<ActivitySeineDto> form) { + return service.save(routeId, form); + } + + @Write + public void delete(String routeId, String activitySeineId) { + service.delete(routeId, activitySeineId); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java new file mode 100644 index 0000000..96bc2b1 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -0,0 +1,49 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineStubDto; +import fr.ird.observe.services.service.seine.TripSeineService; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class TripSeineServiceController extends ObserveServiceControllerSupport<TripSeineService> implements TripSeineService { + + public TripSeineServiceController() { + super(TripSeineService.class); + } + + @Override + public List<TripSeineStubDto> getTripSeineByProgram(String programId) { + return service.getTripSeineByProgram(programId); + } + + @Override + public FormDto<TripSeineDto> loadToRead(String tripSeineId) { + return service.loadToRead(tripSeineId); + } + + @Override + public FormDto<TripSeineDto> loadToEdit(String tripSeineId) { + return service.loadToEdit(tripSeineId); + } + + @Override + public FormDto<TripSeineDto> preCreate(String programId) { + return service.preCreate(programId); + } + + @Override + public String save(FormDto<TripSeineDto> form) { + return service.save(form); + } + + @Override + public void delete(String tripSeineId) { + service.delete(tripSeineId); + } +} diff --git a/observe-application-web/src/main/resources/mapping b/observe-application-web/src/main/resources/mapping index 0fdc07a..b5936f8 100644 --- a/observe-application-web/src/main/resources/mapping +++ b/observe-application-web/src/main/resources/mapping @@ -40,7 +40,9 @@ default.render=fr.ird.observe.application.web.ObserveWebMotionRender [actions] -GET /admin/configuration/{method} ConfigurationController.{method} -GET,POST /api/v1/referential/{method} ReferentialServiceController.{method} -GET,POST /api/v1/dataSource/{method} DataSourceServiceController.{method} +GET /admin/configuration/{method} ConfigurationController.{method} +GET,POST /api/v1/{service}/{method} {service}Controller.{method} +GET,POST /api/v1/{package}/{service}/{method} {package}.{service}Controller.{method} + + diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 8b74739..f799ba5 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -30,6 +30,9 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe ReferenceLocale referenceLocale = getReferenceLocale(); + // pour verifier l'existance du programme + loadEntity(ProgramDto.class, Program.class, programId); + List<TripSeine> tripSeines = getDao().findAllStubByProgramId(programId, referenceLocale); List<TripSeineStubDto> stubs = Lists.newLinkedList(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.