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

[Git][ultreiaio/ird-observe][develop] 7 commits: Suppression du pom parent
by Tony CHEMIT (＠tchemit) 10 Dec '24

10 Dec '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 04c9ca55 by Tony Chemit at 2024-10-09T15:01:50+02:00 Suppression du pom parent - - - - - 0f79c2d6 by Tony Chemit at 2024-10-09T15:15:01+02:00 Suppression de certains profiles déclanchés via des fichiers - - - - - 78f8544c by Tony Chemit at 2024-12-01T19:37:34+01:00 add pmd plugin and let's generate javadoc when build site - - - - - 282e6d07 by Tony Chemit at 2024-12-01T19:37:34+01:00 fix dependency to make pmd report works - - - - - a72f2cd9 by Tony Chemit at 2024-12-01T19:37:34+01:00 add mvn via mvnwrapper - - - - - 656a75cf by Tony Chemit at 2024-12-10T12:56:28+01:00 do generate javadoc when building site - - - - - 37d24904 by Tony Chemit at 2024-12-10T12:57:39+01:00 Merge branch 'feature/issue-2945' into develop Suppression du pom parent qui pointe sur un projet de mon organisation - Closes #2945 - - - - - 85 changed files: - + .mvn/wrapper/maven-wrapper.properties - − client/configuration/.mvn/add-auto-service - − client/configuration/.mvn/add-build-number - client/configuration/pom.xml - − client/core/.mvn/add-auto-service - − client/core/.mvn/jaxx-generate - client/core/pom.xml - − client/datasource/actions/.mvn/add-auto-service - − client/datasource/actions/.mvn/jaxx-generate - client/datasource/actions/pom.xml - − client/datasource/editor/api/.mvn/add-auto-service - − client/datasource/editor/api/.mvn/jaxx-generate - client/datasource/editor/api/pom.xml - − client/datasource/editor/common/.mvn/add-auto-service - − client/datasource/editor/common/.mvn/jaxx-generate - client/datasource/editor/common/pom.xml - − client/datasource/editor/ll-validation/.mvn/add-auto-service - client/datasource/editor/ll-validation/pom.xml - − client/datasource/editor/ll/.mvn/add-auto-service - − client/datasource/editor/ll/.mvn/jaxx-generate - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - − client/datasource/editor/ps-validation/.mvn/add-auto-service - client/datasource/editor/ps-validation/pom.xml - − client/datasource/editor/ps/.mvn/add-auto-service - − client/datasource/editor/ps/.mvn/jaxx-generate - client/datasource/editor/ps/pom.xml - − client/datasource/editor/spi/.mvn/add-auto-service - client/datasource/editor/spi/pom.xml - client/pom.xml - − client/runner/.mvn/add-auto-service - − client/runner/.mvn/add-build-number - − client/runner/.mvn/application-assembly - client/runner/pom.xml - − core/api/dto-consolidation/.mvn/add-auto-service - core/api/dto-consolidation/pom.xml - − core/api/dto-decoration/.mvn/add-auto-service - core/api/dto-decoration/pom.xml - − core/api/dto-pairing/.mvn/add-auto-service - core/api/dto-pairing/pom.xml - − core/api/dto-validation-templates/.mvn/add-auto-service - core/api/dto-validation-templates/pom.xml - − core/api/dto-validation/.mvn/add-auto-service - core/api/dto-validation/pom.xml - − core/api/dto/.mvn/add-auto-service - core/api/dto/pom.xml - − core/api/services/.mvn/add-auto-service - core/api/services/pom.xml - − core/api/tree/.mvn/add-auto-service - core/api/tree/pom.xml - − core/api/validation/.mvn/add-auto-service - core/api/validation/pom.xml - − core/persistence/avdth/.mvn/add-auto-service - core/persistence/avdth/pom.xml - − core/persistence/consolidation/.mvn/add-auto-service - core/persistence/consolidation/pom.xml - − core/persistence/decoration/.mvn/add-auto-service - core/persistence/decoration/pom.xml - − core/persistence/java/.mvn/add-auto-service - core/persistence/java/pom.xml - − core/persistence/migration/.mvn/add-auto-service - core/persistence/migration/pom.xml - − core/persistence/report/.mvn/add-auto-service - core/persistence/report/pom.xml - − core/services/client/.mvn/add-auto-service - core/services/client/pom.xml - − core/services/i18n/.mvn/add-auto-service - core/services/i18n/pom.xml - − core/services/local/.mvn/add-auto-service - core/services/local/pom.xml - − core/services/test/.mvn/add-auto-service - core/services/test/pom.xml - − model/.mvn/add-auto-service - model/pom.xml - + mvnw - + mvnw.cmd - pom.xml - − server/configuration/.mvn/add-auto-service - − server/configuration/.mvn/add-build-number - server/configuration/pom.xml - − server/core/.mvn/add-build-number - server/core/pom.xml - − server/runner/.mvn/add-auto-service - − server/runner/.mvn/add-build-number - server/runner/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c636885847ed5a4de6f69218… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c636885847ed5a4de6f69218… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2945
by Tony CHEMIT (＠tchemit) 10 Dec '24

