From 78e6afba7211d52e154d5d743854fa1175538e1f Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Wed, 19 Dec 2018 12:35:52 +0100 Subject: [PATCH] Code cleanup --- .../sap/sailing/domain/common/RegattaNameAndRaceName.java | 6 +----- .../com/sap/sailing/domain/common/media/MediaTrack.java | 6 +----- .../src/com/sap/sailing/domain/igtimiadapter/Account.java | 6 +----- .../src/com/sap/sailing/domain/base/impl/BoatImpl.java | 6 +----- .../com/sap/sailing/domain/base/impl/CompetitorImpl.java | 6 +----- .../com/sap/sailing/domain/base/impl/EventBaseImpl.java | 6 +----- .../domain/base/impl/LeaderboardGroupBaseImpl.java | 6 +----- .../SwissTimingArchiveConfiguration.java | 4 ---- .../swisstimingadapter/SwissTimingConfiguration.java | 4 ---- .../domain/tractracadapter/TracTracConfiguration.java | 4 ---- .../src/com/sap/sailing/domain/base/Regatta.java | 4 ---- .../com/sap/sailing/domain/leaderboard/Leaderboard.java | 6 +----- .../src/com/sap/sailing/domain/tracking/TrackedRace.java | 8 ++------ .../security/PermissionAwareRaceTrackingHandler.java | 2 +- 14 files changed, 11 insertions(+), 63 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/RegattaNameAndRaceName.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/RegattaNameAndRaceName.java index d7beceac8a4..2c44b50c238 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/RegattaNameAndRaceName.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/RegattaNameAndRaceName.java @@ -68,11 +68,7 @@ public class RegattaNameAndRaceName extends RegattaName implements RegattaAndRac @Override public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() { - return getTypeRelativeObjectIdentifier(this); - } - - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(RegattaAndRaceIdentifier regattaAndRaceIdentifier) { - return new TypeRelativeObjectIdentifier(regattaAndRaceIdentifier.getRegattaName(), regattaAndRaceIdentifier.getRaceName()); + return getTypeRelativeObjectIdentifier(getRegattaName(), getRaceName()); } public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String regattaName, String raceName) { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java index 1e31e8ebc96..99d3030b511 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java @@ -180,11 +180,7 @@ public class MediaTrack implements Serializable, WithQualifiedObjectIdentifier { } public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() { - return getTypeRelativeObjectIdentifier(this); - } - - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(MediaTrack mediaTrack) { - return new TypeRelativeObjectIdentifier(mediaTrack.dbId); + return getTypeRelativeObjectIdentifier(dbId); } public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String dbId) { diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/Account.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/Account.java index c47640ad48b..ffb96003919 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/Account.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/Account.java @@ -28,11 +28,7 @@ public interface Account extends WithQualifiedObjectIdentifier { } default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() { - return getTypeRelativeObjectIdentifier(this); - } - - static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(Account account) { - return new TypeRelativeObjectIdentifier(account.getUser().getEmail()); + return getTypeRelativeObjectIdentifier(getUser().getEmail()); } static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String email) { diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatImpl.java index 91b6f398844..c106744c365 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatImpl.java @@ -138,11 +138,7 @@ public class BoatImpl extends RenamableImpl implements DynamicBoat { } public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() { - return getTypeRelativeObjectIdentifier(this); - } - - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(Boat boat) { - return new TypeRelativeObjectIdentifier(boat.getId().toString()); + return getTypeRelativeObjectIdentifier(getId()); } public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(Serializable id) { diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java index bfe041ec035..b8f14712ff4 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java @@ -258,11 +258,7 @@ public class CompetitorImpl implements DynamicCompetitor { } public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() { - return getTypeRelativeObjectIdentifier(this); - } - - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(Competitor competitor) { - return new TypeRelativeObjectIdentifier(competitor.getId().toString()); + return getTypeRelativeObjectIdentifier(getId()); } public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(Serializable id) { diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/EventBaseImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/EventBaseImpl.java index 95c96296ad4..d97e3973076 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/EventBaseImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/EventBaseImpl.java @@ -384,11 +384,7 @@ public abstract class EventBaseImpl implements EventBase { } public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() { - return getTypeRelativeObjectIdentifier(this); - } - - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(EventBase event) { - return new TypeRelativeObjectIdentifier(event.getId().toString()); + return getTypeRelativeObjectIdentifier(getId()); } public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(UUID id) { diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/LeaderboardGroupBaseImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/LeaderboardGroupBaseImpl.java index c53d862386c..2785cef93c0 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/LeaderboardGroupBaseImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/LeaderboardGroupBaseImpl.java @@ -72,11 +72,7 @@ public abstract class LeaderboardGroupBaseImpl implements LeaderboardGroupBase { } public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() { - return getTypeRelativeObjectIdentifier(this); - } - - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(LeaderboardGroupBaseImpl leaderboarGroup) { - return new TypeRelativeObjectIdentifier(leaderboarGroup.getId().toString()); + return getTypeRelativeObjectIdentifier(getId()); } public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(UUID id) { diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingArchiveConfiguration.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingArchiveConfiguration.java index 35925eb3329..591d8874dea 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingArchiveConfiguration.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingArchiveConfiguration.java @@ -29,10 +29,6 @@ public interface SwissTimingArchiveConfiguration extends WithQualifiedObjectIden return getTypeRelativeObjectIdentifier(getJsonURL()); } - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(SwissTimingArchiveConfiguration config) { - return new TypeRelativeObjectIdentifier(config.getJsonURL()); - } - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String jsonUrl) { return new TypeRelativeObjectIdentifier(jsonUrl); } diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingConfiguration.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingConfiguration.java index 991e1e1725a..ee97edc60b7 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingConfiguration.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingConfiguration.java @@ -41,10 +41,6 @@ public interface SwissTimingConfiguration extends WithQualifiedObjectIdentifier return getTypeRelativeObjectIdentifier(getJsonURL()); } - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(SwissTimingConfiguration config) { - return new TypeRelativeObjectIdentifier(config.getJsonURL()); - } - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String jsonUrl) { return new TypeRelativeObjectIdentifier(jsonUrl); } diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracConfiguration.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracConfiguration.java index ace21b8e963..ec088c87358 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracConfiguration.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracConfiguration.java @@ -53,10 +53,6 @@ public interface TracTracConfiguration extends WithQualifiedObjectIdentifier { return getTypeRelativeObjectIdentifier(getJSONURL()); } - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(TracTracConfiguration config) { - return new TypeRelativeObjectIdentifier(config.getJSONURL()); - } - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String jsonUrl) { return new TypeRelativeObjectIdentifier(jsonUrl); } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java index 26b8f83faf2..a4003158348 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java @@ -252,10 +252,6 @@ public interface Regatta return getTypeRelativeObjectIdentifier(getName()); } - static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(Regatta regatta) { - return new TypeRelativeObjectIdentifier(regatta.getName()); - } - static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String regattaName) { return new TypeRelativeObjectIdentifier(regattaName); } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java index a96cca5da91..bcf7b3f0121 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java @@ -626,17 +626,13 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns { } default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() { - return getTypeRelativeObjectIdentifier(this); + return getTypeRelativeObjectIdentifier(getName()); } static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String name) { return new TypeRelativeObjectIdentifier(name); } - static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(Leaderboard leaderboard) { - return new TypeRelativeObjectIdentifier(leaderboard.getName()); - } - static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(RegattaName regattaName) { return new TypeRelativeObjectIdentifier(regattaName.getRegattaName()); } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java index 291eff25fc5..3871f19f72e 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java @@ -1138,15 +1138,11 @@ public interface TrackedRace } public static QualifiedObjectIdentifier getIdentifier(RegattaAndRaceIdentifier regattaAndRaceId) { - return getSecuredDomainType().getQualifiedObjectIdentifier(getTypeRelativeObjectIdentifier(regattaAndRaceId)); - } - - public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(RegattaAndRaceIdentifier regattaAndRaceId) { - return regattaAndRaceId.getTypeRelativeObjectIdentifier(); + return getSecuredDomainType().getQualifiedObjectIdentifier(regattaAndRaceId.getTypeRelativeObjectIdentifier()); } default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() { - return getTypeRelativeObjectIdentifier(getRaceIdentifier()); + return getRaceIdentifier().getTypeRelativeObjectIdentifier(); } @Override diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/security/PermissionAwareRaceTrackingHandler.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/security/PermissionAwareRaceTrackingHandler.java index 89fad9efc74..2184737a67f 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/security/PermissionAwareRaceTrackingHandler.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/security/PermissionAwareRaceTrackingHandler.java @@ -57,7 +57,7 @@ public class PermissionAwareRaceTrackingHandler extends DefaultRaceTrackingHandl try { return securityService.doWithTemporaryDefaultTenant(defaultTenant, () -> { return securityService.setOwnershipCheckPermissionForObjectCreationAndRevertOnError( - SecuredDomainType.TRACKED_RACE, RegattaNameAndRaceName.getTypeRelativeObjectIdentifier(regattaAndRaceIdentifier), + SecuredDomainType.TRACKED_RACE, regattaAndRaceIdentifier.getTypeRelativeObjectIdentifier(), regattaAndRaceIdentifier.toString(), () -> { return innerAction.get(); });