Skip to content
Snippets Groups Projects
Verified Commit 1a0bb299 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

Merge remote-tracking branch 'origin/f-grpc-f-acm' into f-grpc-f-acm

parents 3812a425 978a8328
No related branches found
No related tags found
2 merge requests!58REL: prepare release 0.7.2,!45F grpc f acm
Pipeline #17050 failed
...@@ -366,9 +366,10 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa ...@@ -366,9 +366,10 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
} }
private MultiRetrieveEntityACLResponse multiRetrieveEntityACL( private MultiRetrieveEntityACLResponse multiRetrieveEntityACL(
MultiRetrieveEntityACLRequest request) { MultiRetrieveEntityACLRequest request) throws Exception {
MultiRetrieveEntityACLResponse.Builder builder = MultiRetrieveEntityACLResponse.newBuilder(); MultiRetrieveEntityACLResponse.Builder builder = MultiRetrieveEntityACLResponse.newBuilder();
RetrieveACL transaction = new RetrieveACL(request.getIdList()); RetrieveACL transaction = new RetrieveACL(request.getIdList());
transaction.execute();
for (EntityInterface e : transaction.getContainer()) { for (EntityInterface e : transaction.getContainer()) {
builder.addAcls(caosdbToGrpc.convertACL(e)); builder.addAcls(caosdbToGrpc.convertACL(e));
} }
......
package org.caosdb.server.transaction; package org.caosdb.server.transaction;
import com.google.protobuf.ProtocolStringList; import java.util.UUID;
import org.apache.shiro.SecurityUtils;
import org.caosdb.server.database.backend.transaction.RetrieveEntityACLTransaction; import org.caosdb.server.database.backend.transaction.RetrieveEntityACLTransaction;
import org.caosdb.server.entity.Entity; import org.caosdb.server.entity.Entity;
import org.caosdb.server.entity.EntityInterface; import org.caosdb.server.entity.EntityInterface;
import org.caosdb.server.entity.container.TransactionContainer; import org.caosdb.server.entity.container.TransactionContainer;
import org.caosdb.server.permissions.EntityACL; import org.caosdb.server.permissions.EntityACL;
import org.caosdb.server.permissions.EntityPermission; import org.caosdb.server.permissions.EntityPermission;
import com.google.protobuf.ProtocolStringList;
public class RetrieveACL extends Transaction<TransactionContainer> { public class RetrieveACL extends Transaction<TransactionContainer> {
public RetrieveACL(ProtocolStringList idList) { public RetrieveACL(ProtocolStringList idList) {
super(new TransactionContainer()); super(new TransactionContainer(SecurityUtils.getSubject(), System.currentTimeMillis(), UUID.randomUUID().toString()));
for (String strId : idList) { for (String strId : idList) {
getContainer().add(new Entity(Integer.parseInt(strId))); getContainer().add(new Entity(Integer.parseInt(strId)));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment