WIP: consolidation

proto/caosdb/entity/v1alpha1/main.proto

@@ -29,16 +29,12 @@ package caosdb.entity.v1alpha1;
 message ReferenceDataType {
   // The name of the record type which defines the scope of the reference.
   string name = 1;
-  // The id of the record type which defines the scope of the reference.
-  string id = 2;
-  // The description of the record type which defines the scope of the reference.
-  string description = 3;
 }
 
 // Data type for list value.
 message ListDataType {
   // A list can be a list of atomic data types or references.
-  oneof content {
+  oneof list_data_type {
     // List of atomic data types (e.g. List of DOUBLE)
     AtomicDataType atomic_data_type = 1;
     // List of reference (e.g. List of Person(s))
@@ -60,14 +56,12 @@ enum AtomicDataType {
   ATOMIC_DATA_TYPE_INTEGER = 4;
   // BOOLEAN data type.
   ATOMIC_DATA_TYPE_BOOLEAN = 5;
-  // FILE data type.
-  ATOMIC_DATA_TYPE_FILE = 6;
 }
 
 // The property value's data type.
 message DataType {
   // Wraps atomic types, LIST and REFERENCE
-  oneof content {
+  oneof data_type {
     // The atomic data types.
     AtomicDataType atomic_type = 1;
     // A list data type.
@@ -85,18 +79,16 @@ message CollectionValues {
 
 // Represents special values which are otherwise hard to tranfer via protobuf.
 enum SpecialValue {
-  // Not set.
+  // Represent the NULL value.
   SPECIAL_VALUE_UNSPECIFIED = 0;
-  // The NULL value.
-  SPECIAL_VALUE_NULL = 1;
   // The empty string.
-  SPECIAL_VALUE_EMPTY_STRING = 2;
+  SPECIAL_VALUE_EMPTY_STRING = 1;
 }
 
 // A scalar property value.
 message ScalarValue {
   // Wraps different optimized representations of a single value.
-  oneof content {
+  oneof scalar_value {
     // The value as integer
     int64 integer_value = 1;
     // The value as double
@@ -113,7 +105,7 @@ message ScalarValue {
 // The value of a property.
 message Value {
   // Wraps scalar and multi-dimensional values.
-  oneof content {
+  oneof value {
     // The scalar values.
     ScalarValue scalar_value = 1;
     // The list values.
@@ -431,8 +423,8 @@ message Entity {
   EntityRole role = 5;
   // Default unit of this entity (only used by properties).
   string unit = 6;
-  // Default datatype of this entity (only used by properties).
-  DataType datatype = 7;
+  // Default data type of this entity (only used by properties).
+  DataType data_type = 7;
   // Default value of this entity (only used by properties).
   Value value = 8;
   // Properties of this entity.
@@ -485,7 +477,7 @@ message Property {
   // Property unit
   string unit = 6;
   // Property datatype
-  DataType datatype = 7;
+  DataType data_type = 7;
   // Errors of this property
   repeated Message errors = 8;
   // Warnings of this property