From 2652e9da8e1ed32a066db10d3fa26a1333b01e2a Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Fri, 22 Jul 2022 17:05:58 -0700 Subject: [PATCH] Update license text Signed-off-by: Victor Chang --- .dockerignore | 16 +- .editorconfig | 16 +- .github/workflows/build.yml | 15 +- .github/workflows/codeql.yml | 15 +- .github/workflows/publish.yml | 17 +- .github/workflows/security.yml | 15 +- .github/workflows/test.yml | 25 ++- .gitignore | 14 ++ .licenserc.yaml | 3 + CODE_OF_CONDUCT.md | 15 +- CONTRIBUTING.md | 42 +++-- README.md | 16 ++ codecov.yml | 15 +- doc/dependency_decisions.yml | 14 ++ docker-compose/docker-compose.yml | 14 ++ guidelines/mwm-input.md | 16 ++ guidelines/mwm-sadd.md | 16 ++ guidelines/mwm-srs.md | 16 ++ guidelines/mwm-storage.md | 16 ++ guidelines/mwm-workflow-spec.md | 16 ++ .../static/workflow_examples/scenario2.yml | 14 ++ .../Monai.Deploy.WorkflowManager.CLI.csproj | 16 ++ src/CLI/Program.cs | 17 +- .../Extensions/StorageListExtensions.cs | 17 +- .../Extensions/TaskDispatchEventExtension.cs | 17 +- src/Common/Interfaces/IPaginatedApi.cs | 17 +- src/Common/Interfaces/IPayloadService.cs | 17 +- .../Interfaces/IWorkflowInstanceService.cs | 18 +- src/Common/Interfaces/IWorkflowService.cs | 17 +- ...Monai.Deploy.WorkflowManager.Common.csproj | 15 +- src/Common/ServiceNotFoundException.cs | 17 +- src/Common/Services/IMonaiService.cs | 17 +- src/Common/Services/PayloadService.cs | 17 +- .../Services/WorkflowInstanceService.cs | 17 +- src/Common/Services/WorkflowService.cs | 17 +- src/Common/TypeExtensions.cs | 19 ++- .../Extensions/RegexExtensions.cs | 17 +- .../Extensions/StringExtensions.cs | 17 +- ....WorkflowManager.ConditionsResolver.csproj | 15 +- .../Parser/ConditionalParameterParser.cs | 17 +- .../Parser/IConditionalParameterParser.cs | 17 +- .../Resovler/Conditional.cs | 17 +- .../Resovler/ConditionalGroup.cs | 17 +- src/ConditionsResolver/Resovler/Keyword.cs | 17 +- src/Configuration/ConfigurationValidator.cs | 17 +- src/Configuration/DicomAgentConfiguration.cs | 17 +- .../Exceptions/ConfigurationException.cs | 17 +- .../MessageBrokerConfiguration.cs | 17 +- .../MessageBrokerConfigurationKeys.cs | 17 +- ...eploy.WorkflowManager.Configuration.csproj | 15 +- src/Configuration/PaginationSettings.cs | 17 +- src/Configuration/RetryConfiguration.cs | 17 +- src/Configuration/StorageConfiguration.cs | 17 +- src/Configuration/TaskManagerConfiguration.cs | 17 +- src/Configuration/WorkflowManagerOptions.cs | 17 +- src/Contracts/Constants/TaskTypeConstants.cs | 18 +- src/Contracts/Models/Artifact.cs | 17 +- src/Contracts/Models/ArtifactMap.cs | 17 +- src/Contracts/Models/DicomTags.cs | 17 +- src/Contracts/Models/DicomValue.cs | 17 +- src/Contracts/Models/Evaluator.cs | 17 +- src/Contracts/Models/ExecutionContext.cs | 17 +- src/Contracts/Models/ExportDestination.cs | 17 +- src/Contracts/Models/ISoftDeleteable.cs | 18 +- src/Contracts/Models/InformaticsGateway.cs | 17 +- src/Contracts/Models/PatientDetails.cs | 18 +- src/Contracts/Models/Payload.cs | 18 +- src/Contracts/Models/Status.cs | 17 +- src/Contracts/Models/TaskDestination.cs | 17 +- src/Contracts/Models/TaskExecution.cs | 17 +- src/Contracts/Models/TaskObject.cs | 17 +- src/Contracts/Models/TaskPluginArguments.cs | 17 +- src/Contracts/Models/Workflow.cs | 18 +- src/Contracts/Models/WorkflowInstance.cs | 17 +- src/Contracts/Models/WorkflowRevision.cs | 18 +- ...ai.Deploy.WorkflowManager.Contracts.csproj | 15 +- .../Responses/CreateWorkflowResponse.cs | 17 +- src/Contracts/Rest/ServiceStatus.cs | 17 +- src/Database/Interfaces/IPayloadRepsitory.cs | 20 ++- .../Interfaces/IWorkflowInstanceRepository.cs | 17 +- .../Interfaces/IWorkflowRepository.cs | 17 +- ...nai.Deploy.WorkflowManager.Database.csproj | 20 ++- .../WorkloadManagerDatabaseSettings.cs | 17 +- src/Database/PayloadRepository.cs | 17 +- src/Database/RepositoryBase.cs | 17 +- src/Database/WorkflowInstanceRepository.cs | 18 +- src/Database/WorkflowRepository.cs | 17 +- src/Logging/LoggerHelpers.cs | 17 +- src/Logging/Logging/Log.cs | 19 ++- src/Logging/Models/ObjectLog.cs | 17 +- ...onai.Deploy.WorkflowManager.Logging.csproj | 15 +- .../Constants/DicomTagConstants.cs | 17 +- ...onai.Deploy.WorkflowManager.Storage.csproj | 19 ++- .../Services/DicomService.cs | 25 ++- .../Services/IDicomService.cs | 17 +- src/Monai.Deploy.WorkflowManager.sln | 18 +- .../Extensions/ValidationExtensions.cs | 17 +- .../Extensions/WorkflowExtensions.cs | 17 +- ...loy.WorkflowManager.PayloadListener.csproj | 15 +- .../Services/EventPayloadRecieverService.cs | 17 +- .../Services/IEventPayloadRecieverService.cs | 17 +- .../Services/PayloadListenerService.cs | 17 +- .../Validators/EventPayloadValidator.cs | 20 ++- .../Validators/IEventPayloadValidator.cs | 17 +- src/TaskManager/API/ExecutionStatus.cs | 17 +- src/TaskManager/API/IMetadataRepository.cs | 17 +- src/TaskManager/API/ITaskPlugin.cs | 17 +- src/TaskManager/API/InvalidTaskException.cs | 17 +- src/TaskManager/API/MetadataRepositoryBase.cs | 17 +- ...loy.WorkflowManager.TaskManager.API.csproj | 15 +- src/TaskManager/API/TaskPluginBase.cs | 17 +- src/TaskManager/AssemblyInfo.cs | 17 +- src/TaskManager/Logging/Log.cs | 17 +- ....Deploy.WorkflowManager.TaskManager.csproj | 17 +- .../AideClinicalReviewPlugin.cs | 18 +- .../Events/ClinicalReviewRequestEvent.cs | 18 +- .../Plug-ins/AideClinicalReview/Keys.cs | 18 +- .../AideClinicalReview/Logging/Log.cs | 18 +- .../Models/PatientMetadata.cs | 18 +- ...ager.TaskManager.AideClinicalReview.csproj | 20 ++- src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs | 17 +- src/TaskManager/Plug-ins/Argo/ArgoProvider.cs | 17 +- .../Argo/ArtifactMappingNotFoundException.cs | 17 +- src/TaskManager/Plug-ins/Argo/AssemblyInfo.cs | 17 +- .../Plug-ins/Argo/ExitHookTemplate.cs | 17 +- .../Plug-ins/Argo/IArgoProvider.cs | 17 +- .../Plug-ins/Argo/IKubernetesProvider.cs | 17 +- .../Plug-ins/Argo/KubernetesProvider.cs | 17 +- src/TaskManager/Plug-ins/Argo/Logging/Log.cs | 17 +- ...oy.WorkflowManager.TaskManager.Argo.csproj | 15 +- .../Repositories/ArgoMetadataRepository.cs | 17 +- .../Plug-ins/Argo/Specs/ArgoGeneratedCocde.cs | 20 ++- .../Plug-ins/Argo/StaticValues/Keys.cs | 17 +- .../Argo/StaticValues/ResourcesKey.cs | 17 +- .../Argo/StaticValues/ResourcesKeys.cs | 17 +- src/TaskManager/Plug-ins/Argo/Strings.cs | 17 +- .../Argo/TemplateNotFoundException.cs | 17 +- src/TaskManager/Plug-ins/TestPlugin/Keys.cs | 18 +- ...kflowManager.TaskManager.TestPlugin.csproj | 16 ++ .../Repositories/ArgoMetadataRepository.cs | 17 +- .../Plug-ins/TestPlugin/TestPlugin.cs | 18 +- src/TaskManager/PluginStrings.cs | 17 +- ....WorkflowManager.TaskManager.Runner.csproj | 15 +- src/TaskManager/Runner/Program.cs | 17 +- src/TaskManager/Strings.cs | 17 +- src/TaskManager/TaskManager.cs | 17 +- src/TaskManager/TaskRunnerInstance.cs | 17 +- src/WorkflowExecuter/Common/ArtifactMapper.cs | 17 +- src/WorkflowExecuter/Common/EventMapper.cs | 17 +- .../Common/IArtifactMapper.cs | 17 +- .../Common/TaskExecutionStatusExtensions.cs | 17 +- ...loy.WorkloadManager.WorkfowExecuter.csproj | 17 +- .../Services/IWorkflowExecuterService.cs | 17 +- .../Services/WorkflowExecuterService.cs | 17 +- src/WorkflowManager/AssemblyInfo.cs | 17 +- .../Common/ServiceProviderExtensions.cs | 17 +- .../Controllers/ApiControllerBase.cs | 17 +- .../Controllers/PayloadController.cs | 21 ++- .../Controllers/WorkflowInstanceController.cs | 17 +- .../Controllers/WorkflowsController.cs | 17 +- .../Extentions/TaskManagerExtensions.cs | 17 +- .../Extentions/WorkflowExecutorExtensions.cs | 17 +- .../Filter/PaginationFilter.cs | 17 +- .../Logging/FileLoggingTextFormatter.cs | 17 +- .../Monai.Deploy.WorkflowManager.csproj | 19 ++- src/WorkflowManager/Program.cs | 17 +- .../DataRetentionService.cs | 17 +- src/WorkflowManager/Services/Http/Startup.cs | 17 +- src/WorkflowManager/Services/IUriService.cs | 17 +- src/WorkflowManager/Services/UriService.cs | 17 +- src/WorkflowManager/Wrappers/PagedResponse.cs | 17 +- src/WorkflowManager/Wrappers/Response.cs | 17 +- stylecop.json | 4 +- .../Features/ClinicalReview.feature | 16 +- .../Features/TaskUpdate.feature | 16 +- .../TaskManager.IntegrationTests/Hooks.cs | 17 +- .../ImplicitUsings.cs | 18 +- ...anager.TaskManager.IntegrationTests.csproj | 16 ++ .../POCO/TestExecutionConfig.cs | 17 +- .../TaskManager.IntegrationTests/README.md | 20 ++- .../ClinicalReviewStepDefinitions.cs | 18 +- .../StepDefinitions/CommonStepDefinitions.cs | 17 +- .../TaskUpdateStepDefinitions.cs | 17 +- .../Support/Assertions.cs | 17 +- .../Support/DataHelper.cs | 17 +- .../Support/MinioClientUtil.cs | 18 +- .../Support/RabbitConnectionFactory.cs | 17 +- .../Support/RabbitConsumer.cs | 17 +- .../Support/RabbitPublisher.cs | 17 +- .../Support/TaskManagerStartup.cs | 17 +- .../TestData/Helper.cs | 17 +- .../TestData/TaskCallbackTestData.cs | 18 +- .../TestData/TaskDispatchTestData.cs | 18 +- .../TaskManager.IntegrationTests/nginx.conf | 14 ++ .../Features/PayloadApi.feature | 16 +- .../Features/PayloadCollection.feature | 22 ++- .../Features/RouterTasks.feature | 16 +- .../Features/TaskDestinations.feature | 20 ++- .../Features/TaskStatusUpdate.feature | 20 ++- .../Features/WorkflowApi.feature | 32 +++- .../Features/WorkflowInstancesApi.feature | 20 ++- .../Features/WorkflowRequest.feature | 18 +- .../Features/WorkflowTaskArtefacts.feature | 20 ++- .../Hooks.cs | 17 +- .../ImplicitUsings.cs | 18 +- .../WorkflowRequestMessage.cs | 17 +- ...r.WorkflowExecutor.IntegrationTests.csproj | 16 ++ .../POCO/TestExecutionConfig.cs | 17 +- .../README.md | 20 ++- .../CommonApiStepDefinitions.cs | 17 +- .../PayloadApiStepDefinitions.cs | 17 +- .../PayloadCollectionStepDefinitions.cs | 17 +- .../TaskDestinationsStepDefinitions.cs | 18 +- .../TaskStatusUpdateStepDefinitions.cs | 17 +- .../WorkflowApiStepDefinitions.cs | 17 +- .../WorkflowInstancesApiStepDefinitions.cs | 17 +- .../WorkflowRequestStepDefinitions.cs | 17 +- .../WorkflowTaskArtefactStepDefinitions.cs | 17 +- .../Support/ApiHelper.cs | 18 +- .../Support/Assertions.cs | 154 ++++++++++-------- .../Support/DataHelper.cs | 21 ++- .../Support/HttpRequestMessageExtensions.cs | 18 +- .../Support/JsonFormatter.cs | 17 +- .../Support/MessageReceiver.cs | 17 +- .../Support/MinioClientUtil.cs | 18 +- .../Support/MongoClientUtil.cs | 45 +++-- .../Support/RabbitConnectionFactory.cs | 17 +- .../Support/RabbitConsumer.cs | 17 +- .../Support/RabbitPublisher.cs | 17 +- .../Support/WorkflowExecutorStartup.cs | 18 +- .../TestData/Helper.cs | 17 +- .../TestData/PatientTestData.cs | 18 +- .../TestData/PayloadTestData.cs | 18 +- .../TestData/TaskUpdateTestData.cs | 18 +- .../TestData/WorkflowInstanceTestData.cs | 17 +- .../TestData/WorkflowObjectTestData.cs | 17 +- .../TestData/WorkflowRequestTestData.cs | 17 +- .../TestData/WorkflowRevisionTestData.cs | 17 +- .../nginx.conf | 14 ++ tests/Shared/VerifyLogExtension.cs | 17 +- ...ai.Deploy.WorkflowManager.CLI.Tests.csproj | 16 ++ ....Deploy.WorkflowManger.Common.Tests.csproj | 16 +- .../Services/WorkflowServiceTests.cs | 17 +- ...lowManager.ConditionsResolver.Tests.csproj | 16 ++ .../Resolver/ConditionalGroupTests.cs | 17 +- .../Resolver/ConditionalTests.cs | 17 +- .../Resolver/RegexExtensionsTests.cs | 17 +- .../Resolver/StringExtensionsTests.cs | 17 +- .../ConfigurationValidatorTest.cs | 17 +- ...WorkflowManager.Configuration.Tests.csproj | 15 +- .../Configuration.Tests/VerifyLogExtension.cs | 17 +- ...ploy.WorkflowManager.Database.Tests.csproj | 16 ++ ...rkflowManager.PayloadListener.Tests.csproj | 15 +- .../EventPayloadRecieverServiceTests.cs | 17 +- .../Validators/EventPayloadValidatorTests.cs | 17 +- ...eploy.WorkflowManager.Storage.Tests.csproj | 15 +- .../Services/DicomServiceTests.cs | 17 +- .../AideClinicalReviewPluginTests.cs | 16 ++ ...askManager.AideClinicalReview.Tests.csproj | 16 ++ .../TaskManager.Argo.Tests/ArgoPluginTest.cs | 17 +- .../ArgoProviderTest.cs | 17 +- ...kflowManager.TaskManager.Argo.Tests.csproj | 16 ++ .../ArgoMetadataRepositoryTests.cs | 17 +- .../DagWithIntermediateArtifacts.yml | 17 +- .../Templates/SimpleTemplate.yml | 15 +- ...y.WorkflowManager.TaskManager.Tests.csproj | 15 +- .../TaskManager.Tests/TaskManagerTest.cs | 17 +- .../Common/ArtifactMapperTests.cs | 17 +- .../Common/EventMapperTests.cs | 17 +- .../TaskExecutionStatusExtensionsTests.cs | 18 +- ...kflowManager.WorkflowExecuter.Tests.csproj | 16 ++ .../ConditionalParameterParserTests.cs | 19 ++- .../Services/WorkflowExecuterServiceTests.cs | 17 +- ...Deploy.WorkflowManager.Common.Tests.csproj | 16 ++ .../Services/PayloadServiceTests.cs | 18 +- .../StorageListExtensionsTests.cs | 18 +- .../Common/IServiceProviderExtensionsTest.cs | 17 +- .../Controllers/PayloadControllerTests.cs | 17 +- .../WorkflowInstanceControllerTests.cs | 17 +- .../Controllers/WorkflowsControllerTests.cs | 17 +- .../DummyMessagingService.cs | 17 +- .../DummyStorageService.cs | 17 +- .../Logging/FileLoggingTextFormatterTest.cs | 17 +- .../Monai.Deploy.WorkflowManager.Tests.csproj | 17 +- .../WorkflowManager.Tests/ProgramTest.cs | 17 +- .../DataRetentionServiceTest.cs | 17 +- .../Shared/VerifyLogExtension.cs | 17 +- tests/coverlet.runsettings | 15 ++ 288 files changed, 4473 insertions(+), 624 deletions(-) diff --git a/.dockerignore b/.dockerignore index bfc6570f9..7d9ca7c42 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,17 @@ +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + .github/ .docs/ .demos/ @@ -58,4 +72,4 @@ bld/ # files ending in .cache can be ignored *.[Cc]ache # but keep track of directories ending in .cache -!*.[Cc]ache/ \ No newline at end of file +!*.[Cc]ache/ diff --git a/.editorconfig b/.editorconfig index b307fd96b..b0ed567c9 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,10 +1,24 @@ +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # editorconfig.org # top-most EditorConfig file root = true # Copyright File Header -file_header_template = SPDX-FileCopyrightText: © [year file created] - [last year file modified], MONAI Consortium\nSPDX-License-Identifier: Apache License 2.0 +file_header_template = SPDX-FileCopyrightText: � [year file created] - [last year file modified], MONAI Consortium\nSPDX-License-Identifier: Apache License 2.0 dotnet_diagnostic.IDE0073.severity = error # Default settings: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a56d82062..131400cbf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,16 @@ -# SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -# SPDX-License-Identifier: Apache License 2.0 +# Copyright 2021-2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. name: Build Project diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2fee5095e..787eb34ef 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,5 +1,16 @@ -# SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -# SPDX-License-Identifier: Apache License 2.0 +# Copyright 2021-2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. name: CodeQL diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9b44f117e..2026ccd50 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,5 +1,16 @@ -# SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -# SPDX-License-Identifier: Apache License 2.0 +# Copyright 2021-2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. name: Publish and scan @@ -26,7 +37,7 @@ jobs: export VERSION=`cat VERSION` ./build.sh docker tag monai/workflow-manager:$VERSION monai/workflow-manager:${{ github.sha }} - + - name: Scan image with Azure Container Scan uses: Azure/container-scan@v0 with: diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index 32cc75e75..6c1727dd2 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -1,5 +1,16 @@ -# SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -# SPDX-License-Identifier: Apache License 2.0 +# Copyright 2021-2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. name: Security Scanning diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 923887c55..cbcc78672 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,16 @@ -# SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -# SPDX-License-Identifier: Apache License 2.0 +# Copyright 2021-2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. name: Tests & Sonarscanner/CodeCov @@ -44,9 +55,9 @@ jobs: run: | find ~+ -type f -name "*.Tests.csproj" | \ xargs -L1 dotnet test -v=minimal --results-directory "./results" \ - --collect:"XPlat Code Coverage" --settings "./coverlet.runsettings" + --collect:"XPlat Code Coverage" --settings "./coverlet.runsettings" working-directory: ./tests - + - name: Archive code coverage results uses: actions/upload-artifact@v3 with: @@ -235,8 +246,8 @@ jobs: - name: Download code coverage from unit tests uses: actions/download-artifact@v3 with: - name: code-coverage-reports - + name: code-coverage-reports + - name: End SonarScanner env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -251,7 +262,7 @@ jobs: - name: Download code coverage from unit tests uses: actions/download-artifact@v3 with: - name: code-coverage-reports + name: code-coverage-reports - name: Run CodeCov analysis uses: codecov/codecov-action@v2 diff --git a/.gitignore b/.gitignore index 371d3d933..2d928f63f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,17 @@ +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # Created by https://www.toptal.com/developers/gitignore/api/aspnetcore,dotnetcore,visualstudio,visualstudiocode # Edit at https://www.toptal.com/developers/gitignore?templates=aspnetcore,dotnetcore,visualstudio,visualstudiocode diff --git a/.licenserc.yaml b/.licenserc.yaml index b8e0f2bf8..73e58a905 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -19,14 +19,17 @@ header: paths-ignore: - 'LICENSE' + - 'VERSION' - '.github/**/*.md' - '**/*.log' - '**/bin/**' - '**/obj/**' - '**/*.json' + - '**/*.nswag' - '**/*.ruleset' - 'src/.sonarlint/**' - 'src/coverlet.runsettings' + - 'src/.vs' comment: on-failure diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 86de87094..43ea6251e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,6 +1,17 @@ # Contributor Covenant Code of Conduct diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a5c70f1f7..d277bf61c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,23 +1,24 @@ + - [Introduction](#introduction) - [Communicate with us](#communicate-with-us) - [The contribution process](#the-contribution-process) - [Preparing pull requests](#preparing-pull-requests) - - [Checking the coding style](#checking-the-coding-style) - - [C# Coding Style](#c-coding-style) - - [License information](#license-information) - - [License Scanning](#license-scanning) - - [Test Projects](#test-projects) - - [Building the documentation](#building-the-documentation) - - [Automatic code formatting](#automatic-code-formatting) - - [Signing your work](#signing-your-work) - [Submitting pull requests](#submitting-pull-requests) - - [Branching](#branching) - - [Begin with Your Contribution Journey with a Pull Request](#begin-with-your-contribution-journey-with-a-pull-request) - - [When You Are Ready to Merge](#when-you-are-ready-to-merge) - [Release a new version](#release-a-new-version) @@ -88,8 +89,19 @@ An [EditorConfig](https://editorconfig.org "EditorConfig homepage") file (`.edit All source code files should start with this paragraph: ``` -// SPDX-FileCopyrightText: © [YEAR]-[YEAR] MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +// Copyright 2022 MONAI Consortium +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. ``` ##### License Scanning diff --git a/README.md b/README.md index 24fb7b90d..e1bdaac7f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,19 @@ + +

