Merge remote-tracking branch 'origin/develop' into

entity-management-definitions/src/main/java/eu/europeana/entitymanagement/definitions/model/Vocabulary.java

@@ -15,6 +15,7 @@
 import dev.morphia.annotations.Id;
 import dev.morphia.annotations.IndexOptions;
 import dev.morphia.annotations.Indexed;
+import dev.morphia.annotations.Transient;
 import eu.europeana.entitymanagement.utils.VocabularyWatcher;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -26,6 +27,7 @@
  */
 public class Vocabulary {
 
+  @Transient
   private String type = "Concept";
 
   @Id @JsonIgnore private ObjectId dbId;

entity-management-mongo/src/main/java/eu/europeana/entitymanagement/mongo/repository/VocabularyRepository.java

@@ -1,7 +1,6 @@
 package eu.europeana.entitymanagement.mongo.repository;
 
 import static dev.morphia.query.experimental.filters.Filters.in;
-import static eu.europeana.entitymanagement.definitions.VocabularyFields.ID;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Resource;
@@ -17,6 +16,8 @@ public class VocabularyRepository  {
 
   @Resource(name = AppConfigConstants.BEAN_EM_DATA_STORE)
   Datastore datastore;
+
+  private static final String ID = "id";
 
   /**
    * retrieve records by their id