Merge branch 'main' into bug6060

+ - name: Convert repo name to lowercase GHCR package

+ id: ghcr

+ env:

+ GITHUB_REPOSITORY: ${{ github.repository }}

+ run: |

+ # $GITHUB_REPOSITORY is in format owner/repo

+ OWNER=${GITHUB_REPOSITORY%%/*} # extract owner

+ REPO=${GITHUB_REPOSITORY##*/} # extract repo

+ OWNER_LOWER=$(echo "$OWNER" | tr '[:upper:]' '[:lower:]') # lowercase owner

+ REPO_LOWER=$(echo "$REPO" | tr '[:upper:]' '[:lower:]') # lowercase repo

+ PACKAGE="$OWNER_LOWER/$REPO_LOWER"

+ echo "PACKAGE=${PACKAGE}" >> $GITHUB_OUTPUT

+ RELEASE_TAR_GZ_FILENAME=$( configuration/github-download-release-assets.sh ${{ secrets.GITHUB_TOKEN }} ${{ env.RELEASE_PREFIX }} ${{ github.repository }} )

+ tags: ghcr.io/${{steps.ghcr.outputs.PACKAGE}}:${{ env.RELEASE }}${{ env.BRANCH == 'main' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest', steps.ghcr.outputs.PACKAGE) || env.BRANCH == 'docker-17' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest-17', steps.ghcr.outputs.PACKAGE) || env.BRANCH == 'docker-21' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest-21', steps.ghcr.outputs.PACKAGE) || env.BRANCH == 'docker-24' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest-24', steps.ghcr.outputs.PACKAGE) || '' }}

+name: Merge main branch into docker-24 after successful build

+on:

+ workflow_run:

+ workflows: [release]

+ types: [completed]

+ branches: [main]

+ workflow_dispatch: {}

+jobs:

+ merge-main-into-docker-24:

+ permissions:

+ contents: write

+ if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}

+ runs-on: ubuntu-latest

+ steps:

+ - name: Checkout

+ uses: actions/checkout@v4

+ with:

+ ref: docker-24

+ fetch-depth: 0 # fetch the whole thing to make sure the histories merge

+ - name: Merge main into docker-24

+ uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # v1.4.0

+ env:

+ GH_TOKEN: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}

+ with:

+ type: now

+ from_branch: main

+ target_branch: docker-24

+ message: Auto-merging main into docker-24 after successful release build

+ github_token: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}

+ - 'README.md'

+ description: Empty means ubuntu-latest, usually 4 CPUs with little disk/memory, but if you have runners named ubuntu-latest-Xcpu, it can be 4, 8, 16, and 64 as well, using, e.g., ubuntu-latest-16cpu; default is ubuntu-latest

+ default: ''

+ actions: read

+ runs-on: ${{ github.event.inputs.runner_cpus != '' && format('ubuntu-latest-{0}cpu', github.event.inputs.runner_cpus) || 'ubuntu-latest' }}

+ - name: Free Disk Space (Ubuntu)

+ uses: jlumbroso/free-disk-space@v1.3.1

+ with:

+ # this might remove tools that are actually needed,

+ # if set to "true" but frees about 6 GB

+ tool-cache: false

+ # all of these default to true, but feel free to set to

+ # "false" if necessary for your workflow

+ android: false

+ dotnet: true

+ haskell: true

+ large-packages: true

+ docker-images: false

+ swap-storage: true

+ sudo dd if=/dev/zero of=/mnt/large-swapfile bs=1G count=30

+ - name: Create TMP space under /mnt/tmp

+ shell: bash

+ run: |

+ sudo mkdir /mnt/tmp

+ sudo chmod 777 /mnt/tmp

+ TMP: /mnt/tmp

+ AWS_S3_TEST_S3ACCESSID: ${{ secrets.AWS_S3_TEST_S3ACCESSID }}

+ AWS_S3_TEST_S3ACCESSKEY: ${{ secrets.AWS_S3_TEST_S3ACCESSKEY }}

+ GEONAMES_ORG_USERNAMES: ${{ secrets.GEONAMES_ORG_USERNAMES }}

+ GOOGLE_MAPS_AUTHENTICATION_PARAMS: ${{ secrets.GOOGLE_MAPS_AUTHENTICATION_PARAMS }}

+ APP_PARAMETERS: "-Daws.region=eu-west-1"

+ ./configuration/buildAndUpdateProduct.sh -x ${{ github.event.inputs.runner_cpus == '' && '4' || github.event.inputs.runner_cpus }} ${{ github.event.inputs.skip_tests == 'true' && '-t' || '' }} ${{ github.event.inputs.local_target_platform == 'true' && '-v' || '' }} build 2>&1

+ - name: show disk stats

+ if: always()

+ run: df -h

+ env:

+ HUDSON_JOB_USERNAME: ${{ secrets.HUDSON_JOB_USERNAME }}

+ HUDSON_JOB_PASSWORD: ${{ secrets.HUDSON_JOB_PASSWORD }}

+ HUDSON_JOB_TOKEN: ${{ secrets.HUDSON_JOB_TOKEN }}

+ if: ${{ always() && env.HUDSON_JOB_USERNAME != '' && env.HUDSON_JOB_PASSWORD != '' && env.HUDSON_JOB_TOKEN != '' }}

+* [[Cloud Infrastructure Orchestration|wiki/projects/cloud-orchestrator]]

