September 2015 - Observe-commits - mailman.cloud.codelutin.com

06/27: Introduction de constants pour les choses mises dans les headers de la requete (See #7463)
by codelutin.com scm 06 Sep '15

06 Sep '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-2 in repository observe. See http://git.codelutin.com/observe.git commit b2f2af56fb5cad8cd9b39c5e791a06720dc9b70e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 4 07:34:49 2015 +0200 Introduction de constants pour les choses mises dans les headers de la requete (See #7463) --- .../application/web/ObserveWebMotionFilter.java | 27 ++++-- ...bserveDataSourceConfigurationRestConstants.java | 23 +++++ .../services/ObserveServiceFactoryRest.java | 104 ++++++++++++++------- 3 files changed, 111 insertions(+), 43 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java index e34a42d..e823654 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java @@ -10,6 +10,7 @@ import fr.ird.observe.application.web.security.ObserveWebSecurityApplicationCont import fr.ird.observe.application.web.security.UnknownObserveWebUserException; import fr.ird.observe.application.web.security.UnknownObserveWebUserForDatabaseException; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.dto.constants.ReferentialLocale; import org.apache.commons.lang3.StringUtils; import org.debux.webmotion.server.WebMotionFilter; @@ -22,7 +23,7 @@ import java.util.Locale; /** * @author Tony Chemit - chemit(a)codelutin.com */ -public class ObserveWebMotionFilter extends WebMotionFilter { +public class ObserveWebMotionFilter extends WebMotionFilter implements ObserveDataSourceConfigurationRestConstants { public void inject(HttpContext context) throws InvalidAuthenticationTokenException, UnknownObserveWebUserException, BadObserveWebUserPasswordException, DataSourceConfigurationAlreadyRegistredException, UnknownObserveWebUserForDatabaseException, InvalidAdminKeyApiException { @@ -35,7 +36,7 @@ public class ObserveWebMotionFilter extends WebMotionFilter { Locale applicationLocale = getApplicationLocale(request); ReferentialLocale referentialLocale = getReferentialLocale(request); - String adminApiKey = getRequestHeaderOrParameterValueOrNull(request, "adminApiKey"); + String adminApiKey = getRequestHeaderOrParameterValueOrNull(request, REQUEST_ADMIN_API_KEY); if (adminApiKey != null) { String configurationAdminKey = applicationContext.getApplicationConfiguration().getAdminApiKey(); @@ -43,8 +44,8 @@ public class ObserveWebMotionFilter extends WebMotionFilter { throw new InvalidAdminKeyApiException(adminApiKey); } } - ObserveWebRequestContext requestContext = new ObserveWebRequestContext(applicationContext, securityContext, applicationLocale, referentialLocale, adminApiKey); + ObserveWebRequestContext requestContext = new ObserveWebRequestContext(applicationContext, securityContext, applicationLocale, referentialLocale, adminApiKey); ObserveWebRequestContext.setRequestContext(context, requestContext); doProcess(); @@ -52,28 +53,32 @@ public class ObserveWebMotionFilter extends WebMotionFilter { } protected ReferentialLocale getReferentialLocale(HttpServletRequest request) { + ReferentialLocale referentialLocale = null; - String referentialLocaleStr = getRequestHeaderOrParameterValueOrNull(request, "referentialLocale"); + String referentialLocaleStr = getRequestHeaderOrParameterValueOrNull(request, REQUEST_REFERENTIAL_LOCALE); if (referentialLocaleStr != null) { Locale referentialLoca = ConverterUtil.convert(Locale.class, referentialLocaleStr); referentialLocale = ReferentialLocale.valueOf(referentialLoca); } return referentialLocale; + } protected Locale getApplicationLocale(HttpServletRequest request) { + Locale applicationLocale = null; - String applicationLocaleStr = getRequestHeaderOrParameterValueOrNull(request, "applicationLocale"); + String applicationLocaleStr = getRequestHeaderOrParameterValueOrNull(request, REQUEST_APPLICATION_LOCALE); if (applicationLocaleStr != null) { applicationLocale = ConverterUtil.convert(Locale.class, applicationLocaleStr); } return applicationLocale; + } protected ObserveWebRequestSecurityContext createSecurityContext(ObserveWebApplicationContext applicationContext, HttpServletRequest request) throws InvalidAuthenticationTokenException, UnknownObserveWebUserForDatabaseException, BadObserveWebUserPasswordException, DataSourceConfigurationAlreadyRegistredException, UnknownObserveWebUserException { ObserveWebRequestSecurityContext securityContext = null; - String authenticationToken = getRequestHeaderOrParameterValueOrNull(request, "authenticationToken"); + String authenticationToken = getRequestHeaderOrParameterValueOrNull(request, REQUEST_AUTHENTICATION_TOKEN); if (StringUtils.isNotBlank(authenticationToken)) { // Recherche de la configuration à la source de donnée @@ -85,9 +90,9 @@ public class ObserveWebMotionFilter extends WebMotionFilter { // Cas où on l'utilisateur n'est pas connecté - String userLogin = getRequestParameterValueOrNull(request, "userLogin"); - String userPassword = getRequestParameterValueOrNull(request, "userPassword"); - String userDatabaseName = getRequestParameterValueOrNull(request, "userDatabaseName"); + String userLogin = getRequestParameterValueOrNull(request, REQUEST_USER_LOGIN); + String userPassword = getRequestParameterValueOrNull(request, REQUEST_USER_PASSWORD); + String userDatabaseName = getRequestParameterValueOrNull(request, REQUEST_USER_DATABASE_NAME); if (!(userLogin == null && userPassword == null)) { @@ -105,19 +110,23 @@ public class ObserveWebMotionFilter extends WebMotionFilter { } protected String getRequestHeaderOrParameterValueOrNull(HttpServletRequest request, String parameterName) { + String result = request.getHeader(parameterName); if (StringUtils.isBlank(result)) { result = getRequestParameterValueOrNull(request, parameterName); } return result; + } protected String getRequestParameterValueOrNull(HttpServletRequest request, String parameterName) { + String parameterValue = request.getParameter(parameterName); if (StringUtils.isBlank(parameterValue)) { parameterValue = null; } return parameterValue; + } } diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java new file mode 100644 index 0000000..f093639 --- /dev/null +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java @@ -0,0 +1,23 @@ +package fr.ird.observe.services.configuration; + +/** + * Created on 04/09/15. + * + * @author Tony Chemit - chemit(a)codelutin.com + */ +public interface ObserveDataSourceConfigurationRestConstants { + + String REQUEST_APPLICATION_LOCALE = "applicationLocale"; + + String REQUEST_REFERENTIAL_LOCALE = "referentialLocale"; + + String REQUEST_AUTHENTICATION_TOKEN = "authenticationToken"; + + String REQUEST_USER_LOGIN = "userLogin"; + + String REQUEST_USER_PASSWORD = "userPassword"; + + String REQUEST_USER_DATABASE_NAME = "userDatabaseName"; + + String REQUEST_ADMIN_API_KEY = "adminApiKey"; +} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java index e324069..be71661 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java @@ -8,15 +8,20 @@ import com.google.gson.Gson; import com.thoughtworks.paranamer.CachingParanamer; import com.thoughtworks.paranamer.Paranamer; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestAuthenticated; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestNotAuthenticated; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestSupport; import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; import fr.ird.observe.services.http.RequestBuilder; import fr.ird.observe.services.spi.Write; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.io.IOException; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; +import java.lang.reflect.Type; import java.util.Collection; /** @@ -24,26 +29,22 @@ import java.util.Collection; * * @author Tony Chemit - chemit(a)codelutin.com */ -public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport { +public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport implements ObserveDataSourceConfigurationRestConstants { /** Logger. */ private static final Log log = LogFactory.getLog(ObserveServiceFactoryRest.class); - public static final String AUTHENTICATION_TOKEN = "authenticationToken"; - - public static final String APPLICATION_LOCALE = "applicationLocale"; - - public static final String REFERENTIAL_LOCALE = "referentialLocale"; - protected final CachingParanamer paranamer = new CachingParanamer(); protected final Supplier<Gson> gsonSupplier = new ObserveDtoGsonSupplier(); @Override public <S extends ObserveService> boolean accept(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { + Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); Preconditions.checkNotNull(serviceType, "serviceType can't be null."); - return dataSourceConfiguration instanceof ObserveDataSourceConfigurationRest; + return dataSourceConfiguration instanceof ObserveDataSourceConfigurationRestSupport; + } @Override @@ -56,7 +57,7 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport { Preconditions.checkNotNull(observeServiceInitializer.getTemporaryDirectoryRoot(), "temporaryDirectoryRoot can't be null."); ObserveDataSourceConfiguration dataSourceConfiguration = observeServiceInitializer.getDataSourceConfiguration(); Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); - Preconditions.checkArgument(dataSourceConfiguration instanceof ObserveDataSourceConfigurationRest, "dataSourceConfiguration must be of type ObserveRestClientDataSourceConfiguration"); + Preconditions.checkArgument(dataSourceConfiguration instanceof ObserveDataSourceConfigurationRestSupport, "dataSourceConfiguration must be of type ObserveDataSourceConfigurationRestSupport"); S service = newRemoteProxyServiceInstance(serviceType, observeServiceInitializer); return service; @@ -78,7 +79,7 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport { protected static class RemoteInvocationHandler<E extends ObserveService> implements InvocationHandler { - protected final String authenticationToken; + protected final ObserveDataSourceConfigurationRestSupport dataSourceConfiguration; protected final Supplier<Gson> gsonSupplier; @@ -96,8 +97,7 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport { this.paranamer = paranamer; this.serviceClass = serviceClass; - ObserveDataSourceConfigurationRest dataSourceConfiguration = (ObserveDataSourceConfigurationRest) observeServiceInitializer.getDataSourceConfiguration(); - this.authenticationToken = dataSourceConfiguration.getAuthenticationToken(); + this.dataSourceConfiguration = (ObserveDataSourceConfigurationRestSupport) observeServiceInitializer.getDataSourceConfiguration(); this.serviceUrl = dataSourceConfiguration.getServerUrl() + "/" + serviceClass.getSimpleName(); this.gsonSupplier = gsonSupplier; this.applicationLocale = observeServiceInitializer.getApplicationLocale().toString(); @@ -129,7 +129,42 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport { if (log.isDebugEnabled()) { log.debug("Invoke remote service on endpoint: " + url); } + RequestBuilder requestBuilder = new RequestBuilder(url, gsonSupplier); + addParameters(requestBuilder, method, args); + addHeaders(requestBuilder); + Object result = getResult(method, requestBuilder); + + return result; + + } + + protected Object getResult(Method method, RequestBuilder requestBuilder) throws IOException { + + Object result; + try { + + boolean writeData = method.isAnnotationPresent(Write.class); + + Type genericReturnType = method.getGenericReturnType(); + if (writeData) { + result = requestBuilder.postAndGetJsonAndCloseConnection(genericReturnType); + } else { + result = requestBuilder.getJsonAndCloseConnection(genericReturnType); + } + + } catch (RuntimeException re) { + if (log.isWarnEnabled()) { + log.warn("An error occurred during remote service call", re); + } + throw re; + } + return result; + + } + + protected void addParameters(RequestBuilder requestBuilder, Method method, Object... args) throws IOException { + String[] strings = paranamer.lookupParameterNames(method); int index = 0; for (String name : strings) { @@ -145,32 +180,33 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport { } index++; } - if (!Strings.isNullOrEmpty(authenticationToken)) { - requestBuilder.addHeader(AUTHENTICATION_TOKEN, authenticationToken); + + } + + protected void addHeaders(RequestBuilder requestBuilder) { + + if (dataSourceConfiguration instanceof ObserveDataSourceConfigurationRestNotAuthenticated) { + + ObserveDataSourceConfigurationRestNotAuthenticated sourceConfiguration = (ObserveDataSourceConfigurationRestNotAuthenticated) dataSourceConfiguration; + requestBuilder.addHeader(REQUEST_USER_LOGIN, sourceConfiguration.getLogin()); + requestBuilder.addHeader(REQUEST_USER_PASSWORD, new String(sourceConfiguration.getPassword())); + if (sourceConfiguration.withDatabaseName()) { + + requestBuilder.addHeader(REQUEST_USER_DATABASE_NAME, sourceConfiguration.getOptionalDatabaseName().get()); + } + + } else if (dataSourceConfiguration instanceof ObserveDataSourceConfigurationRestAuthenticated) { + + ObserveDataSourceConfigurationRestAuthenticated sourceConfiguration = (ObserveDataSourceConfigurationRestAuthenticated) dataSourceConfiguration; + requestBuilder.addHeader(REQUEST_AUTHENTICATION_TOKEN, sourceConfiguration.getAuthenticationToken()); + } if (!Strings.isNullOrEmpty(applicationLocale)) { - requestBuilder.addHeader(APPLICATION_LOCALE, applicationLocale); + requestBuilder.addHeader(REQUEST_APPLICATION_LOCALE, applicationLocale); } if (!Strings.isNullOrEmpty(referentialLocale)) { - requestBuilder.addHeader(REFERENTIAL_LOCALE, referentialLocale); - } - Object result; - try { - - boolean writeData = method.isAnnotationPresent(Write.class); - - if (writeData) { - result = requestBuilder.postAndGetJsonAndCloseConnection(method.getGenericReturnType()); - } else { - result = requestBuilder.getJsonAndCloseConnection(method.getGenericReturnType()); - } - } catch (RuntimeException re) { - if (log.isWarnEnabled()) { - log.warn("An error occurred during remote service call", re); - } - throw re; + requestBuilder.addHeader(REQUEST_REFERENTIAL_LOCALE, referentialLocale); } - return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

05/27: Revue un peu du paquetage http (See #7463)
by codelutin.com scm 06 Sep '15

06 Sep '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-2 in repository observe. See http://git.codelutin.com/observe.git commit e173179981e6750761ea887b83c78fcfdd2d7881 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 4 07:22:36 2015 +0200 Revue un peu du paquetage http (See #7463) --- .../ird/observe/services/http/RequestBuilder.java | 8 ++-- .../ird/observe/services/http/RequestResult.java | 52 ++++++---------------- 2 files changed, 17 insertions(+), 43 deletions(-) diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java index 8eb1e0b..1a67ae0 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java @@ -2,12 +2,12 @@ package fr.ird.observe.services.http; import com.google.common.base.Charsets; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; +import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -58,7 +58,7 @@ public class RequestBuilder { @Override public Gson get() { - return new Gson(); + return new ObserveDtoGsonSupplier().get(); } }; @@ -364,7 +364,7 @@ public class RequestBuilder { public <T> T postAndGetJsonAndCloseConnection(Type type) throws IOException { RequestResult postResult = postAndCloseConnection(); if (postResult.getStatusCode() != 200 && log.isWarnEnabled()) { - log.warn(String.format("Unexpected status code: %d%nResponse is: %s", postResult.getStatusCode(), postResult)); + log.warn(String.format("Unexpected status code: %d\nResponse is: %s", postResult.getStatusCode(), postResult)); } T result = convertJson(postResult.getResponse(), type, getGson()); return result; @@ -489,7 +489,7 @@ public class RequestBuilder { @Override public String toString() { - Objects.ToStringHelper helper = Objects.toStringHelper(this).add("url", baseUrl); + MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this).add("url", baseUrl); if (header != null) { for (Map.Entry<String, String> entry : header.entrySet()) { String key = String.format("Header [%s]", entry.getKey()); diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java index b83da5b..47d7ed2 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java @@ -13,24 +13,26 @@ import java.io.StringWriter; */ public class RequestResult { - protected int statusCode; - protected Header[] headers; - protected String responseAsString; + protected final int statusCode; + + protected final Header[] headers; + + protected final String responseAsString; public RequestResult(HttpResponse response) throws IOException { this.statusCode = response.getStatusLine().getStatusCode(); this.headers = response.getAllHeaders(); response.getEntity(); - StringWriter writer = new StringWriter(); - InputStream inputStream = response.getEntity().getContent(); - try { - IOUtils.copy(inputStream, writer, "UTF-8"); - inputStream.close(); - } finally { - IOUtils.closeQuietly(inputStream); + try (InputStream inputStream = response.getEntity().getContent()) { + + try (StringWriter writer = new StringWriter()) { + + IOUtils.copy(inputStream, writer, "UTF-8"); + + responseAsString = writer.toString(); + } } - responseAsString = writer.toString(); } public int getStatusCode() { @@ -64,34 +66,6 @@ public class RequestResult { throw new IllegalArgumentException(key + " key is not found in header"); } -// public String getResponseAsString(String fieldName) throws IOException { -// if (responseAsString == null) { -// return null; -// } -// JsonNode jsonNodes = new Gson().(responseAsString).get(fieldName); -// if (jsonNodes == null) { -// return null; -// } -// return jsonNodes.asText(); -// } -// -// public Boolean getResponseAsBoolean(String fieldName) throws IOException { -// JsonNode jsonNodes = getResponseAsJsonNode(fieldName); -// if (jsonNodes == null) return null; -// return jsonNodes.asBoolean(); -// } -// -// public JsonNode getResponseAsJsonNode(String fieldName) throws IOException { -// if (responseAsString == null) { -// return null; -// } -// JsonNode jsonNodes = new ObjectMapper().readTree(responseAsString).get(fieldName); -// if (jsonNodes == null) { -// return null; -// } -// return jsonNodes; -// } - public String getResponse() throws IOException { return responseAsString; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

04/27: Ajout de configuration de sources de données différentes si on est ou pas authentifié au serveur (See #7463)
by codelutin.com scm 06 Sep '15

06 Sep '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-2 in repository observe. See http://git.codelutin.com/observe.git commit 19a15174deb3cf7e5a933137cdc2c97f089ac99f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 4 07:21:16 2015 +0200 Ajout de configuration de sources de données différentes si on est ou pas authentifié au serveur (See #7463) --- ...eDataSourceConfigurationRestAuthenticated.java} | 38 +++--------- ...ataSourceConfigurationRestNotAuthenticated.java | 69 ++++++++++++++++++++++ ...ObserveDataSourceConfigurationRestSupport.java} | 16 +---- .../ObserveDataSourceConfigurationMainFactory.java | 26 ++++++-- 4 files changed, 100 insertions(+), 49 deletions(-) diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestAuthenticated.java similarity index 52% copy from observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java copy to observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestAuthenticated.java index c9625bd..3d0d14d 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestAuthenticated.java @@ -1,48 +1,21 @@ package fr.ird.observe.services.configuration; -import java.net.URL; - /** + * La configuration d'une source de données connectée. + * * Created on 19/08/15. * * @author Tony Chemit - chemit(a)codelutin.com */ -public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConfiguration { +public class ObserveDataSourceConfigurationRestAuthenticated extends ObserveDataSourceConfigurationRestSupport { private static final long serialVersionUID = 1L; /** - * Le libellé de la data source. - */ - protected String label; - - /** - * L'url du serveur à utiliser. - */ - protected URL serverUrl; - - /** * Le jeton d'authentification. */ protected String authenticationToken; - @Override - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public URL getServerUrl() { - return serverUrl; - } - - public void setServerUrl(URL serverUrl) { - this.serverUrl = serverUrl; - } - public String getAuthenticationToken() { return authenticationToken; } @@ -52,6 +25,11 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf } @Override + public boolean isAuthenticated() { + return true; + } + + @Override public boolean datasourceExists() { //TODO return false; diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestNotAuthenticated.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestNotAuthenticated.java new file mode 100644 index 0000000..489773f --- /dev/null +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestNotAuthenticated.java @@ -0,0 +1,69 @@ +package fr.ird.observe.services.configuration; + +import com.google.common.base.Optional; + +/** + * Configuration d'une source de données Rest non connectée. + * + * Created on 19/08/15. + * + * @author Tony Chemit - chemit(a)codelutin.com + */ +public class ObserveDataSourceConfigurationRestNotAuthenticated extends ObserveDataSourceConfigurationRestSupport { + + private static final long serialVersionUID = 1L; + + /** + * Le login de l'utilisateur. + */ + protected String login; + + /** + * Le mot de passe de l'utilisateur. + */ + protected char[] password; + + /** + * Un nom optionel de base à utiliser, si rien n'est préciser, on utilisera la base par défaut du serveur. + */ + protected Optional<String> optionalDatabaseName; + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public char[] getPassword() { + return password; + } + + public void setPassword(char... password) { + this.password = password; + } + + public boolean withDatabaseName() { + return optionalDatabaseName.isPresent(); + } + public Optional<String> getOptionalDatabaseName() { + return optionalDatabaseName; + } + + public void setOptionalDatabaseName(Optional<String> optionalDatabaseName) { + this.optionalDatabaseName = optionalDatabaseName; + } + + @Override + public boolean isAuthenticated() { + return false; + } + + @Override + public boolean datasourceExists() { + //TODO + return false; + } + +} diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestSupport.java similarity index 65% rename from observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java rename to observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestSupport.java index c9625bd..199b821 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestSupport.java @@ -7,7 +7,7 @@ import java.net.URL; * * @author Tony Chemit - chemit(a)codelutin.com */ -public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConfiguration { +public abstract class ObserveDataSourceConfigurationRestSupport implements ObserveDataSourceConfiguration { private static final long serialVersionUID = 1L; @@ -21,11 +21,7 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf */ protected URL serverUrl; - /** - * Le jeton d'authentification. - */ - protected String authenticationToken; - + public abstract boolean isAuthenticated(); @Override public String getLabel() { return label; @@ -43,14 +39,6 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf this.serverUrl = serverUrl; } - public String getAuthenticationToken() { - return authenticationToken; - } - - public void setAuthenticationToken(String authenticationToken) { - this.authenticationToken = authenticationToken; - } - @Override public boolean datasourceExists() { //TODO diff --git a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java index e9e18cb..d7e7453 100644 --- a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java +++ b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java @@ -1,7 +1,8 @@ package fr.ird.observe.services; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestAuthenticated; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestNotAuthenticated; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; @@ -57,11 +58,26 @@ public class ObserveDataSourceConfigurationMainFactory { } - public ObserveDataSourceConfiguration createObserveDataSourceConfigurationRest(String label, - URL serverUrl, - String authenticationToken) { + public ObserveDataSourceConfiguration createObserveDataSourceConfigurationRestNotAuthenticated(String label, + URL serverUrl, + String login, + char... password) { - ObserveDataSourceConfigurationRest result = new ObserveDataSourceConfigurationRest(); + ObserveDataSourceConfigurationRestNotAuthenticated result = new ObserveDataSourceConfigurationRestNotAuthenticated(); + result.setLabel(label); + result.setServerUrl(serverUrl); + result.setLogin(login); + result.setPassword(password); + + return result; + + } + + public ObserveDataSourceConfiguration createObserveDataSourceConfigurationRestAuthenticated(String label, + URL serverUrl, + String authenticationToken) { + + ObserveDataSourceConfigurationRestAuthenticated result = new ObserveDataSourceConfigurationRestAuthenticated(); result.setLabel(label); result.setServerUrl(serverUrl); result.setAuthenticationToken(authenticationToken); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

03/27: controleur pour seine pour le serveur web (refs #7463)
by codelutin.com scm 06 Sep '15

06 Sep '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-2 in repository observe. See http://git.codelutin.com/observe.git commit f79fabf27539294de141d7c66ff9178206f4a0e7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 3 16:40:30 2015 +0200 controleur pour seine pour le serveur web (refs #7463) --- ...tivitySeineObservedSystemServiceController.java | 5 ++- .../v1/seine/ActivitySeineServiceController.java | 9 ++-- .../v1/seine/FloatingObjectServiceController.java | 49 ++++++++++++++++++++++ .../GearUseFeaturesSeineServiceController.java | 48 +++++++++++++++++++++ .../v1/seine/NonTargetCatchServiceController.java | 31 ++++++++++++++ .../v1/seine/NonTargetSampleServiceController.java | 36 ++++++++++++++++ .../ObjectObservedSpeciesServiceController.java | 31 ++++++++++++++ .../ObjectSchoolEstimateServiceController.java | 31 ++++++++++++++ .../v1/seine/RouteServiceController.java | 49 ++++++++++++++++++++++ .../v1/seine/SchoolEstimateServiceController.java | 31 ++++++++++++++ .../v1/seine/SetSeineServiceController.java | 41 ++++++++++++++++++ .../v1/seine/TargetCatchServiceController.java | 31 ++++++++++++++ .../v1/seine/TargetSampleServiceController.java | 36 ++++++++++++++++ ...TransmittingBuoyOperationServiceController.java | 31 ++++++++++++++ .../service/seine/NonTargetSampleService.java | 3 +- 15 files changed, 456 insertions(+), 6 deletions(-) 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 index 4d3571c..ef4e749 100644 --- 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 @@ -4,7 +4,6 @@ import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupp 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(a)codelutin.com @@ -15,15 +14,17 @@ public class ActivitySeineObservedSystemServiceController extends ObserveService super(ActivitySeineObservedSystemService.class); } + @Override public FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId) { return service.loadToRead(activitySeineId); } + @Override public FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId) { return service.loadToEdit(activitySeineId); } - @Write + @Override 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 index 51df759..d8090b6 100644 --- 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 @@ -5,7 +5,6 @@ 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; @@ -18,28 +17,32 @@ public class ActivitySeineServiceController extends ObserveServiceControllerSupp super(ActivitySeineService.class); } + @Override public List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { return service.getActivitySeineStubByRoute(routeId); } + @Override public FormDto<ActivitySeineDto> loadToRead(String activitySeineId) { return service.loadToRead(activitySeineId); } + @Override public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { return service.loadToEdit(activitySeineId); } + @Override public FormDto<ActivitySeineDto> preCreate(String routeId) { return service.preCreate(routeId); } - @Write + @Override public String save(String routeId, FormDto<ActivitySeineDto> form) { return service.save(routeId, form); } - @Write + @Override 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/FloatingObjectServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java new file mode 100644 index 0000000..0a6c5ab --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.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.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.FloatingObjectStubDto; +import fr.ird.observe.services.service.seine.FloatingObjectService; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class FloatingObjectServiceController extends ObserveServiceControllerSupport<FloatingObjectService> implements FloatingObjectService { + + public FloatingObjectServiceController() { + super(FloatingObjectService.class); + } + + @Override + public List<FloatingObjectStubDto> getFloatingObjectStubByActivitySeine(String activitySeineId) { + return service.getFloatingObjectStubByActivitySeine(activitySeineId); + } + + @Override + public FormDto<FloatingObjectDto> loadToRead(String floatingObjectId) { + return service.loadToRead(floatingObjectId); + } + + @Override + public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { + return service.loadToEdit(floatingObjectId); + } + + @Override + public FormDto<FloatingObjectDto> preCreate(String activitySeineId) { + return service.preCreate(activitySeineId); + } + + @Override + public String save(String activitySeineId, FormDto<FloatingObjectDto> form) { + return service.save(activitySeineId, form); + } + + @Override + public void delete(String activitySeineId, String floatingObjectId) { + service.delete(activitySeineId, floatingObjectId); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/GearUseFeaturesSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/GearUseFeaturesSeineServiceController.java new file mode 100644 index 0000000..8e554b8 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/GearUseFeaturesSeineServiceController.java @@ -0,0 +1,48 @@ +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.GearUseFeaturesSeineDto; +import fr.ird.observe.services.service.seine.GearUseFeaturesSeineService; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class GearUseFeaturesSeineServiceController extends ObserveServiceControllerSupport<GearUseFeaturesSeineService> implements GearUseFeaturesSeineService { + + public GearUseFeaturesSeineServiceController() { + super(GearUseFeaturesSeineService.class); + } + + @Override + public List<GearUseFeaturesSeineDto> getGearUseFeaturesSeineByTripSeine(String tripSeineId) { + return service.getGearUseFeaturesSeineByTripSeine(tripSeineId); + } + + @Override + public FormDto<GearUseFeaturesSeineDto> loadToRead(String gearUseFeaturesSeineId) { + return service.loadToRead(gearUseFeaturesSeineId); + } + + @Override + public FormDto<GearUseFeaturesSeineDto> loadToEdit(String gearUseFeaturesSeineId) { + return service.loadToEdit(gearUseFeaturesSeineId); + } + + @Override + public FormDto<GearUseFeaturesSeineDto> preCreate() { + return service.preCreate(); + } + + @Override + public String save(String tripSeineId, FormDto<GearUseFeaturesSeineDto> form) { + return service.save(tripSeineId, form); + } + + @Override + public void delete(String tripSeineId, String gearUseFeaturesSeineId) { + service.delete(tripSeineId, gearUseFeaturesSeineId); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java new file mode 100644 index 0000000..8bc43a5 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java @@ -0,0 +1,31 @@ +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.SetSeineNonTargetCatchDto; +import fr.ird.observe.services.service.seine.NonTargetCatchService; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class NonTargetCatchServiceController extends ObserveServiceControllerSupport<NonTargetCatchService> implements NonTargetCatchService { + + public NonTargetCatchServiceController() { + super(NonTargetCatchService.class); + } + + @Override + public FormDto<SetSeineNonTargetCatchDto> loadToRead(String setSeineId) { + return service.loadToRead(setSeineId); + } + + @Override + public FormDto<SetSeineNonTargetCatchDto> loadToEdit(String setSeineId) { + return service.loadToEdit(setSeineId); + } + + @Override + public String save(FormDto<SetSeineNonTargetCatchDto> form) { + return service.save(form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java new file mode 100644 index 0000000..739ffe9 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java @@ -0,0 +1,36 @@ +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.NonTargetSampleDto; +import fr.ird.observe.services.service.seine.NonTargetSampleService; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class NonTargetSampleServiceController extends ObserveServiceControllerSupport<NonTargetSampleService> implements NonTargetSampleService { + + public NonTargetSampleServiceController() { + super(NonTargetSampleService.class); + } + + @Override + public boolean canUseNonTargetSample(String setSeineId) { + return service.canUseNonTargetSample(setSeineId); + } + + @Override + public FormDto<NonTargetSampleDto> loadToRead(String setSeineId) { + return service.loadToRead(setSeineId); + } + + @Override + public FormDto<NonTargetSampleDto> loadToEdit(String setSeineId) { + return service.loadToEdit(setSeineId); + } + + @Override + public String save(String setSeineId, FormDto<NonTargetSampleDto> form) { + return service.save(setSeineId, form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java new file mode 100644 index 0000000..ad80bd6 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java @@ -0,0 +1,31 @@ +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.FloatingObjectObservedSpeciesDto; +import fr.ird.observe.services.service.seine.ObjectObservedSpeciesService; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class ObjectObservedSpeciesServiceController extends ObserveServiceControllerSupport<ObjectObservedSpeciesService> implements ObjectObservedSpeciesService { + + public ObjectObservedSpeciesServiceController() { + super(ObjectObservedSpeciesService.class); + } + + @Override + public FormDto<FloatingObjectObservedSpeciesDto> loadToRead(String floatingObjectId) { + return service.loadToRead(floatingObjectId); + } + + @Override + public FormDto<FloatingObjectObservedSpeciesDto> loadToEdit(String floatingObjectId) { + return service.loadToEdit(floatingObjectId); + } + + @Override + public String save(FormDto<FloatingObjectObservedSpeciesDto> form) { + return service.save(form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java new file mode 100644 index 0000000..c72d496 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java @@ -0,0 +1,31 @@ +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.FloatingObjectSchoolEstimateDto; +import fr.ird.observe.services.service.seine.ObjectSchoolEstimateService; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class ObjectSchoolEstimateServiceController extends ObserveServiceControllerSupport<ObjectSchoolEstimateService> implements ObjectSchoolEstimateService { + + public ObjectSchoolEstimateServiceController() { + super(ObjectSchoolEstimateService.class); + } + + @Override + public FormDto<FloatingObjectSchoolEstimateDto> loadToRead(String floatingObjectId) { + return service.loadToRead(floatingObjectId); + } + + @Override + public FormDto<FloatingObjectSchoolEstimateDto> loadToEdit(String floatingObjectId) { + return service.loadToEdit(floatingObjectId); + } + + @Override + public String save(FormDto<FloatingObjectSchoolEstimateDto> form) { + return service.save(form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java new file mode 100644 index 0000000..4e1ac4b --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.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.RouteDto; +import fr.ird.observe.services.dto.seine.RouteStubDto; +import fr.ird.observe.services.service.seine.RouteService; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class RouteServiceController extends ObserveServiceControllerSupport<RouteService> implements RouteService { + + public RouteServiceController() { + super(RouteService.class); + } + + @Override + public List<RouteStubDto> getRouteByTripSeine(String tripSeineId) { + return service.getRouteByTripSeine(tripSeineId); + } + + @Override + public FormDto<RouteDto> loadToRead(String routeId) { + return service.loadToRead(routeId); + } + + @Override + public FormDto<RouteDto> loadToEdit(String routeId) { + return service.loadToEdit(routeId); + } + + @Override + public FormDto<RouteDto> preCreate(String tripSeineId) { + return service.preCreate(tripSeineId); + } + + @Override + public String save(String tripSeineId, FormDto<RouteDto> form) { + return service.save(tripSeineId, form); + } + + @Override + public void delete(String tripSeineId, String routeId) { + service.delete(tripSeineId, routeId); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java new file mode 100644 index 0000000..ba2485f --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java @@ -0,0 +1,31 @@ +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.SetSeineSchoolEstimateDto; +import fr.ird.observe.services.service.seine.SchoolEstimateService; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class SchoolEstimateServiceController extends ObserveServiceControllerSupport<SchoolEstimateService> implements SchoolEstimateService { + + public SchoolEstimateServiceController() { + super(SchoolEstimateService.class); + } + + @Override + public FormDto<SetSeineSchoolEstimateDto> loadToRead(String setSeineId) { + return service.loadToRead(setSeineId); + } + + @Override + public FormDto<SetSeineSchoolEstimateDto> loadToEdit(String setSeineId) { + return service.loadToEdit(setSeineId); + } + + @Override + public String save(FormDto<SetSeineSchoolEstimateDto> form) { + return service.save(form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java new file mode 100644 index 0000000..65250e0 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java @@ -0,0 +1,41 @@ +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.SetSeineDto; +import fr.ird.observe.services.service.seine.SetSeineService; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class SetSeineServiceController extends ObserveServiceControllerSupport<SetSeineService> implements SetSeineService { + + public SetSeineServiceController() { + super(SetSeineService.class); + } + + @Override + public FormDto<SetSeineDto> loadToRead(String setSeineId) { + return service.loadToRead(setSeineId); + } + + @Override + public FormDto<SetSeineDto> loadToEdit(String setSeineId) { + return service.loadToEdit(setSeineId); + } + + @Override + public FormDto<SetSeineDto> preCreate(String routeId, String activitySeineId) { + return service.preCreate(routeId, activitySeineId); + } + + @Override + public String save(String activitySeineId, FormDto<SetSeineDto> form) { + return service.save(activitySeineId, form); + } + + @Override + public void delete(String activitySeineId, String setSeineId) { + service.delete(activitySeineId, setSeineId); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java new file mode 100644 index 0000000..529ee75 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java @@ -0,0 +1,31 @@ +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.SetSeineTargetCatchDto; +import fr.ird.observe.services.service.seine.TargetCatchService; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class TargetCatchServiceController extends ObserveServiceControllerSupport<TargetCatchService> implements TargetCatchService { + + public TargetCatchServiceController() { + super(TargetCatchService.class); + } + + @Override + public FormDto<SetSeineTargetCatchDto> loadToRead(String setSeineId) { + return service.loadToRead(setSeineId); + } + + @Override + public FormDto<SetSeineTargetCatchDto> loadToEdit(String setSeineId) { + return service.loadToEdit(setSeineId); + } + + @Override + public String save(FormDto<SetSeineTargetCatchDto> form) { + return service.save(form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java new file mode 100644 index 0000000..1495e2b --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java @@ -0,0 +1,36 @@ +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.TargetSampleDto; +import fr.ird.observe.services.service.seine.TargetSampleService; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class TargetSampleServiceController extends ObserveServiceControllerSupport<TargetSampleService> implements TargetSampleService { + + public TargetSampleServiceController() { + super(TargetSampleService.class); + } + + @Override + public boolean canUseTargetSample(String setSeineId, boolean discarded) { + return service.canUseTargetSample(setSeineId, discarded); + } + + @Override + public FormDto<TargetSampleDto> loadToRead(String setSeineId, boolean discarded) { + return service.loadToRead(setSeineId, discarded); + } + + @Override + public FormDto<TargetSampleDto> loadToEdit(String setSeineId, boolean discarded) { + return service.loadToEdit(setSeineId, discarded); + } + + @Override + public String save(String setSeineId, FormDto<TargetSampleDto> form) { + return service.save(setSeineId, form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java new file mode 100644 index 0000000..ae48852 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java @@ -0,0 +1,31 @@ +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.FloatingObjectTransmittingBuoyDto; +import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class TransmittingBuoyOperationServiceController extends ObserveServiceControllerSupport<TransmittingBuoyOperationService> implements TransmittingBuoyOperationService { + + public TransmittingBuoyOperationServiceController() { + super(TransmittingBuoyOperationService.class); + } + + @Override + public FormDto<FloatingObjectTransmittingBuoyDto> loadToRead(String floatingObjectId) { + return service.loadToRead(floatingObjectId); + } + + @Override + public FormDto<FloatingObjectTransmittingBuoyDto> loadToEdit(String floatingObjectId) { + return service.loadToEdit(floatingObjectId); + } + + @Override + public String save(FormDto<FloatingObjectTransmittingBuoyDto> form) { + return service.save(form); + } +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java index a4a7299..664e759 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java @@ -1,5 +1,6 @@ package fr.ird.observe.services.service.seine; +import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.services.spi.Write; @@ -7,7 +8,7 @@ import fr.ird.observe.services.spi.Write; /** * @author Sylvain Bavencoff - bavencoff(a)codelutin.com */ -public interface NonTargetSampleService { +public interface NonTargetSampleService extends ObserveService { boolean canUseNonTargetSample(String setSeineId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

02/27: premier controleur pour le serveur web (refs #7463)
by codelutin.com scm 06 Sep '15

06 Sep '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-2 in repository observe. See http://git.codelutin.com/observe.git commit b474bf6354ef363bf16aaa9c7d342f7be7964c89 Author: Sylvain Bavencoff <bavencoff(a)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(a)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(a)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(a)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(a)list.forge.codelutin.com>.

1 0

01/27: Ajout de la configuration pour deployer l'application web sur demo
by codelutin.com scm 06 Sep '15

06 Sep '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-2 in repository observe. See http://git.codelutin.com/observe.git commit 057edb4e05396ce52f946171907a9bf4216ffa48 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 23:04:29 2015 +0200 Ajout de la configuration pour deployer l'application web sur demo --- observe-application-web/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/observe-application-web/pom.xml b/observe-application-web/pom.xml index 2e1e1e8..5786564 100644 --- a/observe-application-web/pom.xml +++ b/observe-application-web/pom.xml @@ -21,6 +21,9 @@  <defaultWebContextPath>observeweb</defaultWebContextPath> +  + <deployFiles>${project.build.directory}/${project.artifactId}-${project.version}.war</deployFiles> + </properties> <dependencies> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7463 deleted (was e6cc331)
by codelutin.com scm 06 Sep '15

06 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git was e6cc331 Ajout de nouvelles méthodes d'administration pour voir (et supprimer) les jetons d'authenfication This change permanently discards the following revisions: discards e6cc331 Ajout de nouvelles méthodes d'administration pour voir (et supprimer) les jetons d'authenfication discards b7310f2 On teste si on peut lancer les tests sur le serveur web discards 5b122a2 Renommage méthode de vérification de configuration de source de données discards 9e590f1 Ajout d'un service spécifique à l'API Rest pour tester si le serveur ping bien + une exception si une requète ne peut être jouée discards 417aef2 Amélioration des tests sur le service DataSourceService pour bien attendre que la base est fermé discards a24fea5 Ajout traductions discards f7d8d84 Ajout de la méthode DataSourceService.canConnect discards cb211a9 Permettre de connecter plusieurs utilisateurs à la même source de données (un must pour une application web... discards e8d1850 Utilisation d'un main handler et faire fonctionner la connexion à une source de données discards ae4d46b Revue du client reste discards 3fca647 Ajout d'un supplier de builder de Gson par default discards b9bf71e Ajout du jeton d'authentification sur le DataSourceConnection discards aa39edd Revue de la manière de se connecter (introduction de ObserveDataSourceConnection) discards e042916 test + correction de la communication entre le client REST et le serveur Web (refs #7463) discards c884bd5 Changement de l'API de DataSourceService pour quelle renvoie le résultat de la connexion à la source de données discards 652eaa9 controleur pour les actions pour le serveur web (refs #7463) discards 15ea9ab controleur pour la palangre pour le serveur web (refs #7463) discards 60fabd0 Introduction d'un objet qui contient une connexion à une source de données (avec les droits utilisateurs) discards 05be1c0 Ajout de la configuration de sécurité sur les méthodes de service + renommage d'une classe dans l'opération de validation discards dd37e61 Début de tests sur le client rest (See #7563) discards 42de064 Introduction de constants pour les choses mises dans les headers de la requete (See #7463) discards 7fcd439 Revue un peu du paquetage http (See #7463) discards 24036b0 Ajout de configuration de sources de données différentes si on est ou pas authentifié au serveur (See #7463) discards c579af1 controleur pour seine pour le serveur web (refs #7463) discards 6cf362b premier controleur pour le serveur web (refs #7463) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7463 updated (f7d8d84 -> e6cc331)
by codelutin.com scm 06 Sep '15

06 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git from f7d8d84 Ajout de la méthode DataSourceService.canConnect new a24fea5 Ajout traductions new 417aef2 Amélioration des tests sur le service DataSourceService pour bien attendre que la base est fermé new 9e590f1 Ajout d'un service spécifique à l'API Rest pour tester si le serveur ping bien + une exception si une requète ne peut être jouée new 5b122a2 Renommage méthode de vérification de configuration de source de données new b7310f2 On teste si on peut lancer les tests sur le serveur web new e6cc331 Ajout de nouvelles méthodes d'administration pour voir (et supprimer) les jetons d'authenfication The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e6cc331e43d31421961a18173270cab789bf1b1c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 23:02:53 2015 +0200 Ajout de nouvelles méthodes d'administration pour voir (et supprimer) les jetons d'authenfication commit b7310f2b2cdd2b5bdd78e7633075c682823d373e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 23:02:10 2015 +0200 On teste si on peut lancer les tests sur le serveur web commit 5b122a27a5727d1475e91616b43abeefe632b621 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 23:01:44 2015 +0200 Renommage méthode de vérification de configuration de source de données commit 9e590f1e45481559c9bbb32cd902ff91d97dd6d0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 23:01:03 2015 +0200 Ajout d'un service spécifique à l'API Rest pour tester si le serveur ping bien + une exception si une requète ne peut être jouée commit 417aef2f1cd8d2cc2c52012df89a83692c4f304b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 22:21:33 2015 +0200 Amélioration des tests sur le service DataSourceService pour bien attendre que la base est fermé commit a24fea5576246ea40048cfdc4036a39e8f997631 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 22:18:29 2015 +0200 Ajout traductions Summary of changes: .../web/controller/v1/ConfigurationController.java | 39 +++++++++++++++++ .../controller/v1/DataSourceServiceController.java | 4 +- .../web/controller/v1/PingServiceController.java | 17 ++++++++ .../ObserveWebSecurityApplicationContext.java | 4 ++ ...ObserveWebSecurityAuthenticationTokenCache.java | 4 ++ .../services/service/DataSourceService.java | 2 +- .../ird/observe/services/service/PingService.java | 16 +++++++ .../ObserveDataSourceConfigurationTopiaH2.java | 15 ++++--- .../ObserveServiceRestNotAvailableException.java | 26 +++++++++++ .../services/http/ObserveResponseBuilder.java | 23 +++++++--- .../ird/observe/services/TestMethodResource.java | 27 ++++++++++++ .../service/DataSourceServiceRestTest.java | 15 ------- .../service/seine/TripSeineServiceTest.java | 2 - .../services/service/DataSourceServiceTopia.java | 18 +++----- .../i18n/observe-services-topia_en_GB.properties | 4 ++ .../i18n/observe-services-topia_es_ES.properties | 4 ++ .../i18n/observe-services-topia_fr_FR.properties | 4 ++ .../service/DataSourceServiceTopiaTest.java | 51 ++++++++++++++-------- 18 files changed, 215 insertions(+), 60 deletions(-) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/PingService.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 6

branch feature/7463 updated (e042916 -> f7d8d84)
by codelutin.com scm 06 Sep '15

06 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git from e042916 test + correction de la communication entre le client REST et le serveur Web (refs #7463) new aa39edd Revue de la manière de se connecter (introduction de ObserveDataSourceConnection) new b9bf71e Ajout du jeton d'authentification sur le DataSourceConnection new 3fca647 Ajout d'un supplier de builder de Gson par default new ae4d46b Revue du client reste new e8d1850 Utilisation d'un main handler et faire fonctionner la connexion à une source de données new cb211a9 Permettre de connecter plusieurs utilisateurs à la même source de données (un must pour une application web... new f7d8d84 Ajout de la méthode DataSourceService.canConnect The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f7d8d849f0cfd49fea56a4e1854430b5900d8f6d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 12:27:05 2015 +0200 Ajout de la méthode DataSourceService.canConnect commit cb211a96b80249ee743c9cc1eee741f22096e88f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 11:21:44 2015 +0200 Permettre de connecter plusieurs utilisateurs à la même source de données (un must pour une application web... commit e8d18506f0a0bea9029748d7cc620844f0022500 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 11:09:03 2015 +0200 Utilisation d'un main handler et faire fonctionner la connexion à une source de données commit ae4d46b7247434c8131586153e27e334191ff3ee Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 11:07:42 2015 +0200 Revue du client reste commit 3fca6475fecc55e6a3a7177f2fd80970520dc7c4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 11:07:04 2015 +0200 Ajout d'un supplier de builder de Gson par default commit b9bf71e4e49538918a1305f81e54bdf7d93f70cc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 6 11:06:27 2015 +0200 Ajout du jeton d'authentification sur le DataSourceConnection commit aa39eddd9ec5404d3b78512e8b22fc56d842daf3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Sep 5 09:00:21 2015 +0200 Revue de la manière de se connecter (introduction de ObserveDataSourceConnection) Summary of changes: .../ObserveDataSourceConfigurationConverter.java | 47 ++ .../web/ObserveWebApplicationListener.java | 30 ++ .../application/web/ObserveWebMainHandler.java | 27 ++ .../application/web/ObserveWebMotionFilter.java | 5 +- .../web/ObserveWebMotionJsonHelper.java | 130 ----- .../controller/v1/DataSourceServiceController.java | 55 +-- ...urceConfigurationAlreadyRegistredException.java | 27 -- .../ObserveWebSecurityApplicationContext.java | 45 +- ...ObserveWebSecurityAuthenticationTokenCache.java | 10 +- observe-application-web/src/main/resources/mapping | 1 + .../observe/ObserveTopiaApplicationContext.java | 22 + .../observe/services/ObserveServiceFactory.java | 3 + .../services/ObserveServiceInitializer.java | 69 ++- .../services/service/DataSourceService.java | 10 +- .../DatabaseConnexionNotAuthorizedException.java | 5 + .../service/DatabaseNotFoundException.java | 6 +- .../configuration/ObserveDataSourceConnection.java | 4 +- .../ObserveDataSourceConnectionSupport.java | 42 +- ...ava => ObserveDataSourceConfigurationRest.java} | 37 +- ...veDataSourceConfigurationRestAuthenticated.java | 32 -- ...bserveDataSourceConfigurationRestConstants.java | 7 + .../ObserveDataSourceConfigurationRestSupport.java | 43 -- .../ObserveDataSourceConnectionRest.java | 17 +- .../ObserveDataSourceConnectionTopia.java | 6 +- .../services/dto/gson/ObserveDtoGsonSupplier.java | 8 + .../ObserveDataSourceConnectionAdapter.java | 24 + .../services/ObserveServiceFactoryRest.java | 237 ++++++--- .../ird/observe/services/http/ObserveRequest.java | 77 +++ .../services/http/ObserveRequestBuilder.java | 134 ++++++ .../services/http/ObserveRequestMethod.java | 13 + .../ird/observe/services/http/ObserveResponse.java | 140 ++++++ .../services/http/ObserveResponseBuilder.java | 396 +++++++++++++++ .../ird/observe/services/http/RequestBuilder.java | 531 --------------------- .../ird/observe/services/http/RequestResult.java | 86 ---- .../fr/ird/observe/services/TestClassResource.java | 25 +- .../ird/observe/services/TestMethodResource.java | 6 +- .../service/DataSourceServiceRestTest.java | 40 +- .../service/seine/TripSeineServiceTest.java | 4 +- .../ObserveDataSourceConfigurationMainFactory.java | 52 +- .../services/ObserveServiceMainFactory.java | 25 + .../services/ObserveServiceContextTopia.java | 28 +- .../services/ObserveServiceFactoryTopia.java | 60 ++- .../ird/observe/services/ObserveServiceTopia.java | 12 +- .../ObserveTopiaApplicationContextFactory.java | 18 +- .../services/service/DataSourceServiceTopia.java | 162 +++++-- .../ird/observe/services/DataSourceResource.java | 2 +- .../service/DataSourceServiceTopiaTest.java | 87 +++- 47 files changed, 1682 insertions(+), 1165 deletions(-) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveDataSourceConfigurationConverter.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMainHandler.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionJsonHelper.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/DataSourceConfigurationAlreadyRegistredException.java rename observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/{ObserveDataSourceConfigurationRestNotAuthenticated.java => ObserveDataSourceConfigurationRest.java} (69%) delete mode 100644 observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestAuthenticated.java delete mode 100644 observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestSupport.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveDataSourceConnectionAdapter.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequest.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestBuilder.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveRequestMethod.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponse.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestBuilder.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/http/RequestResult.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 7

branch feature/7463 updated (c884bd5 -> e042916)
by codelutin.com scm 04 Sep '15

04 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git from c884bd5 Changement de l'API de DataSourceService pour quelle renvoie le résultat de la connexion à la source de données new e042916 test + correction de la communication entre le client REST et le serveur Web (refs #7463) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e0429166b47d40d585ab0b612de708189f46a6db Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 4 17:59:25 2015 +0200 test + correction de la communication entre le client REST et le serveur Web (refs #7463) Summary of changes: .../application/web/ObserveWebMotionFilter.java | 6 +- .../java/fr/ird/observe/services/dto/FormDto.java | 12 +- .../fr/ird/observe/services/dto/ReferenceDto.java | 14 +- .../services/dto/gson/ImmutableListAdapter.java | 25 ++ .../services/dto/gson/ObserveDtoGsonSupplier.java | 8 +- .../services/dto/gson/ReferenceDtoAdapter.java | 84 ++++++ .../dto/gson/ReferentialReferenceDtoAdapter.java | 27 ++ .../dto/referential/ReferentialReferenceDtos.java | 8 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 34074 -> 33879 bytes .../services/ObserveServiceFactoryRest.java | 12 +- .../fr/ird/observe/services/TestClassResource.java | 4 +- .../service/seine/TripSeineServiceTest.java | 329 +++++++++++++++++++++ 12 files changed, 514 insertions(+), 15 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferenceDtoAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialReferenceDtoAdapter.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1