Simon Pamies
770b65da3a
Added null checks as value returned by JSON might be empty
2018-09-07 21:12:42 +02:00
Simon Pamies
c5a9b737bb
Making deserialization more robust against different types of numbers
2018-09-07 17:49:51 +02:00
D067890
f63e5923dc
bug4668: updated deserializer and serializer to turn tests green
2018-07-12 10:25:15 +02:00
Peter Siegmund
3ad383d42d
Merge branch 'master' into bug4239
2018-06-21 12:56:16 +02:00
Maximilian Groß
37917a50a4
Merge branch 'master' into bug4491
...
# Conflicts:
# java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java
# java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorWithContext.java
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoExtendedFixImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties
# java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverMainCurveWithEstimationDataJsonDeserializer.java
# java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java
2018-05-28 08:35:21 +02:00
Axel Uhl
00c80cb3c3
fixed de-serialization of anniversary race details
2018-05-19 11:32:26 +02:00
Maximilian Groß
e977678869
Merge branch 'master' into bug4491
...
# Conflicts:
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/CompleteManeuverCurveWithEstimationDataImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsView.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsViewImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardView.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardViewImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/LeaderboardContext.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
2018-04-20 13:10:37 +02:00
Axel Uhl
18c777a99f
adjusted SwissTiming connector to accomodate UUIDs for mark devices and competitors
...
Change-Id: Ieaca20de4eacbbc5c64e218fb557045f2590e6f6
2018-04-19 17:24:54 +02:00
Axel Uhl
837004e765
Merge branch 'bug4509'
2018-04-14 10:38:46 +02:00
Axel Uhl
df3fc3ffe6
made boat JSON deserialization backward compatible by using competitor ID as default boat ID
...
Change-Id: I7b6c0431ebe4085d035bd9a64d9b1f4dadad192f
2018-04-13 21:11:55 +02:00
Maximilian Groß
ed1fae0c8f
divided datamining from sailing specific classes
2018-04-12 07:40:59 +02:00
Axel Uhl
1cf923a027
use DynamicCompetitor and DynamicBoat where necessary
...
Change-Id: Id06014ac0baba5ea2315894068003c80733f1b0e
2018-04-11 17:26:20 +02:00
Axel Uhl
07105f65d8
let CompetitorWithBoatRefJsonDeserializer inherit from CompetitorJsonDeserializer
...
Change-Id: I177b2c1a5a96bb9e9313e86d3535ecd4cc70cce7
2018-04-11 14:19:43 +02:00
Axel Uhl
e4e9cdb22c
changed CompetitorAndBoat[De]Serializer such that it is backward compatible for CompetitorWithBoat
...
Change-Id: Ia5717bdef5d9db7833b8d44df061dce524cecf85
2018-04-09 18:23:33 +02:00
Axel Uhl
06447318e5
bug4500: consolidated the two Competitor Json (De-)Serializers into one
...
Change-Id: I517a2649b6175f11f5e1c7b35fdc439f1982dca4
2018-04-09 16:39:17 +02:00
Axel Uhl
827824f699
re-added "boat" field to competitor serialization for backward compatibility
...
Change-Id: I01c2d405b5d261b032caefb261f0be18b2f9d026
2018-04-06 17:31:05 +02:00
Axel Uhl
360f72a6a7
Merge branch 'master' into bug2822_boatcolors
2018-03-24 08:49:11 +01:00
Axel Uhl
bd90f921dd
added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule
2018-03-24 01:45:37 +01:00
Axel Uhl
8f1e5e4229
making it absolutely clear by renaming idClass to competitorIdClass
...
Change-Id: Ia287e4ae15b1c6aec98dc61dae76e1429c14c8d8
2018-03-19 22:59:26 +01:00
Axel Uhl
3bcff4e918
inserted a block to ensure locality of idClass
...
Change-Id: I84e1c9f920371d5f15f173b7de90922464e403ee
2018-03-19 22:58:59 +01:00
Axel Uhl
78a1f4caf1
log replacement of a Competitor object with another one with equal ID
...
Change-Id: I6e35dc8c2160377dec58cba032b33c08e3774445
2018-03-19 21:17:11 +01:00
Frank Mittag
162392a435
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2018-02-27 15:17:45 +01:00
Kai Boernert
f505b10d50
removed RaceLogCourseAreaChangedEvent
2018-02-23 17:06:14 +01:00
Frank Mittag
4999933364
added 'canBoatsOfCompetitorsChangePerRace' attribute to RaceGroup for usage in RCApp
2018-02-13 15:57:03 +01:00
Frank Mittag
4f5792b797
little improvement with field names
2018-02-12 12:49:41 +01:00
Frank Mittag
6a7d33bda8
Implemented a CompetitorAndBoatJsonSerializer and CompetitorAndBoatJsonDeserializer to implement a /rc/competitorsAndBoats service call to transfer Competitor/Boat pairs to the rcApp
2018-02-09 14:23:47 +01:00
Frank Mittag
df3565cd7e
just some cleanup of protected vs. final
2018-02-09 14:22:30 +01:00
Frank Mittag
950104f20c
fixed Json Serializer for competitors with boats with invalid constructor args
2018-02-08 10:06:51 +01:00
Axel Uhl
ae70f96104
use Duration for protest time defaults in regatta configuration
...
Change-Id: Ie0554276aa96bd304a2787b7f297e69f84df371a
2018-02-01 10:54:31 +01:00
Axel Uhl
dcb43721e6
don't use "instanceof CompetitorWithBoat" because of live migration;
...
when a tracked race is loaded into a regatta with changing boats and the
competitor has a boat, it is migrated "in place" with its boat reference
set to null; this way it is possible to have a CompetitorWithBoat object
that returns false from hasBoat(). Therefore, hasBoat() must be
preferred over a type check
Change-Id: Ic74441bfb48566e66cb88391b52537303638d564
2018-01-16 12:43:30 +01:00
Peter Siegmund
7d825e3fb2
remove unused variable
2018-01-16 08:42:17 +01:00
Peter Siegmund
b46e0409e9
save and transfer default protest time to Android
2018-01-16 08:10:48 +01:00
Frank Mittag
62438c83d6
Merged RaceLogRegisterCompetitorEvent and RaceLogRegisterCompetitorAndBoatEvent into just RaceLogRegisterCompetitorEvent to make it easier to handle regattas with changing boats and non changing boats
2017-12-07 16:31:06 +01:00
Frank Mittag
aaff138c14
Fixed migration of archived tractrac races with changing boats for some corner cases.
...
Added a 'LegacyBoatJsonDeserializer' to make sure that changes in the BoatJsonDeserializer will not effect the competitors migration of old servers
2017-11-29 00:21:36 +01:00
Frank Mittag
d45de24610
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
# java/com.sap.sailing.domain.test/resources/IncrementalLeaderboardDTO.ser
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardPlace.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardSettingsFactory.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettingsDialogComponent.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettingsDialogComponent.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorRegistrationsPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogImportSensorDataAndAddMappingsDialog.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiRaceLeaderboardPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java
# java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-11-22 15:39:00 +01:00
Axel Uhl
021ac5e80e
Merge branch 'master' into bug4356
2017-11-13 11:33:54 +01:00
Axel Uhl
612e9b76d5
when adding a device mapping for EXPEDITION_SENSOR, use the correct log event type
...
Change-Id: I6358ff0120224082532ad25d40265b49e2c02142
2017-11-08 14:20:38 +01:00
Axel Uhl
6924ea32b8
bug 4356: included MergeState enum and field in CompetitorResult
...
Change-Id: I974bb5904c7e71efc142ac19e84b03a91b7ad045
2017-10-27 10:42:32 +02:00
Frank Mittag
8a118e16c0
Integrated 2 boat creation options ('new boat' and 'use existing boat') into the competitor new/edit dialog
2017-10-12 16:08:41 +02:00
Frank Mittag
85f3ec4723
Implemented migration of COMPETITORS collection to COMPETITORS_WITH_BOAT_REFERENCES and BOATS collections (old COMPETITORS collection is not deleted for easier development and debugging)
...
TracTrac connector uses now boat metadata AND leaderboardGroup to create boatIds and lookup boats from the boat store.
2017-09-29 16:09:30 +02:00
Steffen Schaefer
0359ee202e
Bug 4227: Consistent naming of eventType field in JSON and null safety
2017-09-12 09:57:24 +02:00
Steffen Schaefer
2934b47124
Bug 4227: eventName wasn't added to json
2017-09-12 09:56:23 +02:00
Steffen Schaefer
7ac22edc59
Bug 4227: Renamed enum for better reusability
2017-09-12 08:05:34 +02:00
Kai Boernert
7f03a972b0
added anniversary type enum
2017-09-11 17:12:13 +02:00
Steffen Schaefer
ca0c02cb55
Bug 4227: Fixed leaderboardDisplayName field in REST API
2017-09-11 16:13:02 +02:00
Kai Boernert
02b93657cb
added eventName and leaderboardDisplayName
2017-09-11 14:24:04 +02:00
Frank Mittag
239150af31
Removed the idea of a separate CompetitorWithBoatFactory
2017-09-05 17:36:53 +02:00
Benjamin Barth
0dc106494a
bug4227 Adjusted JavaDocs and code formattings
2017-08-29 18:09:10 +02:00
Frank Mittag
68ae4f561c
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractRaceColumn.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
# java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-08-28 16:12:00 +02:00
Frank Mittag
48162c73be
major refacoring and cleanup of RaceLog and RegattaLog events needed for the new way of registering boats and competitors as separate entities -> UI is still not ready for it.
2017-08-25 17:09:00 +02:00
Simon Pamies
D067890
Peter Siegmund
Maximilian Groß
Axel Uhl
Frank Mittag
Kai Boernert
Steffen Schaefer
Benjamin Barth