Removed method parameter by introducing specific handling for

ExpeditionDeviceConfiguration that has the server name included in the
type relative object identifier

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/RegattaAndRaceIdentifier.java

@@ -1,6 +1,9 @@
 package com.sap.sailing.domain.common;
 
+import com.sap.sse.security.shared.TypeRelativeObjectIdentifier;
 import com.sap.sse.security.shared.WithQualifiedObjectIdentifier;
 
 public interface RegattaAndRaceIdentifier extends RegattaIdentifier, RaceIdentifier, WithQualifiedObjectIdentifier {
+
+    TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier();
 }

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/RegattaNameAndRaceName.java

@@ -67,7 +67,7 @@ public class RegattaNameAndRaceName extends RegattaName implements RegattaAndRac
     }
 
     @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this);
     }
 

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/BoatDTO.java

@@ -119,7 +119,7 @@ public class BoatDTO extends NamedSecuredObjectDTO implements WithID, Serializab
     }
 
     @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return new TypeRelativeObjectIdentifier(idAsString);
     }
 

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTOImpl.java

@@ -239,7 +239,7 @@ public class CompetitorDTOImpl extends NamedSecuredObjectDTO implements Competit
     }
 
     @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return new TypeRelativeObjectIdentifier(idAsString);
     }
 

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/PreviousCompetitorDTOImpl.java

@@ -165,7 +165,7 @@ public class PreviousCompetitorDTOImpl extends NamedSecuredObjectDTO implements
     }
 
     @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return new TypeRelativeObjectIdentifier(getId().toString());
     }
 

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/RaceDTO.java

@@ -118,7 +118,7 @@ public class RaceDTO extends BasicRaceDTO implements SecuredDTO {
     }
 
     @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return new TypeRelativeObjectIdentifier(regattaName, getName());
     }
 

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java

@@ -179,8 +179,7 @@ public class MediaTrack implements Serializable, WithQualifiedObjectIdentifier {
         return SecuredDomainType.MEDIA_TRACK;
     }
 
-    @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this);
     }
 

java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/Account.java

@@ -27,8 +27,7 @@ public interface Account extends WithQualifiedObjectIdentifier {
         return getType().getQualifiedObjectIdentifier(getTypeRelativeObjectIdentifier());
     }
 
-    @Override
-    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this);
     }
 

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatImpl.java

@@ -137,8 +137,7 @@ public class BoatImpl extends RenamableImpl implements DynamicBoat {
         return SecuredDomainType.BOAT;
     }
 
-    @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this);
     }
 

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java

@@ -257,8 +257,7 @@ public class CompetitorImpl implements DynamicCompetitor {
         return SecuredDomainType.COMPETITOR;
     }
 
-    @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this);
     }
 

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/EventBaseImpl.java

@@ -383,8 +383,7 @@ public abstract class EventBaseImpl implements EventBase {
         return SecuredDomainType.EVENT;
     }
 
-    @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this);
     }
 

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/LeaderboardGroupBaseImpl.java

@@ -71,7 +71,7 @@ public abstract class LeaderboardGroupBaseImpl implements LeaderboardGroupBase {
         return getType().getQualifiedObjectIdentifier(getTypeRelativeObjectIdentifier());
     }
 
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this);
     }
 

java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingArchiveConfiguration.java

@@ -25,8 +25,7 @@ public interface SwissTimingArchiveConfiguration extends WithQualifiedObjectIden
         return SecuredDomainType.SWISS_TIMING_ARCHIVE_ACCOUNT;
     }
 
-    @Override
-    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(getJsonURL());
     }
 

java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingConfiguration.java

@@ -37,8 +37,7 @@ public interface SwissTimingConfiguration extends WithQualifiedObjectIdentifier
         return SecuredDomainType.SWISS_TIMING_ACCOUNT;
     }
 
-    @Override
-    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(getJsonURL());
     }
 

java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracConfiguration.java

@@ -49,8 +49,7 @@ public interface TracTracConfiguration extends WithQualifiedObjectIdentifier {
         return SecuredDomainType.TRACTRAC_ACCOUNT;
     }
 
-    @Override
-    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(getJSONURL());
     }
 

java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java

@@ -248,8 +248,7 @@ public interface Regatta
         return getType().getQualifiedObjectIdentifier(getTypeRelativeObjectIdentifier());
     }
 
-    @Override
-    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(getName());
     }
 

java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/LeaderboardBaseImpl.java

@@ -45,8 +45,7 @@ public class LeaderboardBaseImpl implements LeaderboardBase {
         return SecuredDomainType.LEADERBOARD;
     }
 
-    @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this);
     }
 

java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java

@@ -625,8 +625,7 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns {
         return getType().getQualifiedObjectIdentifier(getTypeRelativeObjectIdentifier());
     }
 