+The Sailing Analytics, formerly known as the "SAP Sailing Analytics," are a solution for portraying and analyzing sailing regattas, supporting training scenarios, and powering the vast archive at https://sapsailing.com. The solution consists of a cloud application with a web-based user interface, as well as three companion apps that integrate with the cloud application. This repository has the code for the cloud-based web application, and two of the three mobile apps (Buoy Pinger and Race Manager). The third companion app (Sail Insight) is found in [another repository](https://github.com/SAP/sailing-analytics-sail-insight).

+To use Java 24, use the ``docker-compose-24.yml`` file instead:

+ docker-compose -f docker-compose-24.yml up

+Builds usually run on [GitHub Actions](https://github.com/SAP/sailing-analytics/actions/workflows/release.yml) upon every push. A few repository secrets ensure that the build process has the permissions it needs. Pushes to the ``main``, ``docker-24`` and ``releases/*`` branches also publish a [release](https://github.com/SAP/sailing-analytics/releases) after a successful build.

+

+There are two options for building, detailed below; for both, you need to fulfill a few prerequisites.

+

+### Prerequisites

+

+If you have forked the repository and would like to run your own build, you will need the following prerequisites:

+

+#### Google Maps API Key

+

+Create or log on to your Google account and go to the [Google Cloud Console](https://console.cloud.google.com/apis/) and create an API key at least for the Maps JavaScript API. To later run the full product, while you're here, you can also create an API key for the YouTube Data API v3.

+

+#### AWS S3 Bucket for Upload Tests

+

+The build runs integration tests using the AWS API, requiring an access key with permission to upload to a bucket called ``sapsailing-automatic-upload-test``. Create that bucket in your AWS S3 environment. You can create an IAM user with CLI access and a permission policy that restricts write permissions to just that test bucket. You have to create the bucked in AWS region ``eu-west-1``. A permission policy for that user can look like this:

+

+```

+{

+ "Version": "2012-10-17",

+ "Statement": [

+ {

+ "Sid": "Stmt1422015883000",

+ "Effect": "Allow",

+ "Action": [

+ "s3:AbortMultipartUpload",

+ "s3:DeleteObject",

+ "s3:DeleteObjectVersion",

+ "s3:GetBucketAcl",

+ "s3:GetBucketCORS",

+ "s3:GetBucketLocation",

+ "s3:GetBucketLogging",

+ "s3:GetBucketNotification",

+ "s3:GetBucketPolicy",

+ "s3:GetBucketTagging",

+ "s3:GetBucketVersioning",

+ "s3:GetBucketWebsite",

+ "s3:GetLifecycleConfiguration",

+ "s3:GetObject",

+ "s3:GetObjectAcl",

+ "s3:GetObjectTorrent",

+ "s3:GetObjectVersion",

+ "s3:GetObjectVersionAcl",

+ "s3:GetObjectVersionTorrent",

+ "s3:ListAllMyBuckets",

+ "s3:ListBucket",

+ "s3:ListBucketMultipartUploads",

+ "s3:ListBucketVersions",

+ "s3:ListMultipartUploadParts",

+ "s3:PutBucketLogging",

+ "s3:PutBucketNotification",

+ "s3:PutBucketPolicy",

+ "s3:PutBucketTagging",

+ "s3:PutBucketVersioning",

+ "s3:PutBucketWebsite",

+ "s3:PutLifecycleConfiguration",

+ "s3:PutObject",

+ "s3:PutObjectAcl",

+ "s3:PutObjectVersionAcl",

+ "s3:RestoreObject"

+ ],

+ "Resource": [

+ "arn:aws:s3:::sapsailing-automatic-upload-test/*",

+ "arn:aws:s3:::sapsailing-automatic-upload-test"

+ ]

+ }

+ ]

+}

+```

+

+Create an access key for that user and note key ID and secret.

+

+#### Account(s) for geonames.org

+

+The build runs integration tests against [geonames.org](https://geonames.org). Use their login/sign-up form to create your user account and note its username.

+

+### Get the GitHub Actions build to work in your forked repository

+

+Assign the IDs and secrets from the prerequisites to repository secrets in your forked repository as follows:

+

+```

+AWS_S3_TEST_S3ACCESSID: {your-S3-test-bucket-upload-token-ID}

+AWS_S3_TEST_S3ACCESSKEY: {key-for-your-S3-token}

+GEONAMES_ORG_USERNAMES: {comma-separated-list-of-geonames.org-usernames}

+GOOGLE_MAPS_AUTHENTICATION_PARAMS: key={your-Google-Maps-API-key}

+```

+

+Then, manually trigger the ``release`` workflow with default options. You find the "Run workflow" drop-down in your forked repository under ``https://github.com/{your-github-user}/[your-repository-name}/actions/workflows/release.yml``.

+

+Release builds will trigger the ``create-docker-image`` workflow which will produce a Docker image of your release and publish it as a "ghcr" package in your repository. Note that package names are computed from the repository name by converting the latter to all lowercase characters. If you want to use your packages in the docker-compose configurations from the ``docker/`` folder, make sure to adjust the package name so it points to your own fork's package registry.

+

+If you want automatic validation of your changes to the ``main`` branch also for newer Java versions, you can use the ``merge-main-into-docker-24`` workflow. It requires another secret:

+

+```

+REPO_TOKEN_FOR_MERGE_AND_PUSH: {a-GitHub-token-enabled-for-push}

+```

+

+The workflow will launch automatically after a release has been performed for the ``main`` branch and will try to merge the latest ``main`` branch into ``docker-24`` and pushing the merge result if the merge was successful. This will then trigger a build for the ``docker-24`` branch which, if successul, will in turn produce a release and a docker image for use with Java 24.

+

+### Run a build locally

+

+This assumes you have completed the onboarding (see again [here](https://wiki.sapsailing.com/wiki/howto/onboarding)) successfully, including the Maven-specific parts such as having Maven installed (>= 3.9.x) and having a valid ``toolchains.xml`` file in your ~/.m2 folder. Furthermore, set and export the following environment variables:

+

+```

+export AWS_S3_TEST_S3ACCESSID={your-S3-test-bucket-upload-token-ID}

+export AWS_S3_TEST_S3ACCESSKEY={key-for-your-S3-token}

+export GEONAMES_ORG_USERNAMES={comma-separated-list-of-geonames.org-usernames}

+export GOOGLE_MAPS_AUTHENTICATION_PARAMS=key={your-Google-Maps-API-key}

+export JAVA8_HOME={location-of-your-JDK8}

+export JAVA_HOME={location-of-your-JDK17-or-newer}

+```

+

+To build, then invoke

+This will build the Android companion apps first, then the web application. If you lack a proper Android SDK set-up, consider using the ``-a`` option to skip building the Android apps. If the build was successful you can install the product locally by invoking

+You need to have Java 8 installed. Get one from, e.g., [here](https://tools.eu1.hana.ondemand.com/#cloud). Either ensure that this JVM's ``java`` executable in on the ``PATH`` or set ``JAVA_HOME`` appropriately.

+At [https://github.com/SAP/sailing-analytics/releases](https://github.com/SAP/sailing-analytics/releases) you find official product builds. To fetch and install one of them, make an empty directory, change into it and run the ``refreshInstance.sh`` command, e.g., like this:

+SPDX-PackageComment = "The code in this project may include calls to APIs (\"API Calls\") of\n SAP or third-party products or services developed outside of this project\n (\"External Products\").\n \"APIs\" means application programming interfaces, as well as their respective\n specifications and implementing code that allows software to communicate with\n other software.\n API Calls to External Products are not licensed under the open source license\n that governs this project. The use of such API Calls and related External\n Products are subject to applicable additional agreements with the relevant\n provider of the External Products. In no event shall the open source license\n that governs this project grant any rights in or to any External Products,or\n alter, expand or supersede any terms of the applicable additional agreements.\n If you have a valid license agreement with SAP for the use of a particular SAP\n External Product, then you may make use of any API Calls included in this\n project's code for that SAP External Product, subject to the terms of such\n license agreement. If you do not have a valid license agreement for the use of\n a particular SAP External Product, then you may only make use of any API Calls\n in this project for that SAP External Product for your internal, non-productive\n and non-commercial test and evaluation of such API Calls. Nothing herein grants\n you any rights to use or access any SAP External Product, or provide any third\n parties the right to use of access any SAP External Product, through API Calls."

+extra="${extra} -Dgwt.workers=${GWT_WORKERS} -Djava.io.tmpdir=$TMP -Dgwt.workDir=$TMP"

+ # /var/run is writable only for root, so we need to be able to sudo:

+ sudo bash -c "echo ${last_change_millis} >${LAST_CHANGE_FILE}"

+# Setup script for Amazon Linux 2023. Use 50g root partition.

+# May need to update macro definitions for the archive IP.

+RELEASE_TAR_GZ_FILE_NAME=$( `dirname "${0}"`/github-download-release-assets.sh "${BEARER_TOKEN}" "${RELEASE_NAME_PREFIX}" SAP/sailing-analytics )

+# ./github-download-release-assets.sh {BEARER_TOKEN} {release-name-prefix} {repository-name}

+# ./github-download-release-assets.sh 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 main- SAP/sailing-analytics

+GITHUB_REPOSITORY="${3}"

+RELEASES=$( curl -L -H 'Authorization: Bearer '${BEARER_TOKEN} https://api.github.com/repos/${GITHUB_REPOSITORY}/releases 2>/dev/null )

+ curl -o "${RELEASE_TAR_GZ_FILE_NAME}" -L -H 'Accept: application/octet-stream' -H 'Authorization: Bearer '${BEARER_TOKEN} 'https://api.github.com/repos/'${GITHUB_REPOSITORY}'/releases/assets/'${RELEASE_TAR_GZ_ASSET_ID}

+ curl -o release-notes.txt -L -H 'Accept: application/octet-stream' -H 'Authorization: Bearer '${BEARER_TOKEN} 'https://api.github.com/repos/'${GITHUB_REPOSITORY}'/releases/assets/'${RELEASE_NOTES_TXT_ASSET_ID}

+GITHUB_REPOSITORY="${3}"

+NEXT_PAGE="https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/runs?created=${DATE_YESTERDAY/+/%2B}..${UNIX_DATE/+/%2B}&per_page=100"

+release_prefix="$1"

+GITHUB_REPOSITORY="$2"

+OWNER=${GITHUB_REPOSITORY%%/*}

+OWNER_LOWER=$(echo "$OWNER" | tr '[:upper:]' '[:lower:]')

+REPO=${GITHUB_REPOSITORY##*/}

+REPO_LOWER=$(echo "$REPO" | tr '[:upper:]' '[:lower:]')

+PACKAGE="$OWNER_LOWER/$REPO_LOWER"

+RELEASE_TAR_GZ_FILENAME=$( ${GITROOT}/configuration/github-download-release-assets.sh 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 "${release_prefix}" "${GITHUB_REPOSITORY}" )

+ docker buildx build --builder=container --platform=linux/amd64,linux/arm64 --build-arg RELEASE=${release} -t ghcr.io/${PACKAGE}:${release} --push .

+release_prefix="$1"

+GITHUB_REPOSITORY="$2"

+OWNER=${GITHUB_REPOSITORY%%/*}

+OWNER_LOWER=$(echo "$OWNER" | tr '[:upper:]' '[:lower:]')

+REPO=${GITHUB_REPOSITORY##*/}

+REPO_LOWER=$(echo "$REPO" | tr '[:upper:]' '[:lower:]')

+PACKAGE="$OWNER_LOWER/$REPO_LOWER"

+RELEASE_TAR_GZ_FILENAME=$( ${GITROOT}/configuration/github-download-release-assets.sh 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 "${release_prefix}" "${GITHUB_REPOSITORY}" )

+ docker build --build-arg RELEASE=${release} -t ghcr.io/${PACKAGE}:${release}-arm .

+ docker push ghcr.io/${PACKAGE}:${release}-arm

+ docker tag ghcr.io/${PACKAGE}:${release}-arm ghcr.io/${PACKAGE}:latest-arm

+ docker push ghcr.io/${PACKAGE}:latest-arm

+release_prefix="$1"

+GITHUB_REPOSITORY="$2"

+OWNER=${GITHUB_REPOSITORY%%/*}

+OWNER_LOWER=$(echo "$OWNER" | tr '[:upper:]' '[:lower:]')

+REPO=${GITHUB_REPOSITORY##*/}

+REPO_LOWER=$(echo "$REPO" | tr '[:upper:]' '[:lower:]')

+PACKAGE="$OWNER_LOWER/$REPO_LOWER"

+RELEASE_TAR_GZ_FILENAME=$( ${GITROOT}/configuration/github-download-release-assets.sh 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 "${release_prefix}" "${GITHUB_REPOSITORY}" )

+ docker build --build-arg RELEASE=${release} -t ghcr.io/${PACKAGE}:${release} -f Dockerfile_sapsailing_on_sapmachine11 .

+ docker push ghcr.io/${PACKAGE}:${release}

+ docker tag ghcr.io/${PACKAGE}:${release} ghcr.io/${PACKAGE}:latest-11

+ docker push ghcr.io/${PACKAGE}:latest-11

+release_prefix="$1"

+GITHUB_REPOSITORY="$2"

+OWNER=${GITHUB_REPOSITORY%%/*}

+OWNER_LOWER=$(echo "$OWNER" | tr '[:upper:]' '[:lower:]')

+REPO=${GITHUB_REPOSITORY##*/}

+REPO_LOWER=$(echo "$REPO" | tr '[:upper:]' '[:lower:]')

+PACKAGE="$OWNER_LOWER/$REPO_LOWER"

+RELEASE_TAR_GZ_FILENAME=$( ${GITROOT}/configuration/github-download-release-assets.sh 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 "${release_prefix}" "${GITHUB_REPOSITORY}" )

+ docker build --build-arg RELEASE=${release} -t ghcr.io/${PACKAGE}:${release} -f Dockerfile_sapsailing_on_sapmachine17 .

+ docker push ghcr.io/${PACKAGE}:${release}

+ docker tag ghcr.io/${PACKAGE}:${release} ghcr.io/${PACKAGE}:latest-17

+ docker push ghcr.io/${PACKAGE}:latest-17

+ final Iterable<Document> queryResult = (clientSessionOrNull == null ? messagesCollection.find(query)

+ : messagesCollection.find(clientSessionOrNull, query)).sort(Sorts.ascending(FieldNames.IGTIMI_MESSAGES_TIMESTAMP.name()));

+ * When combined with {@link IgtimiWindReceiver} (which is such a {@link BulkFixReceiver}),

+ * for a websocket connection.<p>

+ if (webSocketClient.getDeviceSerialNumbers().contains(deviceSerialNumber)) {

+ final User user = webSocketClient.getAuthenticatedUser();

+ final OwnershipAnnotation deviceOwnership = securityService.getOwnership(device.getIdentifier());

+ final AccessControlListAnnotation deviceAccessControlList = securityService.getAccessControlList(device.getIdentifier());

+ if (!Util.isEmpty(Util.filter(daws, daw->{

+ final OwnershipAnnotation dawOownership = securityService.getOwnership(daw.getIdentifier());

+ final AccessControlListAnnotation dawAccessControlList = securityService.getAccessControlList(daw.getIdentifier());

+ return PermissionChecker.isPermitted(

+ daw.getIdentifier().getPermission(DefaultActions.READ),

+ user, securityService.getAllUser(),

+ dawOownership==null?null:dawOownership.getAnnotation(),

+ dawAccessControlList==null?null:dawAccessControlList.getAnnotation());

+ }))

+ && PermissionChecker.isPermitted(

+ device.getIdentifier().getPermission(DefaultActions.READ),

+ deviceOwnership==null?null:deviceOwnership.getAnnotation(),

+ deviceAccessControlList==null?null:deviceAccessControlList.getAnnotation()) ) {

+ webSocketClient.sendBytesByFuture(ByteBuffer.wrap(messageAsBytes));

+ }

+ * Returns a wind fix produced out of an AWS/AWA and other fixes, as well as the fixes used for this (in case of

+ * interpolation between two fixes, the older one of the two is returned), including a {@link BatteryLevel} fix, if

+ * any was found, although this did technically not contribute to the production of the {@link Wind} object.

+ * improve precision of boat speed / course over SOG/COG measurements:

+ * earlier than the {@code timePoint} given. This in particular preserves at least one live fix which will "hide"

+ * older, e.g., buffered fixes that may be received when a WindBot device sends them out-of-order. For old, buffered

+ * fixes this may still mean that could be dropped prior to being converted into a {@link Wind} object with an older

+ * time stamp, but usually---and particularly with buffered data from previous days---this shouldn't be a problem.

+ * Also, old data can still be imported at a later point in time.

+ trackToCleanUp.removeAllUpToExcluding(fix);

+ /**

+ * Calculates a linear interpolation of values based on their time points and a target time point that is expected

+ * to be in between (inclusive) the two time points for the two values. If the two time points for the two values

+ * are equal, the average of the two values is returned.

+ */

+ <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>

+ <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=com.sap.sailing.domain.test/src&lt;com.sap.sailing.domain.test"/>

+package com.sap.sailing.domain.test;

+

+import com.sap.sailing.domain.base.Regatta;

+import com.sap.sailing.domain.leaderboard.RegattaLeaderboardWithEliminations;

+import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule;

+import com.sap.sailing.domain.leaderboard.impl.DelegatingRegattaLeaderboardWithCompetitorElimination;

+

+public class LeaderboardCourseChangeWithEliminationTest extends LeaderboardCourseChangeTest {

+ @Override

+ protected RegattaLeaderboardWithEliminations createRegattaLeaderboard(Regatta regatta,

+ ThresholdBasedResultDiscardingRule discardingRule) {

+ return new DelegatingRegattaLeaderboardWithCompetitorElimination(

+ ()->super.createRegattaLeaderboard(regatta, discardingRule), "Test leaderboard with elimination");

+ }

+}

+ // assert that theUntrackedCompetitorInLastRace ended up ranked worse than all participants of ranked fleets:

+ assertTrue(Util.indexOf(rankedCompetitors, c) < Util.indexOf(rankedCompetitors, theUntrackedCompetitorInLastRace));

+ if (getTrackedRace() != null) {

+ getTrackedRace().onStatusChanged(OnlineTracTracBasedTest.this, lastStatus);

+ }

+ for (Waypoint w : getRace().getCourse().getWaypoints()) {

+ if (w.getPassingInstructions() == PassingInstruction.Starboard) {

+ assertEquals(2, i);

+package com.sap.sailing.domain.test;

+

+import static org.junit.jupiter.api.Assertions.assertFalse;

+import static org.junit.jupiter.api.Assertions.assertTrue;

+import static org.mockito.Mockito.mock;

+import static org.mockito.Mockito.when;

+

+import java.util.Arrays;

+import java.util.UUID;

+

+import org.junit.jupiter.api.BeforeEach;

+import org.junit.jupiter.api.Test;

+

+import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;

+import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl;

+import com.sap.sailing.domain.abstractlog.race.RaceLog;

+import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;

+import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RegisteredCompetitorsAnalyzer;

+import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogRegisterCompetitorEventImpl;

+import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogUseCompetitorsFromRaceLogEventImpl;

+import com.sap.sailing.domain.abstractlog.regatta.RegattaLog;

+import com.sap.sailing.domain.abstractlog.regatta.impl.RegattaLogImpl;

+import com.sap.sailing.domain.base.CompetitorWithBoat;

+import com.sap.sailing.domain.base.Fleet;

+import com.sap.sailing.domain.base.RaceColumnInSeries;

+import com.sap.sailing.domain.base.Series;

+import com.sap.sailing.domain.base.impl.FleetImpl;

+import com.sap.sailing.domain.base.impl.SeriesImpl;

+import com.sap.sailing.domain.leaderboard.Leaderboard;

+import com.sap.sailing.domain.leaderboard.SettableScoreCorrection;

+import com.sap.sailing.domain.leaderboard.impl.ScoreCorrectionImpl;

+import com.sap.sse.common.TimePoint;

+import com.sap.sse.common.Util.Pair;

+

+/**

+ * See bug6168; tests fleet-specific check for score corrections in race columns that suggest that this

+ * fleet has finished the race.

+ *

+ * @author Axel Uhl (d043530)

+ *

+ */

+public class ScoreCorrectionForUntrackedRacesTest extends StoredTrackBasedTest {

+ private RaceColumnInSeries f1;

+ private RaceColumnInSeries f2;

+ private Series series;

+ private Fleet gold;

+ private Fleet silver;

+ private RegattaLog regattaLog;

+ private RaceLog goldRaceLogF1;

+ private RaceLog goldRaceLogF2;

+ private RaceLog silverRaceLogF1;

+ private RaceLog silverRaceLogF2;

+ private SettableScoreCorrection scoreCorrection;

+ private CompetitorWithBoat c1;

+ private CompetitorWithBoat c2;

+ private AbstractLogEventAuthor author;

+ private Leaderboard leaderboard;

+

+ @BeforeEach

+ public void setUp() {

+ leaderboard = mock(Leaderboard.class);

+ c1 = createCompetitorWithBoat("C1");

+ c2 = createCompetitorWithBoat("C2");

+ author = new LogEventAuthorImpl("Test", 1);

+ gold = new FleetImpl("Gold", 1);

+ silver = new FleetImpl("Silver", 2);

+ series = new SeriesImpl("Default", /* isMedal */ false, /* isFleetsCanRunInParallel */ true, Arrays.asList(gold, silver), Arrays.asList("F1", "F2"), /* trackedRegattaRegistry */ null);

+ f1 = mock(RaceColumnInSeries.class);

+ when(f1.getName()).thenReturn("F1");

+ when(f1.getSeries()).thenReturn(series);

+ when(f1.getKey(c1)).thenReturn(new Pair<>(c1, f1));

+ when(f1.getKey(c2)).thenReturn(new Pair<>(c2, f1));

+ goldRaceLogF1 = new RaceLogImpl(UUID.randomUUID());

+ silverRaceLogF1 = new RaceLogImpl(UUID.randomUUID());

+ when(f1.getRaceLog(gold)).thenReturn(goldRaceLogF1);

+ when(f1.getRaceLog(silver)).thenReturn(silverRaceLogF1);

+ f2 = mock(RaceColumnInSeries.class);

+ when(f2.getName()).thenReturn("F2");

+ when(f2.getSeries()).thenReturn(series);

+ when(f2.getKey(c1)).thenReturn(new Pair<>(c1, f2));

+ when(f2.getKey(c2)).thenReturn(new Pair<>(c2, f2));

+ goldRaceLogF2 = new RaceLogImpl(UUID.randomUUID());

+ silverRaceLogF2 = new RaceLogImpl(UUID.randomUUID());

+ when(f2.getRaceLog(gold)).thenReturn(goldRaceLogF2);

+ when(f2.getRaceLog(silver)).thenReturn(silverRaceLogF2);

+ goldRaceLogF1.add(new RaceLogUseCompetitorsFromRaceLogEventImpl(TimePoint.now(), author, TimePoint.now(), UUID.randomUUID(), 0));

+ goldRaceLogF1.add(new RaceLogRegisterCompetitorEventImpl(TimePoint.now(), author, /* passId */ 0, c1));

+ goldRaceLogF2.add(new RaceLogUseCompetitorsFromRaceLogEventImpl(TimePoint.now(), author, TimePoint.now(), UUID.randomUUID(), 0));

+ goldRaceLogF2.add(new RaceLogRegisterCompetitorEventImpl(TimePoint.now(), author, /* passId */ 0, c1));

+ silverRaceLogF1.add(new RaceLogUseCompetitorsFromRaceLogEventImpl(TimePoint.now(), author, TimePoint.now(), UUID.randomUUID(), 0));

+ silverRaceLogF1.add(new RaceLogRegisterCompetitorEventImpl(TimePoint.now(), author, /* passId */ 0, c2));

+ silverRaceLogF2.add(new RaceLogUseCompetitorsFromRaceLogEventImpl(TimePoint.now(), author, TimePoint.now(), UUID.randomUUID(), 0));

+ silverRaceLogF2.add(new RaceLogRegisterCompetitorEventImpl(TimePoint.now(), author, /* passId */ 0, c2));

+ regattaLog = new RegattaLogImpl(UUID.randomUUID());

+ when(f1.getAllCompetitors(gold)).thenReturn(new RegisteredCompetitorsAnalyzer(goldRaceLogF1, regattaLog).analyze());

+ when(f1.getAllCompetitors(silver)).thenReturn(new RegisteredCompetitorsAnalyzer(silverRaceLogF1, regattaLog).analyze());

+ when(f2.getAllCompetitors(gold)).thenReturn(new RegisteredCompetitorsAnalyzer(goldRaceLogF2, regattaLog).analyze());

+ when(f2.getAllCompetitors(silver)).thenReturn(new RegisteredCompetitorsAnalyzer(silverRaceLogF2, regattaLog).analyze());

+ scoreCorrection = new ScoreCorrectionImpl(leaderboard);

+ scoreCorrection.correctScore(c1, f1, 1.0);

+ scoreCorrection.correctScore(c1, f2, 1.0);

+ scoreCorrection.correctScore(c2, f1, 1.0);

+ }

+

+ @Test

+ public void testNumberOfRacesWithCorrections() {

+ assertTrue(scoreCorrection.hasCorrectionForNonTrackedFleet(f1, gold));

+ assertTrue(scoreCorrection.hasCorrectionForNonTrackedFleet(f1, silver));

+ assertTrue(scoreCorrection.hasCorrectionForNonTrackedFleet(f2, gold));

+ assertFalse(scoreCorrection.hasCorrectionForNonTrackedFleet(f2, silver));

+ }

+}

+import com.sap.sailing.domain.base.Fleet;

+ * @param fleet TODO

+ boolean hasCorrectionForNonTrackedFleet(RaceColumn raceInLeaderboard, Fleet fleet);

+ * If the race column only has one fleet, no decision is made and 0 is returned. Otherwise, if there are other fleets with

+ * a {@link Fleet#getOrdering() rank} different from that of <code>fleet</code>, we want to sort competitors with no fleet

+ * assignment to the "worse" end of the leaderboard, therefore returning 1. Otherwise, 0 is returned.

+ boolean greaterFleetExists = false;

+ boolean lesserFleetExists = false;

+ greaterFleetExists = greaterFleetExists || f.compareTo(fleet) > 0;

+ lesserFleetExists = lesserFleetExists || f.compareTo(fleet) < 0;

+ final int result;

+ if (othersExist && (greaterFleetExists || lesserFleetExists)) {

+ result = -1; // the competitor with no fleet is considered worse than a competitor in one of the ranked fleets

+ } else {

+ result = 0;

+import com.sap.sailing.domain.base.Fleet;

+ return internalHasScoreCorrectionFor(raceInLeaderboard);

+ private boolean internalHasScoreCorrectionFor(RaceColumn raceInLeaderboard) {

+ for (final Pair<Competitor, RaceColumn> correctedScoresKey : correctedScores.keySet()) {

+ if (correctedScoresKey.getB() == raceInLeaderboard) {

+ if (maxPointsReasonsKey.getB() == raceInLeaderboard) {

+ public boolean hasCorrectionForNonTrackedFleet(RaceColumn raceInLeaderboard, Fleet fleet) {

+ boolean result;

+ if (raceInLeaderboard.getTrackedRace(fleet) == null) {

+ result = false;

+ for (final Competitor competitor : raceInLeaderboard.getAllCompetitors(fleet)) {

+ final Pair<Competitor, RaceColumn> key = raceInLeaderboard.getKey(competitor);

+ if (correctedScores.containsKey(key) || maxPointsReasons.containsKey(key)) {

+ result = true;

+ break;

+ }

+ }

+ } else {

+ result = false;

+ }

+ return result;

+ void removeAllUpToExcluding(FixType fix);

+ public void removeAllUpToExcluding(FixType fix) {

+ getInternalFixes().removeAllLessThan(fix);

+import java.util.Optional;

+ /**

+ * The system property name to get the comma separated list of geonames.org usernames; takes precedence over

+ * the environment variable whose name is given by {@link #USERNAMES_ENV_VARIABLE_NAME}.

+ */

+

+ /**

+ * The environment variable name to get the comma separated list of geonames.org usernames. Not evaluated

+ * if the system property whose name is given by {@link #USERNAMES_SYSTEM_PROPERTY_NAME} is set.

+ */

+ private static final String USERNAMES_ENV_VARIABLE_NAME = "GEONAMES_ORG_USERNAMES";

+

+ /**

+ * Default username in case neither system property nor environment variable is set.

+ */

+ final String commaSeparatedUsernames = System.getProperty(USERNAMES_SYSTEM_PROPERTY_NAME,

+ Optional.ofNullable(System.getenv(USERNAMES_ENV_VARIABLE_NAME)).orElse(GEONAMES_DEFAULT_USER_NAME));

+ <li>Competitors not assigned to any fleet will no longer be sorted in between a Gold

+ and a Silver fleet but will end up "at the bottom" of the leaderboard.</li>

+ <li>Bug fix: when a split-fleet series had results only entered manually as score

+ corrections, the progress bars for the series were not shown properly. All

+ fleets would be considered finished although some may not have seen results.</li>

+ // bug6168: for split fleets we need to check the fleet too

+ if (trackedRace == null && scoreCorrection != null && scoreCorrection.hasCorrectionForNonTrackedFleet(raceColumn, fleet)) {

+ final TextBox optionalBearerTokenBox = new TextBox();

+ correctByDeclination.getValue(),

+ Util.hasLength(optionalBearerTokenBox.getValue()) ? optionalBearerTokenBox.getValue().trim() : null,

+ new AsyncCallback<Map<RegattaAndRaceIdentifier, Integer>>() {

+ final HorizontalPanel tokenPanel = new HorizontalPanel();

+ tokenPanel.setSpacing(5);

+ tokenPanel.add(new Label(stringMessages.optionalBearerTokenForWindImport()));

+ tokenPanel.add(optionalBearerTokenBox);

+ contentPanel.add(tokenPanel);

+ boolean correctByDeclination, String optionalBearerTokenOrNull)

+ String optionalBearerTokenOrNull, AsyncCallback<Map<RegattaAndRaceIdentifier, Integer>> asyncCallback);

+ String optionalBearerTokenForWindImport();

+exportWindSpeedHistogramToCsv=Export Wind Speed histogram to CSV

+optionalBearerTokenForWindImport=Optional bearer token for wind import

+exportWindSpeedHistogramToCsv=Histogramm der wahren Windgeschwindigkeiten in CSV exportieren

+optionalBearerTokenForWindImport=Optionales Bearer Token für Wind-Import

+import java.util.Optional;

+

+ /**

+ * If the system property named after this constant is set, its value is used for Google Maps API authentication.

+ * It takes precedence over the environment variable named after {@link #GOOGLE_MAPS_LOADER_AUTHENTICATION_PARAMS_ENV_VAR_NAME}.

+ */

+ /**

+ * If the system property named after {@link #GOOGLE_MAPS_LOADER_AUTHENTICATION_PARAMS_PROPERTY_NAME} is not set,

+ * this environment variable is checked for Google Maps API authentication parameters.

+ */

+ private final static String GOOGLE_MAPS_LOADER_AUTHENTICATION_PARAMS_ENV_VAR_NAME = "GOOGLE_MAPS_AUTHENTICATION_PARAMS";

+

+ /**

+ * The system property named after this constant is expected to provide the YouTube V3 API key. Takes precedence over

+ * the environment variable named after {@link #YOUTUBE_V3_API_KEY_ENV_VAR_NAME}.

+ */

+ * If the system property named after {@link #YOUTUBE_V3_API_KEY_PROPERTY_NAME} is not set, this environment variable

+ * is checked for the YouTube V3 API key.

+ */

+ private final static String YOUTUBE_V3_API_KEY_ENV_VAR_NAME = "YOUTUBE_V3_API_KEY";

+

+ /**

+ googleMapsLoaderAuthenticationParams = Optional

+ .ofNullable(context.getProperty(GOOGLE_MAPS_LOADER_AUTHENTICATION_PARAMS_PROPERTY_NAME))

+ .orElse(System.getenv(GOOGLE_MAPS_LOADER_AUTHENTICATION_PARAMS_ENV_VAR_NAME));

+ youtubeApiKey = Optional

+ .ofNullable(context.getProperty(YOUTUBE_V3_API_KEY_PROPERTY_NAME))

+ .orElse(System.getenv(YOUTUBE_V3_API_KEY_ENV_VAR_NAME));

+ /**

+ * @param optionalBearerToken

+ * if present, this bearer token is used to authenticate the Igtimi connection; otherwise, we try to use

+ * Igtimi default credentials provided at startup through the {@code igtimi.bearer.token} system

+ * property. Only if no such system property has been set, we look for a logged-in user in the

+ * {@link #getSecurityService() security service} and use its access token

+ */

+ protected IgtimiConnection createIgtimiConnection(Optional<String> optionalBearerToken) {

+ return optionalBearerToken.map(bearerToken->getIgtimiConnectionFactory().getOrCreateConnection(bearerToken))

+ .orElse(getIgtimiConnectionFactory().getOrCreateConnection(()->getSecurityService().getCurrentUser() != null

+ ? getSecurityService().getAccessToken(getSecurityService().getCurrentUser().getName())

+ : null));

+ boolean correctByDeclination, String optionalBearerTokenOrNull)

+ final IgtimiConnection conn = createIgtimiConnection(Optional.ofNullable(optionalBearerTokenOrNull));

+import java.util.Map.Entry;

+ for (Entry<String, String> e : config.getSystemProperties().entrySet()) {

+ System.setProperty(e.getKey(), e.getValue());

+ }

+}

+ Thread.sleep(30000); // wait for 30s to allow all wind fixes to get processed by the PolarDataService

+ <h2 class="articleSubheadline">October 2025</h2>

+ <ul class="bulletList">

+ <li>When WindBots sent buffered data, e.g., from previous days, there was a possibility that

+ under some circumstances this data may have interfered with live data, leading, e.g.,

+ to "jumping" WindBot positions. This has now been fixed.<p>

+ <li>For the following system properties, alternative environment variables have been introduced:

+ <ul>

+ <li><tt>AWS_S3_TEST_S3ACCESSID</tt> for <tt>aws.s3.test.s3AccessId</tt></li>

+ <li><tt>AWS_S3_TEST_S3ACCESSKEY</tt> for <tt>aws.s3.test.s3AccessKey</tt></li>

+ <li><tt>GOOGLE_MAPS_AUTHENTICATION_PARAMS</tt> for <tt>google.maps.authenticationparams</tt></li>

+ <li><tt>YOUTUBE_V3_API_KEY</tt> for <tt>youtube.api.key</tt></li>

+ <li><tt>GEONAMES_ORG_USERNAMES</tt> for <tt>geonames.org.usernames</tt></li>

+ </ul>

+ If the system property is set, it takes precedence over the environment variable.</li>

+ </ul>

+ * Provide the S3 credentials for an IAM account that has access to the "sapsailing-automatic-upload-test" bucket in the

+ * system properties {@code aws.s3.test.s3AccessId} and {@code aws.s3.test.s3AccessKey}. For the build script in

+ * {@code configuration/buildAndUpdateProduct.sh} this can be done by setting the {@code APP_PARAMETERS} environment

+ * variable for the script like this:

+ * {@code APP_PARAMETERS="-Daws.s3.test.s3AccessId=... -Daws.s3.test.s3AccessKey=..."}. Alternatively, e.g., in order to

+ * avoid system property setting with the "-D" command line option to be shown in log files, you may pass the ID and key

+ * as environment variables {@code AWS_S3_TEST_S3ACCESSID} and {@code AWS_S3_TEST_S3ACCESSKEY}, respectively.

+ public static final String s3AccessId = System.getProperty("aws.s3.test.s3AccessId", System.getenv("AWS_S3_TEST_S3ACCESSID"));

+ public static final String s3AccessKey = System.getProperty("aws.s3.test.s3AccessKey", System.getenv("AWS_S3_TEST_S3ACCESSKEY"));

+import software.amazon.awssdk.services.elasticloadbalancingv2.model.IpAddressType;

+ .ipAddressType(IpAddressType.DUALSTACK) // IPv4 and IPv6

+ if (mailSmtpUser != null) {

+ userData.put(DefaultProcessConfigurationVariables.MAIL_SMTP_USER, mailSmtpUser);

+ }

+ - The primary Git repository for the project is hosted on Github (see [https://github.com/SAP/sailing-analytics](https://github.com/SAP/sailing-analytics)). To clone, use ``git@github.com:SAP/sailing-analytics.git``. To gain write access you have to become member of the [sailing-analytics-team](https://github.com/orgs/SAP/teams/sailing-analytics-team) organization. For that you need to [link your Github user to the Github SAP organization](https://wiki.one.int.sap/wiki/display/ospodocs/Self-Service+for+Joining+an+SAP+GitHub+Organization). For that to work, your Github account needs to have your @sap.com e-mail address assigned and verified. We still have a shadow repository around that, e.g., powers our Wiki at [https://wiki.sapsailing.com](https://wiki.sapsailing.com) and which lives at ``ssh://trac@sapsailing.com/home/trac/git``.

+This will upgrade all packages installed as well as the kernel. When run interactively, upgrade requiring a reboot will be displayed in the update list in red color. For scripted use, consider the ``needs-restarting -r`` command, delivering an exit status of ``1`` if a reboot is required.