From e4ac550684592403aaf3e44b4996cf9d924ceefb Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Wed, 8 May 2024 16:14:15 +0300 Subject: [PATCH] package rename --- .../model/builder/DescriptionTagBuilder.java | 2 +- .../builder/RecentActivityItemBuilder.java | 2 +- .../DescriptionBuilder.java | 2 +- .../ExternalIdentifierBuilder.java | 14 +++++++------- .../FieldBuilder.java | 2 +- .../PropertyDefinitionBuilder.java | 18 +++++++++--------- .../PropertyDefinitionFieldSetBuilder.java | 14 +++++++------- .../PropertyDefinitionFieldSetItemBuilder.java | 16 ++++++++-------- .../DescriptionReferenceBuilder.java | 2 +- .../opencdmp/model/builder/dmp/DmpBuilder.java | 2 +- .../description/DescriptionServiceImpl.java | 2 +- .../elastic/ElasticQueryHelperServiceImpl.java | 2 +- .../controllers/DescriptionController.java | 2 +- ...PublicDatasetsDescriptionDocumentation.java | 2 +- 14 files changed, 41 insertions(+), 41 deletions(-) rename backend/core/src/main/java/org/opencdmp/model/builder/{descriptionproperties => description}/DescriptionBuilder.java (99%) rename backend/core/src/main/java/org/opencdmp/model/builder/{descriptionproperties => description}/ExternalIdentifierBuilder.java (95%) rename backend/core/src/main/java/org/opencdmp/model/builder/{descriptionproperties => description}/FieldBuilder.java (99%) rename backend/core/src/main/java/org/opencdmp/model/builder/{descriptionproperties => description}/PropertyDefinitionBuilder.java (92%) rename backend/core/src/main/java/org/opencdmp/model/builder/{descriptionproperties => description}/PropertyDefinitionFieldSetBuilder.java (96%) rename backend/core/src/main/java/org/opencdmp/model/builder/{descriptionproperties => description}/PropertyDefinitionFieldSetItemBuilder.java (93%) diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/DescriptionTagBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/DescriptionTagBuilder.java index 6cfcc61ce..f36b247fd 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/DescriptionTagBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/DescriptionTagBuilder.java @@ -13,7 +13,7 @@ import org.opencdmp.convention.ConventionService; import org.opencdmp.data.DescriptionTagEntity; import org.opencdmp.model.DescriptionTag; import org.opencdmp.model.Tag; -import org.opencdmp.model.builder.descriptionproperties.DescriptionBuilder; +import org.opencdmp.model.builder.description.DescriptionBuilder; import org.opencdmp.model.description.Description; import org.opencdmp.query.DescriptionQuery; import org.opencdmp.query.TagQuery; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/RecentActivityItemBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/RecentActivityItemBuilder.java index 1c6b6bfac..f5ad7888f 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/RecentActivityItemBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/RecentActivityItemBuilder.java @@ -12,7 +12,7 @@ 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.description.DescriptionBuilder; import org.opencdmp.model.builder.dmp.DmpBuilder; import org.opencdmp.model.description.Description; import org.opencdmp.model.dmp.Dmp; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/DescriptionBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/description/DescriptionBuilder.java similarity index 99% rename from backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/DescriptionBuilder.java rename to backend/core/src/main/java/org/opencdmp/model/builder/description/DescriptionBuilder.java index 01e02c67c..49dde4db7 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/DescriptionBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/description/DescriptionBuilder.java @@ -1,4 +1,4 @@ -package org.opencdmp.model.builder.descriptionproperties; +package org.opencdmp.model.builder.description; import gr.cite.commons.web.authz.service.AuthorizationService; import gr.cite.tools.data.builder.BuilderFactory; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/ExternalIdentifierBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/description/ExternalIdentifierBuilder.java similarity index 95% rename from backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/ExternalIdentifierBuilder.java rename to backend/core/src/main/java/org/opencdmp/model/builder/description/ExternalIdentifierBuilder.java index e0be319f8..06014ffe9 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/ExternalIdentifierBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/description/ExternalIdentifierBuilder.java @@ -1,16 +1,16 @@ -package org.opencdmp.model.builder.descriptionproperties; +package org.opencdmp.model.builder.description; +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.description.ExternalIdentifierEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.BaseBuilder; import org.opencdmp.model.description.ExternalIdentifier; import org.opencdmp.service.fielddatahelper.FieldDataHelperServiceProvider; -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; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Component; import java.util.*; @Component("description.ExternalIdentifierBuilder") -@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) +@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) public class ExternalIdentifierBuilder extends BaseBuilder { private EnumSet authorize = EnumSet.of(AuthorizationFlags.None); diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/FieldBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/description/FieldBuilder.java similarity index 99% rename from backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/FieldBuilder.java rename to backend/core/src/main/java/org/opencdmp/model/builder/description/FieldBuilder.java index 3fde0441f..f25f1aad2 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/FieldBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/description/FieldBuilder.java @@ -1,4 +1,4 @@ -package org.opencdmp.model.builder.descriptionproperties; +package org.opencdmp.model.builder.description; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.data.query.QueryFactory; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/PropertyDefinitionBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/description/PropertyDefinitionBuilder.java similarity index 92% rename from backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/PropertyDefinitionBuilder.java rename to backend/core/src/main/java/org/opencdmp/model/builder/description/PropertyDefinitionBuilder.java index 5f1b4e0df..ce601c69f 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/PropertyDefinitionBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/description/PropertyDefinitionBuilder.java @@ -1,27 +1,27 @@ -package org.opencdmp.model.builder.descriptionproperties; +package org.opencdmp.model.builder.description; +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.description.PropertyDefinitionEntity; 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 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.model.description.PropertyDefinition; import org.slf4j.LoggerFactory; 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.description.PropertyDefinition; import java.util.*; @Component("descriptionpropertiesdefinitionbuilder") -@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) +@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) public class PropertyDefinitionBuilder extends BaseBuilder { private final BuilderFactory builderFactory; @@ -61,7 +61,7 @@ public class PropertyDefinitionBuilder extends BaseBuilder()); for (String key : d.getFieldSets().keySet()){ - FieldSetEntity fieldSetEntity = definition != null ? definition.getFieldSetById(key).stream().findFirst().orElse(null) : null; + FieldSetEntity fieldSetEntity = this.definition != null ? this.definition.getFieldSetById(key).stream().findFirst().orElse(null) : null; m.getFieldSets().put(key, this.builderFactory.builder(PropertyDefinitionFieldSetBuilder.class).authorize(this.authorize).withFieldSetEntity(fieldSetEntity).build(fieldsFields, d.getFieldSets().get(key))); } } diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/PropertyDefinitionFieldSetBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/description/PropertyDefinitionFieldSetBuilder.java similarity index 96% rename from backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/PropertyDefinitionFieldSetBuilder.java rename to backend/core/src/main/java/org/opencdmp/model/builder/description/PropertyDefinitionFieldSetBuilder.java index a895ee45c..df111db92 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/PropertyDefinitionFieldSetBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/description/PropertyDefinitionFieldSetBuilder.java @@ -1,16 +1,16 @@ -package org.opencdmp.model.builder.descriptionproperties; +package org.opencdmp.model.builder.description; +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.description.PropertyDefinitionFieldSetEntity; import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.BaseBuilder; import org.opencdmp.model.description.PropertyDefinitionFieldSet; -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; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Component; import java.util.*; @Component("description.PropertyDefinitionFieldSet") -@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) +@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) public class PropertyDefinitionFieldSetBuilder extends BaseBuilder { private final BuilderFactory builderFactory; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/PropertyDefinitionFieldSetItemBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/description/PropertyDefinitionFieldSetItemBuilder.java similarity index 93% rename from backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/PropertyDefinitionFieldSetItemBuilder.java rename to backend/core/src/main/java/org/opencdmp/model/builder/description/PropertyDefinitionFieldSetItemBuilder.java index f5758012c..4217c6ca0 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionproperties/PropertyDefinitionFieldSetItemBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/description/PropertyDefinitionFieldSetItemBuilder.java @@ -1,5 +1,10 @@ -package org.opencdmp.model.builder.descriptionproperties; +package org.opencdmp.model.builder.description; +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.description.PropertyDefinitionFieldSetItemEntity; import org.opencdmp.commons.types.descriptiontemplate.FieldEntity; @@ -7,11 +12,6 @@ import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.BaseBuilder; import org.opencdmp.model.description.PropertyDefinitionFieldSetItem; -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("description.PropertyDefinitionFieldSetItemBuilder") -@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) +@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) public class PropertyDefinitionFieldSetItemBuilder extends BaseBuilder { private final BuilderFactory builderFactory; @@ -63,7 +63,7 @@ public class PropertyDefinitionFieldSetItemBuilder extends BaseBuilder()); for (String key : d.getFields().keySet()){ - FieldEntity fieldEntity = fieldSetEntity != null ? fieldSetEntity.getFieldById(key).stream().findFirst().orElse(null) : null; + FieldEntity fieldEntity = this.fieldSetEntity != null ? this.fieldSetEntity.getFieldById(key).stream().findFirst().orElse(null) : null; m.getFields().put(key, this.builderFactory.builder(FieldBuilder.class).authorize(this.authorize).withFieldEntity(fieldEntity).build(fieldsFields, d.getFields().get(key))); } } diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionreference/DescriptionReferenceBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/descriptionreference/DescriptionReferenceBuilder.java index b6ca46a2f..34bb37c75 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionreference/DescriptionReferenceBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/descriptionreference/DescriptionReferenceBuilder.java @@ -14,7 +14,7 @@ import org.opencdmp.commons.types.descriptionreference.DescriptionReferenceDataE 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.description.DescriptionBuilder; import org.opencdmp.model.builder.reference.ReferenceBuilder; import org.opencdmp.model.description.Description; import org.opencdmp.model.descriptionreference.DescriptionReference; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/dmp/DmpBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/dmp/DmpBuilder.java index c37a08060..316ff01a6 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/dmp/DmpBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/dmp/DmpBuilder.java @@ -23,7 +23,7 @@ import org.opencdmp.model.DmpDescriptionTemplate; 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.description.DescriptionBuilder; import org.opencdmp.model.builder.dmpblueprint.DmpBlueprintBuilder; import org.opencdmp.model.builder.dmpreference.DmpReferenceBuilder; import org.opencdmp.model.description.Description; diff --git a/backend/core/src/main/java/org/opencdmp/service/description/DescriptionServiceImpl.java b/backend/core/src/main/java/org/opencdmp/service/description/DescriptionServiceImpl.java index 307e4505d..cd79e1b22 100644 --- a/backend/core/src/main/java/org/opencdmp/service/description/DescriptionServiceImpl.java +++ b/backend/core/src/main/java/org/opencdmp/service/description/DescriptionServiceImpl.java @@ -45,7 +45,7 @@ import org.opencdmp.model.DescriptionValidationResult; import org.opencdmp.model.DmpDescriptionTemplate; import org.opencdmp.model.StorageFile; import org.opencdmp.model.UserContactInfo; -import org.opencdmp.model.builder.descriptionproperties.DescriptionBuilder; +import org.opencdmp.model.builder.description.DescriptionBuilder; import org.opencdmp.model.deleter.DescriptionDeleter; import org.opencdmp.model.deleter.DescriptionReferenceDeleter; import org.opencdmp.model.deleter.DescriptionTagDeleter; diff --git a/backend/core/src/main/java/org/opencdmp/service/elastic/ElasticQueryHelperServiceImpl.java b/backend/core/src/main/java/org/opencdmp/service/elastic/ElasticQueryHelperServiceImpl.java index fc7d2bac1..c118f32ca 100644 --- a/backend/core/src/main/java/org/opencdmp/service/elastic/ElasticQueryHelperServiceImpl.java +++ b/backend/core/src/main/java/org/opencdmp/service/elastic/ElasticQueryHelperServiceImpl.java @@ -13,7 +13,7 @@ import org.opencdmp.model.PublicDescription; import org.opencdmp.model.PublicDmp; import org.opencdmp.model.builder.PublicDescriptionBuilder; import org.opencdmp.model.builder.PublicDmpBuilder; -import org.opencdmp.model.builder.descriptionproperties.DescriptionBuilder; +import org.opencdmp.model.builder.description.DescriptionBuilder; import org.opencdmp.model.builder.dmp.DmpBuilder; import org.opencdmp.model.description.Description; import org.opencdmp.model.dmp.Dmp; diff --git a/backend/web/src/main/java/org/opencdmp/controllers/DescriptionController.java b/backend/web/src/main/java/org/opencdmp/controllers/DescriptionController.java index fb0e918c6..abce7847c 100644 --- a/backend/web/src/main/java/org/opencdmp/controllers/DescriptionController.java +++ b/backend/web/src/main/java/org/opencdmp/controllers/DescriptionController.java @@ -23,7 +23,7 @@ import org.opencdmp.model.DescriptionValidationResult; import org.opencdmp.model.PublicDescription; import org.opencdmp.model.StorageFile; import org.opencdmp.model.builder.PublicDescriptionBuilder; -import org.opencdmp.model.builder.descriptionproperties.DescriptionBuilder; +import org.opencdmp.model.builder.description.DescriptionBuilder; import org.opencdmp.model.censorship.PublicDescriptionCensor; import org.opencdmp.model.censorship.description.DescriptionCensor; import org.opencdmp.model.description.Description; diff --git a/backend/web/src/main/java/org/opencdmp/controllers/publicapi/PublicDatasetsDescriptionDocumentation.java b/backend/web/src/main/java/org/opencdmp/controllers/publicapi/PublicDatasetsDescriptionDocumentation.java index 07c697792..42e638c32 100644 --- a/backend/web/src/main/java/org/opencdmp/controllers/publicapi/PublicDatasetsDescriptionDocumentation.java +++ b/backend/web/src/main/java/org/opencdmp/controllers/publicapi/PublicDatasetsDescriptionDocumentation.java @@ -20,7 +20,7 @@ import org.opencdmp.controllers.publicapi.types.ApiMessageCode; import org.opencdmp.controllers.publicapi.types.ResponseItem; import org.opencdmp.data.DescriptionEntity; import org.opencdmp.model.DmpUser; -import org.opencdmp.model.builder.descriptionproperties.DescriptionBuilder; +import org.opencdmp.model.builder.description.DescriptionBuilder; import org.opencdmp.model.builder.dmp.DmpBuilder; import org.opencdmp.model.description.Description; import org.opencdmp.model.descriptionreference.DescriptionReference;