-    @Override
-    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this);
     }
 

java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java

@@ -1145,8 +1145,7 @@ public interface TrackedRace
         return regattaAndRaceId.getTypeRelativeObjectIdentifier();
     }
 
-    @Override
-    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    default TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(getRaceIdentifier());
     }
 

java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java

@@ -15,7 +15,6 @@ import com.sap.sse.common.IsManagedByCache;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.security.shared.HasPermissions;
 import com.sap.sse.security.shared.QualifiedObjectIdentifier;
-import com.sap.sse.security.shared.TypeRelativeObjectIdentifier;
 
 public class DummyMarkPassingWithTimePointOnly implements MarkPassing {
     private static final long serialVersionUID = -5494669910047887984L;
@@ -132,11 +131,6 @@ public class DummyMarkPassingWithTimePointOnly implements MarkPassing {
             public HasPermissions getType() {
                 return null;
             }
-
-            @Override
-            public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
-                return null;
-            }
         };
     }
 

java/com.sap.sailing.expeditionconnector.common/src/com/sap/sailing/expeditionconnector/ExpeditionDeviceConfiguration.java

@@ -6,11 +6,9 @@ import java.util.UUID;
 import com.sap.sailing.domain.common.security.SecuredDomainType;
 import com.sap.sse.common.impl.NamedImpl;
 import com.sap.sse.security.shared.HasPermissions;
-import com.sap.sse.security.shared.QualifiedObjectIdentifier;
 import com.sap.sse.security.shared.TypeRelativeObjectIdentifier;
-import com.sap.sse.security.shared.WithQualifiedObjectIdentifier;
 
-public class ExpeditionDeviceConfiguration extends NamedImpl implements Serializable, WithQualifiedObjectIdentifier {
+public class ExpeditionDeviceConfiguration extends NamedImpl implements Serializable {
     private static final long serialVersionUID = -7819154195403387909L;
 
     private final UUID deviceUuid;
@@ -78,26 +76,18 @@ public class ExpeditionDeviceConfiguration extends NamedImpl implements Serializ
                 + ", getName()=" + getName() + "]";
     }
 
-    @Override
-    @Deprecated
-    public QualifiedObjectIdentifier getIdentifier() {
-        return getType().getQualifiedObjectIdentifier(getTypeRelativeObjectIdentifier());
-    }
-
     /**
      * Get TypeRelativeObjectIdentifer. Needs a parameter for the servername passed as a String parameter.
      * 
      */
-    @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
-        return getTypeRelativeObjectIdentifier(params[0], getName());
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String serverName) {
+        return getTypeRelativeObjectIdentifier(serverName, getName());
     }
     
     public static TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String serverName, String name) {
         return new TypeRelativeObjectIdentifier(serverName, name);
     }
 
-    @Override
     public HasPermissions getType() {
         return SecuredDomainType.EXPEDITION_DEVICE_CONFIGURATION;
     }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java

@@ -7861,7 +7861,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
         final Subject subject = SecurityUtils.getSubject();
         if (expeditionConnector != null) {
             for (final ExpeditionDeviceConfiguration config : expeditionConnector.getDeviceConfigurations()) {
-                if (subject.isPermitted(SecuredDomainType.EXPEDITION_DEVICE_CONFIGURATION.getStringPermissionForObject(DefaultActions.READ, config))) {
+                if (subject.isPermitted(
+                        SecuredDomainType.EXPEDITION_DEVICE_CONFIGURATION.getStringPermissionForTypeRelativeIdentifier(
+                                DefaultActions.READ, config.getTypeRelativeObjectIdentifier(ServerInfo.getName())))) {
                     result.add(config);
                 }
             }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/EventDTO.java

@@ -170,7 +170,7 @@ public class EventDTO extends EventBaseDTO implements SecuredDTO {
     }
 
     @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return new TypeRelativeObjectIdentifier(getId().toString());
     }
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LeaderboardGroupBaseDTO.java

@@ -50,7 +50,7 @@ public class LeaderboardGroupBaseDTO extends NamedSecuredObjectDTO implements Wi
     }
 
     @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return new TypeRelativeObjectIdentifier(id.toString());
     }
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java

@@ -169,7 +169,7 @@ public class RegattaDTO extends NamedSecuredObjectDTO implements SecuredDTO {
     }
 
     @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return new TypeRelativeObjectIdentifier(getName());
     }
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/StrippedLeaderboardDTOWithSecurity.java

@@ -46,7 +46,7 @@ public class StrippedLeaderboardDTOWithSecurity extends StrippedLeaderboardDTO i
     }
 
     @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return new TypeRelativeObjectIdentifier(getName());
     }
 