10 Dec '24

Tony CHEMIT deleted branch feature/issue-2945 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2945] do generate javadoc when building site
by Tony CHEMIT (＠tchemit) 10 Dec '24

10 Dec '24

Tony CHEMIT pushed to branch feature/issue-2945 at ultreiaio / ird-observe Commits: 656a75cf by Tony Chemit at 2024-12-10T12:56:28+01:00 do generate javadoc when building site - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -2357,6 +2357,9 @@ <value>true</value> </property> </activation> + <properties> + <maven.javadoc.skip>false</maven.javadoc.skip> + </properties> <build> <plugins> <plugin> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/656a75cfb53570b684d39a321… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/656a75cfb53570b684d39a321… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2945] 3 commits: add pmd plugin and let's generate javadoc when build site
by Tony CHEMIT (＠tchemit) 01 Dec '24

01 Dec '24

Tony CHEMIT pushed to branch feature/issue-2945 at ultreiaio / ird-observe Commits: 78f8544c by Tony Chemit at 2024-12-01T19:37:34+01:00 add pmd plugin and let's generate javadoc when build site - - - - - 282e6d07 by Tony Chemit at 2024-12-01T19:37:34+01:00 fix dependency to make pmd report works - - - - - a72f2cd9 by Tony Chemit at 2024-12-01T19:37:34+01:00 add mvn via mvnwrapper - - - - - 5 changed files: - + .mvn/wrapper/maven-wrapper.properties - model/pom.xml - + mvnw - + mvnw.cmd - pom.xml Changes: ===================================== .mvn/wrapper/maven-wrapper.properties ===================================== @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip ===================================== model/pom.xml ===================================== @@ -53,6 +53,11 @@ <artifactId>auto-service-annotations</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>io.ultreia.java4all.eugene</groupId> <artifactId>eugene-core</artifactId> ===================================== mvnw ===================================== @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash> +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" ===================================== mvnw.cmd ===================================== @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash> +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" ===================================== pom.xml ===================================== @@ -2419,11 +2419,21 @@ </reportSet> </reportSets> </plugin> -  -  + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0f79c2d65c3736d8c0b00bb8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0f79c2d65c3736d8c0b00bb8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.4.0-M1)
by maven (＠group_1426670_bot_50189423d66c88be3ca903922332efb1) 24 Oct '24

24 Oct '24

maven pushed to branch pages at ultreiaio / ird-observe Commits: 1f298e9f by Tony Chemit at 2024-10-24T14:46:39+02:00 Site checkin for project ObServe (version 9.4.0-M1) - - - - - 12 changed files: - 9.4.0-M1/CHANGELOG.html - 9.4.0-M1/architecture-logicielle.html - 9.4.0-M1/avdth/common.html - 9.4.0-M1/avdth/index.html - 9.4.0-M1/avdth/landing.html - 9.4.0-M1/avdth/local_market.html - 9.4.0-M1/avdth/logbook.html - 9.4.0-M1/avdth/referential.html - 9.4.0-M1/avdth/sample.html - 9.4.0-M1/changelog.html - 9.4.0-M1/changes-report.html - 9.4.0-M1/ci-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1f298e9f7649124dddc73ef0a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1f298e9f7649124dddc73ef0a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [pom] use toolkit 10.0.1
by Tony CHEMIT (＠tchemit) 09 Oct '24

09 Oct '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c6368858 by Tony Chemit at 2024-10-09T10:38:52+02:00 [pom] use toolkit 10.0.1 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -111,7 +111,7 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.toolkit>10.0.1-SNAPSHOT</lib.version.toolkit> + <lib.version.toolkit>10.0.1</lib.version.toolkit>  <lib.version.log4j2>2.23.1</lib.version.log4j2> <plugin.version.site>4.0.0-M13</plugin.version.site> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c636885847ed5a4de6f692188… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c636885847ed5a4de6f692188… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue-2945
by Tony CHEMIT (＠tchemit) 09 Oct '24

