refactor namespaces

backend/core/src/main/java/org/opencdmp/authorization/authorizationcontentresolver/AuthorizationContentResolverImpl.java

@@ -9,7 +9,7 @@ import org.opencdmp.data.DescriptionEntity;
 import org.opencdmp.data.DmpDescriptionTemplateEntity;
 import org.opencdmp.data.DmpEntity;
 import org.opencdmp.data.DmpUserEntity;
-import org.opencdmp.model.Description;
+import org.opencdmp.model.description.Description;
 import org.opencdmp.model.DmpDescriptionTemplate;
 import org.opencdmp.model.DmpUser;
 import org.opencdmp.query.DescriptionQuery;

backend/core/src/main/java/org/opencdmp/elastic/elasticbuilder/DescriptionElasticBuilder.java

@@ -5,7 +5,6 @@ import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.DescriptionEntity;
 import org.opencdmp.data.DescriptionReferenceEntity;
 import org.opencdmp.data.DescriptionTagEntity;
-import org.opencdmp.data.DmpDescriptionTemplateEntity;
 import org.opencdmp.elastic.data.DescriptionElasticEntity;
 import org.opencdmp.elastic.data.nested.*;
 import org.opencdmp.elastic.elasticbuilder.nested.NestedDescriptionTemplateElasticBuilder;
@@ -13,14 +12,13 @@ import org.opencdmp.elastic.elasticbuilder.nested.NestedDmpElasticBuilder;
 import org.opencdmp.elastic.elasticbuilder.nested.NestedReferenceElasticBuilder;
 import org.opencdmp.elastic.elasticbuilder.nested.NestedTagElasticBuilder;
 import org.opencdmp.model.*;
-import org.opencdmp.model.builder.DescriptionBuilder;
+import org.opencdmp.model.descriptionreference.DescriptionReference;
-import org.opencdmp.model.builder.ReferenceBuilder;
+import org.opencdmp.model.descriptiontemplate.DescriptionTemplate;
+import org.opencdmp.model.dmp.Dmp;
 import org.opencdmp.query.*;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
-import gr.cite.tools.fieldset.BaseFieldSet;
-import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

backend/core/src/main/java/org/opencdmp/elastic/elasticbuilder/DmpElasticBuilder.java

@@ -6,7 +6,7 @@ import org.opencdmp.data.*;
 import org.opencdmp.elastic.data.DmpElasticEntity;
 import org.opencdmp.elastic.data.nested.*;
 import org.opencdmp.elastic.elasticbuilder.nested.*;
-import org.opencdmp.model.DmpReference;
+import org.opencdmp.model.dmpreference.DmpReference;
 import org.opencdmp.query.*;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;

backend/core/src/main/java/org/opencdmp/elastic/elasticbuilder/nested/NestedCollaboratorElasticBuilder.java

@@ -10,7 +10,7 @@ import org.opencdmp.data.DmpUserEntity;
 import org.opencdmp.data.UserEntity;
 import org.opencdmp.elastic.data.nested.NestedCollaboratorElasticEntity;
 import org.opencdmp.elastic.elasticbuilder.BaseElasticBuilder;
-import org.opencdmp.model.User;
+import org.opencdmp.model.user.User;
 import org.opencdmp.query.UserQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

backend/core/src/main/java/org/opencdmp/elastic/elasticbuilder/nested/NestedDescriptionElasticBuilder.java

@@ -10,9 +10,9 @@ import org.opencdmp.elastic.data.nested.NestedDescriptionTemplateElasticEntity;
 import org.opencdmp.elastic.data.nested.NestedReferenceElasticEntity;
 import org.opencdmp.elastic.data.nested.NestedTagElasticEntity;
 import org.opencdmp.elastic.elasticbuilder.BaseElasticBuilder;
-import org.opencdmp.model.DescriptionReference;
+import org.opencdmp.model.descriptionreference.DescriptionReference;
 import org.opencdmp.model.DescriptionTag;
-import org.opencdmp.model.DescriptionTemplate;
+import org.opencdmp.model.descriptiontemplate.DescriptionTemplate;
 import org.opencdmp.query.*;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;

backend/core/src/main/java/org/opencdmp/elastic/elasticbuilder/nested/NestedDmpElasticBuilder.java

@@ -8,7 +8,7 @@ import org.opencdmp.data.DmpUserEntity;
 import org.opencdmp.data.EntityDoiEntity;
 import org.opencdmp.elastic.data.nested.*;
 import org.opencdmp.elastic.elasticbuilder.BaseElasticBuilder;
-import org.opencdmp.model.DmpReference;
+import org.opencdmp.model.dmpreference.DmpReference;
 import org.opencdmp.query.DmpReferenceQuery;
 import org.opencdmp.query.DmpUserQuery;
 import org.opencdmp.query.EntityDoiQuery;

backend/core/src/main/java/org/opencdmp/integrationevent/outbox/annotationentityremoval/AnnotationEntityRemovalIntegrationEventHandlerImpl.java

@@ -1,15 +1,11 @@
 package org.opencdmp.integrationevent.outbox.annotationentityremoval;
 
-import org.opencdmp.commons.enums.IsActive;
 import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.data.DescriptionEntity;
-import org.opencdmp.data.DmpUserEntity;
 import org.opencdmp.integrationevent.outbox.OutboxIntegrationEvent;
 import org.opencdmp.integrationevent.outbox.OutboxService;
-import org.opencdmp.model.Description;
+import org.opencdmp.model.description.Description;
-import org.opencdmp.model.DmpUser;
 import org.opencdmp.query.DescriptionQuery;
-import org.opencdmp.query.DmpUserQuery;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.logging.LoggerService;

backend/core/src/main/java/org/opencdmp/integrationevent/outbox/annotationentitytouch/AnnotationEntityTouchedIntegrationEventHandlerImpl.java

@@ -5,7 +5,7 @@ import org.opencdmp.data.DescriptionEntity;
 import org.opencdmp.data.DmpUserEntity;
 import org.opencdmp.integrationevent.outbox.OutboxIntegrationEvent;
 import org.opencdmp.integrationevent.outbox.OutboxService;
-import org.opencdmp.model.Description;
+import org.opencdmp.model.description.Description;
 import org.opencdmp.model.DmpUser;
 import org.opencdmp.query.DescriptionQuery;
 import org.opencdmp.query.DmpUserQuery;

backend/core/src/main/java/org/opencdmp/integrationevent/outbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java

@@ -1,13 +1,8 @@
 package org.opencdmp.integrationevent.outbox.userremoval;
 
 import org.opencdmp.commons.scope.tenant.TenantScope;
-import org.opencdmp.data.UserEntity;
 import org.opencdmp.integrationevent.outbox.OutboxIntegrationEvent;
 import org.opencdmp.integrationevent.outbox.OutboxService;
-import org.opencdmp.integrationevent.outbox.usertouched.UserTouchedIntegrationEvent;
-import org.opencdmp.model.User;
-import org.opencdmp.query.UserQuery;
-import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;

backend/core/src/main/java/org/opencdmp/integrationevent/outbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java

@@ -4,15 +4,12 @@ import org.opencdmp.commons.JsonHandlingService;
 import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.commons.types.user.AdditionalInfoEntity;
 import org.opencdmp.data.*;
-import org.opencdmp.elastic.data.DmpElasticEntity;
-import org.opencdmp.elastic.elasticbuilder.DmpElasticBuilder;
 import org.opencdmp.integrationevent.outbox.OutboxIntegrationEvent;
 import org.opencdmp.integrationevent.outbox.OutboxService;
 import org.opencdmp.model.*;
-import org.opencdmp.model.builder.UserAdditionalInfoBuilder;
+import org.opencdmp.model.user.User;
+import org.opencdmp.model.usercredential.UserCredential;
 import org.opencdmp.query.*;
-import gr.cite.tools.data.query.Ordering;
-import gr.cite.tools.data.query.Paging;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyNotFoundException;
 import gr.cite.tools.fieldset.BaseFieldSet;
@@ -22,7 +19,6 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.stereotype.Component;
 
 import javax.management.InvalidApplicationException;

backend/core/src/main/java/org/opencdmp/model/DescriptionTag.java

@@ -1,6 +1,7 @@
 package org.opencdmp.model;
 
 import org.opencdmp.commons.enums.IsActive;
+import org.opencdmp.model.description.Description;
 
 import java.time.Instant;
 import java.util.UUID;

backend/core/src/main/java/org/opencdmp/model/DescriptionTemplateType.java

@@ -2,7 +2,7 @@ package org.opencdmp.model;
 
 import org.opencdmp.commons.enums.DescriptionTemplateTypeStatus;
 import org.opencdmp.commons.enums.IsActive;
-import org.opencdmp.model.descriptiontemplatedefinition.Definition;
+import org.opencdmp.model.descriptiontemplate.Definition;
 
 import java.time.Instant;
 import java.util.UUID;

backend/core/src/main/java/org/opencdmp/model/DmpDescriptionTemplate.java

@@ -1,6 +1,8 @@
 package org.opencdmp.model;
 
 import org.opencdmp.commons.enums.IsActive;
+import org.opencdmp.model.descriptiontemplate.DescriptionTemplate;
+import org.opencdmp.model.dmp.Dmp;
 
 import java.time.Instant;
 import java.util.List;

backend/core/src/main/java/org/opencdmp/model/DmpUser.java

@@ -2,9 +2,8 @@ package org.opencdmp.model;
 
 import org.opencdmp.commons.enums.DmpUserRole;
 import org.opencdmp.commons.enums.IsActive;
