From 1c2cd4866b58618221c32bab75215a1f9c1c8381 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 5 Feb 2021 09:36:16 +0100
Subject: [PATCH] renamed protobuf package
---
.../server/grpc/EntityTransactionImpl.java | 21 +++++++++++--------
src/main/proto/EntityService.proto | 3 ++-
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/caosdb/server/grpc/EntityTransactionImpl.java b/src/main/java/org/caosdb/server/grpc/EntityTransactionImpl.java
index 2ccba8ae..c482f242 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 08351f2f..d7868caa 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;
--
GitLab