java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/ServerInfoDTO.java

@@ -45,8 +45,7 @@ public class ServerInfoDTO implements IsSerializable, WithQualifiedObjectIdentif
         return getType().getQualifiedObjectIdentifier(getTypeRelativeObjectIdentifier());
     }
 
-    @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this.serverName);
     }
 

java/com.sap.sse.security.common/src/com/sap/sse/security/shared/RoleDefinitionImpl.java

@@ -112,8 +112,7 @@ public class RoleDefinitionImpl implements RoleDefinition {
         return getType().getQualifiedObjectIdentifier(getTypeRelativeObjectIdentifier());
     }
 
-    @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this);
     }
 

java/com.sap.sse.security.common/src/com/sap/sse/security/shared/RolePrototype.java

@@ -96,8 +96,7 @@ public abstract class RolePrototype implements RoleDefinition {
         return getType().getQualifiedObjectIdentifier(getTypeRelativeObjectIdentifier());
     }
 
-    @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this);
     }
 

java/com.sap.sse.security.common/src/com/sap/sse/security/shared/SecurityUserGroupImpl.java

@@ -51,8 +51,7 @@ public abstract class SecurityUserGroupImpl implements NamedWithID, WithQualifie
     }
 
 
-    @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return UserGroupImpl.getTypeRelativeObjectIdentifier(getId());
     }
 

java/com.sap.sse.security.common/src/com/sap/sse/security/shared/WithQualifiedObjectIdentifier.java

@@ -4,6 +4,5 @@ import com.sap.sse.common.Named;
 
 public interface WithQualifiedObjectIdentifier extends Named {
     QualifiedObjectIdentifier getIdentifier();
-    TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params);
     HasPermissions getType();
 }

java/com.sap.sse.security.common/src/com/sap/sse/security/shared/dto/SecuredDTO.java

@@ -8,7 +8,7 @@ public interface SecuredDTO {
 
     OwnershipDTO getOwnership();
 
-    TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params);
+    TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier();
 
     void setAccessControlList(AccessControlListDTO createAccessControlListDTO);
 

java/com.sap.sse.security.common/src/com/sap/sse/security/shared/dto/SecurityInformationDTO.java

@@ -39,7 +39,7 @@ public class SecurityInformationDTO implements SecuredDTO, Serializable {
     }
 
     @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return typeRelativeObjectIdentifier;
     }
 

java/com.sap.sse.security.common/src/com/sap/sse/security/shared/dto/UserDTO.java

@@ -150,7 +150,7 @@ public class UserDTO extends SecurityUserImpl<RoleDefinitionDTO, RoleDTO, Stripp
     }
 
     @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return new TypeRelativeObjectIdentifier(getName());
     }
 

java/com.sap.sse.security.common/src/com/sap/sse/security/shared/dto/UserGroupDTO.java

@@ -49,7 +49,7 @@ public class UserGroupDTO extends AbstractUserGroupImpl<StrippedUserDTO> impleme
     }
 
     @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return new TypeRelativeObjectIdentifier(getId().toString());
     }
 

java/com.sap.sse.security.test/src/com/sap/sse/security/test/HasPermissionsTest.java

@@ -76,12 +76,6 @@ public class HasPermissionsTest {
             public HasPermissions getType() {
                 return h;
             }
-
-            @Override
-            public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
-                return null;
-            }
-            
         };
     }
 }

java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/UserProxy.java

@@ -8,7 +8,6 @@ import com.sap.sse.security.shared.Account;
 import com.sap.sse.security.shared.Account.AccountType;
 import com.sap.sse.security.shared.HasPermissions;
 import com.sap.sse.security.shared.QualifiedObjectIdentifier;
-import com.sap.sse.security.shared.TypeRelativeObjectIdentifier;
 import com.sap.sse.security.shared.WildcardPermission;
 import com.sap.sse.security.shared.impl.Role;
 import com.sap.sse.security.shared.impl.User;
@@ -192,9 +191,4 @@ public class UserProxy implements User {
     public void setDefaultTenant(UserGroup newDefaultTenant, String serverName) {
         throw new UnsupportedOperationException();
     }
-
-    @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
-        throw new UnsupportedOperationException();
-    }
 }

java/com.sap.sse.security/src/com/sap/sse/security/UserImpl.java

@@ -365,8 +365,7 @@ public class UserImpl extends SecurityUserImpl<RoleDefinition, Role, UserGroup>
         return getType().getQualifiedObjectIdentifier(getTypeRelativeObjectIdentifier()); 
     }
 
-    @Override
-    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier(String... params) {
+    public TypeRelativeObjectIdentifier getTypeRelativeObjectIdentifier() {
         return getTypeRelativeObjectIdentifier(this);
     }