-import org.opencdmp.data.converters.enums.IsActiveConverter;
+import org.opencdmp.model.dmp.Dmp;
-import org.opencdmp.data.UserEntity;
+import org.opencdmp.model.user.User;
-import jakarta.persistence.*;
 
 import java.time.Instant;
 import java.util.UUID;

backend/core/src/main/java/org/opencdmp/model/Lock.java

@@ -1,6 +1,7 @@
 package org.opencdmp.model;
 
 import org.opencdmp.commons.enums.LockTargetType;
+import org.opencdmp.model.user.User;
 
 import java.time.Instant;
 import java.util.UUID;

backend/core/src/main/java/org/opencdmp/model/PublicDescriptionTemplate.java

@@ -1,12 +1,5 @@
 package org.opencdmp.model;
 
-import org.opencdmp.commons.enums.DescriptionTemplateStatus;
-import org.opencdmp.commons.enums.DescriptionTemplateVersionStatus;
-import org.opencdmp.commons.enums.IsActive;
-import org.opencdmp.model.descriptiontemplatedefinition.Definition;
-
-import java.time.Instant;
-import java.util.List;
 import java.util.UUID;
 
 public class PublicDescriptionTemplate {

backend/core/src/main/java/org/opencdmp/model/RecentActivityItem.java

@@ -1,12 +1,8 @@
 package org.opencdmp.model;
 
-import org.opencdmp.commons.enums.DmpBlueprintStatus;
-import org.opencdmp.commons.enums.IsActive;
 import org.opencdmp.commons.enums.RecentActivityItemType;
-import org.opencdmp.model.dmpblueprintdefinition.Definition;
+import org.opencdmp.model.description.Description;
-
+import org.opencdmp.model.dmp.Dmp;
-import java.time.Instant;
-import java.util.UUID;
 
 public class RecentActivityItem {
     private RecentActivityItemType type;

backend/core/src/main/java/org/opencdmp/model/RecentActivityItemLookup.java

@@ -4,10 +4,11 @@ import org.opencdmp.commons.enums.DescriptionStatus;
 import org.opencdmp.commons.enums.DmpStatus;
 import org.opencdmp.commons.enums.IsActive;
 import org.opencdmp.commons.enums.RecentActivityOrder;
+import org.opencdmp.model.description.Description;
+import org.opencdmp.model.dmp.Dmp;
 import org.opencdmp.query.lookup.DescriptionLookup;
 import org.opencdmp.query.lookup.DmpLookup;
 import org.opencdmp.query.lookup.DmpUserLookup;
-import gr.cite.tools.data.query.Lookup;
 import gr.cite.tools.data.query.Ordering;
 import gr.cite.tools.data.query.Paging;
 import gr.cite.tools.fieldset.BaseFieldSet;

backend/core/src/main/java/org/opencdmp/model/StorageFile.java

@@ -1,6 +1,7 @@
 package org.opencdmp.model;
 
 import org.opencdmp.commons.enums.StorageType;
+import org.opencdmp.model.user.User;
 
 import java.time.Instant;
 import java.util.UUID;

backend/core/src/main/java/org/opencdmp/model/Tag.java

@@ -1,10 +1,9 @@
 package org.opencdmp.model;
 
-import org.opencdmp.commons.enums.DescriptionStatus;
 import org.opencdmp.commons.enums.IsActive;
+import org.opencdmp.model.user.User;
 
 import java.time.Instant;
-import java.util.List;
 import java.util.UUID;
 
 public class Tag {

backend/core/src/main/java/org/opencdmp/model/TenantUser.java

@@ -1,6 +1,7 @@
 package org.opencdmp.model;
 
 import org.opencdmp.commons.enums.IsActive;
+import org.opencdmp.model.user.User;
 
 import java.time.Instant;
 import java.util.UUID;

backend/core/src/main/java/org/opencdmp/model/UserContactInfo.java

@@ -1,6 +1,7 @@
 package org.opencdmp.model;
 
 import org.opencdmp.commons.enums.ContactInfoType;
+import org.opencdmp.model.user.User;
 
 import java.time.Instant;
 import java.util.UUID;

backend/core/src/main/java/org/opencdmp/model/UserDescriptionTemplate.java

@@ -1,9 +1,9 @@
 package org.opencdmp.model;
 
-import org.opencdmp.commons.enums.DescriptionTemplateStatus;
 import org.opencdmp.commons.enums.IsActive;
 import org.opencdmp.commons.enums.UserDescriptionTemplateRole;
-import org.opencdmp.model.descriptiontemplatedefinition.Definition;
+import org.opencdmp.model.descriptiontemplate.DescriptionTemplate;
+import org.opencdmp.model.user.User;
 
 import java.time.Instant;
 import java.util.UUID;

backend/core/src/main/java/org/opencdmp/model/UserRole.java

@@ -1,5 +1,7 @@
 package org.opencdmp.model;
 
+import org.opencdmp.model.user.User;
+
 import java.time.Instant;
 import java.util.UUID;
 

backend/core/src/main/java/org/opencdmp/model/actionconfirmation/ActionConfirmation.java

@@ -1,13 +1,9 @@
-package org.opencdmp.model;
+package org.opencdmp.model.actionconfirmation;
 
 import org.opencdmp.commons.enums.ActionConfirmationStatus;
 import org.opencdmp.commons.enums.ActionConfirmationType;
 import org.opencdmp.commons.enums.IsActive;
-import org.opencdmp.model.actionconfirmation.DmpInvitation;
+import org.opencdmp.model.user.User;
-import org.opencdmp.model.actionconfirmation.MergeAccountConfirmation;
-import org.opencdmp.model.actionconfirmation.RemoveCredentialRequest;
-import org.opencdmp.model.persist.actionconfirmation.MergeAccountConfirmationPersist;
-import org.opencdmp.model.persist.actionconfirmation.RemoveCredentialRequestPersist;
 
 import java.time.Instant;
 import java.util.UUID;

backend/core/src/main/java/org/opencdmp/model/builder/DescriptionTagBuilder.java

@@ -4,7 +4,8 @@ import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.DescriptionTagEntity;
-import org.opencdmp.model.Description;
+import org.opencdmp.model.builder.descriptionproperties.DescriptionBuilder;
+import org.opencdmp.model.description.Description;
 import org.opencdmp.model.DescriptionTag;
 import org.opencdmp.model.Tag;
 import org.opencdmp.query.DescriptionQuery;

backend/core/src/main/java/org/opencdmp/model/builder/DmpAssociatedUserBuilder.java

@@ -5,6 +5,7 @@ import org.opencdmp.commons.enums.ContactInfoType;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.UserEntity;
 import org.opencdmp.model.*;
+import org.opencdmp.model.user.User;
 import org.opencdmp.query.UserContactInfoQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;

backend/core/src/main/java/org/opencdmp/model/builder/DmpDescriptionTemplateBuilder.java

@@ -1,15 +1,5 @@
 package org.opencdmp.model.builder;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.enums.DescriptionTemplateVersionStatus;
-import org.opencdmp.commons.scope.tenant.TenantScope;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.data.DmpDescriptionTemplateEntity;
-import org.opencdmp.data.DmpEntity;
-import org.opencdmp.model.*;
-import org.opencdmp.query.DescriptionTemplateQuery;
-import org.opencdmp.query.DmpQuery;
-import org.opencdmp.query.DmpUserQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -17,6 +7,19 @@ import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.enums.DescriptionTemplateVersionStatus;
+import org.opencdmp.commons.scope.tenant.TenantScope;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.data.DmpDescriptionTemplateEntity;
+import org.opencdmp.model.DescriptionTemplateType;
+import org.opencdmp.model.DmpDescriptionTemplate;
+import org.opencdmp.model.builder.descriptiontemplate.DescriptionTemplateBuilder;
+import org.opencdmp.model.builder.dmp.DmpBuilder;
+import org.opencdmp.model.descriptiontemplate.DescriptionTemplate;
+import org.opencdmp.model.dmp.Dmp;
+import org.opencdmp.query.DescriptionTemplateQuery;
+import org.opencdmp.query.DmpQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -27,7 +30,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DmpDescriptionTemplateBuilder extends BaseBuilder<DmpDescriptionTemplate, DmpDescriptionTemplateEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/DmpUserBuilder.java

@@ -1,12 +1,5 @@
 package org.opencdmp.model.builder;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.scope.tenant.TenantScope;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.data.DmpUserEntity;
-import org.opencdmp.model.*;
-import org.opencdmp.query.DmpQuery;
-import org.opencdmp.query.UserQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -14,6 +7,16 @@ import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.scope.tenant.TenantScope;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.data.DmpUserEntity;
+import org.opencdmp.model.DmpUser;
+import org.opencdmp.model.builder.dmp.DmpBuilder;
+import org.opencdmp.model.dmp.Dmp;
+import org.opencdmp.model.user.User;
+import org.opencdmp.query.DmpQuery;
+import org.opencdmp.query.UserQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -24,7 +27,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DmpUserBuilder extends BaseBuilder<DmpUser, DmpUserEntity>{
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/LockBuilder.java

@@ -1,14 +1,11 @@
 package org.opencdmp.model.builder;
 
 import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.XmlHandlingService;
 import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.LockEntity;
 import org.opencdmp.model.Lock;
-import org.opencdmp.model.Tenant;
+import org.opencdmp.model.user.User;
-import org.opencdmp.model.User;
-import org.opencdmp.query.TenantQuery;
 import org.opencdmp.query.UserQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;

backend/core/src/main/java/org/opencdmp/model/builder/PublicDmpUserBuilder.java

@@ -6,7 +6,7 @@ import org.opencdmp.data.DmpUserEntity;
 import org.opencdmp.model.PublicDmp;
 import org.opencdmp.model.PublicDmpUser;
 import org.opencdmp.model.PublicUser;
-import org.opencdmp.model.User;
+import org.opencdmp.model.user.User;
 import org.opencdmp.query.DmpQuery;
 import org.opencdmp.query.UserQuery;
 import gr.cite.tools.data.builder.BuilderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/PublicUserBuilder.java

@@ -4,7 +4,6 @@ import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.UserEntity;
 import org.opencdmp.model.PublicUser;
-import org.opencdmp.model.User;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;

backend/core/src/main/java/org/opencdmp/model/builder/RecentActivityItemBuilder.java

@@ -1,14 +1,5 @@
 package org.opencdmp.model.builder;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.enums.DescriptionTemplateVersionStatus;
-import org.opencdmp.commons.enums.RecentActivityItemType;
-import org.opencdmp.commons.types.dashborad.RecentActivityItemEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.*;
-import org.opencdmp.query.DescriptionQuery;
-import org.opencdmp.query.DescriptionTemplateQuery;
-import org.opencdmp.query.DmpQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -16,6 +7,17 @@ import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.enums.RecentActivityItemType;
+import org.opencdmp.commons.types.dashborad.RecentActivityItemEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.RecentActivityItem;
+import org.opencdmp.model.builder.descriptionproperties.DescriptionBuilder;
+import org.opencdmp.model.builder.dmp.DmpBuilder;
+import org.opencdmp.model.description.Description;
+import org.opencdmp.model.dmp.Dmp;
+import org.opencdmp.query.DescriptionQuery;
+import org.opencdmp.query.DmpQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -26,7 +28,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class RecentActivityItemBuilder extends BaseBuilder<RecentActivityItem, RecentActivityItemEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/StorageFileBuilder.java

@@ -5,6 +5,7 @@ import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.StorageFileEntity;
 import org.opencdmp.model.*;
+import org.opencdmp.model.user.User;
 import org.opencdmp.query.*;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;

backend/core/src/main/java/org/opencdmp/model/builder/TagBuilder.java

@@ -5,7 +5,7 @@ import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.TagEntity;
 import org.opencdmp.model.Tag;
-import org.opencdmp.model.User;
+import org.opencdmp.model.user.User;
 import org.opencdmp.query.UserQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;

backend/core/src/main/java/org/opencdmp/model/builder/TenantUserBuilder.java

@@ -6,7 +6,7 @@ import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.TenantUserEntity;
 import org.opencdmp.model.Tenant;
 import org.opencdmp.model.TenantUser;
-import org.opencdmp.model.User;
+import org.opencdmp.model.user.User;
 import org.opencdmp.query.TenantQuery;
 import org.opencdmp.query.UserQuery;
 import gr.cite.tools.data.builder.BuilderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/UserAdditionalInfoBuilder.java

@@ -1,13 +1,5 @@
 package org.opencdmp.model.builder;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.user.AdditionalInfoEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.data.DescriptionReferenceEntity;
-import org.opencdmp.model.DescriptionReference;
-import org.opencdmp.model.Reference;
-import org.opencdmp.model.UserAdditionalInfo;
-import org.opencdmp.query.ReferenceQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -15,6 +7,14 @@ import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.types.user.AdditionalInfoEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.reference.ReferenceBuilder;
+import org.opencdmp.model.descriptionreference.DescriptionReference;
+import org.opencdmp.model.reference.Reference;
+import org.opencdmp.model.user.UserAdditionalInfo;
+import org.opencdmp.query.ReferenceQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -25,7 +25,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class UserAdditionalInfoBuilder extends BaseBuilder<UserAdditionalInfo, AdditionalInfoEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/UserBuilder.java

@@ -1,31 +1,36 @@
 package org.opencdmp.model.builder;
 
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.data.query.QueryFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.exception.MyForbiddenException;
+import gr.cite.tools.fieldset.BaseFieldSet;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.authorization.AuthorizationProperties;
 import org.opencdmp.commons.JsonHandlingService;
 import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.commons.types.user.AdditionalInfoEntity;
 import org.opencdmp.convention.ConventionService;
-import org.opencdmp.data.TenantEntity;
 import org.opencdmp.data.TenantEntityManager;
 import org.opencdmp.data.UserEntity;
-import org.opencdmp.model.*;
+import org.opencdmp.model.TenantUser;
-import org.opencdmp.query.*;
+import org.opencdmp.model.UserContactInfo;
-import gr.cite.tools.data.builder.BuilderFactory;
+import org.opencdmp.model.UserRole;
-import gr.cite.tools.data.query.QueryFactory;
+import org.opencdmp.model.builder.usercredential.UserCredentialBuilder;
-import gr.cite.tools.exception.MyApplicationException;
+import org.opencdmp.model.user.User;
-import gr.cite.tools.exception.MyForbiddenException;
+import org.opencdmp.model.usercredential.UserCredential;
-import gr.cite.tools.exception.MyNotFoundException;
+import org.opencdmp.query.TenantUserQuery;
-import gr.cite.tools.fieldset.BaseFieldSet;
+import org.opencdmp.query.UserContactInfoQuery;
-import gr.cite.tools.fieldset.FieldSet;
+import org.opencdmp.query.UserCredentialQuery;
-import gr.cite.tools.logging.DataLogEntry;
+import org.opencdmp.query.UserRoleQuery;
-import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Component;
 
 import javax.management.InvalidApplicationException;
@@ -33,7 +38,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class UserBuilder extends BaseBuilder<User, UserEntity> {
 
     private final QueryFactory queryFactory;
@@ -158,10 +163,10 @@ public class UserBuilder extends BaseBuilder<User, UserEntity> {
         Map<UUID, List<UserRole>> itemMap;
         FieldSet clone = new BaseFieldSet(fields.getFields()).ensure(this.asIndexer(UserRole._user, User._id));
 
-        if (!tenantScope.isSet())  throw new MyForbiddenException("tenant scope required");
+        if (!this.tenantScope.isSet())  throw new MyForbiddenException("tenant scope required");
             
         UserRoleQuery query = this.queryFactory.query(UserRoleQuery.class).authorize(this.authorize).roles(this.authorizationProperties.getAllowedTenantRoles()).userIds(data.stream().map(UserEntity::getId).distinct().collect(Collectors.toList()));
-        if (tenantScope.isDefaultTenant()) query.tenantIsSet(false);
+        if (this.tenantScope.isDefaultTenant()) query.tenantIsSet(false);
         else {
             try {
                 query.tenantIsSet(true).tenantIds(this.tenantScope.getTenant());

backend/core/src/main/java/org/opencdmp/model/builder/UserContactInfoBuilder.java

@@ -3,11 +3,8 @@ package org.opencdmp.model.builder;
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.UserContactInfoEntity;
-import org.opencdmp.model.Description;
+import org.opencdmp.model.user.User;
-import org.opencdmp.model.User;
 import org.opencdmp.model.UserContactInfo;
-import org.opencdmp.model.User;
-import org.opencdmp.query.DescriptionQuery;
 import org.opencdmp.query.UserQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;

backend/core/src/main/java/org/opencdmp/model/builder/UserDescriptionTemplateBuilder.java

@@ -1,13 +1,12 @@
 package org.opencdmp.model.builder;
 
 import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.XmlHandlingService;
 import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.UserDescriptionTemplateEntity;
-import org.opencdmp.model.Description;
+import org.opencdmp.model.builder.descriptiontemplate.DescriptionTemplateBuilder;
-import org.opencdmp.model.DescriptionTemplate;
+import org.opencdmp.model.descriptiontemplate.DescriptionTemplate;
-import org.opencdmp.model.User;
+import org.opencdmp.model.user.User;
 import org.opencdmp.model.UserDescriptionTemplate;
 import org.opencdmp.query.DescriptionTemplateQuery;
 import org.opencdmp.query.UserQuery;

backend/core/src/main/java/org/opencdmp/model/builder/UserRoleBuilder.java

@@ -4,7 +4,7 @@ import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.UserRoleEntity;
-import org.opencdmp.model.User;
+import org.opencdmp.model.user.User;
 import org.opencdmp.model.UserRole;
 import org.opencdmp.query.UserQuery;
 import gr.cite.tools.data.builder.BuilderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/actionconfirmation/ActionConfirmationBuilder.java

@@ -1,22 +1,17 @@
-package org.opencdmp.model.builder;
+package org.opencdmp.model.builder.actionconfirmation;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.XmlHandlingService;
-import org.opencdmp.commons.enums.ActionConfirmationType;
 import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.commons.types.actionconfirmation.DmpInvitationEntity;
 import org.opencdmp.commons.types.actionconfirmation.MergeAccountConfirmationEntity;
 import org.opencdmp.commons.types.actionconfirmation.RemoveCredentialRequestEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.ActionConfirmationEntity;
-import org.opencdmp.data.tenant.TenantScopedBaseEntity;
+import org.opencdmp.model.actionconfirmation.ActionConfirmation;
-import org.opencdmp.model.ActionConfirmation;
+import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.Tenant;
+import org.opencdmp.model.builder.UserBuilder;
-import org.opencdmp.model.User;
+import org.opencdmp.model.user.User;
-import org.opencdmp.model.builder.actionconfirmation.DmpInvitationBuilder;
-import org.opencdmp.model.builder.actionconfirmation.MergeAccountConfirmationBuilder;
-import org.opencdmp.model.builder.actionconfirmation.RemoveCredentialRequestBuilder;
-import org.opencdmp.query.TenantQuery;
 import org.opencdmp.query.UserQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
@@ -31,7 +26,6 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import javax.management.InvalidApplicationException;
 import java.util.*;
 import java.util.stream.Collectors;
 

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/DescriptionCommonModelBuilder.java

@@ -14,7 +14,7 @@ import org.opencdmp.data.DescriptionEntity;
 import org.opencdmp.data.DescriptionTemplateEntity;
 import org.opencdmp.data.DmpDescriptionTemplateEntity;
 import org.opencdmp.data.DmpEntity;
-import org.opencdmp.model.DescriptionTemplate;
+import org.opencdmp.model.descriptiontemplate.DescriptionTemplate;
 import org.opencdmp.model.DmpDescriptionTemplate;
 import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;
 import org.opencdmp.model.builder.commonmodels.CommonModelBuilderItemResponse;
@@ -129,7 +129,7 @@ public class DescriptionCommonModelBuilder extends BaseCommonModelBuilder<Descri
 
         Map<java.util.UUID, DefinitionEntity> itemMap = new HashMap<>();
         DescriptionTemplateQuery q = this.queryFactory.query(DescriptionTemplateQuery.class).authorize(this.authorize).ids(data.stream().map(DescriptionEntity::getDescriptionTemplateId).distinct().collect(Collectors.toList()));
-        List<DescriptionTemplateEntity> items = q.collectAs(new BaseFieldSet().ensure(org.opencdmp.model.DescriptionTemplate._id).ensure(DescriptionTemplate._definition));
+        List<DescriptionTemplateEntity> items = q.collectAs(new BaseFieldSet().ensure(DescriptionTemplate._id).ensure(DescriptionTemplate._definition));
         for (DescriptionTemplateEntity item : items){
             DefinitionEntity definition = this.xmlHandlingService.fromXmlSafe(DefinitionEntity.class, item.getDefinition());
             itemMap.put(item.getId(), definition);

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/FieldCommonModelBuilder.java

@@ -18,7 +18,7 @@ import org.opencdmp.commons.types.description.FieldEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.ReferenceEntity;
 import org.opencdmp.data.StorageFileEntity;
-import org.opencdmp.model.Reference;
+import org.opencdmp.model.reference.Reference;
 import org.opencdmp.model.StorageFile;
 import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;
 import org.opencdmp.model.builder.commonmodels.CommonModelBuilderItemResponse;

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/DefinitionCommonModelBuilder.java

@@ -6,7 +6,6 @@ import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;
 import org.opencdmp.model.builder.commonmodels.CommonModelBuilderItemResponse;
-import org.opencdmp.model.builder.descriptiontemplatedefinition.PageBuilder;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.logging.LoggerService;

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/MultiplicityCommonModelBuilder.java

@@ -6,7 +6,6 @@ import org.opencdmp.commons.types.descriptiontemplate.MultiplicityEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;
 import org.opencdmp.model.builder.commonmodels.CommonModelBuilderItemResponse;
-import org.opencdmp.model.descriptiontemplatedefinition.Multiplicity;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.logging.LoggerService;

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/PageCommonModelBuilder.java

@@ -6,8 +6,6 @@ import org.opencdmp.commons.types.descriptiontemplate.PageEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;
 import org.opencdmp.model.builder.commonmodels.CommonModelBuilderItemResponse;
-import org.opencdmp.model.builder.descriptiontemplatedefinition.SectionBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.Page;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.logging.LoggerService;

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/ReferenceTypeDataCommonModelBuilder.java

@@ -1,14 +1,13 @@
 package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata;
 
-import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.ReferenceTypeDataModel;
-import org.opencdmp.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.builder.ReferenceTypeBuilder;
-import org.opencdmp.model.builder.commonmodels.ReferenceTypeCommonModelBuilder;
-import org.opencdmp.query.ReferenceTypeQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.ReferenceTypeDataModel;
+import org.opencdmp.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.commonmodels.ReferenceTypeCommonModelBuilder;
+import org.opencdmp.query.ReferenceTypeQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -16,7 +15,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class ReferenceTypeDataCommonModelBuilder extends BaseFieldDataCommonModelBuilder<ReferenceTypeDataModel, ReferenceTypeDataEntity> {
 
     private final QueryFactory queryFactory;

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpCommonModelBuilder.java

@@ -21,6 +21,9 @@ import org.opencdmp.model.builder.commonmodels.*;
 import org.opencdmp.model.builder.commonmodels.description.DescriptionCommonModelBuilder;
 import org.opencdmp.model.builder.commonmodels.dmpblueprint.DmpBlueprintCommonModelBuilder;
 import org.opencdmp.model.builder.commonmodels.dmpreference.DmpReferenceCommonModelBuilder;
+import org.opencdmp.model.description.Description;
+import org.opencdmp.model.dmp.Dmp;
+import org.opencdmp.model.dmpreference.DmpReference;
 import org.opencdmp.query.*;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.Ordering;

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/ExtraFieldCommonModelBuilder.java

@@ -4,11 +4,7 @@ import org.opencdmp.commonmodels.enums.DmpBlueprintExtraFieldDataType;
 import org.opencdmp.commonmodels.models.dmpblueprint.ExtraFieldModel;
 import org.opencdmp.commons.types.dmpblueprint.ExtraFieldEntity;
 import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.dmpblueprintdefinition.ExtraField;
 import gr.cite.tools.exception.MyApplicationException;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/FieldCommonModelBuilder.java

@@ -7,11 +7,7 @@ import org.opencdmp.commons.types.dmpblueprint.FieldEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;
 import org.opencdmp.model.builder.commonmodels.CommonModelBuilderItemResponse;
-import org.opencdmp.model.builder.commonmodels.dmp.DmpBlueprintValueCommonModelBuilder;
-import org.opencdmp.model.dmpblueprintdefinition.Field;
-import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
-import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/ReferenceTypeFieldCommonModelBuilder.java

@@ -4,7 +4,6 @@ import org.opencdmp.commonmodels.models.dmpblueprint.ReferenceTypeFieldModel;
 import org.opencdmp.commons.types.dmpblueprint.ReferenceTypeFieldEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.commonmodels.ReferenceTypeCommonModelBuilder;
-import org.opencdmp.model.dmpblueprintdefinition.ReferenceTypeField;
 import org.opencdmp.query.ReferenceTypeQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;

backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/DescriptionBuilder.java

@@ -1,5 +1,13 @@
-package org.opencdmp.model.builder;
+package org.opencdmp.model.builder.descriptionproperties;
 
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.data.query.QueryFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.BaseFieldSet;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
 import org.opencdmp.authorization.AffiliatedResource;
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.authorization.authorizationcontentresolver.AuthorizationContentResolver;
@@ -11,19 +19,21 @@ import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.DescriptionEntity;
 import org.opencdmp.data.DescriptionTemplateEntity;
-import org.opencdmp.data.DmpEntity;
+import org.opencdmp.model.DescriptionTag;
-import org.opencdmp.data.UserRoleEntity;
+import org.opencdmp.model.DmpDescriptionTemplate;
-import org.opencdmp.model.*;
+import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.builder.descriptionpropertiesdefinition.PropertyDefinitionBuilder;
+import org.opencdmp.model.builder.DescriptionTagBuilder;
+import org.opencdmp.model.builder.DmpDescriptionTemplateBuilder;
+import org.opencdmp.model.builder.UserBuilder;
+import org.opencdmp.model.builder.descriptionreference.DescriptionReferenceBuilder;
+import org.opencdmp.model.builder.descriptiontemplate.DescriptionTemplateBuilder;
+import org.opencdmp.model.builder.dmp.DmpBuilder;
+import org.opencdmp.model.description.Description;
+import org.opencdmp.model.descriptionreference.DescriptionReference;
+import org.opencdmp.model.descriptiontemplate.DescriptionTemplate;
+import org.opencdmp.model.dmp.Dmp;
+import org.opencdmp.model.user.User;
 import org.opencdmp.query.*;
-import gr.cite.commons.web.authz.service.AuthorizationService;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.data.query.QueryFactory;
-import gr.cite.tools.exception.MyApplicationException;
-import gr.cite.tools.fieldset.BaseFieldSet;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.DataLogEntry;
-import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -34,7 +44,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DescriptionBuilder extends BaseBuilder<Description, DescriptionEntity> {
 
     private final QueryFactory queryFactory;
@@ -229,7 +239,7 @@ public class DescriptionBuilder extends BaseBuilder<Description, DescriptionEnti
 
         Map<java.util.UUID, DefinitionEntity> itemMap = new HashMap<>();
         DescriptionTemplateQuery q = this.queryFactory.query(DescriptionTemplateQuery.class).authorize(this.authorize).ids(data.stream().map(DescriptionEntity::getDescriptionTemplateId).distinct().collect(Collectors.toList()));
-        List<DescriptionTemplateEntity> items = q.collectAs(new BaseFieldSet().ensure(org.opencdmp.model.DescriptionTemplate._id).ensure(DescriptionTemplate._definition));
+        List<DescriptionTemplateEntity> items = q.collectAs(new BaseFieldSet().ensure(DescriptionTemplate._id).ensure(DescriptionTemplate._definition));
         for (DescriptionTemplateEntity item : items){
             DefinitionEntity definition =this.xmlHandlingService.fromXmlSafe(DefinitionEntity.class, item.getDefinition());
             itemMap.put(item.getId(), definition);

backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/ExternalIdentifierBuilder.java

@@ -1,12 +1,10 @@
-package org.opencdmp.model.builder.descriptionpropertiesdefinition;
+package org.opencdmp.model.builder.descriptionproperties;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.description.ExternalIdentifierEntity;
-import org.opencdmp.commons.types.description.FieldEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptionproperties.ExternalIdentifier;
+import org.opencdmp.model.description.ExternalIdentifier;
-import org.opencdmp.model.descriptionproperties.Field;
 import org.opencdmp.service.fielddatahelper.FieldDataHelperServiceProvider;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;

backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/FieldBuilder.java

@@ -1,4 +1,4 @@
-package org.opencdmp.model.builder.descriptionpropertiesdefinition;
+package org.opencdmp.model.builder.descriptionproperties;
 
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
@@ -13,10 +13,10 @@ import org.opencdmp.commons.types.description.FieldEntity;
 import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity;
 import org.opencdmp.commons.types.descriptiontemplate.fielddata.SelectDataEntity;
 import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.Reference;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.builder.ReferenceBuilder;
+import org.opencdmp.model.builder.reference.ReferenceBuilder;
-import org.opencdmp.model.descriptionproperties.Field;
+import org.opencdmp.model.description.Field;
+import org.opencdmp.model.reference.Reference;
 import org.opencdmp.query.ReferenceQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/PropertyDefinitionBuilder.java

@@ -1,4 +1,4 @@
-package org.opencdmp.model.builder.descriptionpropertiesdefinition;
+package org.opencdmp.model.builder.descriptionproperties;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.description.PropertyDefinitionEntity;
@@ -6,8 +6,6 @@ import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity;
 import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.Definition;
-import org.opencdmp.model.persist.descriptionproperties.PropertyDefinitionPersist;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
@@ -18,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
-import org.opencdmp.model.descriptionproperties.PropertyDefinition;
+import org.opencdmp.model.description.PropertyDefinition;
 
 import java.util.*;
 

backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/PropertyDefinitionFieldSetBuilder.java

@@ -1,12 +1,11 @@
-package org.opencdmp.model.builder.descriptionpropertiesdefinition;
+package org.opencdmp.model.builder.descriptionproperties;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.description.PropertyDefinitionFieldSetEntity;
 import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptionproperties.PropertyDefinitionFieldSet;
+import org.opencdmp.model.description.PropertyDefinitionFieldSet;
-import org.opencdmp.model.persist.descriptionproperties.PropertyDefinitionFieldSetPersist;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;

backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/PropertyDefinitionFieldSetItemBuilder.java

@@ -1,16 +1,12 @@
-package org.opencdmp.model.builder.descriptionpropertiesdefinition;
+package org.opencdmp.model.builder.descriptionproperties;
 
 import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.description.PropertyDefinitionEntity;
 import org.opencdmp.commons.types.description.PropertyDefinitionFieldSetItemEntity;
 import org.opencdmp.commons.types.descriptiontemplate.FieldEntity;
 import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity;
 import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.DescriptionTemplate;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptionproperties.PropertyDefinition;
+import org.opencdmp.model.description.PropertyDefinitionFieldSetItem;
-import org.opencdmp.model.descriptionproperties.PropertyDefinitionFieldSetItem;
-import org.opencdmp.model.persist.descriptionproperties.PropertyDefinitionFieldSetItemPersist;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;

backend/core/src/main/java/org/opencdmp/model/builder/descriptionreference/DescriptionReferenceBuilder.java

@@ -1,20 +1,5 @@
-package org.opencdmp.model.builder;
+package org.opencdmp.model.builder.descriptionreference;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.JsonHandlingService;
-import org.opencdmp.commons.scope.tenant.TenantScope;
-import org.opencdmp.commons.types.descriptionreference.DescriptionReferenceDataEntity;
-import org.opencdmp.commons.types.dmpreference.DmpReferenceDataEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.data.DescriptionReferenceEntity;
-import org.opencdmp.model.Description;
-import org.opencdmp.model.DescriptionReference;
-import org.opencdmp.model.DmpReference;
-import org.opencdmp.model.Reference;
-import org.opencdmp.model.builder.descriptionreference.DescriptionReferenceDataBuilder;
-import org.opencdmp.model.builder.dmpreference.DmpReferenceDataBuilder;
-import org.opencdmp.query.DescriptionQuery;
-import org.opencdmp.query.ReferenceQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -22,6 +7,20 @@ import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.JsonHandlingService;
+import org.opencdmp.commons.scope.tenant.TenantScope;
+import org.opencdmp.commons.types.descriptionreference.DescriptionReferenceDataEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.data.DescriptionReferenceEntity;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.builder.descriptionproperties.DescriptionBuilder;
+import org.opencdmp.model.builder.reference.ReferenceBuilder;
+import org.opencdmp.model.description.Description;
+import org.opencdmp.model.descriptionreference.DescriptionReference;
+import org.opencdmp.model.reference.Reference;
+import org.opencdmp.query.DescriptionQuery;
+import org.opencdmp.query.ReferenceQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -32,7 +31,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DescriptionReferenceBuilder extends BaseBuilder<DescriptionReference, DescriptionReferenceEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/DefaultValueBuilder.java

@@ -1,4 +1,4 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition;
+package org.opencdmp.model.builder.descriptiontemplate;
 
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
@@ -9,7 +9,7 @@ import org.opencdmp.commons.enums.FieldType;
 import org.opencdmp.commons.types.descriptiontemplate.DefaultValueEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.DefaultValue;
+import org.opencdmp.model.descriptiontemplate.DefaultValue;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/DefinitionBuilder.java

@@ -1,10 +1,10 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition;
+package org.opencdmp.model.builder.descriptiontemplate;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.Definition;
+import org.opencdmp.model.descriptiontemplate.Definition;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/DescriptionTemplateBuilder.java

@@ -1,4 +1,4 @@
-package org.opencdmp.model.builder;
+package org.opencdmp.model.builder.descriptiontemplate;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.XmlHandlingService;
@@ -6,10 +6,12 @@ import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.DescriptionTemplateEntity;
-import org.opencdmp.model.DescriptionTemplate;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.builder.DescriptionTemplateTypeBuilder;
+import org.opencdmp.model.builder.UserDescriptionTemplateBuilder;
+import org.opencdmp.model.descriptiontemplate.DescriptionTemplate;
 import org.opencdmp.model.DescriptionTemplateType;
 import org.opencdmp.model.UserDescriptionTemplate;
-import org.opencdmp.model.builder.descriptiontemplatedefinition.DefinitionBuilder;
 import org.opencdmp.query.DescriptionTemplateTypeQuery;
 import org.opencdmp.query.UserDescriptionTemplateQuery;
 import gr.cite.tools.data.builder.BuilderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/FieldBuilder.java

@@ -1,4 +1,4 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition;
+package org.opencdmp.model.builder.descriptiontemplate;
 
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -9,7 +9,7 @@ import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.descriptiontemplate.FieldEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.Field;
+import org.opencdmp.model.descriptiontemplate.Field;
 import org.opencdmp.service.fielddatahelper.FieldDataHelperService;
 import org.opencdmp.service.fielddatahelper.FieldDataHelperServiceProvider;
 import org.slf4j.LoggerFactory;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/FieldSetBuilder.java

@@ -1,4 +1,4 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition;
+package org.opencdmp.model.builder.descriptiontemplate;
 
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -19,7 +19,7 @@ import java.util.*;
 
 @Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class FieldSetBuilder extends BaseBuilder<org.opencdmp.model.descriptiontemplatedefinition.FieldSet, FieldSetEntity> {
+public class FieldSetBuilder extends BaseBuilder<org.opencdmp.model.descriptiontemplate.FieldSet, FieldSetEntity> {
 
     private final BuilderFactory builderFactory;
     private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
@@ -37,25 +37,25 @@ public class FieldSetBuilder extends BaseBuilder<org.opencdmp.model.descriptiont
     }
 
     @Override
-    public List<org.opencdmp.model.descriptiontemplatedefinition.FieldSet> build(FieldSet fields, List<FieldSetEntity> data) throws MyApplicationException {
+    public List<org.opencdmp.model.descriptiontemplate.FieldSet> build(FieldSet fields, List<FieldSetEntity> data) throws MyApplicationException {
         this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
         this.logger.trace(new DataLogEntry("requested fields", fields));
         if (fields == null || data == null || fields.isEmpty())
             return new ArrayList<>();
-        FieldSet fieldsFields = fields.extractPrefixed(this.asPrefix(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._fields));
+        FieldSet fieldsFields = fields.extractPrefixed(this.asPrefix(org.opencdmp.model.descriptiontemplate.FieldSet._fields));
-        FieldSet multiplicityFields = fields.extractPrefixed(this.asPrefix(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._multiplicity));
+        FieldSet multiplicityFields = fields.extractPrefixed(this.asPrefix(org.opencdmp.model.descriptiontemplate.FieldSet._multiplicity));
 
-        List<org.opencdmp.model.descriptiontemplatedefinition.FieldSet> models = new ArrayList<>();
+        List<org.opencdmp.model.descriptiontemplate.FieldSet> models = new ArrayList<>();
         for (FieldSetEntity d : data) {
-            org.opencdmp.model.descriptiontemplatedefinition.FieldSet m = new org.opencdmp.model.descriptiontemplatedefinition.FieldSet();
+            org.opencdmp.model.descriptiontemplate.FieldSet m = new org.opencdmp.model.descriptiontemplate.FieldSet();
-            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._id))) m.setId(d.getId());
+            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplate.FieldSet._id))) m.setId(d.getId());
-            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._ordinal))) m.setOrdinal(d.getOrdinal());
+            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplate.FieldSet._ordinal))) m.setOrdinal(d.getOrdinal());
-            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._title))) m.setTitle(d.getTitle());
+            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplate.FieldSet._title))) m.setTitle(d.getTitle());
-            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._description))) m.setDescription(d.getDescription());
+            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplate.FieldSet._description))) m.setDescription(d.getDescription());
-            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._extendedDescription))) m.setExtendedDescription(d.getExtendedDescription());
+            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplate.FieldSet._extendedDescription))) m.setExtendedDescription(d.getExtendedDescription());
-            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._additionalInformation))) m.setAdditionalInformation(d.getAdditionalInformation());
+            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplate.FieldSet._additionalInformation))) m.setAdditionalInformation(d.getAdditionalInformation());
-            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._hasCommentField))) m.setHasCommentField(d.getHasCommentField());
+            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplate.FieldSet._hasCommentField))) m.setHasCommentField(d.getHasCommentField());
-            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplatedefinition.FieldSet._hasMultiplicity))) m.setHasMultiplicity(d.getHasMultiplicity());
+            if (fields.hasField(this.asIndexer(org.opencdmp.model.descriptiontemplate.FieldSet._hasMultiplicity))) m.setHasMultiplicity(d.getHasMultiplicity());
             if (!multiplicityFields.isEmpty() && d.getMultiplicity() != null) m.setMultiplicity(this.builderFactory.builder(MultiplicityBuilder.class).authorize(this.authorize).build(multiplicityFields, d.getMultiplicity()));
             if (!fieldsFields.isEmpty() && d.getFields() != null) m.setFields(this.builderFactory.builder(FieldBuilder.class).authorize(this.authorize).build(fieldsFields, d.getFields()));
             models.add(m);

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/MultiplicityBuilder.java

