From cfbc140c6629c39060fff334fce5bd60a1786d48 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 9 Nov 2021 13:31:59 +0100
Subject: [PATCH] Update proto again
---
caosdb-proto | 2 +-
src/main/java/org/caosdb/server/entity/Message.java | 1 +
src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java | 4 +++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/caosdb-proto b/caosdb-proto
index fe58edac..9fa41dce 160000
--- a/caosdb-proto
+++ b/caosdb-proto
@@ -1 +1 @@
-Subproject commit fe58edacdedd2fa9992c103e18d4ae4875798a2c
+Subproject commit 9fa41dce325d370eb8da60a77e921d4a0618f513
diff --git a/src/main/java/org/caosdb/server/entity/Message.java b/src/main/java/org/caosdb/server/entity/Message.java
index bd52fa96..7f5c2836 100644
--- a/src/main/java/org/caosdb/server/entity/Message.java
+++ b/src/main/java/org/caosdb/server/entity/Message.java
@@ -52,6 +52,7 @@ public class Message extends Exception implements Comparable<Message>, ToElement
legacy_codes_mapping.put(ServerMessages.REFERENCED_ENTITY_DOES_NOT_EXIST.coreToString(), "235");
legacy_codes_mapping.put(ServerMessages.AUTHORIZATION_ERROR.coreToString(), "403");
legacy_codes_mapping.put(ServerMessages.ROLE_DOES_NOT_EXIST.coreToString(), "1104");
+ legacy_codes_mapping.put(ServerMessages.ENTITY_NAME_DUPLICATES.coreToString(), "0");
}
private static final long serialVersionUID = 1837110172902899264L;
diff --git a/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java b/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
index f11523df..0a19977b 100644
--- a/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
+++ b/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
@@ -22,8 +22,10 @@
*/
package org.caosdb.server.jobs.core;
+import org.caosdb.api.entity.v1.MessageCode;
import org.caosdb.server.entity.EntityInterface;
import org.caosdb.server.entity.Message;
+import org.caosdb.server.entity.Message.MessageType;
import org.caosdb.server.jobs.FlagJob;
import org.caosdb.server.jobs.JobAnnotation;
import org.caosdb.server.jobs.TransactionStage;
@@ -50,7 +52,7 @@ public class ExecuteQuery extends FlagJob {
} catch (final UnsupportedOperationException e) {
getContainer().addMessage(ServerMessages.QUERY_EXCEPTION);
getContainer().setStatus(EntityStatus.UNQUALIFIED);
- getContainer().addMessage(new Message(e.getMessage()));
+ getContainer().addMessage(new Message(MessageType.Info, (MessageCode) null, e.getMessage()));
}
getContainer().addMessage(queryInstance);
if (queryInstance.getQuery().getType() == Type.COUNT) {
--
GitLab