09 Oct '24

Tony CHEMIT pushed new branch feature/issue-2945 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/issue-2945 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: Introduce WellIdAware and WellIdsAware from toolkit project.
by Tony CHEMIT (＠tchemit) 09 Oct '24

09 Oct '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 15898a56 by Tony Chemit at 2024-10-09T09:38:08+02:00 Introduce WellIdAware and WellIdsAware from toolkit project. - - - - - 35ce71ac by Tony Chemit at 2024-10-09T09:38:17+02:00 Introduce WindAware from toolkit project. - - - - - cd83f7d0 by Tony Chemit at 2024-10-09T09:38:23+02:00 Introduce WithSpeciesFaoCode and WithFormula from toolkit project. - - - - - bbcbcbe8 by Tony Chemit at 2024-10-09T09:38:41+02:00 [model] Introduce ObserveValidationTagValues to get ObServe specific validation tag-values - - - - - 55721ae9 by Tony Chemit at 2024-10-09T09:39:28+02:00 Introduce dto-validation-templates module to override ValidationTransformer - - - - - 9da4c1b2 by Tony Chemit at 2024-10-09T09:39:34+02:00 Use dto-validation-templates module and update WellIdXXXValidators - - - - - 6d166312 by Tony Chemit at 2024-10-09T10:24:01+02:00 Introduce WithStartEndDate from toolkit project. - - - - - 0cfaccdc by Tony Chemit at 2024-10-09T10:33:19+02:00 Merge branch 'feature/issue-2946-2' into develop Suppression du projet du module toolkit - Closes #2946 - - - - - 30 changed files: - core/api/dto-decoration/src/main/i18n/getters/java.getter - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/decoration/ObserveDefaultDecoratorRenderer.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/decoration/ObserveDtoDecoratorRenderer.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/decoration/ObserveDtoReferenceDecoratorRenderer.java - + core/api/dto-validation-templates/.mvn/add-auto-service - + core/api/dto-validation-templates/.mvn/pom.gitflow.develop - + core/api/dto-validation-templates/.mvn/pom.gitflow.master - + core/api/dto-validation-templates/.mvn/pom.organizationId - + core/api/dto-validation-templates/.mvn/pom.projectId - + core/api/dto-validation-templates/.mvn/pom.stageId - + core/api/dto-validation-templates/LICENSE.txt - + core/api/dto-validation-templates/README.md - + core/api/dto-validation-templates/pom.xml - + core/api/dto-validation-templates/src/main/java/fr/ird/observe/dto/validation/templates/BoundNauticalLengthValidationTransformerCallback.java - + core/api/dto-validation-templates/src/main/java/fr/ird/observe/dto/validation/templates/BoundTemperatureValidationTransformerCallback.java - + core/api/dto-validation-templates/src/main/java/fr/ird/observe/dto/validation/templates/SpeciesValidationTransformerCallback.java - + core/api/dto-validation-templates/src/main/java/fr/ird/observe/dto/validation/templates/WellIdValidationTransformerCallback.java - + core/api/dto-validation-templates/src/main/java/fr/ird/observe/dto/validation/templates/WellIdsValidationTransformerCallback.java - + core/api/dto-validation-templates/src/main/resources/fr/ird/observe/dto/validation/templates/BOUND_NAUTICAL_LENGTH_FIELD_TEMPLATE.json - + core/api/dto-validation-templates/src/main/resources/fr/ird/observe/dto/validation/templates/BOUND_TEMPERATURE_FIELD_TEMPLATE.json - + core/api/dto-validation-templates/src/main/resources/fr/ird/observe/dto/validation/templates/SPECIES_LENGTH_FIELD_TEMPLATE.json - + core/api/dto-validation-templates/src/main/resources/fr/ird/observe/dto/validation/templates/SPECIES_WEIGHT_FIELD_TEMPLATE.json - + core/api/dto-validation-templates/src/main/resources/fr/ird/observe/dto/validation/templates/WELL_IDS_AWARE_FIELD_TEMPLATE.json - + core/api/dto-validation-templates/src/main/resources/fr/ird/observe/dto/validation/templates/WELL_ID_AWARE_FIELD_TEMPLATE.json - + core/api/dto-validation-templates/src/site/site.xml - core/api/dto-validation/src/main/i18n/getters/java.getter - + core/api/dto-validation/src/main/java/fr/ird/observe/dto/validation/validator/data/WellIdFieldValidator.java - + core/api/dto-validation/src/main/java/fr/ird/observe/dto/validation/validator/data/WellIdsFieldValidator.java - core/api/dto/src/main/i18n/getters/java.getter - + core/api/dto/src/main/java/fr/ird/observe/dto/WithStartEndDate.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bf149ed46d6bfb7fbf238bc7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bf149ed46d6bfb7fbf238bc7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2946-2
by Tony CHEMIT (＠tchemit) 09 Oct '24

