eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 22:43:57 +00:00
Code Activity

Added method variant without result to not need to always return null as

Browse Source 
dummy value
This commit is contained in:
Steffen Schäfer committed 2018-10-12 09:08:19 +02:00
1 parent 1312caedb2
commit 32bfde9656
4 files changed
+26 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+9 -28
View File
@@ -1338,16 +1338,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
getSecurityService().setOwnershipCheckPermissionForObjectCreationAndRevertOnError(
getSecurityService().getDefaultTenant(), SecuredDomainType.TRACTRAC_ACCOUNT, name, name,
new ActionWithResult<Void>() {
@Override
public Void run() throws Exception {
tractracMongoObjectFactory.storeTracTracConfiguration(
getTracTracAdapter().createTracTracConfiguration(name, jsonURL, liveDataURI,
storedDataURI, courseDesignUpdateURI, tracTracUsername, tracTracPassword));
return null;
}
});
() -> tractracMongoObjectFactory.storeTracTracConfiguration(
getTracTracAdapter().createTracTracConfiguration(name, jsonURL, liveDataURI, storedDataURI,
courseDesignUpdateURI, tracTracUsername, tracTracPassword)));
}
private RaceDefinition getRaceByName(Regatta regatta, String raceName) {
@@ -2919,16 +2912,10 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
if (!jsonURL.equalsIgnoreCase("test")) {
getSecurityService().setOwnershipCheckPermissionForObjectCreationAndRevertOnError(
getSecurityService().getDefaultTenant(), SecuredDomainType.SWISS_TIMING_ACCOUNT, configName,
configName, new ActionWithResult<Void>() {
@Override
public Void run() throws Exception {
swissTimingAdapterPersistence.storeSwissTimingConfiguration(
swissTimingFactory.createSwissTimingConfiguration(configName, jsonURL, hostname,
port, updateURL, updateUsername, updatePassword));
return null;
}
});
configName,
() -> swissTimingAdapterPersistence
.storeSwissTimingConfiguration(swissTimingFactory.createSwissTimingConfiguration(configName,
jsonURL, hostname, port, updateURL, updateUsername, updatePassword)));
}
}
@@ -4753,14 +4740,8 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
public void storeSwissTimingArchiveConfiguration(String swissTimingJsonUrl) throws Exception {
getSecurityService().setOwnershipCheckPermissionForObjectCreationAndRevertOnError(
getSecurityService().getDefaultTenant(), SecuredDomainType.SWISS_TIMING_ACCOUNT, swissTimingJsonUrl,
swissTimingJsonUrl, new ActionWithResult<Void>() {
@Override
public Void run() throws Exception {
swissTimingAdapterPersistence.storeSwissTimingArchiveConfiguration(
swissTimingFactory.createSwissTimingArchiveConfiguration(swissTimingJsonUrl));
return null;
}
});
swissTimingJsonUrl, () -> swissTimingAdapterPersistence.storeSwissTimingArchiveConfiguration(
swissTimingFactory.createSwissTimingArchiveConfiguration(swissTimingJsonUrl)));
}
protected com.sap.sailing.domain.base.DomainFactory getBaseDomainFactory() {
java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/EventResourceTest.java
+2 -1
View File
@@ -50,6 +50,7 @@ public class EventResourceTest extends AbstractJaxRsApiTest {
private String randomName;
private UriInfo uriInfo;
@SuppressWarnings("unchecked")
@Before
public void setUp() throws Exception {
super.setUp();
@@ -80,7 +81,7 @@ public class EventResourceTest extends AbstractJaxRsApiTest {
}
}).when(securityService).setOwnershipCheckPermissionForObjectCreationAndRevertOnError(
Mockito.any(UserGroup.class), Mockito.any(), Mockito.any(), Mockito.any(),
Mockito.any());
Mockito.any(ActionWithResult.class));
Mockito.doReturn(true).when(fakeSubject).isAuthenticated();
java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java
+3
View File
@@ -328,4 +328,7 @@ public interface SecurityService extends ReplicableWithObjectInputStream<Replica
<T> T setOwnershipCheckPermissionForObjectCreationAndRevertOnError(String tenantOwnerName, HasPermissions type,
String typeIdentifier, String securityDisplayName,
ActionWithResult<T> actionWithResult);
void setOwnershipCheckPermissionForObjectCreationAndRevertOnError(UserGroup tenantOwner, HasPermissions type,
String typeIdentifier, String securityDisplayName, Action action);
}
java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
+12
View File
@@ -74,6 +74,7 @@ import com.sap.sse.replication.OperationWithResult;
import com.sap.sse.replication.ReplicationMasterDescriptor;
import com.sap.sse.replication.impl.OperationWithResultWithIdWrapper;
import com.sap.sse.security.AccessControlStore;
import com.sap.sse.security.Action;
import com.sap.sse.security.ActionWithResult;
import com.sap.sse.security.BearerAuthenticationToken;
import com.sap.sse.security.ClientUtils;
@@ -1533,6 +1534,17 @@ public class SecurityServiceImpl implements ReplicableSecurityService, ClearStat
actionWithResult);
}
@Override
public void setOwnershipCheckPermissionForObjectCreationAndRevertOnError(UserGroup tenantOwner,
HasPermissions type, String typeIdentifier, String securityDisplayName,
Action action) {
setOwnershipCheckPermissionForObjectCreationAndRevertOnError(tenantOwner, type, typeIdentifier,
securityDisplayName, () -> {
action.run();
return null;
});
}
@Override
public <T> T setOwnershipCheckPermissionForObjectCreationAndRevertOnError(UserGroup tenantOwner,
HasPermissions type, String typeIdentifier, String securityDisplayName,