@@ -1,10 +1,10 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition;
+package org.opencdmp.model.builder.descriptiontemplate;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.descriptiontemplate.MultiplicityEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.Multiplicity;
+import org.opencdmp.model.descriptiontemplate.Multiplicity;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/PageBuilder.java

@@ -1,11 +1,10 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition;
+package org.opencdmp.model.builder.descriptiontemplate;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.descriptiontemplate.PageEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.Definition;
+import org.opencdmp.model.descriptiontemplate.Page;
-import org.opencdmp.model.descriptiontemplatedefinition.Page;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/RuleBuilder.java

@@ -1,4 +1,4 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition;
+package org.opencdmp.model.builder.descriptiontemplate;
 
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
@@ -11,7 +11,7 @@ import org.opencdmp.commons.enums.FieldType;
 import org.opencdmp.commons.types.descriptiontemplate.RuleEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.Rule;
+import org.opencdmp.model.descriptiontemplate.Rule;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/SectionBuilder.java

@@ -1,4 +1,4 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition;
+package org.opencdmp.model.builder.descriptiontemplate;
 
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -9,7 +9,7 @@ import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.descriptiontemplate.SectionEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.Section;
+import org.opencdmp.model.descriptiontemplate.Section;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/fielddata/BaseFieldDataBuilder.java

