From fab7a11a09fd451be0899dc7dbc0019020ad25e7 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 8 Nov 2021 14:54:16 +0100
Subject: [PATCH] DEPS: Update proto and fix breaking changes
---
caosdb-proto | 2 +-
pom.xml | 2 +-
.../caosdb/server/grpc/DownloadBuffer.java | 6 +-
.../grpc/EntityTransactionServiceImpl.java | 128 +++++++++---------
.../org/caosdb/server/grpc/FileDownload.java | 4 +-
.../server/grpc/FileDownloadRegistration.java | 6 +-
.../caosdb/server/grpc/FileTransmission.java | 4 +-
.../grpc/FileTransmissionServiceImpl.java | 26 ++--
.../org/caosdb/server/grpc/FileUpload.java | 8 +-
.../server/grpc/FileUploadRegistration.java | 2 +-
.../server/grpc/GeneralInfoServiceImpl.java | 8 +-
.../org/caosdb/server/grpc/UploadBuffer.java | 2 +-
.../jobs/core/CheckDatatypePresent.java | 4 +-
.../jobs/core/CheckParOblPropPresent.java | 3 -
.../server/jobs/core/CheckParValid.java | 2 +-
.../jobs/core/CheckRefidIsaParRefid.java | 2 +-
.../server/jobs/core/CheckRefidValid.java | 2 +-
.../jobs/core/CheckTargetPathValid.java | 7 +-
.../server/jobs/core/CheckUnitPresent.java | 4 +-
.../caosdb/server/jobs/core/UniqueName.java | 4 +-
.../caosdb/server/utils/ServerMessages.java | 42 ++----
21 files changed, 116 insertions(+), 152 deletions(-)
diff --git a/caosdb-proto b/caosdb-proto
index 73d85fb2..547771c7 160000
--- a/caosdb-proto
+++ b/caosdb-proto
@@ -1 +1 @@
-Subproject commit 73d85fb20bb16902c0a89dda697eed17994712bc
+Subproject commit 547771c7df79f5b0d6c4d73a3d7e8c9c9e73cb71
diff --git a/pom.xml b/pom.xml
index 55aaeedb..887653b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.caosdb</groupId>
<artifactId>caosdb-server</artifactId>
- <version>0.5.1-GRPC0.0.20</version>
+ <version>0.5.1-GRPC0.0.21</version>
<packaging>jar</packaging>
<name>CaosDB Server</name>
<scm>
diff --git a/src/main/java/org/caosdb/server/grpc/DownloadBuffer.java b/src/main/java/org/caosdb/server/grpc/DownloadBuffer.java
index ba54a1c8..06c38762 100644
--- a/src/main/java/org/caosdb/server/grpc/DownloadBuffer.java
+++ b/src/main/java/org/caosdb/server/grpc/DownloadBuffer.java
@@ -7,9 +7,9 @@ import java.io.IOException;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.channels.FileChannel.MapMode;
-import org.caosdb.api.entity.v1alpha1.FileChunk;
-import org.caosdb.api.entity.v1alpha1.FileDownloadResponse;
-import org.caosdb.api.entity.v1alpha1.TransmissionStatus;
+import org.caosdb.api.entity.v1.FileChunk;
+import org.caosdb.api.entity.v1.FileDownloadResponse;
+import org.caosdb.api.entity.v1.TransmissionStatus;
import org.caosdb.server.entity.FileProperties;
public class DownloadBuffer {
diff --git a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
index 7f5434df..5d33ce0b 100644
--- a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
+++ b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
@@ -8,37 +8,37 @@ import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
import org.apache.shiro.SecurityUtils;
-import org.caosdb.api.entity.v1alpha1.AtomicDataType;
-import org.caosdb.api.entity.v1alpha1.CollectionValues;
-import org.caosdb.api.entity.v1alpha1.DataType;
-import org.caosdb.api.entity.v1alpha1.DeleteRequest;
-import org.caosdb.api.entity.v1alpha1.DeleteResponse;
-import org.caosdb.api.entity.v1alpha1.Entity;
-import org.caosdb.api.entity.v1alpha1.Entity.Builder;
-import org.caosdb.api.entity.v1alpha1.EntityRequest;
-import org.caosdb.api.entity.v1alpha1.EntityResponse;
-import org.caosdb.api.entity.v1alpha1.EntityRole;
-import org.caosdb.api.entity.v1alpha1.EntityTransactionServiceGrpc.EntityTransactionServiceImplBase;
-import org.caosdb.api.entity.v1alpha1.FileDescriptor;
-import org.caosdb.api.entity.v1alpha1.IdResponse;
-import org.caosdb.api.entity.v1alpha1.Importance;
-import org.caosdb.api.entity.v1alpha1.InsertRequest;
-import org.caosdb.api.entity.v1alpha1.InsertResponse;
-import org.caosdb.api.entity.v1alpha1.ListDataType;
-import org.caosdb.api.entity.v1alpha1.MessageCode;
-import org.caosdb.api.entity.v1alpha1.MultiTransactionRequest;
-import org.caosdb.api.entity.v1alpha1.MultiTransactionResponse;
-import org.caosdb.api.entity.v1alpha1.Parent;
-import org.caosdb.api.entity.v1alpha1.ReferenceDataType;
-import org.caosdb.api.entity.v1alpha1.RetrieveResponse;
-import org.caosdb.api.entity.v1alpha1.ScalarValue;
-import org.caosdb.api.entity.v1alpha1.SpecialValue;
-import org.caosdb.api.entity.v1alpha1.TransactionRequest;
-import org.caosdb.api.entity.v1alpha1.TransactionRequest.WrappedRequestsCase;
-import org.caosdb.api.entity.v1alpha1.TransactionResponse;
-import org.caosdb.api.entity.v1alpha1.UpdateRequest;
-import org.caosdb.api.entity.v1alpha1.UpdateResponse;
-import org.caosdb.api.entity.v1alpha1.Version;
+import org.caosdb.api.entity.v1.AtomicDataType;
+import org.caosdb.api.entity.v1.CollectionValues;
+import org.caosdb.api.entity.v1.DataType;
+import org.caosdb.api.entity.v1.DeleteRequest;
+import org.caosdb.api.entity.v1.DeleteResponse;
+import org.caosdb.api.entity.v1.Entity;
+import org.caosdb.api.entity.v1.Entity.Builder;
+import org.caosdb.api.entity.v1.EntityRequest;
+import org.caosdb.api.entity.v1.EntityResponse;
+import org.caosdb.api.entity.v1.EntityRole;
+import org.caosdb.api.entity.v1.EntityTransactionServiceGrpc.EntityTransactionServiceImplBase;
+import org.caosdb.api.entity.v1.FileDescriptor;
+import org.caosdb.api.entity.v1.IdResponse;
+import org.caosdb.api.entity.v1.Importance;
+import org.caosdb.api.entity.v1.InsertRequest;
+import org.caosdb.api.entity.v1.InsertResponse;
+import org.caosdb.api.entity.v1.ListDataType;
+import org.caosdb.api.entity.v1.MessageCode;
+import org.caosdb.api.entity.v1.MultiTransactionRequest;
+import org.caosdb.api.entity.v1.MultiTransactionResponse;
+import org.caosdb.api.entity.v1.Parent;
+import org.caosdb.api.entity.v1.ReferenceDataType;
+import org.caosdb.api.entity.v1.RetrieveResponse;
+import org.caosdb.api.entity.v1.ScalarValue;
+import org.caosdb.api.entity.v1.SpecialValue;
+import org.caosdb.api.entity.v1.TransactionRequest;
+import org.caosdb.api.entity.v1.TransactionRequest.WrappedRequestsCase;
+import org.caosdb.api.entity.v1.TransactionResponse;
+import org.caosdb.api.entity.v1.UpdateRequest;
+import org.caosdb.api.entity.v1.UpdateResponse;
+import org.caosdb.api.entity.v1.Version;
import org.caosdb.datetime.DateTimeInterface;
import org.caosdb.server.CaosDBException;
import org.caosdb.server.datatype.AbstractCollectionDatatype;
@@ -162,18 +162,18 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
}
}
- public static Iterable<? extends org.caosdb.api.entity.v1alpha1.Message> convert(
+ public static Iterable<? extends org.caosdb.api.entity.v1.Message> convert(
final List<Message> messages) {
- final List<org.caosdb.api.entity.v1alpha1.Message> result = new LinkedList<>();
+ final List<org.caosdb.api.entity.v1.Message> result = new LinkedList<>();
for (final Message m : messages) {
result.add(convert(m));
}
return result;
}
- public static org.caosdb.api.entity.v1alpha1.Message convert(final Message m) {
- final org.caosdb.api.entity.v1alpha1.Message.Builder builder =
- org.caosdb.api.entity.v1alpha1.Message.newBuilder();
+ public static org.caosdb.api.entity.v1.Message convert(final Message m) {
+ final org.caosdb.api.entity.v1.Message.Builder builder =
+ org.caosdb.api.entity.v1.Message.newBuilder();
final MessageCode code = getMessageCode(m);
builder.setCode(code.getNumber());
builder.setDescription(m.getDescription());
@@ -197,14 +197,14 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
}
public Version convert(final org.caosdb.server.entity.Version from) {
- final org.caosdb.api.entity.v1alpha1.Version.Builder builder = Version.newBuilder();
+ final org.caosdb.api.entity.v1.Version.Builder builder = Version.newBuilder();
builder.setId(from.getId());
return builder.build();
}
public Parent convert(final org.caosdb.server.entity.wrapper.Parent from) {
- final org.caosdb.api.entity.v1alpha1.Parent.Builder builder = Parent.newBuilder();
+ final org.caosdb.api.entity.v1.Parent.Builder builder = Parent.newBuilder();
if (from.hasId()) {
builder.setId(from.getId().toString());
}
@@ -218,9 +218,9 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
return builder.build();
}
- public org.caosdb.api.entity.v1alpha1.Property convert(final Property from) {
- final org.caosdb.api.entity.v1alpha1.Property.Builder builder =
- org.caosdb.api.entity.v1alpha1.Property.newBuilder();
+ public org.caosdb.api.entity.v1.Property convert(final Property from) {
+ final org.caosdb.api.entity.v1.Property.Builder builder =
+ org.caosdb.api.entity.v1.Property.newBuilder();
if (from.hasId()) {
builder.setId(from.getId().toString());
@@ -252,12 +252,12 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
return builder.build();
}
- private org.caosdb.api.entity.v1alpha1.Value.Builder convert(final Value value) {
+ private org.caosdb.api.entity.v1.Value.Builder convert(final Value value) {
if (value instanceof CollectionValue) {
return convertCollectionValue((CollectionValue) value);
}
- final org.caosdb.api.entity.v1alpha1.Value.Builder builder =
- org.caosdb.api.entity.v1alpha1.Value.newBuilder();
+ final org.caosdb.api.entity.v1.Value.Builder builder =
+ org.caosdb.api.entity.v1.Value.newBuilder();
builder.setScalarValue(convertScalarValue(value));
return builder;
}
@@ -290,19 +290,19 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
}
}
- private org.caosdb.api.entity.v1alpha1.ScalarValue.Builder convertStringValue(final Value value) {
+ private org.caosdb.api.entity.v1.ScalarValue.Builder convertStringValue(final Value value) {
if (value.toString().isEmpty()) {
return ScalarValue.newBuilder().setSpecialValue(SpecialValue.SPECIAL_VALUE_EMPTY_STRING);
}
return ScalarValue.newBuilder().setStringValue(value.toString());
}
- private org.caosdb.api.entity.v1alpha1.ScalarValue.Builder convertDateTimeInterface(
+ private org.caosdb.api.entity.v1.ScalarValue.Builder convertDateTimeInterface(
final DateTimeInterface value) {
return convertStringValue(value);
}
- private org.caosdb.api.entity.v1alpha1.ScalarValue.Builder convertBooleanValue(
+ private org.caosdb.api.entity.v1.ScalarValue.Builder convertBooleanValue(
final BooleanValue value) {
return ScalarValue.newBuilder().setBooleanValue(value.getValue());
}
@@ -311,11 +311,11 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
return convertStringValue(value);
}
- private org.caosdb.api.entity.v1alpha1.Value.Builder convertCollectionValue(
+ private org.caosdb.api.entity.v1.Value.Builder convertCollectionValue(
final CollectionValue value) {
- final org.caosdb.api.entity.v1alpha1.Value.Builder builder =
- org.caosdb.api.entity.v1alpha1.Value.newBuilder();
+ final org.caosdb.api.entity.v1.Value.Builder builder =
+ org.caosdb.api.entity.v1.Value.newBuilder();
final List<ScalarValue> values = new LinkedList<>();
value.forEach(
(v) -> {
@@ -344,7 +344,7 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
}
}
- private org.caosdb.api.entity.v1alpha1.DataType.Builder convert(final AbstractDatatype datatype) {
+ private org.caosdb.api.entity.v1.DataType.Builder convert(final AbstractDatatype datatype) {
if (datatype instanceof ReferenceDatatype2) {
return DataType.newBuilder()
.setReferenceDataType(convertReferenceDatatype((ReferenceDatatype2) datatype));
@@ -400,11 +400,10 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
return AtomicDataType.ATOMIC_DATA_TYPE_BOOLEAN;
}
- private org.caosdb.api.entity.v1alpha1.ListDataType.Builder convertAbstractCollectionDatatype(
+ private org.caosdb.api.entity.v1.ListDataType.Builder convertAbstractCollectionDatatype(
final AbstractCollectionDatatype collectionDatatype) {
- final org.caosdb.api.entity.v1alpha1.ListDataType.Builder listBuilder =
- ListDataType.newBuilder();
+ final org.caosdb.api.entity.v1.ListDataType.Builder listBuilder = ListDataType.newBuilder();
final AbstractDatatype datatype = collectionDatatype.getDatatype();
if (datatype instanceof ReferenceDatatype) {
listBuilder.setReferenceDataType(convertReferenceDatatype((ReferenceDatatype) datatype));
@@ -426,12 +425,12 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
return listBuilder;
}
- private org.caosdb.api.entity.v1alpha1.ReferenceDataType.Builder convertReferenceDatatype(
+ private org.caosdb.api.entity.v1.ReferenceDataType.Builder convertReferenceDatatype(
final ReferenceDatatype datatype) {
return ReferenceDataType.newBuilder().setName(datatype.getName());
}
- public Iterable<? extends org.caosdb.api.entity.v1alpha1.Property> convert(
+ public Iterable<? extends org.caosdb.api.entity.v1.Property> convert(
final PropertyContainer from) {
final Iterator<org.caosdb.server.entity.wrapper.Property> iterator = from.iterator();
return () ->
@@ -443,7 +442,7 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
}
@Override
- public org.caosdb.api.entity.v1alpha1.Property next() {
+ public org.caosdb.api.entity.v1.Property next() {
return convert(iterator.next());
}
};
@@ -713,7 +712,7 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
* @return
*/
private MultiTransactionResponse failedWriteDueToStringId(final MultiTransactionRequest request) {
- final org.caosdb.api.entity.v1alpha1.MultiTransactionResponse.Builder builder =
+ final org.caosdb.api.entity.v1.MultiTransactionResponse.Builder builder =
MultiTransactionResponse.newBuilder();
for (final TransactionRequest subRequest : request.getRequestsList()) {
final IdResponse.Builder idResponse = IdResponse.newBuilder();
@@ -794,8 +793,7 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
}
private void appendMessages(
- final EntityInterface from,
- final org.caosdb.api.entity.v1alpha1.EntityResponse.Builder builder) {
+ final EntityInterface from, final org.caosdb.api.entity.v1.EntityResponse.Builder builder) {
if (from.hasMessage(Message.MessageType.Error.toString())) {
builder.addAllErrors(convert(from.getMessages(Message.MessageType.Error.toString())));
}
@@ -808,7 +806,7 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
}
private void appendMessages(
- final EntityInterface from, final org.caosdb.api.entity.v1alpha1.IdResponse.Builder builder) {
+ final EntityInterface from, final org.caosdb.api.entity.v1.IdResponse.Builder builder) {
if (from.hasMessage(Message.MessageType.Error.toString())) {
builder.addAllErrors(convert(from.getMessages(Message.MessageType.Error.toString())));
}
@@ -864,7 +862,7 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
return entity;
}
- private Value convert(final org.caosdb.api.entity.v1alpha1.Value value) {
+ private Value convert(final org.caosdb.api.entity.v1.Value value) {
switch (value.getValueCase()) {
case LIST_VALUES:
return convertListValue(value.getListValues());
@@ -887,7 +885,7 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
return result;
}
- private Value convertScalarValue(final org.caosdb.api.entity.v1alpha1.ScalarValue value) {
+ private Value convertScalarValue(final org.caosdb.api.entity.v1.ScalarValue value) {
switch (value.getScalarValueCase()) {
case BOOLEAN_VALUE:
return BooleanValue.valueOf(value.getBooleanValue());
@@ -972,7 +970,7 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
}
private Collection<Property> convertProperties(
- final List<org.caosdb.api.entity.v1alpha1.Property> propertiesList,
+ final List<org.caosdb.api.entity.v1.Property> propertiesList,
final StatementStatus defaultImportance) {
final Collection<Property> result = new LinkedList<>();
propertiesList.forEach(
@@ -983,7 +981,7 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
}
private Property convert(
- final org.caosdb.api.entity.v1alpha1.Property e, final StatementStatus defaultImportance) {
+ final org.caosdb.api.entity.v1.Property e, final StatementStatus defaultImportance) {
final Property result = new Property();
try {
diff --git a/src/main/java/org/caosdb/server/grpc/FileDownload.java b/src/main/java/org/caosdb/server/grpc/FileDownload.java
index d4fdda38..2f3c7989 100644
--- a/src/main/java/org/caosdb/server/grpc/FileDownload.java
+++ b/src/main/java/org/caosdb/server/grpc/FileDownload.java
@@ -4,8 +4,8 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.caosdb.api.entity.v1alpha1.FileDownloadResponse;
-import org.caosdb.api.entity.v1alpha1.FileTransmissionSettings;
+import org.caosdb.api.entity.v1.FileDownloadResponse;
+import org.caosdb.api.entity.v1.FileTransmissionSettings;
import org.caosdb.server.entity.FileProperties;
import org.caosdb.server.utils.Utils;
diff --git a/src/main/java/org/caosdb/server/grpc/FileDownloadRegistration.java b/src/main/java/org/caosdb/server/grpc/FileDownloadRegistration.java
index 579495a1..51304040 100644
--- a/src/main/java/org/caosdb/server/grpc/FileDownloadRegistration.java
+++ b/src/main/java/org/caosdb/server/grpc/FileDownloadRegistration.java
@@ -7,9 +7,9 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.caosdb.api.entity.v1alpha1.FileDownloadResponse;
-import org.caosdb.api.entity.v1alpha1.FileTransmissionId;
-import org.caosdb.api.entity.v1alpha1.FileTransmissionSettings;
+import org.caosdb.api.entity.v1.FileDownloadResponse;
+import org.caosdb.api.entity.v1.FileTransmissionId;
+import org.caosdb.api.entity.v1.FileTransmissionSettings;
import org.caosdb.server.entity.FileProperties;
import org.caosdb.server.utils.Utils;
diff --git a/src/main/java/org/caosdb/server/grpc/FileTransmission.java b/src/main/java/org/caosdb/server/grpc/FileTransmission.java
index 5440b15c..67eca23a 100644
--- a/src/main/java/org/caosdb/server/grpc/FileTransmission.java
+++ b/src/main/java/org/caosdb/server/grpc/FileTransmission.java
@@ -1,8 +1,8 @@
package org.caosdb.server.grpc;
import java.util.concurrent.locks.ReentrantLock;
-import org.caosdb.api.entity.v1alpha1.FileTransmissionSettings;
-import org.caosdb.api.entity.v1alpha1.RegistrationStatus;
+import org.caosdb.api.entity.v1.FileTransmissionSettings;
+import org.caosdb.api.entity.v1.RegistrationStatus;
import org.caosdb.server.entity.FileProperties;
public abstract class FileTransmission {
diff --git a/src/main/java/org/caosdb/server/grpc/FileTransmissionServiceImpl.java b/src/main/java/org/caosdb/server/grpc/FileTransmissionServiceImpl.java
index fd462053..0b0c4b50 100644
--- a/src/main/java/org/caosdb/server/grpc/FileTransmissionServiceImpl.java
+++ b/src/main/java/org/caosdb/server/grpc/FileTransmissionServiceImpl.java
@@ -2,19 +2,19 @@ package org.caosdb.server.grpc;
import io.grpc.stub.StreamObserver;
import java.io.IOException;
-import org.caosdb.api.entity.v1alpha1.FileChunk;
-import org.caosdb.api.entity.v1alpha1.FileDownloadRequest;
-import org.caosdb.api.entity.v1alpha1.FileDownloadResponse;
-import org.caosdb.api.entity.v1alpha1.FileTransmissionId;
-import org.caosdb.api.entity.v1alpha1.FileTransmissionServiceGrpc.FileTransmissionServiceImplBase;
-import org.caosdb.api.entity.v1alpha1.FileTransmissionSettings;
-import org.caosdb.api.entity.v1alpha1.FileUploadRequest;
-import org.caosdb.api.entity.v1alpha1.FileUploadResponse;
-import org.caosdb.api.entity.v1alpha1.RegisterFileUploadRequest;
-import org.caosdb.api.entity.v1alpha1.RegisterFileUploadResponse;
-import org.caosdb.api.entity.v1alpha1.RegisterFileUploadResponse.Builder;
-import org.caosdb.api.entity.v1alpha1.RegistrationStatus;
-import org.caosdb.api.entity.v1alpha1.TransmissionStatus;
+import org.caosdb.api.entity.v1.FileChunk;
+import org.caosdb.api.entity.v1.FileDownloadRequest;
+import org.caosdb.api.entity.v1.FileDownloadResponse;
+import org.caosdb.api.entity.v1.FileTransmissionId;
+import org.caosdb.api.entity.v1.FileTransmissionServiceGrpc.FileTransmissionServiceImplBase;
+import org.caosdb.api.entity.v1.FileTransmissionSettings;
+import org.caosdb.api.entity.v1.FileUploadRequest;
+import org.caosdb.api.entity.v1.FileUploadResponse;
+import org.caosdb.api.entity.v1.RegisterFileUploadRequest;
+import org.caosdb.api.entity.v1.RegisterFileUploadResponse;
+import org.caosdb.api.entity.v1.RegisterFileUploadResponse.Builder;
+import org.caosdb.api.entity.v1.RegistrationStatus;
+import org.caosdb.api.entity.v1.TransmissionStatus;
import org.caosdb.server.CaosDBServer;
import org.caosdb.server.entity.FileProperties;
import org.caosdb.server.utils.CronJob;
diff --git a/src/main/java/org/caosdb/server/grpc/FileUpload.java b/src/main/java/org/caosdb/server/grpc/FileUpload.java
index c417fd7d..2ec4ca3d 100644
--- a/src/main/java/org/caosdb/server/grpc/FileUpload.java
+++ b/src/main/java/org/caosdb/server/grpc/FileUpload.java
@@ -5,10 +5,10 @@ import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.caosdb.api.entity.v1alpha1.FileChunk;
-import org.caosdb.api.entity.v1alpha1.FileTransmissionSettings;
-import org.caosdb.api.entity.v1alpha1.FileTransmissionSettings.Builder;
-import org.caosdb.api.entity.v1alpha1.TransmissionStatus;
+import org.caosdb.api.entity.v1.FileChunk;
+import org.caosdb.api.entity.v1.FileTransmissionSettings;
+import org.caosdb.api.entity.v1.FileTransmissionSettings.Builder;
+import org.caosdb.api.entity.v1.TransmissionStatus;
import org.caosdb.server.FileSystem;
import org.caosdb.server.entity.FileProperties;
diff --git a/src/main/java/org/caosdb/server/grpc/FileUploadRegistration.java b/src/main/java/org/caosdb/server/grpc/FileUploadRegistration.java
index 7e631fad..bfb25be2 100644
--- a/src/main/java/org/caosdb/server/grpc/FileUploadRegistration.java
+++ b/src/main/java/org/caosdb/server/grpc/FileUploadRegistration.java
@@ -5,7 +5,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.caosdb.api.entity.v1alpha1.FileTransmissionId;
+import org.caosdb.api.entity.v1.FileTransmissionId;
import org.caosdb.server.entity.FileProperties;
import org.caosdb.server.utils.Utils;
diff --git a/src/main/java/org/caosdb/server/grpc/GeneralInfoServiceImpl.java b/src/main/java/org/caosdb/server/grpc/GeneralInfoServiceImpl.java
index dfd10ac8..7966251c 100644
--- a/src/main/java/org/caosdb/server/grpc/GeneralInfoServiceImpl.java
+++ b/src/main/java/org/caosdb/server/grpc/GeneralInfoServiceImpl.java
@@ -20,10 +20,10 @@
package org.caosdb.server.grpc;
import io.grpc.stub.StreamObserver;
-import org.caosdb.api.info.v1alpha1.GeneralInfoServiceGrpc.GeneralInfoServiceImplBase;
-import org.caosdb.api.info.v1alpha1.GetVersionInfoRequest;
-import org.caosdb.api.info.v1alpha1.GetVersionInfoResponse;
-import org.caosdb.api.info.v1alpha1.VersionInfo;
+import org.caosdb.api.info.v1.GeneralInfoServiceGrpc.GeneralInfoServiceImplBase;
+import org.caosdb.api.info.v1.GetVersionInfoRequest;
+import org.caosdb.api.info.v1.GetVersionInfoResponse;
+import org.caosdb.api.info.v1.VersionInfo;
import org.caosdb.server.CaosDBServer;
import org.caosdb.server.ServerProperties;
diff --git a/src/main/java/org/caosdb/server/grpc/UploadBuffer.java b/src/main/java/org/caosdb/server/grpc/UploadBuffer.java
index d196da7d..a9556220 100644
--- a/src/main/java/org/caosdb/server/grpc/UploadBuffer.java
+++ b/src/main/java/org/caosdb/server/grpc/UploadBuffer.java
@@ -4,7 +4,7 @@ import com.google.protobuf.ByteString;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import org.caosdb.api.entity.v1alpha1.TransmissionStatus;
+import org.caosdb.api.entity.v1.TransmissionStatus;
import org.caosdb.server.entity.FileProperties;
public class UploadBuffer {
diff --git a/src/main/java/org/caosdb/server/jobs/core/CheckDatatypePresent.java b/src/main/java/org/caosdb/server/jobs/core/CheckDatatypePresent.java
index 6a3e27d2..9ea7d4b3 100644
--- a/src/main/java/org/caosdb/server/jobs/core/CheckDatatypePresent.java
+++ b/src/main/java/org/caosdb/server/jobs/core/CheckDatatypePresent.java
@@ -95,7 +95,7 @@ public final class CheckDatatypePresent extends EntityJob {
} else {
// finally, no data type
- throw ServerMessages.NO_DATATYPE;
+ throw ServerMessages.PROPERTY_HAS_NO_DATATYPE;
}
} catch (final Message m) {
@@ -214,7 +214,7 @@ public final class CheckDatatypePresent extends EntityJob {
} catch (final EntityDoesNotExistException exc) {
entity.addError(ServerMessages.ENTITY_DOES_NOT_EXIST);
} catch (final EntityWasNotUniqueException exc) {
- entity.addError(ServerMessages.CANNOT_IDENTIFY_ENTITY_UNIQUELY);
+ entity.addError(ServerMessages.ENTITY_NAME_DUPLICATES);
}
}
}
diff --git a/src/main/java/org/caosdb/server/jobs/core/CheckParOblPropPresent.java b/src/main/java/org/caosdb/server/jobs/core/CheckParOblPropPresent.java
index 9588a305..e6ba9da4 100644
--- a/src/main/java/org/caosdb/server/jobs/core/CheckParOblPropPresent.java
+++ b/src/main/java/org/caosdb/server/jobs/core/CheckParOblPropPresent.java
@@ -39,9 +39,6 @@ import org.caosdb.server.utils.ServerMessages;
public class CheckParOblPropPresent extends EntityJob {
public static final String OBL_IMPORTANCE_FLAG_KEY = "force-missing-obligatory";
- public static final Message ENTITY_NOT_UNIQUE =
- new Message(
- MessageType.Error, 0, "Could not check importance. Parent was not uniquely resolvable.");
public static final Message ILLEGAL_FLAG_VALUE =
new Message(MessageType.Warning, "Illegal value for flag 'force-missing-obligatory'.");
diff --git a/src/main/java/org/caosdb/server/jobs/core/CheckParValid.java b/src/main/java/org/caosdb/server/jobs/core/CheckParValid.java
index fa1c6fd3..4e6b097e 100644
--- a/src/main/java/org/caosdb/server/jobs/core/CheckParValid.java
+++ b/src/main/java/org/caosdb/server/jobs/core/CheckParValid.java
@@ -124,7 +124,7 @@ public class CheckParValid extends EntityJob {
} catch (final EntityDoesNotExistException exc) {
addError(parent, ServerMessages.ENTITY_DOES_NOT_EXIST);
} catch (final EntityWasNotUniqueException exc) {
- addError(parent, ServerMessages.NAME_DUPLICATES);
+ addError(parent, ServerMessages.ENTITY_NAME_DUPLICATES);
}
}
}
diff --git a/src/main/java/org/caosdb/server/jobs/core/CheckRefidIsaParRefid.java b/src/main/java/org/caosdb/server/jobs/core/CheckRefidIsaParRefid.java
index b9f804f5..5b95840a 100644
--- a/src/main/java/org/caosdb/server/jobs/core/CheckRefidIsaParRefid.java
+++ b/src/main/java/org/caosdb/server/jobs/core/CheckRefidIsaParRefid.java
@@ -151,7 +151,7 @@ public class CheckRefidIsaParRefid extends EntityJob implements Observer {
+ (par.hasName()
? par.getName()
: (par.hasCuid() ? par.getCuid() : (par.toString())))));
- throw ServerMessages.ENTITY_HAS_INVALID_REFERENCE;
+ throw ServerMessages.ENTITY_HAS_UNQUALIFIED_REFERENCE;
}
if (isSubType(par.getId(), parent)) {
return true;
diff --git a/src/main/java/org/caosdb/server/jobs/core/CheckRefidValid.java b/src/main/java/org/caosdb/server/jobs/core/CheckRefidValid.java
index 8563ea71..f19424b1 100644
--- a/src/main/java/org/caosdb/server/jobs/core/CheckRefidValid.java
+++ b/src/main/java/org/caosdb/server/jobs/core/CheckRefidValid.java
@@ -157,7 +157,7 @@ public class CheckRefidValid extends EntityJob implements Observer {
if (ref.getEntity().hasEntityStatus()) {
switch (ref.getEntity().getEntityStatus()) {
case UNQUALIFIED:
- getEntity().addError(ServerMessages.ENTITY_HAS_INVALID_REFERENCE);
+ getEntity().addError(ServerMessages.ENTITY_HAS_UNQUALIFIED_REFERENCE);
getEntity().setEntityStatus(EntityStatus.UNQUALIFIED);
return false;
case DELETED:
diff --git a/src/main/java/org/caosdb/server/jobs/core/CheckTargetPathValid.java b/src/main/java/org/caosdb/server/jobs/core/CheckTargetPathValid.java
index 7d06498f..28b914e6 100644
--- a/src/main/java/org/caosdb/server/jobs/core/CheckTargetPathValid.java
+++ b/src/main/java/org/caosdb/server/jobs/core/CheckTargetPathValid.java
@@ -37,11 +37,6 @@ import org.caosdb.server.utils.ServerMessages;
*/
public class CheckTargetPathValid extends EntityJob {
- public static final Message TARGET_PATH_NOT_IN_USER_FOLDER =
- new Message(
- 0,
- "According to the server's configuration, your file has to be stored to ýour user folder");
-
@Override
public final void run() {
if (getEntity().hasFileProperties()) {
@@ -50,7 +45,7 @@ public class CheckTargetPathValid extends EntityJob {
if (!file.hasPath()) {
// the file doesn't have a path property at all
getEntity().setEntityStatus(EntityStatus.UNQUALIFIED);
- getEntity().addError(ServerMessages.NO_TARGET_PATH);
+ getEntity().addError(ServerMessages.FILE_HAS_NO_TARGET_PATH);
return;
}
diff --git a/src/main/java/org/caosdb/server/jobs/core/CheckUnitPresent.java b/src/main/java/org/caosdb/server/jobs/core/CheckUnitPresent.java
index 5e3e6120..85eb3259 100644
--- a/src/main/java/org/caosdb/server/jobs/core/CheckUnitPresent.java
+++ b/src/main/java/org/caosdb/server/jobs/core/CheckUnitPresent.java
@@ -42,11 +42,11 @@ public class CheckUnitPresent extends EntityJob {
if (!hasUnit(getEntity())) {
switch (getFailureSeverity()) {
case ERROR:
- getEntity().addError(ServerMessages.ENTITY_HAS_NO_UNIT);
+ getEntity().addError(ServerMessages.PROPERTY_HAS_NO_UNIT);
getEntity().setEntityStatus(EntityStatus.UNQUALIFIED);
break;
case WARN:
- getEntity().addWarning(ServerMessages.ENTITY_HAS_NO_UNIT);
+ getEntity().addWarning(ServerMessages.PROPERTY_HAS_NO_UNIT);
default:
break;
}
diff --git a/src/main/java/org/caosdb/server/jobs/core/UniqueName.java b/src/main/java/org/caosdb/server/jobs/core/UniqueName.java
index 2836ccf7..0ef97925 100644
--- a/src/main/java/org/caosdb/server/jobs/core/UniqueName.java
+++ b/src/main/java/org/caosdb/server/jobs/core/UniqueName.java
@@ -46,7 +46,7 @@ public class UniqueName extends FlagJob {
} catch (final EntityDoesNotExistException e) {
// ok
} catch (final EntityWasNotUniqueException e) {
- entity.addError(ServerMessages.NAME_IS_NOT_UNIQUE);
+ entity.addError(ServerMessages.ENTITY_NAME_IS_NOT_UNIQUE);
entity.setEntityStatus(EntityStatus.UNQUALIFIED);
return;
}
@@ -55,7 +55,7 @@ public class UniqueName extends FlagJob {
for (final EntityInterface e : getContainer()) {
if (entity != e && e.hasName() && e.getName().equals(entity.getName())) {
entity.setEntityStatus(EntityStatus.UNQUALIFIED);
- entity.addError(ServerMessages.NAME_IS_NOT_UNIQUE);
+ entity.addError(ServerMessages.ENTITY_NAME_IS_NOT_UNIQUE);
return;
}
}
diff --git a/src/main/java/org/caosdb/server/utils/ServerMessages.java b/src/main/java/org/caosdb/server/utils/ServerMessages.java
index a12b9bc4..f8898ff4 100644
--- a/src/main/java/org/caosdb/server/utils/ServerMessages.java
+++ b/src/main/java/org/caosdb/server/utils/ServerMessages.java
@@ -19,7 +19,7 @@
*/
package org.caosdb.server.utils;
-import org.caosdb.api.entity.v1alpha1.MessageCode;
+import org.caosdb.api.entity.v1.MessageCode;
import org.caosdb.server.CaosDBServer;
import org.caosdb.server.ServerProperties;
import org.caosdb.server.entity.Message;
@@ -56,7 +56,7 @@ public class ServerMessages {
0,
"Entity is required by other entities which are not to be deleted.");
- public static final Message NO_DATATYPE =
+ public static final Message PROPERTY_HAS_NO_DATATYPE =
new Message(MessageType.Error, 110, "Property has no datatype.");
public static final Message ENTITY_HAS_NO_DESCRIPTION =
@@ -71,16 +71,10 @@ public class ServerMessages {
public static final Message ENTITY_HAS_NO_PARENTS =
new Message(MessageType.Error, 0, "Entity has no parents.");
- public static final Message NAME_DUPLICATES =
- new Message(MessageType.Error, 0, "Entity can not be identified due to name duplicates.");
-
public static final Message ENTITY_HAS_NO_PROPERTIES =
new Message(MessageType.Error, 0, "Entity has no properties.");
- public static final Message REFERENCE_HAS_NO_REFID =
- new Message(MessageType.Error, 0, "Reference property has no refid.");
-
- public static final Message NO_TARGET_PATH =
+ public static final Message FILE_HAS_NO_TARGET_PATH =
new Message(MessageType.Error, 0, "No target path specified.");
public static final Message TARGET_PATH_NOT_ALLOWED =
@@ -89,8 +83,8 @@ public class ServerMessages {
public static final Message TARGET_PATH_EXISTS =
new Message(MessageType.Error, 0, "This target path does already exist.");
- public static final Message ENTITY_HAS_NO_UNIT =
- new Message(MessageType.Error, 0, "Entity has no unit.");
+ public static final Message PROPERTY_HAS_NO_UNIT =
+ new Message(MessageType.Error, 0, "Property has no unit.");
public static final Message CANNOT_PARSE_VALUE =
new Message(MessageType.Error, 0, "Cannot parse value.");
@@ -140,18 +134,6 @@ public class ServerMessages {
public static final Message REQUEST_BODY_EMPTY =
new Message(MessageType.Error, 0, "Request body was empty.");
- public static final Message MYSQL_PROCEDURE_EXCEPTION =
- new Message(
- MessageType.Error,
- 0,
- "Please check if your MySQL has all required procedures installed.");
-
- public static final Message REQUEST_HAS_WRONG_ENCODING =
- new Message(
- MessageType.Error,
- 0,
- "This error occurred while parsing the xml. Probably it has a wrong encoding.");
-
public static final Message REQUEST_DOESNT_CONTAIN_EXPECTED_ELEMENTS =
new Message(MessageType.Error, 0, "Request body didn't contain the expected Elements.");
@@ -182,17 +164,13 @@ public class ServerMessages {
public static final Message FORM_CONTAINS_UNSUPPORTED_CONTENT =
new Message(MessageType.Error, 0, "The form contains unsupported content");
- public static final Message FILE_IS_EMPTY = new Message(MessageType.Error, 0, "File is empty.");
-
public static final Message WARNING_OCCURED =
new Message(
MessageType.Error,
128,
"A warning occured while processing an entity with the strict flag.");
- public static final Message UNKNOWN_JOB = new Message(MessageType.Warning, 0, "Unknown job.");
-
- public static final Message NAME_IS_NOT_UNIQUE =
+ public static final Message ENTITY_NAME_IS_NOT_UNIQUE =
new Message(
MessageType.Error,
152,
@@ -201,10 +179,6 @@ public class ServerMessages {
public static final Message ROLE_NAME_IS_NOT_UNIQUE =
new Message(MessageType.Error, 1152, "Role name is already in use. Choose a different name.");
- public static final Message CANNOT_IDENTIFY_ENTITY_UNIQUELY =
- new Message(
- MessageType.Error, 0, "This entity cannot be identified uniquely due to name dublicates");
-
public static final Message QUERY_EXCEPTION =
new Message(MessageType.Error, 13, "This query finished with errors.");
@@ -371,8 +345,8 @@ public class ServerMessages {
new Message(
MessageType.Error, 192, "This entity cannot be deleted due to dependency problems");
- public static final Message ENTITY_HAS_INVALID_REFERENCE =
- new Message(MessageType.Error, 0, "This entity has an invalid reference.");
+ public static final Message ENTITY_HAS_UNQUALIFIED_REFERENCE =
+ new Message(MessageType.Error, 0, "This entity has an unqualified reference.");
public static final Message REFERENCED_ENTITY_DOES_NOT_EXIST =
new Message(MessageType.Error, 235, "Referenced entity does not exist.");
--
GitLab