WIP: multi-retrieve

pom.xml

@@ -25,7 +25,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.caosdb</groupId>
   <artifactId>caosdb-server</artifactId>
-  <version>0.5.0-GRPC0.0.7</version>
+  <version>0.5.0-GRPC0.0.8</version>
   <packaging>jar</packaging>
   <name>CaosDB Server</name>
   <scm>

src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java

@@ -218,6 +218,19 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
         final RetrieveEntity entity = new RetrieveEntity(getId(id));
         container.add(entity);
 
+      } catch (final NumberFormatException e) {
+        // We handle this after the retrieval
+      }
+    }
+
+    final Retrieve transaction = new Retrieve(container);
+    transaction.execute();
+
+    for (final TransactionRequest sub_request : request.getRequestsList()) {
+      final String id = sub_request.getRetrieveRequest().getId();
+      try {
+        final EntityInterface entity = container.getEntityById(getId(id));
+
         builder.addResponses(
             TransactionResponse.newBuilder()
                 .setRetrieveResponse(RetrieveResponse.newBuilder().setEntity(convert(entity))));
@@ -230,10 +243,6 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
                     RetrieveResponse.newBuilder().setEntity(entityDoesNotExist(id))));
       }
     }
-
-    final Retrieve transaction = new Retrieve(container);
-    transaction.execute();
-
     return builder.build();
   }