project-monai

diff --git a/codecov.yml b/codecov.yml index c5717ec86..adc26de45 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,5 +1,16 @@ -# SPDX-FileCopyrightText: � 2021-2022 MONAI Consortium -# SPDX-License-Identifier: Apache License 2.0 +# Copyright 2021-2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. codecov: require_ci_to_pass: true diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index 01a0db41a..aaf1cca45 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -1,3 +1,17 @@ +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + --- - - :approve - Microsoft.Extensions.ApiDescription.Server diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index ec3f62020..1edecb2ce 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -1,3 +1,17 @@ +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + version: '3.9' services: diff --git a/guidelines/mwm-input.md b/guidelines/mwm-input.md index 8b733c376..07b6e0ac1 100644 --- a/guidelines/mwm-input.md +++ b/guidelines/mwm-input.md @@ -1,3 +1,19 @@ + + # Payload Upload/Input Payloads are sent to the MWM using notifications. The [payload listener](mwm-sadd.md#payload-listener) is responsible for consuming notification messages that are sent using a message broker. diff --git a/guidelines/mwm-sadd.md b/guidelines/mwm-sadd.md index 30a5810ab..ff063a582 100644 --- a/guidelines/mwm-sadd.md +++ b/guidelines/mwm-sadd.md @@ -1,3 +1,19 @@ + + # MONAI Workflow Manager Software Architecture & Design ![MONAI Deploy Workflow Manager](./static/mwm-detailed.png) diff --git a/guidelines/mwm-srs.md b/guidelines/mwm-srs.md index 1573e57a5..5274d99a9 100644 --- a/guidelines/mwm-srs.md +++ b/guidelines/mwm-srs.md @@ -1,3 +1,19 @@ + + # MONAI Deploy Workflow Manager Requirements ![MONAI Deploy Workflow Manager](./static/mwm.png) diff --git a/guidelines/mwm-storage.md b/guidelines/mwm-storage.md index d4d68ab8a..925ac744f 100644 --- a/guidelines/mwm-storage.md +++ b/guidelines/mwm-storage.md @@ -1,3 +1,19 @@ + + # Storage Input data, metadata & task output artifacts are all stored in a shared storage layer. diff --git a/guidelines/mwm-workflow-spec.md b/guidelines/mwm-workflow-spec.md index 60cc1a21d..bb74ee6e4 100644 --- a/guidelines/mwm-workflow-spec.md +++ b/guidelines/mwm-workflow-spec.md @@ -1,3 +1,19 @@ + + # Clinical Workflow Specification Language # Note: this document is not currently up-to-date. It will be updated before the first release of the workflow manager. diff --git a/guidelines/static/workflow_examples/scenario2.yml b/guidelines/static/workflow_examples/scenario2.yml index 6ce7a2c9a..e1045f232 100644 --- a/guidelines/static/workflow_examples/scenario2.yml +++ b/guidelines/static/workflow_examples/scenario2.yml @@ -1,3 +1,17 @@ +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + workflow: name: my-workflow description: my awesome workflow diff --git a/src/CLI/Monai.Deploy.WorkflowManager.CLI.csproj b/src/CLI/Monai.Deploy.WorkflowManager.CLI.csproj index e690db624..fd36abf9c 100644 --- a/src/CLI/Monai.Deploy.WorkflowManager.CLI.csproj +++ b/src/CLI/Monai.Deploy.WorkflowManager.CLI.csproj @@ -1,3 +1,19 @@ + + diff --git a/src/CLI/Program.cs b/src/CLI/Program.cs index 5ffe432c8..a166cba91 100644 --- a/src/CLI/Program.cs +++ b/src/CLI/Program.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; diff --git a/src/Common/Extensions/StorageListExtensions.cs b/src/Common/Extensions/StorageListExtensions.cs index 442cad9b5..414777201 100644 --- a/src/Common/Extensions/StorageListExtensions.cs +++ b/src/Common/Extensions/StorageListExtensions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; diff --git a/src/Common/Extensions/TaskDispatchEventExtension.cs b/src/Common/Extensions/TaskDispatchEventExtension.cs index 4804c736e..9f597069f 100644 --- a/src/Common/Extensions/TaskDispatchEventExtension.cs +++ b/src/Common/Extensions/TaskDispatchEventExtension.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; using Newtonsoft.Json; diff --git a/src/Common/Interfaces/IPaginatedApi.cs b/src/Common/Interfaces/IPaginatedApi.cs index 72e66372d..66e1e7fa4 100644 --- a/src/Common/Interfaces/IPaginatedApi.cs +++ b/src/Common/Interfaces/IPaginatedApi.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.Common.Interfaces { diff --git a/src/Common/Interfaces/IPayloadService.cs b/src/Common/Interfaces/IPayloadService.cs index fc9d69308..93fa58e04 100644 --- a/src/Common/Interfaces/IPayloadService.cs +++ b/src/Common/Interfaces/IPayloadService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/src/Common/Interfaces/IWorkflowInstanceService.cs b/src/Common/Interfaces/IWorkflowInstanceService.cs index 117b8148c..6ba12311f 100644 --- a/src/Common/Interfaces/IWorkflowInstanceService.cs +++ b/src/Common/Interfaces/IWorkflowInstanceService.cs @@ -1,4 +1,20 @@ -using Monai.Deploy.WorkflowManager.Contracts.Models; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Monai.Deploy.WorkflowManager.Contracts.Models; namespace Monai.Deploy.WorkflowManager.Common.Interfaces { diff --git a/src/Common/Interfaces/IWorkflowService.cs b/src/Common/Interfaces/IWorkflowService.cs index 80db128bd..5216a8236 100644 --- a/src/Common/Interfaces/IWorkflowService.cs +++ b/src/Common/Interfaces/IWorkflowService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/src/Common/Monai.Deploy.WorkflowManager.Common.csproj b/src/Common/Monai.Deploy.WorkflowManager.Common.csproj index 5e6ea0fd0..7943a6ea5 100644 --- a/src/Common/Monai.Deploy.WorkflowManager.Common.csproj +++ b/src/Common/Monai.Deploy.WorkflowManager.Common.csproj @@ -1,6 +1,17 @@ diff --git a/src/Common/ServiceNotFoundException.cs b/src/Common/ServiceNotFoundException.cs index ad00f40f1..54a6eeabb 100644 --- a/src/Common/ServiceNotFoundException.cs +++ b/src/Common/ServiceNotFoundException.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Globalization; using System.Runtime.Serialization; diff --git a/src/Common/Services/IMonaiService.cs b/src/Common/Services/IMonaiService.cs index 81346d406..f898385ad 100644 --- a/src/Common/Services/IMonaiService.cs +++ b/src/Common/Services/IMonaiService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.Contracts.Rest; diff --git a/src/Common/Services/PayloadService.cs b/src/Common/Services/PayloadService.cs index 9810c355f..344973db2 100644 --- a/src/Common/Services/PayloadService.cs +++ b/src/Common/Services/PayloadService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Microsoft.Extensions.Logging; diff --git a/src/Common/Services/WorkflowInstanceService.cs b/src/Common/Services/WorkflowInstanceService.cs index ef8ffe93e..79c26c9e4 100644 --- a/src/Common/Services/WorkflowInstanceService.cs +++ b/src/Common/Services/WorkflowInstanceService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Monai.Deploy.WorkflowManager.Common.Interfaces; diff --git a/src/Common/Services/WorkflowService.cs b/src/Common/Services/WorkflowService.cs index e199f82b1..87f717828 100644 --- a/src/Common/Services/WorkflowService.cs +++ b/src/Common/Services/WorkflowService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Monai.Deploy.WorkflowManager.Common.Interfaces; diff --git a/src/Common/TypeExtensions.cs b/src/Common/TypeExtensions.cs index 3632af99f..2312306b7 100644 --- a/src/Common/TypeExtensions.cs +++ b/src/Common/TypeExtensions.cs @@ -1,6 +1,19 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-FileCopyrightText: © 2019-2020 NVIDIA Corporation -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * Copyright 2019-2020 NVIDIA Corporation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Reflection; using Ardalis.GuardClauses; diff --git a/src/ConditionsResolver/Extensions/RegexExtensions.cs b/src/ConditionsResolver/Extensions/RegexExtensions.cs index b0eda4b27..dfc981a97 100644 --- a/src/ConditionsResolver/Extensions/RegexExtensions.cs +++ b/src/ConditionsResolver/Extensions/RegexExtensions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Text.RegularExpressions; diff --git a/src/ConditionsResolver/Extensions/StringExtensions.cs b/src/ConditionsResolver/Extensions/StringExtensions.cs index ebcaa291e..9ec8c103b 100644 --- a/src/ConditionsResolver/Extensions/StringExtensions.cs +++ b/src/ConditionsResolver/Extensions/StringExtensions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Extensions { diff --git a/src/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj b/src/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj index 51e664f6e..e94e6c8dd 100644 --- a/src/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj +++ b/src/ConditionsResolver/Monai.Deploy.WorkflowManager.ConditionsResolver.csproj @@ -1,6 +1,17 @@ diff --git a/src/ConditionsResolver/Parser/ConditionalParameterParser.cs b/src/ConditionsResolver/Parser/ConditionalParameterParser.cs index 775819a57..c3351a5a3 100644 --- a/src/ConditionsResolver/Parser/ConditionalParameterParser.cs +++ b/src/ConditionsResolver/Parser/ConditionalParameterParser.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Text.RegularExpressions; using Ardalis.GuardClauses; diff --git a/src/ConditionsResolver/Parser/IConditionalParameterParser.cs b/src/ConditionsResolver/Parser/IConditionalParameterParser.cs index 8388624f3..c4cd352bc 100644 --- a/src/ConditionsResolver/Parser/IConditionalParameterParser.cs +++ b/src/ConditionsResolver/Parser/IConditionalParameterParser.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/src/ConditionsResolver/Resovler/Conditional.cs b/src/ConditionsResolver/Resovler/Conditional.cs index 5045382ee..801f0f3c3 100644 --- a/src/ConditionsResolver/Resovler/Conditional.cs +++ b/src/ConditionsResolver/Resovler/Conditional.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Globalization; using Ardalis.GuardClauses; diff --git a/src/ConditionsResolver/Resovler/ConditionalGroup.cs b/src/ConditionsResolver/Resovler/ConditionalGroup.cs index e1d8390ca..6dca49e02 100644 --- a/src/ConditionsResolver/Resovler/ConditionalGroup.cs +++ b/src/ConditionsResolver/Resovler/ConditionalGroup.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Text.RegularExpressions; using Ardalis.GuardClauses; diff --git a/src/ConditionsResolver/Resovler/Keyword.cs b/src/ConditionsResolver/Resovler/Keyword.cs index f55f33b5e..920bf2feb 100644 --- a/src/ConditionsResolver/Resovler/Keyword.cs +++ b/src/ConditionsResolver/Resovler/Keyword.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Resolver { diff --git a/src/Configuration/ConfigurationValidator.cs b/src/Configuration/ConfigurationValidator.cs index beeb25a0c..4bbc54c83 100644 --- a/src/Configuration/ConfigurationValidator.cs +++ b/src/Configuration/ConfigurationValidator.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/src/Configuration/DicomAgentConfiguration.cs b/src/Configuration/DicomAgentConfiguration.cs index 76080112a..a42dedbac 100644 --- a/src/Configuration/DicomAgentConfiguration.cs +++ b/src/Configuration/DicomAgentConfiguration.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.Extensions.Configuration; diff --git a/src/Configuration/Exceptions/ConfigurationException.cs b/src/Configuration/Exceptions/ConfigurationException.cs index 559d992cc..6f6782e64 100644 --- a/src/Configuration/Exceptions/ConfigurationException.cs +++ b/src/Configuration/Exceptions/ConfigurationException.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Runtime.Serialization; diff --git a/src/Configuration/MessageBrokerConfiguration.cs b/src/Configuration/MessageBrokerConfiguration.cs index cd3dbc59c..2a3047fff 100644 --- a/src/Configuration/MessageBrokerConfiguration.cs +++ b/src/Configuration/MessageBrokerConfiguration.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.Extensions.Configuration; using Monai.Deploy.Messaging.Configuration; diff --git a/src/Configuration/MessageBrokerConfigurationKeys.cs b/src/Configuration/MessageBrokerConfigurationKeys.cs index ccc9afebe..13162f6f7 100644 --- a/src/Configuration/MessageBrokerConfigurationKeys.cs +++ b/src/Configuration/MessageBrokerConfigurationKeys.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.Extensions.Configuration; diff --git a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj b/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj index d86f2505d..010ac3f81 100644 --- a/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj +++ b/src/Configuration/Monai.Deploy.WorkflowManager.Configuration.csproj @@ -1,6 +1,17 @@ diff --git a/src/Configuration/PaginationSettings.cs b/src/Configuration/PaginationSettings.cs index 8c5101354..ce898c4fb 100644 --- a/src/Configuration/PaginationSettings.cs +++ b/src/Configuration/PaginationSettings.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.Extensions.Configuration; diff --git a/src/Configuration/RetryConfiguration.cs b/src/Configuration/RetryConfiguration.cs index eb4a9cea7..e47610a04 100644 --- a/src/Configuration/RetryConfiguration.cs +++ b/src/Configuration/RetryConfiguration.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/src/Configuration/StorageConfiguration.cs b/src/Configuration/StorageConfiguration.cs index a2f325b90..7f6bf86b9 100644 --- a/src/Configuration/StorageConfiguration.cs +++ b/src/Configuration/StorageConfiguration.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.IO.Abstractions; using Microsoft.Extensions.Configuration; diff --git a/src/Configuration/TaskManagerConfiguration.cs b/src/Configuration/TaskManagerConfiguration.cs index 0a1e0125b..bb8b16eb3 100644 --- a/src/Configuration/TaskManagerConfiguration.cs +++ b/src/Configuration/TaskManagerConfiguration.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/src/Configuration/WorkflowManagerOptions.cs b/src/Configuration/WorkflowManagerOptions.cs index ef3d64d96..338d99db8 100644 --- a/src/Configuration/WorkflowManagerOptions.cs +++ b/src/Configuration/WorkflowManagerOptions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.Extensions.Configuration; diff --git a/src/Contracts/Constants/TaskTypeConstants.cs b/src/Contracts/Constants/TaskTypeConstants.cs index d027c62bc..0be64fdfa 100644 --- a/src/Contracts/Constants/TaskTypeConstants.cs +++ b/src/Contracts/Constants/TaskTypeConstants.cs @@ -1,4 +1,20 @@ -namespace Monai.Deploy.WorkflowManager.Contracts.Constants +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace Monai.Deploy.WorkflowManager.Contracts.Constants { public static class TaskTypeConstants { diff --git a/src/Contracts/Models/Artifact.cs b/src/Contracts/Models/Artifact.cs index 88d249ff4..18bf80121 100644 --- a/src/Contracts/Models/Artifact.cs +++ b/src/Contracts/Models/Artifact.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Newtonsoft.Json; diff --git a/src/Contracts/Models/ArtifactMap.cs b/src/Contracts/Models/ArtifactMap.cs index c394516e9..7a4ecce0a 100644 --- a/src/Contracts/Models/ArtifactMap.cs +++ b/src/Contracts/Models/ArtifactMap.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Newtonsoft.Json; diff --git a/src/Contracts/Models/DicomTags.cs b/src/Contracts/Models/DicomTags.cs index 3bea0b7ff..9786fdf08 100644 --- a/src/Contracts/Models/DicomTags.cs +++ b/src/Contracts/Models/DicomTags.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Collections.Generic; using Newtonsoft.Json; diff --git a/src/Contracts/Models/DicomValue.cs b/src/Contracts/Models/DicomValue.cs index 2195ad542..23123f025 100644 --- a/src/Contracts/Models/DicomValue.cs +++ b/src/Contracts/Models/DicomValue.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Newtonsoft.Json; diff --git a/src/Contracts/Models/Evaluator.cs b/src/Contracts/Models/Evaluator.cs index 116f15c56..6c59dcd61 100644 --- a/src/Contracts/Models/Evaluator.cs +++ b/src/Contracts/Models/Evaluator.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Newtonsoft.Json; diff --git a/src/Contracts/Models/ExecutionContext.cs b/src/Contracts/Models/ExecutionContext.cs index d1683cd94..cca46e36f 100644 --- a/src/Contracts/Models/ExecutionContext.cs +++ b/src/Contracts/Models/ExecutionContext.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Collections.Generic; using Newtonsoft.Json; diff --git a/src/Contracts/Models/ExportDestination.cs b/src/Contracts/Models/ExportDestination.cs index 5758f0f7e..3258acb26 100644 --- a/src/Contracts/Models/ExportDestination.cs +++ b/src/Contracts/Models/ExportDestination.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Newtonsoft.Json; diff --git a/src/Contracts/Models/ISoftDeleteable.cs b/src/Contracts/Models/ISoftDeleteable.cs index 46167df70..5257e2b27 100644 --- a/src/Contracts/Models/ISoftDeleteable.cs +++ b/src/Contracts/Models/ISoftDeleteable.cs @@ -1,4 +1,20 @@ -using System; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System; namespace Monai.Deploy.WorkflowManager.Contracts.Models { diff --git a/src/Contracts/Models/InformaticsGateway.cs b/src/Contracts/Models/InformaticsGateway.cs index 815a07a75..9764f4df1 100644 --- a/src/Contracts/Models/InformaticsGateway.cs +++ b/src/Contracts/Models/InformaticsGateway.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Newtonsoft.Json; diff --git a/src/Contracts/Models/PatientDetails.cs b/src/Contracts/Models/PatientDetails.cs index 06b6b6a05..3accd68b5 100644 --- a/src/Contracts/Models/PatientDetails.cs +++ b/src/Contracts/Models/PatientDetails.cs @@ -1,4 +1,20 @@ -using System; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System; using Newtonsoft.Json; namespace Monai.Deploy.WorkflowManager.Contracts.Models diff --git a/src/Contracts/Models/Payload.cs b/src/Contracts/Models/Payload.cs index 42c424b2a..30b92da0e 100644 --- a/src/Contracts/Models/Payload.cs +++ b/src/Contracts/Models/Payload.cs @@ -1,4 +1,20 @@ -using System; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System; using System.Collections.Generic; using Monai.Deploy.Messaging.Common; using Newtonsoft.Json; diff --git a/src/Contracts/Models/Status.cs b/src/Contracts/Models/Status.cs index f667d4e70..9302c5565 100644 --- a/src/Contracts/Models/Status.cs +++ b/src/Contracts/Models/Status.cs @@ -1,5 +1,18 @@ -// FileCopyrightText: © 2021 - 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021 - 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.Contracts.Models { diff --git a/src/Contracts/Models/TaskDestination.cs b/src/Contracts/Models/TaskDestination.cs index 2e9f931f1..a2f229035 100644 --- a/src/Contracts/Models/TaskDestination.cs +++ b/src/Contracts/Models/TaskDestination.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Newtonsoft.Json; diff --git a/src/Contracts/Models/TaskExecution.cs b/src/Contracts/Models/TaskExecution.cs index 3bbc7a87a..5976e95d1 100644 --- a/src/Contracts/Models/TaskExecution.cs +++ b/src/Contracts/Models/TaskExecution.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/src/Contracts/Models/TaskObject.cs b/src/Contracts/Models/TaskObject.cs index 379dac41d..6d51dcffe 100644 --- a/src/Contracts/Models/TaskObject.cs +++ b/src/Contracts/Models/TaskObject.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Collections.Generic; using Newtonsoft.Json; diff --git a/src/Contracts/Models/TaskPluginArguments.cs b/src/Contracts/Models/TaskPluginArguments.cs index 4545b6da8..24acbc511 100644 --- a/src/Contracts/Models/TaskPluginArguments.cs +++ b/src/Contracts/Models/TaskPluginArguments.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.Extensions.Configuration; diff --git a/src/Contracts/Models/Workflow.cs b/src/Contracts/Models/Workflow.cs index abd0c7b46..19ca0823d 100644 --- a/src/Contracts/Models/Workflow.cs +++ b/src/Contracts/Models/Workflow.cs @@ -1,4 +1,20 @@ -using Newtonsoft.Json; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Newtonsoft.Json; namespace Monai.Deploy.WorkflowManager.Contracts.Models { diff --git a/src/Contracts/Models/WorkflowInstance.cs b/src/Contracts/Models/WorkflowInstance.cs index a05393e28..328ca26f9 100644 --- a/src/Contracts/Models/WorkflowInstance.cs +++ b/src/Contracts/Models/WorkflowInstance.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Newtonsoft.Json; using System; diff --git a/src/Contracts/Models/WorkflowRevision.cs b/src/Contracts/Models/WorkflowRevision.cs index 1bd3cff0f..0db35ff4a 100644 --- a/src/Contracts/Models/WorkflowRevision.cs +++ b/src/Contracts/Models/WorkflowRevision.cs @@ -1,4 +1,20 @@ -using System; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System; using MongoDB.Bson.Serialization.Attributes; using Newtonsoft.Json; diff --git a/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj b/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj index 23f850e4c..dcb5affc6 100644 --- a/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj +++ b/src/Contracts/Monai.Deploy.WorkflowManager.Contracts.csproj @@ -1,6 +1,17 @@ diff --git a/src/Contracts/Responses/CreateWorkflowResponse.cs b/src/Contracts/Responses/CreateWorkflowResponse.cs index f346c4c53..74ba5b5cf 100644 --- a/src/Contracts/Responses/CreateWorkflowResponse.cs +++ b/src/Contracts/Responses/CreateWorkflowResponse.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Newtonsoft.Json; diff --git a/src/Contracts/Rest/ServiceStatus.cs b/src/Contracts/Rest/ServiceStatus.cs index e36fef041..250db91f2 100644 --- a/src/Contracts/Rest/ServiceStatus.cs +++ b/src/Contracts/Rest/ServiceStatus.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.Contracts.Rest { diff --git a/src/Database/Interfaces/IPayloadRepsitory.cs b/src/Database/Interfaces/IPayloadRepsitory.cs index 10e9a47ea..1ce1b59d3 100644 --- a/src/Database/Interfaces/IPayloadRepsitory.cs +++ b/src/Database/Interfaces/IPayloadRepsitory.cs @@ -1,4 +1,20 @@ -using System.Collections.Generic; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System.Collections.Generic; using System.Threading.Tasks; using Monai.Deploy.WorkflowManager.Contracts.Models; @@ -28,7 +44,7 @@ public interface IPayloadRepsitory /// /// Count of objects. Task CountAsync(); - + /// Updates a payload in the database. /// /// diff --git a/src/Database/Interfaces/IWorkflowInstanceRepository.cs b/src/Database/Interfaces/IWorkflowInstanceRepository.cs index 7766ba877..a7c838f74 100644 --- a/src/Database/Interfaces/IWorkflowInstanceRepository.cs +++ b/src/Database/Interfaces/IWorkflowInstanceRepository.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Collections.Generic; using System.Threading.Tasks; diff --git a/src/Database/Interfaces/IWorkflowRepository.cs b/src/Database/Interfaces/IWorkflowRepository.cs index 47a74781a..13da12ee8 100644 --- a/src/Database/Interfaces/IWorkflowRepository.cs +++ b/src/Database/Interfaces/IWorkflowRepository.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/src/Database/Monai.Deploy.WorkflowManager.Database.csproj b/src/Database/Monai.Deploy.WorkflowManager.Database.csproj index d978627e9..e0d814ef1 100644 --- a/src/Database/Monai.Deploy.WorkflowManager.Database.csproj +++ b/src/Database/Monai.Deploy.WorkflowManager.Database.csproj @@ -1,4 +1,20 @@ - + + + net6.0 @@ -30,7 +46,7 @@ - + true true diff --git a/src/Database/Options/WorkloadManagerDatabaseSettings.cs b/src/Database/Options/WorkloadManagerDatabaseSettings.cs index 04a8288cd..ffd9e5cb8 100644 --- a/src/Database/Options/WorkloadManagerDatabaseSettings.cs +++ b/src/Database/Options/WorkloadManagerDatabaseSettings.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.Extensions.Configuration; diff --git a/src/Database/PayloadRepository.cs b/src/Database/PayloadRepository.cs index 300a88a18..d2853afdb 100644 --- a/src/Database/PayloadRepository.cs +++ b/src/Database/PayloadRepository.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/src/Database/RepositoryBase.cs b/src/Database/RepositoryBase.cs index db757cfaf..b7af0cbc2 100644 --- a/src/Database/RepositoryBase.cs +++ b/src/Database/RepositoryBase.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/src/Database/WorkflowInstanceRepository.cs b/src/Database/WorkflowInstanceRepository.cs index 36e2cdbeb..db2f5610e 100644 --- a/src/Database/WorkflowInstanceRepository.cs +++ b/src/Database/WorkflowInstanceRepository.cs @@ -1,6 +1,18 @@ - -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/src/Database/WorkflowRepository.cs b/src/Database/WorkflowRepository.cs index d25e00e4a..f3a093c6a 100644 --- a/src/Database/WorkflowRepository.cs +++ b/src/Database/WorkflowRepository.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Collections.Generic; using System.Threading.Tasks; diff --git a/src/Logging/LoggerHelpers.cs b/src/Logging/LoggerHelpers.cs index 196305ac8..c504ceaf5 100644 --- a/src/Logging/LoggerHelpers.cs +++ b/src/Logging/LoggerHelpers.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/src/Logging/Logging/Log.cs b/src/Logging/Logging/Log.cs index 64950924f..39fc5c113 100644 --- a/src/Logging/Logging/Log.cs +++ b/src/Logging/Logging/Log.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.Extensions.Logging; using Monai.Deploy.WorkflowManager.Contracts.Models; @@ -78,7 +91,7 @@ public static partial class Log [LoggerMessage(EventId = 23, Level = LogLevel.Error, Message = "The task {taskId} metadata store update failed. Payload: {payloadId} - Metadata: {metadata}")] public static partial void TaskMetaDataUpdateFailed(this ILogger logger, string payloadId, string taskId, Dictionary metadata); - + [LoggerMessage(EventId = 24, Level = LogLevel.Debug, Message = "No files to export for task {taskId} within workflow instance {workflowInstanceId}.")] public static partial void ExportFilesNotFound(this ILogger logger, string taskId, string workflowInstanceId); diff --git a/src/Logging/Models/ObjectLog.cs b/src/Logging/Models/ObjectLog.cs index f4b2f6d48..92abfddaf 100644 --- a/src/Logging/Models/ObjectLog.cs +++ b/src/Logging/Models/ObjectLog.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Newtonsoft.Json; diff --git a/src/Logging/Monai.Deploy.WorkflowManager.Logging.csproj b/src/Logging/Monai.Deploy.WorkflowManager.Logging.csproj index 58c3842a2..5c3ceb26d 100644 --- a/src/Logging/Monai.Deploy.WorkflowManager.Logging.csproj +++ b/src/Logging/Monai.Deploy.WorkflowManager.Logging.csproj @@ -1,6 +1,17 @@ diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Constants/DicomTagConstants.cs b/src/Monai.Deploy.WorkflowManager.Storage/Constants/DicomTagConstants.cs index 7ad2862c7..6485b8cb8 100644 --- a/src/Monai.Deploy.WorkflowManager.Storage/Constants/DicomTagConstants.cs +++ b/src/Monai.Deploy.WorkflowManager.Storage/Constants/DicomTagConstants.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.Storage.Constants { diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Monai.Deploy.WorkflowManager.Storage.csproj b/src/Monai.Deploy.WorkflowManager.Storage/Monai.Deploy.WorkflowManager.Storage.csproj index 72e35d1a2..790a30e47 100644 --- a/src/Monai.Deploy.WorkflowManager.Storage/Monai.Deploy.WorkflowManager.Storage.csproj +++ b/src/Monai.Deploy.WorkflowManager.Storage/Monai.Deploy.WorkflowManager.Storage.csproj @@ -1,6 +1,17 @@ @@ -11,7 +22,7 @@ SPDX-License-Identifier: Apache License 2.0 enable enable - + @@ -25,7 +36,7 @@ SPDX-License-Identifier: Apache License 2.0 - + true true diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Services/DicomService.cs b/src/Monai.Deploy.WorkflowManager.Storage/Services/DicomService.cs index 4194bcff7..3849fb2c2 100644 --- a/src/Monai.Deploy.WorkflowManager.Storage/Services/DicomService.cs +++ b/src/Monai.Deploy.WorkflowManager.Storage/Services/DicomService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Text; using Ardalis.GuardClauses; @@ -9,8 +22,8 @@ using Monai.Deploy.WorkflowManager.Storage.Constants; using Newtonsoft.Json; using Monai.Deploy.Storage.API; -using System.Globalization; - +using System.Globalization; + namespace Monai.Deploy.WorkflowManager.Storage.Services { public class DicomService : IDicomService @@ -38,8 +51,8 @@ public async Task GetPayloadPatientDetailsAsync(string payloadId PatientSex = await GetFirstValueAsync(items, payloadId, bucketName, DicomTagConstants.PatientSexTag), PatientAge = await GetFirstValueAsync(items, payloadId, bucketName, DicomTagConstants.PatientAgeTag), PatientHospitalId = await GetFirstValueAsync(items, payloadId, bucketName, DicomTagConstants.PatientHospitalIdTag) - }; - + }; + var dob = await GetFirstValueAsync(items, payloadId, bucketName, DicomTagConstants.PatientDateOfBirthTag); if (DateTime.TryParseExact(dob, "yyyyMMdd", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateOfBirth)) diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Services/IDicomService.cs b/src/Monai.Deploy.WorkflowManager.Storage/Services/IDicomService.cs index fe8715f1e..eab6c36f8 100644 --- a/src/Monai.Deploy.WorkflowManager.Storage/Services/IDicomService.cs +++ b/src/Monai.Deploy.WorkflowManager.Storage/Services/IDicomService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/src/Monai.Deploy.WorkflowManager.sln b/src/Monai.Deploy.WorkflowManager.sln index 5a21121c7..dc05bbf57 100644 --- a/src/Monai.Deploy.WorkflowManager.sln +++ b/src/Monai.Deploy.WorkflowManager.sln @@ -1,5 +1,21 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 + + + # Visual Studio Version 17 VisualStudioVersion = 17.1.32328.378 MinimumVisualStudioVersion = 10.0.40219.1 diff --git a/src/PayloadListener/Extensions/ValidationExtensions.cs b/src/PayloadListener/Extensions/ValidationExtensions.cs index a103bdfbb..ba7653e90 100644 --- a/src/PayloadListener/Extensions/ValidationExtensions.cs +++ b/src/PayloadListener/Extensions/ValidationExtensions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Monai.Deploy.Messaging.Events; diff --git a/src/PayloadListener/Extensions/WorkflowExtensions.cs b/src/PayloadListener/Extensions/WorkflowExtensions.cs index 097415c3e..09b95074e 100644 --- a/src/PayloadListener/Extensions/WorkflowExtensions.cs +++ b/src/PayloadListener/Extensions/WorkflowExtensions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj b/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj index 0a2430750..785720416 100644 --- a/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj +++ b/src/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj @@ -1,6 +1,17 @@ diff --git a/src/PayloadListener/Services/EventPayloadRecieverService.cs b/src/PayloadListener/Services/EventPayloadRecieverService.cs index eae5dc552..fe3e0e364 100644 --- a/src/PayloadListener/Services/EventPayloadRecieverService.cs +++ b/src/PayloadListener/Services/EventPayloadRecieverService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.API; using Microsoft.Extensions.Logging; diff --git a/src/PayloadListener/Services/IEventPayloadRecieverService.cs b/src/PayloadListener/Services/IEventPayloadRecieverService.cs index 4c20f5355..c260df933 100644 --- a/src/PayloadListener/Services/IEventPayloadRecieverService.cs +++ b/src/PayloadListener/Services/IEventPayloadRecieverService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Common; diff --git a/src/PayloadListener/Services/PayloadListenerService.cs b/src/PayloadListener/Services/PayloadListenerService.cs index ed81b1e96..44d538cab 100644 --- a/src/PayloadListener/Services/PayloadListenerService.cs +++ b/src/PayloadListener/Services/PayloadListenerService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; diff --git a/src/PayloadListener/Validators/EventPayloadValidator.cs b/src/PayloadListener/Validators/EventPayloadValidator.cs index 3d108f958..bbf34973d 100644 --- a/src/PayloadListener/Validators/EventPayloadValidator.cs +++ b/src/PayloadListener/Validators/EventPayloadValidator.cs @@ -1,13 +1,23 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.Common; using Monai.Deploy.Messaging.Events; -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 - using Monai.Deploy.WorkflowManager.Logging.Logging; using Monai.Deploy.WorkflowManager.PayloadListener.Extensions; diff --git a/src/PayloadListener/Validators/IEventPayloadValidator.cs b/src/PayloadListener/Validators/IEventPayloadValidator.cs index c0db3f13e..30b03d65a 100644 --- a/src/PayloadListener/Validators/IEventPayloadValidator.cs +++ b/src/PayloadListener/Validators/IEventPayloadValidator.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; diff --git a/src/TaskManager/API/ExecutionStatus.cs b/src/TaskManager/API/ExecutionStatus.cs index c789098b6..e1812e837 100644 --- a/src/TaskManager/API/ExecutionStatus.cs +++ b/src/TaskManager/API/ExecutionStatus.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; diff --git a/src/TaskManager/API/IMetadataRepository.cs b/src/TaskManager/API/IMetadataRepository.cs index 6b305a8cf..c1a5eaff6 100644 --- a/src/TaskManager/API/IMetadataRepository.cs +++ b/src/TaskManager/API/IMetadataRepository.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.TaskManager.API { diff --git a/src/TaskManager/API/ITaskPlugin.cs b/src/TaskManager/API/ITaskPlugin.cs index 61198797f..d9435f39c 100644 --- a/src/TaskManager/API/ITaskPlugin.cs +++ b/src/TaskManager/API/ITaskPlugin.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.TaskManager.API { diff --git a/src/TaskManager/API/InvalidTaskException.cs b/src/TaskManager/API/InvalidTaskException.cs index 3a1de52ca..5c3e5738e 100644 --- a/src/TaskManager/API/InvalidTaskException.cs +++ b/src/TaskManager/API/InvalidTaskException.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Diagnostics; using System.Runtime.Serialization; diff --git a/src/TaskManager/API/MetadataRepositoryBase.cs b/src/TaskManager/API/MetadataRepositoryBase.cs index c00d30ca6..5d5f141dd 100644 --- a/src/TaskManager/API/MetadataRepositoryBase.cs +++ b/src/TaskManager/API/MetadataRepositoryBase.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; diff --git a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj index fc5b6a23a..e483a23a7 100644 --- a/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj +++ b/src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj @@ -1,6 +1,17 @@ diff --git a/src/TaskManager/API/TaskPluginBase.cs b/src/TaskManager/API/TaskPluginBase.cs index 98d0f08db..e96836a0c 100644 --- a/src/TaskManager/API/TaskPluginBase.cs +++ b/src/TaskManager/API/TaskPluginBase.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; diff --git a/src/TaskManager/AssemblyInfo.cs b/src/TaskManager/AssemblyInfo.cs index b3d4493b4..46d362c43 100644 --- a/src/TaskManager/AssemblyInfo.cs +++ b/src/TaskManager/AssemblyInfo.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Runtime.CompilerServices; diff --git a/src/TaskManager/Logging/Log.cs b/src/TaskManager/Logging/Log.cs index ab3e1f286..cb51c99ff 100644 --- a/src/TaskManager/Logging/Log.cs +++ b/src/TaskManager/Logging/Log.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.Events; diff --git a/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index cccf4cba0..864c05a18 100644 --- a/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -1,6 +1,17 @@ @@ -32,7 +43,7 @@ SPDX-License-Identifier: Apache License 2.0 - + diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs b/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs index 2df476e24..b4d4f076b 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs +++ b/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs @@ -1,4 +1,20 @@ -using Ardalis.GuardClauses; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Ardalis.GuardClauses; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.API; diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Events/ClinicalReviewRequestEvent.cs b/src/TaskManager/Plug-ins/AideClinicalReview/Events/ClinicalReviewRequestEvent.cs index fb772781a..8a2af4354 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/Events/ClinicalReviewRequestEvent.cs +++ b/src/TaskManager/Plug-ins/AideClinicalReview/Events/ClinicalReviewRequestEvent.cs @@ -1,4 +1,20 @@ -using System.ComponentModel.DataAnnotations; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System.ComponentModel.DataAnnotations; using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Models; using Newtonsoft.Json; diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Keys.cs b/src/TaskManager/Plug-ins/AideClinicalReview/Keys.cs index 6c3b6d564..c74665039 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/Keys.cs +++ b/src/TaskManager/Plug-ins/AideClinicalReview/Keys.cs @@ -1,4 +1,20 @@ -namespace Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview { public class Keys { diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Logging/Log.cs b/src/TaskManager/Plug-ins/AideClinicalReview/Logging/Log.cs index 2a653a759..efa1b6f7d 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/Logging/Log.cs +++ b/src/TaskManager/Plug-ins/AideClinicalReview/Logging/Log.cs @@ -1,4 +1,20 @@ -using Microsoft.Extensions.Logging; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Microsoft.Extensions.Logging; namespace Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Logging { diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Models/PatientMetadata.cs b/src/TaskManager/Plug-ins/AideClinicalReview/Models/PatientMetadata.cs index 258e25687..2f51351af 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/Models/PatientMetadata.cs +++ b/src/TaskManager/Plug-ins/AideClinicalReview/Models/PatientMetadata.cs @@ -1,4 +1,20 @@ -using Newtonsoft.Json; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Newtonsoft.Json; namespace Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Models { diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj b/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj index 2a07ee2af..79f6e7386 100644 --- a/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj +++ b/src/TaskManager/Plug-ins/AideClinicalReview/Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.csproj @@ -1,4 +1,20 @@ - + + + net6.0 @@ -18,7 +34,7 @@ - + true true diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index 43d776022..75fd229ad 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Text; using Ardalis.GuardClauses; diff --git a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs index 1dcd201af..3a5fb4f17 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoProvider.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Argo; diff --git a/src/TaskManager/Plug-ins/Argo/ArtifactMappingNotFoundException.cs b/src/TaskManager/Plug-ins/Argo/ArtifactMappingNotFoundException.cs index 10d1542bd..71254eaf9 100644 --- a/src/TaskManager/Plug-ins/Argo/ArtifactMappingNotFoundException.cs +++ b/src/TaskManager/Plug-ins/Argo/ArtifactMappingNotFoundException.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Runtime.Serialization; diff --git a/src/TaskManager/Plug-ins/Argo/AssemblyInfo.cs b/src/TaskManager/Plug-ins/Argo/AssemblyInfo.cs index 207bcdc4d..2937cbf1d 100644 --- a/src/TaskManager/Plug-ins/Argo/AssemblyInfo.cs +++ b/src/TaskManager/Plug-ins/Argo/AssemblyInfo.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Runtime.CompilerServices; diff --git a/src/TaskManager/Plug-ins/Argo/ExitHookTemplate.cs b/src/TaskManager/Plug-ins/Argo/ExitHookTemplate.cs index 4ba8a05fc..0ff21ad5f 100644 --- a/src/TaskManager/Plug-ins/Argo/ExitHookTemplate.cs +++ b/src/TaskManager/Plug-ins/Argo/ExitHookTemplate.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Argo; using Monai.Deploy.Messaging.Events; diff --git a/src/TaskManager/Plug-ins/Argo/IArgoProvider.cs b/src/TaskManager/Plug-ins/Argo/IArgoProvider.cs index d4ad18872..7cbc68fb2 100644 --- a/src/TaskManager/Plug-ins/Argo/IArgoProvider.cs +++ b/src/TaskManager/Plug-ins/Argo/IArgoProvider.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Argo; diff --git a/src/TaskManager/Plug-ins/Argo/IKubernetesProvider.cs b/src/TaskManager/Plug-ins/Argo/IKubernetesProvider.cs index e482336a4..005c45624 100644 --- a/src/TaskManager/Plug-ins/Argo/IKubernetesProvider.cs +++ b/src/TaskManager/Plug-ins/Argo/IKubernetesProvider.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using k8s; diff --git a/src/TaskManager/Plug-ins/Argo/KubernetesProvider.cs b/src/TaskManager/Plug-ins/Argo/KubernetesProvider.cs index 41b485803..0f463f232 100644 --- a/src/TaskManager/Plug-ins/Argo/KubernetesProvider.cs +++ b/src/TaskManager/Plug-ins/Argo/KubernetesProvider.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using k8s; using Microsoft.Extensions.Logging; diff --git a/src/TaskManager/Plug-ins/Argo/Logging/Log.cs b/src/TaskManager/Plug-ins/Argo/Logging/Log.cs index 34c2928d3..42c86a5aa 100644 --- a/src/TaskManager/Plug-ins/Argo/Logging/Log.cs +++ b/src/TaskManager/Plug-ins/Argo/Logging/Log.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.Extensions.Logging; diff --git a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj index 0e63e61a9..8331b3c88 100644 --- a/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj +++ b/src/TaskManager/Plug-ins/Argo/Monai.Deploy.WorkflowManager.TaskManager.Argo.csproj @@ -1,6 +1,17 @@ diff --git a/src/TaskManager/Plug-ins/Argo/Repositories/ArgoMetadataRepository.cs b/src/TaskManager/Plug-ins/Argo/Repositories/ArgoMetadataRepository.cs index 25dcdc65b..42416b79c 100644 --- a/src/TaskManager/Plug-ins/Argo/Repositories/ArgoMetadataRepository.cs +++ b/src/TaskManager/Plug-ins/Argo/Repositories/ArgoMetadataRepository.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Text; using Ardalis.GuardClauses; diff --git a/src/TaskManager/Plug-ins/Argo/Specs/ArgoGeneratedCocde.cs b/src/TaskManager/Plug-ins/Argo/Specs/ArgoGeneratedCocde.cs index c5f4d7bba..79b4923e2 100644 --- a/src/TaskManager/Plug-ins/Argo/Specs/ArgoGeneratedCocde.cs +++ b/src/TaskManager/Plug-ins/Argo/Specs/ArgoGeneratedCocde.cs @@ -1,4 +1,20 @@ -//---------------------- +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//---------------------- // // Generated using the NSwag toolchain v13.15.10.0 (NJsonSchema v10.6.10.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org) // @@ -24084,7 +24100,7 @@ public partial class PersistentVolumeClaimCondition public string Status { get; set; } /// - /// + /// ///
///
///
Possible enum values: diff --git a/src/TaskManager/Plug-ins/Argo/StaticValues/Keys.cs b/src/TaskManager/Plug-ins/Argo/StaticValues/Keys.cs index 636822610..9903e9a84 100644 --- a/src/TaskManager/Plug-ins/Argo/StaticValues/Keys.cs +++ b/src/TaskManager/Plug-ins/Argo/StaticValues/Keys.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues { diff --git a/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKey.cs b/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKey.cs index c957a9a36..350dd052d 100644 --- a/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKey.cs +++ b/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKey.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues { diff --git a/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs b/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs index 45f2f7700..048c7985b 100644 --- a/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs +++ b/src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues { diff --git a/src/TaskManager/Plug-ins/Argo/Strings.cs b/src/TaskManager/Plug-ins/Argo/Strings.cs index 83ae4e93c..9306eac21 100644 --- a/src/TaskManager/Plug-ins/Argo/Strings.cs +++ b/src/TaskManager/Plug-ins/Argo/Strings.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.TaskManager.Argo { diff --git a/src/TaskManager/Plug-ins/Argo/TemplateNotFoundException.cs b/src/TaskManager/Plug-ins/Argo/TemplateNotFoundException.cs index b16236dbc..316645e8c 100644 --- a/src/TaskManager/Plug-ins/Argo/TemplateNotFoundException.cs +++ b/src/TaskManager/Plug-ins/Argo/TemplateNotFoundException.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Runtime.Serialization; diff --git a/src/TaskManager/Plug-ins/TestPlugin/Keys.cs b/src/TaskManager/Plug-ins/TestPlugin/Keys.cs index 7ae2fa1e4..074f455d4 100644 --- a/src/TaskManager/Plug-ins/TestPlugin/Keys.cs +++ b/src/TaskManager/Plug-ins/TestPlugin/Keys.cs @@ -1,4 +1,20 @@ -namespace Monai.Deploy.WorkflowManager.TaskManager.TestPlugin +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace Monai.Deploy.WorkflowManager.TaskManager.TestPlugin { internal static class Keys { diff --git a/src/TaskManager/Plug-ins/TestPlugin/Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.csproj b/src/TaskManager/Plug-ins/TestPlugin/Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.csproj index 6a7d093ae..41475f1d8 100644 --- a/src/TaskManager/Plug-ins/TestPlugin/Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.csproj +++ b/src/TaskManager/Plug-ins/TestPlugin/Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.csproj @@ -1,3 +1,19 @@ + + diff --git a/src/TaskManager/Plug-ins/TestPlugin/Repositories/ArgoMetadataRepository.cs b/src/TaskManager/Plug-ins/TestPlugin/Repositories/ArgoMetadataRepository.cs index 39e450dbd..e3be026aa 100644 --- a/src/TaskManager/Plug-ins/TestPlugin/Repositories/ArgoMetadataRepository.cs +++ b/src/TaskManager/Plug-ins/TestPlugin/Repositories/ArgoMetadataRepository.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Microsoft.Extensions.DependencyInjection; diff --git a/src/TaskManager/Plug-ins/TestPlugin/TestPlugin.cs b/src/TaskManager/Plug-ins/TestPlugin/TestPlugin.cs index 148f725d6..180c09a08 100644 --- a/src/TaskManager/Plug-ins/TestPlugin/TestPlugin.cs +++ b/src/TaskManager/Plug-ins/TestPlugin/TestPlugin.cs @@ -1,4 +1,20 @@ -using Ardalis.GuardClauses; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Ardalis.GuardClauses; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.API; diff --git a/src/TaskManager/PluginStrings.cs b/src/TaskManager/PluginStrings.cs index 40a4d432b..0eb898862 100644 --- a/src/TaskManager/PluginStrings.cs +++ b/src/TaskManager/PluginStrings.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.TaskManager { diff --git a/src/TaskManager/Runner/Monai.Deploy.WorkflowManager.TaskManager.Runner.csproj b/src/TaskManager/Runner/Monai.Deploy.WorkflowManager.TaskManager.Runner.csproj index 32e13a964..f0952c024 100644 --- a/src/TaskManager/Runner/Monai.Deploy.WorkflowManager.TaskManager.Runner.csproj +++ b/src/TaskManager/Runner/Monai.Deploy.WorkflowManager.TaskManager.Runner.csproj @@ -1,6 +1,17 @@ diff --git a/src/TaskManager/Runner/Program.cs b/src/TaskManager/Runner/Program.cs index 8459db212..829033e53 100644 --- a/src/TaskManager/Runner/Program.cs +++ b/src/TaskManager/Runner/Program.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Globalization; using System.IO.Abstractions; diff --git a/src/TaskManager/Strings.cs b/src/TaskManager/Strings.cs index b7e392f03..c57c250a7 100644 --- a/src/TaskManager/Strings.cs +++ b/src/TaskManager/Strings.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.TaskManager { diff --git a/src/TaskManager/TaskManager.cs b/src/TaskManager/TaskManager.cs index 50ba99cf2..51bd65797 100644 --- a/src/TaskManager/TaskManager.cs +++ b/src/TaskManager/TaskManager.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Microsoft.Extensions.DependencyInjection; diff --git a/src/TaskManager/TaskRunnerInstance.cs b/src/TaskManager/TaskRunnerInstance.cs index c47fad31e..7d4fa22e3 100644 --- a/src/TaskManager/TaskRunnerInstance.cs +++ b/src/TaskManager/TaskRunnerInstance.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.TaskManager.API; diff --git a/src/WorkflowExecuter/Common/ArtifactMapper.cs b/src/WorkflowExecuter/Common/ArtifactMapper.cs index a3af00a8f..84614bcdc 100644 --- a/src/WorkflowExecuter/Common/ArtifactMapper.cs +++ b/src/WorkflowExecuter/Common/ArtifactMapper.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Monai.Deploy.Storage.API; diff --git a/src/WorkflowExecuter/Common/EventMapper.cs b/src/WorkflowExecuter/Common/EventMapper.cs index a3dc9819b..d16b0648b 100644 --- a/src/WorkflowExecuter/Common/EventMapper.cs +++ b/src/WorkflowExecuter/Common/EventMapper.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Monai.Deploy.Messaging.Events; diff --git a/src/WorkflowExecuter/Common/IArtifactMapper.cs b/src/WorkflowExecuter/Common/IArtifactMapper.cs index e67d7e49d..15031fce0 100644 --- a/src/WorkflowExecuter/Common/IArtifactMapper.cs +++ b/src/WorkflowExecuter/Common/IArtifactMapper.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/src/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs b/src/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs index ef067ea32..01d6abf13 100644 --- a/src/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs +++ b/src/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Monai.Deploy.Messaging.Events; diff --git a/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj b/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj index e2762b0e3..182cfd30b 100644 --- a/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj +++ b/src/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj @@ -1,8 +1,19 @@ - + diff --git a/src/WorkflowExecuter/Services/IWorkflowExecuterService.cs b/src/WorkflowExecuter/Services/IWorkflowExecuterService.cs index f03393411..ebe1de583 100644 --- a/src/WorkflowExecuter/Services/IWorkflowExecuterService.cs +++ b/src/WorkflowExecuter/Services/IWorkflowExecuterService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/src/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowExecuter/Services/WorkflowExecuterService.cs index 3bbf1a265..85ae59445 100644 --- a/src/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Microsoft.Extensions.Logging; diff --git a/src/WorkflowManager/AssemblyInfo.cs b/src/WorkflowManager/AssemblyInfo.cs index bc80f6f29..bc945e278 100644 --- a/src/WorkflowManager/AssemblyInfo.cs +++ b/src/WorkflowManager/AssemblyInfo.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Runtime.CompilerServices; diff --git a/src/WorkflowManager/Common/ServiceProviderExtensions.cs b/src/WorkflowManager/Common/ServiceProviderExtensions.cs index 7b5e469af..0daf8639d 100644 --- a/src/WorkflowManager/Common/ServiceProviderExtensions.cs +++ b/src/WorkflowManager/Common/ServiceProviderExtensions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using Microsoft.Extensions.Logging; diff --git a/src/WorkflowManager/Controllers/ApiControllerBase.cs b/src/WorkflowManager/Controllers/ApiControllerBase.cs index 6eeb56fb3..953d82db9 100644 --- a/src/WorkflowManager/Controllers/ApiControllerBase.cs +++ b/src/WorkflowManager/Controllers/ApiControllerBase.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/src/WorkflowManager/Controllers/PayloadController.cs b/src/WorkflowManager/Controllers/PayloadController.cs index d1d5916fb..ada50af65 100644 --- a/src/WorkflowManager/Controllers/PayloadController.cs +++ b/src/WorkflowManager/Controllers/PayloadController.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Linq; @@ -63,8 +76,8 @@ public async Task GetAllAsync([FromQuery] PaginationFilter filter var pagedData = await _payloadService.GetAllAsync( (validFilter.PageNumber - 1) * validFilter.PageSize, - validFilter.PageSize, - patientId, + validFilter.PageSize, + patientId, patientName); var dataTotal = await _payloadService.CountAsync(); diff --git a/src/WorkflowManager/Controllers/WorkflowInstanceController.cs b/src/WorkflowManager/Controllers/WorkflowInstanceController.cs index 88a96e3b2..f29d96cbf 100644 --- a/src/WorkflowManager/Controllers/WorkflowInstanceController.cs +++ b/src/WorkflowManager/Controllers/WorkflowInstanceController.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Linq; diff --git a/src/WorkflowManager/Controllers/WorkflowsController.cs b/src/WorkflowManager/Controllers/WorkflowsController.cs index 37a430cba..2872eeaf7 100644 --- a/src/WorkflowManager/Controllers/WorkflowsController.cs +++ b/src/WorkflowManager/Controllers/WorkflowsController.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Linq; diff --git a/src/WorkflowManager/Extentions/TaskManagerExtensions.cs b/src/WorkflowManager/Extentions/TaskManagerExtensions.cs index 912023f71..97e553086 100644 --- a/src/WorkflowManager/Extentions/TaskManagerExtensions.cs +++ b/src/WorkflowManager/Extentions/TaskManagerExtensions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Microsoft.Extensions.DependencyInjection; diff --git a/src/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs b/src/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs index 5300f45c9..24eebc181 100644 --- a/src/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs +++ b/src/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Ardalis.GuardClauses; using Microsoft.Extensions.DependencyInjection; diff --git a/src/WorkflowManager/Filter/PaginationFilter.cs b/src/WorkflowManager/Filter/PaginationFilter.cs index 39a29e10a..57b62f8b6 100644 --- a/src/WorkflowManager/Filter/PaginationFilter.cs +++ b/src/WorkflowManager/Filter/PaginationFilter.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.Filter { diff --git a/src/WorkflowManager/Logging/FileLoggingTextFormatter.cs b/src/WorkflowManager/Logging/FileLoggingTextFormatter.cs index da7dc61c5..c6e6371ea 100644 --- a/src/WorkflowManager/Logging/FileLoggingTextFormatter.cs +++ b/src/WorkflowManager/Logging/FileLoggingTextFormatter.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: � 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Globalization; diff --git a/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index 9e326e0ae..76c23e550 100644 --- a/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -1,6 +1,17 @@ @@ -66,7 +77,7 @@ SPDX-License-Identifier: Apache License 2.0 Always - + true true @@ -79,5 +90,5 @@ SPDX-License-Identifier: Apache License 2.0 - + diff --git a/src/WorkflowManager/Program.cs b/src/WorkflowManager/Program.cs index 0e8c4b592..21f20dc21 100644 --- a/src/WorkflowManager/Program.cs +++ b/src/WorkflowManager/Program.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.IO; diff --git a/src/WorkflowManager/Services/DataRetentionService/DataRetentionService.cs b/src/WorkflowManager/Services/DataRetentionService/DataRetentionService.cs index 27a0bde2a..bcc3986d1 100644 --- a/src/WorkflowManager/Services/DataRetentionService/DataRetentionService.cs +++ b/src/WorkflowManager/Services/DataRetentionService/DataRetentionService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Threading; diff --git a/src/WorkflowManager/Services/Http/Startup.cs b/src/WorkflowManager/Services/Http/Startup.cs index c434e1217..4bd66202c 100644 --- a/src/WorkflowManager/Services/Http/Startup.cs +++ b/src/WorkflowManager/Services/Http/Startup.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; diff --git a/src/WorkflowManager/Services/IUriService.cs b/src/WorkflowManager/Services/IUriService.cs index 1420b4f1d..9b2f234bb 100644 --- a/src/WorkflowManager/Services/IUriService.cs +++ b/src/WorkflowManager/Services/IUriService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.Filter; diff --git a/src/WorkflowManager/Services/UriService.cs b/src/WorkflowManager/Services/UriService.cs index 826727e57..7365f24a8 100644 --- a/src/WorkflowManager/Services/UriService.cs +++ b/src/WorkflowManager/Services/UriService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using Microsoft.AspNetCore.WebUtilities; diff --git a/src/WorkflowManager/Wrappers/PagedResponse.cs b/src/WorkflowManager/Wrappers/PagedResponse.cs index cf2f836da..13b9ac2b0 100644 --- a/src/WorkflowManager/Wrappers/PagedResponse.cs +++ b/src/WorkflowManager/Wrappers/PagedResponse.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.Wrappers { diff --git a/src/WorkflowManager/Wrappers/Response.cs b/src/WorkflowManager/Wrappers/Response.cs index 328556def..1af398ebe 100644 --- a/src/WorkflowManager/Wrappers/Response.cs +++ b/src/WorkflowManager/Wrappers/Response.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.Wrappers { diff --git a/stylecop.json b/stylecop.json index 8af2c24e0..1775a8abc 100644 --- a/stylecop.json +++ b/stylecop.json @@ -5,8 +5,8 @@ "usingDirectivesPlacement": "outsideNamespace" }, "documentationRules": { - "copyrightText": "// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium", - "headerDecoration": "// SPDX-License-Identifier: Apache License 2.0" + "copyrightText": "Copyright YYYY MONAI Consortium\n\n Licensed under the Apache License, Version 2.0 (the "License");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the at\n\n http:\nwww.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an "AS IS" BASIS,\n OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.", + "companyName": "MONAI Consortium" } } } diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Features/ClinicalReview.feature b/tests/IntegrationTests/TaskManager.IntegrationTests/Features/ClinicalReview.feature index 214b8fe1f..f44d19be1 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Features/ClinicalReview.feature +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Features/ClinicalReview.feature @@ -1,4 +1,18 @@ -Feature: ClinicalReview +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Feature: ClinicalReview Integration tests for the clinical review plugin diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Features/TaskUpdate.feature b/tests/IntegrationTests/TaskManager.IntegrationTests/Features/TaskUpdate.feature index 799caa423..7c8607781 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Features/TaskUpdate.feature +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Features/TaskUpdate.feature @@ -1,4 +1,18 @@ -Feature: TaskUpdate +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Feature: TaskUpdate Integration tests for testing TaskUpdateEvents from TaskManager diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs index ceca2487b..3712e1b54 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Diagnostics; using BoDi; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/ImplicitUsings.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/ImplicitUsings.cs index 7e4a847aa..d2605bcde 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/ImplicitUsings.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/ImplicitUsings.cs @@ -1,3 +1,19 @@ -global using TechTalk.SpecFlow; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +global using TechTalk.SpecFlow; global using TechTalk.SpecFlow.Infrastructure; global using BoDi; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj index 1d312810c..37cc09fd1 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj @@ -1,3 +1,19 @@ + + diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/POCO/TestExecutionConfig.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/POCO/TestExecutionConfig.cs index b4bb8c5cd..490df69c1 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/POCO/TestExecutionConfig.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/POCO/TestExecutionConfig.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests { diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/README.md b/tests/IntegrationTests/TaskManager.IntegrationTests/README.md index 1091ec880..d97247af0 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/README.md +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/README.md @@ -1,4 +1,20 @@ -# Description + + +# Description Integration tests cover testing the functionality of the Task manager. They simulate the behavior of the Workflow Executor to trigger task plugins and check output messages. @@ -39,4 +55,4 @@ Run the integration tests to generate a TestExecution.json ```bash livingdoc test-assembly {$PROJECT_ROOT}\monai-deploy-workflow-manager\tests\IntegrationTests\TaskManager.IntegrationTests\bin\Debug\net6.0\Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.dll -t {$PROJECT_ROOT}\monai-deploy-workflow-manager\tests\IntegrationTests\TaskManager.IntegrationTests\bin\Debug\net6.0\TestExecution.json -``` \ No newline at end of file +``` diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/ClinicalReviewStepDefinitions.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/ClinicalReviewStepDefinitions.cs index b5ac751a9..361ec7b39 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/ClinicalReviewStepDefinitions.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/ClinicalReviewStepDefinitions.cs @@ -1,6 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 - +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.StepDefinitions { [Binding] diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/CommonStepDefinitions.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/CommonStepDefinitions.cs index 2907a35ee..a9942b61c 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/CommonStepDefinitions.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/CommonStepDefinitions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; using Monai.Deploy.Messaging.Messages; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/TaskUpdateStepDefinitions.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/TaskUpdateStepDefinitions.cs index b0b2cd15e..526319e71 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/TaskUpdateStepDefinitions.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/TaskUpdateStepDefinitions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/Assertions.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/Assertions.cs index 2292ffeb1..9405b1a2e 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/Assertions.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/Assertions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using FluentAssertions; using Monai.Deploy.Messaging.Events; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/DataHelper.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/DataHelper.cs index 9844e3715..c94375218 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/DataHelper.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/DataHelper.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Events; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MinioClientUtil.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MinioClientUtil.cs index 8115c1cde..31ffb76d5 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MinioClientUtil.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MinioClientUtil.cs @@ -1,4 +1,20 @@ -using Minio; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Minio; using Polly; using Polly.Retry; using System.Reactive.Linq; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConnectionFactory.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConnectionFactory.cs index 899578374..644bc92a8 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConnectionFactory.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConnectionFactory.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using RabbitMQ.Client; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConsumer.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConsumer.cs index f36ecf747..1e8a1452f 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConsumer.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConsumer.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Text; using Newtonsoft.Json; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitPublisher.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitPublisher.cs index 7d75a10d0..8ebdf2741 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitPublisher.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitPublisher.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Messages; using RabbitMQ.Client; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/TaskManagerStartup.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/TaskManagerStartup.cs index e7cc77b81..976c71af6 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/TaskManagerStartup.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/TaskManagerStartup.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.IO.Abstractions; using System.Net.Http.Headers; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/TestData/Helper.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/TestData/Helper.cs index e134663ba..5b3812992 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/TestData/Helper.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/TestData/Helper.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests { diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/TestData/TaskCallbackTestData.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/TestData/TaskCallbackTestData.cs index 833b99c8e..60fb56b15 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/TestData/TaskCallbackTestData.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/TestData/TaskCallbackTestData.cs @@ -1,4 +1,20 @@ -using Monai.Deploy.Messaging.Events; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Monai.Deploy.Messaging.Events; namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests { diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/TestData/TaskDispatchTestData.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/TestData/TaskDispatchTestData.cs index 038fcf5b9..de9e2e23b 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/TestData/TaskDispatchTestData.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/TestData/TaskDispatchTestData.cs @@ -1,4 +1,20 @@ -using Monai.Deploy.Messaging.Events; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Monai.Deploy.Messaging.Events; namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests { diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/nginx.conf b/tests/IntegrationTests/TaskManager.IntegrationTests/nginx.conf index cca82f6fe..fa4e9e4b5 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/nginx.conf +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/nginx.conf @@ -1,3 +1,17 @@ +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + user nginx; worker_processes auto; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/PayloadApi.feature b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/PayloadApi.feature index 1fb753d7c..812770abe 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/PayloadApi.feature +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/PayloadApi.feature @@ -1,4 +1,18 @@ -Feature: PayloadApi +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Feature: PayloadApi API to interact with Payloads collection diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/PayloadCollection.feature b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/PayloadCollection.feature index a71139200..9882428f1 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/PayloadCollection.feature +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/PayloadCollection.feature @@ -1,4 +1,18 @@ -Feature: PayloadCollection +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Feature: PayloadCollection Tests around the payload collection @@ -6,7 +20,7 @@ Tests around the payload collection Scenario: Seed MinIO with patient metadata, and payload collection has details Given I have a clinical workflow Basic_Workflow_1 And I have a bucket in MinIO bucket1 - And I have a payload in the bucket bucket1 with payload id + And I have a payload in the bucket bucket1 with payload id When I publish a Workflow Request Message Then A payload collection is created with patient details Then I can see Workflow Instance is created @@ -19,7 +33,7 @@ Scenario: Seed MinIO with patient metadata, and payload collection has details Scenario: Seed MinIO with blank patient data, and payload collection has null details Given I have a clinical workflow Basic_Workflow_1 And I have a bucket in MinIO bucket1 - And I have a payload null_patient_metadata in the bucket bucket1 with payload id 64a2b260-0379-4614-9f05-ff1279cf9e83 + And I have a payload null_patient_metadata in the bucket bucket1 with payload id 64a2b260-0379-4614-9f05-ff1279cf9e83 When I publish a Workflow Request Message Basic_AeTitle_Payload_Collection_Request_2 Then A payload collection is created with patient details Null_Patient Then I can see 1 Workflow Instance is created @@ -28,7 +42,7 @@ Scenario: Seed MinIO with blank patient data, and payload collection has null de Scenario: Seed MinIO with no patient data, and payload collection has null details Given I have a clinical workflow Basic_Workflow_1 And I have a bucket in MinIO bucket1 - And I have a payload no_patient_metadata in the bucket bucket1 with payload id b91f5559-8ab2-455a-806d-961244ea22af + And I have a payload no_patient_metadata in the bucket bucket1 with payload id b91f5559-8ab2-455a-806d-961244ea22af When I publish a Workflow Request Message Basic_AeTitle_Payload_Collection_Request_3 Then A payload collection is created with patient details Null_Patient Then I can see 1 Workflow Instance is created diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/RouterTasks.feature b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/RouterTasks.feature index 58b2b2520..9610ebaa0 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/RouterTasks.feature +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/RouterTasks.feature @@ -1,4 +1,18 @@ -Feature: RouterTasks +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Feature: RouterTasks Workflow supports Router Tasks diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/TaskDestinations.feature b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/TaskDestinations.feature index 52b09f26a..22d81d667 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/TaskDestinations.feature +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/TaskDestinations.feature @@ -1,4 +1,18 @@ -Feature: TaskDestinations +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Feature: TaskDestinations New task is dispatched after a Task update message is received. @@ -99,6 +113,6 @@ Scenario: Task destination based on Dicom data conditional is successful, and ta Given I have a clinical workflow Workflow_Revision_for_bucket_minio And I have a Workflow Instance Workflow_instance_for_bucket_minio And I have a bucket in MinIO bucket1 - And I have a payload patient_1_lordge in the bucket bucket1 with payload id 5450c3a9-2b19-45b0-8b17-fb10f89d1b2d - When I publish a Task Update Message Task_status_update_for_bucket_minio with status Succeeded + And I have a payload patient_1_lordge in the bucket bucket1 with payload id 5450c3a9-2b19-45b0-8b17-fb10f89d1b2d + When I publish a Task Update Message Task_status_update_for_bucket_minio with status Succeeded Then I can see the status of the Task is Succeeded diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/TaskStatusUpdate.feature b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/TaskStatusUpdate.feature index 7ee9e193a..ca2a10736 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/TaskStatusUpdate.feature +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/TaskStatusUpdate.feature @@ -1,4 +1,18 @@ -Feature: TaskStatusUpdate +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Feature: TaskStatusUpdate Update task status in the workflow instance from a Task Update Event @@ -19,14 +33,14 @@ Scenario Outline: Publish a valid Task Update event which updates the Task statu Scenario: Publish a valid Task Update event that where WorkflowInstance does not contain TaskId Given I have a clinical workflow Task_Status_Update_Workflow And I have a Workflow Instance WFI_Task_Status_Update - When I publish a Task Update Message Task_Status_Update_TaskId_Not_Found with status Succeeded + When I publish a Task Update Message Task_Status_Update_TaskId_Not_Found with status Succeeded Then I can see the status of the Task is not updated @TaskUpdate Scenario Outline: Publish an invalid Task Update event which does not update the task status Given I have a clinical workflow Task_Status_Update_Workflow And I have a Workflow Instance WFI_Task_Status_Update - When I publish a Task Update Message with status Succeeded + When I publish a Task Update Message with status Succeeded Then I can see the status of the Task is not updated Examples: | taskUpdateMessage | diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowApi.feature b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowApi.feature index 61d082882..e08ebda82 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowApi.feature +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowApi.feature @@ -1,4 +1,18 @@ -Feature: WorkflowApi +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Feature: WorkflowApi API to interact with WorkflowRevisions collection @@ -29,7 +43,7 @@ Scenario: Get all clinical workflows from API - No workflows @WorkflowPagination Scenario Outline: Get all clinical workflows from API - Test pagination Given I have an endpoint /workflows/ - And I have clinical workflows + And I have clinical workflows When I send a GET request Then I will get a 200 response And Pagination is working correctly for the workflows @@ -52,7 +66,7 @@ Scenario Outline: Get all clinical workflows from API - Test pagination @WorkflowPagination Scenario Outline: Invalid pagination returns 400 Given I have an endpoint /workflows/ - And I have 10 clinical workflows + And I have 10 clinical workflows When I send a GET request Then I will get a 400 response And I will recieve the error message @@ -64,7 +78,7 @@ Scenario Outline: Invalid pagination returns 400 | ?pageSize=10000000000000&pageNumber=2 | The value '10000000000000' is not valid for PageSize. | | ?pageNumber=10000000000000&pageSize=1 | The value '10000000000000' is not valid for PageNumber. | - + @UpdateWorkflows Scenario: Update workflow with valid details Given I have a clinical workflow Basic_Workflow_1_static @@ -74,7 +88,7 @@ Scenario: Update workflow with valid details Then I will get a 201 response And the Workflow Id c86a437d-d026-4bdf-b1df-c7a6372b89e3 is returned in the response body And multiple workflow revisions now exist with correct details - + @UpdateWorkflows Scenario Outline: Update workflow with invalid details Given I have a clinical workflow Basic_Workflow_1_static @@ -106,7 +120,7 @@ Scenario: Update workflow where workflow ID does not exist @DeleteWorkflows Scenario: Delete a workflow with one revision - Given I have a clinical workflow Basic_Workflow_1_static + Given I have a clinical workflow Basic_Workflow_1_static And I have an endpoint /workflows/c86a437d-d026-4bdf-b1df-c7a6372b89e3 When I send a DELETE request Then I will get a 200 response @@ -127,7 +141,7 @@ Scenario: Delete workflow with invalid details And I have an endpoint /workflows/1 When I send a DELETE request Then I will get a 400 response - And I will recieve the error message Failed to validate id, not a valid guid + And I will recieve the error message Failed to validate id, not a valid guid @DeleteWorkflows Scenario: Delete workflow where workflow ID does not exist @@ -136,7 +150,7 @@ Scenario: Delete workflow where workflow ID does not exist When I send a DELETE request Then I will get a 404 response And I will recieve the error message Failed to validate id, workflow not found - + @DeleteWorkflows Scenario: Delete a workflow and recieve 404 when trying to GET by ID Given I have a clinical workflow Basic_Workflow_1_static @@ -163,4 +177,4 @@ Scenario: Delete a workflow and recieve 404 when trying to GET all And I send a DELETE request And I have an endpoint /workflows When I send a GET request - Then the deleted workflow is not returned + Then the deleted workflow is not returned diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowInstancesApi.feature b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowInstancesApi.feature index b713313b3..2e081d460 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowInstancesApi.feature +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowInstancesApi.feature @@ -1,4 +1,18 @@ -Feature: WorkflowInstancesApi +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Feature: WorkflowInstancesApi API to interact with WorkflowInstances collection @@ -53,7 +67,7 @@ Scenario Outline: Get all workflow instances from API - Test pagination @WorkflowInstancePagination Scenario Outline: Invalid pagination returns 400 Given I have an endpoint /workflowinstances/ - And I have 10 Workflow Instances + And I have 10 Workflow Instances When I send a GET request Then I will get a 400 response And I will recieve the error message @@ -64,7 +78,7 @@ Scenario Outline: Invalid pagination returns 400 | ?pageNumber=NotANumber&pageSize=NotANumber | The value 'NotANumber' is not valid for PageSize."],"PageNumber":["The value 'NotANumber' is not valid for PageNumber. | | ?pageSize=10000000000000&pageNumber=2 | The value '10000000000000' is not valid for PageSize. | | ?pageNumber=10000000000000&pageSize=1 | The value '10000000000000' is not valid for PageNumber. | - + @GetWorkflowInstances Scenario: Get all workflows instances by Id Given I have an endpoint /workflowinstances/bff4cfd0-3af3-4e2b-9f3c-de2a6f2b9569 diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowRequest.feature b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowRequest.feature index ad965b84f..07272f9a2 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowRequest.feature +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowRequest.feature @@ -1,4 +1,18 @@ -Feature: WorkflowRequest +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Feature: WorkflowRequest Publishing a workflow request is consumed by the Workflow Manager. @@ -40,7 +54,7 @@ Scenario: Publish a valid workflow request triggering a workflow with multiple r Given I have a clinical workflow Basic_Workflow_Multiple_Revisions_1 And I have a clinical workflow Basic_Workflow_Multiple_Revisions_2 And I have a bucket in MinIO bucket1 - When I publish a Workflow Request Message + When I publish a Workflow Request Message Then I can see 1 Workflow Instances are created Examples: | workflowRequestMessage | diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowTaskArtefacts.feature b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowTaskArtefacts.feature index f7881ce28..4e29fc704 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowTaskArtefacts.feature +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowTaskArtefacts.feature @@ -1,4 +1,18 @@ -Feature: WorkflowTaskArtefact +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Feature: WorkflowTaskArtefact Artefacts can get passed into and between tasks @@ -7,7 +21,7 @@ Scenario Outline: Bucket exists in MinIO, publish workflow request which uses in Given I have a bucket in MinIO monai And I have a clinical workflow Single_Task_Context_Input When I publish a Workflow Request Message Context_Input_AE - Then I can see 1 Workflow Instance is created + Then I can see 1 Workflow Instance is created And 1 Task Dispatch event is published @WorkflowTaskArtefacts @ignore @@ -23,7 +37,7 @@ Scenario Outline: Create artefact in MinIO, publish task update message with art And I have a Workflow Instance Single_Task_Completed When I publish a task update message output_artefact When I publish a task update message - Then I can see 1 Workflow Instance is created + Then I can see 1 Workflow Instance is created And 1 Task Dispatch event is published Examples: | Task_Update_Message | diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs index 71327ed4a..07c3eff7f 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Diagnostics; using BoDi; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/ImplicitUsings.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/ImplicitUsings.cs index 2ce83da01..8e9935960 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/ImplicitUsings.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/ImplicitUsings.cs @@ -1,3 +1,19 @@ -global using FluentAssertions; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +global using FluentAssertions; global using NUnit; global using TechTalk.SpecFlow; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs index 213727765..978505ac8 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Models/InformaticsGateway/WorkflowRequestMessage.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Newtonsoft.Json; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj index 5603a2ef9..bb780f2de 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj @@ -1,3 +1,19 @@ + + diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/POCO/TestExecutionConfig.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/POCO/TestExecutionConfig.cs index eb6e3c630..8294c7aa3 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/POCO/TestExecutionConfig.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/POCO/TestExecutionConfig.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.IntegrationTests.POCO { diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/README.md b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/README.md index 7ecc9697a..f0e0cd7a9 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/README.md +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/README.md @@ -1,4 +1,20 @@ -# Description + + +# Description Integration tests cover testing the functionality of the Workflow Executor. They seed DB state in Mongo, seed artifacts in MinIO and simulate the behavior of the Informatics Gateway and Task Executor. @@ -44,4 +60,4 @@ Run the integration tests to generate a TestExecution.json ```bash livingdoc test-assembly {$PROJECT_ROOT}\monai-deploy-workflow-manager\tests\IntegrationTests\TaskManager.IntegrationTests\bin\Debug\net6.0\Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.dll -t {$PROJECT_ROOT}\monai-deploy-workflow-manager\tests\IntegrationTests\TaskManager.IntegrationTests\bin\Debug\net6.0\TestExecution.json -``` \ No newline at end of file +``` diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/CommonApiStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/CommonApiStepDefinitions.cs index a9a36d4e8..1f09dedf1 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/CommonApiStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/CommonApiStepDefinitions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Net; using BoDi; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/PayloadApiStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/PayloadApiStepDefinitions.cs index ca239350a..1178873b9 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/PayloadApiStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/PayloadApiStepDefinitions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using BoDi; using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/PayloadCollectionStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/PayloadCollectionStepDefinitions.cs index 3337b7274..3c54fa9dc 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/PayloadCollectionStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/PayloadCollectionStepDefinitions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using BoDi; using Monai.Deploy.Messaging.Events; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TaskDestinationsStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TaskDestinationsStepDefinitions.cs index 2c04113c8..27c16af9d 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TaskDestinationsStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TaskDestinationsStepDefinitions.cs @@ -1,4 +1,20 @@ -using BoDi; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using BoDi; using Monai.Deploy.WorkflowManager.IntegrationTests.Support; using Polly; using Polly.Retry; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TaskStatusUpdateStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TaskStatusUpdateStepDefinitions.cs index 5ba0c6ee2..67391f466 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TaskStatusUpdateStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/TaskStatusUpdateStepDefinitions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using BoDi; using Monai.Deploy.Messaging.Events; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowApiStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowApiStepDefinitions.cs index 1b3fb9def..9e708d94e 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowApiStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowApiStepDefinitions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using BoDi; using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowInstancesApiStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowInstancesApiStepDefinitions.cs index 47c9d09ff..18f5f33b2 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowInstancesApiStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowInstancesApiStepDefinitions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using BoDi; using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowRequestStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowRequestStepDefinitions.cs index 14db74916..3dec12157 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowRequestStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowRequestStepDefinitions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using BoDi; using Monai.Deploy.Messaging.Events; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowTaskArtefactStepDefinitions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowTaskArtefactStepDefinitions.cs index 4c8481b90..6816ccb78 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowTaskArtefactStepDefinitions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/StepDefinitions/WorkflowTaskArtefactStepDefinitions.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: � 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Reflection; using BoDi; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/ApiHelper.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/ApiHelper.cs index 70d71339c..5f4494eea 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/ApiHelper.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/ApiHelper.cs @@ -1,4 +1,20 @@ - +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + namespace Monai.Deploy.WorkflowManager.IntegrationTests.Support { [Binding] diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs index 42f81471d..2d40c1bf7 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs @@ -1,4 +1,20 @@ -using System.Collections; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System.Collections; using FluentAssertions; using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Contracts.Models; @@ -65,8 +81,8 @@ public void AssertPayloadList(List payload, List? actualPayloa AssertPayload(p, actualPayload); } - } - + } + public void AssertPayloadCollection(Payload payloadCollection, PatientDetails patientDetails, WorkflowRequestMessage workflowRequestMessage) { payloadCollection.PayloadId.Should().Be(workflowRequestMessage.PayloadId.ToString()); @@ -83,39 +99,39 @@ public void AssertWorkflowIstanceMatchesExpectedTaskStatusUpdate(WorkflowInstanc updatedWorkflowInstance.Tasks[0].Status.Should().Be(taskExecutionStatus); } - public void AssertPagination(int count, string queries, T Response) - { - var data = Response.GetType().GetProperty("Data").GetValue(Response, null) as ICollection; - var totalPages = Response.GetType().GetProperty("TotalPages").GetValue(Response, null); - var pageSize = Response.GetType().GetProperty("PageSize").GetValue(Response, null); - var totalRecords = Response.GetType().GetProperty("TotalRecords").GetValue(Response, null); - var pageNumber = Response.GetType().GetProperty("PageNumber").GetValue(Response, null); - int pageNumberQuery = 1; - int pageSizeQuery = 10; - List splitQuery = queries.Split("&").ToList(); - if (queries != "") - { - foreach (var query in splitQuery) - { - if (query.Contains("pageNumber")) - { - pageNumberQuery = Int32.Parse(query.Split("=")[1]); - } - else if (query.Contains("pageSize")) - { - pageSizeQuery = Int32.Parse(query.Split("=")[1]); - } - else - { - throw new Exception($"Pagination query {query} is not valid"); - } - } - } - AssertDataCount(data, pageNumberQuery, pageSizeQuery, count); - AssertTotalPages(totalPages, count, pageSizeQuery); - totalRecords.Should().Be(count); - pageNumber.Should().Be(pageNumberQuery); - pageSize.Should().Be(pageSizeQuery); + public void AssertPagination(int count, string queries, T Response) + { + var data = Response.GetType().GetProperty("Data").GetValue(Response, null) as ICollection; + var totalPages = Response.GetType().GetProperty("TotalPages").GetValue(Response, null); + var pageSize = Response.GetType().GetProperty("PageSize").GetValue(Response, null); + var totalRecords = Response.GetType().GetProperty("TotalRecords").GetValue(Response, null); + var pageNumber = Response.GetType().GetProperty("PageNumber").GetValue(Response, null); + int pageNumberQuery = 1; + int pageSizeQuery = 10; + List splitQuery = queries.Split("&").ToList(); + if (queries != "") + { + foreach (var query in splitQuery) + { + if (query.Contains("pageNumber")) + { + pageNumberQuery = Int32.Parse(query.Split("=")[1]); + } + else if (query.Contains("pageSize")) + { + pageSizeQuery = Int32.Parse(query.Split("=")[1]); + } + else + { + throw new Exception($"Pagination query {query} is not valid"); + } + } + } + AssertDataCount(data, pageNumberQuery, pageSizeQuery, count); + AssertTotalPages(totalPages, count, pageSizeQuery); + totalRecords.Should().Be(count); + pageNumber.Should().Be(pageNumberQuery); + pageSize.Should().Be(pageSizeQuery); } public void WorkflowInstanceIncludesTaskDetails(List taskDispatchEvents, WorkflowInstance workflowInstance, WorkflowRevision workflowRevision) @@ -185,39 +201,39 @@ public void AssertWorkflowInstance(List expectedWorkflowInstan actualWorkflowInstance.Should().BeEquivalentTo(expectedWorkflowInstance, options => options.Excluding(x => x.StartTime)); } - private static void AssertDataCount(ICollection Data, int pageNumberQuery, int pageSizeQuery, int count) - { - if ((pageNumberQuery * pageSizeQuery) > count) - { - Data.Count.Should().Be(Math.Max(count - ((pageNumberQuery - 1) * pageSizeQuery), 0)); - } - else if ((pageNumberQuery * pageSizeQuery) < count) - { - Data.Count.Should().Be(pageSizeQuery); - } - else if (pageNumberQuery > 1) - { - Data.Count.Should().Be(Math.Max(count - (pageSizeQuery * (pageNumberQuery - 1)), 0)); - } - else - { - Data.Count.Should().Be(count); - } - } - - private static void AssertTotalPages(object TotalPages, int count, int pageSizeQuery) - { - int remainder; - int quotient = Math.DivRem(count, pageSizeQuery, out remainder); - - if (remainder == 0) - { - TotalPages.Should().Be(quotient); - } - else - { - TotalPages.Should().Be(quotient + 1); - } + private static void AssertDataCount(ICollection Data, int pageNumberQuery, int pageSizeQuery, int count) + { + if ((pageNumberQuery * pageSizeQuery) > count) + { + Data.Count.Should().Be(Math.Max(count - ((pageNumberQuery - 1) * pageSizeQuery), 0)); + } + else if ((pageNumberQuery * pageSizeQuery) < count) + { + Data.Count.Should().Be(pageSizeQuery); + } + else if (pageNumberQuery > 1) + { + Data.Count.Should().Be(Math.Max(count - (pageSizeQuery * (pageNumberQuery - 1)), 0)); + } + else + { + Data.Count.Should().Be(count); + } + } + + private static void AssertTotalPages(object TotalPages, int count, int pageSizeQuery) + { + int remainder; + int quotient = Math.DivRem(count, pageSizeQuery, out remainder); + + if (remainder == 0) + { + TotalPages.Should().Be(quotient); + } + else + { + TotalPages.Should().Be(quotient + 1); + } } } } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/DataHelper.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/DataHelper.cs index be5f8ac51..7d0844cd4 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/DataHelper.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/DataHelper.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Contracts.Models; @@ -123,8 +136,8 @@ public WorkflowInstance GetWorkflowInstanceTestData(string name) { throw new Exception($"Workflow Intance {name} does not have any applicable test data, please check and try again!"); } - } - + } + public WorkflowInstance GetWorkflowInstanceTestDataByIndex(int index) { var workflowInstance = WorkflowInstancesTestData.TestData[index]; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/HttpRequestMessageExtensions.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/HttpRequestMessageExtensions.cs index 51e759b06..8ac2e2987 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/HttpRequestMessageExtensions.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/HttpRequestMessageExtensions.cs @@ -1,4 +1,20 @@ -using System.Net.Http.Formatting; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System.Net.Http.Formatting; using System.Text; namespace Monai.Deploy.WorkflowManager.IntegrationTests.Support diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/JsonFormatter.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/JsonFormatter.cs index e1a104f78..205977773 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/JsonFormatter.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/JsonFormatter.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Newtonsoft.Json; using Newtonsoft.Json.Linq; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MessageReceiver.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MessageReceiver.cs index ec347705c..387a61d12 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MessageReceiver.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MessageReceiver.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using RabbitMQ.Client; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioClientUtil.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioClientUtil.cs index 879a481a0..b05032e0d 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioClientUtil.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MinioClientUtil.cs @@ -1,4 +1,20 @@ -using Minio; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Minio; using Monai.Deploy.WorkflowManager.IntegrationTests.POCO; using Polly; using Polly.Retry; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MongoClientUtil.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MongoClientUtil.cs index c8fdf8884..88680374d 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MongoClientUtil.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/MongoClientUtil.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.Contracts.Models; using Monai.Deploy.WorkflowManager.IntegrationTests.POCO; @@ -14,7 +27,7 @@ public class MongoClientUtil private MongoClient Client { get; set; } private IMongoDatabase Database { get; set; } private IMongoCollection WorkflowRevisionCollection { get; set; } - private IMongoCollection WorkflowInstanceCollection { get; set; } + private IMongoCollection WorkflowInstanceCollection { get; set; } private IMongoCollection PayloadCollection { get; set; } private RetryPolicy RetryMongo { get; set; } private RetryPolicy> RetryPayload { get; set; } @@ -26,7 +39,7 @@ public MongoClientUtil() WorkflowRevisionCollection = Database.GetCollection($"{TestExecutionConfig.MongoConfig.WorkflowCollection}"); WorkflowInstanceCollection = Database.GetCollection($"{TestExecutionConfig.MongoConfig.WorkflowInstanceCollection}"); PayloadCollection = Database.GetCollection($"{TestExecutionConfig.MongoConfig.PayloadCollection}"); - RetryMongo = Policy.Handle().WaitAndRetry(retryCount: 10, sleepDurationProvider: _ => TimeSpan.FromMilliseconds(1000)); + RetryMongo = Policy.Handle().WaitAndRetry(retryCount: 10, sleepDurationProvider: _ => TimeSpan.FromMilliseconds(1000)); RetryPayload = Policy>.Handle().WaitAndRetry(retryCount: 10, sleepDurationProvider: _ => TimeSpan.FromMilliseconds(1000)); } @@ -111,20 +124,20 @@ public void CreatePayloadDocument(Payload payload) { PayloadCollection.InsertOne(payload); }); - } + } public List GetPayloadCollectionByPayloadId(string payloadId) { - var res = RetryPayload.Execute(() => - { - var payloadCollection = PayloadCollection.Find(x => x.PayloadId == payloadId).ToList(); - if (payloadCollection.Count != 0) - { - return payloadCollection; - } - else - { - throw new Exception("Payload not found"); - } + var res = RetryPayload.Execute(() => + { + var payloadCollection = PayloadCollection.Find(x => x.PayloadId == payloadId).ToList(); + if (payloadCollection.Count != 0) + { + return payloadCollection; + } + else + { + throw new Exception("Payload not found"); + } }); return res; } diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/RabbitConnectionFactory.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/RabbitConnectionFactory.cs index 7a0cab774..98212d040 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/RabbitConnectionFactory.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/RabbitConnectionFactory.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.IntegrationTests.POCO; using RabbitMQ.Client; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/RabbitConsumer.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/RabbitConsumer.cs index bba668be5..71dda2018 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/RabbitConsumer.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/RabbitConsumer.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System.Text; using Newtonsoft.Json; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/RabbitPublisher.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/RabbitPublisher.cs index 7e02f433f..bb3d497c1 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/RabbitPublisher.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/RabbitPublisher.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Messages; using RabbitMQ.Client; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/WorkflowExecutorStartup.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/WorkflowExecutorStartup.cs index 311d86265..8b8fb5365 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/WorkflowExecutorStartup.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/WorkflowExecutorStartup.cs @@ -1,4 +1,20 @@ -using System.IO.Abstractions; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System.IO.Abstractions; using System.Net.Http.Headers; using System.Text; using Microsoft.AspNetCore.Hosting; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/Helper.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/Helper.cs index ee17cea0d..35b154dda 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/Helper.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/Helper.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ namespace Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.TestData { diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PatientTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PatientTestData.cs index 3592b0960..14cac65b4 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PatientTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PatientTestData.cs @@ -1,4 +1,20 @@ -using Monai.Deploy.WorkflowManager.Contracts.Models; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Monai.Deploy.WorkflowManager.Contracts.Models; namespace Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.TestData { diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs index aa70e2baf..8b6886c52 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/PayloadTestData.cs @@ -1,4 +1,20 @@ -using Monai.Deploy.WorkflowManager.Contracts.Models; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Monai.Deploy.WorkflowManager.Contracts.Models; namespace Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.TestData { diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/TaskUpdateTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/TaskUpdateTestData.cs index cf6c3bf86..aa626ba6f 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/TaskUpdateTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/TaskUpdateTestData.cs @@ -1,4 +1,20 @@ -using Monai.Deploy.Messaging.Events; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Monai.Deploy.Messaging.Events; namespace Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.TestData { diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs index c12d10a6f..b593f9952 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowObjectTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowObjectTestData.cs index 26f255d29..f93d1c4fe 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowObjectTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowObjectTestData.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs index 644288f2f..38f4fb602 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRequestTestData.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.IntegrationTests.Models; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRevisionTestData.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRevisionTestData.cs index 26ca76c12..a069f52f0 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRevisionTestData.cs +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowRevisionTestData.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.Contracts.Models; diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/nginx.conf b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/nginx.conf index cca82f6fe..fa4e9e4b5 100644 --- a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/nginx.conf +++ b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/nginx.conf @@ -1,3 +1,17 @@ +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + user nginx; worker_processes auto; diff --git a/tests/Shared/VerifyLogExtension.cs b/tests/Shared/VerifyLogExtension.cs index 5008db656..a23688f34 100644 --- a/tests/Shared/VerifyLogExtension.cs +++ b/tests/Shared/VerifyLogExtension.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Diagnostics.CodeAnalysis; diff --git a/tests/UnitTests/CLI.Tests/Monai.Deploy.WorkflowManager.CLI.Tests.csproj b/tests/UnitTests/CLI.Tests/Monai.Deploy.WorkflowManager.CLI.Tests.csproj index 560b0ba01..395cda254 100644 --- a/tests/UnitTests/CLI.Tests/Monai.Deploy.WorkflowManager.CLI.Tests.csproj +++ b/tests/UnitTests/CLI.Tests/Monai.Deploy.WorkflowManager.CLI.Tests.csproj @@ -1,3 +1,19 @@ + + diff --git a/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManger.Common.Tests.csproj b/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManger.Common.Tests.csproj index 57cf1cef1..0706ef165 100644 --- a/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManger.Common.Tests.csproj +++ b/tests/UnitTests/Common.Tests/Monai.Deploy.WorkflowManger.Common.Tests.csproj @@ -1,6 +1,17 @@ @@ -32,3 +43,4 @@ SPDX-License-Identifier: Apache License 2.0 + diff --git a/tests/UnitTests/Common.Tests/Services/WorkflowServiceTests.cs b/tests/UnitTests/Common.Tests/Services/WorkflowServiceTests.cs index 28c98eb56..61660a4d8 100644 --- a/tests/UnitTests/Common.Tests/Services/WorkflowServiceTests.cs +++ b/tests/UnitTests/Common.Tests/Services/WorkflowServiceTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Monai.Deploy.WorkflowManager.Common.Interfaces; using Monai.Deploy.WorkflowManager.Common.Services; diff --git a/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj b/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj index 4ef722ce5..bf54c8042 100644 --- a/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj +++ b/tests/UnitTests/ConditionsResolver.Tests/Monai.Deploy.WorkflowManager.ConditionsResolver.Tests.csproj @@ -1,3 +1,19 @@ + + diff --git a/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalGroupTests.cs b/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalGroupTests.cs index 7d079a7b6..4a1968310 100644 --- a/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalGroupTests.cs +++ b/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalGroupTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using Monai.Deploy.WorkflowManager.ConditionsResolver.Resolver; diff --git a/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalTests.cs b/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalTests.cs index e335a71da..455071611 100644 --- a/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalTests.cs +++ b/tests/UnitTests/ConditionsResolver.Tests/Resolver/ConditionalTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using Monai.Deploy.WorkflowManager.ConditionsResolver.Resolver; diff --git a/tests/UnitTests/ConditionsResolver.Tests/Resolver/RegexExtensionsTests.cs b/tests/UnitTests/ConditionsResolver.Tests/Resolver/RegexExtensionsTests.cs index 5b3a5795d..12373b92f 100644 --- a/tests/UnitTests/ConditionsResolver.Tests/Resolver/RegexExtensionsTests.cs +++ b/tests/UnitTests/ConditionsResolver.Tests/Resolver/RegexExtensionsTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Text.RegularExpressions; diff --git a/tests/UnitTests/ConditionsResolver.Tests/Resolver/StringExtensionsTests.cs b/tests/UnitTests/ConditionsResolver.Tests/Resolver/StringExtensionsTests.cs index 420e90389..838cf6b71 100644 --- a/tests/UnitTests/ConditionsResolver.Tests/Resolver/StringExtensionsTests.cs +++ b/tests/UnitTests/ConditionsResolver.Tests/Resolver/StringExtensionsTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using Monai.Deploy.WorkflowManager.ConditionsResolver.Extensions; diff --git a/tests/UnitTests/Configuration.Tests/ConfigurationValidatorTest.cs b/tests/UnitTests/Configuration.Tests/ConfigurationValidatorTest.cs index d50dca2af..d17873096 100644 --- a/tests/UnitTests/Configuration.Tests/ConfigurationValidatorTest.cs +++ b/tests/UnitTests/Configuration.Tests/ConfigurationValidatorTest.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj index 156ca4a98..06012f6a1 100644 --- a/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj +++ b/tests/UnitTests/Configuration.Tests/Monai.Deploy.WorkflowManager.Configuration.Tests.csproj @@ -1,6 +1,17 @@ diff --git a/tests/UnitTests/Configuration.Tests/VerifyLogExtension.cs b/tests/UnitTests/Configuration.Tests/VerifyLogExtension.cs index 286baa20f..2fb2f80a1 100644 --- a/tests/UnitTests/Configuration.Tests/VerifyLogExtension.cs +++ b/tests/UnitTests/Configuration.Tests/VerifyLogExtension.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Diagnostics.CodeAnalysis; diff --git a/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj b/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj index 855541008..bf7af7295 100644 --- a/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj +++ b/tests/UnitTests/Database.Tests/Monai.Deploy.WorkflowManager.Database.Tests.csproj @@ -1,3 +1,19 @@ + + diff --git a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj index e170bf9ef..ab7eab575 100644 --- a/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj +++ b/tests/UnitTests/PayloadListener.Tests/Monai.Deploy.WorkflowManager.PayloadListener.Tests.csproj @@ -1,6 +1,17 @@ diff --git a/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs b/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs index eada3fd25..07835eebf 100644 --- a/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs +++ b/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using NUnit.Framework; using Moq; diff --git a/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs b/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs index d5e873386..4e22d2d6c 100644 --- a/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs +++ b/tests/UnitTests/PayloadListener.Tests/Validators/EventPayloadValidatorTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj b/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj index 86975ce73..01a2742e3 100644 --- a/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj +++ b/tests/UnitTests/Storage.Tests/Monai.Deploy.WorkflowManager.Storage.Tests.csproj @@ -1,6 +1,17 @@ diff --git a/tests/UnitTests/Storage.Tests/Services/DicomServiceTests.cs b/tests/UnitTests/Storage.Tests/Services/DicomServiceTests.cs index eebd0f53c..f6aa32cf5 100644 --- a/tests/UnitTests/Storage.Tests/Services/DicomServiceTests.cs +++ b/tests/UnitTests/Storage.Tests/Services/DicomServiceTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/tests/UnitTests/TaskManager.AideClinicalReview.Tests/AideClinicalReviewPluginTests.cs b/tests/UnitTests/TaskManager.AideClinicalReview.Tests/AideClinicalReviewPluginTests.cs index 5050705ce..161e147bc 100644 --- a/tests/UnitTests/TaskManager.AideClinicalReview.Tests/AideClinicalReviewPluginTests.cs +++ b/tests/UnitTests/TaskManager.AideClinicalReview.Tests/AideClinicalReviewPluginTests.cs @@ -1,3 +1,19 @@ +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.API; diff --git a/tests/UnitTests/TaskManager.AideClinicalReview.Tests/TaskManager.AideClinicalReview.Tests.csproj b/tests/UnitTests/TaskManager.AideClinicalReview.Tests/TaskManager.AideClinicalReview.Tests.csproj index 1a9b88756..b53e7036d 100644 --- a/tests/UnitTests/TaskManager.AideClinicalReview.Tests/TaskManager.AideClinicalReview.Tests.csproj +++ b/tests/UnitTests/TaskManager.AideClinicalReview.Tests/TaskManager.AideClinicalReview.Tests.csproj @@ -1,3 +1,19 @@ + + diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs index cf013f6a9..b63c00d74 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/tests/UnitTests/TaskManager.Argo.Tests/ArgoProviderTest.cs b/tests/UnitTests/TaskManager.Argo.Tests/ArgoProviderTest.cs index f120671be..3cc82483c 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/ArgoProviderTest.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/ArgoProviderTest.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Globalization; diff --git a/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj b/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj index 7ebc8e62f..6593ec439 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj +++ b/tests/UnitTests/TaskManager.Argo.Tests/Monai.Deploy.WorkflowManager.TaskManager.Argo.Tests.csproj @@ -1,3 +1,19 @@ + + diff --git a/tests/UnitTests/TaskManager.Argo.Tests/Repositories/ArgoMetadataRepositoryTests.cs b/tests/UnitTests/TaskManager.Argo.Tests/Repositories/ArgoMetadataRepositoryTests.cs index cd7fbf9de..962348ae0 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/Repositories/ArgoMetadataRepositoryTests.cs +++ b/tests/UnitTests/TaskManager.Argo.Tests/Repositories/ArgoMetadataRepositoryTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/tests/UnitTests/TaskManager.Argo.Tests/Templates/DagWithIntermediateArtifacts.yml b/tests/UnitTests/TaskManager.Argo.Tests/Templates/DagWithIntermediateArtifacts.yml index 64ac1900b..a49f300c1 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/Templates/DagWithIntermediateArtifacts.yml +++ b/tests/UnitTests/TaskManager.Argo.Tests/Templates/DagWithIntermediateArtifacts.yml @@ -1,5 +1,16 @@ -# SPDX-FileCopyrightText: © 2022 MONAI Consortium -# SPDX-License-Identifier: Apache License 2.0 +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # The entrypoint template contains a dag with three tasks and three additional template # each referenced by the tasks defined in the dag. @@ -33,7 +44,7 @@ kind: WorkflowTemplate metadata: name: artifact-input-copy-dag spec: - entrypoint: my-entrypoint + entrypoint: my-entrypoint templates: - name: my-entrypoint dag: diff --git a/tests/UnitTests/TaskManager.Argo.Tests/Templates/SimpleTemplate.yml b/tests/UnitTests/TaskManager.Argo.Tests/Templates/SimpleTemplate.yml index 79c21abe1..7af504537 100644 --- a/tests/UnitTests/TaskManager.Argo.Tests/Templates/SimpleTemplate.yml +++ b/tests/UnitTests/TaskManager.Argo.Tests/Templates/SimpleTemplate.yml @@ -1,5 +1,16 @@ -# SPDX-FileCopyrightText: © 2022 MONAI Consortium -# SPDX-License-Identifier: Apache License 2.0 +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # Template contains a single template with two inputs expected # to be provided by the Task Manager. diff --git a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj index 0df2b5757..fb1a22166 100644 --- a/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj +++ b/tests/UnitTests/TaskManager.Tests/Monai.Deploy.WorkflowManager.TaskManager.Tests.csproj @@ -1,6 +1,17 @@ diff --git a/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs b/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs index 61d4763b6..edcc1f669 100644 --- a/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs +++ b/tests/UnitTests/TaskManager.Tests/TaskManagerTest.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: � 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Common/ArtifactMapperTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Common/ArtifactMapperTests.cs index b72680db7..ae1912d10 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Common/ArtifactMapperTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Common/ArtifactMapperTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Common/EventMapperTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Common/EventMapperTests.cs index 7e4f30a7f..16df32fb7 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Common/EventMapperTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Common/EventMapperTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Common/TaskExecutionStatusExtensionsTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Common/TaskExecutionStatusExtensionsTests.cs index b9421f09b..81563635c 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Common/TaskExecutionStatusExtensionsTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Common/TaskExecutionStatusExtensionsTests.cs @@ -1,4 +1,20 @@ -using Monai.Deploy.Messaging.Events; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.WorkfowExecuter.Common; using Xunit; diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj b/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj index b4784075c..b6d2c4ed4 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj +++ b/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj @@ -1,3 +1,19 @@ + + diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/ConditionalParameterParserTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/ConditionalParameterParserTests.cs index 560edbd10..d163b7292 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Services/ConditionalParameterParserTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Services/ConditionalParameterParserTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; @@ -160,7 +173,7 @@ public List CreateTestData() } } #region Extra Test Data - + //new WorkflowInstance() //{ // Id = Guid.NewGuid().ToString(), diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs index 9d5cd1ae8..f5a1dc50f 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs +++ b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/tests/UnitTests/WorkflowManager.Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj b/tests/UnitTests/WorkflowManager.Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj index efd429b3a..12a8a9f01 100644 --- a/tests/UnitTests/WorkflowManager.Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj +++ b/tests/UnitTests/WorkflowManager.Common.Tests/Monai.Deploy.WorkflowManager.Common.Tests.csproj @@ -1,3 +1,19 @@ + + diff --git a/tests/UnitTests/WorkflowManager.Common.Tests/Services/PayloadServiceTests.cs b/tests/UnitTests/WorkflowManager.Common.Tests/Services/PayloadServiceTests.cs index acc4b3400..ff40a6707 100644 --- a/tests/UnitTests/WorkflowManager.Common.Tests/Services/PayloadServiceTests.cs +++ b/tests/UnitTests/WorkflowManager.Common.Tests/Services/PayloadServiceTests.cs @@ -1,4 +1,20 @@ -using FluentAssertions; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using FluentAssertions; using Microsoft.Extensions.Logging; using Monai.Deploy.Messaging.Events; using Monai.Deploy.WorkflowManager.Common.Interfaces; diff --git a/tests/UnitTests/WorkflowManager.Common.Tests/StorageListExtensionsTests.cs b/tests/UnitTests/WorkflowManager.Common.Tests/StorageListExtensionsTests.cs index f174a5781..8c78d0835 100644 --- a/tests/UnitTests/WorkflowManager.Common.Tests/StorageListExtensionsTests.cs +++ b/tests/UnitTests/WorkflowManager.Common.Tests/StorageListExtensionsTests.cs @@ -1,4 +1,20 @@ -using Monai.Deploy.WorkflowManager.Common.Extensions; +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Monai.Deploy.WorkflowManager.Common.Extensions; using Xunit; namespace Monai.Deploy.WorkflowManager.Common.Tests diff --git a/tests/UnitTests/WorkflowManager.Tests/Common/IServiceProviderExtensionsTest.cs b/tests/UnitTests/WorkflowManager.Tests/Common/IServiceProviderExtensionsTest.cs index 4fc4a80a6..5340999da 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Common/IServiceProviderExtensionsTest.cs +++ b/tests/UnitTests/WorkflowManager.Tests/Common/IServiceProviderExtensionsTest.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using Microsoft.Extensions.Logging; diff --git a/tests/UnitTests/WorkflowManager.Tests/Controllers/PayloadControllerTests.cs b/tests/UnitTests/WorkflowManager.Tests/Controllers/PayloadControllerTests.cs index ddcc529fc..5c0e88517 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Controllers/PayloadControllerTests.cs +++ b/tests/UnitTests/WorkflowManager.Tests/Controllers/PayloadControllerTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/tests/UnitTests/WorkflowManager.Tests/Controllers/WorkflowInstanceControllerTests.cs b/tests/UnitTests/WorkflowManager.Tests/Controllers/WorkflowInstanceControllerTests.cs index 8338e08a6..e4992c0f5 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Controllers/WorkflowInstanceControllerTests.cs +++ b/tests/UnitTests/WorkflowManager.Tests/Controllers/WorkflowInstanceControllerTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/tests/UnitTests/WorkflowManager.Tests/Controllers/WorkflowsControllerTests.cs b/tests/UnitTests/WorkflowManager.Tests/Controllers/WorkflowsControllerTests.cs index b7ece852c..42402229b 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Controllers/WorkflowsControllerTests.cs +++ b/tests/UnitTests/WorkflowManager.Tests/Controllers/WorkflowsControllerTests.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Collections.Generic; diff --git a/tests/UnitTests/WorkflowManager.Tests/DummyMessagingService.cs b/tests/UnitTests/WorkflowManager.Tests/DummyMessagingService.cs index 7e9fedd4b..aa2342cb9 100644 --- a/tests/UnitTests/WorkflowManager.Tests/DummyMessagingService.cs +++ b/tests/UnitTests/WorkflowManager.Tests/DummyMessagingService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; diff --git a/tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs b/tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs index b985d429b..8349229ea 100644 --- a/tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs +++ b/tests/UnitTests/WorkflowManager.Tests/DummyStorageService.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; diff --git a/tests/UnitTests/WorkflowManager.Tests/Logging/FileLoggingTextFormatterTest.cs b/tests/UnitTests/WorkflowManager.Tests/Logging/FileLoggingTextFormatterTest.cs index 4336a820d..a546745e0 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Logging/FileLoggingTextFormatterTest.cs +++ b/tests/UnitTests/WorkflowManager.Tests/Logging/FileLoggingTextFormatterTest.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Globalization; diff --git a/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj b/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj index b4b57b2e7..182c5d037 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj +++ b/tests/UnitTests/WorkflowManager.Tests/Monai.Deploy.WorkflowManager.Tests.csproj @@ -1,6 +1,17 @@ @@ -44,7 +55,7 @@ SPDX-License-Identifier: Apache License 2.0 Always - + true true diff --git a/tests/UnitTests/WorkflowManager.Tests/ProgramTest.cs b/tests/UnitTests/WorkflowManager.Tests/ProgramTest.cs index 5a1413ea2..fec44c8e6 100644 --- a/tests/UnitTests/WorkflowManager.Tests/ProgramTest.cs +++ b/tests/UnitTests/WorkflowManager.Tests/ProgramTest.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.IO; diff --git a/tests/UnitTests/WorkflowManager.Tests/Services/DataRetentionService/DataRetentionServiceTest.cs b/tests/UnitTests/WorkflowManager.Tests/Services/DataRetentionService/DataRetentionServiceTest.cs index ab3a792f8..a8dea2439 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Services/DataRetentionService/DataRetentionServiceTest.cs +++ b/tests/UnitTests/WorkflowManager.Tests/Services/DataRetentionService/DataRetentionServiceTest.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Threading; diff --git a/tests/UnitTests/WorkflowManager.Tests/Shared/VerifyLogExtension.cs b/tests/UnitTests/WorkflowManager.Tests/Shared/VerifyLogExtension.cs index 4b1bc4c22..403a81c9a 100644 --- a/tests/UnitTests/WorkflowManager.Tests/Shared/VerifyLogExtension.cs +++ b/tests/UnitTests/WorkflowManager.Tests/Shared/VerifyLogExtension.cs @@ -1,5 +1,18 @@ -// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium -// SPDX-License-Identifier: Apache License 2.0 +/* + * Copyright 2021-2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using System; using System.Diagnostics.CodeAnalysis; diff --git a/tests/coverlet.runsettings b/tests/coverlet.runsettings index ab61b6330..63104b019 100644 --- a/tests/coverlet.runsettings +++ b/tests/coverlet.runsettings @@ -1,4 +1,19 @@ +