diff --git a/src/main/java/org/caosdb/server/grpc/EntityTransactionImpl.java b/src/main/java/org/caosdb/server/grpc/EntityTransactionImpl.java index 2ccba8ae455dc5812d0287348bdf9a10ce39dfc8..c482f2421db1e4d133d0e5f46494e6d1fd6cc593 100644 --- a/src/main/java/org/caosdb/server/grpc/EntityTransactionImpl.java +++ b/src/main/java/org/caosdb/server/grpc/EntityTransactionImpl.java @@ -1,5 +1,6 @@ package org.caosdb.server.grpc; +import io.grpc.stub.StreamObserver; import java.util.UUID; import org.apache.shiro.SecurityUtils; import org.caosdb.grpc.Entity; @@ -8,15 +9,19 @@ import org.caosdb.server.entity.EntityInterface; import org.caosdb.server.entity.container.RetrieveContainer; import org.caosdb.server.transaction.Retrieve; import org.caosdb.server.utils.EntityStatus; -import io.grpc.stub.StreamObserver; public class EntityTransactionImpl extends EntityTransactionServiceImplBase { @Override public void retrieve(Entity request, StreamObserver<Entity> responseObserver) { String requested_entity_id = request.getEid(); - - RetrieveContainer container = new RetrieveContainer(SecurityUtils.getSubject(), System.currentTimeMillis(), UUID.randomUUID().toString(), null); + + RetrieveContainer container = + new RetrieveContainer( + SecurityUtils.getSubject(), + System.currentTimeMillis(), + UUID.randomUUID().toString(), + null); container.add(Integer.parseInt(requested_entity_id)); Retrieve retrieve = new Retrieve(container); try { @@ -26,16 +31,14 @@ public class EntityTransactionImpl extends EntityTransactionServiceImplBase { e.printStackTrace(); } EntityInterface retrieved_entity = retrieve.getContainer().get(0); - + Entity response; if (retrieved_entity.getEntityStatus() == EntityStatus.VALID) { response = Entity.newBuilder(request) - - - .setName(retrieved_entity.getName()) - .setDescription(retrieved_entity.getDescription()) - .build(); + .setName(retrieved_entity.getName()) + .setDescription(retrieved_entity.getDescription()) + .build(); } else { response = Entity.newBuilder(request).setDescription("DOES NOT EXIST").build(); } diff --git a/src/main/proto/EntityService.proto b/src/main/proto/EntityService.proto index 08351f2fe285dac4a4733a4436666936b079e259..d7868caab6b9a6ea99597e3505d5d0873001cb64 100644 --- a/src/main/proto/EntityService.proto +++ b/src/main/proto/EntityService.proto @@ -1,6 +1,7 @@ syntax = "proto3"; option java_multiple_files = true; -package org.caosdb.grpc; +option java_package = "org.caosdb.grpc"; +package caosdb; message Entity { string eid = 1;