Commit Graph
722 Commits
Author SHA1 Message Date
Axel Uhl 99a04487b1 bug5193: adjusting server group in UserStore after receiving initial load 2020-02-03 18:47:06 +01:00
Axel Uhl a0c87e8f4b Merge branch 'master' into bug5165 2020-01-10 20:31:52 +01:00
Dennis Aulenbacher d189cce693 code styling improvements 2019-12-13 21:21:36 +01:00
Dennis Aulenbacher 17e1d760d0 commented test constructors with null values, added informative javadoc 2019-12-05 16:56:04 +01:00
Axel Uhl aaace28830 null fixes regarding tracking connector info on Event and (de-)serialization 2019-12-03 18:51:56 +01:00
Dennis Aulenbacher 423a21f635 introduced type trackingConnectorInfo representing the tracking source
and webUrl
2019-11-29 14:06:27 +01:00
Steffen Schaefer 9b35cf574c Merge branch 'master' into bug5085
Conflicts:
	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
2019-11-25 08:19:26 +01:00
Dennis Aulenbacher 2bc9db7785 new isTrackedByTracTrac method for events 2019-11-12 17:40:15 +01:00
Dennis Aulenbacher 53b01cd2bc changes to constructor and creation-methods of TrackedRaces resulting from new field 2019-11-12 17:33:09 +01:00
Steffen Schaefer 7b143f372c Merge branch 'master' into bug5085
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Mark.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/MarkImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.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/server/SailingServiceImpl.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/RacingEventServiceImpl.java
2019-11-04 13:08:42 +01:00
Axel Uhl 74338f692e major refactoring of RaceLogResolver;
Introduced specialization that can also resolve a TrackedRace based on a
SimpleRaceLogIdentifier. This is then used to find TrackedRaces for race
log entries setting the implied wind to come from another TrackedRace.
With this, it doesn't matter whether the other tracked race has an ORC
Performance Curve ranking metric or not, or if the reference points to a
race slot that doesn't even have a tracked race attached. If a tracked
race is attached, it will be asked for its "reference implied wind."
Otherwise, the race log will be scanned, but if "own maximum implied
wind" is requested and there is no tracked race, null will be returned.

Change-Id: I14fe32f8a473281c9f489eb081544ae20c5b37f3
2019-10-26 00:00:58 +02:00
Axel Uhl e4bca100c2 fixed compilation problem by making getRaceLogTrackingAdapter public 2019-10-08 21:23:39 +02:00
Axel Uhl 1cf4a7af40 fixed test set-up by adding bundle requirement to server.test fragment 2019-10-08 20:55:58 +02:00
Axel Uhl 41d98c920c made getReplicationService() public, hoping it will appease Mockito 2019-10-08 20:46:02 +02:00
Axel Uhl b4d4b3c503 use same pattern as for DummyLeaderboardResource to expose method/type from fragment to Mockito
Change-Id: I6f51dbd27d554ce54158580ec041996588826112
2019-10-08 18:24:40 +02:00
Axel Uhl 60a23daf24 removed a few more redundant empty lines 2019-10-08 00:07:48 +02:00
Axel Uhl 6a7fe97492 removed empty lines 2019-10-07 23:15:57 +02:00
Steffen Jacobs 418a774c13 Bug 5085: started with adding support for 2019-09-18 15:29:36 +02:00
Axel Uhl a85da965be bug5106: starting to introduce parameter indicating Boat/Competitor was loaded from DB 2019-07-28 14:45:53 +02:00
Steffen Jacobs ccf0a6414f Bug 5081: fixed failing test in MasterDataImportTest 2019-06-27 11:04:38 +02:00
Steffen Jacobs c4bf938ad9 Bug 5081: adjusted MasterDataImportTest to reduce number of test
failures
2019-06-27 10:37:31 +02:00
Steffen Jacobs 6b090449eb Bug 5081: attempted to fix failing tests in
MasterDataImportTest
2019-06-26 18:46:49 +02:00
Steffen Jacobs 23ddb8ebba Bug 5081: used SecurityServiceMockFactory to fix failing tests in
RemoveLeaderboardGroupTest
2019-06-26 18:37:19 +02:00
Axel Uhl 08e5aa286d added a failing test case for bug 5073
Change-Id: Ib4ac2ee84c92c37df87273c31a08484a3991a60b
2019-06-07 09:55:08 +02:00
Axel Uhl 89e8bef9c8 Revert "removed PluginNature from our OSGi bundles; they are not Eclipse plugins";
according to https://bugs.eclipse.org/bugs/show_bug.cgi?id=544977#c21 the
scenario of using the ManifestBuilder without setting the PluginNature is
not a supported scenario. Besides, it doesn't help to get rid of the new
Eclipse warning regarding non-exported packages.