@@ -1,10 +1,10 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition.fielddata;
+package org.opencdmp.model.builder.descriptiontemplate.fielddata;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import org.opencdmp.model.descriptiontemplate.fielddata.BaseFieldData;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/fielddata/LabelAndMultiplicityDataBuilder.java

@@ -1,8 +1,8 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition.fielddata;
+package org.opencdmp.model.builder.descriptiontemplate.fielddata;
 
 import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity;
 import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.descriptiontemplatedefinition.fielddata.LabelAndMultiplicityData;
+import org.opencdmp.model.descriptiontemplate.fielddata.LabelAndMultiplicityData;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/fielddata/LabelDataBuilder.java

@@ -1,8 +1,8 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition.fielddata;
+package org.opencdmp.model.builder.descriptiontemplate.fielddata;
 
 import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelDataEntity;
 import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.descriptiontemplatedefinition.fielddata.LabelData;
+import org.opencdmp.model.descriptiontemplate.fielddata.LabelData;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/fielddata/RadioBoxDataBuilder.java

@@ -1,10 +1,10 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition.fielddata;
+package org.opencdmp.model.builder.descriptiontemplate.fielddata;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.descriptiontemplate.fielddata.RadioBoxDataEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.fielddata.RadioBoxData;
+import org.opencdmp.model.descriptiontemplate.fielddata.RadioBoxData;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/fielddata/ReferenceTypeDataBuilder.java

