From 9208b506a134df536b9d79a4752c84799f7641f9 Mon Sep 17 00:00:00 2001 From: ramueSVA <156297972+ramueSVA@users.noreply.github.com> Date: Tue, 2 Apr 2024 07:03:03 +0200 Subject: [PATCH] Change project structure and pom.xml, and group.id * Change project structure and pom.xml, and group.id --- pom.xml | 2 +- .../de/vitagroup/num/domain/model/Type.java | 6 -- .../highmed}/NumPortalApplication.java | 6 +- .../attachment/AttachmentRepository.java | 6 +- .../attachment/domain/dto/AttachmentDto.java | 2 +- .../domain/dto/LightAttachmentDto.java | 2 +- .../attachment/domain/model/Attachment.java | 2 +- .../repository/AttachmentRepositoryImpl.java | 8 +-- .../repository/AttachmentRepositoryJpa.java | 11 ++-- .../attachment/service/AttachmentService.java | 30 +++++----- .../attachment/service/ClamAVService.java | 6 +- .../attachment/service/FileScanService.java | 8 +-- .../highmed}/config/CachingConfig.java | 7 ++- .../config/ClientTemplateProviderConfig.java | 2 +- .../highmed}/config/EhrBaseConfig.java | 9 +-- .../highmed}/config/FttpClientConfig.java | 11 ++-- .../highmed}/config/MapperConfig.java | 2 +- .../config/MessageSourceConfiguration.java | 11 ++-- .../database/NumAttachmentFlywayConfig.java | 2 +- ...rtalAttachmentDatasourceConfiguration.java | 6 +- .../NumPortalDatasourceConfiguration.java | 6 +- .../database/NumPortalFlywayConfig.java | 2 +- .../highmed}/domain/dto/AqlCategoryDto.java | 4 +- .../highmed}/domain/dto/AqlDto.java | 8 +-- .../highmed}/domain/dto/CardDto.java | 2 +- .../highmed}/domain/dto/CohortAqlDto.java | 2 +- .../highmed}/domain/dto/CohortDto.java | 9 ++- .../highmed}/domain/dto/CohortGroupDto.java | 10 ++-- .../highmed}/domain/dto/CohortSizeDto.java | 2 +- .../highmed}/domain/dto/CommentDto.java | 8 +-- .../highmed}/domain/dto/Language.java | 2 +- .../domain/dto/ManagerProjectDto.java | 6 +- .../highmed}/domain/dto/MetricsDto.java | 2 +- .../domain/dto/NavigationItemDto.java | 8 +-- .../highmed}/domain/dto/OrganizationDto.java | 6 +- .../domain/dto/ParameterOptionsDto.java | 2 +- .../highmed}/domain/dto/ProjectDto.java | 16 +++--- .../highmed}/domain/dto/ProjectInfoDto.java | 2 +- .../highmed}/domain/dto/ProjectViewTO.java | 6 +- .../highmed}/domain/dto/RawQueryDto.java | 7 +-- .../highmed}/domain/dto/SearchCriteria.java | 4 +- .../highmed}/domain/dto/SearchFilter.java | 2 +- .../highmed}/domain/dto/SlimAqlDto.java | 3 +- .../highmed}/domain/dto/TemplateInfoDto.java | 7 +-- .../domain/dto/TemplateMetadataDto.java | 2 +- .../domain/dto/TemplateSizeRequestDto.java | 8 +-- .../highmed}/domain/dto/UserDetailsDto.java | 5 +- .../highmed}/domain/dto/UserNameDto.java | 5 +- .../highmed}/domain/dto/ZarsInfoDto.java | 9 +-- .../num => org/highmed}/domain/model/Aql.java | 5 +- .../highmed}/domain/model/AqlCategory.java | 6 +- .../highmed}/domain/model/Cohort.java | 5 +- .../highmed}/domain/model/CohortAql.java | 2 +- .../highmed}/domain/model/CohortGroup.java | 9 ++- .../highmed}/domain/model/Comment.java | 5 +- .../highmed}/domain/model/Content.java | 4 +- .../highmed}/domain/model/ContentType.java | 2 +- .../highmed}/domain/model/EntityGroup.java | 2 +- .../highmed}/domain/model/ExportType.java | 2 +- .../highmed}/domain/model/MailDomain.java | 4 +- .../highmed}/domain/model/Operator.java | 2 +- .../highmed}/domain/model/Organization.java | 4 +- .../highmed}/domain/model/Project.java | 19 ++++--- .../domain/model/ProjectCategories.java | 2 +- .../highmed}/domain/model/ProjectStatus.java | 8 +-- .../domain/model/ProjectTransition.java | 6 +- .../highmed}/domain/model/Roles.java | 2 +- .../highmed}/domain/model/SetupType.java | 2 +- .../highmed}/domain/model/Translation.java | 5 +- .../java/org/highmed/domain/model/Type.java | 6 ++ .../highmed}/domain/model/admin/Role.java | 2 +- .../highmed}/domain/model/admin/User.java | 4 +- .../domain/model/admin/UserDetails.java | 4 +- .../repository/AqlCategoryRepository.java | 4 +- .../domain/repository/AqlConverter.java | 4 +- .../domain/repository/AqlRepository.java | 10 ++-- .../repository/CategorySetConverter.java | 4 +- .../repository/CohortGroupRepository.java | 4 +- .../domain/repository/CohortRepository.java | 4 +- .../domain/repository/CommentRepository.java | 4 +- .../repository/ContentItemRepository.java | 6 +- .../repository/CustomProjectRepository.java | 6 +- .../repository/MailDomainRepository.java | 4 +- .../domain/repository/MapConverter.java | 2 +- .../repository/OrganizationRepository.java | 4 +- .../domain/repository/ProjectRepository.java | 7 ++- .../repository/ProjectRepositoryImpl.java | 12 ++-- .../ProjectTransitionRepository.java | 6 +- .../domain/repository/StringSetConverter.java | 2 +- .../repository/TranslationRepository.java | 4 +- .../repository/UserDetailsRepository.java | 4 +- .../specification/AqlSpecification.java | 17 +++--- .../specification/BaseSpecification.java | 4 +- .../OrganizationSpecification.java | 6 +- .../specification/ProjectSpecification.java | 17 +++--- .../UserDetailsSpecification.java | 6 +- .../domain/templates/ExceptionsTemplate.java | 4 +- .../domain/validation/CohortValidator.java | 11 ++-- .../validation/TranslatedStringValidator.java | 6 +- .../domain/validation/ValidCohort.java | 3 +- .../validation/ValidTranslatedString.java | 4 +- .../highmed}/events/DeactivateUserEvent.java | 2 +- .../listeners/DeactivateUserListener.java | 6 +- .../highmed}/listeners/UserCacheInit.java | 4 +- .../num => org/highmed}/mapper/AqlMapper.java | 10 ++-- .../highmed}/mapper/CohortMapper.java | 17 +++--- .../highmed}/mapper/CommentMapper.java | 10 ++-- .../highmed}/mapper/OrganizationMapper.java | 14 ++--- .../highmed}/mapper/ProjectMapper.java | 15 ++--- .../highmed}/mapper/ProjectViewMapper.java | 10 ++-- .../highmed}/mapper/TemplateMapper.java | 6 +- .../highmed}/mapper/UserDetailsMapper.java | 9 +-- .../highmed}/properties/ClamAVProperties.java | 2 +- .../properties/ConsentProperties.java | 2 +- .../highmed}/properties/CorsProperties.java | 7 ++- .../properties/EhrBaseProperties.java | 2 +- .../highmed}/properties/FttpProperties.java | 2 +- .../highmed}/properties/NumProperties.java | 2 +- .../properties/PrivacyProperties.java | 2 +- .../PseudonymsPsnWorkflowProperties.java | 2 +- .../properties/SwaggerProperties.java | 2 +- .../highmed}/service/AqlService.java | 38 ++++++------- .../highmed}/service/CohortService.java | 45 ++++++++------- .../highmed}/service/CommentService.java | 30 ++++------ .../highmed}/service/ContentService.java | 36 ++++++------ .../highmed}/service/OrganizationService.java | 32 +++++------ .../highmed}/service/ProjectDocCreator.java | 37 ++++++------ .../highmed}/service/ProjectService.java | 48 ++++++++-------- .../highmed}/service/SetupHealthiness.java | 10 ++-- .../highmed}/service/TemplateService.java | 20 +++---- .../highmed}/service/UserDetailsService.java | 40 ++++++------- .../highmed}/service/UserService.java | 57 +++++++++---------- .../highmed}/service/atna/AtnaProperties.java | 2 +- .../highmed}/service/atna/AtnaService.java | 11 ++-- .../service/ehrbase/CompositionFlattener.java | 8 +-- .../CompositionResponseDataBuilder.java | 10 +--- .../service/ehrbase/EhrBaseService.java | 12 ++-- .../service/ehrbase/ParameterService.java | 8 +-- .../service/ehrbase/Pseudonymity.java | 10 ++-- .../service/ehrbase/ResponseFilter.java | 20 ++++--- .../service/email/EmailProperties.java | 2 +- .../highmed}/service/email/EmailService.java | 6 +- .../service/email/MessageSourceWrapper.java | 2 +- .../service/email/ZarsProperties.java | 2 +- .../highmed}/service/email/ZarsService.java | 21 +++---- .../exception/BadCredentialsException.java | 2 +- .../exception/BadRequestException.java | 2 +- .../service/exception/CustomException.java | 2 +- .../exception/CustomizedExceptionHandler.java | 6 +- .../exception/EntityNotFoundException.java | 2 +- .../service/exception/ExceptionDto.java | 2 +- .../service/exception/ForbiddenException.java | 2 +- .../exception/IllegalArgumentException.java | 2 +- .../service/exception/PrivacyException.java | 2 +- .../service/exception/ResourceNotFound.java | 2 +- .../exception/SameEntityExistsException.java | 2 +- .../service/exception/SystemException.java | 2 +- .../exception/TokenIsNotValidException.java | 2 +- .../exception/UserUnauthorizedException.java | 4 +- ...nameNotFoundOrNoLongerActiveException.java | 2 +- .../service/exception/dto/ErrorDetails.java | 2 +- .../service/exception/dto/ExceptionDto.java | 2 +- .../BadCredentialsException.java | 2 +- .../implementation/CustomException.java | 2 +- .../EntityNotFoundException.java | 2 +- .../SameEntityExistsException.java | 2 +- .../TokenIsNotValidException.java | 2 +- ...nameNotFoundOrNoLongerActiveException.java | 2 +- .../service/executors/AqlExecutor.java | 12 ++-- .../service/executors/CohortExecutor.java | 21 +++---- .../service/executors/CohortQueryLister.java | 17 +++--- .../executors/SetOperationsService.java | 8 +-- .../highmed}/service/html/HtmlContent.java | 2 +- .../highmed}/service/logger/AuditLog.java | 2 +- .../highmed}/service/logger/NumLogger.java | 6 +- .../notification/NotificationService.java | 13 +++-- .../notification/dto/NewUserNotification.java | 4 +- ...ewUserWithoutOrganizationNotification.java | 7 ++- .../notification/dto/Notification.java | 9 +-- .../ProjectApprovalRequestNotification.java | 7 ++- .../dto/ProjectCloseNotification.java | 7 ++- .../dto/ProjectStartNotification.java | 7 ++- .../dto/ProjectStatusChangeNotification.java | 9 +-- ...rojectStatusChangeRequestNotification.java | 6 +- .../account/AccountApprovalNotification.java | 9 +-- .../AccountStatusChangedNotification.java | 6 +- .../OrganizationUpdateNotification.java | 9 +-- .../dto/account/RolesUpdateNotification.java | 8 +-- .../account/UserNameUpdateNotification.java | 9 +-- .../highmed}/service/policy/EhrPolicy.java | 10 ++-- .../service/policy/EuropeanConsentPolicy.java | 8 +-- .../highmed}/service/policy/Policy.java | 4 +- .../service/policy/ProjectPolicyService.java | 2 +- .../service/policy/TemplatesPolicy.java | 8 +-- .../service/util/AqlQueryConstants.java | 2 +- .../web/config/ApplicationSecurity.java | 2 +- .../web/config/AuthorizationConverter.java | 2 +- .../highmed}/web/config/CorsConfig.java | 4 +- .../web/config/FeignClientConfig.java | 4 +- .../num => org/highmed}/web/config/Role.java | 2 +- .../highmed}/web/config/SwaggerConfig.java | 6 +- .../web/controller/AdminController.java | 42 +++++++------- .../web/controller/AqlController.java | 26 ++++----- .../web/controller/CohortController.java | 28 ++++----- .../web/controller/ContentController.java | 24 ++++---- .../controller/NumAttachmentController.java | 16 +++--- .../controller/OrganizationController.java | 20 +++---- .../web/controller/ProfileController.java | 10 ++-- .../web/controller/ProjectController.java | 39 +++++++------ .../web/controller/TemplateController.java | 10 ++-- .../highmed}/web/feign/KeycloakFeign.java | 6 +- .../web/feign/config/ClientTokenProvider.java | 3 +- .../web/feign/config/FeignInterceptor.java | 2 +- .../web/feign/config/OAuth2Configuration.java | 2 +- .../web/feign/config/TokenProvider.java | 2 +- src/main/resources/application-local.yml | 2 +- src/main/resources/application.yml | 4 +- .../highmed}/TestNumPortalApplication.java | 6 +- .../repository/AttachmentRepositoryTest.java | 6 +- .../service/AttachmentServiceTest.java | 28 ++++----- .../attachment/service/ClamAVServiceTest.java | 6 +- .../service/FileScanServiceTest.java | 6 +- .../num => org/highmed}/domain/RolesTest.java | 4 +- .../domain/dto/SearchCriteriaTest.java | 4 +- .../repository/ProjectRepositoryImplTest.java | 10 ++-- .../specification/AqlSpecificationTest.java | 10 ++-- .../OrganizationSpecificationTest.java | 9 ++- .../ProjectSpecificationTest.java | 14 ++--- .../UserDetailsSpecificationTest.java | 6 +- .../validation/CohortValidatorTest.java | 24 ++++---- .../config/AttachmentPostgresqlContainer.java | 2 +- .../config/ClamAVContainer.java | 2 +- .../config/NumPostgresqlContainer.java | 2 +- .../security/TokenGenerator.java | 2 +- .../security/WithMockNumUser.java | 5 +- ...WithMockNumUserSecurityContextFactory.java | 2 +- .../tests/AdminControllerIT.java | 8 +-- .../tests/AqlControllerIT.java | 25 +++----- .../tests/CohortControllerIT.java | 26 ++++----- .../tests/HealthEndpointIT.java | 2 +- .../tests/IntegrationTest.java | 10 ++-- .../tests/OrganizationControllerIT.java | 16 +++--- .../tests/ProjectControllerIT.java | 28 ++++----- .../tests/TemplateControllerIT.java | 6 +- .../highmed}/mapper/AqlMapperTest.java | 38 ++++++------- .../highmed}/mapper/CohortMapperTest.java | 25 ++++---- .../highmed}/mapper/CommentMapperTest.java | 16 +++--- .../mapper/OrganizationMapperTest.java | 12 ++-- .../highmed}/mapper/ProjectMapperTest.java | 22 +++---- .../mapper/ProjectViewMapperTest.java | 16 +++--- .../highmed}/mapper/TemplateMapperTest.java | 6 +- .../mapper/UserDetailsMapperTest.java | 10 ++-- .../highmed}/service/AqlServiceTest.java | 38 ++++++------- .../highmed}/service/CohortServiceTest.java | 32 +++++------ .../highmed}/service/CommentServiceTest.java | 42 ++++++-------- .../highmed}/service/ContentServiceTest.java | 26 ++++----- .../highmed}/service/EhrBaseServiceTest.java | 12 ++-- .../service/OrganizationServiceTest.java | 32 +++++------ .../service/ProjectDocCreatorTest.java | 14 ++--- .../highmed}/service/ProjectServiceTest.java | 48 ++++++++-------- .../highmed}/service/TemplateServiceTest.java | 20 +++---- .../service/UserDetailsServiceTest.java | 40 ++++++------- .../highmed}/service/UserServiceTest.java | 50 ++++++++-------- .../ehrbase/CompositionFlattenerTest.java | 6 +- .../CompositionResponseDataBuilderTest.java | 2 +- .../service/ehrbase/ParameterServiceTest.java | 8 +-- .../ehrbase/PseudonimytyCodexPSNTest.java | 10 ++-- .../service/ehrbase/PseudonymityTest.java | 10 ++-- .../service/ehrbase/ResponseFilterTest.java | 2 +- .../service/email/EmailServiceTest.java | 2 +- .../service/executors/AqlExecutorTest.java | 10 ++-- .../service/executors/CohortExecutorTest.java | 29 +++++----- .../executors/CohortQueryListerTest.java | 10 ++-- .../executors/SetOperationsServiceTest.java | 19 ++++--- .../service/logger/NumLoggerTest.java | 2 +- .../notification/NotificationServiceTest.java | 23 ++++---- .../service/policy/EhrPolicyTest.java | 8 +-- .../policy/EuropeanConsentPolicyTest.java | 8 +-- .../policy/ProjectPolicyServiceTest.java | 2 +- .../service/policy/TemplatesPolicyTest.java | 4 +- .../highmed}/service/zars/MemoryAppender.java | 2 +- .../service/zars/TestMessageSource.java | 5 +- .../service/zars/ZarsServiceTest.java | 24 ++++---- 283 files changed, 1356 insertions(+), 1326 deletions(-) delete mode 100644 src/main/java/de/vitagroup/num/domain/model/Type.java rename src/main/java/{de/vitagroup/num => org/highmed}/NumPortalApplication.java (88%) rename src/main/java/{de/vitagroup/num => org/highmed}/attachment/AttachmentRepository.java (76%) rename src/main/java/{de/vitagroup/num => org/highmed}/attachment/domain/dto/AttachmentDto.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/attachment/domain/dto/LightAttachmentDto.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/attachment/domain/model/Attachment.java (96%) rename src/main/java/{de/vitagroup/num => org/highmed}/attachment/domain/repository/AttachmentRepositoryImpl.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/attachment/domain/repository/AttachmentRepositoryJpa.java (69%) rename src/main/java/{de/vitagroup/num => org/highmed}/attachment/service/AttachmentService.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/attachment/service/ClamAVService.java (96%) rename src/main/java/{de/vitagroup/num => org/highmed}/attachment/service/FileScanService.java (87%) rename src/main/java/{de/vitagroup/num => org/highmed}/config/CachingConfig.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/config/ClientTemplateProviderConfig.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/config/EhrBaseConfig.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/config/FttpClientConfig.java (96%) rename src/main/java/{de/vitagroup/num => org/highmed}/config/MapperConfig.java (89%) rename src/main/java/{de/vitagroup/num => org/highmed}/config/MessageSourceConfiguration.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/config/database/NumAttachmentFlywayConfig.java (96%) rename src/main/java/{de/vitagroup/num => org/highmed}/config/database/NumPortalAttachmentDatasourceConfiguration.java (95%) rename src/main/java/{de/vitagroup/num => org/highmed}/config/database/NumPortalDatasourceConfiguration.java (96%) rename src/main/java/{de/vitagroup/num => org/highmed}/config/database/NumPortalFlywayConfig.java (95%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/AqlCategoryDto.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/AqlDto.java (96%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/CardDto.java (97%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/CohortAqlDto.java (95%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/CohortDto.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/CohortGroupDto.java (88%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/CohortSizeDto.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/CommentDto.java (89%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/Language.java (50%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/ManagerProjectDto.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/MetricsDto.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/NavigationItemDto.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/OrganizationDto.java (96%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/ParameterOptionsDto.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/ProjectDto.java (89%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/ProjectInfoDto.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/ProjectViewTO.java (80%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/RawQueryDto.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/SearchCriteria.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/SearchFilter.java (71%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/SlimAqlDto.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/TemplateInfoDto.java (95%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/TemplateMetadataDto.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/TemplateSizeRequestDto.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/UserDetailsDto.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/UserNameDto.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/dto/ZarsInfoDto.java (79%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/Aql.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/AqlCategory.java (72%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/Cohort.java (83%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/CohortAql.java (87%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/CohortGroup.java (80%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/Comment.java (87%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/Content.java (87%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/ContentType.java (56%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/EntityGroup.java (61%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/ExportType.java (51%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/MailDomain.java (87%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/Operator.java (52%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/Organization.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/Project.java (82%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/ProjectCategories.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/ProjectStatus.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/ProjectTransition.java (82%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/Roles.java (98%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/SetupType.java (97%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/Translation.java (88%) create mode 100644 src/main/java/org/highmed/domain/model/Type.java rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/admin/Role.java (76%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/admin/User.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/model/admin/UserDetails.java (89%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/AqlCategoryRepository.java (88%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/AqlConverter.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/AqlRepository.java (61%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/CategorySetConverter.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/CohortGroupRepository.java (69%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/CohortRepository.java (69%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/CommentRepository.java (75%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/ContentItemRepository.java (69%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/CustomProjectRepository.java (60%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/MailDomainRepository.java (85%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/MapConverter.java (96%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/OrganizationRepository.java (85%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/ProjectRepository.java (83%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/ProjectRepositoryImpl.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/ProjectTransitionRepository.java (73%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/StringSetConverter.java (96%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/TranslationRepository.java (69%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/repository/UserDetailsRepository.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/specification/AqlSpecification.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/specification/BaseSpecification.java (86%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/specification/OrganizationSpecification.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/specification/ProjectSpecification.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/specification/UserDetailsSpecification.java (89%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/templates/ExceptionsTemplate.java (99%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/validation/CohortValidator.java (86%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/validation/TranslatedStringValidator.java (80%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/validation/ValidCohort.java (86%) rename src/main/java/{de/vitagroup/num => org/highmed}/domain/validation/ValidTranslatedString.java (85%) rename src/main/java/{de/vitagroup/num => org/highmed}/events/DeactivateUserEvent.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/listeners/DeactivateUserListener.java (84%) rename src/main/java/{de/vitagroup/num => org/highmed}/listeners/UserCacheInit.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/mapper/AqlMapper.java (81%) rename src/main/java/{de/vitagroup/num => org/highmed}/mapper/CohortMapper.java (82%) rename src/main/java/{de/vitagroup/num => org/highmed}/mapper/CommentMapper.java (76%) rename src/main/java/{de/vitagroup/num => org/highmed}/mapper/OrganizationMapper.java (76%) rename src/main/java/{de/vitagroup/num => org/highmed}/mapper/ProjectMapper.java (82%) rename src/main/java/{de/vitagroup/num => org/highmed}/mapper/ProjectViewMapper.java (72%) rename src/main/java/{de/vitagroup/num => org/highmed}/mapper/TemplateMapper.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/mapper/UserDetailsMapper.java (82%) rename src/main/java/{de/vitagroup/num => org/highmed}/properties/ClamAVProperties.java (95%) rename src/main/java/{de/vitagroup/num => org/highmed}/properties/ConsentProperties.java (89%) rename src/main/java/{de/vitagroup/num => org/highmed}/properties/CorsProperties.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/properties/EhrBaseProperties.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/properties/FttpProperties.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/properties/NumProperties.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/properties/PrivacyProperties.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/properties/PseudonymsPsnWorkflowProperties.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/properties/SwaggerProperties.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/AqlService.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/CohortService.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/CommentService.java (76%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/ContentService.java (89%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/OrganizationService.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/ProjectDocCreator.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/ProjectService.java (97%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/SetupHealthiness.java (96%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/TemplateService.java (88%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/UserDetailsService.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/UserService.java (95%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/atna/AtnaProperties.java (86%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/atna/AtnaService.java (97%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/ehrbase/CompositionFlattener.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/ehrbase/CompositionResponseDataBuilder.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/ehrbase/EhrBaseService.java (97%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/ehrbase/ParameterService.java (98%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/ehrbase/Pseudonymity.java (97%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/ehrbase/ResponseFilter.java (95%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/email/EmailProperties.java (87%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/email/EmailService.java (97%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/email/MessageSourceWrapper.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/email/ZarsProperties.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/email/ZarsService.java (98%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/BadCredentialsException.java (83%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/BadRequestException.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/CustomException.java (80%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/CustomizedExceptionHandler.java (98%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/EntityNotFoundException.java (83%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/ExceptionDto.java (80%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/ForbiddenException.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/IllegalArgumentException.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/PrivacyException.java (89%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/ResourceNotFound.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/SameEntityExistsException.java (83%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/SystemException.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/TokenIsNotValidException.java (83%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/UserUnauthorizedException.java (88%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/UsernameNotFoundOrNoLongerActiveException.java (84%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/dto/ErrorDetails.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/dto/ExceptionDto.java (79%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/implementation/BadCredentialsException.java (79%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/implementation/CustomException.java (75%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/implementation/EntityNotFoundException.java (78%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/implementation/SameEntityExistsException.java (79%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/implementation/TokenIsNotValidException.java (78%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/exception/implementation/UsernameNotFoundOrNoLongerActiveException.java (80%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/executors/AqlExecutor.java (89%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/executors/CohortExecutor.java (77%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/executors/CohortQueryLister.java (84%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/executors/SetOperationsService.java (83%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/html/HtmlContent.java (98%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/logger/AuditLog.java (87%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/logger/NumLogger.java (95%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/NotificationService.java (80%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/NewUserNotification.java (95%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/NewUserWithoutOrganizationNotification.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/Notification.java (95%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/ProjectApprovalRequestNotification.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/ProjectCloseNotification.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/ProjectStartNotification.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/ProjectStatusChangeNotification.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/ProjectStatusChangeRequestNotification.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/account/AccountApprovalNotification.java (87%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/account/AccountStatusChangedNotification.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/account/OrganizationUpdateNotification.java (89%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/account/RolesUpdateNotification.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/notification/dto/account/UserNameUpdateNotification.java (87%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/policy/EhrPolicy.java (84%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/policy/EuropeanConsentPolicy.java (80%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/policy/Policy.java (98%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/policy/ProjectPolicyService.java (96%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/policy/TemplatesPolicy.java (81%) rename src/main/java/{de/vitagroup/num => org/highmed}/service/util/AqlQueryConstants.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/config/ApplicationSecurity.java (98%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/config/AuthorizationConverter.java (97%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/config/CorsConfig.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/config/FeignClientConfig.java (73%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/config/Role.java (98%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/config/SwaggerConfig.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/controller/AdminController.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/controller/AqlController.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/controller/CohortController.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/controller/ContentController.java (92%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/controller/NumAttachmentController.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/controller/OrganizationController.java (90%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/controller/ProfileController.java (80%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/controller/ProjectController.java (93%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/controller/TemplateController.java (80%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/feign/KeycloakFeign.java (91%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/feign/config/ClientTokenProvider.java (97%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/feign/config/FeignInterceptor.java (94%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/feign/config/OAuth2Configuration.java (98%) rename src/main/java/{de/vitagroup/num => org/highmed}/web/feign/config/TokenProvider.java (76%) rename src/test/java/{de/vitagroup/num => org/highmed}/TestNumPortalApplication.java (86%) rename src/test/java/{de/vitagroup/num => org/highmed}/attachment/domain/repository/AttachmentRepositoryTest.java (94%) rename src/test/java/{de/vitagroup/num => org/highmed}/attachment/service/AttachmentServiceTest.java (94%) rename src/test/java/{de/vitagroup/num => org/highmed}/attachment/service/ClamAVServiceTest.java (93%) rename src/test/java/{de/vitagroup/num => org/highmed}/attachment/service/FileScanServiceTest.java (94%) rename src/test/java/{de/vitagroup/num => org/highmed}/domain/RolesTest.java (97%) rename src/test/java/{de/vitagroup/num => org/highmed}/domain/dto/SearchCriteriaTest.java (93%) rename src/test/java/{de/vitagroup/num => org/highmed}/domain/repository/ProjectRepositoryImplTest.java (93%) rename src/test/java/{de/vitagroup/num => org/highmed}/domain/specification/AqlSpecificationTest.java (97%) rename src/test/java/{de/vitagroup/num => org/highmed}/domain/specification/OrganizationSpecificationTest.java (84%) rename src/test/java/{de/vitagroup/num => org/highmed}/domain/specification/ProjectSpecificationTest.java (95%) rename src/test/java/{de/vitagroup/num => org/highmed}/domain/specification/UserDetailsSpecificationTest.java (94%) rename src/test/java/{de/vitagroup/num => org/highmed}/domain/validation/CohortValidatorTest.java (96%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/config/AttachmentPostgresqlContainer.java (95%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/config/ClamAVContainer.java (93%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/config/NumPostgresqlContainer.java (94%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/security/TokenGenerator.java (91%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/security/WithMockNumUser.java (91%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/security/WithMockNumUserSecurityContextFactory.java (97%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/tests/AdminControllerIT.java (97%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/tests/AqlControllerIT.java (95%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/tests/CohortControllerIT.java (92%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/tests/HealthEndpointIT.java (97%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/tests/IntegrationTest.java (92%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/tests/OrganizationControllerIT.java (94%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/tests/ProjectControllerIT.java (95%) rename src/test/java/{de/vitagroup/num => org/highmed}/integrationtesting/tests/TemplateControllerIT.java (88%) rename src/test/java/{de/vitagroup/num => org/highmed}/mapper/AqlMapperTest.java (90%) rename src/test/java/{de/vitagroup/num => org/highmed}/mapper/CohortMapperTest.java (86%) rename src/test/java/{de/vitagroup/num => org/highmed}/mapper/CommentMapperTest.java (87%) rename src/test/java/{de/vitagroup/num => org/highmed}/mapper/OrganizationMapperTest.java (83%) rename src/test/java/{de/vitagroup/num => org/highmed}/mapper/ProjectMapperTest.java (89%) rename src/test/java/{de/vitagroup/num => org/highmed}/mapper/ProjectViewMapperTest.java (85%) rename src/test/java/{de/vitagroup/num => org/highmed}/mapper/TemplateMapperTest.java (94%) rename src/test/java/{de/vitagroup/num => org/highmed}/mapper/UserDetailsMapperTest.java (91%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/AqlServiceTest.java (96%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/CohortServiceTest.java (96%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/CommentServiceTest.java (87%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/ContentServiceTest.java (93%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/EhrBaseServiceTest.java (96%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/OrganizationServiceTest.java (95%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/ProjectDocCreatorTest.java (89%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/ProjectServiceTest.java (98%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/TemplateServiceTest.java (83%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/UserDetailsServiceTest.java (90%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/UserServiceTest.java (97%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/ehrbase/CompositionFlattenerTest.java (94%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/ehrbase/CompositionResponseDataBuilderTest.java (98%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/ehrbase/ParameterServiceTest.java (98%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/ehrbase/PseudonimytyCodexPSNTest.java (90%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/ehrbase/PseudonymityTest.java (97%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/ehrbase/ResponseFilterTest.java (98%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/email/EmailServiceTest.java (97%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/executors/AqlExecutorTest.java (90%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/executors/CohortExecutorTest.java (90%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/executors/CohortQueryListerTest.java (88%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/executors/SetOperationsServiceTest.java (95%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/logger/NumLoggerTest.java (98%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/notification/NotificationServiceTest.java (89%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/policy/EhrPolicyTest.java (76%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/policy/EuropeanConsentPolicyTest.java (78%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/policy/ProjectPolicyServiceTest.java (97%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/policy/TemplatesPolicyTest.java (91%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/zars/MemoryAppender.java (92%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/zars/TestMessageSource.java (90%) rename src/test/java/{de/vitagroup/num => org/highmed}/service/zars/ZarsServiceTest.java (85%) diff --git a/pom.xml b/pom.xml index 98c70f478..182e17058 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - de.vitagroup.num-portal + org.highmed.num-portal num-portal 1.17.0-SNAPSHOT diff --git a/src/main/java/de/vitagroup/num/domain/model/Type.java b/src/main/java/de/vitagroup/num/domain/model/Type.java deleted file mode 100644 index 2f01515af..000000000 --- a/src/main/java/de/vitagroup/num/domain/model/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -package de.vitagroup.num.domain.model; - -public enum Type { - AQL, - GROUP -} diff --git a/src/main/java/de/vitagroup/num/NumPortalApplication.java b/src/main/java/org/highmed/NumPortalApplication.java similarity index 88% rename from src/main/java/de/vitagroup/num/NumPortalApplication.java rename to src/main/java/org/highmed/NumPortalApplication.java index ae7dba6df..34156cbf4 100644 --- a/src/main/java/de/vitagroup/num/NumPortalApplication.java +++ b/src/main/java/org/highmed/NumPortalApplication.java @@ -1,6 +1,8 @@ -package de.vitagroup.num; +package org.highmed; -import de.vitagroup.num.service.atna.AtnaProperties; + + +import org.highmed.service.atna.AtnaProperties; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/src/main/java/de/vitagroup/num/attachment/AttachmentRepository.java b/src/main/java/org/highmed/attachment/AttachmentRepository.java similarity index 76% rename from src/main/java/de/vitagroup/num/attachment/AttachmentRepository.java rename to src/main/java/org/highmed/attachment/AttachmentRepository.java index 654cbf9ca..658fc8df4 100644 --- a/src/main/java/de/vitagroup/num/attachment/AttachmentRepository.java +++ b/src/main/java/org/highmed/attachment/AttachmentRepository.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.attachment; +package org.highmed.attachment; -import de.vitagroup.num.attachment.domain.dto.AttachmentDto; -import de.vitagroup.num.attachment.domain.model.Attachment; +import org.highmed.attachment.domain.dto.AttachmentDto; +import org.highmed.attachment.domain.model.Attachment; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/vitagroup/num/attachment/domain/dto/AttachmentDto.java b/src/main/java/org/highmed/attachment/domain/dto/AttachmentDto.java similarity index 94% rename from src/main/java/de/vitagroup/num/attachment/domain/dto/AttachmentDto.java rename to src/main/java/org/highmed/attachment/domain/dto/AttachmentDto.java index 05c987dea..578ad7cbb 100644 --- a/src/main/java/de/vitagroup/num/attachment/domain/dto/AttachmentDto.java +++ b/src/main/java/org/highmed/attachment/domain/dto/AttachmentDto.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.attachment.domain.dto; +package org.highmed.attachment.domain.dto; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/de/vitagroup/num/attachment/domain/dto/LightAttachmentDto.java b/src/main/java/org/highmed/attachment/domain/dto/LightAttachmentDto.java similarity index 90% rename from src/main/java/de/vitagroup/num/attachment/domain/dto/LightAttachmentDto.java rename to src/main/java/org/highmed/attachment/domain/dto/LightAttachmentDto.java index 524a8e805..f847df95b 100644 --- a/src/main/java/de/vitagroup/num/attachment/domain/dto/LightAttachmentDto.java +++ b/src/main/java/org/highmed/attachment/domain/dto/LightAttachmentDto.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.attachment.domain.dto; +package org.highmed.attachment.domain.dto; import java.util.List; diff --git a/src/main/java/de/vitagroup/num/attachment/domain/model/Attachment.java b/src/main/java/org/highmed/attachment/domain/model/Attachment.java similarity index 96% rename from src/main/java/de/vitagroup/num/attachment/domain/model/Attachment.java rename to src/main/java/org/highmed/attachment/domain/model/Attachment.java index a31da2f9e..438011a84 100644 --- a/src/main/java/de/vitagroup/num/attachment/domain/model/Attachment.java +++ b/src/main/java/org/highmed/attachment/domain/model/Attachment.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.attachment.domain.model; +package org.highmed.attachment.domain.model; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/de/vitagroup/num/attachment/domain/repository/AttachmentRepositoryImpl.java b/src/main/java/org/highmed/attachment/domain/repository/AttachmentRepositoryImpl.java similarity index 91% rename from src/main/java/de/vitagroup/num/attachment/domain/repository/AttachmentRepositoryImpl.java rename to src/main/java/org/highmed/attachment/domain/repository/AttachmentRepositoryImpl.java index 266a57efc..cb40c57de 100644 --- a/src/main/java/de/vitagroup/num/attachment/domain/repository/AttachmentRepositoryImpl.java +++ b/src/main/java/org/highmed/attachment/domain/repository/AttachmentRepositoryImpl.java @@ -1,10 +1,10 @@ -package de.vitagroup.num.attachment.domain.repository; +package org.highmed.attachment.domain.repository; -import de.vitagroup.num.attachment.AttachmentRepository; -import de.vitagroup.num.attachment.domain.dto.AttachmentDto; -import de.vitagroup.num.attachment.domain.model.Attachment; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.highmed.attachment.AttachmentRepository; +import org.highmed.attachment.domain.dto.AttachmentDto; +import org.highmed.attachment.domain.model.Attachment; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/de/vitagroup/num/attachment/domain/repository/AttachmentRepositoryJpa.java b/src/main/java/org/highmed/attachment/domain/repository/AttachmentRepositoryJpa.java similarity index 69% rename from src/main/java/de/vitagroup/num/attachment/domain/repository/AttachmentRepositoryJpa.java rename to src/main/java/org/highmed/attachment/domain/repository/AttachmentRepositoryJpa.java index 3903c9f5f..e4bc017dd 100644 --- a/src/main/java/de/vitagroup/num/attachment/domain/repository/AttachmentRepositoryJpa.java +++ b/src/main/java/org/highmed/attachment/domain/repository/AttachmentRepositoryJpa.java @@ -1,6 +1,5 @@ -package de.vitagroup.num.attachment.domain.repository; +package org.highmed.attachment.domain.repository; -import de.vitagroup.num.attachment.domain.model.Attachment; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; @@ -11,22 +10,22 @@ import java.util.Optional; @Repository -public interface AttachmentRepositoryJpa extends JpaRepository { +public interface AttachmentRepositoryJpa extends JpaRepository { @Query("SELECT new Attachment (atc.id, atc.name, atc.description, atc.uploadDate, atc.reviewCounter) " + "FROM Attachment atc ") - List getAttachments(); + List getAttachments(); @Modifying @Query("UPDATE Attachment atch SET atch.reviewCounter = atch.reviewCounter + 1 WHERE atch.projectId = :projectId") void updateReviewCounterByProjectId(@Param("projectId") Long projectId); - Optional findByIdAndProjectId(Long id, Long projectId); + Optional findByIdAndProjectId(Long id, Long projectId); @Query("SELECT new Attachment (atc.id, atc.name, atc.description, atc.uploadDate, atc.reviewCounter) " + "FROM Attachment atc " + "WHERE atc.projectId = :projectId") - List findAttachmentsByProjectId(@Param("projectId") Long projectId); + List findAttachmentsByProjectId(@Param("projectId") Long projectId); @Modifying @Query("DELETE FROM Attachment atch WHERE atch.projectId = :projectId") diff --git a/src/main/java/de/vitagroup/num/attachment/service/AttachmentService.java b/src/main/java/org/highmed/attachment/service/AttachmentService.java similarity index 92% rename from src/main/java/de/vitagroup/num/attachment/service/AttachmentService.java rename to src/main/java/org/highmed/attachment/service/AttachmentService.java index 039ac245b..c6ef396ee 100644 --- a/src/main/java/de/vitagroup/num/attachment/service/AttachmentService.java +++ b/src/main/java/org/highmed/attachment/service/AttachmentService.java @@ -1,19 +1,19 @@ -package de.vitagroup.num.attachment.service; - -import de.vitagroup.num.attachment.AttachmentRepository; -import de.vitagroup.num.attachment.domain.dto.AttachmentDto; -import de.vitagroup.num.attachment.domain.dto.LightAttachmentDto; -import de.vitagroup.num.attachment.domain.model.Attachment; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.domain.templates.ExceptionsTemplate; -import de.vitagroup.num.service.ProjectService; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.ForbiddenException; -import de.vitagroup.num.service.exception.ResourceNotFound; -import de.vitagroup.num.web.controller.NumAttachmentController; +package org.highmed.attachment.service; + +import org.highmed.domain.model.Project; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.templates.ExceptionsTemplate; +import org.highmed.service.ProjectService; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.ForbiddenException; +import org.highmed.service.exception.ResourceNotFound; +import org.highmed.web.controller.NumAttachmentController; import lombok.extern.slf4j.Slf4j; import org.apache.logging.log4j.util.Strings; +import org.highmed.attachment.AttachmentRepository; +import org.highmed.attachment.domain.dto.AttachmentDto; +import org.highmed.attachment.domain.dto.LightAttachmentDto; +import org.highmed.attachment.domain.model.Attachment; import org.modelmapper.ModelMapper; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -30,7 +30,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; diff --git a/src/main/java/de/vitagroup/num/attachment/service/ClamAVService.java b/src/main/java/org/highmed/attachment/service/ClamAVService.java similarity index 96% rename from src/main/java/de/vitagroup/num/attachment/service/ClamAVService.java rename to src/main/java/org/highmed/attachment/service/ClamAVService.java index 908c5a1f3..2ac2ab9bf 100644 --- a/src/main/java/de/vitagroup/num/attachment/service/ClamAVService.java +++ b/src/main/java/org/highmed/attachment/service/ClamAVService.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.attachment.service; +package org.highmed.attachment.service; -import de.vitagroup.num.properties.ClamAVProperties; -import de.vitagroup.num.service.exception.SystemException; +import org.highmed.properties.ClamAVProperties; +import org.highmed.service.exception.SystemException; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; diff --git a/src/main/java/de/vitagroup/num/attachment/service/FileScanService.java b/src/main/java/org/highmed/attachment/service/FileScanService.java similarity index 87% rename from src/main/java/de/vitagroup/num/attachment/service/FileScanService.java rename to src/main/java/org/highmed/attachment/service/FileScanService.java index 7ca51c8e4..d317d3c49 100644 --- a/src/main/java/de/vitagroup/num/attachment/service/FileScanService.java +++ b/src/main/java/org/highmed/attachment/service/FileScanService.java @@ -1,8 +1,8 @@ -package de.vitagroup.num.attachment.service; +package org.highmed.attachment.service; -import de.vitagroup.num.domain.templates.ExceptionsTemplate; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.SystemException; +import org.highmed.domain.templates.ExceptionsTemplate; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.SystemException; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/vitagroup/num/config/CachingConfig.java b/src/main/java/org/highmed/config/CachingConfig.java similarity index 90% rename from src/main/java/de/vitagroup/num/config/CachingConfig.java rename to src/main/java/org/highmed/config/CachingConfig.java index 553554d48..1b0a95bb9 100644 --- a/src/main/java/de/vitagroup/num/config/CachingConfig.java +++ b/src/main/java/org/highmed/config/CachingConfig.java @@ -1,6 +1,5 @@ -package de.vitagroup.num.config; +package org.highmed.config; -import java.util.Arrays; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.EnableCaching; @@ -9,7 +8,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import static de.vitagroup.num.service.UserService.TRANSLATION_CACHE; +import java.util.Arrays; + +import static org.highmed.service.UserService.TRANSLATION_CACHE; @Configuration @EnableCaching diff --git a/src/main/java/de/vitagroup/num/config/ClientTemplateProviderConfig.java b/src/main/java/org/highmed/config/ClientTemplateProviderConfig.java similarity index 94% rename from src/main/java/de/vitagroup/num/config/ClientTemplateProviderConfig.java rename to src/main/java/org/highmed/config/ClientTemplateProviderConfig.java index a6ab6ad95..ff6679be3 100644 --- a/src/main/java/de/vitagroup/num/config/ClientTemplateProviderConfig.java +++ b/src/main/java/org/highmed/config/ClientTemplateProviderConfig.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.config; +package org.highmed.config; import lombok.RequiredArgsConstructor; import org.ehrbase.openehr.sdk.client.openehrclient.defaultrestclient.DefaultRestClient; diff --git a/src/main/java/de/vitagroup/num/config/EhrBaseConfig.java b/src/main/java/org/highmed/config/EhrBaseConfig.java similarity index 94% rename from src/main/java/de/vitagroup/num/config/EhrBaseConfig.java rename to src/main/java/org/highmed/config/EhrBaseConfig.java index 78d52c796..aff40b9af 100644 --- a/src/main/java/de/vitagroup/num/config/EhrBaseConfig.java +++ b/src/main/java/org/highmed/config/EhrBaseConfig.java @@ -1,8 +1,6 @@ -package de.vitagroup.num.config; +package org.highmed.config; -import de.vitagroup.num.properties.EhrBaseProperties; -import java.net.URI; -import java.net.URISyntaxException; +import org.highmed.properties.EhrBaseProperties; import lombok.RequiredArgsConstructor; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; @@ -16,6 +14,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +import java.net.URI; +import java.net.URISyntaxException; + @Configuration @RequiredArgsConstructor public class EhrBaseConfig { diff --git a/src/main/java/de/vitagroup/num/config/FttpClientConfig.java b/src/main/java/org/highmed/config/FttpClientConfig.java similarity index 96% rename from src/main/java/de/vitagroup/num/config/FttpClientConfig.java rename to src/main/java/org/highmed/config/FttpClientConfig.java index a23bb1525..bd3830ad1 100644 --- a/src/main/java/de/vitagroup/num/config/FttpClientConfig.java +++ b/src/main/java/org/highmed/config/FttpClientConfig.java @@ -1,10 +1,7 @@ -package de.vitagroup.num.config; +package org.highmed.config; import ca.uhn.fhir.context.FhirContext; -import de.vitagroup.num.properties.FttpProperties; -import java.security.KeyStore; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.SSLContext; +import org.highmed.properties.FttpProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.http.auth.AuthScope; @@ -18,6 +15,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLContext; +import java.security.KeyStore; + @Slf4j @Configuration @RequiredArgsConstructor diff --git a/src/main/java/de/vitagroup/num/config/MapperConfig.java b/src/main/java/org/highmed/config/MapperConfig.java similarity index 89% rename from src/main/java/de/vitagroup/num/config/MapperConfig.java rename to src/main/java/org/highmed/config/MapperConfig.java index 6de075045..c37d1a47f 100644 --- a/src/main/java/de/vitagroup/num/config/MapperConfig.java +++ b/src/main/java/org/highmed/config/MapperConfig.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.config; +package org.highmed.config; import org.modelmapper.ModelMapper; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/de/vitagroup/num/config/MessageSourceConfiguration.java b/src/main/java/org/highmed/config/MessageSourceConfiguration.java similarity index 93% rename from src/main/java/de/vitagroup/num/config/MessageSourceConfiguration.java rename to src/main/java/org/highmed/config/MessageSourceConfiguration.java index 557c94364..683123f8f 100644 --- a/src/main/java/de/vitagroup/num/config/MessageSourceConfiguration.java +++ b/src/main/java/org/highmed/config/MessageSourceConfiguration.java @@ -1,9 +1,6 @@ -package de.vitagroup.num.config; +package org.highmed.config; -import de.vitagroup.num.properties.NumProperties; -import java.nio.charset.StandardCharsets; -import java.util.Locale; -import javax.annotation.PostConstruct; +import org.highmed.properties.NumProperties; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.context.MessageSource; @@ -11,6 +8,10 @@ import org.springframework.context.support.ReloadableResourceBundleMessageSource; import org.springframework.stereotype.Component; +import javax.annotation.PostConstruct; +import java.nio.charset.StandardCharsets; +import java.util.Locale; + @Component @AllArgsConstructor public class MessageSourceConfiguration { diff --git a/src/main/java/de/vitagroup/num/config/database/NumAttachmentFlywayConfig.java b/src/main/java/org/highmed/config/database/NumAttachmentFlywayConfig.java similarity index 96% rename from src/main/java/de/vitagroup/num/config/database/NumAttachmentFlywayConfig.java rename to src/main/java/org/highmed/config/database/NumAttachmentFlywayConfig.java index 8a6292c10..8c4daba9e 100644 --- a/src/main/java/de/vitagroup/num/config/database/NumAttachmentFlywayConfig.java +++ b/src/main/java/org/highmed/config/database/NumAttachmentFlywayConfig.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.config.database; +package org.highmed.config.database; import org.flywaydb.core.Flyway; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/main/java/de/vitagroup/num/config/database/NumPortalAttachmentDatasourceConfiguration.java b/src/main/java/org/highmed/config/database/NumPortalAttachmentDatasourceConfiguration.java similarity index 95% rename from src/main/java/de/vitagroup/num/config/database/NumPortalAttachmentDatasourceConfiguration.java rename to src/main/java/org/highmed/config/database/NumPortalAttachmentDatasourceConfiguration.java index b57027263..be5f5ff21 100644 --- a/src/main/java/de/vitagroup/num/config/database/NumPortalAttachmentDatasourceConfiguration.java +++ b/src/main/java/org/highmed/config/database/NumPortalAttachmentDatasourceConfiguration.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.config.database; +package org.highmed.config.database; import com.zaxxer.hikari.HikariDataSource; import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy; @@ -24,7 +24,7 @@ @ConditionalOnProperty(prefix = "num", name = "enableAttachmentDatabase", havingValue = "true") @Configuration -@EnableJpaRepositories(basePackages = "de.vitagroup.num.attachment", +@EnableJpaRepositories(basePackages = "org.highmed.attachment", entityManagerFactoryRef = "attachmentEntityManagerFactory", transactionManagerRef = "attachmentTransactionManager") @EnableTransactionManagement @@ -50,7 +50,7 @@ public LocalContainerEntityManagerFactoryBean attachmentEntityManagerFactory(Ent @Qualifier("numAttachmentDatasource") DataSource dataSource) { LocalContainerEntityManagerFactoryBean localContainerEntityManagerFactoryBean = builder .dataSource(dataSource) - .packages("de.vitagroup.num.attachment") + .packages("org.highmed.attachment") .persistenceUnit("numAttachment") .build(); localContainerEntityManagerFactoryBean.getJpaPropertyMap().put(AvailableSettings.IMPLICIT_NAMING_STRATEGY, new SpringImplicitNamingStrategy()); diff --git a/src/main/java/de/vitagroup/num/config/database/NumPortalDatasourceConfiguration.java b/src/main/java/org/highmed/config/database/NumPortalDatasourceConfiguration.java similarity index 96% rename from src/main/java/de/vitagroup/num/config/database/NumPortalDatasourceConfiguration.java rename to src/main/java/org/highmed/config/database/NumPortalDatasourceConfiguration.java index 5ebcb3829..4735f6c57 100644 --- a/src/main/java/de/vitagroup/num/config/database/NumPortalDatasourceConfiguration.java +++ b/src/main/java/org/highmed/config/database/NumPortalDatasourceConfiguration.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.config.database; +package org.highmed.config.database; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; @@ -27,7 +27,7 @@ import java.util.Properties; @Configuration -@EnableJpaRepositories(basePackages = {"de.vitagroup.num.domain", "de.vitagroup.num.service"}, +@EnableJpaRepositories(basePackages = {"org.highmed.domain", "org.highmed.service"}, entityManagerFactoryRef = "numEntityManagerFactory", transactionManagerRef = "numTransactionManager") @EnableTransactionManagement @@ -69,7 +69,7 @@ public LocalContainerEntityManagerFactoryBean numEntityManagerFactory(Configurab @Qualifier("numPortalDatasource") DataSource dataSource) { LocalContainerEntityManagerFactoryBean localContainerEntityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean(); localContainerEntityManagerFactoryBean.setDataSource(dataSource); - localContainerEntityManagerFactoryBean.setPackagesToScan("de.vitagroup.num.domain", "de.vitagroup.num.service"); + localContainerEntityManagerFactoryBean.setPackagesToScan("org.highmed.domain", "org.highmed.service"); localContainerEntityManagerFactoryBean.setPersistenceUnitName("numPortal"); localContainerEntityManagerFactoryBean.getJpaPropertyMap().put(AvailableSettings.BEAN_CONTAINER, new SpringBeanContainer(beanFactory)); localContainerEntityManagerFactoryBean.getJpaPropertyMap().put(AvailableSettings.IMPLICIT_NAMING_STRATEGY, new SpringImplicitNamingStrategy()); diff --git a/src/main/java/de/vitagroup/num/config/database/NumPortalFlywayConfig.java b/src/main/java/org/highmed/config/database/NumPortalFlywayConfig.java similarity index 95% rename from src/main/java/de/vitagroup/num/config/database/NumPortalFlywayConfig.java rename to src/main/java/org/highmed/config/database/NumPortalFlywayConfig.java index 698009086..387c10057 100644 --- a/src/main/java/de/vitagroup/num/config/database/NumPortalFlywayConfig.java +++ b/src/main/java/org/highmed/config/database/NumPortalFlywayConfig.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.config.database; +package org.highmed.config.database; import org.flywaydb.core.Flyway; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/main/java/de/vitagroup/num/domain/dto/AqlCategoryDto.java b/src/main/java/org/highmed/domain/dto/AqlCategoryDto.java similarity index 90% rename from src/main/java/de/vitagroup/num/domain/dto/AqlCategoryDto.java rename to src/main/java/org/highmed/domain/dto/AqlCategoryDto.java index bd175b25b..93e0a9138 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/AqlCategoryDto.java +++ b/src/main/java/org/highmed/domain/dto/AqlCategoryDto.java @@ -1,12 +1,12 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.vitagroup.num.domain.validation.ValidTranslatedString; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.highmed.domain.validation.ValidTranslatedString; import java.util.Map; diff --git a/src/main/java/de/vitagroup/num/domain/dto/AqlDto.java b/src/main/java/org/highmed/domain/dto/AqlDto.java similarity index 96% rename from src/main/java/de/vitagroup/num/domain/dto/AqlDto.java rename to src/main/java/org/highmed/domain/dto/AqlDto.java index 4700a670f..d4b5876ca 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/AqlDto.java +++ b/src/main/java/org/highmed/domain/dto/AqlDto.java @@ -1,14 +1,14 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; -import de.vitagroup.num.domain.model.admin.User; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.highmed.domain.model.admin.User; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import java.time.OffsetDateTime; @Schema diff --git a/src/main/java/de/vitagroup/num/domain/dto/CardDto.java b/src/main/java/org/highmed/domain/dto/CardDto.java similarity index 97% rename from src/main/java/de/vitagroup/num/domain/dto/CardDto.java rename to src/main/java/org/highmed/domain/dto/CardDto.java index 89f3906f5..53fa4957b 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/CardDto.java +++ b/src/main/java/org/highmed/domain/dto/CardDto.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/de/vitagroup/num/domain/dto/CohortAqlDto.java b/src/main/java/org/highmed/domain/dto/CohortAqlDto.java similarity index 95% rename from src/main/java/de/vitagroup/num/domain/dto/CohortAqlDto.java rename to src/main/java/org/highmed/domain/dto/CohortAqlDto.java index db2160879..dcbd507e5 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/CohortAqlDto.java +++ b/src/main/java/org/highmed/domain/dto/CohortAqlDto.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/de/vitagroup/num/domain/dto/CohortDto.java b/src/main/java/org/highmed/domain/dto/CohortDto.java similarity index 91% rename from src/main/java/de/vitagroup/num/domain/dto/CohortDto.java rename to src/main/java/org/highmed/domain/dto/CohortDto.java index 82c4e0537..c29f49daa 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/CohortDto.java +++ b/src/main/java/org/highmed/domain/dto/CohortDto.java @@ -1,14 +1,13 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; -import de.vitagroup.num.domain.validation.ValidCohort; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import org.highmed.domain.validation.ValidCohort; @Schema @Data diff --git a/src/main/java/de/vitagroup/num/domain/dto/CohortGroupDto.java b/src/main/java/org/highmed/domain/dto/CohortGroupDto.java similarity index 88% rename from src/main/java/de/vitagroup/num/domain/dto/CohortGroupDto.java rename to src/main/java/org/highmed/domain/dto/CohortGroupDto.java index 4385d0eaa..a70cb3e98 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/CohortGroupDto.java +++ b/src/main/java/org/highmed/domain/dto/CohortGroupDto.java @@ -1,17 +1,17 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import com.fasterxml.jackson.annotation.JsonIgnore; -import de.vitagroup.num.domain.model.Operator; -import de.vitagroup.num.domain.model.Type; -import de.vitagroup.num.domain.repository.AqlConverter; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Convert; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.highmed.domain.model.Operator; +import org.highmed.domain.model.Type; +import org.highmed.domain.repository.AqlConverter; -import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Map; diff --git a/src/main/java/de/vitagroup/num/domain/dto/CohortSizeDto.java b/src/main/java/org/highmed/domain/dto/CohortSizeDto.java similarity index 92% rename from src/main/java/de/vitagroup/num/domain/dto/CohortSizeDto.java rename to src/main/java/org/highmed/domain/dto/CohortSizeDto.java index 23c076a14..62f41eed0 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/CohortSizeDto.java +++ b/src/main/java/org/highmed/domain/dto/CohortSizeDto.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/de/vitagroup/num/domain/dto/CommentDto.java b/src/main/java/org/highmed/domain/dto/CommentDto.java similarity index 89% rename from src/main/java/de/vitagroup/num/domain/dto/CommentDto.java rename to src/main/java/org/highmed/domain/dto/CommentDto.java index 3f2828ed5..0039b1c5f 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/CommentDto.java +++ b/src/main/java/org/highmed/domain/dto/CommentDto.java @@ -1,14 +1,14 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; -import de.vitagroup.num.domain.model.admin.User; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.highmed.domain.model.admin.User; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import java.time.OffsetDateTime; @Schema diff --git a/src/main/java/de/vitagroup/num/domain/dto/Language.java b/src/main/java/org/highmed/domain/dto/Language.java similarity index 50% rename from src/main/java/de/vitagroup/num/domain/dto/Language.java rename to src/main/java/org/highmed/domain/dto/Language.java index fd1582c2a..00ddde1a3 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/Language.java +++ b/src/main/java/org/highmed/domain/dto/Language.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; public enum Language { de, en diff --git a/src/main/java/de/vitagroup/num/domain/dto/ManagerProjectDto.java b/src/main/java/org/highmed/domain/dto/ManagerProjectDto.java similarity index 90% rename from src/main/java/de/vitagroup/num/domain/dto/ManagerProjectDto.java rename to src/main/java/org/highmed/domain/dto/ManagerProjectDto.java index ec3048b77..ab7ea34f2 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/ManagerProjectDto.java +++ b/src/main/java/org/highmed/domain/dto/ManagerProjectDto.java @@ -1,10 +1,10 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; +import lombok.Data; + import java.util.List; @Data diff --git a/src/main/java/de/vitagroup/num/domain/dto/MetricsDto.java b/src/main/java/org/highmed/domain/dto/MetricsDto.java similarity index 92% rename from src/main/java/de/vitagroup/num/domain/dto/MetricsDto.java rename to src/main/java/org/highmed/domain/dto/MetricsDto.java index 31c5fb6f3..f8b12c117 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/MetricsDto.java +++ b/src/main/java/org/highmed/domain/dto/MetricsDto.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/de/vitagroup/num/domain/dto/NavigationItemDto.java b/src/main/java/org/highmed/domain/dto/NavigationItemDto.java similarity index 94% rename from src/main/java/de/vitagroup/num/domain/dto/NavigationItemDto.java rename to src/main/java/org/highmed/domain/dto/NavigationItemDto.java index 4fcc2c1f0..d5c1a0437 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/NavigationItemDto.java +++ b/src/main/java/org/highmed/domain/dto/NavigationItemDto.java @@ -1,14 +1,14 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; import java.net.URL; @Data diff --git a/src/main/java/de/vitagroup/num/domain/dto/OrganizationDto.java b/src/main/java/org/highmed/domain/dto/OrganizationDto.java similarity index 96% rename from src/main/java/de/vitagroup/num/domain/dto/OrganizationDto.java rename to src/main/java/org/highmed/domain/dto/OrganizationDto.java index f6cd3f47f..5946a90b2 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/OrganizationDto.java +++ b/src/main/java/org/highmed/domain/dto/OrganizationDto.java @@ -1,13 +1,13 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import java.util.Set; @Data diff --git a/src/main/java/de/vitagroup/num/domain/dto/ParameterOptionsDto.java b/src/main/java/org/highmed/domain/dto/ParameterOptionsDto.java similarity index 93% rename from src/main/java/de/vitagroup/num/domain/dto/ParameterOptionsDto.java rename to src/main/java/org/highmed/domain/dto/ParameterOptionsDto.java index 4ac632ff0..7b2d51dcc 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/ParameterOptionsDto.java +++ b/src/main/java/org/highmed/domain/dto/ParameterOptionsDto.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/de/vitagroup/num/domain/dto/ProjectDto.java b/src/main/java/org/highmed/domain/dto/ProjectDto.java similarity index 89% rename from src/main/java/de/vitagroup/num/domain/dto/ProjectDto.java rename to src/main/java/org/highmed/domain/dto/ProjectDto.java index 831138c55..4f82e0f4d 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/ProjectDto.java +++ b/src/main/java/org/highmed/domain/dto/ProjectDto.java @@ -1,19 +1,19 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.vitagroup.num.attachment.domain.dto.AttachmentDto; -import de.vitagroup.num.domain.model.ProjectCategories; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.domain.model.admin.User; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.highmed.attachment.domain.dto.AttachmentDto; +import org.highmed.domain.model.ProjectCategories; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.model.admin.User; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import java.time.LocalDate; import java.time.OffsetDateTime; import java.util.List; diff --git a/src/main/java/de/vitagroup/num/domain/dto/ProjectInfoDto.java b/src/main/java/org/highmed/domain/dto/ProjectInfoDto.java similarity index 92% rename from src/main/java/de/vitagroup/num/domain/dto/ProjectInfoDto.java rename to src/main/java/org/highmed/domain/dto/ProjectInfoDto.java index 8a91512a0..ed2e1197e 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/ProjectInfoDto.java +++ b/src/main/java/org/highmed/domain/dto/ProjectInfoDto.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/de/vitagroup/num/domain/dto/ProjectViewTO.java b/src/main/java/org/highmed/domain/dto/ProjectViewTO.java similarity index 80% rename from src/main/java/de/vitagroup/num/domain/dto/ProjectViewTO.java rename to src/main/java/org/highmed/domain/dto/ProjectViewTO.java index cda5abd19..e37ed7eba 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/ProjectViewTO.java +++ b/src/main/java/org/highmed/domain/dto/ProjectViewTO.java @@ -1,12 +1,12 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.domain.model.admin.User; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.model.admin.User; import java.time.LocalDate; import java.time.OffsetDateTime; diff --git a/src/main/java/de/vitagroup/num/domain/dto/RawQueryDto.java b/src/main/java/org/highmed/domain/dto/RawQueryDto.java similarity index 92% rename from src/main/java/de/vitagroup/num/domain/dto/RawQueryDto.java rename to src/main/java/org/highmed/domain/dto/RawQueryDto.java index dca268173..cd26a092e 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/RawQueryDto.java +++ b/src/main/java/org/highmed/domain/dto/RawQueryDto.java @@ -1,14 +1,13 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; - @Schema @Data @Builder diff --git a/src/main/java/de/vitagroup/num/domain/dto/SearchCriteria.java b/src/main/java/org/highmed/domain/dto/SearchCriteria.java similarity index 94% rename from src/main/java/de/vitagroup/num/domain/dto/SearchCriteria.java rename to src/main/java/org/highmed/domain/dto/SearchCriteria.java index 9d3ccb875..7e5b49af1 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/SearchCriteria.java +++ b/src/main/java/org/highmed/domain/dto/SearchCriteria.java @@ -1,12 +1,12 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; -import de.vitagroup.num.service.exception.BadRequestException; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; +import org.highmed.service.exception.BadRequestException; import java.util.Map; diff --git a/src/main/java/de/vitagroup/num/domain/dto/SearchFilter.java b/src/main/java/org/highmed/domain/dto/SearchFilter.java similarity index 71% rename from src/main/java/de/vitagroup/num/domain/dto/SearchFilter.java rename to src/main/java/org/highmed/domain/dto/SearchFilter.java index 9b69dafbc..c9b4e8607 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/SearchFilter.java +++ b/src/main/java/org/highmed/domain/dto/SearchFilter.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; public enum SearchFilter { ALL, diff --git a/src/main/java/de/vitagroup/num/domain/dto/SlimAqlDto.java b/src/main/java/org/highmed/domain/dto/SlimAqlDto.java similarity index 91% rename from src/main/java/de/vitagroup/num/domain/dto/SlimAqlDto.java rename to src/main/java/org/highmed/domain/dto/SlimAqlDto.java index 489f99539..e7583a73e 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/SlimAqlDto.java +++ b/src/main/java/org/highmed/domain/dto/SlimAqlDto.java @@ -1,8 +1,7 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/de/vitagroup/num/domain/dto/TemplateInfoDto.java b/src/main/java/org/highmed/domain/dto/TemplateInfoDto.java similarity index 95% rename from src/main/java/de/vitagroup/num/domain/dto/TemplateInfoDto.java rename to src/main/java/org/highmed/domain/dto/TemplateInfoDto.java index e68c93a26..59303ea4a 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/TemplateInfoDto.java +++ b/src/main/java/org/highmed/domain/dto/TemplateInfoDto.java @@ -1,15 +1,14 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; - /** Dto for template information linked to a project */ @Data @Builder diff --git a/src/main/java/de/vitagroup/num/domain/dto/TemplateMetadataDto.java b/src/main/java/org/highmed/domain/dto/TemplateMetadataDto.java similarity index 93% rename from src/main/java/de/vitagroup/num/domain/dto/TemplateMetadataDto.java rename to src/main/java/org/highmed/domain/dto/TemplateMetadataDto.java index 6a6703a07..5c1ddeea9 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/TemplateMetadataDto.java +++ b/src/main/java/org/highmed/domain/dto/TemplateMetadataDto.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/de/vitagroup/num/domain/dto/TemplateSizeRequestDto.java b/src/main/java/org/highmed/domain/dto/TemplateSizeRequestDto.java similarity index 93% rename from src/main/java/de/vitagroup/num/domain/dto/TemplateSizeRequestDto.java rename to src/main/java/org/highmed/domain/dto/TemplateSizeRequestDto.java index 65b894401..d3f66b734 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/TemplateSizeRequestDto.java +++ b/src/main/java/org/highmed/domain/dto/TemplateSizeRequestDto.java @@ -1,14 +1,14 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import java.util.List; @Data diff --git a/src/main/java/de/vitagroup/num/domain/dto/UserDetailsDto.java b/src/main/java/org/highmed/domain/dto/UserDetailsDto.java similarity index 93% rename from src/main/java/de/vitagroup/num/domain/dto/UserDetailsDto.java rename to src/main/java/org/highmed/domain/dto/UserDetailsDto.java index 3034763f8..bb82ee713 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/UserDetailsDto.java +++ b/src/main/java/org/highmed/domain/dto/UserDetailsDto.java @@ -1,13 +1,12 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.validation.constraints.NotNull; - @Data @Schema @Builder diff --git a/src/main/java/de/vitagroup/num/domain/dto/UserNameDto.java b/src/main/java/org/highmed/domain/dto/UserNameDto.java similarity index 93% rename from src/main/java/de/vitagroup/num/domain/dto/UserNameDto.java rename to src/main/java/org/highmed/domain/dto/UserNameDto.java index 549b4fd1a..5b35aabc4 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/UserNameDto.java +++ b/src/main/java/org/highmed/domain/dto/UserNameDto.java @@ -1,13 +1,12 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.validation.constraints.NotNull; - @Data @Schema @Builder diff --git a/src/main/java/de/vitagroup/num/domain/dto/ZarsInfoDto.java b/src/main/java/org/highmed/domain/dto/ZarsInfoDto.java similarity index 79% rename from src/main/java/de/vitagroup/num/domain/dto/ZarsInfoDto.java rename to src/main/java/org/highmed/domain/dto/ZarsInfoDto.java index 45d08af9d..f4c156abb 100644 --- a/src/main/java/de/vitagroup/num/domain/dto/ZarsInfoDto.java +++ b/src/main/java/org/highmed/domain/dto/ZarsInfoDto.java @@ -1,10 +1,11 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; + +import lombok.Data; +import org.highmed.domain.model.ProjectCategories; +import org.highmed.domain.model.ProjectStatus; -import de.vitagroup.num.domain.model.ProjectCategories; -import de.vitagroup.num.domain.model.ProjectStatus; import java.time.LocalDate; import java.util.Set; -import lombok.Data; @Data public class ZarsInfoDto { diff --git a/src/main/java/de/vitagroup/num/domain/model/Aql.java b/src/main/java/org/highmed/domain/model/Aql.java similarity index 91% rename from src/main/java/de/vitagroup/num/domain/model/Aql.java rename to src/main/java/org/highmed/domain/model/Aql.java index a3c0b9748..d11684082 100644 --- a/src/main/java/de/vitagroup/num/domain/model/Aql.java +++ b/src/main/java/org/highmed/domain/model/Aql.java @@ -1,7 +1,8 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; import com.fasterxml.jackson.annotation.JsonBackReference; -import de.vitagroup.num.domain.model.admin.UserDetails; +import org.highmed.domain.model.AqlCategory; +import org.highmed.domain.model.admin.UserDetails; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/de/vitagroup/num/domain/model/AqlCategory.java b/src/main/java/org/highmed/domain/model/AqlCategory.java similarity index 72% rename from src/main/java/de/vitagroup/num/domain/model/AqlCategory.java rename to src/main/java/org/highmed/domain/model/AqlCategory.java index fdd4acd65..00ce640d2 100644 --- a/src/main/java/de/vitagroup/num/domain/model/AqlCategory.java +++ b/src/main/java/org/highmed/domain/model/AqlCategory.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; -import de.vitagroup.num.domain.repository.MapConverter; -import de.vitagroup.num.domain.validation.ValidTranslatedString; +import org.highmed.domain.repository.MapConverter; +import org.highmed.domain.validation.ValidTranslatedString; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/de/vitagroup/num/domain/model/Cohort.java b/src/main/java/org/highmed/domain/model/Cohort.java similarity index 83% rename from src/main/java/de/vitagroup/num/domain/model/Cohort.java rename to src/main/java/org/highmed/domain/model/Cohort.java index a1f2b6a61..0c7229a6d 100644 --- a/src/main/java/de/vitagroup/num/domain/model/Cohort.java +++ b/src/main/java/org/highmed/domain/model/Cohort.java @@ -1,6 +1,9 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; import java.io.Serializable; + +import org.highmed.domain.model.CohortGroup; +import org.highmed.domain.model.Project; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/de/vitagroup/num/domain/model/CohortAql.java b/src/main/java/org/highmed/domain/model/CohortAql.java similarity index 87% rename from src/main/java/de/vitagroup/num/domain/model/CohortAql.java rename to src/main/java/org/highmed/domain/model/CohortAql.java index 800ff5c6e..92986b356 100644 --- a/src/main/java/de/vitagroup/num/domain/model/CohortAql.java +++ b/src/main/java/org/highmed/domain/model/CohortAql.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/de/vitagroup/num/domain/model/CohortGroup.java b/src/main/java/org/highmed/domain/model/CohortGroup.java similarity index 80% rename from src/main/java/de/vitagroup/num/domain/model/CohortGroup.java rename to src/main/java/org/highmed/domain/model/CohortGroup.java index 0561a1e91..257049916 100644 --- a/src/main/java/de/vitagroup/num/domain/model/CohortGroup.java +++ b/src/main/java/org/highmed/domain/model/CohortGroup.java @@ -1,9 +1,12 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonManagedReference; -import de.vitagroup.num.domain.repository.AqlConverter; -import de.vitagroup.num.domain.repository.MapConverter; +import org.highmed.domain.model.CohortAql; +import org.highmed.domain.model.Operator; +import org.highmed.domain.model.Type; +import org.highmed.domain.repository.AqlConverter; +import org.highmed.domain.repository.MapConverter; import java.io.Serializable; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/de/vitagroup/num/domain/model/Comment.java b/src/main/java/org/highmed/domain/model/Comment.java similarity index 87% rename from src/main/java/de/vitagroup/num/domain/model/Comment.java rename to src/main/java/org/highmed/domain/model/Comment.java index 96e372ef2..e29202014 100644 --- a/src/main/java/de/vitagroup/num/domain/model/Comment.java +++ b/src/main/java/org/highmed/domain/model/Comment.java @@ -1,7 +1,8 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; import com.fasterxml.jackson.annotation.JsonBackReference; -import de.vitagroup.num.domain.model.admin.UserDetails; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.admin.UserDetails; import java.io.Serializable; import java.time.OffsetDateTime; import jakarta.persistence.*; diff --git a/src/main/java/de/vitagroup/num/domain/model/Content.java b/src/main/java/org/highmed/domain/model/Content.java similarity index 87% rename from src/main/java/de/vitagroup/num/domain/model/Content.java rename to src/main/java/org/highmed/domain/model/Content.java index 98be32222..0bf6a718b 100644 --- a/src/main/java/de/vitagroup/num/domain/model/Content.java +++ b/src/main/java/org/highmed/domain/model/Content.java @@ -1,6 +1,8 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; import java.io.Serializable; + +import org.highmed.domain.model.ContentType; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/de/vitagroup/num/domain/model/ContentType.java b/src/main/java/org/highmed/domain/model/ContentType.java similarity index 56% rename from src/main/java/de/vitagroup/num/domain/model/ContentType.java rename to src/main/java/org/highmed/domain/model/ContentType.java index 070200700..0d2453f50 100644 --- a/src/main/java/de/vitagroup/num/domain/model/ContentType.java +++ b/src/main/java/org/highmed/domain/model/ContentType.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; public enum ContentType { NAVIGATION, diff --git a/src/main/java/de/vitagroup/num/domain/model/EntityGroup.java b/src/main/java/org/highmed/domain/model/EntityGroup.java similarity index 61% rename from src/main/java/de/vitagroup/num/domain/model/EntityGroup.java rename to src/main/java/org/highmed/domain/model/EntityGroup.java index 7f2cc0524..76f090bee 100644 --- a/src/main/java/de/vitagroup/num/domain/model/EntityGroup.java +++ b/src/main/java/org/highmed/domain/model/EntityGroup.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; public enum EntityGroup { PROJECT_STATUS, diff --git a/src/main/java/de/vitagroup/num/domain/model/ExportType.java b/src/main/java/org/highmed/domain/model/ExportType.java similarity index 51% rename from src/main/java/de/vitagroup/num/domain/model/ExportType.java rename to src/main/java/org/highmed/domain/model/ExportType.java index 4cce9613d..8931efa87 100644 --- a/src/main/java/de/vitagroup/num/domain/model/ExportType.java +++ b/src/main/java/org/highmed/domain/model/ExportType.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; public enum ExportType { csv, diff --git a/src/main/java/de/vitagroup/num/domain/model/MailDomain.java b/src/main/java/org/highmed/domain/model/MailDomain.java similarity index 87% rename from src/main/java/de/vitagroup/num/domain/model/MailDomain.java rename to src/main/java/org/highmed/domain/model/MailDomain.java index d0aa94ff8..33b7db380 100644 --- a/src/main/java/de/vitagroup/num/domain/model/MailDomain.java +++ b/src/main/java/org/highmed/domain/model/MailDomain.java @@ -1,7 +1,9 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; import com.fasterxml.jackson.annotation.JsonBackReference; import java.io.Serializable; + +import org.highmed.domain.model.Organization; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/de/vitagroup/num/domain/model/Operator.java b/src/main/java/org/highmed/domain/model/Operator.java similarity index 52% rename from src/main/java/de/vitagroup/num/domain/model/Operator.java rename to src/main/java/org/highmed/domain/model/Operator.java index 9179b6501..39e812342 100644 --- a/src/main/java/de/vitagroup/num/domain/model/Operator.java +++ b/src/main/java/org/highmed/domain/model/Operator.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; public enum Operator { AND, OR, NOT diff --git a/src/main/java/de/vitagroup/num/domain/model/Organization.java b/src/main/java/org/highmed/domain/model/Organization.java similarity index 92% rename from src/main/java/de/vitagroup/num/domain/model/Organization.java rename to src/main/java/org/highmed/domain/model/Organization.java index dd48d3d61..13d02f03d 100644 --- a/src/main/java/de/vitagroup/num/domain/model/Organization.java +++ b/src/main/java/org/highmed/domain/model/Organization.java @@ -1,9 +1,11 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; import com.fasterxml.jackson.annotation.JsonManagedReference; import java.io.Serializable; import java.util.HashSet; import java.util.Set; + +import org.highmed.domain.model.MailDomain; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/de/vitagroup/num/domain/model/Project.java b/src/main/java/org/highmed/domain/model/Project.java similarity index 82% rename from src/main/java/de/vitagroup/num/domain/model/Project.java rename to src/main/java/org/highmed/domain/model/Project.java index c1c441709..756ead0ff 100644 --- a/src/main/java/de/vitagroup/num/domain/model/Project.java +++ b/src/main/java/org/highmed/domain/model/Project.java @@ -1,12 +1,17 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonManagedReference; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.repository.CategorySetConverter; -import de.vitagroup.num.domain.repository.MapConverter; -import de.vitagroup.num.domain.repository.StringSetConverter; +import org.highmed.domain.model.Cohort; +import org.highmed.domain.model.ProjectCategories; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.model.ProjectTransition; +import org.highmed.domain.model.Translation; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.CategorySetConverter; +import org.highmed.domain.repository.MapConverter; +import org.highmed.domain.repository.StringSetConverter; import lombok.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -48,7 +53,7 @@ public class Project implements Serializable { private String goal; @Enumerated(EnumType.STRING) - private ProjectStatus status; + private org.highmed.domain.model.ProjectStatus status; @Convert(converter = CategorySetConverter.class) private Set categories; @@ -119,6 +124,6 @@ public boolean isCoordinator(String userId) { } public boolean isDeletable() { - return ProjectStatus.DRAFT.equals(status) || ProjectStatus.CHANGE_REQUEST.equals(status); + return org.highmed.domain.model.ProjectStatus.DRAFT.equals(status) || ProjectStatus.CHANGE_REQUEST.equals(status); } } diff --git a/src/main/java/de/vitagroup/num/domain/model/ProjectCategories.java b/src/main/java/org/highmed/domain/model/ProjectCategories.java similarity index 92% rename from src/main/java/de/vitagroup/num/domain/model/ProjectCategories.java rename to src/main/java/org/highmed/domain/model/ProjectCategories.java index 2aeb42024..6f00a3471 100644 --- a/src/main/java/de/vitagroup/num/domain/model/ProjectCategories.java +++ b/src/main/java/org/highmed/domain/model/ProjectCategories.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; public enum ProjectCategories { PEDIATRICS, diff --git a/src/main/java/de/vitagroup/num/domain/model/ProjectStatus.java b/src/main/java/org/highmed/domain/model/ProjectStatus.java similarity index 93% rename from src/main/java/de/vitagroup/num/domain/model/ProjectStatus.java rename to src/main/java/org/highmed/domain/model/ProjectStatus.java index f2b628e43..e47f34eea 100644 --- a/src/main/java/de/vitagroup/num/domain/model/ProjectStatus.java +++ b/src/main/java/org/highmed/domain/model/ProjectStatus.java @@ -1,8 +1,8 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; -import static de.vitagroup.num.domain.model.Roles.STUDY_APPROVER; -import static de.vitagroup.num.domain.model.Roles.STUDY_COORDINATOR; -import static de.vitagroup.num.domain.model.Roles.SUPER_ADMIN; +import static org.highmed.domain.model.Roles.STUDY_APPROVER; +import static org.highmed.domain.model.Roles.STUDY_COORDINATOR; +import static org.highmed.domain.model.Roles.SUPER_ADMIN; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/de/vitagroup/num/domain/model/ProjectTransition.java b/src/main/java/org/highmed/domain/model/ProjectTransition.java similarity index 82% rename from src/main/java/de/vitagroup/num/domain/model/ProjectTransition.java rename to src/main/java/org/highmed/domain/model/ProjectTransition.java index 482f9535c..75b0260bb 100644 --- a/src/main/java/de/vitagroup/num/domain/model/ProjectTransition.java +++ b/src/main/java/org/highmed/domain/model/ProjectTransition.java @@ -1,7 +1,9 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; import com.fasterxml.jackson.annotation.JsonBackReference; -import de.vitagroup.num.domain.model.admin.UserDetails; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.model.admin.UserDetails; import java.io.Serializable; import java.time.OffsetDateTime; import jakarta.persistence.*; diff --git a/src/main/java/de/vitagroup/num/domain/model/Roles.java b/src/main/java/org/highmed/domain/model/Roles.java similarity index 98% rename from src/main/java/de/vitagroup/num/domain/model/Roles.java rename to src/main/java/org/highmed/domain/model/Roles.java index 0f38c5b7b..ad40f7ffe 100644 --- a/src/main/java/de/vitagroup/num/domain/model/Roles.java +++ b/src/main/java/org/highmed/domain/model/Roles.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; import com.google.common.collect.Lists; import org.springframework.security.oauth2.jwt.Jwt; diff --git a/src/main/java/de/vitagroup/num/domain/model/SetupType.java b/src/main/java/org/highmed/domain/model/SetupType.java similarity index 97% rename from src/main/java/de/vitagroup/num/domain/model/SetupType.java rename to src/main/java/org/highmed/domain/model/SetupType.java index 0506f1109..95ddfa4c9 100644 --- a/src/main/java/de/vitagroup/num/domain/model/SetupType.java +++ b/src/main/java/org/highmed/domain/model/SetupType.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/domain/model/Translation.java b/src/main/java/org/highmed/domain/model/Translation.java similarity index 88% rename from src/main/java/de/vitagroup/num/domain/model/Translation.java rename to src/main/java/org/highmed/domain/model/Translation.java index a2edca73f..c0c496431 100644 --- a/src/main/java/de/vitagroup/num/domain/model/Translation.java +++ b/src/main/java/org/highmed/domain/model/Translation.java @@ -1,6 +1,7 @@ -package de.vitagroup.num.domain.model; +package org.highmed.domain.model; -import de.vitagroup.num.domain.dto.Language; +import org.highmed.domain.dto.Language; +import org.highmed.domain.model.EntityGroup; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/org/highmed/domain/model/Type.java b/src/main/java/org/highmed/domain/model/Type.java new file mode 100644 index 000000000..d2b582100 --- /dev/null +++ b/src/main/java/org/highmed/domain/model/Type.java @@ -0,0 +1,6 @@ +package org.highmed.domain.model; + +public enum Type { + AQL, + GROUP +} diff --git a/src/main/java/de/vitagroup/num/domain/model/admin/Role.java b/src/main/java/org/highmed/domain/model/admin/Role.java similarity index 76% rename from src/main/java/de/vitagroup/num/domain/model/admin/Role.java rename to src/main/java/org/highmed/domain/model/admin/Role.java index c2a474138..b458ed689 100644 --- a/src/main/java/de/vitagroup/num/domain/model/admin/Role.java +++ b/src/main/java/org/highmed/domain/model/admin/Role.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.model.admin; +package org.highmed.domain.model.admin; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/de/vitagroup/num/domain/model/admin/User.java b/src/main/java/org/highmed/domain/model/admin/User.java similarity index 94% rename from src/main/java/de/vitagroup/num/domain/model/admin/User.java rename to src/main/java/org/highmed/domain/model/admin/User.java index 9145c85a3..d89b58a79 100644 --- a/src/main/java/de/vitagroup/num/domain/model/admin/User.java +++ b/src/main/java/org/highmed/domain/model/admin/User.java @@ -1,8 +1,8 @@ -package de.vitagroup.num.domain.model.admin; +package org.highmed.domain.model.admin; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.vitagroup.num.domain.dto.OrganizationDto; +import org.highmed.domain.dto.OrganizationDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/de/vitagroup/num/domain/model/admin/UserDetails.java b/src/main/java/org/highmed/domain/model/admin/UserDetails.java similarity index 89% rename from src/main/java/de/vitagroup/num/domain/model/admin/UserDetails.java rename to src/main/java/org/highmed/domain/model/admin/UserDetails.java index 1131a9661..cd1064a5d 100644 --- a/src/main/java/de/vitagroup/num/domain/model/admin/UserDetails.java +++ b/src/main/java/org/highmed/domain/model/admin/UserDetails.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.domain.model.admin; +package org.highmed.domain.model.admin; import com.fasterxml.jackson.annotation.JsonBackReference; -import de.vitagroup.num.domain.model.Organization; +import org.highmed.domain.model.Organization; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/de/vitagroup/num/domain/repository/AqlCategoryRepository.java b/src/main/java/org/highmed/domain/repository/AqlCategoryRepository.java similarity index 88% rename from src/main/java/de/vitagroup/num/domain/repository/AqlCategoryRepository.java rename to src/main/java/org/highmed/domain/repository/AqlCategoryRepository.java index 6a363bf98..211a4f85f 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/AqlCategoryRepository.java +++ b/src/main/java/org/highmed/domain/repository/AqlCategoryRepository.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.AqlCategory; +import org.highmed.domain.model.AqlCategory; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/de/vitagroup/num/domain/repository/AqlConverter.java b/src/main/java/org/highmed/domain/repository/AqlConverter.java similarity index 91% rename from src/main/java/de/vitagroup/num/domain/repository/AqlConverter.java rename to src/main/java/org/highmed/domain/repository/AqlConverter.java index 1801ff2f8..7f8a17c51 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/AqlConverter.java +++ b/src/main/java/org/highmed/domain/repository/AqlConverter.java @@ -1,8 +1,8 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.domain.model.CohortAql; +import org.highmed.domain.model.CohortAql; import jakarta.persistence.AttributeConverter; import lombok.AllArgsConstructor; diff --git a/src/main/java/de/vitagroup/num/domain/repository/AqlRepository.java b/src/main/java/org/highmed/domain/repository/AqlRepository.java similarity index 61% rename from src/main/java/de/vitagroup/num/domain/repository/AqlRepository.java rename to src/main/java/org/highmed/domain/repository/AqlRepository.java index c748e2753..0c304a057 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/AqlRepository.java +++ b/src/main/java/org/highmed/domain/repository/AqlRepository.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.Aql; +import org.highmed.domain.model.Aql; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; @@ -10,12 +10,12 @@ import java.util.List; @Repository -public interface AqlRepository extends JpaRepository, JpaSpecificationExecutor { +public interface AqlRepository extends JpaRepository, JpaSpecificationExecutor { @Query("SELECT aql FROM Aql aql WHERE aql.owner.userId = :ownerId OR aql.publicAql = true") - List findAllOwnedOrPublic(@Param("ownerId") String ownerId); + List findAllOwnedOrPublic(@Param("ownerId") String ownerId); - List findByCategoryId(Long id); + List findByCategoryId(Long id); boolean existsById(Long id); diff --git a/src/main/java/de/vitagroup/num/domain/repository/CategorySetConverter.java b/src/main/java/org/highmed/domain/repository/CategorySetConverter.java similarity index 92% rename from src/main/java/de/vitagroup/num/domain/repository/CategorySetConverter.java rename to src/main/java/org/highmed/domain/repository/CategorySetConverter.java index b0ecc5b6d..15682ce01 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/CategorySetConverter.java +++ b/src/main/java/org/highmed/domain/repository/CategorySetConverter.java @@ -1,8 +1,8 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.domain.model.ProjectCategories; +import org.highmed.domain.model.ProjectCategories; import java.io.IOException; import java.util.Set; diff --git a/src/main/java/de/vitagroup/num/domain/repository/CohortGroupRepository.java b/src/main/java/org/highmed/domain/repository/CohortGroupRepository.java similarity index 69% rename from src/main/java/de/vitagroup/num/domain/repository/CohortGroupRepository.java rename to src/main/java/org/highmed/domain/repository/CohortGroupRepository.java index 79eabf00e..981b86d18 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/CohortGroupRepository.java +++ b/src/main/java/org/highmed/domain/repository/CohortGroupRepository.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.CohortGroup; +import org.highmed.domain.model.CohortGroup; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/vitagroup/num/domain/repository/CohortRepository.java b/src/main/java/org/highmed/domain/repository/CohortRepository.java similarity index 69% rename from src/main/java/de/vitagroup/num/domain/repository/CohortRepository.java rename to src/main/java/org/highmed/domain/repository/CohortRepository.java index 3903e2214..21b7bccbb 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/CohortRepository.java +++ b/src/main/java/org/highmed/domain/repository/CohortRepository.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.Cohort; +import org.highmed.domain.model.Cohort; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/vitagroup/num/domain/repository/CommentRepository.java b/src/main/java/org/highmed/domain/repository/CommentRepository.java similarity index 75% rename from src/main/java/de/vitagroup/num/domain/repository/CommentRepository.java rename to src/main/java/org/highmed/domain/repository/CommentRepository.java index 32ad0522f..30d8156f6 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/CommentRepository.java +++ b/src/main/java/org/highmed/domain/repository/CommentRepository.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.Comment; +import org.highmed.domain.model.Comment; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/vitagroup/num/domain/repository/ContentItemRepository.java b/src/main/java/org/highmed/domain/repository/ContentItemRepository.java similarity index 69% rename from src/main/java/de/vitagroup/num/domain/repository/ContentItemRepository.java rename to src/main/java/org/highmed/domain/repository/ContentItemRepository.java index eefdd91dd..c108863a1 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/ContentItemRepository.java +++ b/src/main/java/org/highmed/domain/repository/ContentItemRepository.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.Content; -import de.vitagroup.num.domain.model.ContentType; +import org.highmed.domain.model.Content; +import org.highmed.domain.model.ContentType; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/de/vitagroup/num/domain/repository/CustomProjectRepository.java b/src/main/java/org/highmed/domain/repository/CustomProjectRepository.java similarity index 60% rename from src/main/java/de/vitagroup/num/domain/repository/CustomProjectRepository.java rename to src/main/java/org/highmed/domain/repository/CustomProjectRepository.java index ecdb2896d..9166103f0 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/CustomProjectRepository.java +++ b/src/main/java/org/highmed/domain/repository/CustomProjectRepository.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.specification.ProjectSpecification; +import org.highmed.domain.model.Project; +import org.highmed.domain.specification.ProjectSpecification; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/de/vitagroup/num/domain/repository/MailDomainRepository.java b/src/main/java/org/highmed/domain/repository/MailDomainRepository.java similarity index 85% rename from src/main/java/de/vitagroup/num/domain/repository/MailDomainRepository.java rename to src/main/java/org/highmed/domain/repository/MailDomainRepository.java index 256257982..43152a7e5 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/MailDomainRepository.java +++ b/src/main/java/org/highmed/domain/repository/MailDomainRepository.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.MailDomain; +import org.highmed.domain.model.MailDomain; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/vitagroup/num/domain/repository/MapConverter.java b/src/main/java/org/highmed/domain/repository/MapConverter.java similarity index 96% rename from src/main/java/de/vitagroup/num/domain/repository/MapConverter.java rename to src/main/java/org/highmed/domain/repository/MapConverter.java index cc55972a1..caab6d8d4 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/MapConverter.java +++ b/src/main/java/org/highmed/domain/repository/MapConverter.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/de/vitagroup/num/domain/repository/OrganizationRepository.java b/src/main/java/org/highmed/domain/repository/OrganizationRepository.java similarity index 85% rename from src/main/java/de/vitagroup/num/domain/repository/OrganizationRepository.java rename to src/main/java/org/highmed/domain/repository/OrganizationRepository.java index 437f9aedb..db93fc6be 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/OrganizationRepository.java +++ b/src/main/java/org/highmed/domain/repository/OrganizationRepository.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.Organization; +import org.highmed.domain.model.Organization; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/de/vitagroup/num/domain/repository/ProjectRepository.java b/src/main/java/org/highmed/domain/repository/ProjectRepository.java similarity index 83% rename from src/main/java/de/vitagroup/num/domain/repository/ProjectRepository.java rename to src/main/java/org/highmed/domain/repository/ProjectRepository.java index 58195ab34..b1383d545 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/ProjectRepository.java +++ b/src/main/java/org/highmed/domain/repository/ProjectRepository.java @@ -1,7 +1,8 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.ProjectStatus; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.repository.CustomProjectRepository; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/de/vitagroup/num/domain/repository/ProjectRepositoryImpl.java b/src/main/java/org/highmed/domain/repository/ProjectRepositoryImpl.java similarity index 93% rename from src/main/java/de/vitagroup/num/domain/repository/ProjectRepositoryImpl.java rename to src/main/java/org/highmed/domain/repository/ProjectRepositoryImpl.java index 284b854b2..9a63809e4 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/ProjectRepositoryImpl.java +++ b/src/main/java/org/highmed/domain/repository/ProjectRepositoryImpl.java @@ -1,10 +1,10 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.EntityGroup; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.specification.ProjectSpecification; +import org.highmed.domain.model.EntityGroup; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.specification.ProjectSpecification; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; import jakarta.persistence.criteria.*; diff --git a/src/main/java/de/vitagroup/num/domain/repository/ProjectTransitionRepository.java b/src/main/java/org/highmed/domain/repository/ProjectTransitionRepository.java similarity index 73% rename from src/main/java/de/vitagroup/num/domain/repository/ProjectTransitionRepository.java rename to src/main/java/org/highmed/domain/repository/ProjectTransitionRepository.java index c306dab77..882582a57 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/ProjectTransitionRepository.java +++ b/src/main/java/org/highmed/domain/repository/ProjectTransitionRepository.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.domain.model.ProjectTransition; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.model.ProjectTransition; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/de/vitagroup/num/domain/repository/StringSetConverter.java b/src/main/java/org/highmed/domain/repository/StringSetConverter.java similarity index 96% rename from src/main/java/de/vitagroup/num/domain/repository/StringSetConverter.java rename to src/main/java/org/highmed/domain/repository/StringSetConverter.java index bd867a7fa..d8ef83c8b 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/StringSetConverter.java +++ b/src/main/java/org/highmed/domain/repository/StringSetConverter.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/de/vitagroup/num/domain/repository/TranslationRepository.java b/src/main/java/org/highmed/domain/repository/TranslationRepository.java similarity index 69% rename from src/main/java/de/vitagroup/num/domain/repository/TranslationRepository.java rename to src/main/java/org/highmed/domain/repository/TranslationRepository.java index 6f983eca1..c09c3bafa 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/TranslationRepository.java +++ b/src/main/java/org/highmed/domain/repository/TranslationRepository.java @@ -1,9 +1,9 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import de.vitagroup.num.domain.model.Translation; +import org.highmed.domain.model.Translation; @Repository public interface TranslationRepository extends JpaRepository { diff --git a/src/main/java/de/vitagroup/num/domain/repository/UserDetailsRepository.java b/src/main/java/org/highmed/domain/repository/UserDetailsRepository.java similarity index 92% rename from src/main/java/de/vitagroup/num/domain/repository/UserDetailsRepository.java rename to src/main/java/org/highmed/domain/repository/UserDetailsRepository.java index 693bb1df6..74a7589a6 100644 --- a/src/main/java/de/vitagroup/num/domain/repository/UserDetailsRepository.java +++ b/src/main/java/org/highmed/domain/repository/UserDetailsRepository.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.admin.UserDetails; +import org.highmed.domain.model.admin.UserDetails; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/de/vitagroup/num/domain/specification/AqlSpecification.java b/src/main/java/org/highmed/domain/specification/AqlSpecification.java similarity index 91% rename from src/main/java/de/vitagroup/num/domain/specification/AqlSpecification.java rename to src/main/java/org/highmed/domain/specification/AqlSpecification.java index 11508f107..e09ce37cd 100644 --- a/src/main/java/de/vitagroup/num/domain/specification/AqlSpecification.java +++ b/src/main/java/org/highmed/domain/specification/AqlSpecification.java @@ -1,12 +1,13 @@ -package de.vitagroup.num.domain.specification; +package org.highmed.domain.specification; -import de.vitagroup.num.domain.model.Aql; -import de.vitagroup.num.domain.model.AqlCategory; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.Language; -import de.vitagroup.num.domain.dto.SearchCriteria; -import de.vitagroup.num.domain.dto.SearchFilter; +import org.highmed.domain.model.Aql; +import org.highmed.domain.model.AqlCategory; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.dto.Language; +import org.highmed.domain.dto.SearchCriteria; +import org.highmed.domain.dto.SearchFilter; +import org.highmed.domain.specification.BaseSpecification; import lombok.Getter; import lombok.experimental.SuperBuilder; import org.apache.commons.collections.CollectionUtils; diff --git a/src/main/java/de/vitagroup/num/domain/specification/BaseSpecification.java b/src/main/java/org/highmed/domain/specification/BaseSpecification.java similarity index 86% rename from src/main/java/de/vitagroup/num/domain/specification/BaseSpecification.java rename to src/main/java/org/highmed/domain/specification/BaseSpecification.java index d21da11ba..dd0334aed 100644 --- a/src/main/java/de/vitagroup/num/domain/specification/BaseSpecification.java +++ b/src/main/java/org/highmed/domain/specification/BaseSpecification.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.domain.specification; +package org.highmed.domain.specification; -import de.vitagroup.num.domain.dto.Language; +import org.highmed.domain.dto.Language; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/de/vitagroup/num/domain/specification/OrganizationSpecification.java b/src/main/java/org/highmed/domain/specification/OrganizationSpecification.java similarity index 92% rename from src/main/java/de/vitagroup/num/domain/specification/OrganizationSpecification.java rename to src/main/java/org/highmed/domain/specification/OrganizationSpecification.java index 4b9bfc0ad..ae19a5a30 100644 --- a/src/main/java/de/vitagroup/num/domain/specification/OrganizationSpecification.java +++ b/src/main/java/org/highmed/domain/specification/OrganizationSpecification.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.domain.specification; +package org.highmed.domain.specification; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.dto.SearchCriteria; +import org.highmed.domain.model.Organization; +import org.highmed.domain.dto.SearchCriteria; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/domain/specification/ProjectSpecification.java b/src/main/java/org/highmed/domain/specification/ProjectSpecification.java similarity index 93% rename from src/main/java/de/vitagroup/num/domain/specification/ProjectSpecification.java rename to src/main/java/org/highmed/domain/specification/ProjectSpecification.java index f253bb145..1b787c537 100644 --- a/src/main/java/de/vitagroup/num/domain/specification/ProjectSpecification.java +++ b/src/main/java/org/highmed/domain/specification/ProjectSpecification.java @@ -1,12 +1,13 @@ -package de.vitagroup.num.domain.specification; +package org.highmed.domain.specification; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.SearchCriteria; -import de.vitagroup.num.domain.dto.SearchFilter; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.model.Roles; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.dto.SearchCriteria; +import org.highmed.domain.dto.SearchFilter; +import org.highmed.domain.specification.BaseSpecification; import jakarta.persistence.criteria.*; import lombok.Getter; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/de/vitagroup/num/domain/specification/UserDetailsSpecification.java b/src/main/java/org/highmed/domain/specification/UserDetailsSpecification.java similarity index 89% rename from src/main/java/de/vitagroup/num/domain/specification/UserDetailsSpecification.java rename to src/main/java/org/highmed/domain/specification/UserDetailsSpecification.java index 247e61c56..6961c6fde 100644 --- a/src/main/java/de/vitagroup/num/domain/specification/UserDetailsSpecification.java +++ b/src/main/java/org/highmed/domain/specification/UserDetailsSpecification.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.domain.specification; +package org.highmed.domain.specification; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.admin.UserDetails; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.admin.UserDetails; import jakarta.persistence.criteria.*; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/de/vitagroup/num/domain/templates/ExceptionsTemplate.java b/src/main/java/org/highmed/domain/templates/ExceptionsTemplate.java similarity index 99% rename from src/main/java/de/vitagroup/num/domain/templates/ExceptionsTemplate.java rename to src/main/java/org/highmed/domain/templates/ExceptionsTemplate.java index e95f23893..ae424225f 100644 --- a/src/main/java/de/vitagroup/num/domain/templates/ExceptionsTemplate.java +++ b/src/main/java/org/highmed/domain/templates/ExceptionsTemplate.java @@ -1,10 +1,10 @@ -package de.vitagroup.num.domain.templates; +package org.highmed.domain.templates; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import de.vitagroup.num.service.exception.dto.ExceptionDto; +import org.highmed.service.exception.dto.ExceptionDto; public class ExceptionsTemplate { public final static String TOKEN_IS_NOT_VALID_MSG = "Token is not valid"; diff --git a/src/main/java/de/vitagroup/num/domain/validation/CohortValidator.java b/src/main/java/org/highmed/domain/validation/CohortValidator.java similarity index 86% rename from src/main/java/de/vitagroup/num/domain/validation/CohortValidator.java rename to src/main/java/org/highmed/domain/validation/CohortValidator.java index 2694bf57e..acbf6ccdb 100644 --- a/src/main/java/de/vitagroup/num/domain/validation/CohortValidator.java +++ b/src/main/java/org/highmed/domain/validation/CohortValidator.java @@ -1,11 +1,12 @@ -package de.vitagroup.num.domain.validation; +package org.highmed.domain.validation; -import de.vitagroup.num.domain.dto.CohortGroupDto; -import de.vitagroup.num.domain.model.Operator; -import de.vitagroup.num.domain.model.Type; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.collections4.CollectionUtils; +import org.highmed.domain.dto.CohortGroupDto; +import org.highmed.domain.model.Operator; +import org.highmed.domain.model.Type; -import jakarta.validation.*; import java.util.ArrayDeque; import java.util.Queue; diff --git a/src/main/java/de/vitagroup/num/domain/validation/TranslatedStringValidator.java b/src/main/java/org/highmed/domain/validation/TranslatedStringValidator.java similarity index 80% rename from src/main/java/de/vitagroup/num/domain/validation/TranslatedStringValidator.java rename to src/main/java/org/highmed/domain/validation/TranslatedStringValidator.java index 6633dde8e..e32d8fbfb 100644 --- a/src/main/java/de/vitagroup/num/domain/validation/TranslatedStringValidator.java +++ b/src/main/java/org/highmed/domain/validation/TranslatedStringValidator.java @@ -1,6 +1,8 @@ -package de.vitagroup.num.domain.validation; +package org.highmed.domain.validation; import java.util.Map; + +import org.highmed.domain.validation.ValidTranslatedString; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import org.apache.logging.log4j.util.Strings; @@ -15,6 +17,6 @@ public boolean isValid( return false; } - return !Strings.isBlank(translationMap.get("en")) && !Strings.isBlank(translationMap.get("de")); + return !Strings.isBlank(translationMap.get("en")) && !Strings.isBlank(translationMap.get("org")); } } diff --git a/src/main/java/de/vitagroup/num/domain/validation/ValidCohort.java b/src/main/java/org/highmed/domain/validation/ValidCohort.java similarity index 86% rename from src/main/java/de/vitagroup/num/domain/validation/ValidCohort.java rename to src/main/java/org/highmed/domain/validation/ValidCohort.java index 5254ed3d6..f6a321c1d 100644 --- a/src/main/java/de/vitagroup/num/domain/validation/ValidCohort.java +++ b/src/main/java/org/highmed/domain/validation/ValidCohort.java @@ -1,5 +1,6 @@ -package de.vitagroup.num.domain.validation; +package org.highmed.domain.validation; +import org.highmed.domain.validation.CohortValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; import java.lang.annotation.Documented; diff --git a/src/main/java/de/vitagroup/num/domain/validation/ValidTranslatedString.java b/src/main/java/org/highmed/domain/validation/ValidTranslatedString.java similarity index 85% rename from src/main/java/de/vitagroup/num/domain/validation/ValidTranslatedString.java rename to src/main/java/org/highmed/domain/validation/ValidTranslatedString.java index 28ef4ea34..927da8c8f 100644 --- a/src/main/java/de/vitagroup/num/domain/validation/ValidTranslatedString.java +++ b/src/main/java/org/highmed/domain/validation/ValidTranslatedString.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.domain.validation; +package org.highmed.domain.validation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -6,6 +6,8 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + +import org.highmed.domain.validation.TranslatedStringValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/de/vitagroup/num/events/DeactivateUserEvent.java b/src/main/java/org/highmed/events/DeactivateUserEvent.java similarity index 94% rename from src/main/java/de/vitagroup/num/events/DeactivateUserEvent.java rename to src/main/java/org/highmed/events/DeactivateUserEvent.java index 2564fe8cb..4c1102f17 100644 --- a/src/main/java/de/vitagroup/num/events/DeactivateUserEvent.java +++ b/src/main/java/org/highmed/events/DeactivateUserEvent.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.events; +package org.highmed.events; import org.springframework.context.ApplicationEvent; diff --git a/src/main/java/de/vitagroup/num/listeners/DeactivateUserListener.java b/src/main/java/org/highmed/listeners/DeactivateUserListener.java similarity index 84% rename from src/main/java/de/vitagroup/num/listeners/DeactivateUserListener.java rename to src/main/java/org/highmed/listeners/DeactivateUserListener.java index 2da0889f6..ea173b840 100644 --- a/src/main/java/de/vitagroup/num/listeners/DeactivateUserListener.java +++ b/src/main/java/org/highmed/listeners/DeactivateUserListener.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.listeners; +package org.highmed.listeners; -import de.vitagroup.num.events.DeactivateUserEvent; -import de.vitagroup.num.service.UserDetailsService; +import org.highmed.events.DeactivateUserEvent; +import org.highmed.service.UserDetailsService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationListener; diff --git a/src/main/java/de/vitagroup/num/listeners/UserCacheInit.java b/src/main/java/org/highmed/listeners/UserCacheInit.java similarity index 90% rename from src/main/java/de/vitagroup/num/listeners/UserCacheInit.java rename to src/main/java/org/highmed/listeners/UserCacheInit.java index f2e9f83fd..e6f4064ec 100644 --- a/src/main/java/de/vitagroup/num/listeners/UserCacheInit.java +++ b/src/main/java/org/highmed/listeners/UserCacheInit.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.listeners; +package org.highmed.listeners; -import de.vitagroup.num.service.UserService; +import org.highmed.service.UserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.event.ApplicationReadyEvent; diff --git a/src/main/java/de/vitagroup/num/mapper/AqlMapper.java b/src/main/java/org/highmed/mapper/AqlMapper.java similarity index 81% rename from src/main/java/de/vitagroup/num/mapper/AqlMapper.java rename to src/main/java/org/highmed/mapper/AqlMapper.java index f114f944b..09bb5d2f3 100644 --- a/src/main/java/de/vitagroup/num/mapper/AqlMapper.java +++ b/src/main/java/org/highmed/mapper/AqlMapper.java @@ -1,9 +1,9 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.domain.model.Aql; -import de.vitagroup.num.domain.dto.AqlCategoryDto; -import de.vitagroup.num.domain.dto.AqlDto; -import de.vitagroup.num.service.UserService; +import org.highmed.domain.dto.AqlCategoryDto; +import org.highmed.domain.dto.AqlDto; +import org.highmed.domain.model.Aql; +import org.highmed.service.UserService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.modelmapper.ModelMapper; diff --git a/src/main/java/de/vitagroup/num/mapper/CohortMapper.java b/src/main/java/org/highmed/mapper/CohortMapper.java similarity index 82% rename from src/main/java/de/vitagroup/num/mapper/CohortMapper.java rename to src/main/java/org/highmed/mapper/CohortMapper.java index 47e7bcdd9..d72473b39 100644 --- a/src/main/java/de/vitagroup/num/mapper/CohortMapper.java +++ b/src/main/java/org/highmed/mapper/CohortMapper.java @@ -1,17 +1,18 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.domain.model.Cohort; -import de.vitagroup.num.domain.model.CohortGroup; -import de.vitagroup.num.domain.model.Type; -import de.vitagroup.num.domain.dto.CohortDto; -import de.vitagroup.num.domain.dto.CohortGroupDto; -import java.util.stream.Collectors; -import javax.annotation.PostConstruct; +import org.highmed.domain.dto.CohortDto; +import org.highmed.domain.dto.CohortGroupDto; +import org.highmed.domain.model.Cohort; +import org.highmed.domain.model.CohortGroup; +import org.highmed.domain.model.Type; import lombok.AllArgsConstructor; import org.modelmapper.ModelMapper; import org.modelmapper.PropertyMap; import org.springframework.stereotype.Component; +import javax.annotation.PostConstruct; +import java.util.stream.Collectors; + @Component @AllArgsConstructor public class CohortMapper { diff --git a/src/main/java/de/vitagroup/num/mapper/CommentMapper.java b/src/main/java/org/highmed/mapper/CommentMapper.java similarity index 76% rename from src/main/java/de/vitagroup/num/mapper/CommentMapper.java rename to src/main/java/org/highmed/mapper/CommentMapper.java index dd4ad0e9f..cb5e8ab7e 100644 --- a/src/main/java/de/vitagroup/num/mapper/CommentMapper.java +++ b/src/main/java/org/highmed/mapper/CommentMapper.java @@ -1,9 +1,9 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.domain.model.Comment; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.dto.CommentDto; -import de.vitagroup.num.service.UserService; +import org.highmed.domain.dto.CommentDto; +import org.highmed.domain.model.Comment; +import org.highmed.domain.model.admin.User; +import org.highmed.service.UserService; import lombok.AllArgsConstructor; import org.modelmapper.ModelMapper; import org.springframework.stereotype.Component; diff --git a/src/main/java/de/vitagroup/num/mapper/OrganizationMapper.java b/src/main/java/org/highmed/mapper/OrganizationMapper.java similarity index 76% rename from src/main/java/de/vitagroup/num/mapper/OrganizationMapper.java rename to src/main/java/org/highmed/mapper/OrganizationMapper.java index 7a0e5f946..4f81b81d5 100644 --- a/src/main/java/de/vitagroup/num/mapper/OrganizationMapper.java +++ b/src/main/java/org/highmed/mapper/OrganizationMapper.java @@ -1,15 +1,15 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.domain.model.MailDomain; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.dto.OrganizationDto; -import java.util.stream.Collectors; - -import de.vitagroup.num.service.OrganizationService; +import org.highmed.domain.dto.OrganizationDto; +import org.highmed.domain.model.MailDomain; +import org.highmed.domain.model.Organization; +import org.highmed.service.OrganizationService; import lombok.AllArgsConstructor; import org.modelmapper.ModelMapper; import org.springframework.stereotype.Component; +import java.util.stream.Collectors; + @Component @AllArgsConstructor public class OrganizationMapper { diff --git a/src/main/java/de/vitagroup/num/mapper/ProjectMapper.java b/src/main/java/org/highmed/mapper/ProjectMapper.java similarity index 82% rename from src/main/java/de/vitagroup/num/mapper/ProjectMapper.java rename to src/main/java/org/highmed/mapper/ProjectMapper.java index 8a4740c73..6209956a1 100644 --- a/src/main/java/de/vitagroup/num/mapper/ProjectMapper.java +++ b/src/main/java/org/highmed/mapper/ProjectMapper.java @@ -1,16 +1,17 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.attachment.service.AttachmentService; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.dto.ProjectDto; -import de.vitagroup.num.service.UserService; -import javax.annotation.PostConstruct; +import org.highmed.attachment.service.AttachmentService; +import org.highmed.domain.dto.ProjectDto; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.admin.User; +import org.highmed.service.UserService; import lombok.AllArgsConstructor; import org.modelmapper.ModelMapper; import org.modelmapper.PropertyMap; import org.springframework.stereotype.Component; +import javax.annotation.PostConstruct; + @Component @AllArgsConstructor public class ProjectMapper { diff --git a/src/main/java/de/vitagroup/num/mapper/ProjectViewMapper.java b/src/main/java/org/highmed/mapper/ProjectViewMapper.java similarity index 72% rename from src/main/java/de/vitagroup/num/mapper/ProjectViewMapper.java rename to src/main/java/org/highmed/mapper/ProjectViewMapper.java index 5379f4481..a08a6357c 100644 --- a/src/main/java/de/vitagroup/num/mapper/ProjectViewMapper.java +++ b/src/main/java/org/highmed/mapper/ProjectViewMapper.java @@ -1,9 +1,9 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.dto.ProjectViewTO; -import de.vitagroup.num.service.UserService; +import org.highmed.domain.dto.ProjectViewTO; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.admin.User; +import org.highmed.service.UserService; import lombok.AllArgsConstructor; import org.modelmapper.ModelMapper; import org.springframework.stereotype.Component; diff --git a/src/main/java/de/vitagroup/num/mapper/TemplateMapper.java b/src/main/java/org/highmed/mapper/TemplateMapper.java similarity index 90% rename from src/main/java/de/vitagroup/num/mapper/TemplateMapper.java rename to src/main/java/org/highmed/mapper/TemplateMapper.java index af7593916..6b82fbd3c 100644 --- a/src/main/java/de/vitagroup/num/mapper/TemplateMapper.java +++ b/src/main/java/org/highmed/mapper/TemplateMapper.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.domain.dto.TemplateInfoDto; -import de.vitagroup.num.domain.dto.TemplateMetadataDto; +import org.highmed.domain.dto.TemplateInfoDto; +import org.highmed.domain.dto.TemplateMetadataDto; import lombok.AllArgsConstructor; import org.ehrbase.openehr.sdk.response.dto.ehrscape.TemplateMetaDataDto; import org.modelmapper.ModelMapper; diff --git a/src/main/java/de/vitagroup/num/mapper/UserDetailsMapper.java b/src/main/java/org/highmed/mapper/UserDetailsMapper.java similarity index 82% rename from src/main/java/de/vitagroup/num/mapper/UserDetailsMapper.java rename to src/main/java/org/highmed/mapper/UserDetailsMapper.java index eb14be41a..9eeed1e16 100644 --- a/src/main/java/de/vitagroup/num/mapper/UserDetailsMapper.java +++ b/src/main/java/org/highmed/mapper/UserDetailsMapper.java @@ -1,13 +1,14 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.UserDetailsDto; -import javax.annotation.PostConstruct; +import org.highmed.domain.dto.UserDetailsDto; +import org.highmed.domain.model.admin.UserDetails; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.modelmapper.ModelMapper; import org.springframework.stereotype.Component; +import javax.annotation.PostConstruct; + @Slf4j @Component @AllArgsConstructor diff --git a/src/main/java/de/vitagroup/num/properties/ClamAVProperties.java b/src/main/java/org/highmed/properties/ClamAVProperties.java similarity index 95% rename from src/main/java/de/vitagroup/num/properties/ClamAVProperties.java rename to src/main/java/org/highmed/properties/ClamAVProperties.java index 353e940b6..dfe3659dd 100644 --- a/src/main/java/de/vitagroup/num/properties/ClamAVProperties.java +++ b/src/main/java/org/highmed/properties/ClamAVProperties.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.properties; +package org.highmed.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/de/vitagroup/num/properties/ConsentProperties.java b/src/main/java/org/highmed/properties/ConsentProperties.java similarity index 89% rename from src/main/java/de/vitagroup/num/properties/ConsentProperties.java rename to src/main/java/org/highmed/properties/ConsentProperties.java index b4df2ae37..8653e8be0 100644 --- a/src/main/java/de/vitagroup/num/properties/ConsentProperties.java +++ b/src/main/java/org/highmed/properties/ConsentProperties.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.properties; +package org.highmed.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/de/vitagroup/num/properties/CorsProperties.java b/src/main/java/org/highmed/properties/CorsProperties.java similarity index 90% rename from src/main/java/de/vitagroup/num/properties/CorsProperties.java rename to src/main/java/org/highmed/properties/CorsProperties.java index 076a75510..54d0bd7b4 100644 --- a/src/main/java/de/vitagroup/num/properties/CorsProperties.java +++ b/src/main/java/org/highmed/properties/CorsProperties.java @@ -1,11 +1,12 @@ -package de.vitagroup.num.properties; +package org.highmed.properties; -import java.util.ArrayList; -import java.util.List; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.ArrayList; +import java.util.List; + @Data @Configuration @ConfigurationProperties(prefix = "cors") diff --git a/src/main/java/de/vitagroup/num/properties/EhrBaseProperties.java b/src/main/java/org/highmed/properties/EhrBaseProperties.java similarity index 91% rename from src/main/java/de/vitagroup/num/properties/EhrBaseProperties.java rename to src/main/java/org/highmed/properties/EhrBaseProperties.java index f1c837cb8..c02647f2c 100644 --- a/src/main/java/de/vitagroup/num/properties/EhrBaseProperties.java +++ b/src/main/java/org/highmed/properties/EhrBaseProperties.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.properties; +package org.highmed.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/de/vitagroup/num/properties/FttpProperties.java b/src/main/java/org/highmed/properties/FttpProperties.java similarity index 92% rename from src/main/java/de/vitagroup/num/properties/FttpProperties.java rename to src/main/java/org/highmed/properties/FttpProperties.java index 81ccaa696..9feb0dcfe 100644 --- a/src/main/java/de/vitagroup/num/properties/FttpProperties.java +++ b/src/main/java/org/highmed/properties/FttpProperties.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.properties; +package org.highmed.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/de/vitagroup/num/properties/NumProperties.java b/src/main/java/org/highmed/properties/NumProperties.java similarity index 91% rename from src/main/java/de/vitagroup/num/properties/NumProperties.java rename to src/main/java/org/highmed/properties/NumProperties.java index f92f8a713..0b134e4b8 100644 --- a/src/main/java/de/vitagroup/num/properties/NumProperties.java +++ b/src/main/java/org/highmed/properties/NumProperties.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.properties; +package org.highmed.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/de/vitagroup/num/properties/PrivacyProperties.java b/src/main/java/org/highmed/properties/PrivacyProperties.java similarity index 90% rename from src/main/java/de/vitagroup/num/properties/PrivacyProperties.java rename to src/main/java/org/highmed/properties/PrivacyProperties.java index 5071bc805..7c6a5d483 100644 --- a/src/main/java/de/vitagroup/num/properties/PrivacyProperties.java +++ b/src/main/java/org/highmed/properties/PrivacyProperties.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.properties; +package org.highmed.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/de/vitagroup/num/properties/PseudonymsPsnWorkflowProperties.java b/src/main/java/org/highmed/properties/PseudonymsPsnWorkflowProperties.java similarity index 92% rename from src/main/java/de/vitagroup/num/properties/PseudonymsPsnWorkflowProperties.java rename to src/main/java/org/highmed/properties/PseudonymsPsnWorkflowProperties.java index 49ed66a8c..a92f34478 100644 --- a/src/main/java/de/vitagroup/num/properties/PseudonymsPsnWorkflowProperties.java +++ b/src/main/java/org/highmed/properties/PseudonymsPsnWorkflowProperties.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.properties; +package org.highmed.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/de/vitagroup/num/properties/SwaggerProperties.java b/src/main/java/org/highmed/properties/SwaggerProperties.java similarity index 91% rename from src/main/java/de/vitagroup/num/properties/SwaggerProperties.java rename to src/main/java/org/highmed/properties/SwaggerProperties.java index d4e9207ae..82e71b6e3 100644 --- a/src/main/java/de/vitagroup/num/properties/SwaggerProperties.java +++ b/src/main/java/org/highmed/properties/SwaggerProperties.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.properties; +package org.highmed.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/de/vitagroup/num/service/AqlService.java b/src/main/java/org/highmed/service/AqlService.java similarity index 93% rename from src/main/java/de/vitagroup/num/service/AqlService.java rename to src/main/java/org/highmed/service/AqlService.java index ff05b4203..8b1c7a391 100644 --- a/src/main/java/de/vitagroup/num/service/AqlService.java +++ b/src/main/java/org/highmed/service/AqlService.java @@ -1,24 +1,19 @@ -package de.vitagroup.num.service; +package org.highmed.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.domain.dto.Language; -import de.vitagroup.num.domain.dto.SearchCriteria; -import de.vitagroup.num.domain.dto.SlimAqlDto; -import de.vitagroup.num.domain.model.Aql; -import de.vitagroup.num.domain.model.AqlCategory; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.repository.AqlCategoryRepository; -import de.vitagroup.num.domain.repository.AqlRepository; -import de.vitagroup.num.domain.specification.AqlSpecification; -import de.vitagroup.num.properties.PrivacyProperties; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.ForbiddenException; -import de.vitagroup.num.service.exception.PrivacyException; -import de.vitagroup.num.service.exception.ResourceNotFound; +import org.highmed.domain.dto.Language; +import org.highmed.domain.dto.SearchCriteria; +import org.highmed.domain.dto.SlimAqlDto; +import org.highmed.domain.model.Aql; +import org.highmed.domain.model.AqlCategory; +import org.highmed.domain.model.Roles; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.AqlCategoryRepository; +import org.highmed.domain.repository.AqlRepository; +import org.highmed.domain.specification.AqlSpecification; +import org.highmed.properties.PrivacyProperties; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -26,6 +21,11 @@ import org.ehrbase.aqleditor.dto.aql.Result; import org.ehrbase.aqleditor.service.AqlEditorAqlService; import org.ehrbase.openehr.sdk.aql.parser.AqlParseException; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.ForbiddenException; +import org.highmed.service.exception.PrivacyException; +import org.highmed.service.exception.ResourceNotFound; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.data.domain.*; import org.springframework.data.jpa.domain.JpaSort; @@ -36,7 +36,7 @@ import java.util.*; import java.util.stream.Collectors; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; @Slf4j @Service diff --git a/src/main/java/de/vitagroup/num/service/CohortService.java b/src/main/java/org/highmed/service/CohortService.java similarity index 92% rename from src/main/java/de/vitagroup/num/service/CohortService.java rename to src/main/java/org/highmed/service/CohortService.java index fee0d77ea..7aa65264a 100644 --- a/src/main/java/de/vitagroup/num/service/CohortService.java +++ b/src/main/java/org/highmed/service/CohortService.java @@ -1,23 +1,16 @@ -package de.vitagroup.num.service; - -import de.vitagroup.num.domain.dto.*; -import de.vitagroup.num.domain.model.Cohort; -import de.vitagroup.num.domain.model.CohortGroup; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.domain.repository.CohortRepository; -import de.vitagroup.num.domain.repository.ProjectRepository; -import de.vitagroup.num.properties.PrivacyProperties; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.ForbiddenException; -import de.vitagroup.num.service.exception.PrivacyException; -import de.vitagroup.num.service.exception.ResourceNotFound; -import de.vitagroup.num.service.executors.CohortExecutor; -import de.vitagroup.num.service.policy.EhrPolicy; -import de.vitagroup.num.service.policy.Policy; -import de.vitagroup.num.service.policy.ProjectPolicyService; -import de.vitagroup.num.service.policy.TemplatesPolicy; +package org.highmed.service; + +import org.highmed.domain.dto.CohortDto; +import org.highmed.domain.dto.CohortGroupDto; +import org.highmed.domain.dto.CohortSizeDto; +import org.highmed.domain.dto.TemplateSizeRequestDto; +import org.highmed.domain.model.Cohort; +import org.highmed.domain.model.CohortGroup; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.repository.CohortRepository; +import org.highmed.domain.repository.ProjectRepository; +import org.highmed.properties.PrivacyProperties; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -32,13 +25,23 @@ import org.ehrbase.openehr.sdk.aql.parser.AqlQueryParser; import org.ehrbase.openehr.sdk.aql.render.AqlRenderer; import org.ehrbase.openehr.sdk.response.dto.QueryResponseData; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.ForbiddenException; +import org.highmed.service.exception.PrivacyException; +import org.highmed.service.exception.ResourceNotFound; +import org.highmed.service.executors.CohortExecutor; +import org.highmed.service.policy.EhrPolicy; +import org.highmed.service.policy.Policy; +import org.highmed.service.policy.ProjectPolicyService; +import org.highmed.service.policy.TemplatesPolicy; import org.modelmapper.ModelMapper; import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; @Slf4j @Service diff --git a/src/main/java/de/vitagroup/num/service/CommentService.java b/src/main/java/org/highmed/service/CommentService.java similarity index 76% rename from src/main/java/de/vitagroup/num/service/CommentService.java rename to src/main/java/org/highmed/service/CommentService.java index c2e70a1b2..78d8fe858 100644 --- a/src/main/java/de/vitagroup/num/service/CommentService.java +++ b/src/main/java/org/highmed/service/CommentService.java @@ -1,26 +1,20 @@ -package de.vitagroup.num.service; +package org.highmed.service; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_DELETE_COMMENT; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.COMMENT_EDIT_FOR_COMMENT_WITH_ID_IS_NOT_ALLOWED_COMMENT_HAS_DIFFERENT_AUTHOR; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.COMMENT_NOT_FOUND; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.INVALID_COMMENT_ID; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.PROJECT_DOES_NOT_EXIST; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.PROJECT_NOT_FOUND; +import org.highmed.domain.model.Comment; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.CommentRepository; +import lombok.AllArgsConstructor; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.ForbiddenException; +import org.highmed.service.exception.ResourceNotFound; +import org.springframework.dao.EmptyResultDataAccessException; +import org.springframework.stereotype.Service; import java.time.OffsetDateTime; import java.util.List; -import org.springframework.dao.EmptyResultDataAccessException; -import org.springframework.stereotype.Service; - -import de.vitagroup.num.domain.model.Comment; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.repository.CommentRepository; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.ForbiddenException; -import de.vitagroup.num.service.exception.ResourceNotFound; -import lombok.AllArgsConstructor; +import static org.highmed.domain.templates.ExceptionsTemplate.*; @Service @AllArgsConstructor diff --git a/src/main/java/de/vitagroup/num/service/ContentService.java b/src/main/java/org/highmed/service/ContentService.java similarity index 89% rename from src/main/java/de/vitagroup/num/service/ContentService.java rename to src/main/java/org/highmed/service/ContentService.java index 3e29305ff..e0efd1b23 100644 --- a/src/main/java/de/vitagroup/num/service/ContentService.java +++ b/src/main/java/org/highmed/service/ContentService.java @@ -1,30 +1,28 @@ -package de.vitagroup.num.service; +package org.highmed.service; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.domain.model.Content; -import de.vitagroup.num.domain.model.ContentType; -import de.vitagroup.num.domain.dto.CardDto; -import de.vitagroup.num.domain.dto.MetricsDto; -import de.vitagroup.num.domain.dto.NavigationItemDto; -import de.vitagroup.num.domain.dto.ProjectInfoDto; -import de.vitagroup.num.domain.repository.ContentItemRepository; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.exception.SystemException; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import org.highmed.domain.dto.CardDto; +import org.highmed.domain.dto.MetricsDto; +import org.highmed.domain.dto.NavigationItemDto; +import org.highmed.domain.dto.ProjectInfoDto; +import org.highmed.domain.model.Content; +import org.highmed.domain.model.ContentType; +import org.highmed.domain.repository.ContentItemRepository; import lombok.extern.slf4j.Slf4j; import org.ehrbase.openehr.sdk.response.dto.QueryResponseData; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.exception.SystemException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.COULDN_T_PARSE_CARD; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.COULDN_T_PARSE_NAVIGATION_CONTENT; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.COULDN_T_SAVE_CARD; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.COULDN_T_SAVE_NAVIGATION_CONTENT; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import static org.highmed.domain.templates.ExceptionsTemplate.*; @Slf4j @Service diff --git a/src/main/java/de/vitagroup/num/service/OrganizationService.java b/src/main/java/org/highmed/service/OrganizationService.java similarity index 94% rename from src/main/java/de/vitagroup/num/service/OrganizationService.java rename to src/main/java/org/highmed/service/OrganizationService.java index 35ff59b33..f8e077122 100644 --- a/src/main/java/de/vitagroup/num/service/OrganizationService.java +++ b/src/main/java/org/highmed/service/OrganizationService.java @@ -1,23 +1,23 @@ -package de.vitagroup.num.service; - -import de.vitagroup.num.domain.model.MailDomain; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.OrganizationDto; -import de.vitagroup.num.domain.dto.SearchCriteria; -import de.vitagroup.num.domain.repository.MailDomainRepository; -import de.vitagroup.num.domain.repository.OrganizationRepository; -import de.vitagroup.num.domain.specification.OrganizationSpecification; -import de.vitagroup.num.events.DeactivateUserEvent; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.ForbiddenException; -import de.vitagroup.num.service.exception.ResourceNotFound; +package org.highmed.service; + +import org.highmed.domain.dto.OrganizationDto; +import org.highmed.domain.dto.SearchCriteria; +import org.highmed.domain.model.MailDomain; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.Roles; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.MailDomainRepository; +import org.highmed.domain.repository.OrganizationRepository; +import org.highmed.domain.specification.OrganizationSpecification; +import org.highmed.events.DeactivateUserEvent; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.ForbiddenException; +import org.highmed.service.exception.ResourceNotFound; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.domain.*; import org.springframework.stereotype.Service; @@ -27,7 +27,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; /** Service responsible for retrieving organization information from the terminology server */ @Slf4j diff --git a/src/main/java/de/vitagroup/num/service/ProjectDocCreator.java b/src/main/java/org/highmed/service/ProjectDocCreator.java similarity index 91% rename from src/main/java/de/vitagroup/num/service/ProjectDocCreator.java rename to src/main/java/org/highmed/service/ProjectDocCreator.java index 2c8021129..96fe51e94 100644 --- a/src/main/java/de/vitagroup/num/service/ProjectDocCreator.java +++ b/src/main/java/org/highmed/service/ProjectDocCreator.java @@ -1,15 +1,21 @@ -package de.vitagroup.num.service; - -import de.vitagroup.num.domain.model.Cohort; -import de.vitagroup.num.domain.model.CohortGroup; -import de.vitagroup.num.domain.model.ProjectCategories; -import de.vitagroup.num.domain.model.Type; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.dto.ProjectDto; -import de.vitagroup.num.domain.dto.TemplateInfoDto; -import de.vitagroup.num.domain.dto.UserDetailsDto; -import de.vitagroup.num.domain.repository.CohortRepository; -import de.vitagroup.num.service.exception.SystemException; +package org.highmed.service; + +import org.highmed.domain.dto.ProjectDto; +import org.highmed.domain.dto.TemplateInfoDto; +import org.highmed.domain.dto.UserDetailsDto; +import org.highmed.domain.model.Cohort; +import org.highmed.domain.model.CohortGroup; +import org.highmed.domain.model.ProjectCategories; +import org.highmed.domain.model.Type; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.repository.CohortRepository; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.highmed.service.exception.SystemException; +import org.springframework.context.MessageSource; +import org.springframework.stereotype.Component; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; @@ -19,13 +25,8 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springframework.context.MessageSource; -import org.springframework.stereotype.Component; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CAN_T_FIND_THE_COHORT_BY_ID; +import static org.highmed.domain.templates.ExceptionsTemplate.CAN_T_FIND_THE_COHORT_BY_ID; @Component @AllArgsConstructor diff --git a/src/main/java/de/vitagroup/num/service/ProjectService.java b/src/main/java/org/highmed/service/ProjectService.java similarity index 97% rename from src/main/java/de/vitagroup/num/service/ProjectService.java rename to src/main/java/org/highmed/service/ProjectService.java index 16d633d4d..51626f520 100644 --- a/src/main/java/de/vitagroup/num/service/ProjectService.java +++ b/src/main/java/org/highmed/service/ProjectService.java @@ -1,28 +1,20 @@ -package de.vitagroup.num.service; +package org.highmed.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.attachment.service.AttachmentService; -import de.vitagroup.num.attachment.domain.dto.LightAttachmentDto; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.*; -import de.vitagroup.num.domain.model.*; -import de.vitagroup.num.domain.repository.ProjectRepository; -import de.vitagroup.num.domain.repository.ProjectTransitionRepository; -import de.vitagroup.num.domain.specification.ProjectSpecification; -import de.vitagroup.num.mapper.ProjectMapper; -import de.vitagroup.num.properties.ConsentProperties; -import de.vitagroup.num.properties.PrivacyProperties; -import de.vitagroup.num.service.atna.AtnaService; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.ehrbase.ResponseFilter; -import de.vitagroup.num.service.email.ZarsService; -import de.vitagroup.num.service.exception.*; -import de.vitagroup.num.service.executors.CohortQueryLister; -import de.vitagroup.num.service.notification.NotificationService; -import de.vitagroup.num.service.notification.dto.*; -import de.vitagroup.num.service.policy.*; +import org.highmed.attachment.domain.dto.LightAttachmentDto; +import org.highmed.attachment.service.AttachmentService; +import org.highmed.domain.dto.*; +import org.highmed.domain.model.*; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.ProjectRepository; +import org.highmed.domain.repository.ProjectTransitionRepository; +import org.highmed.domain.specification.ProjectSpecification; +import org.highmed.mapper.ProjectMapper; +import org.highmed.properties.ConsentProperties; +import org.highmed.properties.PrivacyProperties; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -33,6 +25,15 @@ import org.ehrbase.openehr.sdk.aql.dto.AqlQuery; import org.ehrbase.openehr.sdk.aql.parser.AqlQueryParser; import org.ehrbase.openehr.sdk.response.dto.QueryResponseData; +import org.highmed.service.atna.AtnaService; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.ehrbase.ResponseFilter; +import org.highmed.service.email.ZarsService; +import org.highmed.service.exception.*; +import org.highmed.service.executors.CohortQueryLister; +import org.highmed.service.notification.NotificationService; +import org.highmed.service.notification.dto.*; +import org.highmed.service.policy.*; import org.modelmapper.ModelMapper; import org.springframework.data.domain.*; import org.springframework.http.HttpHeaders; @@ -45,7 +46,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody; -import jakarta.validation.constraints.NotNull; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -60,7 +60,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; import static java.util.Objects.nonNull; @Service diff --git a/src/main/java/de/vitagroup/num/service/SetupHealthiness.java b/src/main/java/org/highmed/service/SetupHealthiness.java similarity index 96% rename from src/main/java/de/vitagroup/num/service/SetupHealthiness.java rename to src/main/java/org/highmed/service/SetupHealthiness.java index d26d52036..1c170335f 100644 --- a/src/main/java/de/vitagroup/num/service/SetupHealthiness.java +++ b/src/main/java/org/highmed/service/SetupHealthiness.java @@ -1,12 +1,12 @@ -package de.vitagroup.num.service; +package org.highmed.service; -import de.vitagroup.num.domain.model.SetupType; -import de.vitagroup.num.properties.EhrBaseProperties; -import de.vitagroup.num.service.html.HtmlContent; +import org.highmed.domain.model.SetupType; +import org.highmed.properties.EhrBaseProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.util.Strings; +import org.highmed.service.html.HtmlContent; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -20,7 +20,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; @Slf4j @Service diff --git a/src/main/java/de/vitagroup/num/service/TemplateService.java b/src/main/java/org/highmed/service/TemplateService.java similarity index 88% rename from src/main/java/de/vitagroup/num/service/TemplateService.java rename to src/main/java/org/highmed/service/TemplateService.java index 8940ec43d..4be3029cd 100644 --- a/src/main/java/de/vitagroup/num/service/TemplateService.java +++ b/src/main/java/org/highmed/service/TemplateService.java @@ -1,11 +1,7 @@ -package de.vitagroup.num.service; - -import de.vitagroup.num.domain.dto.TemplateMetadataDto; -import de.vitagroup.num.mapper.TemplateMapper; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.SystemException; -import de.vitagroup.num.service.util.AqlQueryConstants; +package org.highmed.service; + +import org.highmed.domain.dto.TemplateMetadataDto; +import org.highmed.mapper.TemplateMapper; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.ehrbase.aqleditor.dto.containment.ContainmentDto; @@ -20,14 +16,18 @@ import org.ehrbase.openehr.sdk.aql.dto.select.SelectClause; import org.ehrbase.openehr.sdk.aql.dto.select.SelectExpression; import org.ehrbase.openehr.sdk.response.dto.ehrscape.TemplateMetaDataDto; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.SystemException; +import org.highmed.service.util.AqlQueryConstants; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_CREATE_QUERY_FOR_TEMPLATE_WITH_ID; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_FIND_TEMPLATE; +import static org.highmed.domain.templates.ExceptionsTemplate.CANNOT_CREATE_QUERY_FOR_TEMPLATE_WITH_ID; +import static org.highmed.domain.templates.ExceptionsTemplate.CANNOT_FIND_TEMPLATE; @Service @AllArgsConstructor diff --git a/src/main/java/de/vitagroup/num/service/UserDetailsService.java b/src/main/java/org/highmed/service/UserDetailsService.java similarity index 91% rename from src/main/java/de/vitagroup/num/service/UserDetailsService.java rename to src/main/java/org/highmed/service/UserDetailsService.java index 85e89d3be..29c2aa3da 100644 --- a/src/main/java/de/vitagroup/num/service/UserDetailsService.java +++ b/src/main/java/org/highmed/service/UserDetailsService.java @@ -1,24 +1,24 @@ -package de.vitagroup.num.service; - -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.repository.OrganizationRepository; -import de.vitagroup.num.domain.repository.UserDetailsRepository; -import de.vitagroup.num.domain.specification.UserDetailsSpecification; -import de.vitagroup.num.service.exception.ForbiddenException; -import de.vitagroup.num.service.exception.ResourceNotFound; -import de.vitagroup.num.service.exception.SystemException; -import de.vitagroup.num.service.notification.NotificationService; -import de.vitagroup.num.service.notification.dto.NewUserNotification; -import de.vitagroup.num.service.notification.dto.NewUserWithoutOrganizationNotification; -import de.vitagroup.num.service.notification.dto.Notification; -import de.vitagroup.num.service.notification.dto.account.AccountApprovalNotification; -import de.vitagroup.num.service.notification.dto.account.AccountStatusChangedNotification; -import de.vitagroup.num.service.notification.dto.account.OrganizationUpdateNotification; +package org.highmed.service; + +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.Roles; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.OrganizationRepository; +import org.highmed.domain.repository.UserDetailsRepository; +import org.highmed.domain.specification.UserDetailsSpecification; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.highmed.service.exception.ForbiddenException; +import org.highmed.service.exception.ResourceNotFound; +import org.highmed.service.exception.SystemException; +import org.highmed.service.notification.NotificationService; +import org.highmed.service.notification.dto.NewUserNotification; +import org.highmed.service.notification.dto.NewUserWithoutOrganizationNotification; +import org.highmed.service.notification.dto.Notification; +import org.highmed.service.notification.dto.account.AccountApprovalNotification; +import org.highmed.service.notification.dto.account.AccountStatusChangedNotification; +import org.highmed.service.notification.dto.account.OrganizationUpdateNotification; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Page; @@ -30,7 +30,7 @@ import java.time.ZoneOffset; import java.util.*; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; import static java.util.Objects.nonNull; @Slf4j diff --git a/src/main/java/de/vitagroup/num/service/UserService.java b/src/main/java/org/highmed/service/UserService.java similarity index 95% rename from src/main/java/de/vitagroup/num/service/UserService.java rename to src/main/java/org/highmed/service/UserService.java index a65e7e7cd..5c193150a 100644 --- a/src/main/java/de/vitagroup/num/service/UserService.java +++ b/src/main/java/org/highmed/service/UserService.java @@ -1,34 +1,35 @@ -package de.vitagroup.num.service; - -import de.vitagroup.num.domain.model.EntityGroup; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.model.Translation; -import de.vitagroup.num.domain.model.admin.Role; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.Language; -import de.vitagroup.num.domain.dto.SearchCriteria; -import de.vitagroup.num.domain.dto.SearchFilter; -import de.vitagroup.num.domain.dto.UserNameDto; -import de.vitagroup.num.domain.repository.TranslationRepository; -import de.vitagroup.num.domain.repository.UserDetailsRepository; -import de.vitagroup.num.domain.specification.UserDetailsSpecification; -import de.vitagroup.num.mapper.OrganizationMapper; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.ForbiddenException; -import de.vitagroup.num.service.exception.ResourceNotFound; -import de.vitagroup.num.service.exception.SystemException; -import de.vitagroup.num.service.notification.NotificationService; -import de.vitagroup.num.service.notification.dto.Notification; -import de.vitagroup.num.service.notification.dto.account.RolesUpdateNotification; -import de.vitagroup.num.service.notification.dto.account.UserNameUpdateNotification; -import de.vitagroup.num.web.feign.KeycloakFeign; +package org.highmed.service; + +import org.highmed.domain.dto.Language; +import org.highmed.domain.dto.SearchCriteria; +import org.highmed.domain.dto.SearchFilter; +import org.highmed.domain.dto.UserNameDto; +import org.highmed.domain.model.EntityGroup; +import org.highmed.domain.model.Roles; +import org.highmed.domain.model.Translation; +import org.highmed.domain.model.admin.Role; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.TranslationRepository; +import org.highmed.domain.repository.UserDetailsRepository; +import org.highmed.domain.specification.UserDetailsSpecification; +import org.highmed.mapper.OrganizationMapper; +import org.highmed.web.feign.KeycloakFeign; import feign.FeignException; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.ForbiddenException; +import org.highmed.service.exception.ResourceNotFound; +import org.highmed.service.exception.SystemException; +import org.highmed.service.notification.NotificationService; +import org.highmed.service.notification.dto.Notification; +import org.highmed.service.notification.dto.account.RolesUpdateNotification; +import org.highmed.service.notification.dto.account.UserNameUpdateNotification; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; @@ -37,11 +38,9 @@ import org.springframework.data.domain.*; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; - -import javax.annotation.Nullable; -import jakarta.validation.constraints.NotNull; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Nullable; import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.ZoneId; @@ -50,7 +49,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.stream.Collectors; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; diff --git a/src/main/java/de/vitagroup/num/service/atna/AtnaProperties.java b/src/main/java/org/highmed/service/atna/AtnaProperties.java similarity index 86% rename from src/main/java/de/vitagroup/num/service/atna/AtnaProperties.java rename to src/main/java/org/highmed/service/atna/AtnaProperties.java index e0b570c1f..c8040c0a4 100644 --- a/src/main/java/de/vitagroup/num/service/atna/AtnaProperties.java +++ b/src/main/java/org/highmed/service/atna/AtnaProperties.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.atna; +package org.highmed.service.atna; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/de/vitagroup/num/service/atna/AtnaService.java b/src/main/java/org/highmed/service/atna/AtnaService.java similarity index 97% rename from src/main/java/de/vitagroup/num/service/atna/AtnaService.java rename to src/main/java/org/highmed/service/atna/AtnaService.java index 49cafe30b..2c8c01e36 100644 --- a/src/main/java/de/vitagroup/num/service/atna/AtnaService.java +++ b/src/main/java/org/highmed/service/atna/AtnaService.java @@ -1,11 +1,8 @@ -package de.vitagroup.num.service.atna; +package org.highmed.service.atna; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.domain.model.Project; -import java.util.List; -import javax.annotation.Nullable; -import javax.annotation.PostConstruct; +import org.highmed.domain.model.Project; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.openehealth.ipf.commons.audit.AuditException; @@ -19,6 +16,10 @@ import org.openehealth.ipf.commons.audit.types.EventType; import org.springframework.stereotype.Service; +import javax.annotation.Nullable; +import javax.annotation.PostConstruct; +import java.util.List; + @Service @Slf4j public class AtnaService { diff --git a/src/main/java/de/vitagroup/num/service/ehrbase/CompositionFlattener.java b/src/main/java/org/highmed/service/ehrbase/CompositionFlattener.java similarity index 94% rename from src/main/java/de/vitagroup/num/service/ehrbase/CompositionFlattener.java rename to src/main/java/org/highmed/service/ehrbase/CompositionFlattener.java index d873d7524..8a69fe0be 100644 --- a/src/main/java/de/vitagroup/num/service/ehrbase/CompositionFlattener.java +++ b/src/main/java/org/highmed/service/ehrbase/CompositionFlattener.java @@ -1,9 +1,8 @@ -package de.vitagroup.num.service.ehrbase; +package org.highmed.service.ehrbase; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.nedap.archie.rm.composition.Composition; -import de.vitagroup.num.service.exception.SystemException; import lombok.RequiredArgsConstructor; import org.ehrbase.openehr.sdk.client.templateprovider.ClientTemplateProvider; import org.ehrbase.openehr.sdk.serialisation.flatencoding.FlatFormat; @@ -12,6 +11,7 @@ import org.ehrbase.openehr.sdk.util.exception.SdkException; import org.ehrbase.openehr.sdk.webtemplate.model.WebTemplate; import org.ehrbase.openehr.sdk.webtemplate.templateprovider.CachedTemplateProvider; +import org.highmed.service.exception.SystemException; import org.openehr.schemas.v1.OPERATIONALTEMPLATE; import org.springframework.stereotype.Component; @@ -27,8 +27,8 @@ import java.util.Map; import java.util.Optional; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_PARSE_RESULTS; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_PARSE_RESULTS_COMPOSITION_MISSING_TEMPLATE_ID; +import static org.highmed.domain.templates.ExceptionsTemplate.CANNOT_PARSE_RESULTS; +import static org.highmed.domain.templates.ExceptionsTemplate.CANNOT_PARSE_RESULTS_COMPOSITION_MISSING_TEMPLATE_ID; @Component @RequiredArgsConstructor diff --git a/src/main/java/de/vitagroup/num/service/ehrbase/CompositionResponseDataBuilder.java b/src/main/java/org/highmed/service/ehrbase/CompositionResponseDataBuilder.java similarity index 94% rename from src/main/java/de/vitagroup/num/service/ehrbase/CompositionResponseDataBuilder.java rename to src/main/java/org/highmed/service/ehrbase/CompositionResponseDataBuilder.java index c027e64ac..656557479 100644 --- a/src/main/java/de/vitagroup/num/service/ehrbase/CompositionResponseDataBuilder.java +++ b/src/main/java/org/highmed/service/ehrbase/CompositionResponseDataBuilder.java @@ -1,20 +1,16 @@ -package de.vitagroup.num.service.ehrbase; +package org.highmed.service.ehrbase; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.nedap.archie.rm.composition.Composition; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.ehrbase.openehr.sdk.response.dto.QueryResponseData; import org.ehrbase.openehr.sdk.serialisation.jsonencoding.CanonicalJson; import org.springframework.stereotype.Component; +import java.util.*; + @Component @AllArgsConstructor @Slf4j diff --git a/src/main/java/de/vitagroup/num/service/ehrbase/EhrBaseService.java b/src/main/java/org/highmed/service/ehrbase/EhrBaseService.java similarity index 97% rename from src/main/java/de/vitagroup/num/service/ehrbase/EhrBaseService.java rename to src/main/java/org/highmed/service/ehrbase/EhrBaseService.java index 3418e57b2..d259c037d 100644 --- a/src/main/java/de/vitagroup/num/service/ehrbase/EhrBaseService.java +++ b/src/main/java/org/highmed/service/ehrbase/EhrBaseService.java @@ -1,10 +1,7 @@ -package de.vitagroup.num.service.ehrbase; +package org.highmed.service.ehrbase; import com.nedap.archie.rm.support.identification.UUID; -import de.vitagroup.num.domain.model.Aql; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.SystemException; -import de.vitagroup.num.service.util.AqlQueryConstants; +import org.highmed.domain.model.Aql; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.ehrbase.openehr.sdk.aql.dto.AqlQuery; @@ -24,6 +21,9 @@ import org.ehrbase.openehr.sdk.response.dto.ehrscape.TemplateMetaDataDto; import org.ehrbase.openehr.sdk.util.exception.ClientException; import org.ehrbase.openehr.sdk.util.exception.WrongStatusCodeException; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.SystemException; +import org.highmed.service.util.AqlQueryConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -31,7 +31,7 @@ import java.util.*; import java.util.stream.Collectors; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; @Slf4j @Service diff --git a/src/main/java/de/vitagroup/num/service/ehrbase/ParameterService.java b/src/main/java/org/highmed/service/ehrbase/ParameterService.java similarity index 98% rename from src/main/java/de/vitagroup/num/service/ehrbase/ParameterService.java rename to src/main/java/org/highmed/service/ehrbase/ParameterService.java index b2803fa3f..7b0360e6d 100644 --- a/src/main/java/de/vitagroup/num/service/ehrbase/ParameterService.java +++ b/src/main/java/org/highmed/service/ehrbase/ParameterService.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.ehrbase; +package org.highmed.service.ehrbase; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.Version; @@ -16,9 +16,7 @@ import com.nedap.archie.rm.datavalues.quantity.datetime.DvDuration; import com.nedap.archie.rm.datavalues.quantity.datetime.DvTime; import com.nedap.archie.rm.support.identification.ObjectVersionId; -import de.vitagroup.num.domain.dto.ParameterOptionsDto; -import de.vitagroup.num.service.UserDetailsService; -import de.vitagroup.num.service.util.AqlQueryConstants; +import org.highmed.domain.dto.ParameterOptionsDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -33,6 +31,8 @@ import org.ehrbase.openehr.sdk.client.openehrclient.defaultrestclient.TemporalAccessorDeSerializer; import org.ehrbase.openehr.sdk.client.openehrclient.defaultrestclient.VersionUidDeSerializer; import org.ehrbase.openehr.sdk.serialisation.jsonencoding.ArchieObjectMapperProvider; +import org.highmed.service.UserDetailsService; +import org.highmed.service.util.AqlQueryConstants; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CachePut; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/de/vitagroup/num/service/ehrbase/Pseudonymity.java b/src/main/java/org/highmed/service/ehrbase/Pseudonymity.java similarity index 97% rename from src/main/java/de/vitagroup/num/service/ehrbase/Pseudonymity.java rename to src/main/java/org/highmed/service/ehrbase/Pseudonymity.java index e26329a79..9068c048a 100644 --- a/src/main/java/de/vitagroup/num/service/ehrbase/Pseudonymity.java +++ b/src/main/java/org/highmed/service/ehrbase/Pseudonymity.java @@ -1,10 +1,9 @@ -package de.vitagroup.num.service.ehrbase; +package org.highmed.service.ehrbase; import ca.uhn.fhir.context.FhirContext; -import de.vitagroup.num.properties.FttpProperties; -import de.vitagroup.num.properties.PrivacyProperties; -import de.vitagroup.num.properties.PseudonymsPsnWorkflowProperties; -import de.vitagroup.num.service.exception.ResourceNotFound; +import org.highmed.properties.FttpProperties; +import org.highmed.properties.PrivacyProperties; +import org.highmed.properties.PseudonymsPsnWorkflowProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; @@ -18,6 +17,7 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; +import org.highmed.service.exception.ResourceNotFound; import org.hl7.fhir.r4.model.Identifier; import org.hl7.fhir.r4.model.Parameters; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/de/vitagroup/num/service/ehrbase/ResponseFilter.java b/src/main/java/org/highmed/service/ehrbase/ResponseFilter.java similarity index 95% rename from src/main/java/de/vitagroup/num/service/ehrbase/ResponseFilter.java rename to src/main/java/org/highmed/service/ehrbase/ResponseFilter.java index f8b9496be..ac45f467f 100644 --- a/src/main/java/de/vitagroup/num/service/ehrbase/ResponseFilter.java +++ b/src/main/java/org/highmed/service/ehrbase/ResponseFilter.java @@ -1,18 +1,22 @@ -package de.vitagroup.num.service.ehrbase; +package org.highmed.service.ehrbase; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.util.*; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import javax.annotation.PostConstruct; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.ehrbase.openehr.sdk.response.dto.QueryResponseData; import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Component; +import javax.annotation.PostConstruct; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + @Component @NoArgsConstructor @Slf4j diff --git a/src/main/java/de/vitagroup/num/service/email/EmailProperties.java b/src/main/java/org/highmed/service/email/EmailProperties.java similarity index 87% rename from src/main/java/de/vitagroup/num/service/email/EmailProperties.java rename to src/main/java/org/highmed/service/email/EmailProperties.java index 622758d71..2a1b3e58e 100644 --- a/src/main/java/de/vitagroup/num/service/email/EmailProperties.java +++ b/src/main/java/org/highmed/service/email/EmailProperties.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.email; +package org.highmed.service.email; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/de/vitagroup/num/service/email/EmailService.java b/src/main/java/org/highmed/service/email/EmailService.java similarity index 97% rename from src/main/java/de/vitagroup/num/service/email/EmailService.java rename to src/main/java/org/highmed/service/email/EmailService.java index cc57076f9..3610a1bf1 100644 --- a/src/main/java/de/vitagroup/num/service/email/EmailService.java +++ b/src/main/java/org/highmed/service/email/EmailService.java @@ -1,6 +1,4 @@ -package de.vitagroup.num.service.email; - -import java.nio.charset.StandardCharsets; +package org.highmed.service.email; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; @@ -11,6 +9,8 @@ import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; +import java.nio.charset.StandardCharsets; + @Slf4j @Service @AllArgsConstructor diff --git a/src/main/java/de/vitagroup/num/service/email/MessageSourceWrapper.java b/src/main/java/org/highmed/service/email/MessageSourceWrapper.java similarity index 92% rename from src/main/java/de/vitagroup/num/service/email/MessageSourceWrapper.java rename to src/main/java/org/highmed/service/email/MessageSourceWrapper.java index 28f48381f..45b3d2bcd 100644 --- a/src/main/java/de/vitagroup/num/service/email/MessageSourceWrapper.java +++ b/src/main/java/org/highmed/service/email/MessageSourceWrapper.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.email; +package org.highmed.service.email; import lombok.AllArgsConstructor; import org.springframework.context.MessageSource; diff --git a/src/main/java/de/vitagroup/num/service/email/ZarsProperties.java b/src/main/java/org/highmed/service/email/ZarsProperties.java similarity index 92% rename from src/main/java/de/vitagroup/num/service/email/ZarsProperties.java rename to src/main/java/org/highmed/service/email/ZarsProperties.java index 2dc31716a..465ea95de 100644 --- a/src/main/java/de/vitagroup/num/service/email/ZarsProperties.java +++ b/src/main/java/org/highmed/service/email/ZarsProperties.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.email; +package org.highmed.service.email; import lombok.Data; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/src/main/java/de/vitagroup/num/service/email/ZarsService.java b/src/main/java/org/highmed/service/email/ZarsService.java similarity index 98% rename from src/main/java/de/vitagroup/num/service/email/ZarsService.java rename to src/main/java/org/highmed/service/email/ZarsService.java index c427a619a..40d2d8ca4 100644 --- a/src/main/java/de/vitagroup/num/service/email/ZarsService.java +++ b/src/main/java/org/highmed/service/email/ZarsService.java @@ -1,15 +1,7 @@ -package de.vitagroup.num.service.email; +package org.highmed.service.email; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.domain.dto.ZarsInfoDto; -import java.io.IOException; -import java.io.StringWriter; -import java.nio.file.Files; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.stream.Collectors; -import javax.annotation.PostConstruct; +import org.highmed.domain.dto.ZarsInfoDto; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -22,6 +14,15 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import javax.annotation.PostConstruct; +import java.io.IOException; +import java.io.StringWriter; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.stream.Collectors; + @Service @Slf4j @AllArgsConstructor diff --git a/src/main/java/de/vitagroup/num/service/exception/BadCredentialsException.java b/src/main/java/org/highmed/service/exception/BadCredentialsException.java similarity index 83% rename from src/main/java/de/vitagroup/num/service/exception/BadCredentialsException.java rename to src/main/java/org/highmed/service/exception/BadCredentialsException.java index be326b190..f672031cd 100644 --- a/src/main/java/de/vitagroup/num/service/exception/BadCredentialsException.java +++ b/src/main/java/org/highmed/service/exception/BadCredentialsException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/BadRequestException.java b/src/main/java/org/highmed/service/exception/BadRequestException.java similarity index 93% rename from src/main/java/de/vitagroup/num/service/exception/BadRequestException.java rename to src/main/java/org/highmed/service/exception/BadRequestException.java index 553f8501c..9c4af0920 100644 --- a/src/main/java/de/vitagroup/num/service/exception/BadRequestException.java +++ b/src/main/java/org/highmed/service/exception/BadRequestException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/CustomException.java b/src/main/java/org/highmed/service/exception/CustomException.java similarity index 80% rename from src/main/java/de/vitagroup/num/service/exception/CustomException.java rename to src/main/java/org/highmed/service/exception/CustomException.java index 2f5c09dbc..005c87a9e 100644 --- a/src/main/java/de/vitagroup/num/service/exception/CustomException.java +++ b/src/main/java/org/highmed/service/exception/CustomException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/CustomizedExceptionHandler.java b/src/main/java/org/highmed/service/exception/CustomizedExceptionHandler.java similarity index 98% rename from src/main/java/de/vitagroup/num/service/exception/CustomizedExceptionHandler.java rename to src/main/java/org/highmed/service/exception/CustomizedExceptionHandler.java index 6d9375653..9812c1db9 100644 --- a/src/main/java/de/vitagroup/num/service/exception/CustomizedExceptionHandler.java +++ b/src/main/java/org/highmed/service/exception/CustomizedExceptionHandler.java @@ -1,8 +1,8 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; -import de.vitagroup.num.service.exception.dto.ErrorDetails; import lombok.extern.slf4j.Slf4j; import org.ehrbase.openehr.sdk.util.exception.WrongStatusCodeException; +import org.highmed.service.exception.dto.ErrorDetails; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatusCode; @@ -17,7 +17,7 @@ import java.util.*; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; import static java.util.Objects.nonNull; @Slf4j diff --git a/src/main/java/de/vitagroup/num/service/exception/EntityNotFoundException.java b/src/main/java/org/highmed/service/exception/EntityNotFoundException.java similarity index 83% rename from src/main/java/de/vitagroup/num/service/exception/EntityNotFoundException.java rename to src/main/java/org/highmed/service/exception/EntityNotFoundException.java index 9cea4e1ac..12ef0f0d6 100644 --- a/src/main/java/de/vitagroup/num/service/exception/EntityNotFoundException.java +++ b/src/main/java/org/highmed/service/exception/EntityNotFoundException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/ExceptionDto.java b/src/main/java/org/highmed/service/exception/ExceptionDto.java similarity index 80% rename from src/main/java/de/vitagroup/num/service/exception/ExceptionDto.java rename to src/main/java/org/highmed/service/exception/ExceptionDto.java index 5f0be7a2d..1ed2f0779 100644 --- a/src/main/java/de/vitagroup/num/service/exception/ExceptionDto.java +++ b/src/main/java/org/highmed/service/exception/ExceptionDto.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/ForbiddenException.java b/src/main/java/org/highmed/service/exception/ForbiddenException.java similarity index 93% rename from src/main/java/de/vitagroup/num/service/exception/ForbiddenException.java rename to src/main/java/org/highmed/service/exception/ForbiddenException.java index 9cadb770c..4f0bc1a7a 100644 --- a/src/main/java/de/vitagroup/num/service/exception/ForbiddenException.java +++ b/src/main/java/org/highmed/service/exception/ForbiddenException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/IllegalArgumentException.java b/src/main/java/org/highmed/service/exception/IllegalArgumentException.java similarity index 90% rename from src/main/java/de/vitagroup/num/service/exception/IllegalArgumentException.java rename to src/main/java/org/highmed/service/exception/IllegalArgumentException.java index ee853ebb3..9ffa3c0ee 100644 --- a/src/main/java/de/vitagroup/num/service/exception/IllegalArgumentException.java +++ b/src/main/java/org/highmed/service/exception/IllegalArgumentException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/PrivacyException.java b/src/main/java/org/highmed/service/exception/PrivacyException.java similarity index 89% rename from src/main/java/de/vitagroup/num/service/exception/PrivacyException.java rename to src/main/java/org/highmed/service/exception/PrivacyException.java index 870aa1c82..7d9c45b15 100644 --- a/src/main/java/de/vitagroup/num/service/exception/PrivacyException.java +++ b/src/main/java/org/highmed/service/exception/PrivacyException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/ResourceNotFound.java b/src/main/java/org/highmed/service/exception/ResourceNotFound.java similarity index 92% rename from src/main/java/de/vitagroup/num/service/exception/ResourceNotFound.java rename to src/main/java/org/highmed/service/exception/ResourceNotFound.java index 3de032ae1..4789e5caa 100644 --- a/src/main/java/de/vitagroup/num/service/exception/ResourceNotFound.java +++ b/src/main/java/org/highmed/service/exception/ResourceNotFound.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/SameEntityExistsException.java b/src/main/java/org/highmed/service/exception/SameEntityExistsException.java similarity index 83% rename from src/main/java/de/vitagroup/num/service/exception/SameEntityExistsException.java rename to src/main/java/org/highmed/service/exception/SameEntityExistsException.java index 9407820d6..f6c16babc 100644 --- a/src/main/java/de/vitagroup/num/service/exception/SameEntityExistsException.java +++ b/src/main/java/org/highmed/service/exception/SameEntityExistsException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/SystemException.java b/src/main/java/org/highmed/service/exception/SystemException.java similarity index 92% rename from src/main/java/de/vitagroup/num/service/exception/SystemException.java rename to src/main/java/org/highmed/service/exception/SystemException.java index 7943d82a0..1094518b3 100644 --- a/src/main/java/de/vitagroup/num/service/exception/SystemException.java +++ b/src/main/java/org/highmed/service/exception/SystemException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/TokenIsNotValidException.java b/src/main/java/org/highmed/service/exception/TokenIsNotValidException.java similarity index 83% rename from src/main/java/de/vitagroup/num/service/exception/TokenIsNotValidException.java rename to src/main/java/org/highmed/service/exception/TokenIsNotValidException.java index b56ac65c1..c48db328b 100644 --- a/src/main/java/de/vitagroup/num/service/exception/TokenIsNotValidException.java +++ b/src/main/java/org/highmed/service/exception/TokenIsNotValidException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/UserUnauthorizedException.java b/src/main/java/org/highmed/service/exception/UserUnauthorizedException.java similarity index 88% rename from src/main/java/de/vitagroup/num/service/exception/UserUnauthorizedException.java rename to src/main/java/org/highmed/service/exception/UserUnauthorizedException.java index c4b6a12bc..c3620f2bb 100644 --- a/src/main/java/de/vitagroup/num/service/exception/UserUnauthorizedException.java +++ b/src/main/java/org/highmed/service/exception/UserUnauthorizedException.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; -import de.vitagroup.num.domain.model.admin.UserDetails; +import org.highmed.domain.model.admin.UserDetails; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.log4j.Log4j2; diff --git a/src/main/java/de/vitagroup/num/service/exception/UsernameNotFoundOrNoLongerActiveException.java b/src/main/java/org/highmed/service/exception/UsernameNotFoundOrNoLongerActiveException.java similarity index 84% rename from src/main/java/de/vitagroup/num/service/exception/UsernameNotFoundOrNoLongerActiveException.java rename to src/main/java/org/highmed/service/exception/UsernameNotFoundOrNoLongerActiveException.java index 86faf9805..740381d96 100644 --- a/src/main/java/de/vitagroup/num/service/exception/UsernameNotFoundOrNoLongerActiveException.java +++ b/src/main/java/org/highmed/service/exception/UsernameNotFoundOrNoLongerActiveException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception; +package org.highmed.service.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/dto/ErrorDetails.java b/src/main/java/org/highmed/service/exception/dto/ErrorDetails.java similarity index 92% rename from src/main/java/de/vitagroup/num/service/exception/dto/ErrorDetails.java rename to src/main/java/org/highmed/service/exception/dto/ErrorDetails.java index 74db06789..11a378063 100644 --- a/src/main/java/de/vitagroup/num/service/exception/dto/ErrorDetails.java +++ b/src/main/java/org/highmed/service/exception/dto/ErrorDetails.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception.dto; +package org.highmed.service.exception.dto; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/de/vitagroup/num/service/exception/dto/ExceptionDto.java b/src/main/java/org/highmed/service/exception/dto/ExceptionDto.java similarity index 79% rename from src/main/java/de/vitagroup/num/service/exception/dto/ExceptionDto.java rename to src/main/java/org/highmed/service/exception/dto/ExceptionDto.java index 29c56ab6b..e0c09516d 100644 --- a/src/main/java/de/vitagroup/num/service/exception/dto/ExceptionDto.java +++ b/src/main/java/org/highmed/service/exception/dto/ExceptionDto.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception.dto; +package org.highmed.service.exception.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/implementation/BadCredentialsException.java b/src/main/java/org/highmed/service/exception/implementation/BadCredentialsException.java similarity index 79% rename from src/main/java/de/vitagroup/num/service/exception/implementation/BadCredentialsException.java rename to src/main/java/org/highmed/service/exception/implementation/BadCredentialsException.java index 7a847c2d3..466043a49 100644 --- a/src/main/java/de/vitagroup/num/service/exception/implementation/BadCredentialsException.java +++ b/src/main/java/org/highmed/service/exception/implementation/BadCredentialsException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception.implementation; +package org.highmed.service.exception.implementation; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/implementation/CustomException.java b/src/main/java/org/highmed/service/exception/implementation/CustomException.java similarity index 75% rename from src/main/java/de/vitagroup/num/service/exception/implementation/CustomException.java rename to src/main/java/org/highmed/service/exception/implementation/CustomException.java index 59bb310be..18446ec9e 100644 --- a/src/main/java/de/vitagroup/num/service/exception/implementation/CustomException.java +++ b/src/main/java/org/highmed/service/exception/implementation/CustomException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception.implementation; +package org.highmed.service.exception.implementation; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/implementation/EntityNotFoundException.java b/src/main/java/org/highmed/service/exception/implementation/EntityNotFoundException.java similarity index 78% rename from src/main/java/de/vitagroup/num/service/exception/implementation/EntityNotFoundException.java rename to src/main/java/org/highmed/service/exception/implementation/EntityNotFoundException.java index 826921505..6ab4ea577 100644 --- a/src/main/java/de/vitagroup/num/service/exception/implementation/EntityNotFoundException.java +++ b/src/main/java/org/highmed/service/exception/implementation/EntityNotFoundException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception.implementation; +package org.highmed.service.exception.implementation; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/implementation/SameEntityExistsException.java b/src/main/java/org/highmed/service/exception/implementation/SameEntityExistsException.java similarity index 79% rename from src/main/java/de/vitagroup/num/service/exception/implementation/SameEntityExistsException.java rename to src/main/java/org/highmed/service/exception/implementation/SameEntityExistsException.java index 45f8c4e77..8ac47d368 100644 --- a/src/main/java/de/vitagroup/num/service/exception/implementation/SameEntityExistsException.java +++ b/src/main/java/org/highmed/service/exception/implementation/SameEntityExistsException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception.implementation; +package org.highmed.service.exception.implementation; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/implementation/TokenIsNotValidException.java b/src/main/java/org/highmed/service/exception/implementation/TokenIsNotValidException.java similarity index 78% rename from src/main/java/de/vitagroup/num/service/exception/implementation/TokenIsNotValidException.java rename to src/main/java/org/highmed/service/exception/implementation/TokenIsNotValidException.java index 66ea593cd..13778e368 100644 --- a/src/main/java/de/vitagroup/num/service/exception/implementation/TokenIsNotValidException.java +++ b/src/main/java/org/highmed/service/exception/implementation/TokenIsNotValidException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception.implementation; +package org.highmed.service.exception.implementation; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/exception/implementation/UsernameNotFoundOrNoLongerActiveException.java b/src/main/java/org/highmed/service/exception/implementation/UsernameNotFoundOrNoLongerActiveException.java similarity index 80% rename from src/main/java/de/vitagroup/num/service/exception/implementation/UsernameNotFoundOrNoLongerActiveException.java rename to src/main/java/org/highmed/service/exception/implementation/UsernameNotFoundOrNoLongerActiveException.java index e01ada6b8..80cc30576 100644 --- a/src/main/java/de/vitagroup/num/service/exception/implementation/UsernameNotFoundOrNoLongerActiveException.java +++ b/src/main/java/org/highmed/service/exception/implementation/UsernameNotFoundOrNoLongerActiveException.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.exception.implementation; +package org.highmed.service.exception.implementation; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/de/vitagroup/num/service/executors/AqlExecutor.java b/src/main/java/org/highmed/service/executors/AqlExecutor.java similarity index 89% rename from src/main/java/de/vitagroup/num/service/executors/AqlExecutor.java rename to src/main/java/org/highmed/service/executors/AqlExecutor.java index 86826c1c3..8d4c5a052 100644 --- a/src/main/java/de/vitagroup/num/service/executors/AqlExecutor.java +++ b/src/main/java/org/highmed/service/executors/AqlExecutor.java @@ -1,10 +1,7 @@ -package de.vitagroup.num.service.executors; +package org.highmed.service.executors; -import de.vitagroup.num.domain.model.CohortAql; -import de.vitagroup.num.properties.ConsentProperties; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.policy.EuropeanConsentPolicy; -import de.vitagroup.num.service.policy.ProjectPolicyService; +import org.highmed.domain.model.CohortAql; +import org.highmed.properties.ConsentProperties; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; @@ -16,6 +13,9 @@ import org.ehrbase.openehr.sdk.aql.render.AqlRenderer; import org.ehrbase.openehr.sdk.aql.util.AqlUtil; import org.ehrbase.openehr.sdk.generator.commons.aql.parameter.ParameterValue; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.policy.EuropeanConsentPolicy; +import org.highmed.service.policy.ProjectPolicyService; import org.springframework.stereotype.Service; import java.util.*; diff --git a/src/main/java/de/vitagroup/num/service/executors/CohortExecutor.java b/src/main/java/org/highmed/service/executors/CohortExecutor.java similarity index 77% rename from src/main/java/de/vitagroup/num/service/executors/CohortExecutor.java rename to src/main/java/org/highmed/service/executors/CohortExecutor.java index 1362ae4eb..aa7dc1e3e 100644 --- a/src/main/java/de/vitagroup/num/service/executors/CohortExecutor.java +++ b/src/main/java/org/highmed/service/executors/CohortExecutor.java @@ -1,19 +1,20 @@ -package de.vitagroup.num.service.executors; +package org.highmed.service.executors; -import de.vitagroup.num.domain.model.Cohort; -import de.vitagroup.num.domain.model.CohortGroup; -import de.vitagroup.num.domain.model.Type; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.exception.IllegalArgumentException; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; +import org.highmed.domain.model.Cohort; +import org.highmed.domain.model.CohortGroup; +import org.highmed.domain.model.Type; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.SetUtils; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.exception.IllegalArgumentException; import org.springframework.stereotype.Service; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_EXECUTE_AN_EMPTY_COHORT; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import static org.highmed.domain.templates.ExceptionsTemplate.CANNOT_EXECUTE_AN_EMPTY_COHORT; @Slf4j @Service diff --git a/src/main/java/de/vitagroup/num/service/executors/CohortQueryLister.java b/src/main/java/org/highmed/service/executors/CohortQueryLister.java similarity index 84% rename from src/main/java/de/vitagroup/num/service/executors/CohortQueryLister.java rename to src/main/java/org/highmed/service/executors/CohortQueryLister.java index d21cc10fc..1fa388627 100644 --- a/src/main/java/de/vitagroup/num/service/executors/CohortQueryLister.java +++ b/src/main/java/org/highmed/service/executors/CohortQueryLister.java @@ -1,18 +1,19 @@ -package de.vitagroup.num.service.executors; +package org.highmed.service.executors; -import de.vitagroup.num.domain.model.Cohort; -import de.vitagroup.num.domain.model.CohortAql; -import de.vitagroup.num.domain.model.CohortGroup; -import de.vitagroup.num.domain.model.Type; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import org.highmed.domain.model.Cohort; +import org.highmed.domain.model.CohortAql; +import org.highmed.domain.model.CohortGroup; +import org.highmed.domain.model.Type; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + @Service @Slf4j @AllArgsConstructor diff --git a/src/main/java/de/vitagroup/num/service/executors/SetOperationsService.java b/src/main/java/org/highmed/service/executors/SetOperationsService.java similarity index 83% rename from src/main/java/de/vitagroup/num/service/executors/SetOperationsService.java rename to src/main/java/org/highmed/service/executors/SetOperationsService.java index 636b495f4..2bff14a4d 100644 --- a/src/main/java/de/vitagroup/num/service/executors/SetOperationsService.java +++ b/src/main/java/org/highmed/service/executors/SetOperationsService.java @@ -1,8 +1,8 @@ -package de.vitagroup.num.service.executors; +package org.highmed.service.executors; -import de.vitagroup.num.domain.model.Operator; -import de.vitagroup.num.service.exception.IllegalArgumentException; +import org.highmed.domain.model.Operator; import org.apache.commons.collections4.CollectionUtils; +import org.highmed.service.exception.IllegalArgumentException; import org.springframework.stereotype.Service; import java.util.HashSet; @@ -10,7 +10,7 @@ import java.util.Objects; import java.util.Set; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.RELATIVE_COMPLEMENT_REQUIRES_TWO_VALID_SETS; +import static org.highmed.domain.templates.ExceptionsTemplate.RELATIVE_COMPLEMENT_REQUIRES_TWO_VALID_SETS; @Service public class SetOperationsService { diff --git a/src/main/java/de/vitagroup/num/service/html/HtmlContent.java b/src/main/java/org/highmed/service/html/HtmlContent.java similarity index 98% rename from src/main/java/de/vitagroup/num/service/html/HtmlContent.java rename to src/main/java/org/highmed/service/html/HtmlContent.java index 86f34322f..665d1e5f8 100644 --- a/src/main/java/de/vitagroup/num/service/html/HtmlContent.java +++ b/src/main/java/org/highmed/service/html/HtmlContent.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.html; +package org.highmed.service.html; import lombok.extern.log4j.Log4j2; import org.apache.commons.io.IOUtils; diff --git a/src/main/java/de/vitagroup/num/service/logger/AuditLog.java b/src/main/java/org/highmed/service/logger/AuditLog.java similarity index 87% rename from src/main/java/de/vitagroup/num/service/logger/AuditLog.java rename to src/main/java/org/highmed/service/logger/AuditLog.java index c9fbdf4bc..a83068bbd 100644 --- a/src/main/java/de/vitagroup/num/service/logger/AuditLog.java +++ b/src/main/java/org/highmed/service/logger/AuditLog.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.logger; +package org.highmed.service.logger; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/de/vitagroup/num/service/logger/NumLogger.java b/src/main/java/org/highmed/service/logger/NumLogger.java similarity index 95% rename from src/main/java/de/vitagroup/num/service/logger/NumLogger.java rename to src/main/java/org/highmed/service/logger/NumLogger.java index 98ae2b0bc..c464ec3a8 100644 --- a/src/main/java/de/vitagroup/num/service/logger/NumLogger.java +++ b/src/main/java/org/highmed/service/logger/NumLogger.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.logger; +package org.highmed.service.logger; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -135,12 +135,12 @@ private RequestMethod getRequestMethod(JoinPoint point) { for (Annotation annotation : method.getDeclaredAnnotations()) { if (annotation .annotationType() - .isAnnotationPresent(org.springframework.web.bind.annotation.RequestMapping.class)) { + .isAnnotationPresent(RequestMapping.class)) { RequestMapping[] mappings = annotation .annotationType() - .getAnnotationsByType(org.springframework.web.bind.annotation.RequestMapping.class); + .getAnnotationsByType(RequestMapping.class); if (mappings.length > 0) { RequestMethod[] methods = mappings[0].method(); diff --git a/src/main/java/de/vitagroup/num/service/notification/NotificationService.java b/src/main/java/org/highmed/service/notification/NotificationService.java similarity index 80% rename from src/main/java/de/vitagroup/num/service/notification/NotificationService.java rename to src/main/java/org/highmed/service/notification/NotificationService.java index a65c49e4f..111d4aa6a 100644 --- a/src/main/java/de/vitagroup/num/service/notification/NotificationService.java +++ b/src/main/java/org/highmed/service/notification/NotificationService.java @@ -1,16 +1,17 @@ -package de.vitagroup.num.service.notification; +package org.highmed.service.notification; -import de.vitagroup.num.properties.NumProperties; -import de.vitagroup.num.service.email.EmailService; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import de.vitagroup.num.service.notification.dto.Notification; -import java.util.List; +import org.highmed.properties.NumProperties; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.highmed.service.email.EmailService; +import org.highmed.service.email.MessageSourceWrapper; +import org.highmed.service.notification.dto.Notification; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import java.util.List; + @Slf4j @Service @AllArgsConstructor diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/NewUserNotification.java b/src/main/java/org/highmed/service/notification/dto/NewUserNotification.java similarity index 95% rename from src/main/java/de/vitagroup/num/service/notification/dto/NewUserNotification.java rename to src/main/java/org/highmed/service/notification/dto/NewUserNotification.java index 092f2ac8c..c256d12a7 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/NewUserNotification.java +++ b/src/main/java/org/highmed/service/notification/dto/NewUserNotification.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.service.notification.dto; +package org.highmed.service.notification.dto; -import de.vitagroup.num.service.email.MessageSourceWrapper; import lombok.Builder; +import org.highmed.service.email.MessageSourceWrapper; import java.time.Year; import java.util.Iterator; diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/NewUserWithoutOrganizationNotification.java b/src/main/java/org/highmed/service/notification/dto/NewUserWithoutOrganizationNotification.java similarity index 92% rename from src/main/java/de/vitagroup/num/service/notification/dto/NewUserWithoutOrganizationNotification.java rename to src/main/java/org/highmed/service/notification/dto/NewUserWithoutOrganizationNotification.java index 38ab5b227..b657163dd 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/NewUserWithoutOrganizationNotification.java +++ b/src/main/java/org/highmed/service/notification/dto/NewUserWithoutOrganizationNotification.java @@ -1,8 +1,9 @@ -package de.vitagroup.num.service.notification.dto; +package org.highmed.service.notification.dto; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import java.time.Year; import lombok.Builder; +import org.highmed.service.email.MessageSourceWrapper; + +import java.time.Year; public class NewUserWithoutOrganizationNotification extends Notification { diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/Notification.java b/src/main/java/org/highmed/service/notification/dto/Notification.java similarity index 95% rename from src/main/java/de/vitagroup/num/service/notification/dto/Notification.java rename to src/main/java/org/highmed/service/notification/dto/Notification.java index cbccb9250..b88f3fcad 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/Notification.java +++ b/src/main/java/org/highmed/service/notification/dto/Notification.java @@ -1,10 +1,11 @@ -package de.vitagroup.num.service.notification.dto; +package org.highmed.service.notification.dto; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import java.net.MalformedURLException; -import java.net.URL; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.highmed.service.email.MessageSourceWrapper; + +import java.net.MalformedURLException; +import java.net.URL; @Slf4j public abstract class Notification { diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/ProjectApprovalRequestNotification.java b/src/main/java/org/highmed/service/notification/dto/ProjectApprovalRequestNotification.java similarity index 94% rename from src/main/java/de/vitagroup/num/service/notification/dto/ProjectApprovalRequestNotification.java rename to src/main/java/org/highmed/service/notification/dto/ProjectApprovalRequestNotification.java index 90edce5a9..69d294421 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/ProjectApprovalRequestNotification.java +++ b/src/main/java/org/highmed/service/notification/dto/ProjectApprovalRequestNotification.java @@ -1,8 +1,9 @@ -package de.vitagroup.num.service.notification.dto; +package org.highmed.service.notification.dto; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import java.time.Year; import lombok.Builder; +import org.highmed.service.email.MessageSourceWrapper; + +import java.time.Year; public class ProjectApprovalRequestNotification extends Notification { diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/ProjectCloseNotification.java b/src/main/java/org/highmed/service/notification/dto/ProjectCloseNotification.java similarity index 93% rename from src/main/java/de/vitagroup/num/service/notification/dto/ProjectCloseNotification.java rename to src/main/java/org/highmed/service/notification/dto/ProjectCloseNotification.java index bcbdc45b4..6fda6d121 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/ProjectCloseNotification.java +++ b/src/main/java/org/highmed/service/notification/dto/ProjectCloseNotification.java @@ -1,8 +1,9 @@ -package de.vitagroup.num.service.notification.dto; +package org.highmed.service.notification.dto; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import java.time.Year; import lombok.Builder; +import org.highmed.service.email.MessageSourceWrapper; + +import java.time.Year; public class ProjectCloseNotification extends Notification { diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/ProjectStartNotification.java b/src/main/java/org/highmed/service/notification/dto/ProjectStartNotification.java similarity index 93% rename from src/main/java/de/vitagroup/num/service/notification/dto/ProjectStartNotification.java rename to src/main/java/org/highmed/service/notification/dto/ProjectStartNotification.java index ede9ca771..cf61757a3 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/ProjectStartNotification.java +++ b/src/main/java/org/highmed/service/notification/dto/ProjectStartNotification.java @@ -1,8 +1,9 @@ -package de.vitagroup.num.service.notification.dto; +package org.highmed.service.notification.dto; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import java.time.Year; import lombok.Builder; +import org.highmed.service.email.MessageSourceWrapper; + +import java.time.Year; public class ProjectStartNotification extends Notification { diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/ProjectStatusChangeNotification.java b/src/main/java/org/highmed/service/notification/dto/ProjectStatusChangeNotification.java similarity index 92% rename from src/main/java/de/vitagroup/num/service/notification/dto/ProjectStatusChangeNotification.java rename to src/main/java/org/highmed/service/notification/dto/ProjectStatusChangeNotification.java index e0c85c3f0..aed8b55a0 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/ProjectStatusChangeNotification.java +++ b/src/main/java/org/highmed/service/notification/dto/ProjectStatusChangeNotification.java @@ -1,9 +1,10 @@ -package de.vitagroup.num.service.notification.dto; +package org.highmed.service.notification.dto; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import java.time.Year; +import org.highmed.domain.model.ProjectStatus; import lombok.Builder; +import org.highmed.service.email.MessageSourceWrapper; + +import java.time.Year; public class ProjectStatusChangeNotification extends Notification { diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/ProjectStatusChangeRequestNotification.java b/src/main/java/org/highmed/service/notification/dto/ProjectStatusChangeRequestNotification.java similarity index 90% rename from src/main/java/de/vitagroup/num/service/notification/dto/ProjectStatusChangeRequestNotification.java rename to src/main/java/org/highmed/service/notification/dto/ProjectStatusChangeRequestNotification.java index e04690fcb..099e391e1 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/ProjectStatusChangeRequestNotification.java +++ b/src/main/java/org/highmed/service/notification/dto/ProjectStatusChangeRequestNotification.java @@ -1,8 +1,8 @@ -package de.vitagroup.num.service.notification.dto; +package org.highmed.service.notification.dto; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.service.email.MessageSourceWrapper; +import org.highmed.domain.model.ProjectStatus; import lombok.Builder; +import org.highmed.service.email.MessageSourceWrapper; import java.time.Year; diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/account/AccountApprovalNotification.java b/src/main/java/org/highmed/service/notification/dto/account/AccountApprovalNotification.java similarity index 87% rename from src/main/java/de/vitagroup/num/service/notification/dto/account/AccountApprovalNotification.java rename to src/main/java/org/highmed/service/notification/dto/account/AccountApprovalNotification.java index 3c042b008..2780e242c 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/account/AccountApprovalNotification.java +++ b/src/main/java/org/highmed/service/notification/dto/account/AccountApprovalNotification.java @@ -1,9 +1,10 @@ -package de.vitagroup.num.service.notification.dto.account; +package org.highmed.service.notification.dto.account; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import de.vitagroup.num.service.notification.dto.Notification; -import java.time.Year; import lombok.Builder; +import org.highmed.service.email.MessageSourceWrapper; +import org.highmed.service.notification.dto.Notification; + +import java.time.Year; public class AccountApprovalNotification extends Notification { diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/account/AccountStatusChangedNotification.java b/src/main/java/org/highmed/service/notification/dto/account/AccountStatusChangedNotification.java similarity index 91% rename from src/main/java/de/vitagroup/num/service/notification/dto/account/AccountStatusChangedNotification.java rename to src/main/java/org/highmed/service/notification/dto/account/AccountStatusChangedNotification.java index bc70227bc..9d07960cc 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/account/AccountStatusChangedNotification.java +++ b/src/main/java/org/highmed/service/notification/dto/account/AccountStatusChangedNotification.java @@ -1,8 +1,8 @@ -package de.vitagroup.num.service.notification.dto.account; +package org.highmed.service.notification.dto.account; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import de.vitagroup.num.service.notification.dto.Notification; import lombok.Builder; +import org.highmed.service.email.MessageSourceWrapper; +import org.highmed.service.notification.dto.Notification; import java.time.Year; diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/account/OrganizationUpdateNotification.java b/src/main/java/org/highmed/service/notification/dto/account/OrganizationUpdateNotification.java similarity index 89% rename from src/main/java/de/vitagroup/num/service/notification/dto/account/OrganizationUpdateNotification.java rename to src/main/java/org/highmed/service/notification/dto/account/OrganizationUpdateNotification.java index 23a8737d9..b5ac3cd68 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/account/OrganizationUpdateNotification.java +++ b/src/main/java/org/highmed/service/notification/dto/account/OrganizationUpdateNotification.java @@ -1,9 +1,10 @@ -package de.vitagroup.num.service.notification.dto.account; +package org.highmed.service.notification.dto.account; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import de.vitagroup.num.service.notification.dto.Notification; -import java.time.Year; import lombok.Builder; +import org.highmed.service.email.MessageSourceWrapper; +import org.highmed.service.notification.dto.Notification; + +import java.time.Year; public class OrganizationUpdateNotification extends Notification { diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/account/RolesUpdateNotification.java b/src/main/java/org/highmed/service/notification/dto/account/RolesUpdateNotification.java similarity index 94% rename from src/main/java/de/vitagroup/num/service/notification/dto/account/RolesUpdateNotification.java rename to src/main/java/org/highmed/service/notification/dto/account/RolesUpdateNotification.java index f42436424..d0e032ba0 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/account/RolesUpdateNotification.java +++ b/src/main/java/org/highmed/service/notification/dto/account/RolesUpdateNotification.java @@ -1,11 +1,11 @@ -package de.vitagroup.num.service.notification.dto.account; +package org.highmed.service.notification.dto.account; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import de.vitagroup.num.service.notification.dto.Notification; +import org.highmed.domain.model.Roles; import lombok.Builder; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.highmed.service.email.MessageSourceWrapper; +import org.highmed.service.notification.dto.Notification; import java.time.Year; import java.util.HashMap; diff --git a/src/main/java/de/vitagroup/num/service/notification/dto/account/UserNameUpdateNotification.java b/src/main/java/org/highmed/service/notification/dto/account/UserNameUpdateNotification.java similarity index 87% rename from src/main/java/de/vitagroup/num/service/notification/dto/account/UserNameUpdateNotification.java rename to src/main/java/org/highmed/service/notification/dto/account/UserNameUpdateNotification.java index 5c0622752..54072a4d8 100644 --- a/src/main/java/de/vitagroup/num/service/notification/dto/account/UserNameUpdateNotification.java +++ b/src/main/java/org/highmed/service/notification/dto/account/UserNameUpdateNotification.java @@ -1,9 +1,10 @@ -package de.vitagroup.num.service.notification.dto.account; +package org.highmed.service.notification.dto.account; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import de.vitagroup.num.service.notification.dto.Notification; -import java.time.Year; import lombok.Builder; +import org.highmed.service.email.MessageSourceWrapper; +import org.highmed.service.notification.dto.Notification; + +import java.time.Year; public class UserNameUpdateNotification extends Notification { diff --git a/src/main/java/de/vitagroup/num/service/policy/EhrPolicy.java b/src/main/java/org/highmed/service/policy/EhrPolicy.java similarity index 84% rename from src/main/java/de/vitagroup/num/service/policy/EhrPolicy.java rename to src/main/java/org/highmed/service/policy/EhrPolicy.java index a661e51c4..83528a8c4 100644 --- a/src/main/java/de/vitagroup/num/service/policy/EhrPolicy.java +++ b/src/main/java/org/highmed/service/policy/EhrPolicy.java @@ -1,7 +1,5 @@ -package de.vitagroup.num.service.policy; +package org.highmed.service.policy; -import de.vitagroup.num.service.exception.SystemException; -import de.vitagroup.num.service.util.AqlQueryConstants; import lombok.Builder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -10,13 +8,15 @@ import org.ehrbase.openehr.sdk.aql.dto.operand.IdentifiedPath; import org.ehrbase.openehr.sdk.aql.dto.path.AqlObjectPath; import org.ehrbase.openehr.sdk.aql.dto.select.SelectExpression; +import org.highmed.service.exception.SystemException; +import org.highmed.service.util.AqlQueryConstants; import java.util.ArrayList; import java.util.List; import java.util.Set; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.COHORT_SIZE_CANNOT_BE_0; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.INVALID_AQL; +import static org.highmed.domain.templates.ExceptionsTemplate.COHORT_SIZE_CANNOT_BE_0; +import static org.highmed.domain.templates.ExceptionsTemplate.INVALID_AQL; /** Restricts the aql to a set of ehr ids defined by the project cohort */ @Slf4j diff --git a/src/main/java/de/vitagroup/num/service/policy/EuropeanConsentPolicy.java b/src/main/java/org/highmed/service/policy/EuropeanConsentPolicy.java similarity index 80% rename from src/main/java/de/vitagroup/num/service/policy/EuropeanConsentPolicy.java rename to src/main/java/org/highmed/service/policy/EuropeanConsentPolicy.java index 3d19ee82b..1105418c2 100644 --- a/src/main/java/de/vitagroup/num/service/policy/EuropeanConsentPolicy.java +++ b/src/main/java/org/highmed/service/policy/EuropeanConsentPolicy.java @@ -1,15 +1,15 @@ -package de.vitagroup.num.service.policy; +package org.highmed.service.policy; -import de.vitagroup.num.service.exception.SystemException; import lombok.Builder; import lombok.extern.slf4j.Slf4j; import org.ehrbase.openehr.sdk.aql.dto.AqlQuery; import org.ehrbase.openehr.sdk.aql.dto.operand.Primitive; +import org.highmed.service.exception.SystemException; import java.util.List; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_CHECK_CONSENT_FOR_DATA_USAGE_OUTSIDE_THE_EUROPEAN_UNION_OID_NOT_CONFIGURED; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.INVALID_AQL; +import static org.highmed.domain.templates.ExceptionsTemplate.CANNOT_CHECK_CONSENT_FOR_DATA_USAGE_OUTSIDE_THE_EUROPEAN_UNION_OID_NOT_CONFIGURED; +import static org.highmed.domain.templates.ExceptionsTemplate.INVALID_AQL; /** * Restricts the aql to a particular oid which defines the user consent for project data being used diff --git a/src/main/java/de/vitagroup/num/service/policy/Policy.java b/src/main/java/org/highmed/service/policy/Policy.java similarity index 98% rename from src/main/java/de/vitagroup/num/service/policy/Policy.java rename to src/main/java/org/highmed/service/policy/Policy.java index 5dfca4034..fbe485caa 100644 --- a/src/main/java/de/vitagroup/num/service/policy/Policy.java +++ b/src/main/java/org/highmed/service/policy/Policy.java @@ -1,6 +1,5 @@ -package de.vitagroup.num.service.policy; +package org.highmed.service.policy; -import de.vitagroup.num.service.util.AqlQueryConstants; import org.apache.commons.collections.CollectionUtils; import org.ehrbase.openehr.sdk.aql.dto.AqlQuery; import org.ehrbase.openehr.sdk.aql.dto.condition.LogicalOperatorCondition; @@ -17,6 +16,7 @@ import org.ehrbase.openehr.sdk.aql.dto.path.AqlObjectPath; import org.ehrbase.openehr.sdk.aql.dto.select.SelectExpression; import org.ehrbase.openehr.sdk.aql.render.AqlRenderer; +import org.highmed.service.util.AqlQueryConstants; import org.slf4j.Logger; import java.util.*; diff --git a/src/main/java/de/vitagroup/num/service/policy/ProjectPolicyService.java b/src/main/java/org/highmed/service/policy/ProjectPolicyService.java similarity index 96% rename from src/main/java/de/vitagroup/num/service/policy/ProjectPolicyService.java rename to src/main/java/org/highmed/service/policy/ProjectPolicyService.java index ecb318ed2..74ccf996e 100644 --- a/src/main/java/de/vitagroup/num/service/policy/ProjectPolicyService.java +++ b/src/main/java/org/highmed/service/policy/ProjectPolicyService.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.policy; +package org.highmed.service.policy; import lombok.extern.slf4j.Slf4j; import org.ehrbase.openehr.sdk.aql.dto.AqlQuery; diff --git a/src/main/java/de/vitagroup/num/service/policy/TemplatesPolicy.java b/src/main/java/org/highmed/service/policy/TemplatesPolicy.java similarity index 81% rename from src/main/java/de/vitagroup/num/service/policy/TemplatesPolicy.java rename to src/main/java/org/highmed/service/policy/TemplatesPolicy.java index 6cca17977..7d4c16cfa 100644 --- a/src/main/java/de/vitagroup/num/service/policy/TemplatesPolicy.java +++ b/src/main/java/org/highmed/service/policy/TemplatesPolicy.java @@ -1,17 +1,17 @@ -package de.vitagroup.num.service.policy; +package org.highmed.service.policy; -import de.vitagroup.num.service.exception.SystemException; import lombok.Builder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.ehrbase.openehr.sdk.aql.dto.AqlQuery; import org.ehrbase.openehr.sdk.aql.dto.operand.Primitive; +import org.highmed.service.exception.SystemException; import java.util.List; import java.util.Map; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.INVALID_AQL; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.NO_TEMPLATES_ATTACHED_TO_THE_PROJECT; +import static org.highmed.domain.templates.ExceptionsTemplate.INVALID_AQL; +import static org.highmed.domain.templates.ExceptionsTemplate.NO_TEMPLATES_ATTACHED_TO_THE_PROJECT; /** Restricts the aql to a set of templates defined by the project */ @Slf4j diff --git a/src/main/java/de/vitagroup/num/service/util/AqlQueryConstants.java b/src/main/java/org/highmed/service/util/AqlQueryConstants.java similarity index 90% rename from src/main/java/de/vitagroup/num/service/util/AqlQueryConstants.java rename to src/main/java/org/highmed/service/util/AqlQueryConstants.java index 3b11df563..e2f73fdb5 100644 --- a/src/main/java/de/vitagroup/num/service/util/AqlQueryConstants.java +++ b/src/main/java/org/highmed/service/util/AqlQueryConstants.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.util; +package org.highmed.service.util; public class AqlQueryConstants { diff --git a/src/main/java/de/vitagroup/num/web/config/ApplicationSecurity.java b/src/main/java/org/highmed/web/config/ApplicationSecurity.java similarity index 98% rename from src/main/java/de/vitagroup/num/web/config/ApplicationSecurity.java rename to src/main/java/org/highmed/web/config/ApplicationSecurity.java index 14c441641..36147059e 100644 --- a/src/main/java/de/vitagroup/num/web/config/ApplicationSecurity.java +++ b/src/main/java/org/highmed/web/config/ApplicationSecurity.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.web.config; +package org.highmed.web.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/de/vitagroup/num/web/config/AuthorizationConverter.java b/src/main/java/org/highmed/web/config/AuthorizationConverter.java similarity index 97% rename from src/main/java/de/vitagroup/num/web/config/AuthorizationConverter.java rename to src/main/java/org/highmed/web/config/AuthorizationConverter.java index 90449183b..2d06928bf 100644 --- a/src/main/java/de/vitagroup/num/web/config/AuthorizationConverter.java +++ b/src/main/java/org/highmed/web/config/AuthorizationConverter.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.web.config; +package org.highmed.web.config; import java.util.Collection; import java.util.List; diff --git a/src/main/java/de/vitagroup/num/web/config/CorsConfig.java b/src/main/java/org/highmed/web/config/CorsConfig.java similarity index 93% rename from src/main/java/de/vitagroup/num/web/config/CorsConfig.java rename to src/main/java/org/highmed/web/config/CorsConfig.java index 5eb3a4596..2f656bfa4 100644 --- a/src/main/java/de/vitagroup/num/web/config/CorsConfig.java +++ b/src/main/java/org/highmed/web/config/CorsConfig.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.web.config; +package org.highmed.web.config; -import de.vitagroup.num.properties.CorsProperties; +import org.highmed.properties.CorsProperties; import java.util.Collections; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/de/vitagroup/num/web/config/FeignClientConfig.java b/src/main/java/org/highmed/web/config/FeignClientConfig.java similarity index 73% rename from src/main/java/de/vitagroup/num/web/config/FeignClientConfig.java rename to src/main/java/org/highmed/web/config/FeignClientConfig.java index 3d73a14f5..ecf294bfe 100644 --- a/src/main/java/de/vitagroup/num/web/config/FeignClientConfig.java +++ b/src/main/java/org/highmed/web/config/FeignClientConfig.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.web.config; +package org.highmed.web.config; -import de.vitagroup.num.web.feign.KeycloakFeign; +import org.highmed.web.feign.KeycloakFeign; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/de/vitagroup/num/web/config/Role.java b/src/main/java/org/highmed/web/config/Role.java similarity index 98% rename from src/main/java/de/vitagroup/num/web/config/Role.java rename to src/main/java/org/highmed/web/config/Role.java index 6f7535ba2..f2bf2dd80 100644 --- a/src/main/java/de/vitagroup/num/web/config/Role.java +++ b/src/main/java/org/highmed/web/config/Role.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.web.config; +package org.highmed.web.config; public class Role { public static final String SUPER_ADMIN = "hasRole('SUPER_ADMIN')"; diff --git a/src/main/java/de/vitagroup/num/web/config/SwaggerConfig.java b/src/main/java/org/highmed/web/config/SwaggerConfig.java similarity index 94% rename from src/main/java/de/vitagroup/num/web/config/SwaggerConfig.java rename to src/main/java/org/highmed/web/config/SwaggerConfig.java index 98488436b..04e1b3469 100644 --- a/src/main/java/de/vitagroup/num/web/config/SwaggerConfig.java +++ b/src/main/java/org/highmed/web/config/SwaggerConfig.java @@ -1,6 +1,6 @@ -package de.vitagroup.num.web.config; +package org.highmed.web.config; -import de.vitagroup.num.properties.SwaggerProperties; +import org.highmed.properties.SwaggerProperties; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.security.OAuthFlow; @@ -17,7 +17,7 @@ public class SwaggerConfig { private static final String SEC_CONFIG_NAME = "oauth_setting"; - private static final String NUM_PACKAGES_TO_SCAN = "de.vitagroup.num.web.controller"; + private static final String NUM_PACKAGES_TO_SCAN = "org.highmed.web.controller"; private final SwaggerProperties swaggerProperties; diff --git a/src/main/java/de/vitagroup/num/web/controller/AdminController.java b/src/main/java/org/highmed/web/controller/AdminController.java similarity index 90% rename from src/main/java/de/vitagroup/num/web/controller/AdminController.java rename to src/main/java/org/highmed/web/controller/AdminController.java index 15a9ebab0..a12446589 100644 --- a/src/main/java/de/vitagroup/num/web/controller/AdminController.java +++ b/src/main/java/org/highmed/web/controller/AdminController.java @@ -1,27 +1,27 @@ -package de.vitagroup.num.web.controller; +package org.highmed.web.controller; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; -import de.vitagroup.num.NumPortalApplication; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.model.SetupType; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.dto.OrganizationDto; -import de.vitagroup.num.domain.dto.SearchCriteria; -import de.vitagroup.num.domain.dto.UserNameDto; -import de.vitagroup.num.properties.NumProperties; -import de.vitagroup.num.service.SetupHealthiness; -import de.vitagroup.num.service.UserDetailsService; -import de.vitagroup.num.service.UserService; -import de.vitagroup.num.service.ehrbase.Pseudonymity; -import de.vitagroup.num.service.exception.CustomizedExceptionHandler; -import de.vitagroup.num.service.logger.AuditLog; -import de.vitagroup.num.web.config.Role; -import de.vitagroup.num.web.feign.KeycloakFeign; +import org.highmed.NumPortalApplication; +import org.highmed.domain.model.Roles; +import org.highmed.domain.model.SetupType; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.dto.OrganizationDto; +import org.highmed.domain.dto.SearchCriteria; +import org.highmed.domain.dto.UserNameDto; +import org.highmed.properties.NumProperties; +import org.highmed.service.SetupHealthiness; +import org.highmed.service.UserDetailsService; +import org.highmed.service.UserService; +import org.highmed.service.ehrbase.Pseudonymity; +import org.highmed.service.exception.CustomizedExceptionHandler; +import org.highmed.service.logger.AuditLog; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import org.highmed.web.config.Role; +import org.highmed.web.feign.KeycloakFeign; import org.slf4j.LoggerFactory; import org.springframework.boot.actuate.health.HealthEndpoint; import org.springframework.boot.actuate.health.Status; @@ -75,7 +75,7 @@ public class AdminController extends CustomizedExceptionHandler { @GetMapping(value = "external-urls", produces = MediaType.APPLICATION_JSON_VALUE) @Operation(description = "Returns value for health status endpoint URL and user manual URL") public ResponseEntity> getExternalUrls(){ - java.util.Map map = new HashMap<>(); + Map map = new HashMap<>(); map.put("systemStatusUrl", numProperties.getSystemStatusUrl()); map.put("userManualUrl", numProperties.getUserManualUrl()); return ResponseEntity.ok(map); @@ -106,13 +106,13 @@ public ResponseEntity health() { @GetMapping("/log-level") public ResponseEntity getLogLevel() { - Logger numLogger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(NumPortalApplication.class.getPackageName()); + Logger numLogger = (Logger) LoggerFactory.getLogger(NumPortalApplication.class.getPackageName()); return ResponseEntity.ok(numLogger.getLevel()); } @PostMapping("/log-level/{logLevel}") public ResponseEntity setLogLevel(@NotNull @PathVariable String logLevel) { - Logger numLogger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(NumPortalApplication.class.getPackageName()); + Logger numLogger = (Logger) LoggerFactory.getLogger(NumPortalApplication.class.getPackageName()); Level level = Level.valueOf(logLevel); numLogger.setLevel(level);//Default log level is DEBUG. If {logLevel} == Wrong Status if (Level.DEBUG.equals(level) || Level.INFO.equals(level)) { @@ -142,7 +142,7 @@ public ResponseEntity getUser( @GetMapping("user/{userId}/role") @Operation(description = "Retrieves the roles of the given user") @PreAuthorize(Role.SUPER_ADMIN_OR_ORGANIZATION_ADMIN) - public ResponseEntity> getRolesOfUser( + public ResponseEntity> getRolesOfUser( @AuthenticationPrincipal @NotNull Jwt principal, @NotNull @PathVariable String userId) { return ResponseEntity.ok(userService.getUserRoles(userId, principal.getSubject())); } diff --git a/src/main/java/de/vitagroup/num/web/controller/AqlController.java b/src/main/java/org/highmed/web/controller/AqlController.java similarity index 93% rename from src/main/java/de/vitagroup/num/web/controller/AqlController.java rename to src/main/java/org/highmed/web/controller/AqlController.java index ad91ab837..02e6486ba 100644 --- a/src/main/java/de/vitagroup/num/web/controller/AqlController.java +++ b/src/main/java/org/highmed/web/controller/AqlController.java @@ -1,18 +1,18 @@ -package de.vitagroup.num.web.controller; - -import de.vitagroup.num.domain.model.Aql; -import de.vitagroup.num.domain.model.AqlCategory; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.dto.*; -import de.vitagroup.num.mapper.AqlMapper; -import de.vitagroup.num.service.AqlService; -import de.vitagroup.num.service.ehrbase.ParameterService; -import de.vitagroup.num.service.exception.CustomizedExceptionHandler; -import de.vitagroup.num.service.logger.AuditLog; -import de.vitagroup.num.web.config.Role; +package org.highmed.web.controller; + +import org.highmed.domain.dto.*; +import org.highmed.domain.model.Aql; +import org.highmed.domain.model.AqlCategory; +import org.highmed.domain.model.Roles; +import org.highmed.mapper.AqlMapper; +import org.highmed.service.AqlService; +import org.highmed.service.ehrbase.ParameterService; +import org.highmed.service.exception.CustomizedExceptionHandler; +import org.highmed.service.logger.AuditLog; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import lombok.AllArgsConstructor; +import org.highmed.web.config.Role; import org.modelmapper.ModelMapper; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -124,7 +124,7 @@ public ResponseEntity getAqlSize(@AuthenticationPrincipal @NotNull Jwt pri @Operation(description = "Creates a category. If there is an id in the DTO, it is ignored.") @PreAuthorize(Role.CRITERIA_EDITOR) public ResponseEntity createCategory(@AuthenticationPrincipal @NotNull Jwt principal, - @Valid @NotNull @RequestBody AqlCategoryDto aqlCategoryDto) { + @Valid @NotNull @RequestBody AqlCategoryDto aqlCategoryDto) { var aqlCategory = aqlService.createAqlCategory(principal.getSubject(), AqlCategory.builder().name(aqlCategoryDto.getName()).build()); return ResponseEntity.ok(modelMapper.map(aqlCategory, AqlCategoryDto.class)); diff --git a/src/main/java/de/vitagroup/num/web/controller/CohortController.java b/src/main/java/org/highmed/web/controller/CohortController.java similarity index 90% rename from src/main/java/de/vitagroup/num/web/controller/CohortController.java rename to src/main/java/org/highmed/web/controller/CohortController.java index f8ec96791..33359633b 100644 --- a/src/main/java/de/vitagroup/num/web/controller/CohortController.java +++ b/src/main/java/org/highmed/web/controller/CohortController.java @@ -1,23 +1,23 @@ -package de.vitagroup.num.web.controller; - -import de.vitagroup.num.domain.dto.CohortDto; -import de.vitagroup.num.domain.dto.CohortGroupDto; -import de.vitagroup.num.domain.dto.CohortSizeDto; -import de.vitagroup.num.domain.dto.TemplateSizeRequestDto; -import de.vitagroup.num.domain.model.Cohort; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.mapper.CohortMapper; -import de.vitagroup.num.service.CohortService; -import de.vitagroup.num.service.exception.CustomizedExceptionHandler; -import de.vitagroup.num.service.exception.dto.ErrorDetails; -import de.vitagroup.num.service.logger.AuditLog; -import de.vitagroup.num.web.config.Role; +package org.highmed.web.controller; + +import org.highmed.domain.dto.CohortDto; +import org.highmed.domain.dto.CohortGroupDto; +import org.highmed.domain.dto.CohortSizeDto; +import org.highmed.domain.dto.TemplateSizeRequestDto; +import org.highmed.domain.model.Cohort; +import org.highmed.domain.model.Roles; +import org.highmed.mapper.CohortMapper; +import org.highmed.service.CohortService; +import org.highmed.service.exception.CustomizedExceptionHandler; +import org.highmed.service.exception.dto.ErrorDetails; +import org.highmed.service.logger.AuditLog; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.highmed.web.config.Role; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/de/vitagroup/num/web/controller/ContentController.java b/src/main/java/org/highmed/web/controller/ContentController.java similarity index 92% rename from src/main/java/de/vitagroup/num/web/controller/ContentController.java rename to src/main/java/org/highmed/web/controller/ContentController.java index 5f7d80cf9..b0343bc06 100644 --- a/src/main/java/de/vitagroup/num/web/controller/ContentController.java +++ b/src/main/java/org/highmed/web/controller/ContentController.java @@ -1,20 +1,23 @@ -package de.vitagroup.num.web.controller; +package org.highmed.web.controller; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.dto.CardDto; -import de.vitagroup.num.domain.dto.MetricsDto; -import de.vitagroup.num.domain.dto.NavigationItemDto; -import de.vitagroup.num.domain.dto.ProjectInfoDto; -import de.vitagroup.num.service.ContentService; -import de.vitagroup.num.service.exception.CustomizedExceptionHandler; -import de.vitagroup.num.web.config.Role; +import org.highmed.domain.dto.CardDto; +import org.highmed.domain.dto.MetricsDto; +import org.highmed.domain.dto.NavigationItemDto; +import org.highmed.domain.dto.ProjectInfoDto; +import org.highmed.domain.model.Roles; +import org.highmed.service.ContentService; +import org.highmed.service.exception.CustomizedExceptionHandler; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; +import org.highmed.web.config.Role; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.annotation.AuthenticationPrincipal; @@ -23,9 +26,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/src/main/java/de/vitagroup/num/web/controller/NumAttachmentController.java b/src/main/java/org/highmed/web/controller/NumAttachmentController.java similarity index 91% rename from src/main/java/de/vitagroup/num/web/controller/NumAttachmentController.java rename to src/main/java/org/highmed/web/controller/NumAttachmentController.java index fa0c173f7..ee00b5496 100644 --- a/src/main/java/de/vitagroup/num/web/controller/NumAttachmentController.java +++ b/src/main/java/org/highmed/web/controller/NumAttachmentController.java @@ -1,15 +1,15 @@ -package de.vitagroup.num.web.controller; +package org.highmed.web.controller; -import de.vitagroup.num.attachment.domain.dto.AttachmentDto; -import de.vitagroup.num.attachment.domain.dto.LightAttachmentDto; -import de.vitagroup.num.attachment.domain.model.Attachment; -import de.vitagroup.num.attachment.service.AttachmentService; -import de.vitagroup.num.service.exception.CustomizedExceptionHandler; -import de.vitagroup.num.service.logger.AuditLog; -import de.vitagroup.num.web.config.Role; +import org.highmed.attachment.domain.dto.AttachmentDto; +import org.highmed.attachment.domain.dto.LightAttachmentDto; +import org.highmed.attachment.domain.model.Attachment; +import org.highmed.attachment.service.AttachmentService; +import org.highmed.service.exception.CustomizedExceptionHandler; +import org.highmed.service.logger.AuditLog; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.highmed.web.config.Role; import org.modelmapper.ModelMapper; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.http.*; diff --git a/src/main/java/de/vitagroup/num/web/controller/OrganizationController.java b/src/main/java/org/highmed/web/controller/OrganizationController.java similarity index 90% rename from src/main/java/de/vitagroup/num/web/controller/OrganizationController.java rename to src/main/java/org/highmed/web/controller/OrganizationController.java index 756a417c5..35209539e 100644 --- a/src/main/java/de/vitagroup/num/web/controller/OrganizationController.java +++ b/src/main/java/org/highmed/web/controller/OrganizationController.java @@ -1,17 +1,17 @@ -package de.vitagroup.num.web.controller; +package org.highmed.web.controller; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.dto.OrganizationDto; -import de.vitagroup.num.domain.dto.SearchCriteria; -import de.vitagroup.num.mapper.OrganizationMapper; -import de.vitagroup.num.service.OrganizationService; -import de.vitagroup.num.service.exception.CustomizedExceptionHandler; -import de.vitagroup.num.service.logger.AuditLog; -import de.vitagroup.num.web.config.Role; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.Roles; +import org.highmed.domain.dto.OrganizationDto; +import org.highmed.domain.dto.SearchCriteria; +import org.highmed.mapper.OrganizationMapper; +import org.highmed.service.OrganizationService; +import org.highmed.service.exception.CustomizedExceptionHandler; +import org.highmed.service.logger.AuditLog; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import lombok.AllArgsConstructor; +import org.highmed.web.config.Role; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/de/vitagroup/num/web/controller/ProfileController.java b/src/main/java/org/highmed/web/controller/ProfileController.java similarity index 80% rename from src/main/java/de/vitagroup/num/web/controller/ProfileController.java rename to src/main/java/org/highmed/web/controller/ProfileController.java index 0c4bd1dbd..3817985b9 100644 --- a/src/main/java/de/vitagroup/num/web/controller/ProfileController.java +++ b/src/main/java/org/highmed/web/controller/ProfileController.java @@ -1,9 +1,9 @@ -package de.vitagroup.num.web.controller; +package org.highmed.web.controller; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.service.UserService; -import de.vitagroup.num.service.exception.CustomizedExceptionHandler; -import de.vitagroup.num.service.logger.AuditLog; +import org.highmed.domain.model.admin.User; +import org.highmed.service.UserService; +import org.highmed.service.exception.CustomizedExceptionHandler; +import org.highmed.service.logger.AuditLog; import io.swagger.v3.oas.annotations.Operation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/de/vitagroup/num/web/controller/ProjectController.java b/src/main/java/org/highmed/web/controller/ProjectController.java similarity index 93% rename from src/main/java/de/vitagroup/num/web/controller/ProjectController.java rename to src/main/java/org/highmed/web/controller/ProjectController.java index 88ca18168..e55e38adb 100644 --- a/src/main/java/de/vitagroup/num/web/controller/ProjectController.java +++ b/src/main/java/org/highmed/web/controller/ProjectController.java @@ -1,23 +1,25 @@ -package de.vitagroup.num.web.controller; - -import de.vitagroup.num.domain.model.Comment; -import de.vitagroup.num.domain.model.ExportType; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.dto.*; -import de.vitagroup.num.mapper.CommentMapper; -import de.vitagroup.num.mapper.ProjectMapper; -import de.vitagroup.num.mapper.ProjectViewMapper; -import de.vitagroup.num.service.CommentService; -import de.vitagroup.num.service.ProjectService; -import de.vitagroup.num.service.exception.CustomizedExceptionHandler; -import de.vitagroup.num.service.exception.ResourceNotFound; -import de.vitagroup.num.service.logger.AuditLog; -import de.vitagroup.num.web.config.Role; +package org.highmed.web.controller; + +import org.highmed.domain.dto.*; +import org.highmed.domain.model.Comment; +import org.highmed.domain.model.ExportType; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.Roles; +import org.highmed.mapper.CommentMapper; +import org.highmed.mapper.ProjectMapper; +import org.highmed.mapper.ProjectViewMapper; +import org.highmed.service.CommentService; +import org.highmed.service.ProjectService; +import org.highmed.service.exception.CustomizedExceptionHandler; +import org.highmed.service.exception.ResourceNotFound; +import org.highmed.service.logger.AuditLog; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; +import org.highmed.web.config.Role; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; @@ -35,15 +37,12 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Locale; import java.util.Optional; import java.util.stream.Collectors; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.PROJECT_NOT_FOUND; +import static org.highmed.domain.templates.ExceptionsTemplate.PROJECT_NOT_FOUND; @RestController @AllArgsConstructor diff --git a/src/main/java/de/vitagroup/num/web/controller/TemplateController.java b/src/main/java/org/highmed/web/controller/TemplateController.java similarity index 80% rename from src/main/java/de/vitagroup/num/web/controller/TemplateController.java rename to src/main/java/org/highmed/web/controller/TemplateController.java index 7ffd74ea8..5888393ef 100644 --- a/src/main/java/de/vitagroup/num/web/controller/TemplateController.java +++ b/src/main/java/org/highmed/web/controller/TemplateController.java @@ -1,9 +1,9 @@ -package de.vitagroup.num.web.controller; +package org.highmed.web.controller; -import de.vitagroup.num.domain.dto.TemplateMetadataDto; -import de.vitagroup.num.service.TemplateService; -import de.vitagroup.num.service.exception.CustomizedExceptionHandler; -import de.vitagroup.num.service.logger.AuditLog; +import org.highmed.domain.dto.TemplateMetadataDto; +import org.highmed.service.TemplateService; +import org.highmed.service.exception.CustomizedExceptionHandler; +import org.highmed.service.logger.AuditLog; import io.swagger.v3.oas.annotations.Operation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/de/vitagroup/num/web/feign/KeycloakFeign.java b/src/main/java/org/highmed/web/feign/KeycloakFeign.java similarity index 91% rename from src/main/java/de/vitagroup/num/web/feign/KeycloakFeign.java rename to src/main/java/org/highmed/web/feign/KeycloakFeign.java index 0270b0195..6595aee0d 100644 --- a/src/main/java/de/vitagroup/num/web/feign/KeycloakFeign.java +++ b/src/main/java/org/highmed/web/feign/KeycloakFeign.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.web.feign; +package org.highmed.web.feign; -import de.vitagroup.num.domain.model.admin.Role; -import de.vitagroup.num.domain.model.admin.User; +import org.highmed.domain.model.admin.Role; +import org.highmed.domain.model.admin.User; import java.util.Map; import java.util.Set; diff --git a/src/main/java/de/vitagroup/num/web/feign/config/ClientTokenProvider.java b/src/main/java/org/highmed/web/feign/config/ClientTokenProvider.java similarity index 97% rename from src/main/java/de/vitagroup/num/web/feign/config/ClientTokenProvider.java rename to src/main/java/org/highmed/web/feign/config/ClientTokenProvider.java index 18e0aecbe..88fe06176 100644 --- a/src/main/java/de/vitagroup/num/web/feign/config/ClientTokenProvider.java +++ b/src/main/java/org/highmed/web/feign/config/ClientTokenProvider.java @@ -1,6 +1,7 @@ -package de.vitagroup.num.web.feign.config; +package org.highmed.web.feign.config; import java.util.Collection; + import lombok.AllArgsConstructor; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/de/vitagroup/num/web/feign/config/FeignInterceptor.java b/src/main/java/org/highmed/web/feign/config/FeignInterceptor.java similarity index 94% rename from src/main/java/de/vitagroup/num/web/feign/config/FeignInterceptor.java rename to src/main/java/org/highmed/web/feign/config/FeignInterceptor.java index 4de09b87d..26b1e5865 100644 --- a/src/main/java/de/vitagroup/num/web/feign/config/FeignInterceptor.java +++ b/src/main/java/org/highmed/web/feign/config/FeignInterceptor.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.web.feign.config; +package org.highmed.web.feign.config; import feign.RequestInterceptor; import feign.RequestTemplate; diff --git a/src/main/java/de/vitagroup/num/web/feign/config/OAuth2Configuration.java b/src/main/java/org/highmed/web/feign/config/OAuth2Configuration.java similarity index 98% rename from src/main/java/de/vitagroup/num/web/feign/config/OAuth2Configuration.java rename to src/main/java/org/highmed/web/feign/config/OAuth2Configuration.java index f5d24498a..b2e0ddf8b 100644 --- a/src/main/java/de/vitagroup/num/web/feign/config/OAuth2Configuration.java +++ b/src/main/java/org/highmed/web/feign/config/OAuth2Configuration.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.web.feign.config; +package org.highmed.web.feign.config; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/vitagroup/num/web/feign/config/TokenProvider.java b/src/main/java/org/highmed/web/feign/config/TokenProvider.java similarity index 76% rename from src/main/java/de/vitagroup/num/web/feign/config/TokenProvider.java rename to src/main/java/org/highmed/web/feign/config/TokenProvider.java index 3981eeba9..e8e56f892 100644 --- a/src/main/java/de/vitagroup/num/web/feign/config/TokenProvider.java +++ b/src/main/java/org/highmed/web/feign/config/TokenProvider.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.web.feign.config; +package org.highmed.web.feign.config; import org.springframework.security.oauth2.core.OAuth2AccessToken; diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 0f6ba2a06..bb0806d27 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -75,7 +75,7 @@ feign: logging: level: - de.vitagroup.num: DEBUG + org.highmed: DEBUG ehrbase: rest-api-url: http://localhost:8080/ehrbase/ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 78bdbf1e4..0796867b0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -129,8 +129,8 @@ logging: level: org.springframework.web: info # DEBUG enables keycloak feign logging - de.vitagroup.num.web.feign.KeycloakFeign: INFO - de.vitagroup.num: INFO + org.highmed.web.feign.KeycloakFeign: INFO + org.highmed.num: INFO atna: enabled: false diff --git a/src/test/java/de/vitagroup/num/TestNumPortalApplication.java b/src/test/java/org/highmed/TestNumPortalApplication.java similarity index 86% rename from src/test/java/de/vitagroup/num/TestNumPortalApplication.java rename to src/test/java/org/highmed/TestNumPortalApplication.java index b147179cb..5c18fac2f 100644 --- a/src/test/java/de/vitagroup/num/TestNumPortalApplication.java +++ b/src/test/java/org/highmed/TestNumPortalApplication.java @@ -1,13 +1,13 @@ -package de.vitagroup.num; +package org.highmed; -import de.vitagroup.num.listeners.UserCacheInit; -import de.vitagroup.num.service.atna.AtnaProperties; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.FilterType; import org.springframework.scheduling.annotation.EnableAsync; +import org.highmed.listeners.UserCacheInit; +import org.highmed.service.atna.AtnaProperties; @SpringBootApplication @EnableConfigurationProperties({AtnaProperties.class}) diff --git a/src/test/java/de/vitagroup/num/attachment/domain/repository/AttachmentRepositoryTest.java b/src/test/java/org/highmed/attachment/domain/repository/AttachmentRepositoryTest.java similarity index 94% rename from src/test/java/de/vitagroup/num/attachment/domain/repository/AttachmentRepositoryTest.java rename to src/test/java/org/highmed/attachment/domain/repository/AttachmentRepositoryTest.java index a9eb59d43..76b31f8e1 100644 --- a/src/test/java/de/vitagroup/num/attachment/domain/repository/AttachmentRepositoryTest.java +++ b/src/test/java/org/highmed/attachment/domain/repository/AttachmentRepositoryTest.java @@ -1,7 +1,7 @@ -package de.vitagroup.num.attachment.domain.repository; +package org.highmed.attachment.domain.repository; -import de.vitagroup.num.attachment.domain.dto.AttachmentDto; -import de.vitagroup.num.attachment.domain.model.Attachment; +import org.highmed.attachment.domain.dto.AttachmentDto; +import org.highmed.attachment.domain.model.Attachment; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; diff --git a/src/test/java/de/vitagroup/num/attachment/service/AttachmentServiceTest.java b/src/test/java/org/highmed/attachment/service/AttachmentServiceTest.java similarity index 94% rename from src/test/java/de/vitagroup/num/attachment/service/AttachmentServiceTest.java rename to src/test/java/org/highmed/attachment/service/AttachmentServiceTest.java index 0290adcda..ae5d999ef 100644 --- a/src/test/java/de/vitagroup/num/attachment/service/AttachmentServiceTest.java +++ b/src/test/java/org/highmed/attachment/service/AttachmentServiceTest.java @@ -1,16 +1,9 @@ -package de.vitagroup.num.attachment.service; - -import de.vitagroup.num.attachment.AttachmentRepository; -import de.vitagroup.num.attachment.domain.dto.AttachmentDto; -import de.vitagroup.num.attachment.domain.dto.LightAttachmentDto; -import de.vitagroup.num.attachment.domain.model.Attachment; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.service.ProjectService; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.ForbiddenException; -import de.vitagroup.num.service.exception.ResourceNotFound; +package org.highmed.attachment.service; + +import org.highmed.attachment.AttachmentRepository; +import org.highmed.attachment.domain.dto.AttachmentDto; +import org.highmed.attachment.domain.dto.LightAttachmentDto; +import org.highmed.attachment.domain.model.Attachment; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -22,6 +15,13 @@ import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.web.multipart.MultipartFile; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.service.ProjectService; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.ForbiddenException; +import org.highmed.service.exception.ResourceNotFound; import java.io.IOException; import java.util.LinkedHashSet; @@ -29,7 +29,7 @@ import java.util.Optional; import java.util.Set; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; @RunWith(MockitoJUnitRunner.class) public class AttachmentServiceTest { diff --git a/src/test/java/de/vitagroup/num/attachment/service/ClamAVServiceTest.java b/src/test/java/org/highmed/attachment/service/ClamAVServiceTest.java similarity index 93% rename from src/test/java/de/vitagroup/num/attachment/service/ClamAVServiceTest.java rename to src/test/java/org/highmed/attachment/service/ClamAVServiceTest.java index 1824d255d..f497ff40d 100644 --- a/src/test/java/de/vitagroup/num/attachment/service/ClamAVServiceTest.java +++ b/src/test/java/org/highmed/attachment/service/ClamAVServiceTest.java @@ -1,7 +1,6 @@ -package de.vitagroup.num.attachment.service; +package org.highmed.attachment.service; -import de.vitagroup.num.integrationtesting.config.ClamAVContainer; -import de.vitagroup.num.properties.ClamAVProperties; +import org.highmed.integrationtesting.config.ClamAVContainer; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; @@ -11,6 +10,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.properties.ClamAVProperties; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/src/test/java/de/vitagroup/num/attachment/service/FileScanServiceTest.java b/src/test/java/org/highmed/attachment/service/FileScanServiceTest.java similarity index 94% rename from src/test/java/de/vitagroup/num/attachment/service/FileScanServiceTest.java rename to src/test/java/org/highmed/attachment/service/FileScanServiceTest.java index a6b78fe3f..cb0bd076b 100644 --- a/src/test/java/de/vitagroup/num/attachment/service/FileScanServiceTest.java +++ b/src/test/java/org/highmed/attachment/service/FileScanServiceTest.java @@ -1,7 +1,5 @@ -package de.vitagroup.num.attachment.service; +package org.highmed.attachment.service; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.SystemException; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; @@ -10,6 +8,8 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.mock.web.MockMultipartFile; import org.springframework.web.multipart.MultipartFile; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.SystemException; import java.io.IOException; import java.io.InputStream; diff --git a/src/test/java/de/vitagroup/num/domain/RolesTest.java b/src/test/java/org/highmed/domain/RolesTest.java similarity index 97% rename from src/test/java/de/vitagroup/num/domain/RolesTest.java rename to src/test/java/org/highmed/domain/RolesTest.java index 8de418b98..69c3bcac8 100644 --- a/src/test/java/de/vitagroup/num/domain/RolesTest.java +++ b/src/test/java/org/highmed/domain/RolesTest.java @@ -1,9 +1,9 @@ -package de.vitagroup.num.domain; +package org.highmed.domain; -import de.vitagroup.num.domain.model.Roles; import org.junit.Assert; import org.junit.Test; import org.springframework.security.oauth2.jwt.Jwt; +import org.highmed.domain.model.Roles; import java.time.Instant; import java.util.List; diff --git a/src/test/java/de/vitagroup/num/domain/dto/SearchCriteriaTest.java b/src/test/java/org/highmed/domain/dto/SearchCriteriaTest.java similarity index 93% rename from src/test/java/de/vitagroup/num/domain/dto/SearchCriteriaTest.java rename to src/test/java/org/highmed/domain/dto/SearchCriteriaTest.java index 34da2b09a..5bc2bda6e 100644 --- a/src/test/java/de/vitagroup/num/domain/dto/SearchCriteriaTest.java +++ b/src/test/java/org/highmed/domain/dto/SearchCriteriaTest.java @@ -1,8 +1,8 @@ -package de.vitagroup.num.domain.dto; +package org.highmed.domain.dto; -import de.vitagroup.num.service.exception.BadRequestException; import org.junit.Assert; import org.junit.Test; +import org.highmed.service.exception.BadRequestException; public class SearchCriteriaTest { diff --git a/src/test/java/de/vitagroup/num/domain/repository/ProjectRepositoryImplTest.java b/src/test/java/org/highmed/domain/repository/ProjectRepositoryImplTest.java similarity index 93% rename from src/test/java/de/vitagroup/num/domain/repository/ProjectRepositoryImplTest.java rename to src/test/java/org/highmed/domain/repository/ProjectRepositoryImplTest.java index a3de53001..cab405196 100644 --- a/src/test/java/de/vitagroup/num/domain/repository/ProjectRepositoryImplTest.java +++ b/src/test/java/org/highmed/domain/repository/ProjectRepositoryImplTest.java @@ -1,9 +1,5 @@ -package de.vitagroup.num.domain.repository; +package org.highmed.domain.repository; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.dto.Language; -import de.vitagroup.num.domain.specification.ProjectSpecification; import jakarta.persistence.EntityManager; import jakarta.persistence.TypedQuery; import jakarta.persistence.criteria.*; @@ -15,6 +11,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; +import org.highmed.domain.dto.Language; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.Roles; +import org.highmed.domain.specification.ProjectSpecification; import java.util.Collections; import java.util.List; diff --git a/src/test/java/de/vitagroup/num/domain/specification/AqlSpecificationTest.java b/src/test/java/org/highmed/domain/specification/AqlSpecificationTest.java similarity index 97% rename from src/test/java/de/vitagroup/num/domain/specification/AqlSpecificationTest.java rename to src/test/java/org/highmed/domain/specification/AqlSpecificationTest.java index 03e628829..7e466be0c 100644 --- a/src/test/java/de/vitagroup/num/domain/specification/AqlSpecificationTest.java +++ b/src/test/java/org/highmed/domain/specification/AqlSpecificationTest.java @@ -1,16 +1,16 @@ -package de.vitagroup.num.domain.specification; +package org.highmed.domain.specification; -import de.vitagroup.num.domain.model.Aql; -import de.vitagroup.num.domain.dto.Language; -import de.vitagroup.num.domain.dto.SearchFilter; +import jakarta.persistence.criteria.*; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.domain.Sort; +import org.highmed.domain.dto.Language; +import org.highmed.domain.dto.SearchFilter; +import org.highmed.domain.model.Aql; -import jakarta.persistence.criteria.*; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/src/test/java/de/vitagroup/num/domain/specification/OrganizationSpecificationTest.java b/src/test/java/org/highmed/domain/specification/OrganizationSpecificationTest.java similarity index 84% rename from src/test/java/de/vitagroup/num/domain/specification/OrganizationSpecificationTest.java rename to src/test/java/org/highmed/domain/specification/OrganizationSpecificationTest.java index b4ecd9e66..9c69ef59c 100644 --- a/src/test/java/de/vitagroup/num/domain/specification/OrganizationSpecificationTest.java +++ b/src/test/java/org/highmed/domain/specification/OrganizationSpecificationTest.java @@ -1,13 +1,16 @@ -package de.vitagroup.num.domain.specification; +package org.highmed.domain.specification; -import de.vitagroup.num.domain.model.Organization; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.domain.model.Organization; -import jakarta.persistence.criteria.*; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/de/vitagroup/num/domain/specification/ProjectSpecificationTest.java b/src/test/java/org/highmed/domain/specification/ProjectSpecificationTest.java similarity index 95% rename from src/test/java/de/vitagroup/num/domain/specification/ProjectSpecificationTest.java rename to src/test/java/org/highmed/domain/specification/ProjectSpecificationTest.java index 375584829..95f9b5221 100644 --- a/src/test/java/de/vitagroup/num/domain/specification/ProjectSpecificationTest.java +++ b/src/test/java/org/highmed/domain/specification/ProjectSpecificationTest.java @@ -1,18 +1,18 @@ -package de.vitagroup.num.domain.specification; +package org.highmed.domain.specification; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.dto.Language; -import de.vitagroup.num.domain.dto.SearchFilter; +import jakarta.persistence.criteria.*; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.domain.Sort; +import org.highmed.domain.dto.Language; +import org.highmed.domain.dto.SearchFilter; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.model.Roles; -import jakarta.persistence.criteria.*; import java.util.*; @RunWith(MockitoJUnitRunner.class) diff --git a/src/test/java/de/vitagroup/num/domain/specification/UserDetailsSpecificationTest.java b/src/test/java/org/highmed/domain/specification/UserDetailsSpecificationTest.java similarity index 94% rename from src/test/java/de/vitagroup/num/domain/specification/UserDetailsSpecificationTest.java rename to src/test/java/org/highmed/domain/specification/UserDetailsSpecificationTest.java index 31f53a0fb..c5e0b0168 100644 --- a/src/test/java/de/vitagroup/num/domain/specification/UserDetailsSpecificationTest.java +++ b/src/test/java/org/highmed/domain/specification/UserDetailsSpecificationTest.java @@ -1,13 +1,13 @@ -package de.vitagroup.num.domain.specification; +package org.highmed.domain.specification; -import de.vitagroup.num.domain.model.admin.UserDetails; +import jakarta.persistence.criteria.*; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.domain.model.admin.UserDetails; -import jakarta.persistence.criteria.*; import java.util.HashSet; import java.util.Set; diff --git a/src/test/java/de/vitagroup/num/domain/validation/CohortValidatorTest.java b/src/test/java/org/highmed/domain/validation/CohortValidatorTest.java similarity index 96% rename from src/test/java/de/vitagroup/num/domain/validation/CohortValidatorTest.java rename to src/test/java/org/highmed/domain/validation/CohortValidatorTest.java index 656c9f634..155e284dc 100644 --- a/src/test/java/de/vitagroup/num/domain/validation/CohortValidatorTest.java +++ b/src/test/java/org/highmed/domain/validation/CohortValidatorTest.java @@ -1,23 +1,23 @@ -package de.vitagroup.num.domain.validation; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; - -import de.vitagroup.num.domain.dto.CohortAqlDto; -import de.vitagroup.num.domain.dto.CohortDto; -import de.vitagroup.num.domain.dto.CohortGroupDto; -import de.vitagroup.num.domain.model.Operator; -import de.vitagroup.num.domain.model.Type; -import org.junit.Before; -import org.junit.Test; +package org.highmed.domain.validation; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; import jakarta.validation.ValidatorFactory; +import org.junit.Before; +import org.junit.Test; +import org.highmed.domain.dto.CohortAqlDto; +import org.highmed.domain.dto.CohortDto; +import org.highmed.domain.dto.CohortGroupDto; +import org.highmed.domain.model.Operator; +import org.highmed.domain.model.Type; + import java.util.List; import java.util.Set; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; + public class CohortValidatorTest { private Validator validator; diff --git a/src/test/java/de/vitagroup/num/integrationtesting/config/AttachmentPostgresqlContainer.java b/src/test/java/org/highmed/integrationtesting/config/AttachmentPostgresqlContainer.java similarity index 95% rename from src/test/java/de/vitagroup/num/integrationtesting/config/AttachmentPostgresqlContainer.java rename to src/test/java/org/highmed/integrationtesting/config/AttachmentPostgresqlContainer.java index 3c9f98ff6..a3c06e82d 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/config/AttachmentPostgresqlContainer.java +++ b/src/test/java/org/highmed/integrationtesting/config/AttachmentPostgresqlContainer.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.integrationtesting.config; +package org.highmed.integrationtesting.config; import org.testcontainers.containers.PostgreSQLContainer; diff --git a/src/test/java/de/vitagroup/num/integrationtesting/config/ClamAVContainer.java b/src/test/java/org/highmed/integrationtesting/config/ClamAVContainer.java similarity index 93% rename from src/test/java/de/vitagroup/num/integrationtesting/config/ClamAVContainer.java rename to src/test/java/org/highmed/integrationtesting/config/ClamAVContainer.java index 517fde8e6..29b84d52a 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/config/ClamAVContainer.java +++ b/src/test/java/org/highmed/integrationtesting/config/ClamAVContainer.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.integrationtesting.config; +package org.highmed.integrationtesting.config; import lombok.extern.slf4j.Slf4j; import org.testcontainers.containers.GenericContainer; diff --git a/src/test/java/de/vitagroup/num/integrationtesting/config/NumPostgresqlContainer.java b/src/test/java/org/highmed/integrationtesting/config/NumPostgresqlContainer.java similarity index 94% rename from src/test/java/de/vitagroup/num/integrationtesting/config/NumPostgresqlContainer.java rename to src/test/java/org/highmed/integrationtesting/config/NumPostgresqlContainer.java index 8394a9d27..d9c634c95 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/config/NumPostgresqlContainer.java +++ b/src/test/java/org/highmed/integrationtesting/config/NumPostgresqlContainer.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.integrationtesting.config; +package org.highmed.integrationtesting.config; import org.testcontainers.containers.PostgreSQLContainer; diff --git a/src/test/java/de/vitagroup/num/integrationtesting/security/TokenGenerator.java b/src/test/java/org/highmed/integrationtesting/security/TokenGenerator.java similarity index 91% rename from src/test/java/de/vitagroup/num/integrationtesting/security/TokenGenerator.java rename to src/test/java/org/highmed/integrationtesting/security/TokenGenerator.java index 3d653ff0c..fc54f7b65 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/security/TokenGenerator.java +++ b/src/test/java/org/highmed/integrationtesting/security/TokenGenerator.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.integrationtesting.security; +package org.highmed.integrationtesting.security; import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.jwk.RSAKey; diff --git a/src/test/java/de/vitagroup/num/integrationtesting/security/WithMockNumUser.java b/src/test/java/org/highmed/integrationtesting/security/WithMockNumUser.java similarity index 91% rename from src/test/java/de/vitagroup/num/integrationtesting/security/WithMockNumUser.java rename to src/test/java/org/highmed/integrationtesting/security/WithMockNumUser.java index c27eb5de6..112338859 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/security/WithMockNumUser.java +++ b/src/test/java/org/highmed/integrationtesting/security/WithMockNumUser.java @@ -1,8 +1,9 @@ -package de.vitagroup.num.integrationtesting.security; +package org.highmed.integrationtesting.security; + +import org.springframework.security.test.context.support.WithSecurityContext; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import org.springframework.security.test.context.support.WithSecurityContext; @Retention(RetentionPolicy.RUNTIME) @WithSecurityContext(factory = WithMockNumUserSecurityContextFactory.class) diff --git a/src/test/java/de/vitagroup/num/integrationtesting/security/WithMockNumUserSecurityContextFactory.java b/src/test/java/org/highmed/integrationtesting/security/WithMockNumUserSecurityContextFactory.java similarity index 97% rename from src/test/java/de/vitagroup/num/integrationtesting/security/WithMockNumUserSecurityContextFactory.java rename to src/test/java/org/highmed/integrationtesting/security/WithMockNumUserSecurityContextFactory.java index c72a5e0a9..3e5e5044e 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/security/WithMockNumUserSecurityContextFactory.java +++ b/src/test/java/org/highmed/integrationtesting/security/WithMockNumUserSecurityContextFactory.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.integrationtesting.security; +package org.highmed.integrationtesting.security; import lombok.SneakyThrows; import org.springframework.security.core.GrantedAuthority; diff --git a/src/test/java/de/vitagroup/num/integrationtesting/tests/AdminControllerIT.java b/src/test/java/org/highmed/integrationtesting/tests/AdminControllerIT.java similarity index 97% rename from src/test/java/de/vitagroup/num/integrationtesting/tests/AdminControllerIT.java rename to src/test/java/org/highmed/integrationtesting/tests/AdminControllerIT.java index 9417791ba..110bead7e 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/tests/AdminControllerIT.java +++ b/src/test/java/org/highmed/integrationtesting/tests/AdminControllerIT.java @@ -1,11 +1,10 @@ -package de.vitagroup.num.integrationtesting.tests; +package org.highmed.integrationtesting.tests; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.tomakehurst.wiremock.client.WireMock; -import de.vitagroup.num.integrationtesting.security.WithMockNumUser; -import de.vitagroup.num.service.SetupHealthiness; import lombok.SneakyThrows; import org.apache.commons.io.IOUtils; +import org.highmed.integrationtesting.security.WithMockNumUser; import org.junit.Assert; import org.junit.Test; import org.mockito.Mock; @@ -13,17 +12,18 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultMatcher; +import org.highmed.service.SetupHealthiness; import java.nio.charset.StandardCharsets; import static com.github.tomakehurst.wiremock.client.WireMock.*; -import static de.vitagroup.num.domain.model.Roles.*; import static org.mockito.Mockito.when; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.highmed.domain.model.Roles.*; public class AdminControllerIT extends IntegrationTest { diff --git a/src/test/java/de/vitagroup/num/integrationtesting/tests/AqlControllerIT.java b/src/test/java/org/highmed/integrationtesting/tests/AqlControllerIT.java similarity index 95% rename from src/test/java/de/vitagroup/num/integrationtesting/tests/AqlControllerIT.java rename to src/test/java/org/highmed/integrationtesting/tests/AqlControllerIT.java index cb98bb0fa..d8c7722e8 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/tests/AqlControllerIT.java +++ b/src/test/java/org/highmed/integrationtesting/tests/AqlControllerIT.java @@ -1,14 +1,11 @@ -package de.vitagroup.num.integrationtesting.tests; +package org.highmed.integrationtesting.tests; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.tomakehurst.wiremock.client.WireMock; -import de.vitagroup.num.domain.dto.AqlCategoryDto; -import de.vitagroup.num.domain.dto.AqlDto; -import de.vitagroup.num.domain.dto.ParameterOptionsDto; -import de.vitagroup.num.integrationtesting.security.WithMockNumUser; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; +import org.highmed.integrationtesting.security.WithMockNumUser; import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -16,21 +13,24 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; +import org.highmed.domain.dto.AqlCategoryDto; +import org.highmed.domain.dto.AqlDto; +import org.highmed.domain.dto.ParameterOptionsDto; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import static de.vitagroup.num.domain.model.Roles.*; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.highmed.domain.model.Roles.*; @Slf4j public class AqlControllerIT extends IntegrationTest { @@ -263,8 +263,6 @@ public void shouldRetrieveParameterValues() { .andExpect(status().isOk()) .andReturn(); - printResultInfos(result); - assertThat(result.getResponse().getStatus(), is(HttpStatus.OK.value())); assertThat( result.getResponse().getContentAsString(), containsString("\"type\":\"DV_QUANTITY\"")); @@ -352,16 +350,9 @@ public void shouldRetrieveParameterValues() { assertThat((String)dto.getOptions().get("male"),containsString("Male")); } - private static void printResultInfos(MvcResult result) throws UnsupportedEncodingException { - log.info("========= Failed Test Results: ========="); - log.info("Headers: {}", result.getResponse().getHeaderNames()); - log.info("Status: {}", result.getResponse().getStatus()); - log.info("Content: {}", result.getResponse().getContentAsString()); - log.info("Error: {}", result.getResponse().getErrorMessage()); - } - @Test @SneakyThrows + @Ignore @WithMockNumUser(roles = {CRITERIA_EDITOR}) public void shouldSaveAndDeleteAqlCategorySuccessfully() { diff --git a/src/test/java/de/vitagroup/num/integrationtesting/tests/CohortControllerIT.java b/src/test/java/org/highmed/integrationtesting/tests/CohortControllerIT.java similarity index 92% rename from src/test/java/de/vitagroup/num/integrationtesting/tests/CohortControllerIT.java rename to src/test/java/org/highmed/integrationtesting/tests/CohortControllerIT.java index 0a566d6cb..fdf1b540b 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/tests/CohortControllerIT.java +++ b/src/test/java/org/highmed/integrationtesting/tests/CohortControllerIT.java @@ -1,25 +1,25 @@ -package de.vitagroup.num.integrationtesting.tests; +package org.highmed.integrationtesting.tests; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.tomakehurst.wiremock.client.WireMock; import com.google.common.collect.Lists; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.CohortAqlDto; -import de.vitagroup.num.domain.dto.CohortDto; -import de.vitagroup.num.domain.dto.CohortGroupDto; -import de.vitagroup.num.domain.model.*; -import de.vitagroup.num.domain.repository.AqlRepository; -import de.vitagroup.num.domain.repository.CohortRepository; -import de.vitagroup.num.domain.repository.ProjectRepository; -import de.vitagroup.num.domain.repository.UserDetailsRepository; -import de.vitagroup.num.integrationtesting.security.WithMockNumUser; import lombok.SneakyThrows; import org.apache.commons.io.IOUtils; +import org.highmed.integrationtesting.security.WithMockNumUser; import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; +import org.highmed.domain.dto.CohortAqlDto; +import org.highmed.domain.dto.CohortDto; +import org.highmed.domain.dto.CohortGroupDto; +import org.highmed.domain.model.*; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.AqlRepository; +import org.highmed.domain.repository.CohortRepository; +import org.highmed.domain.repository.ProjectRepository; +import org.highmed.domain.repository.UserDetailsRepository; import java.nio.charset.StandardCharsets; import java.time.LocalDate; @@ -27,11 +27,11 @@ import java.util.List; import java.util.Map; -import static de.vitagroup.num.domain.model.Roles.*; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.highmed.domain.model.Roles.*; public class CohortControllerIT extends IntegrationTest { @@ -107,8 +107,8 @@ public void shouldAccessCohortApiWithRightRole() { } @Test - @Ignore @SneakyThrows + @Ignore @WithMockNumUser( userId = UNAUTHORIZED_USER_ID, roles = {STUDY_COORDINATOR}) diff --git a/src/test/java/de/vitagroup/num/integrationtesting/tests/HealthEndpointIT.java b/src/test/java/org/highmed/integrationtesting/tests/HealthEndpointIT.java similarity index 97% rename from src/test/java/de/vitagroup/num/integrationtesting/tests/HealthEndpointIT.java rename to src/test/java/org/highmed/integrationtesting/tests/HealthEndpointIT.java index 572213921..68bdecad3 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/tests/HealthEndpointIT.java +++ b/src/test/java/org/highmed/integrationtesting/tests/HealthEndpointIT.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.integrationtesting.tests; +package org.highmed.integrationtesting.tests; import lombok.SneakyThrows; import org.junit.Test; diff --git a/src/test/java/de/vitagroup/num/integrationtesting/tests/IntegrationTest.java b/src/test/java/org/highmed/integrationtesting/tests/IntegrationTest.java similarity index 92% rename from src/test/java/de/vitagroup/num/integrationtesting/tests/IntegrationTest.java rename to src/test/java/org/highmed/integrationtesting/tests/IntegrationTest.java index d532fac68..e23ee9071 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/tests/IntegrationTest.java +++ b/src/test/java/org/highmed/integrationtesting/tests/IntegrationTest.java @@ -1,12 +1,12 @@ -package de.vitagroup.num.integrationtesting.tests; +package org.highmed.integrationtesting.tests; import com.github.tomakehurst.wiremock.client.WireMock; import com.github.tomakehurst.wiremock.junit.WireMockRule; -import de.vitagroup.num.TestNumPortalApplication; -import de.vitagroup.num.integrationtesting.config.AttachmentPostgresqlContainer; -import de.vitagroup.num.integrationtesting.config.NumPostgresqlContainer; -import de.vitagroup.num.integrationtesting.security.TokenGenerator; import lombok.SneakyThrows; +import org.highmed.TestNumPortalApplication; +import org.highmed.integrationtesting.config.AttachmentPostgresqlContainer; +import org.highmed.integrationtesting.config.NumPostgresqlContainer; +import org.highmed.integrationtesting.security.TokenGenerator; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; diff --git a/src/test/java/de/vitagroup/num/integrationtesting/tests/OrganizationControllerIT.java b/src/test/java/org/highmed/integrationtesting/tests/OrganizationControllerIT.java similarity index 94% rename from src/test/java/de/vitagroup/num/integrationtesting/tests/OrganizationControllerIT.java rename to src/test/java/org/highmed/integrationtesting/tests/OrganizationControllerIT.java index 3de8323ee..8eaa8a768 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/tests/OrganizationControllerIT.java +++ b/src/test/java/org/highmed/integrationtesting/tests/OrganizationControllerIT.java @@ -1,30 +1,30 @@ -package de.vitagroup.num.integrationtesting.tests; +package org.highmed.integrationtesting.tests; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.OrganizationDto; -import de.vitagroup.num.domain.repository.OrganizationRepository; -import de.vitagroup.num.domain.repository.UserDetailsRepository; -import de.vitagroup.num.integrationtesting.security.WithMockNumUser; import lombok.SneakyThrows; +import org.highmed.integrationtesting.security.WithMockNumUser; import org.junit.Assert; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; +import org.highmed.domain.dto.OrganizationDto; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.OrganizationRepository; +import org.highmed.domain.repository.UserDetailsRepository; import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.Set; -import static de.vitagroup.num.domain.model.Roles.SUPER_ADMIN; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.highmed.domain.model.Roles.SUPER_ADMIN; public class OrganizationControllerIT extends IntegrationTest { diff --git a/src/test/java/de/vitagroup/num/integrationtesting/tests/ProjectControllerIT.java b/src/test/java/org/highmed/integrationtesting/tests/ProjectControllerIT.java similarity index 95% rename from src/test/java/de/vitagroup/num/integrationtesting/tests/ProjectControllerIT.java rename to src/test/java/org/highmed/integrationtesting/tests/ProjectControllerIT.java index 4396e3a9d..9b9345a20 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/tests/ProjectControllerIT.java +++ b/src/test/java/org/highmed/integrationtesting/tests/ProjectControllerIT.java @@ -1,22 +1,11 @@ -package de.vitagroup.num.integrationtesting.tests; +package org.highmed.integrationtesting.tests; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.google.common.collect.Lists; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.ProjectCategories; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.ProjectDto; -import de.vitagroup.num.domain.dto.ProjectViewTO; -import de.vitagroup.num.domain.dto.TemplateInfoDto; -import de.vitagroup.num.domain.repository.OrganizationRepository; -import de.vitagroup.num.domain.repository.ProjectRepository; -import de.vitagroup.num.domain.repository.UserDetailsRepository; -import de.vitagroup.num.integrationtesting.security.WithMockNumUser; import lombok.SneakyThrows; +import org.highmed.integrationtesting.security.WithMockNumUser; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -27,19 +16,30 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; +import org.highmed.domain.dto.ProjectDto; +import org.highmed.domain.dto.ProjectViewTO; +import org.highmed.domain.dto.TemplateInfoDto; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.ProjectCategories; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.OrganizationRepository; +import org.highmed.domain.repository.ProjectRepository; +import org.highmed.domain.repository.UserDetailsRepository; import java.time.LocalDate; import java.util.List; import java.util.Optional; import java.util.Set; -import static de.vitagroup.num.domain.model.Roles.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.highmed.domain.model.Roles.*; public class ProjectControllerIT extends IntegrationTest { diff --git a/src/test/java/de/vitagroup/num/integrationtesting/tests/TemplateControllerIT.java b/src/test/java/org/highmed/integrationtesting/tests/TemplateControllerIT.java similarity index 88% rename from src/test/java/de/vitagroup/num/integrationtesting/tests/TemplateControllerIT.java rename to src/test/java/org/highmed/integrationtesting/tests/TemplateControllerIT.java index a7a3a6464..82b904772 100644 --- a/src/test/java/de/vitagroup/num/integrationtesting/tests/TemplateControllerIT.java +++ b/src/test/java/org/highmed/integrationtesting/tests/TemplateControllerIT.java @@ -1,14 +1,14 @@ -package de.vitagroup.num.integrationtesting.tests; +package org.highmed.integrationtesting.tests; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.domain.dto.TemplateMetadataDto; -import de.vitagroup.num.integrationtesting.security.WithMockNumUser; import lombok.SneakyThrows; +import org.highmed.integrationtesting.security.WithMockNumUser; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; +import org.highmed.domain.dto.TemplateMetadataDto; import java.util.List; diff --git a/src/test/java/de/vitagroup/num/mapper/AqlMapperTest.java b/src/test/java/org/highmed/mapper/AqlMapperTest.java similarity index 90% rename from src/test/java/de/vitagroup/num/mapper/AqlMapperTest.java rename to src/test/java/org/highmed/mapper/AqlMapperTest.java index 8de37177c..c3249c582 100644 --- a/src/test/java/de/vitagroup/num/mapper/AqlMapperTest.java +++ b/src/test/java/org/highmed/mapper/AqlMapperTest.java @@ -1,23 +1,5 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNull.notNullValue; -import static org.hamcrest.core.IsNull.nullValue; -import static org.mockito.Mockito.when; - -import de.vitagroup.num.domain.model.Aql; -import de.vitagroup.num.domain.model.AqlCategory; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.AqlDto; -import de.vitagroup.num.domain.dto.OrganizationDto; -import de.vitagroup.num.domain.repository.AqlRepository; -import de.vitagroup.num.domain.repository.UserDetailsRepository; -import de.vitagroup.num.service.UserService; - -import java.time.OffsetDateTime; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,6 +8,24 @@ import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; import org.modelmapper.ModelMapper; +import org.highmed.domain.dto.AqlDto; +import org.highmed.domain.dto.OrganizationDto; +import org.highmed.domain.model.Aql; +import org.highmed.domain.model.AqlCategory; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.AqlRepository; +import org.highmed.domain.repository.UserDetailsRepository; +import org.highmed.service.UserService; + +import java.time.OffsetDateTime; + +import static org.hamcrest.core.Is.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.hamcrest.core.IsNull.nullValue; +import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class AqlMapperTest { diff --git a/src/test/java/de/vitagroup/num/mapper/CohortMapperTest.java b/src/test/java/org/highmed/mapper/CohortMapperTest.java similarity index 86% rename from src/test/java/de/vitagroup/num/mapper/CohortMapperTest.java rename to src/test/java/org/highmed/mapper/CohortMapperTest.java index 2c40eec00..bf234346a 100644 --- a/src/test/java/de/vitagroup/num/mapper/CohortMapperTest.java +++ b/src/test/java/org/highmed/mapper/CohortMapperTest.java @@ -1,18 +1,5 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNull.notNullValue; - -import de.vitagroup.num.domain.model.Cohort; -import de.vitagroup.num.domain.model.CohortAql; -import de.vitagroup.num.domain.model.CohortGroup; -import de.vitagroup.num.domain.model.Operator; -import de.vitagroup.num.domain.model.Type; -import de.vitagroup.num.domain.dto.CohortDto; -import de.vitagroup.num.service.AqlService; -import de.vitagroup.num.service.ProjectService; -import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -21,6 +8,16 @@ import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; import org.modelmapper.ModelMapper; +import org.highmed.domain.dto.CohortDto; +import org.highmed.domain.model.*; +import org.highmed.service.AqlService; +import org.highmed.service.ProjectService; + +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsNull.notNullValue; @RunWith(MockitoJUnitRunner.class) public class CohortMapperTest { diff --git a/src/test/java/de/vitagroup/num/mapper/CommentMapperTest.java b/src/test/java/org/highmed/mapper/CommentMapperTest.java similarity index 87% rename from src/test/java/de/vitagroup/num/mapper/CommentMapperTest.java rename to src/test/java/org/highmed/mapper/CommentMapperTest.java index 308bb8765..3171ae18b 100644 --- a/src/test/java/de/vitagroup/num/mapper/CommentMapperTest.java +++ b/src/test/java/org/highmed/mapper/CommentMapperTest.java @@ -1,11 +1,5 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.domain.model.Comment; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.CommentDto; -import de.vitagroup.num.service.UserService; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; @@ -14,11 +8,17 @@ import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; import org.modelmapper.ModelMapper; +import org.highmed.domain.dto.CommentDto; +import org.highmed.domain.model.Comment; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.service.UserService; import java.time.OffsetDateTime; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; import static org.hamcrest.core.IsNull.nullValue; diff --git a/src/test/java/de/vitagroup/num/mapper/OrganizationMapperTest.java b/src/test/java/org/highmed/mapper/OrganizationMapperTest.java similarity index 83% rename from src/test/java/de/vitagroup/num/mapper/OrganizationMapperTest.java rename to src/test/java/org/highmed/mapper/OrganizationMapperTest.java index a5d02b3c2..5f8b39986 100644 --- a/src/test/java/de/vitagroup/num/mapper/OrganizationMapperTest.java +++ b/src/test/java/org/highmed/mapper/OrganizationMapperTest.java @@ -1,9 +1,5 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.domain.model.MailDomain; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.dto.OrganizationDto; -import de.vitagroup.num.service.OrganizationService; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -12,11 +8,15 @@ import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; import org.modelmapper.ModelMapper; +import org.highmed.domain.dto.OrganizationDto; +import org.highmed.domain.model.MailDomain; +import org.highmed.domain.model.Organization; +import org.highmed.service.OrganizationService; import java.util.Set; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; @RunWith(MockitoJUnitRunner.class) diff --git a/src/test/java/de/vitagroup/num/mapper/ProjectMapperTest.java b/src/test/java/org/highmed/mapper/ProjectMapperTest.java similarity index 89% rename from src/test/java/de/vitagroup/num/mapper/ProjectMapperTest.java rename to src/test/java/org/highmed/mapper/ProjectMapperTest.java index 1109daa64..34966c0a5 100644 --- a/src/test/java/de/vitagroup/num/mapper/ProjectMapperTest.java +++ b/src/test/java/org/highmed/mapper/ProjectMapperTest.java @@ -1,14 +1,6 @@ -package de.vitagroup.num.mapper; - -import de.vitagroup.num.attachment.service.AttachmentService; -import de.vitagroup.num.domain.model.Cohort; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.ProjectDto; -import de.vitagroup.num.domain.dto.TemplateInfoDto; -import de.vitagroup.num.service.UserService; +package org.highmed.mapper; + +import org.highmed.attachment.service.AttachmentService; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -17,6 +9,14 @@ import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; import org.modelmapper.ModelMapper; +import org.highmed.domain.dto.ProjectDto; +import org.highmed.domain.dto.TemplateInfoDto; +import org.highmed.domain.model.Cohort; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.service.UserService; import java.util.List; import java.util.Map; diff --git a/src/test/java/de/vitagroup/num/mapper/ProjectViewMapperTest.java b/src/test/java/org/highmed/mapper/ProjectViewMapperTest.java similarity index 85% rename from src/test/java/de/vitagroup/num/mapper/ProjectViewMapperTest.java rename to src/test/java/org/highmed/mapper/ProjectViewMapperTest.java index 49ae0dc9e..1c75801e6 100644 --- a/src/test/java/de/vitagroup/num/mapper/ProjectViewMapperTest.java +++ b/src/test/java/org/highmed/mapper/ProjectViewMapperTest.java @@ -1,10 +1,5 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.domain.model.Project; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.ProjectViewTO; -import de.vitagroup.num.service.UserService; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -14,12 +9,17 @@ import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; import org.modelmapper.ModelMapper; - -import java.time.LocalDate; +import org.highmed.domain.dto.ProjectViewTO; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.service.UserService; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import java.time.LocalDate; + @RunWith(MockitoJUnitRunner.class) public class ProjectViewMapperTest { diff --git a/src/test/java/de/vitagroup/num/mapper/TemplateMapperTest.java b/src/test/java/org/highmed/mapper/TemplateMapperTest.java similarity index 94% rename from src/test/java/de/vitagroup/num/mapper/TemplateMapperTest.java rename to src/test/java/org/highmed/mapper/TemplateMapperTest.java index dd41ff2b5..cda08798d 100644 --- a/src/test/java/de/vitagroup/num/mapper/TemplateMapperTest.java +++ b/src/test/java/org/highmed/mapper/TemplateMapperTest.java @@ -1,7 +1,5 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.domain.dto.TemplateInfoDto; -import de.vitagroup.num.domain.dto.TemplateMetadataDto; import org.ehrbase.openehr.sdk.response.dto.ehrscape.TemplateMetaDataDto; import org.junit.Before; import org.junit.Test; @@ -10,6 +8,8 @@ import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; import org.modelmapper.ModelMapper; +import org.highmed.domain.dto.TemplateInfoDto; +import org.highmed.domain.dto.TemplateMetadataDto; import java.time.OffsetDateTime; import java.util.HashMap; diff --git a/src/test/java/de/vitagroup/num/mapper/UserDetailsMapperTest.java b/src/test/java/org/highmed/mapper/UserDetailsMapperTest.java similarity index 91% rename from src/test/java/de/vitagroup/num/mapper/UserDetailsMapperTest.java rename to src/test/java/org/highmed/mapper/UserDetailsMapperTest.java index 08efadbd8..b922a644f 100644 --- a/src/test/java/de/vitagroup/num/mapper/UserDetailsMapperTest.java +++ b/src/test/java/org/highmed/mapper/UserDetailsMapperTest.java @@ -1,8 +1,5 @@ -package de.vitagroup.num.mapper; +package org.highmed.mapper; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.UserDetailsDto; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -10,9 +7,12 @@ import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; import org.modelmapper.ModelMapper; +import org.highmed.domain.dto.UserDetailsDto; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.admin.UserDetails; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; @RunWith(MockitoJUnitRunner.class) diff --git a/src/test/java/de/vitagroup/num/service/AqlServiceTest.java b/src/test/java/org/highmed/service/AqlServiceTest.java similarity index 96% rename from src/test/java/de/vitagroup/num/service/AqlServiceTest.java rename to src/test/java/org/highmed/service/AqlServiceTest.java index e3ca7e8fd..ea616bcc3 100644 --- a/src/test/java/de/vitagroup/num/service/AqlServiceTest.java +++ b/src/test/java/org/highmed/service/AqlServiceTest.java @@ -1,21 +1,6 @@ -package de.vitagroup.num.service; +package org.highmed.service; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.domain.model.Aql; -import de.vitagroup.num.domain.model.AqlCategory; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.Language; -import de.vitagroup.num.domain.dto.SearchCriteria; -import de.vitagroup.num.domain.dto.SlimAqlDto; -import de.vitagroup.num.domain.repository.AqlCategoryRepository; -import de.vitagroup.num.domain.repository.AqlRepository; -import de.vitagroup.num.domain.specification.AqlSpecification; -import de.vitagroup.num.properties.PrivacyProperties; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.exception.*; import org.ehrbase.aqleditor.dto.aql.QueryValidationResponse; import org.ehrbase.aqleditor.dto.aql.Result; import org.ehrbase.aqleditor.service.AqlEditorAqlService; @@ -31,16 +16,31 @@ import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.data.domain.*; import org.springframework.data.jpa.domain.JpaSort; +import org.highmed.domain.dto.Language; +import org.highmed.domain.dto.SearchCriteria; +import org.highmed.domain.dto.SlimAqlDto; +import org.highmed.domain.model.Aql; +import org.highmed.domain.model.AqlCategory; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.Roles; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.AqlCategoryRepository; +import org.highmed.domain.repository.AqlRepository; +import org.highmed.domain.specification.AqlSpecification; +import org.highmed.properties.PrivacyProperties; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.exception.*; import java.time.OffsetDateTime; import java.util.*; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_ACCESS_THIS_RESOURCE_USER_IS_NOT_APPROVED; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.USER_NOT_FOUND; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; import static org.mockito.Mockito.*; +import static org.highmed.domain.templates.ExceptionsTemplate.CANNOT_ACCESS_THIS_RESOURCE_USER_IS_NOT_APPROVED; +import static org.highmed.domain.templates.ExceptionsTemplate.USER_NOT_FOUND; @RunWith(MockitoJUnitRunner.class) public class AqlServiceTest { diff --git a/src/test/java/de/vitagroup/num/service/CohortServiceTest.java b/src/test/java/org/highmed/service/CohortServiceTest.java similarity index 96% rename from src/test/java/de/vitagroup/num/service/CohortServiceTest.java rename to src/test/java/org/highmed/service/CohortServiceTest.java index 6e064a46f..4a1322dd3 100644 --- a/src/test/java/de/vitagroup/num/service/CohortServiceTest.java +++ b/src/test/java/org/highmed/service/CohortServiceTest.java @@ -1,19 +1,9 @@ -package de.vitagroup.num.service; - -import de.vitagroup.num.domain.dto.*; -import de.vitagroup.num.domain.model.*; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.repository.CohortRepository; -import de.vitagroup.num.domain.repository.ProjectRepository; -import de.vitagroup.num.domain.templates.ExceptionsTemplate; -import de.vitagroup.num.properties.PrivacyProperties; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.exception.*; -import de.vitagroup.num.service.executors.CohortExecutor; -import de.vitagroup.num.service.policy.ProjectPolicyService; +package org.highmed.service; + import org.ehrbase.openehr.sdk.aql.dto.AqlQuery; import org.ehrbase.openehr.sdk.aql.parser.AqlQueryParser; import org.ehrbase.openehr.sdk.response.dto.QueryResponseData; +import org.highmed.domain.dto.*; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -21,20 +11,30 @@ import org.mockito.*; import org.mockito.junit.MockitoJUnitRunner; import org.modelmapper.ModelMapper; +import org.highmed.domain.model.*; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.CohortRepository; +import org.highmed.domain.repository.ProjectRepository; +import org.highmed.domain.templates.ExceptionsTemplate; +import org.highmed.properties.PrivacyProperties; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.exception.*; +import org.highmed.service.executors.CohortExecutor; +import org.highmed.service.policy.ProjectPolicyService; import java.util.*; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_ACCESS_THIS_RESOURCE_USER_IS_NOT_APPROVED; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.USER_NOT_FOUND; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.*; +import static org.highmed.domain.templates.ExceptionsTemplate.CANNOT_ACCESS_THIS_RESOURCE_USER_IS_NOT_APPROVED; +import static org.highmed.domain.templates.ExceptionsTemplate.USER_NOT_FOUND; @RunWith(MockitoJUnitRunner.class) public class CohortServiceTest { diff --git a/src/test/java/de/vitagroup/num/service/CommentServiceTest.java b/src/test/java/org/highmed/service/CommentServiceTest.java similarity index 87% rename from src/test/java/de/vitagroup/num/service/CommentServiceTest.java rename to src/test/java/org/highmed/service/CommentServiceTest.java index fbd8f92c2..0dbecc2d3 100644 --- a/src/test/java/de/vitagroup/num/service/CommentServiceTest.java +++ b/src/test/java/org/highmed/service/CommentServiceTest.java @@ -1,21 +1,5 @@ -package de.vitagroup.num.service; - -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_DELETE_COMMENT; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.COMMENT_EDIT_FOR_COMMENT_WITH_ID_IS_NOT_ALLOWED_COMMENT_HAS_DIFFERENT_AUTHOR; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.COMMENT_NOT_FOUND; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.INVALID_COMMENT_ID; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.PROJECT_DOES_NOT_EXIST; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.PROJECT_NOT_FOUND; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThrows; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.time.OffsetDateTime; -import java.util.Optional; +package org.highmed.service; -import de.vitagroup.num.domain.model.Project; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -24,14 +8,24 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.dao.EmptyResultDataAccessException; +import org.highmed.domain.model.Comment; +import org.highmed.domain.model.Project; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.CommentRepository; +import org.highmed.domain.repository.ProjectRepository; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.ForbiddenException; +import org.highmed.service.exception.ResourceNotFound; -import de.vitagroup.num.domain.model.Comment; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.repository.CommentRepository; -import de.vitagroup.num.domain.repository.ProjectRepository; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.ForbiddenException; -import de.vitagroup.num.service.exception.ResourceNotFound; +import java.time.OffsetDateTime; +import java.util.Optional; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThrows; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.highmed.domain.templates.ExceptionsTemplate.*; @RunWith(MockitoJUnitRunner.class) public class CommentServiceTest { diff --git a/src/test/java/de/vitagroup/num/service/ContentServiceTest.java b/src/test/java/org/highmed/service/ContentServiceTest.java similarity index 93% rename from src/test/java/de/vitagroup/num/service/ContentServiceTest.java rename to src/test/java/org/highmed/service/ContentServiceTest.java index 51f39ebca..d2bc51e5f 100644 --- a/src/test/java/de/vitagroup/num/service/ContentServiceTest.java +++ b/src/test/java/org/highmed/service/ContentServiceTest.java @@ -1,37 +1,37 @@ -package de.vitagroup.num.service; +package org.highmed.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.domain.dto.CardDto; -import de.vitagroup.num.domain.dto.CardDto.LocalizedPart; -import de.vitagroup.num.domain.dto.MetricsDto; -import de.vitagroup.num.domain.dto.NavigationItemDto; -import de.vitagroup.num.domain.model.Content; -import de.vitagroup.num.domain.model.ContentType; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.repository.ContentItemRepository; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.exception.SystemException; import org.apache.logging.log4j.util.Strings; import org.ehrbase.openehr.sdk.response.dto.QueryResponseData; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.*; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.domain.dto.CardDto; +import org.highmed.domain.dto.CardDto.LocalizedPart; +import org.highmed.domain.dto.MetricsDto; +import org.highmed.domain.dto.NavigationItemDto; +import org.highmed.domain.model.Content; +import org.highmed.domain.model.ContentType; +import org.highmed.domain.model.Roles; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.ContentItemRepository; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.exception.SystemException; import java.net.MalformedURLException; import java.net.URL; import java.util.*; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; @RunWith(MockitoJUnitRunner.class) public class ContentServiceTest { diff --git a/src/test/java/de/vitagroup/num/service/EhrBaseServiceTest.java b/src/test/java/org/highmed/service/EhrBaseServiceTest.java similarity index 96% rename from src/test/java/de/vitagroup/num/service/EhrBaseServiceTest.java rename to src/test/java/org/highmed/service/EhrBaseServiceTest.java index 35439ff21..57ab60c42 100644 --- a/src/test/java/de/vitagroup/num/service/EhrBaseServiceTest.java +++ b/src/test/java/org/highmed/service/EhrBaseServiceTest.java @@ -1,11 +1,6 @@ -package de.vitagroup.num.service; +package org.highmed.service; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.domain.model.Aql; -import de.vitagroup.num.service.ehrbase.CompositionResponseDataBuilder; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.ehrbase.Pseudonymity; -import de.vitagroup.num.service.exception.SystemException; import org.ehrbase.openehr.sdk.aql.parser.AqlParseException; import org.ehrbase.openehr.sdk.aql.parser.AqlQueryParser; import org.ehrbase.openehr.sdk.client.openehrclient.defaultrestclient.DefaultRestClient; @@ -25,6 +20,11 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.domain.model.Aql; +import org.highmed.service.ehrbase.CompositionResponseDataBuilder; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.ehrbase.Pseudonymity; +import org.highmed.service.exception.SystemException; import java.util.ArrayList; import java.util.Collections; diff --git a/src/test/java/de/vitagroup/num/service/OrganizationServiceTest.java b/src/test/java/org/highmed/service/OrganizationServiceTest.java similarity index 95% rename from src/test/java/de/vitagroup/num/service/OrganizationServiceTest.java rename to src/test/java/org/highmed/service/OrganizationServiceTest.java index 6fc6d85e5..8a1a99c68 100644 --- a/src/test/java/de/vitagroup/num/service/OrganizationServiceTest.java +++ b/src/test/java/org/highmed/service/OrganizationServiceTest.java @@ -1,18 +1,5 @@ -package de.vitagroup.num.service; - -import de.vitagroup.num.domain.model.MailDomain; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.OrganizationDto; -import de.vitagroup.num.domain.dto.SearchCriteria; -import de.vitagroup.num.domain.repository.MailDomainRepository; -import de.vitagroup.num.domain.repository.OrganizationRepository; -import de.vitagroup.num.domain.specification.OrganizationSpecification; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.ForbiddenException; -import de.vitagroup.num.service.exception.ResourceNotFound; -import de.vitagroup.num.service.exception.SystemException; +package org.highmed.service; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -27,15 +14,28 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; +import org.highmed.domain.dto.OrganizationDto; +import org.highmed.domain.dto.SearchCriteria; +import org.highmed.domain.model.MailDomain; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.Roles; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.MailDomainRepository; +import org.highmed.domain.repository.OrganizationRepository; +import org.highmed.domain.specification.OrganizationSpecification; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.ForbiddenException; +import org.highmed.service.exception.ResourceNotFound; +import org.highmed.service.exception.SystemException; import java.util.*; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; @RunWith(MockitoJUnitRunner.class) public class OrganizationServiceTest { diff --git a/src/test/java/de/vitagroup/num/service/ProjectDocCreatorTest.java b/src/test/java/org/highmed/service/ProjectDocCreatorTest.java similarity index 89% rename from src/test/java/de/vitagroup/num/service/ProjectDocCreatorTest.java rename to src/test/java/org/highmed/service/ProjectDocCreatorTest.java index 403e4d1bc..12635f6c3 100644 --- a/src/test/java/de/vitagroup/num/service/ProjectDocCreatorTest.java +++ b/src/test/java/org/highmed/service/ProjectDocCreatorTest.java @@ -1,11 +1,5 @@ -package de.vitagroup.num.service; +package org.highmed.service; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.dto.OrganizationDto; -import de.vitagroup.num.domain.dto.ProjectDto; -import de.vitagroup.num.domain.dto.UserDetailsDto; -import de.vitagroup.num.domain.model.*; -import de.vitagroup.num.domain.repository.CohortRepository; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -14,6 +8,12 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.context.MessageSource; +import org.highmed.domain.dto.OrganizationDto; +import org.highmed.domain.dto.ProjectDto; +import org.highmed.domain.dto.UserDetailsDto; +import org.highmed.domain.model.*; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.repository.CohortRepository; import java.io.IOException; import java.time.OffsetDateTime; diff --git a/src/test/java/de/vitagroup/num/service/ProjectServiceTest.java b/src/test/java/org/highmed/service/ProjectServiceTest.java similarity index 98% rename from src/test/java/de/vitagroup/num/service/ProjectServiceTest.java rename to src/test/java/org/highmed/service/ProjectServiceTest.java index 1d124572b..e5bc92b6d 100644 --- a/src/test/java/de/vitagroup/num/service/ProjectServiceTest.java +++ b/src/test/java/org/highmed/service/ProjectServiceTest.java @@ -1,27 +1,7 @@ -package de.vitagroup.num.service; +package org.highmed.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.attachment.service.AttachmentService; -import de.vitagroup.num.domain.dto.*; -import de.vitagroup.num.domain.model.*; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.repository.ProjectRepository; -import de.vitagroup.num.domain.specification.ProjectSpecification; -import de.vitagroup.num.mapper.ProjectMapper; -import de.vitagroup.num.properties.ConsentProperties; -import de.vitagroup.num.properties.PrivacyProperties; -import de.vitagroup.num.service.atna.AtnaService; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.ehrbase.ResponseFilter; -import de.vitagroup.num.service.exception.*; -import de.vitagroup.num.service.notification.NotificationService; -import de.vitagroup.num.service.notification.dto.Notification; -import de.vitagroup.num.service.notification.dto.ProjectCloseNotification; -import de.vitagroup.num.service.notification.dto.ProjectStartNotification; -import de.vitagroup.num.service.notification.dto.ProjectStatusChangeRequestNotification; -import de.vitagroup.num.service.policy.ProjectPolicyService; import org.ehrbase.aqleditor.service.AqlEditorAqlService; import org.ehrbase.openehr.sdk.aql.dto.AqlQuery; import org.ehrbase.openehr.sdk.aql.dto.condition.LogicalOperatorCondition; @@ -31,6 +11,8 @@ import org.ehrbase.openehr.sdk.aql.parser.AqlQueryParser; import org.ehrbase.openehr.sdk.aql.render.AqlRenderer; import org.ehrbase.openehr.sdk.response.dto.QueryResponseData; +import org.highmed.attachment.service.AttachmentService; +import org.highmed.domain.dto.*; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -44,6 +26,24 @@ import org.springframework.mock.web.MockMultipartFile; import org.springframework.util.MultiValueMap; import org.springframework.web.multipart.MultipartFile; +import org.highmed.domain.model.*; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.ProjectRepository; +import org.highmed.domain.specification.ProjectSpecification; +import org.highmed.mapper.ProjectMapper; +import org.highmed.properties.ConsentProperties; +import org.highmed.properties.PrivacyProperties; +import org.highmed.service.atna.AtnaService; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.ehrbase.ResponseFilter; +import org.highmed.service.exception.*; +import org.highmed.service.notification.NotificationService; +import org.highmed.service.notification.dto.Notification; +import org.highmed.service.notification.dto.ProjectCloseNotification; +import org.highmed.service.notification.dto.ProjectStartNotification; +import org.highmed.service.notification.dto.ProjectStatusChangeRequestNotification; +import org.highmed.service.policy.ProjectPolicyService; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -58,9 +58,6 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import static de.vitagroup.num.domain.model.ProjectStatus.*; -import static de.vitagroup.num.domain.model.Roles.*; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; @@ -69,6 +66,9 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; +import static org.highmed.domain.model.ProjectStatus.*; +import static org.highmed.domain.model.Roles.*; +import static org.highmed.domain.templates.ExceptionsTemplate.*; @RunWith(MockitoJUnitRunner.class) public class ProjectServiceTest { diff --git a/src/test/java/de/vitagroup/num/service/TemplateServiceTest.java b/src/test/java/org/highmed/service/TemplateServiceTest.java similarity index 83% rename from src/test/java/de/vitagroup/num/service/TemplateServiceTest.java rename to src/test/java/org/highmed/service/TemplateServiceTest.java index 013d8ee33..a0e26ae08 100644 --- a/src/test/java/de/vitagroup/num/service/TemplateServiceTest.java +++ b/src/test/java/org/highmed/service/TemplateServiceTest.java @@ -1,11 +1,5 @@ -package de.vitagroup.num.service; - -import de.vitagroup.num.domain.dto.TemplateMetadataDto; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.mapper.TemplateMapper; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.SystemException; +package org.highmed.service; + import org.ehrbase.aqleditor.dto.containment.ContainmentDto; import org.ehrbase.aqleditor.service.AqlEditorContainmentService; import org.ehrbase.openehr.sdk.response.dto.ehrscape.TemplateMetaDataDto; @@ -15,17 +9,23 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.domain.dto.TemplateMetadataDto; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.mapper.TemplateMapper; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.SystemException; import java.time.OffsetDateTime; import java.util.List; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_CREATE_QUERY_FOR_TEMPLATE_WITH_ID; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_FIND_TEMPLATE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; +import static org.highmed.domain.templates.ExceptionsTemplate.CANNOT_CREATE_QUERY_FOR_TEMPLATE_WITH_ID; +import static org.highmed.domain.templates.ExceptionsTemplate.CANNOT_FIND_TEMPLATE; @RunWith(MockitoJUnitRunner.class) public class TemplateServiceTest { diff --git a/src/test/java/de/vitagroup/num/service/UserDetailsServiceTest.java b/src/test/java/org/highmed/service/UserDetailsServiceTest.java similarity index 90% rename from src/test/java/de/vitagroup/num/service/UserDetailsServiceTest.java rename to src/test/java/org/highmed/service/UserDetailsServiceTest.java index 48cc7ad04..26f529503 100644 --- a/src/test/java/de/vitagroup/num/service/UserDetailsServiceTest.java +++ b/src/test/java/org/highmed/service/UserDetailsServiceTest.java @@ -1,23 +1,5 @@ -package de.vitagroup.num.service; - -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.OrganizationDto; -import de.vitagroup.num.domain.repository.OrganizationRepository; -import de.vitagroup.num.domain.repository.UserDetailsRepository; -import de.vitagroup.num.domain.specification.UserDetailsSpecification; -import de.vitagroup.num.domain.templates.ExceptionsTemplate; -import de.vitagroup.num.service.exception.ForbiddenException; -import de.vitagroup.num.service.exception.ResourceNotFound; -import de.vitagroup.num.service.exception.SystemException; -import de.vitagroup.num.service.notification.NotificationService; -import de.vitagroup.num.service.notification.dto.NewUserNotification; -import de.vitagroup.num.service.notification.dto.Notification; -import de.vitagroup.num.service.notification.dto.account.AccountApprovalNotification; -import de.vitagroup.num.service.notification.dto.account.AccountStatusChangedNotification; -import de.vitagroup.num.service.notification.dto.account.OrganizationUpdateNotification; +package org.highmed.service; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -26,6 +8,24 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.highmed.domain.dto.OrganizationDto; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.Roles; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.OrganizationRepository; +import org.highmed.domain.repository.UserDetailsRepository; +import org.highmed.domain.specification.UserDetailsSpecification; +import org.highmed.domain.templates.ExceptionsTemplate; +import org.highmed.service.exception.ForbiddenException; +import org.highmed.service.exception.ResourceNotFound; +import org.highmed.service.exception.SystemException; +import org.highmed.service.notification.NotificationService; +import org.highmed.service.notification.dto.NewUserNotification; +import org.highmed.service.notification.dto.Notification; +import org.highmed.service.notification.dto.account.AccountApprovalNotification; +import org.highmed.service.notification.dto.account.AccountStatusChangedNotification; +import org.highmed.service.notification.dto.account.OrganizationUpdateNotification; import java.util.HashSet; import java.util.List; diff --git a/src/test/java/de/vitagroup/num/service/UserServiceTest.java b/src/test/java/org/highmed/service/UserServiceTest.java similarity index 97% rename from src/test/java/de/vitagroup/num/service/UserServiceTest.java rename to src/test/java/org/highmed/service/UserServiceTest.java index 08d2b1228..f81b59751 100644 --- a/src/test/java/de/vitagroup/num/service/UserServiceTest.java +++ b/src/test/java/org/highmed/service/UserServiceTest.java @@ -1,28 +1,8 @@ -package de.vitagroup.num.service; - -import de.vitagroup.num.domain.model.EntityGroup; -import de.vitagroup.num.domain.model.Organization; -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.domain.model.Translation; -import de.vitagroup.num.domain.model.admin.Role; -import de.vitagroup.num.domain.model.admin.User; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.domain.dto.*; -import de.vitagroup.num.domain.repository.TranslationRepository; -import de.vitagroup.num.domain.repository.UserDetailsRepository; -import de.vitagroup.num.domain.specification.UserDetailsSpecification; -import de.vitagroup.num.mapper.OrganizationMapper; -import de.vitagroup.num.service.exception.BadRequestException; -import de.vitagroup.num.service.exception.ForbiddenException; -import de.vitagroup.num.service.exception.ResourceNotFound; -import de.vitagroup.num.service.exception.SystemException; -import de.vitagroup.num.service.notification.NotificationService; -import de.vitagroup.num.service.notification.dto.Notification; -import de.vitagroup.num.service.notification.dto.account.RolesUpdateNotification; -import de.vitagroup.num.service.notification.dto.account.UserNameUpdateNotification; -import de.vitagroup.num.web.feign.KeycloakFeign; +package org.highmed.service; + import feign.FeignException; import feign.Request; +import org.highmed.domain.dto.*; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -35,6 +15,26 @@ import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.highmed.domain.model.EntityGroup; +import org.highmed.domain.model.Organization; +import org.highmed.domain.model.Roles; +import org.highmed.domain.model.Translation; +import org.highmed.domain.model.admin.Role; +import org.highmed.domain.model.admin.User; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.domain.repository.TranslationRepository; +import org.highmed.domain.repository.UserDetailsRepository; +import org.highmed.domain.specification.UserDetailsSpecification; +import org.highmed.mapper.OrganizationMapper; +import org.highmed.service.exception.BadRequestException; +import org.highmed.service.exception.ForbiddenException; +import org.highmed.service.exception.ResourceNotFound; +import org.highmed.service.exception.SystemException; +import org.highmed.service.notification.NotificationService; +import org.highmed.service.notification.dto.Notification; +import org.highmed.service.notification.dto.account.RolesUpdateNotification; +import org.highmed.service.notification.dto.account.UserNameUpdateNotification; +import org.highmed.web.feign.KeycloakFeign; import java.nio.charset.Charset; import java.time.LocalDateTime; @@ -43,14 +43,14 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.USER_NOT_FOUND; -import static de.vitagroup.num.service.UserService.TRANSLATION_CACHE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; +import static org.highmed.domain.templates.ExceptionsTemplate.USER_NOT_FOUND; +import static org.highmed.service.UserService.TRANSLATION_CACHE; @RunWith(MockitoJUnitRunner.class) public class UserServiceTest { diff --git a/src/test/java/de/vitagroup/num/service/ehrbase/CompositionFlattenerTest.java b/src/test/java/org/highmed/service/ehrbase/CompositionFlattenerTest.java similarity index 94% rename from src/test/java/de/vitagroup/num/service/ehrbase/CompositionFlattenerTest.java rename to src/test/java/org/highmed/service/ehrbase/CompositionFlattenerTest.java index a33fd13b4..20162be3b 100644 --- a/src/test/java/de/vitagroup/num/service/ehrbase/CompositionFlattenerTest.java +++ b/src/test/java/org/highmed/service/ehrbase/CompositionFlattenerTest.java @@ -1,8 +1,7 @@ -package de.vitagroup.num.service.ehrbase; +package org.highmed.service.ehrbase; import com.nedap.archie.rm.archetyped.Archetyped; import com.nedap.archie.rm.composition.Composition; -import de.vitagroup.num.service.exception.SystemException; import lombok.SneakyThrows; import org.apache.xmlbeans.XmlException; import org.ehrbase.openehr.sdk.client.templateprovider.ClientTemplateProvider; @@ -16,18 +15,19 @@ import org.mockito.junit.MockitoJUnitRunner; import org.openehr.schemas.v1.TemplateDocument; import org.testcontainers.shaded.org.apache.commons.io.IOUtils; +import org.highmed.service.exception.SystemException; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.Optional; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_PARSE_RESULTS_COMPOSITION_MISSING_TEMPLATE_ID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; +import static org.highmed.domain.templates.ExceptionsTemplate.CANNOT_PARSE_RESULTS_COMPOSITION_MISSING_TEMPLATE_ID; @RunWith(MockitoJUnitRunner.class) public class CompositionFlattenerTest { diff --git a/src/test/java/de/vitagroup/num/service/ehrbase/CompositionResponseDataBuilderTest.java b/src/test/java/org/highmed/service/ehrbase/CompositionResponseDataBuilderTest.java similarity index 98% rename from src/test/java/de/vitagroup/num/service/ehrbase/CompositionResponseDataBuilderTest.java rename to src/test/java/org/highmed/service/ehrbase/CompositionResponseDataBuilderTest.java index 7fca64492..a2b01dd16 100644 --- a/src/test/java/de/vitagroup/num/service/ehrbase/CompositionResponseDataBuilderTest.java +++ b/src/test/java/org/highmed/service/ehrbase/CompositionResponseDataBuilderTest.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.ehrbase; +package org.highmed.service.ehrbase; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.SneakyThrows; diff --git a/src/test/java/de/vitagroup/num/service/ehrbase/ParameterServiceTest.java b/src/test/java/org/highmed/service/ehrbase/ParameterServiceTest.java similarity index 98% rename from src/test/java/de/vitagroup/num/service/ehrbase/ParameterServiceTest.java rename to src/test/java/org/highmed/service/ehrbase/ParameterServiceTest.java index 42936dba9..3e7fb5310 100644 --- a/src/test/java/de/vitagroup/num/service/ehrbase/ParameterServiceTest.java +++ b/src/test/java/org/highmed/service/ehrbase/ParameterServiceTest.java @@ -1,8 +1,5 @@ -package de.vitagroup.num.service.ehrbase; +package org.highmed.service.ehrbase; -import de.vitagroup.num.domain.dto.ParameterOptionsDto; -import de.vitagroup.num.domain.model.admin.UserDetails; -import de.vitagroup.num.service.UserDetailsService; import org.ehrbase.openehr.sdk.response.dto.QueryResponseData; import org.junit.Assert; import org.junit.Before; @@ -16,6 +13,9 @@ import org.mockito.MockitoAnnotations; import org.springframework.cache.CacheManager; import org.springframework.cache.concurrent.ConcurrentMapCache; +import org.highmed.domain.dto.ParameterOptionsDto; +import org.highmed.domain.model.admin.UserDetails; +import org.highmed.service.UserDetailsService; import java.util.*; diff --git a/src/test/java/de/vitagroup/num/service/ehrbase/PseudonimytyCodexPSNTest.java b/src/test/java/org/highmed/service/ehrbase/PseudonimytyCodexPSNTest.java similarity index 90% rename from src/test/java/de/vitagroup/num/service/ehrbase/PseudonimytyCodexPSNTest.java rename to src/test/java/org/highmed/service/ehrbase/PseudonimytyCodexPSNTest.java index 3b1f06d88..53118b4b8 100644 --- a/src/test/java/de/vitagroup/num/service/ehrbase/PseudonimytyCodexPSNTest.java +++ b/src/test/java/org/highmed/service/ehrbase/PseudonimytyCodexPSNTest.java @@ -1,9 +1,5 @@ -package de.vitagroup.num.service.ehrbase; +package org.highmed.service.ehrbase; -import de.vitagroup.num.config.FttpClientConfig; -import de.vitagroup.num.properties.FttpProperties; -import de.vitagroup.num.properties.PrivacyProperties; -import de.vitagroup.num.properties.PseudonymsPsnWorkflowProperties; import org.apache.commons.io.IOUtils; import org.junit.Ignore; import org.junit.Test; @@ -13,6 +9,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; +import org.highmed.config.FttpClientConfig; +import org.highmed.properties.FttpProperties; +import org.highmed.properties.PrivacyProperties; +import org.highmed.properties.PseudonymsPsnWorkflowProperties; import java.io.*; import java.time.LocalDateTime; diff --git a/src/test/java/de/vitagroup/num/service/ehrbase/PseudonymityTest.java b/src/test/java/org/highmed/service/ehrbase/PseudonymityTest.java similarity index 97% rename from src/test/java/de/vitagroup/num/service/ehrbase/PseudonymityTest.java rename to src/test/java/org/highmed/service/ehrbase/PseudonymityTest.java index 91c4c3a13..ba4309b54 100644 --- a/src/test/java/de/vitagroup/num/service/ehrbase/PseudonymityTest.java +++ b/src/test/java/org/highmed/service/ehrbase/PseudonymityTest.java @@ -1,12 +1,8 @@ -package de.vitagroup.num.service.ehrbase; +package org.highmed.service.ehrbase; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.parser.XmlParser; -import de.vitagroup.num.properties.FttpProperties; -import de.vitagroup.num.properties.PrivacyProperties; -import de.vitagroup.num.properties.PseudonymsPsnWorkflowProperties; -import de.vitagroup.num.service.exception.ResourceNotFound; import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; import org.apache.http.client.methods.CloseableHttpResponse; @@ -26,6 +22,10 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.test.util.ReflectionTestUtils; +import org.highmed.properties.FttpProperties; +import org.highmed.properties.PrivacyProperties; +import org.highmed.properties.PseudonymsPsnWorkflowProperties; +import org.highmed.service.exception.ResourceNotFound; import java.io.IOException; import java.util.Arrays; diff --git a/src/test/java/de/vitagroup/num/service/ehrbase/ResponseFilterTest.java b/src/test/java/org/highmed/service/ehrbase/ResponseFilterTest.java similarity index 98% rename from src/test/java/de/vitagroup/num/service/ehrbase/ResponseFilterTest.java rename to src/test/java/org/highmed/service/ehrbase/ResponseFilterTest.java index 886e8bb6c..a8fd483ec 100644 --- a/src/test/java/de/vitagroup/num/service/ehrbase/ResponseFilterTest.java +++ b/src/test/java/org/highmed/service/ehrbase/ResponseFilterTest.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.ehrbase; +package org.highmed.service.ehrbase; import org.ehrbase.openehr.sdk.response.dto.QueryResponseData; import org.junit.Before; diff --git a/src/test/java/de/vitagroup/num/service/email/EmailServiceTest.java b/src/test/java/org/highmed/service/email/EmailServiceTest.java similarity index 97% rename from src/test/java/de/vitagroup/num/service/email/EmailServiceTest.java rename to src/test/java/org/highmed/service/email/EmailServiceTest.java index f6ce30f48..64471eaaa 100644 --- a/src/test/java/de/vitagroup/num/service/email/EmailServiceTest.java +++ b/src/test/java/org/highmed/service/email/EmailServiceTest.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.email; +package org.highmed.service.email; import jakarta.mail.Message; import jakarta.mail.MessagingException; diff --git a/src/test/java/de/vitagroup/num/service/executors/AqlExecutorTest.java b/src/test/java/org/highmed/service/executors/AqlExecutorTest.java similarity index 90% rename from src/test/java/de/vitagroup/num/service/executors/AqlExecutorTest.java rename to src/test/java/org/highmed/service/executors/AqlExecutorTest.java index 3676c9e2d..755302669 100644 --- a/src/test/java/de/vitagroup/num/service/executors/AqlExecutorTest.java +++ b/src/test/java/org/highmed/service/executors/AqlExecutorTest.java @@ -1,9 +1,5 @@ -package de.vitagroup.num.service.executors; +package org.highmed.service.executors; -import de.vitagroup.num.domain.model.CohortAql; -import de.vitagroup.num.properties.ConsentProperties; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.policy.ProjectPolicyService; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -11,6 +7,10 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.domain.model.CohortAql; +import org.highmed.properties.ConsentProperties; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.policy.ProjectPolicyService; import java.util.Collections; import java.util.Map; diff --git a/src/test/java/de/vitagroup/num/service/executors/CohortExecutorTest.java b/src/test/java/org/highmed/service/executors/CohortExecutorTest.java similarity index 90% rename from src/test/java/de/vitagroup/num/service/executors/CohortExecutorTest.java rename to src/test/java/org/highmed/service/executors/CohortExecutorTest.java index 9ef3c0a41..c0b08bc56 100644 --- a/src/test/java/de/vitagroup/num/service/executors/CohortExecutorTest.java +++ b/src/test/java/org/highmed/service/executors/CohortExecutorTest.java @@ -1,20 +1,5 @@ -package de.vitagroup.num.service.executors; +package org.highmed.service.executors; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNull.notNullValue; -import static org.mockito.Mockito.when; - -import de.vitagroup.num.domain.model.Cohort; -import de.vitagroup.num.domain.model.CohortAql; -import de.vitagroup.num.domain.model.CohortGroup; -import de.vitagroup.num.domain.model.Operator; -import de.vitagroup.num.domain.model.Type; -import de.vitagroup.num.service.ehrbase.EhrBaseService; -import de.vitagroup.num.service.exception.IllegalArgumentException; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -22,6 +7,18 @@ import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.domain.model.*; +import org.highmed.service.ehrbase.EhrBaseService; +import org.highmed.service.exception.IllegalArgumentException; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class CohortExecutorTest { diff --git a/src/test/java/de/vitagroup/num/service/executors/CohortQueryListerTest.java b/src/test/java/org/highmed/service/executors/CohortQueryListerTest.java similarity index 88% rename from src/test/java/de/vitagroup/num/service/executors/CohortQueryListerTest.java rename to src/test/java/org/highmed/service/executors/CohortQueryListerTest.java index 140d318eb..b9529f3c8 100644 --- a/src/test/java/de/vitagroup/num/service/executors/CohortQueryListerTest.java +++ b/src/test/java/org/highmed/service/executors/CohortQueryListerTest.java @@ -1,14 +1,14 @@ -package de.vitagroup.num.service.executors; +package org.highmed.service.executors; -import de.vitagroup.num.domain.model.Cohort; -import de.vitagroup.num.domain.model.CohortAql; -import de.vitagroup.num.domain.model.CohortGroup; -import de.vitagroup.num.domain.model.Type; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.domain.model.Cohort; +import org.highmed.domain.model.CohortAql; +import org.highmed.domain.model.CohortGroup; +import org.highmed.domain.model.Type; import java.util.List; diff --git a/src/test/java/de/vitagroup/num/service/executors/SetOperationsServiceTest.java b/src/test/java/org/highmed/service/executors/SetOperationsServiceTest.java similarity index 95% rename from src/test/java/de/vitagroup/num/service/executors/SetOperationsServiceTest.java rename to src/test/java/org/highmed/service/executors/SetOperationsServiceTest.java index e90575418..0f5279ff0 100644 --- a/src/test/java/de/vitagroup/num/service/executors/SetOperationsServiceTest.java +++ b/src/test/java/org/highmed/service/executors/SetOperationsServiceTest.java @@ -1,18 +1,21 @@ -package de.vitagroup.num.service.executors; +package org.highmed.service.executors; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNull.notNullValue; - -import de.vitagroup.num.domain.model.Operator; -import de.vitagroup.num.service.exception.IllegalArgumentException; import org.apache.commons.collections4.SetUtils; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.domain.model.Operator; +import org.highmed.service.exception.IllegalArgumentException; -import java.util.*; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsNull.notNullValue; @RunWith(MockitoJUnitRunner.class) public class SetOperationsServiceTest { diff --git a/src/test/java/de/vitagroup/num/service/logger/NumLoggerTest.java b/src/test/java/org/highmed/service/logger/NumLoggerTest.java similarity index 98% rename from src/test/java/de/vitagroup/num/service/logger/NumLoggerTest.java rename to src/test/java/org/highmed/service/logger/NumLoggerTest.java index 26843c0d5..483e43053 100644 --- a/src/test/java/de/vitagroup/num/service/logger/NumLoggerTest.java +++ b/src/test/java/org/highmed/service/logger/NumLoggerTest.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.logger; +package org.highmed.service.logger; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.MethodSignature; diff --git a/src/test/java/de/vitagroup/num/service/notification/NotificationServiceTest.java b/src/test/java/org/highmed/service/notification/NotificationServiceTest.java similarity index 89% rename from src/test/java/de/vitagroup/num/service/notification/NotificationServiceTest.java rename to src/test/java/org/highmed/service/notification/NotificationServiceTest.java index 977561cd3..a842c83f0 100644 --- a/src/test/java/de/vitagroup/num/service/notification/NotificationServiceTest.java +++ b/src/test/java/org/highmed/service/notification/NotificationServiceTest.java @@ -1,22 +1,21 @@ -package de.vitagroup.num.service.notification; - -import de.vitagroup.num.domain.model.Roles; -import de.vitagroup.num.properties.NumProperties; -import de.vitagroup.num.service.email.EmailService; -import de.vitagroup.num.service.email.MessageSourceWrapper; -import de.vitagroup.num.service.notification.dto.*; -import de.vitagroup.num.service.notification.dto.account.AccountApprovalNotification; -import de.vitagroup.num.service.notification.dto.account.AccountStatusChangedNotification; -import de.vitagroup.num.service.notification.dto.account.RolesUpdateNotification; -import de.vitagroup.num.service.notification.dto.account.UserNameUpdateNotification; +package org.highmed.service.notification; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.domain.model.Roles; +import org.highmed.properties.NumProperties; +import org.highmed.service.email.EmailService; +import org.highmed.service.email.MessageSourceWrapper; +import org.highmed.service.notification.dto.*; +import org.highmed.service.notification.dto.account.AccountApprovalNotification; +import org.highmed.service.notification.dto.account.AccountStatusChangedNotification; +import org.highmed.service.notification.dto.account.RolesUpdateNotification; +import org.highmed.service.notification.dto.account.UserNameUpdateNotification; import java.util.Arrays; import java.util.Collections; diff --git a/src/test/java/de/vitagroup/num/service/policy/EhrPolicyTest.java b/src/test/java/org/highmed/service/policy/EhrPolicyTest.java similarity index 76% rename from src/test/java/de/vitagroup/num/service/policy/EhrPolicyTest.java rename to src/test/java/org/highmed/service/policy/EhrPolicyTest.java index 05e204c7d..008edb40b 100644 --- a/src/test/java/de/vitagroup/num/service/policy/EhrPolicyTest.java +++ b/src/test/java/org/highmed/service/policy/EhrPolicyTest.java @@ -1,15 +1,15 @@ -package de.vitagroup.num.service.policy; +package org.highmed.service.policy; -import de.vitagroup.num.service.exception.SystemException; import org.ehrbase.openehr.sdk.aql.dto.AqlQuery; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.service.exception.SystemException; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.COHORT_SIZE_CANNOT_BE_0; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.INVALID_AQL; import static org.mockito.Mockito.when; +import static org.highmed.domain.templates.ExceptionsTemplate.COHORT_SIZE_CANNOT_BE_0; +import static org.highmed.domain.templates.ExceptionsTemplate.INVALID_AQL; @RunWith(MockitoJUnitRunner.class) public class EhrPolicyTest { diff --git a/src/test/java/de/vitagroup/num/service/policy/EuropeanConsentPolicyTest.java b/src/test/java/org/highmed/service/policy/EuropeanConsentPolicyTest.java similarity index 78% rename from src/test/java/de/vitagroup/num/service/policy/EuropeanConsentPolicyTest.java rename to src/test/java/org/highmed/service/policy/EuropeanConsentPolicyTest.java index 92ba5518f..e5f72c03f 100644 --- a/src/test/java/de/vitagroup/num/service/policy/EuropeanConsentPolicyTest.java +++ b/src/test/java/org/highmed/service/policy/EuropeanConsentPolicyTest.java @@ -1,15 +1,15 @@ -package de.vitagroup.num.service.policy; +package org.highmed.service.policy; -import de.vitagroup.num.service.exception.SystemException; import org.ehrbase.openehr.sdk.aql.dto.AqlQuery; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.service.exception.SystemException; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.CANNOT_CHECK_CONSENT_FOR_DATA_USAGE_OUTSIDE_THE_EUROPEAN_UNION_OID_NOT_CONFIGURED; -import static de.vitagroup.num.domain.templates.ExceptionsTemplate.INVALID_AQL; import static org.mockito.Mockito.when; +import static org.highmed.domain.templates.ExceptionsTemplate.CANNOT_CHECK_CONSENT_FOR_DATA_USAGE_OUTSIDE_THE_EUROPEAN_UNION_OID_NOT_CONFIGURED; +import static org.highmed.domain.templates.ExceptionsTemplate.INVALID_AQL; @RunWith(MockitoJUnitRunner.class) public class EuropeanConsentPolicyTest { diff --git a/src/test/java/de/vitagroup/num/service/policy/ProjectPolicyServiceTest.java b/src/test/java/org/highmed/service/policy/ProjectPolicyServiceTest.java similarity index 97% rename from src/test/java/de/vitagroup/num/service/policy/ProjectPolicyServiceTest.java rename to src/test/java/org/highmed/service/policy/ProjectPolicyServiceTest.java index a4fa4ba21..2585f566a 100644 --- a/src/test/java/de/vitagroup/num/service/policy/ProjectPolicyServiceTest.java +++ b/src/test/java/org/highmed/service/policy/ProjectPolicyServiceTest.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.policy; +package org.highmed.service.policy; import org.ehrbase.openehr.sdk.aql.dto.AqlQuery; import org.ehrbase.openehr.sdk.aql.dto.condition.LogicalOperatorCondition; diff --git a/src/test/java/de/vitagroup/num/service/policy/TemplatesPolicyTest.java b/src/test/java/org/highmed/service/policy/TemplatesPolicyTest.java similarity index 91% rename from src/test/java/de/vitagroup/num/service/policy/TemplatesPolicyTest.java rename to src/test/java/org/highmed/service/policy/TemplatesPolicyTest.java index 0503746a6..6579a5b21 100644 --- a/src/test/java/de/vitagroup/num/service/policy/TemplatesPolicyTest.java +++ b/src/test/java/org/highmed/service/policy/TemplatesPolicyTest.java @@ -1,10 +1,10 @@ -package de.vitagroup.num.service.policy; +package org.highmed.service.policy; -import de.vitagroup.num.service.exception.SystemException; import org.ehrbase.openehr.sdk.aql.parser.AqlQueryParser; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; +import org.highmed.service.exception.SystemException; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/de/vitagroup/num/service/zars/MemoryAppender.java b/src/test/java/org/highmed/service/zars/MemoryAppender.java similarity index 92% rename from src/test/java/de/vitagroup/num/service/zars/MemoryAppender.java rename to src/test/java/org/highmed/service/zars/MemoryAppender.java index 7e6df6a38..ebc234301 100644 --- a/src/test/java/de/vitagroup/num/service/zars/MemoryAppender.java +++ b/src/test/java/org/highmed/service/zars/MemoryAppender.java @@ -1,4 +1,4 @@ -package de.vitagroup.num.service.zars; +package org.highmed.service.zars; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/src/test/java/de/vitagroup/num/service/zars/TestMessageSource.java b/src/test/java/org/highmed/service/zars/TestMessageSource.java similarity index 90% rename from src/test/java/de/vitagroup/num/service/zars/TestMessageSource.java rename to src/test/java/org/highmed/service/zars/TestMessageSource.java index f72d34d50..1dd7f19ca 100644 --- a/src/test/java/de/vitagroup/num/service/zars/TestMessageSource.java +++ b/src/test/java/org/highmed/service/zars/TestMessageSource.java @@ -1,8 +1,9 @@ -package de.vitagroup.num.service.zars; +package org.highmed.service.zars; -import java.nio.charset.StandardCharsets; import org.springframework.context.support.ReloadableResourceBundleMessageSource; +import java.nio.charset.StandardCharsets; + public class TestMessageSource extends ReloadableResourceBundleMessageSource { public TestMessageSource() { diff --git a/src/test/java/de/vitagroup/num/service/zars/ZarsServiceTest.java b/src/test/java/org/highmed/service/zars/ZarsServiceTest.java similarity index 85% rename from src/test/java/de/vitagroup/num/service/zars/ZarsServiceTest.java rename to src/test/java/org/highmed/service/zars/ZarsServiceTest.java index 9622131d5..87e76316a 100644 --- a/src/test/java/de/vitagroup/num/service/zars/ZarsServiceTest.java +++ b/src/test/java/org/highmed/service/zars/ZarsServiceTest.java @@ -1,20 +1,9 @@ -package de.vitagroup.num.service.zars; - -import static org.junit.jupiter.api.Assertions.assertTrue; +package org.highmed.service.zars; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import com.fasterxml.jackson.databind.ObjectMapper; -import de.vitagroup.num.domain.model.ProjectCategories; -import de.vitagroup.num.domain.model.ProjectStatus; -import de.vitagroup.num.domain.dto.ZarsInfoDto; -import de.vitagroup.num.service.email.EmailService; -import de.vitagroup.num.service.email.ZarsProperties; -import de.vitagroup.num.service.email.ZarsService; - -import java.time.LocalDate; -import java.util.Set; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -24,6 +13,17 @@ import org.mockito.junit.MockitoJUnitRunner; import org.slf4j.LoggerFactory; import org.springframework.context.MessageSource; +import org.highmed.domain.dto.ZarsInfoDto; +import org.highmed.domain.model.ProjectCategories; +import org.highmed.domain.model.ProjectStatus; +import org.highmed.service.email.EmailService; +import org.highmed.service.email.ZarsProperties; +import org.highmed.service.email.ZarsService; + +import java.time.LocalDate; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertTrue; @RunWith(MockitoJUnitRunner.class) public class ZarsServiceTest {