Make new API alpha status and fix package problems

proto/caosdb/entity/v2/main.proto → proto/caosdb/entity/v2alpha1/entity.proto

@@ -20,11 +20,13 @@
 
 // This is the main file of the caosdb.entity.v1 package.
 syntax = "proto3";
-option  java_multiple_files = true;
-option  java_package        = "org.caosdb.api.entity.v2";
+package caosdb.entity.v2alpha1;
+
+import "caosdb/file_transmission/v1alpha1/file_transmission.proto"; // for FileTransmissionId
+
 option cc_enable_arenas = true;
-package caosdb.entity.v2;
-import "caosdb/file_transmission/v1/main.proto"; // for FileTransmissionId
+option java_multiple_files = true;
+option java_package = "org.caosdb.api.entity.v2alpha1";
 
 // Data type for references to other entities.
 message ReferenceDataType {
@@ -469,7 +471,7 @@ message EntityRequest {
   Entity entity = 1;
   // The transmission id (if any). Note: upload_ids are only meaningful for
   // File entities.
-  FileTransmissionId upload_id = 2;
+  caosdb.file_transmission.v1alpha1.FileTransmissionId upload_id = 2;
 }
 
 // Wraps an entity and associates it with a transimission id for a file
@@ -479,7 +481,7 @@ message EntityResponse {
   Entity entity = 1;
   // The transmission id (if any). Note: download_ids are only meaningful for
   // File entities.
-  FileTransmissionId download_id = 2;
+  caosdb.file_transmission.v1alpha1.FileTransmissionId download_id = 2;
   // Errors for this entity which occurred during the current transaction. The
   // presence of errors indicates that a transaction was not successful and the
   // errors describe why this is the case.
@@ -836,13 +838,9 @@ enum EntityPermission {
 // Entity Transaction Service
 service EntityTransactionService {
   // Issue multiple mixed requests
-  rpc MultiTransaction(MultiTransactionRequest)
-      returns (MultiTransactionResponse);
+  rpc MultiTransaction(MultiTransactionRequest) returns (MultiTransactionResponse);
   // Request the Entity ACLs
-  rpc MultiRetrieveEntityACL(MultiRetrieveEntityACLRequest)
-      returns (MultiRetrieveEntityACLResponse);
+  rpc MultiRetrieveEntityACL(MultiRetrieveEntityACLRequest) returns (MultiRetrieveEntityACLResponse);
   // Set the Entity ACLs,
-  rpc MultiUpdateEntityACL(MultiUpdateEntityACLRequest)
-      returns (MultiUpdateEntityACLResponse);
+  rpc MultiUpdateEntityACL(MultiUpdateEntityACLRequest) returns (MultiUpdateEntityACLResponse);
 }
-

proto/caosdb/file_transmission/v1/main.proto → proto/caosdb/file_transmission/v1alpha1/file_transmission.proto

@@ -21,10 +21,11 @@
 
 // This is the main file of the caosdb.entity.v1 package.
 syntax = "proto3";
+package caosdb.file_transmission.v1alpha1;
+
+option cc_enable_arenas = true;
 option java_multiple_files = true;
 option java_package = "org.caosdb.api.file_transmission.v1";
-option  cc_enable_arenas    = true;
-package caosdb.file_transmission.v1;
 
 ///////////////////////////////////////////////////////////////////////////
 // File transmission
@@ -176,8 +177,7 @@ message FileDownloadResponse {
 service FileTransmissionService {
   // Register a file upload. This needs to be done prior to the actual upload
   // and prior to the transaction request which uses the uploaded files.
-  rpc RegisterFileUpload(RegisterFileUploadRequest)
-      returns (RegisterFileUploadResponse);
+  rpc RegisterFileUpload(RegisterFileUploadRequest) returns (RegisterFileUploadResponse);
   // The actual file upload. The upload has to be registered prior to this rpc.
   rpc FileUpload(stream FileUploadRequest) returns (FileUploadResponse);
   // A file download. The download has to be registered prior this rpc in the