This reverts commit 063484e29f.
2019-05-28 21:54:20 +02:00
Axel Uhl 063484e29f removed PluginNature from our OSGi bundles; they are not Eclipse plugins 2019-05-27 22:53:30 +02:00
Steffen Jacobs 15d65f4c87 Bug 5040: attempt to fix Unit-Test for MasterDataImport 2019-05-21 11:43:36 +02:00
Axel Uhl 242513b42e Merge branch 'master' into permission-vertical 2019-04-13 08:25:19 +02:00
Robert Benedikt e7a97749bc Merge branch 'master' into bug4703
# Conflicts:
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/CompetitorResultEditableImpl.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/CompetitorResultWithIdImpl.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/PenaltyFragment.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/layouts/CompetitorEditLayout.java
2019-04-12 11:34:24 +02:00
Axel Uhl 850a904d63 refactored DeviceConfiguration stuff, removing matcher design, introducing UUIDs
Change-Id: Iec8555a3f1a3cb5a52ed272e4560226e4de654d7
2019-03-01 13:24:42 +01:00
Kai Börnert 17d5a285b5 made regattaSecret no longer optional, for the old code paths without a
secret, a UUID.random().toString() is used
2019-02-21 16:17:07 +01:00
Kai Börnert 250783b4ae Merge branch 'master' into permission-vertical
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.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
2019-02-11 09:25:45 +01:00
Kai Börnert 4c173f5221 use random registrationSecrets in tests, since in normal a non nurr
secret is the default now
2019-02-07 11:06:27 +01:00
Steffen Schaefer fa5127a277 Fixed compiler error 2019-01-17 10:02:46 +01:00
Axel Uhl 9c299f0718 Merge branch 'master' into bug4469 2019-01-15 20:24:46 +01:00
Axel Uhl 5169b66b83 Merge branch 'master' into permission-vertical 2019-01-15 00:30:35 +01:00
Axel Uhl 496ea9f278 enforce creation of new Subject; added Subject-related tests
Change-Id: Ie126133d7ee25b452cefd6c15ca3225c7aae656b
2019-01-14 17:46:30 +01:00
Axel Uhl 6883cb9087 added logging output in TaggingServiceTest showing the threads executing the critical methods
Change-Id: I7d90a2031c963983a5adce0e865990e71f0cf159
2019-01-14 09:44:03 +01:00
Axel Uhl fd0cc2e388 added synchronization to avoid possible threading issues in JUnit execution order
Change-Id: I5e0b3fdcab8bf0349e25149a79557e5b8cc60a4f
2019-01-14 09:32:57 +01:00
Axel Uhl c1970b38c3 trying to work with ThreadState.bind() / .restore() symmetrically in TaggingServiceTest
Change-Id: I745b31b1fcbb229f280fb35635595641089f2da0
2019-01-11 18:34:09 +01:00
Axel Uhl a3c39e97f7 attach subject to thread state in TaggingServiceTest 2019-01-10 00:58:19 +01:00
Steffen Schaefer 488cb00417 Merge branch 'permission-vertical' into bug4813 2019-01-07 09:36:56 +01:00
Kai Börnert 045c502438 Merge branch 'master' into permission-vertical
Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java
2019-01-07 09:07:40 +01:00
Robin Kuck ab27f9f155 Merge remote-tracking branch 'origin/master' into bug4469
Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2019-01-05 14:30:00 +01:00
Axel Uhl c8897dfb40 fixed SearchServiceTest, ensuring the Shiro thread state is bound
Change-Id: I093bab634260af7a25981ed987ce163a9fda73d7
2019-01-04 15:47:09 +01:00
Steffen Schaefer d412abac09 Merge branch 'permission-vertical' into bug4813
Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java
2018-12-19 08:47:46 +01:00
Steffen Schaefer 7dddae939c Fixed TaggingServiceTest that failed due to missing permissions 2018-12-19 08:42:08 +01:00
Thomas Wiese 475356f8b8 Merge branch 'permission-vertical' into bug4813
# Conflicts:
#	java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
#	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java
2018-12-18 13:32:12 +01:00
Kai Börnert cd2eafc80e adjusted securityservice to allow different ownerTenant for
createSimpleUser than the default one.
2018-12-18 10:08:53 +01:00
Thomas Wiese a387055f95 bug 4813: building the identifier for permissions checks is now be done
by supporting a TypeRelativeObjectIdentifer object that has to be built
by domain objects
2018-12-17 15:49:44 +01:00