09 Oct '24

Tony CHEMIT deleted branch feature/issue-2946-2 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2946-2] Introduce WithSpeciesFaoCode and WithFormula from toolkit project.
by Tony CHEMIT (＠tchemit) 02 Oct '24

02 Oct '24

Tony CHEMIT pushed to branch feature/issue-2946-2 at ultreiaio / ird-observe Commits: dada0ce7 by Tony Chemit at 2024-10-02T19:05:50+02:00 Introduce WithSpeciesFaoCode and WithFormula from toolkit project. - - - - - 4 changed files: - + core/api/dto/src/main/java/fr/ird/observe/dto/referential/FormulaHelper.java - + core/api/dto/src/main/java/fr/ird/observe/dto/referential/WithFormula.java - + core/api/dto/src/main/java/fr/ird/observe/dto/referential/WithSpeciesFaoCode.java - + core/api/dto/src/test/java/fr/ird/observe/dto/referential/FormulaHelperTest.java Changes: ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/referential/FormulaHelper.java ===================================== @@ -0,0 +1,184 @@ +package fr.ird.observe.dto.referential; + +/*- + * #%L + * ObServe Core :: API :: Dto + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.dto.ObserveUtil; +import io.ultreia.java4all.lang.Strings; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.script.Bindings; +import javax.script.ScriptContext; +import javax.script.ScriptEngine; +import javax.script.ScriptException; +import java.util.Map; +import java.util.TreeMap; +import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Created on 05/11/16. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 6.0 + */ +public class FormulaHelper { + + public static final String VARIABLE_WEIGHT = "P"; + public static final String VARIABLE_LENGTH = "L"; + public static final String VARIABLE_INPUT = "I"; + public static final String VARIABLE_OUTPUT = "O"; + public static final String COEFFICIENT_B = "b"; + private static final Logger log = LogManager.getLogger(FormulaHelper.class); + private static final Pattern COEFFICIENTS_PATTERN = Pattern.compile("(.+)=(.+)"); + private static final String VARIABLE_X = "x"; + private static ScriptEngine scriptEngine; + + private static ScriptEngine getScriptEngine() { + if (scriptEngine == null) { + scriptEngine = ObserveUtil.getScriptEngine(); + } + return scriptEngine; + } + + public static Map<String, Double> getCoefficientValues(WithFormula formula) { + Map<String, Double> result = new TreeMap<>(); + String coefficients = formula.getCoefficients(); + if (coefficients != null) { + for (String coefficientDef : coefficients.split(":")) { + Matcher matcher = COEFFICIENTS_PATTERN.matcher(coefficientDef.trim()); + log.debug("constant to test = " + coefficientDef); + if (matcher.matches()) { + String key = matcher.group(1); + String val = matcher.group(2); + try { + Double d = Double.valueOf(val); + result.put(key, d); + log.debug("detects coefficient " + key + '=' + val); + } catch (NumberFormatException e) { + // pas pu recupere le count... + log.warn("could not parse double " + val + " for coefficient " + key, e); + } + } + } + } + return result; + } + + public static boolean validateRelation(WithFormula withFormula, String formula, String variable) { + boolean result = false; + if (Strings.isNotEmpty(formula)) { + Map<String, Double> coefficientValues = withFormula.getCoefficientValues(); + ScriptEngine engine = getScriptEngine(); + Bindings bindings = engine.createBindings(); + addBindings(coefficientValues, bindings, variable, 1); + try { + engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); + Number o = (Number) engine.eval("parseFloat(" + formula + ")"); + log.debug("evaluation ok : " + formula + " (" + variable + "=1) = " + o); + result = true; + } catch (Exception e) { + log.error("evaluation ko : " + formula + ", reason : " + e.getMessage(), e); + } + } + return result; + } + + public static boolean validateObjectMaterialValidation(String relation, Object value) { + boolean result = false; + if (Strings.isNotEmpty(relation)) { + ScriptEngine engine = getScriptEngine(); + Bindings bindings = engine.createBindings(); + bindings.put(FormulaHelper.VARIABLE_X, value); + try { + engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); + Boolean o = (Boolean) engine.eval(relation); + log.debug(String.format("evaluation ok : %s (%s=%s) = %s", relation, FormulaHelper.VARIABLE_X, value, o)); + result = o != null && o; + } catch (Exception e) { + log.error("evaluation ko : " + relation + ", reason : " + e.getMessage(), e); + } + } + return result; + } + + public static boolean validateObjectMaterialValidationSyntax(String relation, Object value) { + if (Strings.isNotEmpty(relation)) { + ScriptEngine engine = getScriptEngine(); + Bindings bindings = engine.createBindings(); + bindings.put(FormulaHelper.VARIABLE_X, value); + try { + engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); + Boolean o = (Boolean) engine.eval(relation); + log.debug(String.format("evaluation ok : %s (%s=%s) = %s", relation, FormulaHelper.VARIABLE_X, value, o)); + return true; + } catch (Exception e) { + log.error(String.format("evaluation ko : %s, reason : %s", relation, e.getMessage()), e); + return false; + } + } + return false; + } + + public static Float computeValue(WithFormula withFormula, String formula, String coefficientName, String variableName, float data, Function<Float,Float> toRoundResult) { + if (coefficientName != null) { + Double b = withFormula.getCoefficientValue(coefficientName); + if (b == 0) { + // ce cas limite ne permet pas de calculer la taille a partir du weight + return null; + } + } + Float o = computeValue(withFormula, formula, variableName, data); + if (o != null) { + o = toRoundResult.apply(o); + } + return o; + } + + private static Float computeValue(WithFormula withFormula, String formula, String variable, float data) { + Map<String, Double> coefficientValues = withFormula.getCoefficientValues(); + ScriptEngine engine = getScriptEngine(); + Bindings bindings = engine.createBindings(); + addBindings(coefficientValues, bindings, variable, data); + engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); + Number o = null; + try { + o = (Number) engine.eval("parseFloat(" + formula + ")"); + } catch (ScriptException e) { + log.error("Could not compute value from " + formula, e); + } + return o == null ? null : o.floatValue(); + } + + private static void addBindings(Map<String, Double> coefficientValues, Bindings bindings, String variable, float data) { + for (Map.Entry<String, Double> entry : coefficientValues.entrySet()) { + String key = entry.getKey(); + Double value = entry.getValue(); + bindings.put(key, value); + log.debug("add constant " + key + '=' + value); + } + bindings.put(variable, data); + } + +} ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/referential/WithFormula.java ===================================== @@ -0,0 +1,114 @@ +package fr.ird.observe.dto.referential; + +/*- + * #%L + * ObServe Core :: API :: Dto + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.dto.WithStartEndDate; + +import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Created on 22/12/16. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 6.0 + */ +public interface WithFormula extends WithStartEndDate, WithSpeciesFaoCode { + + String PROPERTY_OCEAN = "ocean"; + String PROPERTY_SPECIES = "species"; + String PROPERTY_SEX = "sex"; + String PROPERTY_START_DATE = "startDate"; + String PROPERTY_END_DATE = "endDate"; + String PROPERTY_COEFFICIENTS = "coefficients"; + String PROPERTY_SOURCE = "source"; + Comparator<WithFormula> FORMULA_SUPPORT_START_DATE_COMPARATOR = Comparator.comparing(WithStartEndDate::getStartDate, WithStartEndDate.START_DATE_COMPARATOR); + Comparator<WithFormula> FORMULA_SUPPORT_END_DATE_COMPARATOR = Comparator.comparing(WithStartEndDate::getEndDate, WithStartEndDate.END_DATE_COMPARATOR); + Comparator<WithFormula> FORMULA_SUPPORT_COMPARATOR = FORMULA_SUPPORT_START_DATE_COMPARATOR.thenComparing(FORMULA_SUPPORT_END_DATE_COMPARATOR); + + static <D extends WithFormula> void sort(List<D> list) { + list.sort(FORMULA_SUPPORT_COMPARATOR); + } + + String getCoefficients(); + + void setCoefficients(String coefficients); + + Map<String, Double> getCoefficientValues(); + + String getFormulaOneVariableName(); + + String getFormulaTwoVariableName(); + + void setStartDate(Date startDate); + + void setEndDate(Date endDate); + + String getSource(); + + void setSource(String source); + + default Set<String> getCoefficientNames() { + return getCoefficientValues().keySet(); + } + + String getFormulaOne(); + + String getFormulaTwo(); + + default void revalidateFormulaOne() { + boolean result = FormulaHelper.validateRelation(this, getFormulaOne(), getFormulaOneVariableName()); + setFormulaOneValid(result); + } + + boolean isFormulaOneValid(); + + void setFormulaOneValid(boolean formulaOneValid); + + boolean isFormulaTwoValid(); + + void setFormulaTwoValid(boolean formulaTwoValid); + + default void revalidateFormulaTwo() { + boolean result = FormulaHelper.validateRelation(this, getFormulaTwo(), getFormulaTwoVariableName()); + setFormulaTwoValid(result); + } + + default Double getCoefficientValue(String coefficientName) { + return getCoefficientValues().get(coefficientName); + } + + default Float computeFromFormulaOne(float data) { + // only used for entities + return null; + } + + default Float computeFromFormulaTwo(float data) { + // only used for entities + return null; + } + +} ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/referential/WithSpeciesFaoCode.java ===================================== @@ -0,0 +1,43 @@ +package fr.ird.observe.dto.referential; + +/*- + * #%L + * ObServe Core :: API :: Dto + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.dto.CommonDto; +import fr.ird.observe.dto.DtoAndReferenceAware; + +/** + * Created on 18/10/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.14 + */ +public interface WithSpeciesFaoCode extends DtoAndReferenceAware { + + CommonDto getSpecies(); + + default CommonDto getSpeciesLabel() { + return getSpecies(); + } + + String getSpeciesFaoCode(); +} ===================================== core/api/dto/src/test/java/fr/ird/observe/dto/referential/FormulaHelperTest.java ===================================== @@ -0,0 +1,152 @@ +package fr.ird.observe.dto.referential; + +/*- + * #%L + * ObServe Core :: API :: Dto + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.dto.CommonDto; +import io.ultreia.java4all.lang.Numbers; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Date; +import java.util.Map; + +/** + * Created on 05/11/16. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 6.0 + */ +public class FormulaHelperTest { + + @Test + public void testComputeValue() { + + WithFormula formula = new WithFormula() { + @Override + public String getSpeciesFaoCode() { + return null; + } + + @Override + public CommonDto getSpecies() { + return null; + } + + @Override + public Date getStartDate() { + return null; + } + + @Override + public Date getEndDate() { + return null; + } + + @Override + public String getCoefficients() { + return "a=3.8e-5:b=2.78 "; + } + + @Override + public void setCoefficients(String coefficients) { + + } + + @Override + public Double getCoefficientValue(String coefficientName) { + return getCoefficientValues().get(coefficientName); + } + + @Override + public Map<String, Double> getCoefficientValues() { + return Map.of("a", 3.8e-5, "b", 2.78); + } + + @Override + public String getFormulaOneVariableName() { + return null; + } + + @Override + public String getFormulaTwoVariableName() { + return null; + } + + @Override + public void setStartDate(Date startDate) { + + } + + @Override + public void setEndDate(Date endDate) { + + } + + @Override + public String getSource() { + return null; + } + + @Override + public void setSource(String source) { + + } + + @Override + public String getFormulaOne() { + return null; + } + + @Override + public String getFormulaTwo() { + return null; + } + + @Override + public boolean isFormulaOneValid() { + return false; + } + + @Override + public void setFormulaOneValid(boolean formulaOneValid) { + + } + + @Override + public boolean isFormulaTwoValid() { + return false; + } + + @Override + public void setFormulaTwoValid(boolean formulaTwoValid) { + + } + }; + + Float weight = FormulaHelper.computeValue(formula, "a * Math.pow(L, b)", null, "L", 84.0f, Numbers::roundThreeDigits); + Assert.assertNotNull(weight); + + float excepted = (float) (Math.pow(84.0, 2.78) * 3.8e-5); + Assert.assertEquals(excepted, weight, 3); + } +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dada0ce77b548dc5dda208af5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dada0ce77b548dc5dda208af5… You're receiving this email because of your account on gitlab.com.

1 0