Merge branch 'f-grpc-dev' into f-grpc-f-int64

.gitlab-ci.yml

@@ -120,7 +120,7 @@ pages_prepare: &pages_prepare
   script:
     - echo "Deploying..."
     - make doc
-    - cp -r build/doc/html public
+    - rm -r public || true ; cp -r build/doc/html public
   artifacts:
     paths:
       - public

src/main/java/org/caosdb/server/entity/MagicTypes.java

@@ -26,6 +26,7 @@ import java.util.HashMap;
 import org.caosdb.server.entity.container.RetrieveContainer;
 import org.caosdb.server.transaction.Retrieve;
 
+/** Some types correspond to entities in the database with magic IDs. */
 public enum MagicTypes {
   UNIT,
   NAME,

src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java

@@ -7,6 +7,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.shiro.SecurityUtils;
 import org.caosdb.api.entity.v1alpha1.AtomicDataType;
 import org.caosdb.api.entity.v1alpha1.CollectionValues;
@@ -85,6 +87,7 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
 
   private final FileTransmissionServiceImpl fileTransmissionService;
 
+  /** Get the unit as string. */
   public String getStringUnit(final EntityInterface entity) {
     final Iterator<Property> iterator = entity.getProperties().iterator();
     while (iterator.hasNext()) {