@@ -1,16 +1,14 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition.fielddata;
+package org.opencdmp.model.builder.descriptiontemplate.fielddata;
 
-import org.opencdmp.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.builder.ReferenceTypeBuilder;
-import org.opencdmp.model.builder.dmpblueprintdefinition.ReferenceFieldBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.fielddata.ReferenceTypeData;
-import org.opencdmp.model.dmpblueprintdefinition.ReferenceTypeField;
-import org.opencdmp.query.ReferenceTypeQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.referencetype.ReferenceTypeBuilder;
+import org.opencdmp.model.descriptiontemplate.fielddata.ReferenceTypeData;
+import org.opencdmp.query.ReferenceTypeQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -18,7 +16,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class ReferenceTypeDataBuilder extends BaseFieldDataBuilder<ReferenceTypeData, ReferenceTypeDataEntity> {
 
 	private final QueryFactory queryFactory;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/fielddata/SelectDataBuilder.java

@@ -1,10 +1,10 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition.fielddata;
+package org.opencdmp.model.builder.descriptiontemplate.fielddata;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.descriptiontemplate.fielddata.SelectDataEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.fielddata.SelectData;
+import org.opencdmp.model.descriptiontemplate.fielddata.SelectData;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/fielddata/UploadDataBuilder.java

@@ -1,10 +1,10 @@
-package org.opencdmp.model.builder.descriptiontemplatedefinition.fielddata;
+package org.opencdmp.model.builder.descriptiontemplate.fielddata;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.descriptiontemplate.fielddata.UploadDataEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.descriptiontemplatedefinition.fielddata.UploadData;
+import org.opencdmp.model.descriptiontemplate.fielddata.UploadData;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;

backend/core/src/main/java/org/opencdmp/model/builder/dmp/DmpBlueprintValueBuilder.java

@@ -1,15 +1,14 @@
-package org.opencdmp.model.builder.dmpproperties;
+package org.opencdmp.model.builder.dmp;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.dmp.DmpBlueprintValueEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.dmpproperties.DmpBlueprintValue;
-import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.types.dmp.DmpBlueprintValueEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.dmp.DmpBlueprintValue;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -19,7 +18,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component("descriptionpropertiesdefinitionDmpBlueprintValuebuilder")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DmpBlueprintValueBuilder extends BaseBuilder<DmpBlueprintValue, DmpBlueprintValueEntity> {
 
     private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);

backend/core/src/main/java/org/opencdmp/model/builder/dmp/DmpBuilder.java

@@ -1,5 +1,13 @@
-package org.opencdmp.model.builder;
+package org.opencdmp.model.builder.dmp;
 
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.data.query.QueryFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.BaseFieldSet;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
 import org.opencdmp.authorization.AffiliatedResource;
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.authorization.authorizationcontentresolver.AuthorizationContentResolver;
@@ -9,17 +17,19 @@ import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.commons.types.dmp.DmpPropertiesEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.DmpEntity;
-import org.opencdmp.model.*;
+import org.opencdmp.model.DmpDescriptionTemplate;
-import org.opencdmp.model.builder.dmpproperties.DmpPropertiesBuilder;
+import org.opencdmp.model.DmpUser;
+import org.opencdmp.model.EntityDoi;
+import org.opencdmp.model.builder.*;
+import org.opencdmp.model.builder.descriptionproperties.DescriptionBuilder;
+import org.opencdmp.model.builder.dmpblueprint.DmpBlueprintBuilder;
+import org.opencdmp.model.builder.dmpreference.DmpReferenceBuilder;
+import org.opencdmp.model.description.Description;
+import org.opencdmp.model.dmp.Dmp;
+import org.opencdmp.model.dmpblueprint.DmpBlueprint;
+import org.opencdmp.model.dmpreference.DmpReference;
+import org.opencdmp.model.user.User;
 import org.opencdmp.query.*;
-import gr.cite.commons.web.authz.service.AuthorizationService;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.data.query.QueryFactory;
-import gr.cite.tools.exception.MyApplicationException;
-import gr.cite.tools.fieldset.BaseFieldSet;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.DataLogEntry;
-import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -30,7 +40,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DmpBuilder extends BaseBuilder<Dmp, DmpEntity> {
 
     private final QueryFactory queryFactory;

backend/core/src/main/java/org/opencdmp/model/builder/dmp/DmpContactBuilder.java

@@ -1,14 +1,5 @@
-package org.opencdmp.model.builder.dmpproperties;
+package org.opencdmp.model.builder.dmp;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.dmp.DmpContactEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.DmpAssociatedUser;
-import org.opencdmp.model.User;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.builder.DmpAssociatedUserBuilder;
-import org.opencdmp.model.dmpproperties.DmpContact;
-import org.opencdmp.query.UserQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -16,6 +7,15 @@ import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.types.dmp.DmpContactEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.DmpAssociatedUser;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.builder.DmpAssociatedUserBuilder;
+import org.opencdmp.model.dmp.DmpContact;
+import org.opencdmp.model.user.User;
+import org.opencdmp.query.UserQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -26,7 +26,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component("dmpcontactbuilder")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DmpContactBuilder extends BaseBuilder<DmpContact, DmpContactEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/dmp/DmpPropertiesBuilder.java

@@ -1,15 +1,15 @@
-package org.opencdmp.model.builder.dmpproperties;
+package org.opencdmp.model.builder.dmp;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.dmp.DmpPropertiesEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.dmpproperties.DmpProperties;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.types.dmp.DmpPropertiesEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.dmp.DmpProperties;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component("dmppropertiesbuilder")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DmpPropertiesBuilder extends BaseBuilder<DmpProperties, DmpPropertiesEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/dmpblueprint/DefinitionBuilder.java

@@ -1,10 +1,10 @@
-package org.opencdmp.model.builder.dmpblueprintdefinition;
+package org.opencdmp.model.builder.dmpblueprint;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.dmpblueprint.DefinitionEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.dmpblueprintdefinition.Definition;
+import org.opencdmp.model.dmpblueprint.Definition;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;

backend/core/src/main/java/org/opencdmp/model/builder/dmpblueprint/DescriptionTemplateBuilder.java

@@ -1,10 +1,10 @@
-package org.opencdmp.model.builder.dmpblueprintdefinition;
+package org.opencdmp.model.builder.dmpblueprint;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.dmpblueprint.DescriptionTemplateEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.dmpblueprintdefinition.DescriptionTemplate;
+import org.opencdmp.model.dmpblueprint.DescriptionTemplate;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;

backend/core/src/main/java/org/opencdmp/model/builder/dmpblueprint/DmpBlueprintBuilder.java

@@ -1,4 +1,4 @@
-package org.opencdmp.model.builder;
+package org.opencdmp.model.builder.dmpblueprint;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.XmlHandlingService;
@@ -6,8 +6,8 @@ import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.commons.types.dmpblueprint.DefinitionEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.DmpBlueprintEntity;
-import org.opencdmp.model.DmpBlueprint;
+import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.builder.dmpblueprintdefinition.DefinitionBuilder;
+import org.opencdmp.model.dmpblueprint.DmpBlueprint;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;

backend/core/src/main/java/org/opencdmp/model/builder/dmpblueprint/ExtraFieldBuilder.java

@@ -1,8 +1,8 @@
-package org.opencdmp.model.builder.dmpblueprintdefinition;
+package org.opencdmp.model.builder.dmpblueprint;
 
 import org.opencdmp.commons.types.dmpblueprint.ExtraFieldEntity;
 import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.dmpblueprintdefinition.ExtraField;
+import org.opencdmp.model.dmpblueprint.ExtraField;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;

backend/core/src/main/java/org/opencdmp/model/builder/dmpblueprint/FieldBuilder.java

@@ -1,10 +1,10 @@
-package org.opencdmp.model.builder.dmpblueprintdefinition;
+package org.opencdmp.model.builder.dmpblueprint;
 
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.dmpblueprint.FieldEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.dmpblueprintdefinition.Field;
+import org.opencdmp.model.dmpblueprint.Field;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;

backend/core/src/main/java/org/opencdmp/model/builder/dmpblueprint/ReferenceFieldBuilder.java

@@ -1,18 +1,14 @@
-package org.opencdmp.model.builder.dmpblueprintdefinition;
+package org.opencdmp.model.builder.dmpblueprint;
 
-import org.opencdmp.commons.types.dmpblueprint.ReferenceTypeFieldEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.Dmp;
-import org.opencdmp.model.PublicReferenceType;
-import org.opencdmp.model.builder.PublicReferenceTypeBuilder;
-import org.opencdmp.model.builder.ReferenceTypeBuilder;
-import org.opencdmp.model.dmpblueprintdefinition.ReferenceTypeField;
-import org.opencdmp.query.ReferenceTypeQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
-import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.commons.types.dmpblueprint.ReferenceTypeFieldEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.referencetype.ReferenceTypeBuilder;
+import org.opencdmp.model.dmpblueprint.ReferenceTypeField;
+import org.opencdmp.query.ReferenceTypeQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -20,7 +16,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class ReferenceFieldBuilder extends FieldBuilder<ReferenceTypeField, ReferenceTypeFieldEntity> {
 	private final QueryFactory queryFactory;
 

backend/core/src/main/java/org/opencdmp/model/builder/dmpblueprint/SectionBuilder.java

@@ -1,20 +1,23 @@
-package org.opencdmp.model.builder.dmpblueprintdefinition;
+package org.opencdmp.model.builder.dmpblueprint;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.enums.DmpBlueprintFieldCategory;
-import org.opencdmp.commons.types.dmpblueprint.*;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.data.PrefillingSourceEntity;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.builder.PrefillingSourceBuilder;
-import org.opencdmp.model.dmpblueprintdefinition.Section;
-import org.opencdmp.query.PrefillingSourceQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.enums.DmpBlueprintFieldCategory;
+import org.opencdmp.commons.types.dmpblueprint.ExtraFieldEntity;
+import org.opencdmp.commons.types.dmpblueprint.ReferenceTypeFieldEntity;
+import org.opencdmp.commons.types.dmpblueprint.SectionEntity;
+import org.opencdmp.commons.types.dmpblueprint.SystemFieldEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.data.PrefillingSourceEntity;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.builder.prefillingsource.PrefillingSourceBuilder;
+import org.opencdmp.model.dmpblueprint.Section;
+import org.opencdmp.query.PrefillingSourceQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -24,7 +27,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component("dmpblueprintdefinitionsectionbuilder")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class SectionBuilder extends BaseBuilder<Section, SectionEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/dmpblueprint/SystemFieldBuilder.java

@@ -1,8 +1,8 @@
-package org.opencdmp.model.builder.dmpblueprintdefinition;
+package org.opencdmp.model.builder.dmpblueprint;
 
 import org.opencdmp.commons.types.dmpblueprint.SystemFieldEntity;
 import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.dmpblueprintdefinition.SystemField;
+import org.opencdmp.model.dmpblueprint.SystemField;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;

backend/core/src/main/java/org/opencdmp/model/builder/dmpreference/DmpReferenceBuilder.java

@@ -1,20 +1,5 @@
-package org.opencdmp.model.builder;
+package org.opencdmp.model.builder.dmpreference;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.JsonHandlingService;
-import org.opencdmp.commons.scope.tenant.TenantScope;
-import org.opencdmp.commons.types.description.PropertyDefinitionEntity;
-import org.opencdmp.commons.types.dmpreference.DmpReferenceDataEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.data.DmpReferenceEntity;
-import org.opencdmp.model.Description;
-import org.opencdmp.model.Dmp;
-import org.opencdmp.model.DmpReference;
-import org.opencdmp.model.Reference;
-import org.opencdmp.model.builder.descriptionpropertiesdefinition.PropertyDefinitionBuilder;
-import org.opencdmp.model.builder.dmpreference.DmpReferenceDataBuilder;
-import org.opencdmp.query.DmpQuery;
-import org.opencdmp.query.ReferenceQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -22,6 +7,20 @@ import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.JsonHandlingService;
+import org.opencdmp.commons.scope.tenant.TenantScope;
+import org.opencdmp.commons.types.dmpreference.DmpReferenceDataEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.data.DmpReferenceEntity;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.builder.dmp.DmpBuilder;
+import org.opencdmp.model.builder.reference.ReferenceBuilder;
+import org.opencdmp.model.dmp.Dmp;
+import org.opencdmp.model.dmpreference.DmpReference;
+import org.opencdmp.model.reference.Reference;
+import org.opencdmp.query.DmpQuery;
+import org.opencdmp.query.ReferenceQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -32,7 +31,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DmpReferenceBuilder extends BaseBuilder<DmpReference, DmpReferenceEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/externalfetcher/ExternalFetcherBaseSourceConfigurationBuilder.java

@@ -1,13 +1,5 @@
 package org.opencdmp.model.builder.externalfetcher;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.externalfetcher.ExternalFetcherBaseSourceConfigurationEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.ReferenceType;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.builder.ReferenceTypeBuilder;
-import org.opencdmp.model.externalfetcher.ExternalFetcherBaseSourceConfiguration;
-import org.opencdmp.query.ReferenceTypeQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -15,6 +7,14 @@ import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.types.externalfetcher.ExternalFetcherBaseSourceConfigurationEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.builder.referencetype.ReferenceTypeBuilder;
+import org.opencdmp.model.externalfetcher.ExternalFetcherBaseSourceConfiguration;
+import org.opencdmp.model.referencetype.ReferenceType;
+import org.opencdmp.query.ReferenceTypeQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
@@ -24,7 +24,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public abstract class ExternalFetcherBaseSourceConfigurationBuilder<Model extends ExternalFetcherBaseSourceConfiguration, Entity extends ExternalFetcherBaseSourceConfigurationEntity> extends BaseBuilder<Model, Entity> {
 
     protected EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);

backend/core/src/main/java/org/opencdmp/model/builder/externalfetcher/QueryCaseConfigBuilder.java

@@ -1,13 +1,5 @@
 package org.opencdmp.model.builder.externalfetcher;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.externalfetcher.QueryCaseConfigEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.ReferenceType;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.builder.ReferenceTypeBuilder;
-import org.opencdmp.model.externalfetcher.QueryCaseConfig;
-import org.opencdmp.query.ReferenceTypeQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -15,6 +7,14 @@ import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.types.externalfetcher.QueryCaseConfigEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.builder.referencetype.ReferenceTypeBuilder;
+import org.opencdmp.model.externalfetcher.QueryCaseConfig;
+import org.opencdmp.model.referencetype.ReferenceType;
+import org.opencdmp.query.ReferenceTypeQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -25,7 +25,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class QueryCaseConfigBuilder extends BaseBuilder<QueryCaseConfig, QueryCaseConfigEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/prefillingsource/PrefillingSourceBuilder.java

@@ -1,19 +1,18 @@
-package org.opencdmp.model.builder;
+package org.opencdmp.model.builder.prefillingsource;
 
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.XmlHandlingService;
 import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.commons.types.prefillingsource.PrefillingSourceDefinitionEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.PrefillingSourceEntity;
-import org.opencdmp.model.PrefillingSource;
+import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.builder.prefillingsourcedefinition.PrefillingSourceDefinitionBuilder;
+import org.opencdmp.model.prefillingsource.PrefillingSource;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.data.query.QueryFactory;
-import gr.cite.tools.exception.MyApplicationException;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.DataLogEntry;
-import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -23,7 +22,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class PrefillingSourceBuilder extends BaseBuilder<PrefillingSource, PrefillingSourceEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/prefillingsource/PrefillingSourceDefinitionBuilder.java

@@ -1,17 +1,17 @@
-package org.opencdmp.model.builder.prefillingsourcedefinition;
+package org.opencdmp.model.builder.prefillingsource;
 
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.types.prefillingsource.PrefillingSourceDefinitionEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.model.builder.BaseBuilder;
 import org.opencdmp.model.builder.externalfetcher.ExternalFetcherApiSourceConfigurationBuilder;
 import org.opencdmp.model.externalfetcher.ExternalFetcherApiSourceConfiguration;
-import org.opencdmp.model.prefillingsourcedefinition.PrefillingSourceDefinition;
+import org.opencdmp.model.prefillingsource.PrefillingSourceDefinition;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.exception.MyApplicationException;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.DataLogEntry;
-import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class PrefillingSourceDefinitionBuilder extends BaseBuilder<PrefillingSourceDefinition, PrefillingSourceDefinitionEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/prefillingsource/PrefillingSourceDefinitionFieldBuilder.java

@@ -1,15 +1,15 @@
-package org.opencdmp.model.builder.prefillingsourcedefinition;
+package org.opencdmp.model.builder.prefillingsource;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.prefillingsource.PrefillingSourceDefinitionFieldEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.prefillingsourcedefinition.PrefillingSourceDefinitionField;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.types.prefillingsource.PrefillingSourceDefinitionFieldEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.prefillingsource.PrefillingSourceDefinitionField;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class PrefillingSourceDefinitionFieldBuilder extends BaseBuilder<PrefillingSourceDefinitionField, PrefillingSourceDefinitionFieldEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/prefillingsource/PrefillingSourceDefinitionFixedValueFieldBuilder.java

@@ -1,15 +1,15 @@
-package org.opencdmp.model.builder.prefillingsourcedefinition;
+package org.opencdmp.model.builder.prefillingsource;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.prefillingsource.PrefillingSourceDefinitionFixedValueFieldEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.prefillingsourcedefinition.PrefillingSourceDefinitionFixedValueField;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.types.prefillingsource.PrefillingSourceDefinitionFixedValueFieldEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.prefillingsource.PrefillingSourceDefinitionFixedValueField;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class PrefillingSourceDefinitionFixedValueFieldBuilder extends BaseBuilder<PrefillingSourceDefinitionFixedValueField, PrefillingSourceDefinitionFixedValueFieldEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/reference/DefinitionBuilder.java

@@ -1,15 +1,15 @@
-package org.opencdmp.model.builder.referencedefinition;
+package org.opencdmp.model.builder.reference;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.reference.DefinitionEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.referencedefinition.Definition;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.types.reference.DefinitionEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.reference.Definition;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component("referencedefinitionbuilder")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DefinitionBuilder extends BaseBuilder<Definition, DefinitionEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/reference/FieldBuilder.java

@@ -1,15 +1,15 @@
-package org.opencdmp.model.builder.referencedefinition;
+package org.opencdmp.model.builder.reference;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.reference.FieldEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.referencedefinition.Field;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.types.reference.FieldEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.reference.Field;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component("referencedefinitionfieldbuilder")
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class FieldBuilder extends BaseBuilder<Field, FieldEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/reference/ReferenceBuilder.java

@@ -1,20 +1,5 @@
-package org.opencdmp.model.builder;
+package org.opencdmp.model.builder.reference;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.XmlHandlingService;
-import org.opencdmp.commons.scope.tenant.TenantScope;
-import org.opencdmp.commons.types.reference.DefinitionEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.data.DescriptionEntity;
-import org.opencdmp.data.ReferenceEntity;
-import org.opencdmp.model.DmpReference;
-import org.opencdmp.model.Reference;
-import org.opencdmp.model.ReferenceType;
-import org.opencdmp.model.User;
-import org.opencdmp.model.builder.referencedefinition.DefinitionBuilder;
-import org.opencdmp.query.DmpReferenceQuery;
-import org.opencdmp.query.ReferenceTypeQuery;
-import org.opencdmp.query.UserQuery;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
@@ -22,6 +7,23 @@ import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.XmlHandlingService;
+import org.opencdmp.commons.scope.tenant.TenantScope;
+import org.opencdmp.commons.types.reference.DefinitionEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.data.ReferenceEntity;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.builder.UserBuilder;
+import org.opencdmp.model.builder.dmpreference.DmpReferenceBuilder;
+import org.opencdmp.model.builder.referencetype.ReferenceTypeBuilder;
+import org.opencdmp.model.dmpreference.DmpReference;
+import org.opencdmp.model.reference.Reference;
+import org.opencdmp.model.referencetype.ReferenceType;
+import org.opencdmp.model.user.User;
+import org.opencdmp.query.DmpReferenceQuery;
+import org.opencdmp.query.ReferenceTypeQuery;
+import org.opencdmp.query.UserQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -32,7 +34,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class ReferenceBuilder extends BaseBuilder<Reference, ReferenceEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/referencetype/ReferenceTypeBuilder.java

@@ -1,19 +1,18 @@
-package org.opencdmp.model.builder;
+package org.opencdmp.model.builder.referencetype;
 
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.XmlHandlingService;
 import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.commons.types.referencetype.ReferenceTypeDefinitionEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.ReferenceTypeEntity;
-import org.opencdmp.model.ReferenceType;
+import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.builder.referencetypedefinition.ReferenceTypeDefinitionBuilder;
+import org.opencdmp.model.referencetype.ReferenceType;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.data.query.QueryFactory;
-import gr.cite.tools.exception.MyApplicationException;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.DataLogEntry;
-import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -23,7 +22,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class ReferenceTypeBuilder extends BaseBuilder<ReferenceType, ReferenceTypeEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/referencetype/ReferenceTypeDefinitionBuilder.java

@@ -1,21 +1,20 @@
-package org.opencdmp.model.builder.referencetypedefinition;
+package org.opencdmp.model.builder.referencetype;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.enums.ExternalFetcherSourceType;
-import org.opencdmp.commons.types.referencetype.ReferenceTypeDefinitionEntity;
-import org.opencdmp.commons.types.externalfetcher.ExternalFetcherApiSourceConfigurationEntity;
-import org.opencdmp.commons.types.externalfetcher.ExternalFetcherStaticOptionSourceConfigurationEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.builder.externalfetcher.ExternalFetcherApiSourceConfigurationBuilder;
-import org.opencdmp.model.builder.externalfetcher.ExternalFetcherStaticOptionSourceConfigurationBuilder;
-import org.opencdmp.model.referencetypedefinition.ReferenceTypeDefinition;
-import org.opencdmp.model.externalfetcher.ExternalFetcherBaseSourceConfiguration;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.enums.ExternalFetcherSourceType;
+import org.opencdmp.commons.types.externalfetcher.ExternalFetcherApiSourceConfigurationEntity;
+import org.opencdmp.commons.types.externalfetcher.ExternalFetcherStaticOptionSourceConfigurationEntity;
+import org.opencdmp.commons.types.referencetype.ReferenceTypeDefinitionEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.builder.externalfetcher.ExternalFetcherApiSourceConfigurationBuilder;
+import org.opencdmp.model.builder.externalfetcher.ExternalFetcherStaticOptionSourceConfigurationBuilder;
+import org.opencdmp.model.referencetype.ReferenceTypeDefinition;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -25,7 +24,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class ReferenceTypeDefinitionBuilder extends BaseBuilder<ReferenceTypeDefinition, ReferenceTypeDefinitionEntity> {
 
     private final BuilderFactory builderFactory;

backend/core/src/main/java/org/opencdmp/model/builder/referencetype/ReferenceTypeFieldBuilder.java

@@ -1,15 +1,15 @@
-package org.opencdmp.model.builder.referencetypedefinition;
+package org.opencdmp.model.builder.referencetype;
 
-import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.types.referencetype.ReferenceTypeFieldEntity;
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.model.builder.BaseBuilder;
-import org.opencdmp.model.referencetypedefinition.ReferenceTypeField;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
+import org.opencdmp.authorization.AuthorizationFlags;
+import org.opencdmp.commons.types.referencetype.ReferenceTypeFieldEntity;
+import org.opencdmp.convention.ConventionService;
+import org.opencdmp.model.builder.BaseBuilder;
+import org.opencdmp.model.referencetype.ReferenceTypeField;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 @Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class ReferenceTypeFieldBuilder extends BaseBuilder<ReferenceTypeField, ReferenceTypeFieldEntity> {
 
     private final BuilderFactory builderFactory;