From 86457c34b0b19473ab81eeb4592eff067b83f53f Mon Sep 17 00:00:00 2001 From: Matteo Saloni Date: Mon, 18 Nov 2024 17:55:08 +0100 Subject: [PATCH] chore: repackage commons --- .../components/cloud/RunCloudListener.java | 4 +-- .../processors/ProcessorRegistry.java | 3 +- .../runtimes/RuntimeFactory.java | 5 ++-- .../specs/SpecExportRunner.java | 2 +- .../specs/SpecRegistryImpl.java | 2 +- .../infrastructure/specs/SpecTypeScanner.java | 2 +- .../core/components/label/LabelComponent.java | 2 +- .../core/components/run/RunManager.java | 10 +++---- .../run/RunTransitionsProcessor.java | 4 +-- .../core/config/InfrastructureConfig.java | 4 +-- .../core/config/PersistenceConfig.java | 20 ++++++------- .../core/config/SecurityConfig.java | 2 +- .../core/config/WebSocketConfig.java | 2 +- .../v1/base/ArtifactController.java | 2 +- .../v1/base/DataItemController.java | 2 +- .../v1/base/FunctionController.java | 2 +- .../controllers/v1/base/LogController.java | 2 +- .../controllers/v1/base/ModelController.java | 2 +- .../v1/base/ProjectController.java | 4 +-- .../controllers/v1/base/RunController.java | 2 +- .../controllers/v1/base/SchemaController.java | 2 +- .../controllers/v1/base/SecretController.java | 2 +- .../controllers/v1/base/TaskController.java | 2 +- .../v1/base/WorkflowController.java | 2 +- .../v1/context/ArtifactContextController.java | 10 +++---- .../v1/context/DataItemContextController.java | 10 +++---- .../v1/context/FunctionContextController.java | 6 ++-- .../v1/context/LabelContextController.java | 2 +- .../v1/context/LogContextController.java | 2 +- .../v1/context/ModelContextController.java | 10 +++---- .../v1/context/RunContextController.java | 8 +++--- .../v1/context/SchemaContextController.java | 2 +- .../v1/context/SecretContextController.java | 2 +- .../v1/context/TaskContextController.java | 4 +-- .../v1/context/WorkflowContextController.java | 6 ++-- .../builders/artifact/ArtifactDTOBuilder.java | 2 +- .../artifact/ArtifactEntityBuilder.java | 2 +- .../builders/dataitem/DataItemDTOBuilder.java | 2 +- .../dataitem/DataItemEntityBuilder.java | 2 +- .../builders/files/FilesInfoDTOBuilder.java | 4 +-- .../files/FilesInfoEntityBuilder.java | 2 +- .../builders/function/FunctionDTOBuilder.java | 2 +- .../function/FunctionEntityBuilder.java | 2 +- .../builders/label/LabelDTOBuilder.java | 2 +- .../models/builders/log/LogDTOBuilder.java | 2 +- .../models/builders/log/LogEntityBuilder.java | 4 +-- .../builders/model/ModelDTOBuilder.java | 2 +- .../builders/model/ModelEntityBuilder.java | 2 +- .../builders/project/ProjectDTOBuilder.java | 4 +-- .../project/ProjectEntityBuilder.java | 4 +-- .../models/builders/run/RunDTOBuilder.java | 2 +- .../models/builders/run/RunEntityBuilder.java | 4 +-- .../builders/secret/SecretDTOBuilder.java | 2 +- .../builders/secret/SecretEntityBuilder.java | 2 +- .../models/builders/task/TaskDTOBuilder.java | 2 +- .../builders/task/TaskEntityBuilder.java | 6 ++-- .../builders/workflow/WorkflowDTOBuilder.java | 2 +- .../workflow/WorkflowEntityBuilder.java | 2 +- .../indexers/ArtifactEntityIndexer.java | 4 +-- .../models/indexers/BaseEntityIndexer.java | 4 +-- .../indexers/DataItemEntityIndexer.java | 4 +-- .../indexers/FunctionEntityIndexer.java | 4 +-- .../models/indexers/ModelEntityIndexer.java | 4 +-- .../indexers/WorkflowEntityIndexer.java | 4 +-- .../listeners/ArtifactEntityListener.java | 4 +-- .../listeners/DataItemEntityListener.java | 4 +-- .../listeners/FunctionEntityListener.java | 4 +-- .../models/listeners/ModelEntityListener.java | 4 +-- .../models/listeners/RunEntityListener.java | 2 +- .../listeners/WorkflowEntityListener.java | 4 +-- .../services/SearchableArtifactService.java | 2 +- .../services/SearchableDataItemService.java | 2 +- .../services/SearchableFunctionService.java | 2 +- .../services/SearchableLogService.java | 2 +- .../services/SearchableModelService.java | 2 +- .../services/SearchableProjectService.java | 2 +- .../services/SearchableRunService.java | 2 +- .../services/SearchableTaskService.java | 2 +- .../services/SearchableWorkflowService.java | 2 +- .../core/models/schemas/SchemaImpl.java | 3 +- .../specs/artifact/ArtifactArtifactSpec.java | 5 ++-- .../specs/dataitem/DataItemDataItemSpec.java | 5 ++-- .../specs/dataitem/DataItemTableSpec.java | 5 ++-- .../specs/model/HuggingFaceModelSpec.java | 4 +-- .../models/specs/model/MlflowModelSpec.java | 4 +-- .../core/models/specs/model/ModelSpec.java | 4 +-- .../models/specs/model/SKLearnModelSpec.java | 4 +-- .../models/specs/project/ProjectSpec.java | 15 +++++----- .../core/models/specs/run/RunRunSpec.java | 5 ++-- .../models/specs/run/RunTransitionsSpec.java | 3 +- .../models/specs/secret/SecretSecretSpec.java | 5 ++-- .../ArtifactEntityRelationshipsManager.java | 6 ++-- .../DataItemEntityRelationshipsManager.java | 6 ++-- .../EntityRelationshipsManager.java | 2 +- .../EntityRelationshipsService.java | 4 +-- .../FunctionEntityRelationshipsManager.java | 6 ++-- .../ModelEntityRelationshipsManager.java | 6 ++-- .../relationships/RelationshipsManager.java | 2 +- .../RunEntityRelationshipsManager.java | 6 ++-- .../WorkflowEntityRelationshipsManager.java | 6 ++-- .../EntityNameStringConverter.java | 4 ++- .../core/services/ArtifactServiceImpl.java | 18 ++++++------ .../core/services/DataItemServiceImpl.java | 18 ++++++------ .../core/services/FilesInfoServiceImpl.java | 4 +-- .../core/services/FunctionServiceImpl.java | 10 +++---- .../core/services/LabelServiceImpl.java | 2 +- .../core/services/LogServiceImpl.java | 10 +++---- .../core/services/ModelServiceImpl.java | 18 ++++++------ .../core/services/ProjectServiceImpl.java | 16 +++++------ .../core/services/RunServiceImpl.java | 12 ++++---- .../core/services/SecretServiceImpl.java | 8 +++--- .../core/services/TaskServiceImpl.java | 12 ++++---- .../core/services/WorkflowServiceImpl.java | 10 +++---- .../core/websocket/UserNotification.java | 2 +- .../websocket/UserNotificationService.java | 2 +- .../controllers/TokenEndpoint.java | 3 +- .../services/ResourceSharingService.java | 2 +- .../accessors/fields/StatusFieldAccessor.java | 3 +- .../commons/annotations/common/SpecType.java | 3 +- .../commons/infrastructure/RunProcessor.java | 4 +-- .../commons/infrastructure/Runtime.java | 8 +++--- .../{entities => }/artifact/Artifact.java | 10 +++---- .../artifact/ArtifactBaseSpec.java | 2 +- .../commons/models/base/Executable.java | 4 +++ .../{entities => }/dataitem/DataItem.java | 10 +++---- .../dataitem/DataItemBaseSpec.java | 2 +- .../{enums => entities}/EntityName.java | 2 +- .../commons/models/enums/State.java | 2 ++ .../models/{base => files}/FileInfo.java | 2 +- .../{entities => }/files/FilesInfo.java | 3 +- .../{entities => }/function/Function.java | 4 +-- .../function/FunctionBaseSpec.java | 2 +- .../function/FunctionTaskBaseSpec.java | 5 ++-- .../models/{entities => }/label/Label.java | 2 +- .../models/{entities => }/log/Log.java | 10 +++---- .../{entities => }/log/LogBaseSpec.java | 2 +- .../models/{entities => }/log/LogSpec.java | 5 ++-- .../models/metadata/AuditMetadata.java | 3 +- .../commons/models/metadata/BaseMetadata.java | 3 +- .../models/metadata/EmbeddableMetadata.java | 3 +- .../{base => metadata}/MetadataDTO.java | 2 +- .../metadata/RelationshipsMetadata.java | 5 ++-- .../models/metadata/VersioningMetadata.java | 3 +- .../model/HuggingFaceModelSpec.java | 2 +- .../{entities => }/model/MlflowModelSpec.java | 6 ++-- .../models/{entities => }/model/Model.java | 10 +++---- .../{entities => }/model/ModelBaseSpec.java | 2 +- .../{entities => }/model/ModelSpec.java | 2 +- .../model/SKLearnModelSpec.java | 2 +- .../{entities => }/model/mlflow/Dataset.java | 2 +- .../model/mlflow/Signature.java | 2 +- .../{entities => }/project/Project.java | 8 +++--- .../project/ProjectBaseSpec.java | 2 +- .../RelationshipDetail.java | 2 +- .../models/{entities => }/run/Run.java | 10 +++---- .../{entities => }/run/RunBaseSpec.java | 2 +- .../{entities => }/run/RunBaseStatus.java | 2 +- .../models/{entities => }/secret/Secret.java | 10 +++---- .../{entities => }/secret/SecretBaseSpec.java | 2 +- .../models/{base => specs}/SpecDTO.java | 2 +- .../models/{base => status}/StatusDTO.java | 2 +- .../models/{entities => }/task/Task.java | 8 +++--- .../{entities => }/task/TaskBaseSpec.java | 2 +- .../{entities => }/workflow/Workflow.java | 4 +-- .../workflow/WorkflowBaseSpec.java | 2 +- .../workflow/WorkflowTaskBaseSpec.java | 5 ++-- .../commons/services/ArtifactService.java | 2 +- .../commons/services/DataItemService.java | 2 +- .../commons/services/FilesInfoService.java | 4 +-- .../commons/services/FunctionService.java | 4 +-- .../commons/services/LabelService.java | 2 +- .../commons/services/LogService.java | 2 +- .../commons/services/ModelService.java | 2 +- .../commons/services/ProjectService.java | 2 +- .../RelationshipsAwareEntityService.java | 2 +- .../commons/services/RunService.java | 2 +- .../commons/services/SecretService.java | 2 +- .../commons/services/SpecRegistry.java | 2 +- .../commons/services/TaskService.java | 2 +- .../commons/services/WorkflowService.java | 4 +-- .../commons/utils/EmbedUtils.java | 6 ++-- .../commons/utils/LogWriter.java | 28 ------------------- .../files/http/HttpStore.java | 6 ++-- .../files/models}/DownloadInfo.java | 2 +- .../files/models}/UploadInfo.java | 2 +- .../files/s3/S3FilesStore.java | 6 ++-- .../files/service/EntityFilesService.java | 6 ++-- .../files/service/FilesService.java | 6 ++-- .../files/service/FilesStore.java | 6 ++-- .../argo/config/TestConfiguration.java | 2 +- .../framework/k8s/base/K8sBaseRuntime.java | 6 ++-- .../k8s/base/K8sFunctionTaskBaseSpec.java | 3 +- .../k8s/base/K8sWorkflowTaskBaseSpec.java | 3 +- .../framework/k8s/model/K8sRunStatus.java | 4 ++- .../framework/k8s/model/K8sServiceStatus.java | 4 ++- .../k8s/processors/K8sLogProcessor.java | 8 +++--- .../k8s/processors/K8sProcessor.java | 4 +-- .../k8s/processors/K8sServiceProcessor.java | 4 +-- .../models/OpenMetadataMetadata.java | 2 +- .../events/RunnableChangedEvent.java | 2 +- .../events/RunnableMonitorObject.java | 2 +- .../runtime/container/ContainerRuntime.java | 8 +++--- .../runners/ContainerBuildRunner.java | 2 +- .../runners/ContainerDeployRunner.java | 2 +- .../container/runners/ContainerJobRunner.java | 2 +- .../runners/ContainerServeRunner.java | 2 +- .../specs/ContainerBuildTaskSpec.java | 2 +- .../specs/ContainerDeployTaskSpec.java | 2 +- .../specs/ContainerFunctionSpec.java | 4 +-- .../container/specs/ContainerJobTaskSpec.java | 2 +- .../container/specs/ContainerRunSpec.java | 4 +-- .../container/specs/ContainerRunStatus.java | 4 ++- .../specs/ContainerServeTaskSpec.java | 2 +- .../runtime/dbt/DbtRuntime.java | 6 ++-- .../dbt/runners/DbtTransformRunner.java | 2 +- .../runtime/dbt/specs/DbtFunctionSpec.java | 4 +-- .../runtime/dbt/specs/DbtRunSpec.java | 4 +-- .../runtime/dbt/specs/DbtRunStatus.java | 3 +- .../runtime/dbt/specs/DbtTransformSpec.java | 2 +- .../runtime/kfp/KFPRuntime.java | 8 +++--- .../runtime/kfp/runners/KFPBuildRunner.java | 2 +- .../kfp/runners/KFPPipelineRunner.java | 2 +- .../runtime/kfp/specs/KFPBuildTaskSpec.java | 2 +- .../kfp/specs/KFPPipelineTaskSpec.java | 2 +- .../runtime/kfp/specs/KFPRunSpec.java | 4 +-- .../runtime/kfp/specs/KFPRunStatus.java | 3 +- .../runtime/kfp/specs/KFPWorkflowSpec.java | 4 +-- .../huggingface/HuggingfaceServeRunner.java | 8 +++--- .../huggingface/HuggingfaceServeRuntime.java | 6 ++-- .../specs/HuggingfaceServeFunctionSpec.java | 4 +-- .../specs/HuggingfaceServeRunSpec.java | 4 +-- .../specs/HuggingfaceServeTaskSpec.java | 2 +- .../runtime/mlflow/MlflowServeRunner.java | 8 +++--- .../runtime/mlflow/MlflowServeRuntime.java | 6 ++-- .../mlflow/specs/MlflowServeFunctionSpec.java | 4 +-- .../mlflow/specs/MlflowServeRunSpec.java | 4 +-- .../mlflow/specs/MlflowServeTaskSpec.java | 2 +- .../modelserve/specs/ModelServeRunStatus.java | 3 +- .../runtime/sklearn/SklearnServeRunner.java | 10 +++---- .../runtime/sklearn/SklearnServeRuntime.java | 6 ++-- .../specs/SklearnServeFunctionSpec.java | 4 +-- .../sklearn/specs/SklearnServeRunSpec.java | 4 +-- .../sklearn/specs/SklearnServeTaskSpec.java | 2 +- .../runtime/nefertem/NefertemRuntime.java | 6 ++-- .../nefertem/runners/NefertemInferRunner.java | 2 +- .../runners/NefertemMetricRunner.java | 2 +- .../runners/NefertemProfileRunner.java | 2 +- .../runners/NefertemValidateRunner.java | 2 +- .../nefertem/specs/NefertemFunctionSpec.java | 4 +-- .../nefertem/specs/NefertemInferTaskSpec.java | 2 +- .../specs/NefertemMetricTaskSpec.java | 2 +- .../specs/NefertemProfileTaskSpec.java | 2 +- .../nefertem/specs/NefertemRunSpec.java | 4 +-- .../nefertem/specs/NefertemRunStatus.java | 3 +- .../specs/NefertemValidateTaskSpec.java | 2 +- .../runtime/python/PythonRuntime.java | 8 +++--- .../python/runners/PythonBuildRunner.java | 2 +- .../python/runners/PythonJobRunner.java | 2 +- .../python/runners/PythonServeRunner.java | 2 +- .../python/specs/PythonBuildTaskSpec.java | 2 +- .../python/specs/PythonFunctionSpec.java | 4 +-- .../python/specs/PythonJobTaskSpec.java | 2 +- .../runtime/python/specs/PythonRunSpec.java | 4 +-- .../runtime/python/specs/PythonRunStatus.java | 3 +- .../python/specs/PythonServeTaskSpec.java | 2 +- 265 files changed, 554 insertions(+), 541 deletions(-) rename {modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/enums => application/src/main/java/it/smartcommunitylabdhub/core/repositories}/EntityNameStringConverter.java (84%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/artifact/Artifact.java (88%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/artifact/ArtifactBaseSpec.java (91%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/dataitem/DataItem.java (88%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/dataitem/DataItemBaseSpec.java (90%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{enums => entities}/EntityName.java (90%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{base => files}/FileInfo.java (95%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/files/FilesInfo.java (78%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/function/Function.java (94%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/function/FunctionBaseSpec.java (84%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/function/FunctionTaskBaseSpec.java (84%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/label/Label.java (86%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/log/Log.java (87%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/log/LogBaseSpec.java (91%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/log/LogSpec.java (79%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{base => metadata}/MetadataDTO.java (87%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/model/HuggingFaceModelSpec.java (94%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/model/MlflowModelSpec.java (85%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/model/Model.java (88%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/model/ModelBaseSpec.java (93%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/model/ModelSpec.java (92%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/model/SKLearnModelSpec.java (64%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/model/mlflow/Dataset.java (94%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/model/mlflow/Signature.java (89%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/project/Project.java (89%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/project/ProjectBaseSpec.java (89%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{base => relationships}/RelationshipDetail.java (90%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/run/Run.java (88%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/run/RunBaseSpec.java (93%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/run/RunBaseStatus.java (94%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/secret/Secret.java (84%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/secret/SecretBaseSpec.java (93%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{base => specs}/SpecDTO.java (87%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{base => status}/StatusDTO.java (87%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/task/Task.java (86%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/task/TaskBaseSpec.java (85%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/workflow/Workflow.java (94%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/workflow/WorkflowBaseSpec.java (84%) rename modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/{entities => }/workflow/WorkflowTaskBaseSpec.java (84%) delete mode 100644 modules/commons/src/main/java/it/smartcommunitylabdhub/commons/utils/LogWriter.java rename modules/{commons/src/main/java/it/smartcommunitylabdhub/commons/models/base => files/src/main/java/it/smartcommunitylabdhub/files/models}/DownloadInfo.java (91%) rename modules/{commons/src/main/java/it/smartcommunitylabdhub/commons/models/base => files/src/main/java/it/smartcommunitylabdhub/files/models}/UploadInfo.java (91%) rename modules/{commons/src/main/java/it/smartcommunitylabdhub/commons => runtime-base/src/main/java/it/smartcommunitylabdhub/runtimes}/events/RunnableChangedEvent.java (90%) rename modules/{commons/src/main/java/it/smartcommunitylabdhub/commons => runtime-base/src/main/java/it/smartcommunitylabdhub/runtimes}/events/RunnableMonitorObject.java (91%) diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/components/cloud/RunCloudListener.java b/application/src/main/java/it/smartcommunitylabdhub/core/components/cloud/RunCloudListener.java index 00233196..2542cd4d 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/components/cloud/RunCloudListener.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/components/cloud/RunCloudListener.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.components.cloud; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.metadata.AuditMetadata; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.core.websocket.UserNotification; import it.smartcommunitylabdhub.core.websocket.UserNotificationService; import lombok.extern.slf4j.Slf4j; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/processors/ProcessorRegistry.java b/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/processors/ProcessorRegistry.java index 75cb5f64..d21e05bf 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/processors/ProcessorRegistry.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/processors/ProcessorRegistry.java @@ -2,7 +2,8 @@ import it.smartcommunitylabdhub.commons.annotations.common.RunProcessorType; import it.smartcommunitylabdhub.commons.infrastructure.RunProcessor; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/runtimes/RuntimeFactory.java b/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/runtimes/RuntimeFactory.java index b00a1b41..c57f4a56 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/runtimes/RuntimeFactory.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/runtimes/RuntimeFactory.java @@ -4,8 +4,9 @@ import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable; import it.smartcommunitylabdhub.commons.infrastructure.Runtime; import it.smartcommunitylabdhub.commons.models.base.ExecutableBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; + import java.util.List; import java.util.Map; import java.util.function.Function; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecExportRunner.java b/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecExportRunner.java index 09ae6351..526b6150 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecExportRunner.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecExportRunner.java @@ -16,7 +16,7 @@ package it.smartcommunitylabdhub.core.components.infrastructure.specs; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.schemas.Schema; import it.smartcommunitylabdhub.commons.services.SpecRegistry; import java.io.File; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecRegistryImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecRegistryImpl.java index 6417d766..77aaf34a 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecRegistryImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecRegistryImpl.java @@ -4,7 +4,7 @@ import com.github.victools.jsonschema.generator.SchemaGeneratorConfigBuilder; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.infrastructure.SpecFactory; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.schemas.Schema; import it.smartcommunitylabdhub.commons.models.specs.Spec; import it.smartcommunitylabdhub.commons.services.SpecRegistry; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecTypeScanner.java b/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecTypeScanner.java index 19e9b0c4..572953aa 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecTypeScanner.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/components/infrastructure/specs/SpecTypeScanner.java @@ -2,7 +2,7 @@ import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.infrastructure.SpecFactory; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.specs.Spec; import it.smartcommunitylabdhub.commons.services.SpecRegistry; import it.smartcommunitylabdhub.core.CoreApplication; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/components/label/LabelComponent.java b/application/src/main/java/it/smartcommunitylabdhub/core/components/label/LabelComponent.java index 377764e1..c9f0ac47 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/components/label/LabelComponent.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/components/label/LabelComponent.java @@ -1,6 +1,6 @@ package it.smartcommunitylabdhub.core.components.label; -import it.smartcommunitylabdhub.commons.models.entities.label.Label; +import it.smartcommunitylabdhub.commons.models.label.Label; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; import it.smartcommunitylabdhub.commons.services.entities.LabelService; import it.smartcommunitylabdhub.core.models.base.BaseEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/components/run/RunManager.java b/application/src/main/java/it/smartcommunitylabdhub/core/components/run/RunManager.java index cf68037b..3658c75e 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/components/run/RunManager.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/components/run/RunManager.java @@ -14,12 +14,12 @@ import it.smartcommunitylabdhub.commons.infrastructure.Runtime; import it.smartcommunitylabdhub.commons.infrastructure.SecuredRunnable; import it.smartcommunitylabdhub.commons.models.base.ExecutableBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.function.Function; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; +import it.smartcommunitylabdhub.commons.models.task.Task; import it.smartcommunitylabdhub.commons.services.entities.FunctionService; import it.smartcommunitylabdhub.commons.services.entities.RunService; import it.smartcommunitylabdhub.commons.utils.MapUtils; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/components/run/RunTransitionsProcessor.java b/application/src/main/java/it/smartcommunitylabdhub/core/components/run/RunTransitionsProcessor.java index 3a80c075..c52a8c65 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/components/run/RunTransitionsProcessor.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/components/run/RunTransitionsProcessor.java @@ -3,8 +3,8 @@ import it.smartcommunitylabdhub.commons.annotations.common.RunProcessorType; import it.smartcommunitylabdhub.commons.infrastructure.RunProcessor; import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; import it.smartcommunitylabdhub.core.models.specs.run.RunTransitionsSpec; import it.smartcommunitylabdhub.core.models.specs.run.RunTransitionsSpec.Transition; import it.smartcommunitylabdhub.framework.k8s.processors.K8sProcessor; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/config/InfrastructureConfig.java b/application/src/main/java/it/smartcommunitylabdhub/core/config/InfrastructureConfig.java index f66e2b3f..972dc4a7 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/config/InfrastructureConfig.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/config/InfrastructureConfig.java @@ -3,8 +3,8 @@ import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable; import it.smartcommunitylabdhub.commons.infrastructure.Runtime; import it.smartcommunitylabdhub.commons.models.base.ExecutableBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; import it.smartcommunitylabdhub.commons.services.RunnableStore; import it.smartcommunitylabdhub.core.components.infrastructure.runtimes.RuntimeFactory; import it.smartcommunitylabdhub.core.repositories.RunnableRepository; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/config/PersistenceConfig.java b/application/src/main/java/it/smartcommunitylabdhub/core/config/PersistenceConfig.java index 807e1155..ca849cc8 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/config/PersistenceConfig.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/config/PersistenceConfig.java @@ -1,15 +1,15 @@ package it.smartcommunitylabdhub.core.config; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.entities.log.Log; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.secret.Secret; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.function.Function; +import it.smartcommunitylabdhub.commons.models.log.Log; +import it.smartcommunitylabdhub.commons.models.model.Model; +import it.smartcommunitylabdhub.commons.models.project.Project; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.secret.Secret; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.core.models.entities.ArtifactEntity; import it.smartcommunitylabdhub.core.models.entities.DataItemEntity; import it.smartcommunitylabdhub.core.models.entities.FunctionEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/config/SecurityConfig.java b/application/src/main/java/it/smartcommunitylabdhub/core/config/SecurityConfig.java index 91c92cea..d3c76326 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/config/SecurityConfig.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/config/SecurityConfig.java @@ -8,7 +8,7 @@ import it.smartcommunitylabdhub.commons.config.ApplicationProperties; import it.smartcommunitylabdhub.commons.config.SecurityProperties; import it.smartcommunitylabdhub.commons.config.SecurityProperties.JwtAuthenticationProperties; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; +import it.smartcommunitylabdhub.commons.models.project.Project; import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Arrays; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/config/WebSocketConfig.java b/application/src/main/java/it/smartcommunitylabdhub/core/config/WebSocketConfig.java index 5716f84a..b8384823 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/config/WebSocketConfig.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/config/WebSocketConfig.java @@ -4,7 +4,7 @@ import it.smartcommunitylabdhub.commons.config.ApplicationProperties; import it.smartcommunitylabdhub.commons.config.SecurityProperties; import it.smartcommunitylabdhub.commons.config.SecurityProperties.JwtAuthenticationProperties; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.core.websocket.UserNotificationService; import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ArtifactController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ArtifactController.java index 3e0ae682..b6b934d8 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ArtifactController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ArtifactController.java @@ -6,7 +6,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/DataItemController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/DataItemController.java index 49cb6531..8819cdd4 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/DataItemController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/DataItemController.java @@ -6,7 +6,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/FunctionController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/FunctionController.java index 4103e1f5..9e220781 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/FunctionController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/FunctionController.java @@ -6,7 +6,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; +import it.smartcommunitylabdhub.commons.models.function.Function; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/LogController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/LogController.java index d8995cb2..a62c1ed5 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/LogController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/LogController.java @@ -6,7 +6,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.log.Log; +import it.smartcommunitylabdhub.commons.models.log.Log; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ModelController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ModelController.java index ce8a1074..1ae84670 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ModelController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ModelController.java @@ -6,7 +6,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; +import it.smartcommunitylabdhub.commons.models.model.Model; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ProjectController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ProjectController.java index b8960fe4..4309ca0b 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ProjectController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/ProjectController.java @@ -9,9 +9,9 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/RunController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/RunController.java index 0b1fd371..012caa44 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/RunController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/RunController.java @@ -6,8 +6,8 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; import it.smartcommunitylabdhub.core.components.run.RunManager; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/SchemaController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/SchemaController.java index 2d1ea852..ed1f8208 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/SchemaController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/SchemaController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.schemas.Schema; import it.smartcommunitylabdhub.commons.services.SpecRegistry; import it.smartcommunitylabdhub.core.annotations.ApiVersion; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/SecretController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/SecretController.java index 0140b137..28d4c962 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/SecretController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/SecretController.java @@ -6,7 +6,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.secret.Secret; +import it.smartcommunitylabdhub.commons.models.secret.Secret; import it.smartcommunitylabdhub.commons.services.entities.SecretService; import it.smartcommunitylabdhub.core.annotations.ApiVersion; import jakarta.validation.Valid; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/TaskController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/TaskController.java index e3dc9bc6..bea9a05b 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/TaskController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/TaskController.java @@ -6,8 +6,8 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.task.Task; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; import it.smartcommunitylabdhub.core.models.entities.TaskEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/WorkflowController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/WorkflowController.java index 2735d518..b0d6d7c0 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/WorkflowController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/base/WorkflowController.java @@ -6,8 +6,8 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; import it.smartcommunitylabdhub.core.models.entities.WorkflowEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/ArtifactContextController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/ArtifactContextController.java index efec1de5..c10379eb 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/ArtifactContextController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/ArtifactContextController.java @@ -6,18 +6,18 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.DownloadInfo; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.base.UploadInfo; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; import it.smartcommunitylabdhub.core.models.entities.ArtifactEntity; import it.smartcommunitylabdhub.core.models.queries.filters.entities.ArtifactEntityFilter; import it.smartcommunitylabdhub.core.models.queries.services.SearchableArtifactService; +import it.smartcommunitylabdhub.files.models.DownloadInfo; +import it.smartcommunitylabdhub.files.models.UploadInfo; import it.smartcommunitylabdhub.files.service.EntityFilesService; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/DataItemContextController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/DataItemContextController.java index 62ac4451..dfc92d87 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/DataItemContextController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/DataItemContextController.java @@ -6,18 +6,18 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.DownloadInfo; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.base.UploadInfo; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; import it.smartcommunitylabdhub.core.models.entities.DataItemEntity; import it.smartcommunitylabdhub.core.models.queries.filters.entities.DataItemEntityFilter; import it.smartcommunitylabdhub.core.models.queries.services.SearchableDataItemService; +import it.smartcommunitylabdhub.files.models.DownloadInfo; +import it.smartcommunitylabdhub.files.models.UploadInfo; import it.smartcommunitylabdhub.files.service.EntityFilesService; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/FunctionContextController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/FunctionContextController.java index 13b62e8b..98e8170f 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/FunctionContextController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/FunctionContextController.java @@ -6,10 +6,10 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; +import it.smartcommunitylabdhub.commons.models.function.Function; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; +import it.smartcommunitylabdhub.commons.models.task.Task; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/LabelContextController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/LabelContextController.java index a7ed63d5..6f273bbc 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/LabelContextController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/LabelContextController.java @@ -3,7 +3,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import it.smartcommunitylabdhub.commons.Keys; -import it.smartcommunitylabdhub.commons.models.entities.label.Label; +import it.smartcommunitylabdhub.commons.models.label.Label; import it.smartcommunitylabdhub.commons.services.entities.LabelService; import it.smartcommunitylabdhub.core.annotations.ApiVersion; import jakarta.validation.Valid; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/LogContextController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/LogContextController.java index 384d9dd4..83893d52 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/LogContextController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/LogContextController.java @@ -6,7 +6,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.log.Log; +import it.smartcommunitylabdhub.commons.models.log.Log; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; import it.smartcommunitylabdhub.commons.services.entities.RunService; import it.smartcommunitylabdhub.core.ApplicationKeys; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/ModelContextController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/ModelContextController.java index 1bd78b61..e14b12aa 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/ModelContextController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/ModelContextController.java @@ -6,18 +6,18 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.DownloadInfo; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.base.UploadInfo; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; +import it.smartcommunitylabdhub.commons.models.model.Model; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; import it.smartcommunitylabdhub.core.models.entities.ModelEntity; import it.smartcommunitylabdhub.core.models.queries.filters.entities.ModelEntityFilter; import it.smartcommunitylabdhub.core.models.queries.services.SearchableModelService; +import it.smartcommunitylabdhub.files.models.DownloadInfo; +import it.smartcommunitylabdhub.files.models.UploadInfo; import it.smartcommunitylabdhub.files.service.EntityFilesService; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/RunContextController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/RunContextController.java index 00796f4d..5ce4f1fe 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/RunContextController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/RunContextController.java @@ -6,11 +6,11 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.log.Log; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; +import it.smartcommunitylabdhub.commons.models.log.Log; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; import it.smartcommunitylabdhub.commons.services.LogService; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.core.ApplicationKeys; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/SchemaContextController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/SchemaContextController.java index a0a635ce..610448e4 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/SchemaContextController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/SchemaContextController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.schemas.Schema; import it.smartcommunitylabdhub.commons.services.SpecRegistry; import it.smartcommunitylabdhub.core.annotations.ApiVersion; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/SecretContextController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/SecretContextController.java index f05ca177..1fcb7272 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/SecretContextController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/SecretContextController.java @@ -6,7 +6,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.secret.Secret; +import it.smartcommunitylabdhub.commons.models.secret.Secret; import it.smartcommunitylabdhub.commons.services.entities.SecretService; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/TaskContextController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/TaskContextController.java index 4c3f39aa..5e7a8861 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/TaskContextController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/TaskContextController.java @@ -6,9 +6,9 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.task.Task; import it.smartcommunitylabdhub.commons.services.entities.RunService; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/WorkflowContextController.java b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/WorkflowContextController.java index 7d85369d..6f51ebb5 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/WorkflowContextController.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/controllers/v1/context/WorkflowContextController.java @@ -6,10 +6,10 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.core.ApplicationKeys; import it.smartcommunitylabdhub.core.annotations.ApiVersion; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/artifact/ArtifactDTOBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/artifact/ArtifactDTOBuilder.java index 8bc19f02..31436e11 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/artifact/ArtifactDTOBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/artifact/ArtifactDTOBuilder.java @@ -1,6 +1,6 @@ package it.smartcommunitylabdhub.core.models.builders.artifact; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; import it.smartcommunitylabdhub.commons.models.metadata.EmbeddableMetadata; import it.smartcommunitylabdhub.commons.utils.MapUtils; import it.smartcommunitylabdhub.core.models.entities.ArtifactEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/artifact/ArtifactEntityBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/artifact/ArtifactEntityBuilder.java index 95b15dad..2a305480 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/artifact/ArtifactEntityBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/artifact/ArtifactEntityBuilder.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.builders.artifact; import it.smartcommunitylabdhub.commons.accessors.fields.StatusFieldAccessor; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; import it.smartcommunitylabdhub.commons.models.metadata.EmbeddableMetadata; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/dataitem/DataItemDTOBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/dataitem/DataItemDTOBuilder.java index e8517ebe..07e68249 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/dataitem/DataItemDTOBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/dataitem/DataItemDTOBuilder.java @@ -1,6 +1,6 @@ package it.smartcommunitylabdhub.core.models.builders.dataitem; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; import it.smartcommunitylabdhub.commons.models.metadata.EmbeddableMetadata; import it.smartcommunitylabdhub.commons.utils.MapUtils; import it.smartcommunitylabdhub.core.models.entities.DataItemEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/dataitem/DataItemEntityBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/dataitem/DataItemEntityBuilder.java index 56da03ac..6b5c1c9a 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/dataitem/DataItemEntityBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/dataitem/DataItemEntityBuilder.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.builders.dataitem; import it.smartcommunitylabdhub.commons.accessors.fields.StatusFieldAccessor; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; import it.smartcommunitylabdhub.commons.models.metadata.EmbeddableMetadata; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/files/FilesInfoDTOBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/files/FilesInfoDTOBuilder.java index 17705e9d..690a2f26 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/files/FilesInfoDTOBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/files/FilesInfoDTOBuilder.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import it.smartcommunitylabdhub.commons.jackson.JacksonMapper; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.entities.files.FilesInfo; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; +import it.smartcommunitylabdhub.commons.models.files.FilesInfo; import it.smartcommunitylabdhub.core.models.entities.FilesInfoEntity; import java.io.IOException; import java.util.List; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/files/FilesInfoEntityBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/files/FilesInfoEntityBuilder.java index 4c288164..52e88813 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/files/FilesInfoEntityBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/files/FilesInfoEntityBuilder.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import it.smartcommunitylabdhub.commons.jackson.JacksonMapper; -import it.smartcommunitylabdhub.commons.models.entities.files.FilesInfo; +import it.smartcommunitylabdhub.commons.models.files.FilesInfo; import it.smartcommunitylabdhub.core.models.entities.FilesInfoEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.core.convert.converter.Converter; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/function/FunctionDTOBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/function/FunctionDTOBuilder.java index f187d920..0020ab70 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/function/FunctionDTOBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/function/FunctionDTOBuilder.java @@ -1,6 +1,6 @@ package it.smartcommunitylabdhub.core.models.builders.function; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; +import it.smartcommunitylabdhub.commons.models.function.Function; import it.smartcommunitylabdhub.commons.models.metadata.EmbeddableMetadata; import it.smartcommunitylabdhub.commons.utils.MapUtils; import it.smartcommunitylabdhub.core.models.entities.FunctionEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/function/FunctionEntityBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/function/FunctionEntityBuilder.java index cbd350f6..9990c0b7 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/function/FunctionEntityBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/function/FunctionEntityBuilder.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.models.builders.function; import it.smartcommunitylabdhub.commons.accessors.fields.StatusFieldAccessor; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.function.Function; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; import it.smartcommunitylabdhub.commons.models.metadata.EmbeddableMetadata; import it.smartcommunitylabdhub.core.models.entities.FunctionEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/label/LabelDTOBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/label/LabelDTOBuilder.java index 3571a257..dcda5f68 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/label/LabelDTOBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/label/LabelDTOBuilder.java @@ -1,6 +1,6 @@ package it.smartcommunitylabdhub.core.models.builders.label; -import it.smartcommunitylabdhub.commons.models.entities.label.Label; +import it.smartcommunitylabdhub.commons.models.label.Label; import it.smartcommunitylabdhub.core.models.entities.LabelEntity; import org.springframework.stereotype.Component; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/log/LogDTOBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/log/LogDTOBuilder.java index 43d7be6f..419e0c98 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/log/LogDTOBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/log/LogDTOBuilder.java @@ -1,6 +1,6 @@ package it.smartcommunitylabdhub.core.models.builders.log; -import it.smartcommunitylabdhub.commons.models.entities.log.Log; +import it.smartcommunitylabdhub.commons.models.log.Log; import it.smartcommunitylabdhub.commons.utils.MapUtils; import it.smartcommunitylabdhub.core.models.entities.LogEntity; import it.smartcommunitylabdhub.core.models.metadata.AuditMetadataBuilder; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/log/LogEntityBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/log/LogEntityBuilder.java index af4cfcc0..162a7cb1 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/log/LogEntityBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/log/LogEntityBuilder.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.builders.log; -import it.smartcommunitylabdhub.commons.models.entities.log.Log; -import it.smartcommunitylabdhub.commons.models.entities.log.LogBaseSpec; +import it.smartcommunitylabdhub.commons.models.log.Log; +import it.smartcommunitylabdhub.commons.models.log.LogBaseSpec; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; import it.smartcommunitylabdhub.core.models.entities.LogEntity; import jakarta.persistence.AttributeConverter; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/model/ModelDTOBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/model/ModelDTOBuilder.java index 1aa722bf..4396044b 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/model/ModelDTOBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/model/ModelDTOBuilder.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.builders.model; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; import it.smartcommunitylabdhub.commons.models.metadata.EmbeddableMetadata; +import it.smartcommunitylabdhub.commons.models.model.Model; import it.smartcommunitylabdhub.commons.utils.MapUtils; import it.smartcommunitylabdhub.core.models.entities.ModelEntity; import it.smartcommunitylabdhub.core.models.metadata.AuditMetadataBuilder; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/model/ModelEntityBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/model/ModelEntityBuilder.java index 3819e828..ee115fb2 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/model/ModelEntityBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/model/ModelEntityBuilder.java @@ -1,10 +1,10 @@ package it.smartcommunitylabdhub.core.models.builders.model; import it.smartcommunitylabdhub.commons.accessors.fields.StatusFieldAccessor; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; import it.smartcommunitylabdhub.commons.models.metadata.EmbeddableMetadata; +import it.smartcommunitylabdhub.commons.models.model.Model; import it.smartcommunitylabdhub.core.models.entities.ModelEntity; import jakarta.persistence.AttributeConverter; import java.io.Serializable; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/project/ProjectDTOBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/project/ProjectDTOBuilder.java index ba8ed8ff..d4a42130 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/project/ProjectDTOBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/project/ProjectDTOBuilder.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.builders.project; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.entities.project.ProjectBaseSpec; +import it.smartcommunitylabdhub.commons.models.project.Project; +import it.smartcommunitylabdhub.commons.models.project.ProjectBaseSpec; import it.smartcommunitylabdhub.commons.utils.MapUtils; import it.smartcommunitylabdhub.core.models.entities.ProjectEntity; import it.smartcommunitylabdhub.core.models.metadata.AuditMetadataBuilder; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/project/ProjectEntityBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/project/ProjectEntityBuilder.java index 22baf42b..f61ae4d2 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/project/ProjectEntityBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/project/ProjectEntityBuilder.java @@ -1,10 +1,10 @@ package it.smartcommunitylabdhub.core.models.builders.project; import it.smartcommunitylabdhub.commons.accessors.fields.StatusFieldAccessor; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.entities.project.ProjectBaseSpec; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; +import it.smartcommunitylabdhub.commons.models.project.Project; +import it.smartcommunitylabdhub.commons.models.project.ProjectBaseSpec; import it.smartcommunitylabdhub.core.models.entities.ProjectEntity; import jakarta.persistence.AttributeConverter; import java.io.Serializable; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/run/RunDTOBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/run/RunDTOBuilder.java index fccd77ac..4a8ba23d 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/run/RunDTOBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/run/RunDTOBuilder.java @@ -1,6 +1,6 @@ package it.smartcommunitylabdhub.core.models.builders.run; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.commons.utils.MapUtils; import it.smartcommunitylabdhub.core.models.entities.RunEntity; import it.smartcommunitylabdhub.core.models.metadata.AuditMetadataBuilder; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/run/RunEntityBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/run/RunEntityBuilder.java index 8877e691..cbfb24fe 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/run/RunEntityBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/run/RunEntityBuilder.java @@ -1,10 +1,10 @@ package it.smartcommunitylabdhub.core.models.builders.run; import it.smartcommunitylabdhub.commons.accessors.fields.StatusFieldAccessor; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; import it.smartcommunitylabdhub.core.models.entities.RunEntity; import jakarta.persistence.AttributeConverter; import java.io.Serializable; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/secret/SecretDTOBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/secret/SecretDTOBuilder.java index 33e810d4..3854dbb5 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/secret/SecretDTOBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/secret/SecretDTOBuilder.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.builders.secret; -import it.smartcommunitylabdhub.commons.models.entities.secret.Secret; import it.smartcommunitylabdhub.commons.models.metadata.EmbeddableMetadata; +import it.smartcommunitylabdhub.commons.models.secret.Secret; import it.smartcommunitylabdhub.commons.utils.MapUtils; import it.smartcommunitylabdhub.core.models.entities.SecretEntity; import it.smartcommunitylabdhub.core.models.metadata.AuditMetadataBuilder; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/secret/SecretEntityBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/secret/SecretEntityBuilder.java index 221f7936..cd42e3ed 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/secret/SecretEntityBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/secret/SecretEntityBuilder.java @@ -1,10 +1,10 @@ package it.smartcommunitylabdhub.core.models.builders.secret; import it.smartcommunitylabdhub.commons.accessors.fields.StatusFieldAccessor; -import it.smartcommunitylabdhub.commons.models.entities.secret.Secret; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; import it.smartcommunitylabdhub.commons.models.metadata.EmbeddableMetadata; +import it.smartcommunitylabdhub.commons.models.secret.Secret; import it.smartcommunitylabdhub.core.models.entities.SecretEntity; import jakarta.persistence.AttributeConverter; import java.io.Serializable; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/task/TaskDTOBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/task/TaskDTOBuilder.java index 6b1eea69..e0ddf3a1 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/task/TaskDTOBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/task/TaskDTOBuilder.java @@ -1,6 +1,6 @@ package it.smartcommunitylabdhub.core.models.builders.task; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; +import it.smartcommunitylabdhub.commons.models.task.Task; import it.smartcommunitylabdhub.core.models.entities.TaskEntity; import it.smartcommunitylabdhub.core.models.metadata.AuditMetadataBuilder; import it.smartcommunitylabdhub.core.models.metadata.BaseMetadataBuilder; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/task/TaskEntityBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/task/TaskEntityBuilder.java index cd48ebaa..76b90b71 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/task/TaskEntityBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/task/TaskEntityBuilder.java @@ -1,9 +1,9 @@ package it.smartcommunitylabdhub.core.models.builders.task; -import it.smartcommunitylabdhub.commons.models.entities.function.FunctionTaskBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.workflow.WorkflowTaskBaseSpec; +import it.smartcommunitylabdhub.commons.models.function.FunctionTaskBaseSpec; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.workflow.WorkflowTaskBaseSpec; import it.smartcommunitylabdhub.core.models.entities.TaskEntity; import jakarta.persistence.AttributeConverter; import java.io.Serializable; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/workflow/WorkflowDTOBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/workflow/WorkflowDTOBuilder.java index 3a4a7319..26f3e1df 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/workflow/WorkflowDTOBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/workflow/WorkflowDTOBuilder.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.builders.workflow; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; import it.smartcommunitylabdhub.commons.models.metadata.EmbeddableMetadata; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.commons.utils.MapUtils; import it.smartcommunitylabdhub.core.models.entities.WorkflowEntity; import it.smartcommunitylabdhub.core.models.metadata.AuditMetadataBuilder; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/workflow/WorkflowEntityBuilder.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/workflow/WorkflowEntityBuilder.java index 81475ab8..7ab2aa3c 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/workflow/WorkflowEntityBuilder.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/builders/workflow/WorkflowEntityBuilder.java @@ -1,10 +1,10 @@ package it.smartcommunitylabdhub.core.models.builders.workflow; import it.smartcommunitylabdhub.commons.accessors.fields.StatusFieldAccessor; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; import it.smartcommunitylabdhub.commons.models.metadata.EmbeddableMetadata; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.core.models.entities.WorkflowEntity; import jakarta.persistence.AttributeConverter; import java.io.Serializable; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/ArtifactEntityIndexer.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/ArtifactEntityIndexer.java index 20dc8d28..b1a6c081 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/ArtifactEntityIndexer.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/ArtifactEntityIndexer.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.models.indexers; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.metadata.VersioningMetadata; import it.smartcommunitylabdhub.core.components.solr.IndexField; import it.smartcommunitylabdhub.core.models.builders.artifact.ArtifactDTOBuilder; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/BaseEntityIndexer.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/BaseEntityIndexer.java index ee3f837f..7c8584f6 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/BaseEntityIndexer.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/BaseEntityIndexer.java @@ -2,10 +2,10 @@ import it.smartcommunitylabdhub.commons.accessors.fields.StatusFieldAccessor; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.MetadataDTO; -import it.smartcommunitylabdhub.commons.models.base.StatusDTO; import it.smartcommunitylabdhub.commons.models.metadata.AuditMetadata; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; +import it.smartcommunitylabdhub.commons.models.metadata.MetadataDTO; +import it.smartcommunitylabdhub.commons.models.status.StatusDTO; import it.smartcommunitylabdhub.core.components.solr.IndexField; import it.smartcommunitylabdhub.core.components.solr.SolrBaseEntityParser; import it.smartcommunitylabdhub.core.components.solr.SolrComponent; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/DataItemEntityIndexer.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/DataItemEntityIndexer.java index 47fdee70..f1d7c5b2 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/DataItemEntityIndexer.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/DataItemEntityIndexer.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.models.indexers; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.metadata.VersioningMetadata; import it.smartcommunitylabdhub.core.components.solr.IndexField; import it.smartcommunitylabdhub.core.models.builders.dataitem.DataItemDTOBuilder; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/FunctionEntityIndexer.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/FunctionEntityIndexer.java index 8b33e3d0..62b3811c 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/FunctionEntityIndexer.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/FunctionEntityIndexer.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.models.indexers; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.Function; import it.smartcommunitylabdhub.commons.models.metadata.VersioningMetadata; import it.smartcommunitylabdhub.core.components.solr.IndexField; import it.smartcommunitylabdhub.core.models.builders.function.FunctionDTOBuilder; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/ModelEntityIndexer.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/ModelEntityIndexer.java index 03ca5ee8..18f96b4c 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/ModelEntityIndexer.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/ModelEntityIndexer.java @@ -1,9 +1,9 @@ package it.smartcommunitylabdhub.core.models.indexers; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.metadata.VersioningMetadata; +import it.smartcommunitylabdhub.commons.models.model.Model; import it.smartcommunitylabdhub.core.components.solr.IndexField; import it.smartcommunitylabdhub.core.models.builders.model.ModelDTOBuilder; import it.smartcommunitylabdhub.core.models.entities.ModelEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/WorkflowEntityIndexer.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/WorkflowEntityIndexer.java index 564a911d..2e2a2a48 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/WorkflowEntityIndexer.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/indexers/WorkflowEntityIndexer.java @@ -1,9 +1,9 @@ package it.smartcommunitylabdhub.core.models.indexers; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.metadata.VersioningMetadata; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.core.components.solr.IndexField; import it.smartcommunitylabdhub.core.models.builders.workflow.WorkflowDTOBuilder; import it.smartcommunitylabdhub.core.models.entities.WorkflowEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/ArtifactEntityListener.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/ArtifactEntityListener.java index 41c77c45..3f7ae733 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/ArtifactEntityListener.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/ArtifactEntityListener.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.models.listeners; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.core.models.entities.ArtifactEntity; import it.smartcommunitylabdhub.core.models.entities.ProjectEntity; import it.smartcommunitylabdhub.core.models.events.EntityEvent; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/DataItemEntityListener.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/DataItemEntityListener.java index f06ac88b..6ed204f1 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/DataItemEntityListener.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/DataItemEntityListener.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.models.listeners; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.core.models.entities.DataItemEntity; import it.smartcommunitylabdhub.core.models.entities.ProjectEntity; import it.smartcommunitylabdhub.core.models.events.EntityEvent; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/FunctionEntityListener.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/FunctionEntityListener.java index bea4bae8..02de2b48 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/FunctionEntityListener.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/FunctionEntityListener.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.models.listeners; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; +import it.smartcommunitylabdhub.commons.models.function.Function; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.core.models.entities.FunctionEntity; import it.smartcommunitylabdhub.core.models.entities.ProjectEntity; import it.smartcommunitylabdhub.core.models.events.EntityEvent; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/ModelEntityListener.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/ModelEntityListener.java index e759cf20..220f8611 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/ModelEntityListener.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/ModelEntityListener.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.models.listeners; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; +import it.smartcommunitylabdhub.commons.models.model.Model; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.core.models.entities.ModelEntity; import it.smartcommunitylabdhub.core.models.entities.ProjectEntity; import it.smartcommunitylabdhub.core.models.events.EntityEvent; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/RunEntityListener.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/RunEntityListener.java index 482787b5..1a048850 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/RunEntityListener.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/RunEntityListener.java @@ -1,6 +1,6 @@ package it.smartcommunitylabdhub.core.models.listeners; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.core.components.run.RunManager; import it.smartcommunitylabdhub.core.models.entities.RunEntity; import it.smartcommunitylabdhub.core.models.events.EntityAction; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/WorkflowEntityListener.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/WorkflowEntityListener.java index 320eeaae..cb208b2a 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/WorkflowEntityListener.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/listeners/WorkflowEntityListener.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.models.listeners; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; +import it.smartcommunitylabdhub.commons.models.project.Project; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.core.models.entities.ProjectEntity; import it.smartcommunitylabdhub.core.models.entities.WorkflowEntity; import it.smartcommunitylabdhub.core.models.events.EntityEvent; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableArtifactService.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableArtifactService.java index 1639e202..4d324ce7 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableArtifactService.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableArtifactService.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.queries.services; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; import it.smartcommunitylabdhub.commons.services.entities.ArtifactService; import it.smartcommunitylabdhub.core.models.entities.ArtifactEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableDataItemService.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableDataItemService.java index cf353f64..4775053c 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableDataItemService.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableDataItemService.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.queries.services; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; import it.smartcommunitylabdhub.commons.services.entities.DataItemService; import it.smartcommunitylabdhub.core.models.entities.DataItemEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableFunctionService.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableFunctionService.java index d7afca2e..dec03030 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableFunctionService.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableFunctionService.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.queries.services; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; +import it.smartcommunitylabdhub.commons.models.function.Function; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; import it.smartcommunitylabdhub.commons.services.entities.FunctionService; import it.smartcommunitylabdhub.core.models.entities.FunctionEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableLogService.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableLogService.java index 4629b0b3..0f7bceb9 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableLogService.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableLogService.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.queries.services; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.log.Log; +import it.smartcommunitylabdhub.commons.models.log.Log; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; import it.smartcommunitylabdhub.commons.services.LogService; import it.smartcommunitylabdhub.core.models.entities.LogEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableModelService.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableModelService.java index e6824fa6..b05599bd 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableModelService.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableModelService.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.queries.services; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; +import it.smartcommunitylabdhub.commons.models.model.Model; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; import it.smartcommunitylabdhub.commons.services.entities.ModelService; import it.smartcommunitylabdhub.core.models.entities.ModelEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableProjectService.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableProjectService.java index a67da5b3..f72b551f 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableProjectService.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableProjectService.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.queries.services; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; import it.smartcommunitylabdhub.commons.services.entities.ProjectService; import it.smartcommunitylabdhub.core.models.entities.ProjectEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableRunService.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableRunService.java index 5400d90e..cc56edf4 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableRunService.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableRunService.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.models.queries.services; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.commons.services.entities.RunService; import it.smartcommunitylabdhub.core.models.entities.RunEntity; import jakarta.annotation.Nullable; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableTaskService.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableTaskService.java index 5d6a7ca4..24b28a34 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableTaskService.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableTaskService.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.models.queries.services; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.task.Task; import it.smartcommunitylabdhub.commons.services.entities.TaskService; import it.smartcommunitylabdhub.core.models.entities.TaskEntity; import jakarta.annotation.Nullable; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableWorkflowService.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableWorkflowService.java index 0f61f29c..eb62ee31 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableWorkflowService.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/queries/services/SearchableWorkflowService.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.models.queries.services; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.commons.services.entities.WorkflowService; import it.smartcommunitylabdhub.core.models.entities.WorkflowEntity; import jakarta.annotation.Nullable; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/schemas/SchemaImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/schemas/SchemaImpl.java index 227c7302..f77d5854 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/schemas/SchemaImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/schemas/SchemaImpl.java @@ -2,7 +2,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.JsonNode; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; + +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.schemas.Schema; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/artifact/ArtifactArtifactSpec.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/artifact/ArtifactArtifactSpec.java index f8ec892f..82121b55 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/artifact/ArtifactArtifactSpec.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/artifact/ArtifactArtifactSpec.java @@ -1,8 +1,9 @@ package it.smartcommunitylabdhub.core.models.specs.artifact; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.artifact.ArtifactBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.artifact.ArtifactBaseSpec; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; + import java.io.Serializable; import java.util.Map; import lombok.Getter; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/dataitem/DataItemDataItemSpec.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/dataitem/DataItemDataItemSpec.java index 32e75216..163f9c73 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/dataitem/DataItemDataItemSpec.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/dataitem/DataItemDataItemSpec.java @@ -1,8 +1,9 @@ package it.smartcommunitylabdhub.core.models.specs.dataitem; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItemBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItemBaseSpec; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; + import java.io.Serializable; import java.util.Map; import lombok.Getter; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/dataitem/DataItemTableSpec.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/dataitem/DataItemTableSpec.java index 15b3992a..2f8beb56 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/dataitem/DataItemTableSpec.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/dataitem/DataItemTableSpec.java @@ -1,8 +1,9 @@ package it.smartcommunitylabdhub.core.models.specs.dataitem; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItemBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItemBaseSpec; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; + import java.io.Serializable; import java.util.Map; import lombok.Getter; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/HuggingFaceModelSpec.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/HuggingFaceModelSpec.java index cf663f4a..be2658a0 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/HuggingFaceModelSpec.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/HuggingFaceModelSpec.java @@ -3,9 +3,9 @@ import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; @SpecType(kind = "huggingface", entity = EntityName.MODEL) -public class HuggingFaceModelSpec extends it.smartcommunitylabdhub.commons.models.entities.model.HuggingFaceModelSpec { +public class HuggingFaceModelSpec extends it.smartcommunitylabdhub.commons.models.model.HuggingFaceModelSpec { } diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/MlflowModelSpec.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/MlflowModelSpec.java index 3ff85511..92a16845 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/MlflowModelSpec.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/MlflowModelSpec.java @@ -2,8 +2,8 @@ import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; @SpecType(kind = "mlflow", entity = EntityName.MODEL) -public class MlflowModelSpec extends it.smartcommunitylabdhub.commons.models.entities.model.MlflowModelSpec { +public class MlflowModelSpec extends it.smartcommunitylabdhub.commons.models.model.MlflowModelSpec { } \ No newline at end of file diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/ModelSpec.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/ModelSpec.java index 000c05d5..cdf1ed5f 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/ModelSpec.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/ModelSpec.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.models.specs.model; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; @SpecType(kind = "model", entity = EntityName.MODEL) -public class ModelSpec extends it.smartcommunitylabdhub.commons.models.entities.model.ModelBaseSpec { +public class ModelSpec extends it.smartcommunitylabdhub.commons.models.model.ModelBaseSpec { } diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/SKLearnModelSpec.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/SKLearnModelSpec.java index 820a6ba5..d0a3a926 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/SKLearnModelSpec.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/SKLearnModelSpec.java @@ -2,8 +2,8 @@ import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; @SpecType(kind = "sklearn", entity = EntityName.MODEL) -public class SKLearnModelSpec extends it.smartcommunitylabdhub.commons.models.entities.model.SKLearnModelSpec { +public class SKLearnModelSpec extends it.smartcommunitylabdhub.commons.models.model.SKLearnModelSpec { } \ No newline at end of file diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/project/ProjectSpec.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/project/ProjectSpec.java index 4573cf81..2e9eb714 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/project/ProjectSpec.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/project/ProjectSpec.java @@ -1,13 +1,14 @@ package it.smartcommunitylabdhub.core.models.specs.project; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; -import it.smartcommunitylabdhub.commons.models.entities.project.ProjectBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.Function; +import it.smartcommunitylabdhub.commons.models.model.Model; +import it.smartcommunitylabdhub.commons.models.project.ProjectBaseSpec; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/run/RunRunSpec.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/run/RunRunSpec.java index e677d410..73833f1f 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/run/RunRunSpec.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/run/RunRunSpec.java @@ -1,8 +1,9 @@ package it.smartcommunitylabdhub.core.models.specs.run; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; + import java.io.Serializable; import java.util.Map; import lombok.Getter; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/run/RunTransitionsSpec.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/run/RunTransitionsSpec.java index aa2cf231..563c4bc7 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/run/RunTransitionsSpec.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/run/RunTransitionsSpec.java @@ -2,7 +2,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; + +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; import it.smartcommunitylabdhub.core.fsm.RunEvent; import java.io.Serializable; import java.time.OffsetDateTime; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/secret/SecretSecretSpec.java b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/secret/SecretSecretSpec.java index 937284d7..a0d48e58 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/secret/SecretSecretSpec.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/models/specs/secret/SecretSecretSpec.java @@ -1,8 +1,9 @@ package it.smartcommunitylabdhub.core.models.specs.secret; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.secret.SecretBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.secret.SecretBaseSpec; + import java.io.Serializable; import java.util.Map; import lombok.Getter; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/ArtifactEntityRelationshipsManager.java b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/ArtifactEntityRelationshipsManager.java index cd4f9ba2..78bb2bd2 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/ArtifactEntityRelationshipsManager.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/ArtifactEntityRelationshipsManager.java @@ -1,10 +1,10 @@ package it.smartcommunitylabdhub.core.relationships; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.metadata.RelationshipsMetadata; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.core.models.builders.artifact.ArtifactDTOBuilder; import it.smartcommunitylabdhub.core.models.entities.ArtifactEntity; import it.smartcommunitylabdhub.core.models.entities.RelationshipEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/DataItemEntityRelationshipsManager.java b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/DataItemEntityRelationshipsManager.java index 3ea6b46e..573c94dd 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/DataItemEntityRelationshipsManager.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/DataItemEntityRelationshipsManager.java @@ -1,10 +1,10 @@ package it.smartcommunitylabdhub.core.relationships; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.metadata.RelationshipsMetadata; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.core.models.builders.dataitem.DataItemDTOBuilder; import it.smartcommunitylabdhub.core.models.entities.DataItemEntity; import it.smartcommunitylabdhub.core.models.entities.RelationshipEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/EntityRelationshipsManager.java b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/EntityRelationshipsManager.java index 55b4f424..89e9b65c 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/EntityRelationshipsManager.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/EntityRelationshipsManager.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.relationships; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.core.models.base.BaseEntity; import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/EntityRelationshipsService.java b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/EntityRelationshipsService.java index 52ce1a8f..7a538cef 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/EntityRelationshipsService.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/EntityRelationshipsService.java @@ -2,8 +2,8 @@ import it.smartcommunitylabdhub.commons.accessors.fields.KeyAccessor; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.core.models.entities.RelationshipEntity; import it.smartcommunitylabdhub.core.repositories.RelationshipRepository; import jakarta.validation.constraints.NotNull; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/FunctionEntityRelationshipsManager.java b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/FunctionEntityRelationshipsManager.java index 2475928e..e3425002 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/FunctionEntityRelationshipsManager.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/FunctionEntityRelationshipsManager.java @@ -1,10 +1,10 @@ package it.smartcommunitylabdhub.core.relationships; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.Function; import it.smartcommunitylabdhub.commons.models.metadata.RelationshipsMetadata; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.core.models.builders.function.FunctionDTOBuilder; import it.smartcommunitylabdhub.core.models.entities.FunctionEntity; import it.smartcommunitylabdhub.core.models.entities.RelationshipEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/ModelEntityRelationshipsManager.java b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/ModelEntityRelationshipsManager.java index 83c591d1..5a4bcafb 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/ModelEntityRelationshipsManager.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/ModelEntityRelationshipsManager.java @@ -1,10 +1,10 @@ package it.smartcommunitylabdhub.core.relationships; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.metadata.RelationshipsMetadata; +import it.smartcommunitylabdhub.commons.models.model.Model; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.core.models.builders.model.ModelDTOBuilder; import it.smartcommunitylabdhub.core.models.entities.ModelEntity; import it.smartcommunitylabdhub.core.models.entities.RelationshipEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/RelationshipsManager.java b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/RelationshipsManager.java index 17663e08..b725261a 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/RelationshipsManager.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/RelationshipsManager.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.core.relationships; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; import it.smartcommunitylabdhub.commons.models.metadata.RelationshipsMetadata; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/RunEntityRelationshipsManager.java b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/RunEntityRelationshipsManager.java index 77127fa1..d0508de5 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/RunEntityRelationshipsManager.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/RunEntityRelationshipsManager.java @@ -1,10 +1,10 @@ package it.smartcommunitylabdhub.core.relationships; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.metadata.RelationshipsMetadata; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.core.models.builders.run.RunDTOBuilder; import it.smartcommunitylabdhub.core.models.entities.RelationshipEntity; import it.smartcommunitylabdhub.core.models.entities.RunEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/WorkflowEntityRelationshipsManager.java b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/WorkflowEntityRelationshipsManager.java index db4853e3..87dae7b1 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/relationships/WorkflowEntityRelationshipsManager.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/relationships/WorkflowEntityRelationshipsManager.java @@ -1,10 +1,10 @@ package it.smartcommunitylabdhub.core.relationships; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.metadata.RelationshipsMetadata; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.core.models.builders.workflow.WorkflowDTOBuilder; import it.smartcommunitylabdhub.core.models.entities.RelationshipEntity; import it.smartcommunitylabdhub.core.models.entities.WorkflowEntity; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/enums/EntityNameStringConverter.java b/application/src/main/java/it/smartcommunitylabdhub/core/repositories/EntityNameStringConverter.java similarity index 84% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/enums/EntityNameStringConverter.java rename to application/src/main/java/it/smartcommunitylabdhub/core/repositories/EntityNameStringConverter.java index bc55d2d1..4f463462 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/enums/EntityNameStringConverter.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/repositories/EntityNameStringConverter.java @@ -1,10 +1,12 @@ -package it.smartcommunitylabdhub.commons.models.enums; +package it.smartcommunitylabdhub.core.repositories; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; import org.springframework.stereotype.Component; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; + @Component public class EntityNameStringConverter implements Converter { diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/services/ArtifactServiceImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/services/ArtifactServiceImpl.java index 9ba84cae..5f55872a 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/services/ArtifactServiceImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/services/ArtifactServiceImpl.java @@ -5,16 +5,14 @@ import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.DownloadInfo; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.base.UploadInfo; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; -import it.smartcommunitylabdhub.commons.models.entities.artifact.ArtifactBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.files.FilesInfo; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.artifact.ArtifactBaseSpec; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; +import it.smartcommunitylabdhub.commons.models.files.FilesInfo; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.commons.models.specs.Spec; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.commons.services.SpecRegistry; @@ -30,6 +28,8 @@ import it.smartcommunitylabdhub.core.models.queries.services.SearchableArtifactService; import it.smartcommunitylabdhub.core.models.queries.specifications.CommonSpecification; import it.smartcommunitylabdhub.core.relationships.ArtifactEntityRelationshipsManager; +import it.smartcommunitylabdhub.files.models.DownloadInfo; +import it.smartcommunitylabdhub.files.models.UploadInfo; import it.smartcommunitylabdhub.files.service.EntityFilesService; import it.smartcommunitylabdhub.files.service.FilesService; import jakarta.validation.constraints.NotNull; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/services/DataItemServiceImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/services/DataItemServiceImpl.java index 2ffc9ce3..4a2339cf 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/services/DataItemServiceImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/services/DataItemServiceImpl.java @@ -5,16 +5,14 @@ import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.DownloadInfo; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.base.UploadInfo; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItemBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.files.FilesInfo; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItemBaseSpec; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; +import it.smartcommunitylabdhub.commons.models.files.FilesInfo; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.commons.models.specs.Spec; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.commons.services.SpecRegistry; @@ -30,6 +28,8 @@ import it.smartcommunitylabdhub.core.models.queries.services.SearchableDataItemService; import it.smartcommunitylabdhub.core.models.queries.specifications.CommonSpecification; import it.smartcommunitylabdhub.core.relationships.DataItemEntityRelationshipsManager; +import it.smartcommunitylabdhub.files.models.DownloadInfo; +import it.smartcommunitylabdhub.files.models.UploadInfo; import it.smartcommunitylabdhub.files.service.EntityFilesService; import it.smartcommunitylabdhub.files.service.FilesService; import jakarta.transaction.Transactional; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/services/FilesInfoServiceImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/services/FilesInfoServiceImpl.java index d462168a..1e66891c 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/services/FilesInfoServiceImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/services/FilesInfoServiceImpl.java @@ -2,8 +2,8 @@ import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.entities.files.FilesInfo; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; +import it.smartcommunitylabdhub.commons.models.files.FilesInfo; import it.smartcommunitylabdhub.commons.services.entities.FilesInfoService; import it.smartcommunitylabdhub.core.models.builders.files.FilesInfoDTOBuilder; import it.smartcommunitylabdhub.core.models.builders.files.FilesInfoEntityBuilder; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/services/FunctionServiceImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/services/FunctionServiceImpl.java index f204bf40..34465f1d 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/services/FunctionServiceImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/services/FunctionServiceImpl.java @@ -5,13 +5,13 @@ import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.Function; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.commons.models.specs.Spec; +import it.smartcommunitylabdhub.commons.models.task.Task; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.commons.services.SpecRegistry; import it.smartcommunitylabdhub.commons.services.entities.TaskService; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/services/LabelServiceImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/services/LabelServiceImpl.java index 35695c6f..70653a10 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/services/LabelServiceImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/services/LabelServiceImpl.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.services; import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; -import it.smartcommunitylabdhub.commons.models.entities.label.Label; +import it.smartcommunitylabdhub.commons.models.label.Label; import it.smartcommunitylabdhub.commons.services.entities.LabelService; import it.smartcommunitylabdhub.core.models.builders.label.LabelDTOBuilder; import it.smartcommunitylabdhub.core.models.entities.LabelEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/services/LogServiceImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/services/LogServiceImpl.java index b7d85060..98ba0a38 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/services/LogServiceImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/services/LogServiceImpl.java @@ -4,12 +4,12 @@ import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.log.Log; -import it.smartcommunitylabdhub.commons.models.entities.log.LogBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.log.Log; +import it.smartcommunitylabdhub.commons.models.log.LogBaseSpec; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.core.models.entities.AbstractEntity_; import it.smartcommunitylabdhub.core.models.entities.LogEntity; import it.smartcommunitylabdhub.core.models.entities.ProjectEntity; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/services/ModelServiceImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/services/ModelServiceImpl.java index e42231b0..cc493e39 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/services/ModelServiceImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/services/ModelServiceImpl.java @@ -5,16 +5,14 @@ import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.DownloadInfo; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.base.UploadInfo; -import it.smartcommunitylabdhub.commons.models.entities.files.FilesInfo; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; -import it.smartcommunitylabdhub.commons.models.entities.model.ModelBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; +import it.smartcommunitylabdhub.commons.models.files.FilesInfo; +import it.smartcommunitylabdhub.commons.models.model.Model; +import it.smartcommunitylabdhub.commons.models.model.ModelBaseSpec; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.commons.models.specs.Spec; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.commons.services.SpecRegistry; @@ -30,6 +28,8 @@ import it.smartcommunitylabdhub.core.models.queries.services.SearchableModelService; import it.smartcommunitylabdhub.core.models.queries.specifications.CommonSpecification; import it.smartcommunitylabdhub.core.relationships.ModelEntityRelationshipsManager; +import it.smartcommunitylabdhub.files.models.DownloadInfo; +import it.smartcommunitylabdhub.files.models.UploadInfo; import it.smartcommunitylabdhub.files.service.EntityFilesService; import it.smartcommunitylabdhub.files.service.FilesService; import jakarta.transaction.Transactional; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/services/ProjectServiceImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/services/ProjectServiceImpl.java index 607cae74..160be09a 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/services/ProjectServiceImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/services/ProjectServiceImpl.java @@ -8,15 +8,15 @@ import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.Function; +import it.smartcommunitylabdhub.commons.models.model.Model; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.commons.services.SpecRegistry; import it.smartcommunitylabdhub.commons.services.entities.ArtifactService; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/services/RunServiceImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/services/RunServiceImpl.java index b19d449b..c6ad9002 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/services/RunServiceImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/services/RunServiceImpl.java @@ -6,15 +6,15 @@ import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.enums.RelationshipName; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; import it.smartcommunitylabdhub.commons.models.specs.Spec; +import it.smartcommunitylabdhub.commons.models.task.Task; import it.smartcommunitylabdhub.commons.services.LogService; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.commons.services.SpecRegistry; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/services/SecretServiceImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/services/SecretServiceImpl.java index d18b961f..9e6bd633 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/services/SecretServiceImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/services/SecretServiceImpl.java @@ -5,10 +5,10 @@ import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.entities.secret.Secret; -import it.smartcommunitylabdhub.commons.models.entities.secret.SecretBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.project.Project; +import it.smartcommunitylabdhub.commons.models.secret.Secret; +import it.smartcommunitylabdhub.commons.models.secret.SecretBaseSpec; import it.smartcommunitylabdhub.commons.models.specs.Spec; import it.smartcommunitylabdhub.commons.services.SecretsProvider; import it.smartcommunitylabdhub.commons.services.SpecRegistry; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/services/TaskServiceImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/services/TaskServiceImpl.java index 70eaeb1b..cafcb514 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/services/TaskServiceImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/services/TaskServiceImpl.java @@ -6,14 +6,14 @@ import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; import it.smartcommunitylabdhub.commons.models.base.Executable; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.Function; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.commons.models.specs.Spec; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.commons.services.SpecRegistry; import it.smartcommunitylabdhub.commons.services.entities.RunService; import it.smartcommunitylabdhub.core.components.infrastructure.specs.SpecValidator; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/services/WorkflowServiceImpl.java b/application/src/main/java/it/smartcommunitylabdhub/core/services/WorkflowServiceImpl.java index ee6e2e8e..86dbef37 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/services/WorkflowServiceImpl.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/services/WorkflowServiceImpl.java @@ -5,13 +5,13 @@ import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.project.Project; import it.smartcommunitylabdhub.commons.models.queries.SearchFilter; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import it.smartcommunitylabdhub.commons.models.specs.Spec; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.commons.services.RelationshipsAwareEntityService; import it.smartcommunitylabdhub.commons.services.SpecRegistry; import it.smartcommunitylabdhub.commons.services.entities.TaskService; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/websocket/UserNotification.java b/application/src/main/java/it/smartcommunitylabdhub/core/websocket/UserNotification.java index c78a1e95..524cc4d1 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/websocket/UserNotification.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/websocket/UserNotification.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.core.models.events.EntityAction; import jakarta.validation.constraints.NotNull; import java.io.Serializable; diff --git a/application/src/main/java/it/smartcommunitylabdhub/core/websocket/UserNotificationService.java b/application/src/main/java/it/smartcommunitylabdhub/core/websocket/UserNotificationService.java index 0a3b75b9..c6f4b469 100644 --- a/application/src/main/java/it/smartcommunitylabdhub/core/websocket/UserNotificationService.java +++ b/application/src/main/java/it/smartcommunitylabdhub/core/websocket/UserNotificationService.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.core.websocket; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import jakarta.validation.constraints.NotNull; import java.io.Serializable; import lombok.extern.slf4j.Slf4j; diff --git a/modules/authorization/src/main/java/it/smartcommunitylabdhub/authorization/controllers/TokenEndpoint.java b/modules/authorization/src/main/java/it/smartcommunitylabdhub/authorization/controllers/TokenEndpoint.java index 00f8fc91..e693d8f3 100644 --- a/modules/authorization/src/main/java/it/smartcommunitylabdhub/authorization/controllers/TokenEndpoint.java +++ b/modules/authorization/src/main/java/it/smartcommunitylabdhub/authorization/controllers/TokenEndpoint.java @@ -11,7 +11,8 @@ import it.smartcommunitylabdhub.commons.config.ApplicationProperties; import it.smartcommunitylabdhub.commons.config.SecurityProperties; import it.smartcommunitylabdhub.commons.config.SecurityProperties.JwtAuthenticationProperties; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; +import it.smartcommunitylabdhub.commons.models.project.Project; + import java.util.HashSet; import java.util.List; import java.util.Map; diff --git a/modules/authorization/src/main/java/it/smartcommunitylabdhub/authorization/services/ResourceSharingService.java b/modules/authorization/src/main/java/it/smartcommunitylabdhub/authorization/services/ResourceSharingService.java index 7eeb9d32..2dc95a5f 100644 --- a/modules/authorization/src/main/java/it/smartcommunitylabdhub/authorization/services/ResourceSharingService.java +++ b/modules/authorization/src/main/java/it/smartcommunitylabdhub/authorization/services/ResourceSharingService.java @@ -3,7 +3,7 @@ import it.smartcommunitylabdhub.authorization.model.ResourceShareEntity; import it.smartcommunitylabdhub.authorization.repositories.ResourceShareRepository; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Optional; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/accessors/fields/StatusFieldAccessor.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/accessors/fields/StatusFieldAccessor.java index 5f67dc12..38d0acb4 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/accessors/fields/StatusFieldAccessor.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/accessors/fields/StatusFieldAccessor.java @@ -3,7 +3,8 @@ import io.micrometer.common.lang.Nullable; import it.smartcommunitylabdhub.commons.accessors.Accessor; import it.smartcommunitylabdhub.commons.jackson.JacksonMapper; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; + import java.io.Serializable; import java.util.LinkedList; import java.util.List; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/annotations/common/SpecType.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/annotations/common/SpecType.java index 55161745..95e7bf36 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/annotations/common/SpecType.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/annotations/common/SpecType.java @@ -1,12 +1,13 @@ package it.smartcommunitylabdhub.commons.annotations.common; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.stereotype.Indexed; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @Indexed diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/infrastructure/RunProcessor.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/infrastructure/RunProcessor.java index 5cfc0055..90cabeec 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/infrastructure/RunProcessor.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/infrastructure/RunProcessor.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.commons.infrastructure; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; @FunctionalInterface public interface RunProcessor { diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/infrastructure/Runtime.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/infrastructure/Runtime.java index 86104c06..5ae4139f 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/infrastructure/Runtime.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/infrastructure/Runtime.java @@ -2,10 +2,10 @@ import it.smartcommunitylabdhub.commons.models.base.Executable; import it.smartcommunitylabdhub.commons.models.base.ExecutableBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; +import it.smartcommunitylabdhub.commons.models.task.Task; import jakarta.validation.constraints.NotNull; import org.springframework.lang.Nullable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/artifact/Artifact.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/artifact/Artifact.java similarity index 88% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/artifact/Artifact.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/artifact/Artifact.java index 12123f15..ce219a6f 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/artifact/Artifact.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/artifact/Artifact.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.artifact; +package it.smartcommunitylabdhub.commons.models.artifact; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.MetadataDTO; -import it.smartcommunitylabdhub.commons.models.base.SpecDTO; -import it.smartcommunitylabdhub.commons.models.base.StatusDTO; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.metadata.MetadataDTO; +import it.smartcommunitylabdhub.commons.models.specs.SpecDTO; +import it.smartcommunitylabdhub.commons.models.status.StatusDTO; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/artifact/ArtifactBaseSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/artifact/ArtifactBaseSpec.java similarity index 91% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/artifact/ArtifactBaseSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/artifact/ArtifactBaseSpec.java index b1517e2c..a5f205dc 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/artifact/ArtifactBaseSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/artifact/ArtifactBaseSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.artifact; +package it.smartcommunitylabdhub.commons.models.artifact; import com.fasterxml.jackson.annotation.JsonProperty; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/Executable.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/Executable.java index ebd65b87..e38f2356 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/Executable.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/Executable.java @@ -1,3 +1,7 @@ package it.smartcommunitylabdhub.commons.models.base; +import it.smartcommunitylabdhub.commons.models.metadata.MetadataDTO; +import it.smartcommunitylabdhub.commons.models.specs.SpecDTO; +import it.smartcommunitylabdhub.commons.models.status.StatusDTO; + public interface Executable extends BaseDTO, MetadataDTO, SpecDTO, StatusDTO {} diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/dataitem/DataItem.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/dataitem/DataItem.java similarity index 88% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/dataitem/DataItem.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/dataitem/DataItem.java index e3bb336c..caa1484b 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/dataitem/DataItem.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/dataitem/DataItem.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.dataitem; +package it.smartcommunitylabdhub.commons.models.dataitem; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.MetadataDTO; -import it.smartcommunitylabdhub.commons.models.base.SpecDTO; -import it.smartcommunitylabdhub.commons.models.base.StatusDTO; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.metadata.MetadataDTO; +import it.smartcommunitylabdhub.commons.models.specs.SpecDTO; +import it.smartcommunitylabdhub.commons.models.status.StatusDTO; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/dataitem/DataItemBaseSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/dataitem/DataItemBaseSpec.java similarity index 90% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/dataitem/DataItemBaseSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/dataitem/DataItemBaseSpec.java index 75d13951..d5c10d31 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/dataitem/DataItemBaseSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/dataitem/DataItemBaseSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.dataitem; +package it.smartcommunitylabdhub.commons.models.dataitem; import com.fasterxml.jackson.annotation.JsonProperty; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/enums/EntityName.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/EntityName.java similarity index 90% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/enums/EntityName.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/EntityName.java index cc58f357..666ccca1 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/enums/EntityName.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/EntityName.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.enums; +package it.smartcommunitylabdhub.commons.models.entities; import lombok.Getter; import lombok.ToString; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/enums/State.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/enums/State.java index 5691d9a0..0cb6c2d8 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/enums/State.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/enums/State.java @@ -1,6 +1,8 @@ package it.smartcommunitylabdhub.commons.models.enums; // Put a couple of example state +//TODO drop: overused, switch to specific states when needed +@Deprecated public enum State { BUILT, CANCELLED, diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/FileInfo.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/files/FileInfo.java similarity index 95% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/FileInfo.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/files/FileInfo.java index 45097053..aead463a 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/FileInfo.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/files/FileInfo.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.base; +package it.smartcommunitylabdhub.commons.models.files; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/files/FilesInfo.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/files/FilesInfo.java similarity index 78% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/files/FilesInfo.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/files/FilesInfo.java index 010759e2..1da7b0d1 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/files/FilesInfo.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/files/FilesInfo.java @@ -1,7 +1,6 @@ -package it.smartcommunitylabdhub.commons.models.entities.files; +package it.smartcommunitylabdhub.commons.models.files; import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/function/Function.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/function/Function.java similarity index 94% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/function/Function.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/function/Function.java index f16b2ec2..a7acfe98 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/function/Function.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/function/Function.java @@ -1,11 +1,11 @@ -package it.smartcommunitylabdhub.commons.models.entities.function; +package it.smartcommunitylabdhub.commons.models.function; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.models.base.Executable; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/function/FunctionBaseSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/function/FunctionBaseSpec.java similarity index 84% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/function/FunctionBaseSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/function/FunctionBaseSpec.java index a69218da..47b6880f 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/function/FunctionBaseSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/function/FunctionBaseSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.function; +package it.smartcommunitylabdhub.commons.models.function; import it.smartcommunitylabdhub.commons.models.base.ExecutableBaseSpec; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/function/FunctionTaskBaseSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/function/FunctionTaskBaseSpec.java similarity index 84% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/function/FunctionTaskBaseSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/function/FunctionTaskBaseSpec.java index 703ce3f3..5c57c452 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/function/FunctionTaskBaseSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/function/FunctionTaskBaseSpec.java @@ -1,9 +1,10 @@ -package it.smartcommunitylabdhub.commons.models.entities.function; +package it.smartcommunitylabdhub.commons.models.function; -import it.smartcommunitylabdhub.commons.models.entities.task.TaskBaseSpec; import jakarta.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Map; + +import it.smartcommunitylabdhub.commons.models.task.TaskBaseSpec; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/label/Label.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/label/Label.java similarity index 86% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/label/Label.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/label/Label.java index 53e9ea91..882e3324 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/label/Label.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/label/Label.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.label; +package it.smartcommunitylabdhub.commons.models.label; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.AllArgsConstructor; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/log/Log.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/log/Log.java similarity index 87% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/log/Log.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/log/Log.java index 34af7e83..a53e43ce 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/log/Log.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/log/Log.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.log; +package it.smartcommunitylabdhub.commons.models.log; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -6,10 +6,10 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.MetadataDTO; -import it.smartcommunitylabdhub.commons.models.base.SpecDTO; -import it.smartcommunitylabdhub.commons.models.base.StatusDTO; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.metadata.MetadataDTO; +import it.smartcommunitylabdhub.commons.models.specs.SpecDTO; +import it.smartcommunitylabdhub.commons.models.status.StatusDTO; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/log/LogBaseSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/log/LogBaseSpec.java similarity index 91% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/log/LogBaseSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/log/LogBaseSpec.java index 502f9969..fe705536 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/log/LogBaseSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/log/LogBaseSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.log; +package it.smartcommunitylabdhub.commons.models.log; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; import jakarta.validation.constraints.NotEmpty; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/log/LogSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/log/LogSpec.java similarity index 79% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/log/LogSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/log/LogSpec.java index 8886e68d..7bd2c2ec 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/log/LogSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/log/LogSpec.java @@ -1,7 +1,8 @@ -package it.smartcommunitylabdhub.commons.models.entities.log; +package it.smartcommunitylabdhub.commons.models.log; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; + import java.io.Serializable; import java.util.Map; import lombok.AllArgsConstructor; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/AuditMetadata.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/AuditMetadata.java index 80a3eeaa..9771c48a 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/AuditMetadata.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/AuditMetadata.java @@ -5,7 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; + import java.io.Serializable; import java.time.OffsetDateTime; import java.util.Map; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/BaseMetadata.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/BaseMetadata.java index 73f35db6..b60c0387 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/BaseMetadata.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/BaseMetadata.java @@ -4,7 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; + import java.io.Serializable; import java.time.OffsetDateTime; import java.util.Map; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/EmbeddableMetadata.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/EmbeddableMetadata.java index 6a7a6bf1..7a98f12e 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/EmbeddableMetadata.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/EmbeddableMetadata.java @@ -3,7 +3,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; + import java.io.Serializable; import java.util.Map; import lombok.AllArgsConstructor; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/MetadataDTO.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/MetadataDTO.java similarity index 87% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/MetadataDTO.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/MetadataDTO.java index 1d41e54d..6722d638 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/MetadataDTO.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/MetadataDTO.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.base; +package it.smartcommunitylabdhub.commons.models.metadata; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/RelationshipsMetadata.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/RelationshipsMetadata.java index 71fb5744..2710aef3 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/RelationshipsMetadata.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/RelationshipsMetadata.java @@ -4,8 +4,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/VersioningMetadata.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/VersioningMetadata.java index 24d355ba..a7f5c5a8 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/VersioningMetadata.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/metadata/VersioningMetadata.java @@ -3,7 +3,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; + import java.io.Serializable; import java.util.Map; import lombok.AllArgsConstructor; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/HuggingFaceModelSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/HuggingFaceModelSpec.java similarity index 94% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/HuggingFaceModelSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/HuggingFaceModelSpec.java index a8bec089..733a1c78 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/HuggingFaceModelSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/HuggingFaceModelSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.model; +package it.smartcommunitylabdhub.commons.models.model; import lombok.Getter; import lombok.Setter; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/MlflowModelSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/MlflowModelSpec.java similarity index 85% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/MlflowModelSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/MlflowModelSpec.java index f88566e8..46a2ee94 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/MlflowModelSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/MlflowModelSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.model; +package it.smartcommunitylabdhub.commons.models.model; import lombok.Getter; @@ -11,8 +11,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; -import it.smartcommunitylabdhub.commons.models.entities.model.mlflow.Dataset; -import it.smartcommunitylabdhub.commons.models.entities.model.mlflow.Signature; +import it.smartcommunitylabdhub.commons.models.model.mlflow.Dataset; +import it.smartcommunitylabdhub.commons.models.model.mlflow.Signature; @Getter @Setter diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/Model.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/Model.java similarity index 88% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/Model.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/Model.java index 52e6a380..f9e02496 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/Model.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/Model.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.model; +package it.smartcommunitylabdhub.commons.models.model; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.MetadataDTO; -import it.smartcommunitylabdhub.commons.models.base.SpecDTO; -import it.smartcommunitylabdhub.commons.models.base.StatusDTO; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.metadata.MetadataDTO; +import it.smartcommunitylabdhub.commons.models.specs.SpecDTO; +import it.smartcommunitylabdhub.commons.models.status.StatusDTO; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/ModelBaseSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/ModelBaseSpec.java similarity index 93% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/ModelBaseSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/ModelBaseSpec.java index d71850db..adcdc429 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/ModelBaseSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/ModelBaseSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.model; +package it.smartcommunitylabdhub.commons.models.model; import com.fasterxml.jackson.annotation.JsonProperty; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/ModelSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/ModelSpec.java similarity index 92% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/ModelSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/ModelSpec.java index 71f7f7cb..276e2fb1 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/ModelSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/ModelSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.model; +package it.smartcommunitylabdhub.commons.models.model; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/SKLearnModelSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/SKLearnModelSpec.java similarity index 64% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/SKLearnModelSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/SKLearnModelSpec.java index 0172d77a..26b3fa25 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/SKLearnModelSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/SKLearnModelSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.model; +package it.smartcommunitylabdhub.commons.models.model; import lombok.Getter; import lombok.Setter; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/mlflow/Dataset.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/mlflow/Dataset.java similarity index 94% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/mlflow/Dataset.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/mlflow/Dataset.java index b2cfd8e5..74d123bb 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/mlflow/Dataset.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/mlflow/Dataset.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.model.mlflow; +package it.smartcommunitylabdhub.commons.models.model.mlflow; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/mlflow/Signature.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/mlflow/Signature.java similarity index 89% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/mlflow/Signature.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/mlflow/Signature.java index 729678a4..6b1514ca 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/model/mlflow/Signature.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/mlflow/Signature.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.model.mlflow; +package it.smartcommunitylabdhub.commons.models.model.mlflow; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/project/Project.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/project/Project.java similarity index 89% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/project/Project.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/project/Project.java index 134cb449..5ab963c6 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/project/Project.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/project/Project.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.project; +package it.smartcommunitylabdhub.commons.models.project; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.MetadataDTO; -import it.smartcommunitylabdhub.commons.models.base.SpecDTO; -import it.smartcommunitylabdhub.commons.models.base.StatusDTO; +import it.smartcommunitylabdhub.commons.models.metadata.MetadataDTO; +import it.smartcommunitylabdhub.commons.models.specs.SpecDTO; +import it.smartcommunitylabdhub.commons.models.status.StatusDTO; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/project/ProjectBaseSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/project/ProjectBaseSpec.java similarity index 89% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/project/ProjectBaseSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/project/ProjectBaseSpec.java index 224bafba..fe938eac 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/project/ProjectBaseSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/project/ProjectBaseSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.project; +package it.smartcommunitylabdhub.commons.models.project; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/RelationshipDetail.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/relationships/RelationshipDetail.java similarity index 90% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/RelationshipDetail.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/relationships/RelationshipDetail.java index aca96954..5483fcda 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/RelationshipDetail.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/relationships/RelationshipDetail.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.base; +package it.smartcommunitylabdhub.commons.models.relationships; import com.fasterxml.jackson.annotation.JsonInclude; import it.smartcommunitylabdhub.commons.models.enums.RelationshipName; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/run/Run.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/run/Run.java similarity index 88% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/run/Run.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/run/Run.java index 336484cd..930e8f1f 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/run/Run.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/run/Run.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.run; +package it.smartcommunitylabdhub.commons.models.run; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.MetadataDTO; -import it.smartcommunitylabdhub.commons.models.base.SpecDTO; -import it.smartcommunitylabdhub.commons.models.base.StatusDTO; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.metadata.MetadataDTO; +import it.smartcommunitylabdhub.commons.models.specs.SpecDTO; +import it.smartcommunitylabdhub.commons.models.status.StatusDTO; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/run/RunBaseSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/run/RunBaseSpec.java similarity index 93% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/run/RunBaseSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/run/RunBaseSpec.java index 104d2d3f..7729c533 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/run/RunBaseSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/run/RunBaseSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.run; +package it.smartcommunitylabdhub.commons.models.run; import com.fasterxml.jackson.annotation.JsonProperty; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/run/RunBaseStatus.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/run/RunBaseStatus.java similarity index 94% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/run/RunBaseStatus.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/run/RunBaseStatus.java index b0a29f48..2c82eb0f 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/run/RunBaseStatus.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/run/RunBaseStatus.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.run; +package it.smartcommunitylabdhub.commons.models.run; import com.fasterxml.jackson.annotation.JsonInclude; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/secret/Secret.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/secret/Secret.java similarity index 84% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/secret/Secret.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/secret/Secret.java index 3fda4bbe..8f33d059 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/secret/Secret.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/secret/Secret.java @@ -1,13 +1,13 @@ -package it.smartcommunitylabdhub.commons.models.entities.secret; +package it.smartcommunitylabdhub.commons.models.secret; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.MetadataDTO; -import it.smartcommunitylabdhub.commons.models.base.SpecDTO; -import it.smartcommunitylabdhub.commons.models.base.StatusDTO; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.metadata.MetadataDTO; +import it.smartcommunitylabdhub.commons.models.specs.SpecDTO; +import it.smartcommunitylabdhub.commons.models.status.StatusDTO; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/secret/SecretBaseSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/secret/SecretBaseSpec.java similarity index 93% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/secret/SecretBaseSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/secret/SecretBaseSpec.java index 31e58886..71be8fd0 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/secret/SecretBaseSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/secret/SecretBaseSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.secret; +package it.smartcommunitylabdhub.commons.models.secret; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/SpecDTO.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/specs/SpecDTO.java similarity index 87% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/SpecDTO.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/specs/SpecDTO.java index 5b1e8bf7..5037344a 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/SpecDTO.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/specs/SpecDTO.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.base; +package it.smartcommunitylabdhub.commons.models.specs; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/StatusDTO.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/status/StatusDTO.java similarity index 87% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/StatusDTO.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/status/StatusDTO.java index 3c20ad9d..89146ed7 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/StatusDTO.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/status/StatusDTO.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.base; +package it.smartcommunitylabdhub.commons.models.status; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/task/Task.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/task/Task.java similarity index 86% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/task/Task.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/task/Task.java index c4582156..a07242ce 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/task/Task.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/task/Task.java @@ -1,12 +1,12 @@ -package it.smartcommunitylabdhub.commons.models.entities.task; +package it.smartcommunitylabdhub.commons.models.task; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.MetadataDTO; -import it.smartcommunitylabdhub.commons.models.base.SpecDTO; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.metadata.MetadataDTO; +import it.smartcommunitylabdhub.commons.models.specs.SpecDTO; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/task/TaskBaseSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/task/TaskBaseSpec.java similarity index 85% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/task/TaskBaseSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/task/TaskBaseSpec.java index e70fab03..1ec8ad66 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/task/TaskBaseSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/task/TaskBaseSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.task; +package it.smartcommunitylabdhub.commons.models.task; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/workflow/Workflow.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/workflow/Workflow.java similarity index 94% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/workflow/Workflow.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/workflow/Workflow.java index 2f9cd2c6..c350edf6 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/workflow/Workflow.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/workflow/Workflow.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.workflow; +package it.smartcommunitylabdhub.commons.models.workflow; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.models.base.Executable; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/workflow/WorkflowBaseSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/workflow/WorkflowBaseSpec.java similarity index 84% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/workflow/WorkflowBaseSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/workflow/WorkflowBaseSpec.java index 296b43c2..6159c25f 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/workflow/WorkflowBaseSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/workflow/WorkflowBaseSpec.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.entities.workflow; +package it.smartcommunitylabdhub.commons.models.workflow; import it.smartcommunitylabdhub.commons.models.base.ExecutableBaseSpec; import java.io.Serializable; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/workflow/WorkflowTaskBaseSpec.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/workflow/WorkflowTaskBaseSpec.java similarity index 84% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/workflow/WorkflowTaskBaseSpec.java rename to modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/workflow/WorkflowTaskBaseSpec.java index 6631f21a..23ba3b1c 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/entities/workflow/WorkflowTaskBaseSpec.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/workflow/WorkflowTaskBaseSpec.java @@ -1,9 +1,10 @@ -package it.smartcommunitylabdhub.commons.models.entities.workflow; +package it.smartcommunitylabdhub.commons.models.workflow; -import it.smartcommunitylabdhub.commons.models.entities.task.TaskBaseSpec; import jakarta.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Map; + +import it.smartcommunitylabdhub.commons.models.task.TaskBaseSpec; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/ArtifactService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/ArtifactService.java index 4d72c3c9..c199bdbb 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/ArtifactService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/ArtifactService.java @@ -3,7 +3,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.artifact.Artifact; +import it.smartcommunitylabdhub.commons.models.artifact.Artifact; import jakarta.validation.constraints.NotNull; import java.util.List; import org.springframework.data.domain.Page; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/DataItemService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/DataItemService.java index af59ffce..46920d62 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/DataItemService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/DataItemService.java @@ -3,7 +3,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.dataitem.DataItem; +import it.smartcommunitylabdhub.commons.models.dataitem.DataItem; import jakarta.validation.constraints.NotNull; import java.util.List; import org.springframework.data.domain.Page; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/FilesInfoService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/FilesInfoService.java index 3fe508e5..c5e0ffde 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/FilesInfoService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/FilesInfoService.java @@ -2,8 +2,8 @@ import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.entities.files.FilesInfo; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; +import it.smartcommunitylabdhub.commons.models.files.FilesInfo; import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/FunctionService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/FunctionService.java index 0c2ca984..b2463d4d 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/FunctionService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/FunctionService.java @@ -3,8 +3,8 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; +import it.smartcommunitylabdhub.commons.models.function.Function; +import it.smartcommunitylabdhub.commons.models.task.Task; import jakarta.validation.constraints.NotNull; import java.util.List; import org.springframework.data.domain.Page; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/LabelService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/LabelService.java index d2191ed1..064188e5 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/LabelService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/LabelService.java @@ -2,7 +2,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.label.Label; +import it.smartcommunitylabdhub.commons.models.label.Label; import jakarta.validation.constraints.NotNull; import java.util.List; import org.springframework.data.domain.Page; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/LogService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/LogService.java index 59be88cf..c54bd772 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/LogService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/LogService.java @@ -3,7 +3,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.log.Log; +import it.smartcommunitylabdhub.commons.models.log.Log; import jakarta.validation.constraints.NotNull; import java.util.List; import org.springframework.data.domain.Page; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/ModelService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/ModelService.java index 86b84770..0df8c1f9 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/ModelService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/ModelService.java @@ -3,7 +3,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; +import it.smartcommunitylabdhub.commons.models.model.Model; import jakarta.validation.constraints.NotNull; import java.util.List; import org.springframework.data.domain.Page; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/ProjectService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/ProjectService.java index 1ef8135c..71e18d04 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/ProjectService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/ProjectService.java @@ -3,7 +3,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.project.Project; +import it.smartcommunitylabdhub.commons.models.project.Project; import jakarta.validation.constraints.NotNull; import java.util.List; import org.springframework.data.domain.Page; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/RelationshipsAwareEntityService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/RelationshipsAwareEntityService.java index bd4aba33..431eab3c 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/RelationshipsAwareEntityService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/RelationshipsAwareEntityService.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.commons.services; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/RunService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/RunService.java index ac1d5be4..945741b8 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/RunService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/RunService.java @@ -3,7 +3,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; +import it.smartcommunitylabdhub.commons.models.run.Run; import jakarta.validation.constraints.NotNull; import java.util.List; import org.springframework.data.domain.Page; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/SecretService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/SecretService.java index 55c42eb6..8675aa2c 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/SecretService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/SecretService.java @@ -3,7 +3,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.secret.Secret; +import it.smartcommunitylabdhub.commons.models.secret.Secret; import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Map; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/SpecRegistry.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/SpecRegistry.java index da33c151..8620e509 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/SpecRegistry.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/SpecRegistry.java @@ -2,7 +2,7 @@ import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.infrastructure.SpecFactory; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.schemas.Schema; import it.smartcommunitylabdhub.commons.models.specs.Spec; import jakarta.validation.Valid; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/TaskService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/TaskService.java index 1c60cff4..7d1e16c8 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/TaskService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/TaskService.java @@ -3,7 +3,7 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; +import it.smartcommunitylabdhub.commons.models.task.Task; import jakarta.validation.constraints.NotNull; import java.util.List; import org.springframework.data.domain.Page; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/WorkflowService.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/WorkflowService.java index 087efbac..8e49e346 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/WorkflowService.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/services/WorkflowService.java @@ -3,8 +3,8 @@ import it.smartcommunitylabdhub.commons.exceptions.DuplicatedEntityException; import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import jakarta.validation.constraints.NotNull; import java.util.List; import org.springframework.data.domain.Page; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/utils/EmbedUtils.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/utils/EmbedUtils.java index 5a48c3fd..2881eb87 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/utils/EmbedUtils.java +++ b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/utils/EmbedUtils.java @@ -2,10 +2,10 @@ import it.smartcommunitylabdhub.commons.accessors.fields.EmbeddedFieldAccessor; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.MetadataDTO; -import it.smartcommunitylabdhub.commons.models.base.SpecDTO; -import it.smartcommunitylabdhub.commons.models.base.StatusDTO; import it.smartcommunitylabdhub.commons.models.metadata.BaseMetadata; +import it.smartcommunitylabdhub.commons.models.metadata.MetadataDTO; +import it.smartcommunitylabdhub.commons.models.specs.SpecDTO; +import it.smartcommunitylabdhub.commons.models.status.StatusDTO; public class EmbedUtils { diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/utils/LogWriter.java b/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/utils/LogWriter.java deleted file mode 100644 index c510adbe..00000000 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/utils/LogWriter.java +++ /dev/null @@ -1,28 +0,0 @@ -package it.smartcommunitylabdhub.commons.utils; - -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.IOException; - -public class LogWriter { - - private static final String LOG_DIRECTORY = ""; - - public static void writeLog(String fileName, String logMessage) { - String filePath = LOG_DIRECTORY + fileName; - - try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath, true))) { - // Create the log entry with timestamp - String logEntry = logMessage + "\n"; - - // Write the log entry to the file - writer.write(logEntry); - writer.newLine(); - - // Flush the writer to ensure the log entry is written immediately - writer.flush(); - } catch (IOException e) { - System.out.println(e.getMessage()); - } - } -} diff --git a/modules/files/src/main/java/it/smartcommunitylabdhub/files/http/HttpStore.java b/modules/files/src/main/java/it/smartcommunitylabdhub/files/http/HttpStore.java index 4c170212..63ba8f66 100644 --- a/modules/files/src/main/java/it/smartcommunitylabdhub/files/http/HttpStore.java +++ b/modules/files/src/main/java/it/smartcommunitylabdhub/files/http/HttpStore.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.files.http; -import it.smartcommunitylabdhub.commons.models.base.DownloadInfo; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.base.UploadInfo; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; +import it.smartcommunitylabdhub.files.models.DownloadInfo; +import it.smartcommunitylabdhub.files.models.UploadInfo; import it.smartcommunitylabdhub.files.service.FilesStore; import jakarta.validation.constraints.NotNull; import java.net.MalformedURLException; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/DownloadInfo.java b/modules/files/src/main/java/it/smartcommunitylabdhub/files/models/DownloadInfo.java similarity index 91% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/DownloadInfo.java rename to modules/files/src/main/java/it/smartcommunitylabdhub/files/models/DownloadInfo.java index 703ccf69..5777e4e4 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/DownloadInfo.java +++ b/modules/files/src/main/java/it/smartcommunitylabdhub/files/models/DownloadInfo.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.base; +package it.smartcommunitylabdhub.files.models; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.time.Instant; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/UploadInfo.java b/modules/files/src/main/java/it/smartcommunitylabdhub/files/models/UploadInfo.java similarity index 91% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/UploadInfo.java rename to modules/files/src/main/java/it/smartcommunitylabdhub/files/models/UploadInfo.java index 9df4700e..abe670b3 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/base/UploadInfo.java +++ b/modules/files/src/main/java/it/smartcommunitylabdhub/files/models/UploadInfo.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.models.base; +package it.smartcommunitylabdhub.files.models; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.time.Instant; diff --git a/modules/files/src/main/java/it/smartcommunitylabdhub/files/s3/S3FilesStore.java b/modules/files/src/main/java/it/smartcommunitylabdhub/files/s3/S3FilesStore.java index 1f721798..6a167d07 100644 --- a/modules/files/src/main/java/it/smartcommunitylabdhub/files/s3/S3FilesStore.java +++ b/modules/files/src/main/java/it/smartcommunitylabdhub/files/s3/S3FilesStore.java @@ -1,9 +1,9 @@ package it.smartcommunitylabdhub.files.s3; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.base.DownloadInfo; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.base.UploadInfo; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; +import it.smartcommunitylabdhub.files.models.DownloadInfo; +import it.smartcommunitylabdhub.files.models.UploadInfo; import it.smartcommunitylabdhub.files.service.FilesStore; import jakarta.validation.constraints.NotNull; import java.net.URI; diff --git a/modules/files/src/main/java/it/smartcommunitylabdhub/files/service/EntityFilesService.java b/modules/files/src/main/java/it/smartcommunitylabdhub/files/service/EntityFilesService.java index 60a4fe49..5c624ed0 100644 --- a/modules/files/src/main/java/it/smartcommunitylabdhub/files/service/EntityFilesService.java +++ b/modules/files/src/main/java/it/smartcommunitylabdhub/files/service/EntityFilesService.java @@ -3,9 +3,9 @@ import it.smartcommunitylabdhub.commons.exceptions.NoSuchEntityException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; import it.smartcommunitylabdhub.commons.models.base.BaseDTO; -import it.smartcommunitylabdhub.commons.models.base.DownloadInfo; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.base.UploadInfo; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; +import it.smartcommunitylabdhub.files.models.DownloadInfo; +import it.smartcommunitylabdhub.files.models.UploadInfo; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/modules/files/src/main/java/it/smartcommunitylabdhub/files/service/FilesService.java b/modules/files/src/main/java/it/smartcommunitylabdhub/files/service/FilesService.java index 3a4e77c6..6d1b8786 100644 --- a/modules/files/src/main/java/it/smartcommunitylabdhub/files/service/FilesService.java +++ b/modules/files/src/main/java/it/smartcommunitylabdhub/files/service/FilesService.java @@ -1,9 +1,9 @@ package it.smartcommunitylabdhub.files.service; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.base.DownloadInfo; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.base.UploadInfo; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; +import it.smartcommunitylabdhub.files.models.DownloadInfo; +import it.smartcommunitylabdhub.files.models.UploadInfo; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; import java.io.InputStream; diff --git a/modules/files/src/main/java/it/smartcommunitylabdhub/files/service/FilesStore.java b/modules/files/src/main/java/it/smartcommunitylabdhub/files/service/FilesStore.java index 69ccc088..b68879cf 100644 --- a/modules/files/src/main/java/it/smartcommunitylabdhub/files/service/FilesStore.java +++ b/modules/files/src/main/java/it/smartcommunitylabdhub/files/service/FilesStore.java @@ -1,9 +1,9 @@ package it.smartcommunitylabdhub.files.service; import it.smartcommunitylabdhub.commons.exceptions.StoreException; -import it.smartcommunitylabdhub.commons.models.base.DownloadInfo; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.base.UploadInfo; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; +import it.smartcommunitylabdhub.files.models.DownloadInfo; +import it.smartcommunitylabdhub.files.models.UploadInfo; import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/modules/framework-argo/src/test/java/it/smartcommunitylabdhub/framework/argo/config/TestConfiguration.java b/modules/framework-argo/src/test/java/it/smartcommunitylabdhub/framework/argo/config/TestConfiguration.java index 7b33ab36..7323924b 100644 --- a/modules/framework-argo/src/test/java/it/smartcommunitylabdhub/framework/argo/config/TestConfiguration.java +++ b/modules/framework-argo/src/test/java/it/smartcommunitylabdhub/framework/argo/config/TestConfiguration.java @@ -7,7 +7,7 @@ import it.smartcommunitylabdhub.commons.exceptions.StoreException; import it.smartcommunitylabdhub.commons.exceptions.SystemException; import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable; -import it.smartcommunitylabdhub.commons.models.entities.log.Log; +import it.smartcommunitylabdhub.commons.models.log.Log; import it.smartcommunitylabdhub.commons.services.LogService; import it.smartcommunitylabdhub.commons.services.RunnableStore; import jakarta.validation.constraints.NotNull; diff --git a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/base/K8sBaseRuntime.java b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/base/K8sBaseRuntime.java index c5baf0f6..8ba93eef 100644 --- a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/base/K8sBaseRuntime.java +++ b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/base/K8sBaseRuntime.java @@ -2,9 +2,9 @@ import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable; import it.smartcommunitylabdhub.commons.models.base.ExecutableBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sBuilderHelper; import it.smartcommunitylabdhub.framework.k8s.runnables.K8sRunnable; import it.smartcommunitylabdhub.runtimes.base.AbstractBaseRuntime; diff --git a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/base/K8sFunctionTaskBaseSpec.java b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/base/K8sFunctionTaskBaseSpec.java index edc2ea81..59fcd47f 100644 --- a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/base/K8sFunctionTaskBaseSpec.java +++ b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/base/K8sFunctionTaskBaseSpec.java @@ -1,7 +1,8 @@ package it.smartcommunitylabdhub.framework.k8s.base; import com.fasterxml.jackson.annotation.JsonProperty; -import it.smartcommunitylabdhub.commons.models.entities.function.FunctionTaskBaseSpec; + +import it.smartcommunitylabdhub.commons.models.function.FunctionTaskBaseSpec; import it.smartcommunitylabdhub.framework.k8s.objects.CoreAffinity; import it.smartcommunitylabdhub.framework.k8s.objects.CoreEnv; import it.smartcommunitylabdhub.framework.k8s.objects.CoreNodeSelector; diff --git a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/base/K8sWorkflowTaskBaseSpec.java b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/base/K8sWorkflowTaskBaseSpec.java index f4c14ab2..11381ac3 100644 --- a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/base/K8sWorkflowTaskBaseSpec.java +++ b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/base/K8sWorkflowTaskBaseSpec.java @@ -1,7 +1,8 @@ package it.smartcommunitylabdhub.framework.k8s.base; import com.fasterxml.jackson.annotation.JsonProperty; -import it.smartcommunitylabdhub.commons.models.entities.workflow.WorkflowTaskBaseSpec; + +import it.smartcommunitylabdhub.commons.models.workflow.WorkflowTaskBaseSpec; import it.smartcommunitylabdhub.framework.k8s.objects.CoreAffinity; import it.smartcommunitylabdhub.framework.k8s.objects.CoreEnv; import it.smartcommunitylabdhub.framework.k8s.objects.CoreNodeSelector; diff --git a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/model/K8sRunStatus.java b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/model/K8sRunStatus.java index 030881b0..cc2d3647 100644 --- a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/model/K8sRunStatus.java +++ b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/model/K8sRunStatus.java @@ -1,7 +1,9 @@ package it.smartcommunitylabdhub.framework.k8s.model; import com.fasterxml.jackson.annotation.JsonInclude; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; + +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; + import java.io.Serializable; import java.util.Map; import lombok.AllArgsConstructor; diff --git a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/model/K8sServiceStatus.java b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/model/K8sServiceStatus.java index 2a217671..b7132fb2 100644 --- a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/model/K8sServiceStatus.java +++ b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/model/K8sServiceStatus.java @@ -1,7 +1,9 @@ package it.smartcommunitylabdhub.framework.k8s.model; import com.fasterxml.jackson.annotation.JsonInclude; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; + +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; + import java.io.Serializable; import java.util.Map; import lombok.AllArgsConstructor; diff --git a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/processors/K8sLogProcessor.java b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/processors/K8sLogProcessor.java index 877a8c4a..cc533b4a 100644 --- a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/processors/K8sLogProcessor.java +++ b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/processors/K8sLogProcessor.java @@ -6,10 +6,10 @@ import it.smartcommunitylabdhub.commons.exceptions.SystemException; import it.smartcommunitylabdhub.commons.infrastructure.RunProcessor; import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable; -import it.smartcommunitylabdhub.commons.models.entities.log.Log; -import it.smartcommunitylabdhub.commons.models.entities.log.LogSpec; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; +import it.smartcommunitylabdhub.commons.models.log.Log; +import it.smartcommunitylabdhub.commons.models.log.LogSpec; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; import it.smartcommunitylabdhub.commons.services.LogService; import it.smartcommunitylabdhub.framework.k8s.model.K8sLogStatus; import it.smartcommunitylabdhub.framework.k8s.objects.CoreLog; diff --git a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/processors/K8sProcessor.java b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/processors/K8sProcessor.java index b2c2769c..5b5d37a5 100644 --- a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/processors/K8sProcessor.java +++ b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/processors/K8sProcessor.java @@ -3,8 +3,8 @@ import it.smartcommunitylabdhub.commons.annotations.common.RunProcessorType; import it.smartcommunitylabdhub.commons.infrastructure.RunProcessor; import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; import it.smartcommunitylabdhub.framework.k8s.model.K8sRunStatus; import it.smartcommunitylabdhub.framework.k8s.runnables.K8sRunnable; import java.io.Serializable; diff --git a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/processors/K8sServiceProcessor.java b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/processors/K8sServiceProcessor.java index e0cf2c1b..1f102c34 100644 --- a/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/processors/K8sServiceProcessor.java +++ b/modules/framework-k8s/src/main/java/it/smartcommunitylabdhub/framework/k8s/processors/K8sServiceProcessor.java @@ -8,8 +8,8 @@ import it.smartcommunitylabdhub.commons.annotations.common.RunProcessorType; import it.smartcommunitylabdhub.commons.infrastructure.RunProcessor; import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; import it.smartcommunitylabdhub.framework.k8s.jackson.KubernetesMapper; import it.smartcommunitylabdhub.framework.k8s.model.K8sServiceInfo; import it.smartcommunitylabdhub.framework.k8s.model.K8sServiceStatus; diff --git a/modules/openmetadata-integration/src/main/java/it/smartcommunitylabdhub/openmetadata/models/OpenMetadataMetadata.java b/modules/openmetadata-integration/src/main/java/it/smartcommunitylabdhub/openmetadata/models/OpenMetadataMetadata.java index a7c703de..cd5a5a9c 100644 --- a/modules/openmetadata-integration/src/main/java/it/smartcommunitylabdhub/openmetadata/models/OpenMetadataMetadata.java +++ b/modules/openmetadata-integration/src/main/java/it/smartcommunitylabdhub/openmetadata/models/OpenMetadataMetadata.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.models.base.BaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.metadata.Metadata; import java.io.Serializable; import java.util.Map; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/events/RunnableChangedEvent.java b/modules/runtime-base/src/main/java/it/smartcommunitylabdhub/runtimes/events/RunnableChangedEvent.java similarity index 90% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/events/RunnableChangedEvent.java rename to modules/runtime-base/src/main/java/it/smartcommunitylabdhub/runtimes/events/RunnableChangedEvent.java index 1d220ab0..014ec949 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/events/RunnableChangedEvent.java +++ b/modules/runtime-base/src/main/java/it/smartcommunitylabdhub/runtimes/events/RunnableChangedEvent.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.events; +package it.smartcommunitylabdhub.runtimes.events; import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable; import lombok.AllArgsConstructor; diff --git a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/events/RunnableMonitorObject.java b/modules/runtime-base/src/main/java/it/smartcommunitylabdhub/runtimes/events/RunnableMonitorObject.java similarity index 91% rename from modules/commons/src/main/java/it/smartcommunitylabdhub/commons/events/RunnableMonitorObject.java rename to modules/runtime-base/src/main/java/it/smartcommunitylabdhub/runtimes/events/RunnableMonitorObject.java index f3abcafa..0d422565 100644 --- a/modules/commons/src/main/java/it/smartcommunitylabdhub/commons/events/RunnableMonitorObject.java +++ b/modules/runtime-base/src/main/java/it/smartcommunitylabdhub/runtimes/events/RunnableMonitorObject.java @@ -1,4 +1,4 @@ -package it.smartcommunitylabdhub.commons.events; +package it.smartcommunitylabdhub.runtimes.events; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/ContainerRuntime.java b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/ContainerRuntime.java index 67fac936..26917293 100644 --- a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/ContainerRuntime.java +++ b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/ContainerRuntime.java @@ -4,10 +4,10 @@ import it.smartcommunitylabdhub.commons.annotations.infrastructure.RuntimeComponent; import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable; import it.smartcommunitylabdhub.commons.models.base.Executable; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.task.TaskBaseSpec; +import it.smartcommunitylabdhub.commons.models.function.Function; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.task.TaskBaseSpec; import it.smartcommunitylabdhub.commons.services.FunctionService; import it.smartcommunitylabdhub.commons.services.SecretService; import it.smartcommunitylabdhub.framework.k8s.base.K8sBaseRuntime; diff --git a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerBuildRunner.java b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerBuildRunner.java index a7361ec3..8c5e4ae9 100644 --- a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerBuildRunner.java +++ b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerBuildRunner.java @@ -2,9 +2,9 @@ import it.smartcommunitylabdhub.commons.accessors.spec.RunSpecAccessor; import it.smartcommunitylabdhub.commons.accessors.spec.TaskSpecAccessor; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.objects.SourceCode; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sBuilderHelper; import it.smartcommunitylabdhub.framework.k8s.model.ContextRef; import it.smartcommunitylabdhub.framework.k8s.model.ContextSource; diff --git a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerDeployRunner.java b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerDeployRunner.java index 0cc338a1..0f4834d4 100644 --- a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerDeployRunner.java +++ b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerDeployRunner.java @@ -2,9 +2,9 @@ import it.smartcommunitylabdhub.commons.accessors.fields.StatusFieldAccessor; import it.smartcommunitylabdhub.commons.accessors.spec.TaskSpecAccessor; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.objects.SourceCode; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sBuilderHelper; import it.smartcommunitylabdhub.framework.k8s.model.ContextRef; import it.smartcommunitylabdhub.framework.k8s.model.ContextSource; diff --git a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerJobRunner.java b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerJobRunner.java index 6984d746..fc3f4b40 100644 --- a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerJobRunner.java +++ b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerJobRunner.java @@ -1,9 +1,9 @@ package it.smartcommunitylabdhub.runtime.container.runners; import it.smartcommunitylabdhub.commons.accessors.spec.TaskSpecAccessor; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.objects.SourceCode; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sBuilderHelper; import it.smartcommunitylabdhub.framework.k8s.model.ContextRef; import it.smartcommunitylabdhub.framework.k8s.model.ContextSource; diff --git a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerServeRunner.java b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerServeRunner.java index 79cadf3e..1accdebd 100644 --- a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerServeRunner.java +++ b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/runners/ContainerServeRunner.java @@ -1,9 +1,9 @@ package it.smartcommunitylabdhub.runtime.container.runners; import it.smartcommunitylabdhub.commons.accessors.spec.TaskSpecAccessor; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.objects.SourceCode; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sBuilderHelper; import it.smartcommunitylabdhub.framework.k8s.model.ContextRef; import it.smartcommunitylabdhub.framework.k8s.model.ContextSource; diff --git a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerBuildTaskSpec.java b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerBuildTaskSpec.java index 34335fd7..61e3d0b9 100644 --- a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerBuildTaskSpec.java +++ b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerBuildTaskSpec.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.framework.k8s.base.K8sFunctionTaskBaseSpec; import it.smartcommunitylabdhub.runtime.container.ContainerRuntime; import java.io.Serializable; diff --git a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerDeployTaskSpec.java b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerDeployTaskSpec.java index 76a1981f..b6c85944 100644 --- a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerDeployTaskSpec.java +++ b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerDeployTaskSpec.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.runtime.container.specs; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.framework.k8s.base.K8sFunctionTaskBaseSpec; import it.smartcommunitylabdhub.runtime.container.ContainerRuntime; import jakarta.validation.constraints.Min; diff --git a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerFunctionSpec.java b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerFunctionSpec.java index afe130df..e4c36caf 100644 --- a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerFunctionSpec.java +++ b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerFunctionSpec.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.function.FunctionBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.FunctionBaseSpec; import it.smartcommunitylabdhub.commons.models.objects.SourceCode; import it.smartcommunitylabdhub.runtime.container.ContainerRuntime; import java.io.Serializable; diff --git a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerJobTaskSpec.java b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerJobTaskSpec.java index 27532e1f..e44c7513 100644 --- a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerJobTaskSpec.java +++ b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerJobTaskSpec.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.framework.k8s.base.K8sFunctionTaskBaseSpec; import it.smartcommunitylabdhub.runtime.container.ContainerRuntime; import jakarta.validation.constraints.Min; diff --git a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerRunSpec.java b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerRunSpec.java index 7b535aa1..f66845de 100644 --- a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerRunSpec.java +++ b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerRunSpec.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; import it.smartcommunitylabdhub.runtime.container.ContainerRuntime; import java.io.Serializable; import java.util.Map; diff --git a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerRunStatus.java b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerRunStatus.java index 04e295a0..9ebf5563 100644 --- a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerRunStatus.java +++ b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerRunStatus.java @@ -1,7 +1,9 @@ package it.smartcommunitylabdhub.runtime.container.specs; import com.fasterxml.jackson.annotation.JsonInclude; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; + +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; + import java.io.Serializable; import java.util.Map; import lombok.AllArgsConstructor; diff --git a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerServeTaskSpec.java b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerServeTaskSpec.java index c6c7cd46..c0192429 100644 --- a/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerServeTaskSpec.java +++ b/modules/runtime-container/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerServeTaskSpec.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.framework.k8s.objects.CorePort; import it.smartcommunitylabdhub.framework.k8s.objects.CoreServiceType; import it.smartcommunitylabdhub.runtime.container.ContainerRuntime; diff --git a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/DbtRuntime.java b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/DbtRuntime.java index bcc7395c..9f7e7119 100644 --- a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/DbtRuntime.java +++ b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/DbtRuntime.java @@ -4,9 +4,9 @@ import it.smartcommunitylabdhub.commons.annotations.infrastructure.RuntimeComponent; import it.smartcommunitylabdhub.commons.exceptions.CoreRuntimeException; import it.smartcommunitylabdhub.commons.models.base.Executable; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.task.TaskBaseSpec; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.task.TaskBaseSpec; import it.smartcommunitylabdhub.commons.services.SecretService; import it.smartcommunitylabdhub.framework.k8s.base.K8sBaseRuntime; import it.smartcommunitylabdhub.framework.k8s.runnables.K8sJobRunnable; diff --git a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/runners/DbtTransformRunner.java b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/runners/DbtTransformRunner.java index b915ef31..3da8d49e 100644 --- a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/runners/DbtTransformRunner.java +++ b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/runners/DbtTransformRunner.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.runtime.dbt.runners; import it.smartcommunitylabdhub.commons.exceptions.CoreRuntimeException; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.objects.CoreEnv; import it.smartcommunitylabdhub.framework.k8s.runnables.K8sJobRunnable; import it.smartcommunitylabdhub.runtime.dbt.DbtRuntime; diff --git a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtFunctionSpec.java b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtFunctionSpec.java index 4443e292..8f71dc6e 100644 --- a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtFunctionSpec.java +++ b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtFunctionSpec.java @@ -2,8 +2,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.function.FunctionBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.FunctionBaseSpec; import it.smartcommunitylabdhub.commons.models.objects.SourceCode; import it.smartcommunitylabdhub.runtime.dbt.DbtRuntime; import jakarta.validation.constraints.NotNull; diff --git a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtRunSpec.java b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtRunSpec.java index 7c2ff535..c01f72f0 100644 --- a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtRunSpec.java +++ b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtRunSpec.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; import it.smartcommunitylabdhub.runtime.dbt.DbtRuntime; import java.io.Serializable; import java.util.HashMap; diff --git a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtRunStatus.java b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtRunStatus.java index 3ca90105..ce4ff7cd 100644 --- a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtRunStatus.java +++ b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtRunStatus.java @@ -1,7 +1,8 @@ package it.smartcommunitylabdhub.runtime.dbt.specs; import com.fasterxml.jackson.annotation.JsonInclude; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; + +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtTransformSpec.java b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtTransformSpec.java index 0e790680..c5d46357 100644 --- a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtTransformSpec.java +++ b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtTransformSpec.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.runtime.dbt.specs; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.framework.k8s.base.K8sFunctionTaskBaseSpec; import it.smartcommunitylabdhub.runtime.dbt.DbtRuntime; import java.io.Serializable; diff --git a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/KFPRuntime.java b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/KFPRuntime.java index 4cd007c7..8450287e 100644 --- a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/KFPRuntime.java +++ b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/KFPRuntime.java @@ -7,11 +7,11 @@ import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable; import it.smartcommunitylabdhub.commons.jackson.YamlMapperFactory; import it.smartcommunitylabdhub.commons.models.base.Executable; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.task.TaskBaseSpec; -import it.smartcommunitylabdhub.commons.models.entities.workflow.Workflow; import it.smartcommunitylabdhub.commons.models.objects.SourceCode; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.task.TaskBaseSpec; +import it.smartcommunitylabdhub.commons.models.workflow.Workflow; import it.smartcommunitylabdhub.commons.services.entities.SecretService; import it.smartcommunitylabdhub.commons.services.entities.WorkflowService; import it.smartcommunitylabdhub.framework.k8s.base.K8sBaseRuntime; diff --git a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/runners/KFPBuildRunner.java b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/runners/KFPBuildRunner.java index 9a793d4a..6d66ea21 100644 --- a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/runners/KFPBuildRunner.java +++ b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/runners/KFPBuildRunner.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.runtime.kfp.runners; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.objects.CoreEnv; import it.smartcommunitylabdhub.framework.k8s.runnables.K8sJobRunnable; import it.smartcommunitylabdhub.framework.k8s.runnables.K8sRunnable; diff --git a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/runners/KFPPipelineRunner.java b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/runners/KFPPipelineRunner.java index d320aa1d..971d6c55 100644 --- a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/runners/KFPPipelineRunner.java +++ b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/runners/KFPPipelineRunner.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.runtime.kfp.runners; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.argo.runnables.K8sArgoCronWorkflowRunnable; import it.smartcommunitylabdhub.framework.argo.runnables.K8sArgoWorkflowRunnable; import it.smartcommunitylabdhub.framework.k8s.objects.CoreEnv; diff --git a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPBuildTaskSpec.java b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPBuildTaskSpec.java index 1ffcabb5..45f28282 100644 --- a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPBuildTaskSpec.java +++ b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPBuildTaskSpec.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.runtime.kfp.specs; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.framework.k8s.base.K8sWorkflowTaskBaseSpec; import it.smartcommunitylabdhub.runtime.kfp.KFPRuntime; import java.io.Serializable; diff --git a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPPipelineTaskSpec.java b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPPipelineTaskSpec.java index e2c4102b..46ec1453 100644 --- a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPPipelineTaskSpec.java +++ b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPPipelineTaskSpec.java @@ -2,7 +2,7 @@ import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.framework.k8s.base.K8sWorkflowTaskBaseSpec; import it.smartcommunitylabdhub.runtime.kfp.KFPRuntime; import jakarta.validation.constraints.Pattern; diff --git a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPRunSpec.java b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPRunSpec.java index 029979e9..bbe8f5f7 100644 --- a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPRunSpec.java +++ b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPRunSpec.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; import it.smartcommunitylabdhub.runtime.kfp.KFPRuntime; import java.io.Serializable; import java.util.HashMap; diff --git a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPRunStatus.java b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPRunStatus.java index fd2fa91d..8912af95 100644 --- a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPRunStatus.java +++ b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPRunStatus.java @@ -1,7 +1,8 @@ package it.smartcommunitylabdhub.runtime.kfp.specs; import com.fasterxml.jackson.annotation.JsonInclude; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; + +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPWorkflowSpec.java b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPWorkflowSpec.java index 9c05212d..918e2eba 100644 --- a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPWorkflowSpec.java +++ b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPWorkflowSpec.java @@ -3,9 +3,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore; -import it.smartcommunitylabdhub.commons.models.entities.workflow.WorkflowBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.objects.SourceCode; +import it.smartcommunitylabdhub.commons.models.workflow.WorkflowBaseSpec; import it.smartcommunitylabdhub.runtime.kfp.KFPRuntime; import jakarta.validation.constraints.NotNull; import java.io.Serializable; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/HuggingfaceServeRunner.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/HuggingfaceServeRunner.java index 7765281a..f085cecd 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/HuggingfaceServeRunner.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/HuggingfaceServeRunner.java @@ -4,13 +4,13 @@ import it.smartcommunitylabdhub.commons.accessors.fields.KeyAccessor; import it.smartcommunitylabdhub.commons.accessors.spec.TaskSpecAccessor; import it.smartcommunitylabdhub.commons.exceptions.CoreRuntimeException; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.enums.RelationshipName; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.metadata.RelationshipsMetadata; +import it.smartcommunitylabdhub.commons.models.model.Model; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.commons.services.entities.ModelService; import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sBuilderHelper; import it.smartcommunitylabdhub.framework.k8s.model.ContextRef; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/HuggingfaceServeRuntime.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/HuggingfaceServeRuntime.java index 5f5c5a6f..7c282e1b 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/HuggingfaceServeRuntime.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/HuggingfaceServeRuntime.java @@ -3,9 +3,9 @@ import it.smartcommunitylabdhub.commons.accessors.spec.RunSpecAccessor; import it.smartcommunitylabdhub.commons.annotations.infrastructure.RuntimeComponent; import it.smartcommunitylabdhub.commons.models.base.Executable; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.task.TaskBaseSpec; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.task.TaskBaseSpec; import it.smartcommunitylabdhub.commons.services.entities.ModelService; import it.smartcommunitylabdhub.commons.services.entities.SecretService; import it.smartcommunitylabdhub.framework.k8s.base.K8sBaseRuntime; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeFunctionSpec.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeFunctionSpec.java index ed4ac32e..e9362920 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeFunctionSpec.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeFunctionSpec.java @@ -4,8 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.function.FunctionBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.FunctionBaseSpec; import it.smartcommunitylabdhub.runtime.huggingface.HuggingfaceServeRuntime; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeRunSpec.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeRunSpec.java index a36ec2b7..7a0c2a2d 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeRunSpec.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeRunSpec.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; import it.smartcommunitylabdhub.runtime.huggingface.HuggingfaceServeRuntime; import java.io.Serializable; import java.util.Map; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeTaskSpec.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeTaskSpec.java index ba430085..16a009c9 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeTaskSpec.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeTaskSpec.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.runtime.huggingface.HuggingfaceServeRuntime; import it.smartcommunitylabdhub.runtime.huggingface.models.HuggingfaceBackend; import it.smartcommunitylabdhub.runtime.huggingface.models.HuggingfaceDType; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/MlflowServeRunner.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/MlflowServeRunner.java index b1ca9ce7..08bcc1c5 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/MlflowServeRunner.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/MlflowServeRunner.java @@ -5,13 +5,13 @@ import it.smartcommunitylabdhub.commons.accessors.spec.TaskSpecAccessor; import it.smartcommunitylabdhub.commons.exceptions.CoreRuntimeException; import it.smartcommunitylabdhub.commons.jackson.JacksonMapper; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.enums.RelationshipName; import it.smartcommunitylabdhub.commons.models.enums.State; import it.smartcommunitylabdhub.commons.models.metadata.RelationshipsMetadata; +import it.smartcommunitylabdhub.commons.models.model.Model; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.commons.services.entities.ModelService; import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sBuilderHelper; import it.smartcommunitylabdhub.framework.k8s.model.ContextRef; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/MlflowServeRuntime.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/MlflowServeRuntime.java index d326a6b7..e3af9ce5 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/MlflowServeRuntime.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/MlflowServeRuntime.java @@ -3,9 +3,9 @@ import it.smartcommunitylabdhub.commons.accessors.spec.RunSpecAccessor; import it.smartcommunitylabdhub.commons.annotations.infrastructure.RuntimeComponent; import it.smartcommunitylabdhub.commons.models.base.Executable; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.task.TaskBaseSpec; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.task.TaskBaseSpec; import it.smartcommunitylabdhub.commons.services.entities.ModelService; import it.smartcommunitylabdhub.commons.services.entities.SecretService; import it.smartcommunitylabdhub.framework.k8s.base.K8sBaseRuntime; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeFunctionSpec.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeFunctionSpec.java index ebec4749..86bafb5f 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeFunctionSpec.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeFunctionSpec.java @@ -4,8 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.function.FunctionBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.FunctionBaseSpec; import it.smartcommunitylabdhub.runtime.mlflow.MlflowServeRuntime; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeRunSpec.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeRunSpec.java index e3499794..3cd76a24 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeRunSpec.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeRunSpec.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; import it.smartcommunitylabdhub.runtime.mlflow.MlflowServeRuntime; import java.io.Serializable; import java.util.Map; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeTaskSpec.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeTaskSpec.java index 84017628..cd1b621f 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeTaskSpec.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeTaskSpec.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.runtime.mlflow.specs; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.runtime.mlflow.MlflowServeRuntime; import it.smartcommunitylabdhub.runtime.modelserve.specs.ModelServeServeTaskSpec; import java.io.Serializable; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/modelserve/specs/ModelServeRunStatus.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/modelserve/specs/ModelServeRunStatus.java index 0ea80120..8ef15426 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/modelserve/specs/ModelServeRunStatus.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/modelserve/specs/ModelServeRunStatus.java @@ -1,7 +1,8 @@ package it.smartcommunitylabdhub.runtime.modelserve.specs; import com.fasterxml.jackson.annotation.JsonInclude; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; + +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/SklearnServeRunner.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/SklearnServeRunner.java index 75bf79ac..1756020d 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/SklearnServeRunner.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/SklearnServeRunner.java @@ -6,14 +6,14 @@ import it.smartcommunitylabdhub.commons.accessors.spec.TaskSpecAccessor; import it.smartcommunitylabdhub.commons.exceptions.CoreRuntimeException; import it.smartcommunitylabdhub.commons.jackson.JacksonMapper; -import it.smartcommunitylabdhub.commons.models.base.FileInfo; -import it.smartcommunitylabdhub.commons.models.base.RelationshipDetail; -import it.smartcommunitylabdhub.commons.models.entities.model.Model; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.commons.models.enums.RelationshipName; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.files.FileInfo; import it.smartcommunitylabdhub.commons.models.metadata.RelationshipsMetadata; +import it.smartcommunitylabdhub.commons.models.model.Model; +import it.smartcommunitylabdhub.commons.models.relationships.RelationshipDetail; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.commons.services.entities.ModelService; import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sBuilderHelper; import it.smartcommunitylabdhub.framework.k8s.model.ContextRef; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/SklearnServeRuntime.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/SklearnServeRuntime.java index 4883b0ef..15911434 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/SklearnServeRuntime.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/SklearnServeRuntime.java @@ -3,9 +3,9 @@ import it.smartcommunitylabdhub.commons.accessors.spec.RunSpecAccessor; import it.smartcommunitylabdhub.commons.annotations.infrastructure.RuntimeComponent; import it.smartcommunitylabdhub.commons.models.base.Executable; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.task.TaskBaseSpec; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.task.TaskBaseSpec; import it.smartcommunitylabdhub.commons.services.entities.ModelService; import it.smartcommunitylabdhub.commons.services.entities.SecretService; import it.smartcommunitylabdhub.framework.k8s.base.K8sBaseRuntime; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeFunctionSpec.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeFunctionSpec.java index 49beb922..3310327f 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeFunctionSpec.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeFunctionSpec.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.function.FunctionBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.FunctionBaseSpec; import it.smartcommunitylabdhub.runtime.sklearn.SklearnServeRuntime; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeRunSpec.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeRunSpec.java index 939e816d..61919022 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeRunSpec.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeRunSpec.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; import it.smartcommunitylabdhub.runtime.sklearn.SklearnServeRuntime; import java.io.Serializable; import java.util.Map; diff --git a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeTaskSpec.java b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeTaskSpec.java index 7c6298d4..3b818ea3 100644 --- a/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeTaskSpec.java +++ b/modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeTaskSpec.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.runtime.sklearn.specs; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.runtime.modelserve.specs.ModelServeServeTaskSpec; import it.smartcommunitylabdhub.runtime.sklearn.SklearnServeRuntime; import java.io.Serializable; diff --git a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/NefertemRuntime.java b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/NefertemRuntime.java index 4880223e..c908666b 100644 --- a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/NefertemRuntime.java +++ b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/NefertemRuntime.java @@ -3,9 +3,9 @@ import it.smartcommunitylabdhub.commons.accessors.spec.RunSpecAccessor; import it.smartcommunitylabdhub.commons.annotations.infrastructure.RuntimeComponent; import it.smartcommunitylabdhub.commons.models.base.Executable; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.task.TaskBaseSpec; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.task.TaskBaseSpec; import it.smartcommunitylabdhub.commons.services.entities.SecretService; import it.smartcommunitylabdhub.framework.k8s.base.K8sBaseRuntime; import it.smartcommunitylabdhub.framework.k8s.runnables.K8sJobRunnable; diff --git a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemInferRunner.java b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemInferRunner.java index 179c4fb3..a65ead90 100644 --- a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemInferRunner.java +++ b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemInferRunner.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.runtime.nefertem.runners; import it.smartcommunitylabdhub.commons.exceptions.CoreRuntimeException; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.objects.CoreEnv; import it.smartcommunitylabdhub.framework.k8s.runnables.K8sJobRunnable; import it.smartcommunitylabdhub.runtime.nefertem.NefertemRuntime; diff --git a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemMetricRunner.java b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemMetricRunner.java index bdd10480..aaf69df0 100644 --- a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemMetricRunner.java +++ b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemMetricRunner.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.runtime.nefertem.runners; import it.smartcommunitylabdhub.commons.exceptions.CoreRuntimeException; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.objects.CoreEnv; import it.smartcommunitylabdhub.framework.k8s.runnables.K8sJobRunnable; import it.smartcommunitylabdhub.runtime.nefertem.NefertemRuntime; diff --git a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemProfileRunner.java b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemProfileRunner.java index 85a8f83b..1c93b4d4 100644 --- a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemProfileRunner.java +++ b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemProfileRunner.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.runtime.nefertem.runners; import it.smartcommunitylabdhub.commons.exceptions.CoreRuntimeException; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.objects.CoreEnv; import it.smartcommunitylabdhub.framework.k8s.runnables.K8sJobRunnable; import it.smartcommunitylabdhub.runtime.nefertem.NefertemRuntime; diff --git a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemValidateRunner.java b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemValidateRunner.java index 36a66c9b..c41e2eb5 100644 --- a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemValidateRunner.java +++ b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/runners/NefertemValidateRunner.java @@ -1,8 +1,8 @@ package it.smartcommunitylabdhub.runtime.nefertem.runners; import it.smartcommunitylabdhub.commons.exceptions.CoreRuntimeException; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.objects.CoreEnv; import it.smartcommunitylabdhub.framework.k8s.runnables.K8sJobRunnable; import it.smartcommunitylabdhub.runtime.nefertem.NefertemRuntime; diff --git a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemFunctionSpec.java b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemFunctionSpec.java index 740b7a0f..31aae62b 100644 --- a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemFunctionSpec.java +++ b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemFunctionSpec.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.function.FunctionBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.FunctionBaseSpec; import it.smartcommunitylabdhub.runtime.nefertem.NefertemRuntime; import java.io.Serializable; import java.util.List; diff --git a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemInferTaskSpec.java b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemInferTaskSpec.java index 33f535ed..12feecac 100644 --- a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemInferTaskSpec.java +++ b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemInferTaskSpec.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.runtime.nefertem.specs; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.runtime.nefertem.NefertemRuntime; import java.io.Serializable; import java.util.Map; diff --git a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemMetricTaskSpec.java b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemMetricTaskSpec.java index 8d18c30c..7bb57b4e 100644 --- a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemMetricTaskSpec.java +++ b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemMetricTaskSpec.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.runtime.nefertem.specs; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.runtime.nefertem.NefertemRuntime; import java.io.Serializable; import java.util.Map; diff --git a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemProfileTaskSpec.java b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemProfileTaskSpec.java index 38474a24..7c1e3c8a 100644 --- a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemProfileTaskSpec.java +++ b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemProfileTaskSpec.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.runtime.nefertem.specs; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.runtime.nefertem.NefertemRuntime; import java.io.Serializable; import java.util.Map; diff --git a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemRunSpec.java b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemRunSpec.java index 9375e084..1fccc1ec 100644 --- a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemRunSpec.java +++ b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemRunSpec.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; import it.smartcommunitylabdhub.runtime.nefertem.NefertemRuntime; import java.io.Serializable; import java.util.HashMap; diff --git a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemRunStatus.java b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemRunStatus.java index 104bd2ea..c40470d0 100644 --- a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemRunStatus.java +++ b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemRunStatus.java @@ -1,7 +1,8 @@ package it.smartcommunitylabdhub.runtime.nefertem.specs; import com.fasterxml.jackson.annotation.JsonInclude; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; + +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemValidateTaskSpec.java b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemValidateTaskSpec.java index 47bc3f11..951596c9 100644 --- a/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemValidateTaskSpec.java +++ b/modules/runtime-nefertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemValidateTaskSpec.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.runtime.nefertem.specs; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.runtime.nefertem.NefertemRuntime; import java.io.Serializable; import java.util.Map; diff --git a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/PythonRuntime.java b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/PythonRuntime.java index 132edce6..761b128e 100644 --- a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/PythonRuntime.java +++ b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/PythonRuntime.java @@ -4,10 +4,10 @@ import it.smartcommunitylabdhub.commons.annotations.infrastructure.RuntimeComponent; import it.smartcommunitylabdhub.commons.infrastructure.RunRunnable; import it.smartcommunitylabdhub.commons.models.base.Executable; -import it.smartcommunitylabdhub.commons.models.entities.function.Function; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; -import it.smartcommunitylabdhub.commons.models.entities.task.Task; -import it.smartcommunitylabdhub.commons.models.entities.task.TaskBaseSpec; +import it.smartcommunitylabdhub.commons.models.function.Function; +import it.smartcommunitylabdhub.commons.models.run.Run; +import it.smartcommunitylabdhub.commons.models.task.Task; +import it.smartcommunitylabdhub.commons.models.task.TaskBaseSpec; import it.smartcommunitylabdhub.commons.services.entities.FunctionService; import it.smartcommunitylabdhub.commons.services.entities.SecretService; import it.smartcommunitylabdhub.framework.k8s.base.K8sBaseRuntime; diff --git a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/runners/PythonBuildRunner.java b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/runners/PythonBuildRunner.java index f8ed56fe..c1fd555e 100644 --- a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/runners/PythonBuildRunner.java +++ b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/runners/PythonBuildRunner.java @@ -2,8 +2,8 @@ import it.smartcommunitylabdhub.commons.accessors.spec.RunSpecAccessor; import it.smartcommunitylabdhub.commons.accessors.spec.TaskSpecAccessor; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sBuilderHelper; import it.smartcommunitylabdhub.framework.k8s.model.ContextRef; import it.smartcommunitylabdhub.framework.k8s.model.ContextSource; diff --git a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/runners/PythonJobRunner.java b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/runners/PythonJobRunner.java index bce3728d..0b24fb6a 100644 --- a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/runners/PythonJobRunner.java +++ b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/runners/PythonJobRunner.java @@ -5,8 +5,8 @@ import it.smartcommunitylabdhub.commons.accessors.spec.TaskSpecAccessor; import it.smartcommunitylabdhub.commons.exceptions.CoreRuntimeException; import it.smartcommunitylabdhub.commons.jackson.JacksonMapper; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sBuilderHelper; import it.smartcommunitylabdhub.framework.k8s.model.ContextRef; import it.smartcommunitylabdhub.framework.k8s.model.ContextSource; diff --git a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/runners/PythonServeRunner.java b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/runners/PythonServeRunner.java index 55b5e547..98f94f85 100644 --- a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/runners/PythonServeRunner.java +++ b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/runners/PythonServeRunner.java @@ -4,8 +4,8 @@ import it.smartcommunitylabdhub.commons.accessors.spec.TaskSpecAccessor; import it.smartcommunitylabdhub.commons.exceptions.CoreRuntimeException; import it.smartcommunitylabdhub.commons.jackson.JacksonMapper; -import it.smartcommunitylabdhub.commons.models.entities.run.Run; import it.smartcommunitylabdhub.commons.models.enums.State; +import it.smartcommunitylabdhub.commons.models.run.Run; import it.smartcommunitylabdhub.framework.k8s.kubernetes.K8sBuilderHelper; import it.smartcommunitylabdhub.framework.k8s.model.ContextRef; import it.smartcommunitylabdhub.framework.k8s.model.ContextSource; diff --git a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonBuildTaskSpec.java b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonBuildTaskSpec.java index b504ccb9..8f48db4b 100644 --- a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonBuildTaskSpec.java +++ b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonBuildTaskSpec.java @@ -1,7 +1,7 @@ package it.smartcommunitylabdhub.runtime.python.specs; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.framework.k8s.base.K8sFunctionTaskBaseSpec; import it.smartcommunitylabdhub.runtime.python.PythonRuntime; import java.io.Serializable; diff --git a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonFunctionSpec.java b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonFunctionSpec.java index 9e21e47d..2eeba100 100644 --- a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonFunctionSpec.java +++ b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonFunctionSpec.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.entities.function.FunctionBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.function.FunctionBaseSpec; import it.smartcommunitylabdhub.runtime.python.PythonRuntime; import it.smartcommunitylabdhub.runtime.python.model.PythonSourceCode; import it.smartcommunitylabdhub.runtime.python.model.PythonVersion; diff --git a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonJobTaskSpec.java b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonJobTaskSpec.java index e0fa01fd..16e27b40 100644 --- a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonJobTaskSpec.java +++ b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonJobTaskSpec.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import it.smartcommunitylabdhub.commons.Keys; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.framework.k8s.base.K8sFunctionTaskBaseSpec; import it.smartcommunitylabdhub.runtime.python.PythonRuntime; import jakarta.validation.constraints.Min; diff --git a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonRunSpec.java b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonRunSpec.java index ab30a67a..52a5c4ae 100644 --- a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonRunSpec.java +++ b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonRunSpec.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; +import it.smartcommunitylabdhub.commons.models.run.RunBaseSpec; import it.smartcommunitylabdhub.runtime.python.PythonRuntime; import java.io.Serializable; import java.util.HashMap; diff --git a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonRunStatus.java b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonRunStatus.java index 33a2b765..6a4731db 100644 --- a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonRunStatus.java +++ b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonRunStatus.java @@ -1,7 +1,8 @@ package it.smartcommunitylabdhub.runtime.python.specs; import com.fasterxml.jackson.annotation.JsonInclude; -import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseStatus; + +import it.smartcommunitylabdhub.commons.models.run.RunBaseStatus; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonServeTaskSpec.java b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonServeTaskSpec.java index b7910f60..05a507e7 100644 --- a/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonServeTaskSpec.java +++ b/modules/runtime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonServeTaskSpec.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import it.smartcommunitylabdhub.commons.annotations.common.SpecType; -import it.smartcommunitylabdhub.commons.models.enums.EntityName; +import it.smartcommunitylabdhub.commons.models.entities.EntityName; import it.smartcommunitylabdhub.framework.k8s.base.K8sFunctionTaskBaseSpec; import it.smartcommunitylabdhub.framework.k8s.objects.CoreServiceType; import it.smartcommunitylabdhub.runtime.python.PythonRuntime;