diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7980f90eb16a03370acc07a940f801911c1ddef8..5ad5f1304f0a6d15e935c7ad4378f55366673891 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/src/main/java/org/caosdb/server/entity/MagicTypes.java b/src/main/java/org/caosdb/server/entity/MagicTypes.java index cffdb0723588d3aaec31e24a39895e304aa2e18b..f17d448ca934901dc491f1d737f9122e2a67862a 100644 --- a/src/main/java/org/caosdb/server/entity/MagicTypes.java +++ b/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, diff --git a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java index 1120a0c93b7bed70d7073f7de87c183596831235..f125925b4ece4727c07863dcbfda3818aa7fbbdf 100644 --- a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java +++ b/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()) {