Merge remote-tracking branch 'origin/master' into bug5311

This commit is contained in:
Alessandro Stoltenberg
2020-07-16 18:00:22 +02:00
2 changed files with 3 additions and 3 deletions
@@ -35,7 +35,7 @@ public class MasterDataImportResource extends AbstractSailingServerResource {
@FormParam("targetServerUsername") String targetServerUsername,
@FormParam("targetServerPassword") String targetServerPassword,
@FormParam("targetServerBearerToken") String targetServerBearerToken,
@FormParam("uuids[]") List<UUID> requestedLeaderboardGroupIds,
@FormParam("UUID[]") List<UUID> requestedLeaderboardGroupIds,
@FormParam("override") Boolean override,
@FormParam("compress") Boolean compress,
@FormParam("exportWind") Boolean exportWind,
@@ -27,7 +27,7 @@
<td>Mandatory parameters:</td>
<td>
<div>targetServerUrlAsString, the remote server from which to import.</div>
<div>uuids[], the UUIDs of the leaderboardgroups to be requested from the remote server.</div>
<div>UUID[], the UUIDs of the leaderboardgroups to be requested from the remote server.</div>
<div>override, whether to override a leaderboardgroup already available on the server.</div>
<div>compress, use only if remote server instance is at least running with commit 0fbf6071dea125bec4a56dee55d61c99def4a62e.</div>
<div>exportWind, if false no wind data will be imported.</div>
@@ -50,7 +50,7 @@
</tr>
<tr>
<td>Example:</td>
<td>curl -X POST http://127.0.0.1:8889/sailingserver/api/v1/masterdataimport -d "targetServerUrl=127.0.0.1:8888" -d "uuids[]=75e86618-8b0f-4291-9661-6b2a1fa47dff" -d "override=false" -d "compress=true" -d "exportWind=false" -d "exportDeviceConfigs=false" -d "exportTrackedRacesAndStartTracking=false" -d "targetServerUsername=admin" -d "targetServerPassword=admin" -H "Authorization: Basic YWRtaW46YWRtaW4="<br>
<td>curl -X POST http://127.0.0.1:8889/sailingserver/api/v1/masterdataimport -d "targetServerUrl=127.0.0.1:8888" -d "UUID[]=75e86618-8b0f-4291-9661-6b2a1fa47dff" -d "override=false" -d "compress=true" -d "exportWind=false" -d "exportDeviceConfigs=false" -d "exportTrackedRacesAndStartTracking=false" -d "targetServerUsername=admin" -d "targetServerPassword=admin" -H "Authorization: Basic YWRtaW46YWRtaW4="<br>
produces output:<pre>
{
"LeaderboardgroupsImported": {