Commit Graph
207 Commits
Author SHA1 Message Date
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
Frank Mittag 951e4f38d8 fixed and improved BoatResourceTest to use now also the BoatJsonDeserializer 2018-03-09 10:51:51 +01:00
Frank Mittag 5fca437a61 fixed CompetitorsAndBoatsInLogAnalyzer and a broken test 2017-12-27 20:37:33 +01:00
Axel Uhl 0451fab1d2 Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
Change-Id: Id8ebf0c05a7a269c2f98342af1f43970127532ab
2017-12-25 12:52:32 +01:00
Benjamin Barth c4f94c4bbb bug4371 Added utility class to truncate expedition filename extensions
incl. JUnit tests
2017-12-21 16:46:59 +01:00
Frank Mittag 046dda41b6 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes 2017-12-20 14:40:04 +01:00
Kai Boernert 263c369795 fix for service dependency in importer test 2017-12-19 11:38:57 +01:00
Steffen Schaefer 76597d0abc Bug 4371: Renamed method to make clear what it is used for 2017-12-18 18:23:14 +01:00
Kai Boernert 70f01ce3ee cleaned up result json generation 2017-12-18 16:29:45 +01:00
Steffen Schaefer f6a0073e7d Bug 4371: Fixed test after refactoring 2017-12-18 13:36:33 +01:00
Kai Boernert a0c5f69c88 improved test intention description 2017-12-18 10:41:25 +01:00
Papick Garcia Taboada 0ce6f90c37 Introduced boolean flag for succesful imports 2017-12-14 16:44:38 +01:00
Kai Boernert d8369aab93 added jsonresult structure to gps import servlet 2017-12-12 13:45:06 +01:00
Frank Mittag 812fef2f22 Removed not needed RegattaLogRegisterAndBoatEvent after discussion with Axel.
All registration on regatta level will be of type RegattaLogRegisterCompetitorEvent where the passed competitor is either of type Competitor or CompetitorWithBoat depending on the regatta type
2017-12-04 14:38:59 +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
Frank Mittag 8b1702b688 fixed CompetitorsResourceTest, added BoatResourceTest 2017-11-10 14:10:12 +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 51b2a16799 added test case file
Change-Id: I9ab7f5de44b65b744f9ec306c1be174869a314b9
2017-10-18 16:44:40 +02:00
Axel Uhl d5ce190c58 adjusted Expedition wind importer so it can read Phoenix data; added test case
Change-Id: Ide5c060899877b14428de2a9e833e6ddb330f037
2017-10-18 16:40:23 +02:00
Axel Uhl 2a06f5495e a first version of a Bravo wind importer that seems to do useful things
Change-Id: Ib012a111e7a9ccdcbbeaa4e89a31d77d2c538646
2017-09-29 16:35:15 +02:00
Frank Mittag ecc51c05ba Removed the idea of a RegattaLogEntryEvent
Refactored CompetitorProviderFromRaceColumnsAndRegattaLike to be a CompetitorAndBoatProviderFromRaceColumnsAndRegattaLike to cache also the boats of the competitors
2017-08-30 17:01:01 +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
Axel Uhl e5e7c9c3c1 fixed rest of EventsResourceTest
Change-Id: I96df728ee4dcdc72401f79cb28ef7c8403e78e58
2017-08-25 21:42:31 +02:00
Axel Uhl 23ebda4e45 fixed EventsResourceTest
Change-Id: I03af2f095bcd7c784e1e2a9e49f5c59f0c8017b9
2017-08-25 21:38:52 +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
Axel Uhl d60b6cfd17 addwd missing cast 2017-08-25 13:45:11 +02:00
Axel Uhl 281519303d fixed eventid check after returning json now 2017-08-25 11:03:13 +02:00
Axel Uhl f980a8f28f added documentation for createEvent; fixed baseURL inference
Change-Id: Ic70c49a64eeb8a7648ab41142997ee4f03752252
2017-08-22 18:22:42 +02:00
Axel Uhl d22e1b071a added reverse geocoding in case lat/lng are provided
Change-Id: Ibc1343873410164ccd9d50eb8255321efd088990
2017-08-22 16:07:47 +02:00
Axel Uhl 8d5c931e43 major refactoring of EventsResource
Change-Id: Icb9b0fe2be228fd98d31a70ec69f045c79a49f5c
2017-08-22 14:04:36 +02:00
Leon Radeck 8471b6b348 Adjusted code. 2017-08-21 17:37:37 +02:00
Leon Radeck 1d9795d97f Adjusted tests. 2017-08-21 03:14:35 +02:00
Leon Radeck 5e1caff607 Formatted tests. 2017-08-21 03:07:30 +02:00
Leon Radeck 6f66fc6efb Refactored code. Adjusted tests. Added exception mapper. 2017-08-21 02:44:45 +02:00
Leon Radeck 8ba81d9cab More tests. Tests for duplicate object creation will be created soon. 2017-08-20 22:18:58 +02:00
Leon Radeck 3e5b1124bf Added some tests for event creation. Removed default values and internal calls of rest methods. Disabled security checks for testing. Api is not robust against exceptions. 2017-08-19 20:57:26 +02:00
Kai Boernert a02dea2a28 cleaned up and removed code not required for stage 1 of anniversaries 2017-08-07 09:46:32 +02:00
Steffen Schaefer 101b686eae Bug 4227: Fixed compiler errors after merge 2017-08-04 15:29:45 +02:00
Steffen Schäfer 1542a36109 Merge branch 'master' into bug2822_boatcolors 2017-05-16 16:12:16 +02:00
Steffen Schaefer 9123771f34 normalized line endings 2017-05-16 09:42:02 +02:00
Frank Mittag fd8fee5d58 work commit in the middle of refactoring competitor.getBoat() 2017-04-28 09:08:14 +02:00
Frank Mittag 31e8164166 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
#	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Competitor.java
#	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/DomainFactory.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
#	java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh_CN.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java
#	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ApplyScoresFromRaceLogTest.java
2017-03-08 16:03:56 -03:00
Axel Uhl 07edd7ffb1 preparing for multi-file upload for both Expedition and GRIB; introduced MappingIterable and MappingIterator
moved wind import servlet package structure a little

Change-Id: I9b573d4c91191933383c87397ac8584d9463b4bb
2017-02-08 09:52:25 +01:00
Steffen Schaefer 86ae110571 Merge branch 'master' into bug4009 2017-01-26 15:31:34 +01:00
Steffen Schaefer 673907c017 Merge branch 'master' into bug2447
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/pom.xml
2017-01-09 10:05:05 +01:00
fmittag 45452ac185 added canBoatsOfCompetitorsChangePerRace attribute to regatta (+corresponding load/store methods and admin UI) 2016-12-30 17:05:03 +01:00
Axel Uhl 19d112115b first working version of tracked race restoring with -Drestore.tracked.races=true;
Change-Id: I2c3968d772c7382589ada66c60874015f46f8996
2016-12-29 17:18:42 +01:00
Axel Uhl 296866a6f7 adjusted test verdict related to TimeRange's end now being exclusive
Change-Id: I063d9e28a0f9ec662966d6f98708b9aa7355b3d0
2016-12-24 15:26:33 +01:00
Steffen Schaefer dd5d1fc745 Using junit and hamcrest from orbit / adjustments for different junit
bundle ID
2016-11-24 13:29:02 +01:00