[wao] branch develop updated (a00ca19 -> 05a6d73)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from a00ca19 Migration du projet vers git new 530b573 Mise à jour des dépendances new 05a6d73 Dans l'export CSV du réalisé, le durée moyenne d'une marée en jours de mers est un entier donc on utilise le bon formatter (refs #5117) The 2 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 05a6d737782c6ee3e35b7c56065af1d563e3a7db Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Oct 9 15:13:18 2014 +0200 Dans l'export CSV du réalisé, le durée moyenne d'une marée en jours de mers est un entier donc on utilise le bon formatter (refs #5117) commit 530b573e6b04707fb63b19797e8d74bc4bc32c5c Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Oct 8 17:58:10 2014 +0200 Mise à jour des dépendances Summary of changes: pom.xml | 24 +++++++++++----------- .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 9 ++++---- .../wao/services/service/SamplingPlanService.java | 5 +++-- .../service/csv/ObsMerSamplingPlanExportModel.java | 2 +- .../wao/services/service/mail/EmailService.java | 4 ++-- .../wao/web/action/AbstractSamplingPlanAction.java | 4 ++-- .../fr/ifremer/wao/web/action/BoatsAction.java | 4 ++-- .../fr/ifremer/wao/web/action/ContactsAction.java | 4 ++-- .../fr/ifremer/wao/web/action/SynthesisAction.java | 4 ++-- 9 files changed, 31 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 530b573e6b04707fb63b19797e8d74bc4bc32c5c Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Oct 8 17:58:10 2014 +0200 Mise à jour des dépendances --- pom.xml | 24 +++++++++++----------- .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 9 ++++---- .../wao/services/service/SamplingPlanService.java | 5 +++-- .../wao/services/service/mail/EmailService.java | 4 ++-- .../wao/web/action/AbstractSamplingPlanAction.java | 4 ++-- .../fr/ifremer/wao/web/action/BoatsAction.java | 4 ++-- .../fr/ifremer/wao/web/action/ContactsAction.java | 4 ++-- .../fr/ifremer/wao/web/action/SynthesisAction.java | 4 ++-- 8 files changed, 30 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 7ea24b3..5448025 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ <commonsLoggingVersion>1.1.3</commonsLoggingVersion> <commonsLang3Version>3.3.2</commonsLang3Version> <commonsCollections4Version>4.0</commonsCollections4Version> - <guavaVersion>17.0</guavaVersion> + <guavaVersion>18.0</guavaVersion> <junitVersion>4.11</junitVersion> <log4jVersion>1.2.17</log4jVersion> <commonsBeanutilsVersion>1.9.2</commonsBeanutilsVersion> @@ -116,23 +116,24 @@ <bootstrapPluginVersion>1.7.0</bootstrapPluginVersion> <slf4jVersion>1.7.7</slf4jVersion> <hibernateVersion>4.3.6.Final</hibernateVersion> - <mockitoVersion>1.9.5</mockitoVersion> + <mockitoVersion>1.10.5</mockitoVersion> <postgresqlDriverVersion>9.3-1102-jdbc41</postgresqlDriverVersion> - <commonsEmailVersion>1.3.2</commonsEmailVersion> + <commonsEmailVersion>1.3.3</commonsEmailVersion> <mustacheVersion>1.9</mustacheVersion> <commonsCodecVersion>1.9</commonsCodecVersion> <ehCacheVersion>2.6.9</ehCacheVersion> <jFreeChartVersion>1.0.13</jFreeChartVersion> <jFreeChartCommonVersion>1.0.16</jFreeChartCommonVersion> - - <nuitonWebVersion>1.16</nuitonWebVersion> - <nuitonI18nVersion>3.1</nuitonI18nVersion> - <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> - <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> - <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> - <nuitonUtilsVersion>3.0-rc-4</nuitonUtilsVersion> + <jsoupVersion>1.8.1</jsoupVersion> + + <nuitonWebVersion>1.17</nuitonWebVersion> + <nuitonI18nVersion>3.3</nuitonI18nVersion> + <nuitonConfigVersion>3.0-rc-2</nuitonConfigVersion> + <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion> + <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> + <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <eugeneVersion>2.13</eugeneVersion> - <topiaVersion>3.0-beta-12</topiaVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> <!--Site configuration --> <locales>fr</locales> @@ -153,7 +154,6 @@ <signatureArtifactId>java17</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <jsoupVersion>1.7.3</jsoupVersion> </properties> <repositories> diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java b/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java index f68c71a..0bcc1b5 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java @@ -27,6 +27,7 @@ import org.apache.commons.collections4.CollectionUtils; import java.util.Date; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Objects; import java.util.Set; @@ -68,7 +69,7 @@ public class SampleRowsFilter extends AbstractWaoFilter { protected Set<String> companyIds; - protected Set<String> orderByArguments; + protected LinkedHashSet<String> orderByArguments; public ObsProgram getObsProgram() { return obsProgram; @@ -166,11 +167,11 @@ public class SampleRowsFilter extends AbstractWaoFilter { this.companyIds = companyIds; } - public Set<String> getOrderByArguments() { + public LinkedHashSet<String> getOrderByArguments() { return orderByArguments; } - public void setOrderByArguments(Set<String> orderByArguments) { + public void setOrderByArguments(LinkedHashSet<String> orderByArguments) { this.orderByArguments = orderByArguments; } @@ -267,7 +268,7 @@ public class SampleRowsFilter extends AbstractWaoFilter { clone.samplingStrategies = samplingStrategies == null ? null : new HashSet<>(samplingStrategies); clone.terrestrialDistrictIds = terrestrialDistrictIds == null ? null : new HashSet<>(terrestrialDistrictIds); clone.companyIds = companyIds == null ? null : new HashSet<>(companyIds); - clone.orderByArguments = orderByArguments == null ? null : new HashSet<>(orderByArguments); + clone.orderByArguments = orderByArguments == null ? null : new LinkedHashSet<>(orderByArguments); return clone; } diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java index 73e25aa..a091cc1 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java @@ -90,6 +90,7 @@ import java.util.Collection; import java.util.Date; import java.util.GregorianCalendar; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -207,7 +208,7 @@ public class SamplingPlanService extends WaoServiceSupport { sampleRowsFilter.setPeriodFrom(now); // sampleRowsFilter.setPeriodTo(DateUtils.addYears(now, 1)); - sampleRowsFilter.setOrderByArguments(ImmutableSet.of(SampleRow.PROPERTY_CODE)); + sampleRowsFilter.setOrderByArguments(new LinkedHashSet<>(ImmutableSet.of(SampleRow.PROPERTY_CODE))); SampleRowTopiaDao dao = getSampleRowDao(); @@ -504,7 +505,7 @@ public class SamplingPlanService extends WaoServiceSupport { Preconditions.checkArgument(filter.getPeriodTo() != null); // ignore pagination when exporting - filter.setOrderByArguments(ImmutableSet.of(SampleRow.PROPERTY_CODE)); + filter.setOrderByArguments(new LinkedHashSet<>(ImmutableSet.of(SampleRow.PROPERTY_CODE))); SampleRowTopiaDao dao = getSampleRowDao(); diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java index c38b46a..06915e4 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java @@ -22,7 +22,7 @@ package fr.ifremer.wao.services.service.mail; */ import com.google.common.base.Charsets; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; import fr.ifremer.wao.WaoApplicationConfig; @@ -94,7 +94,7 @@ public class EmailService extends WaoServiceSupport { try { String from = - Objects.firstNonNull( + MoreObjects.firstNonNull( mail.getFrom(), applicationConfig.getSmtpFrom()); diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java index 0f08d74..f30a869 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java @@ -21,7 +21,7 @@ package fr.ifremer.wao.web.action; * #L% */ -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.SampleRowsFilter; import fr.ifremer.wao.services.service.SampleRowsFilterValues; @@ -76,7 +76,7 @@ public abstract class AbstractSamplingPlanAction extends WaoJspActionSupport imp @Override public String execute() { - filter = Objects.firstNonNull(session.getSampleRowsFilter(), filter); + filter = MoreObjects.firstNonNull(session.getSampleRowsFilter(), filter); return applyFilter(); diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/BoatsAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/BoatsAction.java index 7547c8a..db52ff2 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/BoatsAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/BoatsAction.java @@ -21,7 +21,7 @@ package fr.ifremer.wao.web.action; * #L% */ -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.BoatsFilter; import fr.ifremer.wao.entity.Boat; @@ -146,7 +146,7 @@ public class BoatsAction extends WaoJspActionSupport implements Preparable { @Override public String execute() { - filter = Objects.firstNonNull(session.getBoatsFilter(), filter); + filter = MoreObjects.firstNonNull(session.getBoatsFilter(), filter); return applyFilter(); diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java index 60c091c..43f7a16 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java @@ -21,7 +21,7 @@ package fr.ifremer.wao.web.action; * #L% */ -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoUtils; @@ -128,7 +128,7 @@ public class ContactsAction extends WaoJspActionSupport implements Preparable { @Override public String execute() { - filter = Objects.firstNonNull(session.getContactsFilter(), filter); + filter = MoreObjects.firstNonNull(session.getContactsFilter(), filter); return applyFilter(); diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java index e98f60c..09db78d 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java @@ -21,7 +21,7 @@ package fr.ifremer.wao.web.action; * #L% */ -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.services.service.Synthesis; @@ -69,7 +69,7 @@ public class SynthesisAction extends WaoJspActionSupport implements Preparable { @Override public String execute() { - filter = Objects.firstNonNull(session.getSynthesisFilter(), filter); + filter = MoreObjects.firstNonNull(session.getSynthesisFilter(), filter); return applyFilter(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 05a6d737782c6ee3e35b7c56065af1d563e3a7db Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Oct 9 15:13:18 2014 +0200 Dans l'export CSV du réalisé, le durée moyenne d'une marée en jours de mers est un entier donc on utilise le bon formatter (refs #5117) --- .../ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java index cf98ef1..63d76a0 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java @@ -56,7 +56,7 @@ public class ObsMerSamplingPlanExportModel extends AbstractExportModel<ObsMerSam modelBuilder.newColumnForExport("METIER_AUTRE", "professionOther"); modelBuilder.newColumnForExport("METIER_LIBELLE", "professionLibelle"); modelBuilder.newColumnForExport("METIER_ESPECES", "professionSpecies"); - modelBuilder.newColumnForImportExport("PLAN_DUREE_MOY", "averageTideTime", Common.DOUBLE_PRIMITIVE); + modelBuilder.newColumnForImportExport("PLAN_DUREE_MOY", "averageTideTime", Common.PRIMITIVE_INTEGER); modelBuilder.newColumnForImportExport("PLAN_NB_OBSERV", "nbObservants", Common.PRIMITIVE_INTEGER); modelBuilder.newColumnForImportExport("TAUX_COUVERTURE_APPLIQUE", "appliedCoverageRate", Common.DOUBLE); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm