From 1eef4bfb1c2ff12e058b325a0e357b55bef6c1dd Mon Sep 17 00:00:00 2001 From: Thomas Georgios Giannos Date: Mon, 12 Feb 2024 11:49:37 +0200 Subject: [PATCH] Renaming packages on annotation service not to interfere with notification service --- .../web/AnnotationApplication.java | 6 ++-- .../web/WebConfiguration.java | 10 +++--- .../OwnedAuthorizationHandler.java | 8 ++--- .../config/AppMessageSourceConfiguration.java | 2 +- .../web/config/SecurityConfiguration.java | 8 ++--- .../GlobalExceptionHandler.java | 4 +-- .../web/controllers/PrincipalController.java | 10 +++--- .../TenantConfigurationController.java | 26 +++++++------- .../error/GenericErrorHandler.java | 0 .../web/interceptors/UserInterceptor.java | 14 ++++---- .../UserInterceptorCacheOptions.java | 2 +- .../UserInterceptorCacheService.java | 2 +- .../web/model/Account.java | 2 +- .../web/model/AccountBuilder.java | 4 +-- .../web/model/QueryResult.java | 2 +- .../tenant/TenantByCodeCacheOptions.java | 2 +- .../tenant/TenantByCodeCacheService.java | 6 ++-- .../scope/tenant/TenantByIdCacheOptions.java | 2 +- .../scope/tenant/TenantByIdCacheService.java | 6 ++-- .../web/scope/tenant/TenantInterceptor.java | 18 +++++----- .../tenant/TenantScopeClaimInterceptor.java | 12 +++---- .../tenant/TenantScopeConfiguration.java | 2 +- .../tenant/TenantScopeHeaderInterceptor.java | 10 +++--- .../scope/tenant/TenantScopeProperties.java | 2 +- .../tenant/UserAllowedTenantCacheOptions.java | 2 +- .../tenant/UserAllowedTenantCacheService.java | 6 ++-- .../web/scope/user/UserInterceptor.java | 0 .../user/UserInterceptorCacheOptions.java | 0 .../user/UserInterceptorCacheService.java | 0 .../audit/AuditableAction.java | 2 +- .../authorization/AuthorizationFlags.java | 2 +- .../OwnedAuthorizationRequirement.java | 2 +- .../authorization/OwnedResource.java | 2 +- .../authorization/Permission.java | 2 +- ...ormattingUserprofileCacheCacheService.java | 6 ++-- .../common/JsonHandlingService.java | 2 +- .../common/StringUtils.java | 2 +- .../common/XmlHandlingService.java | 4 +-- .../common/enums/ContactInfoType.java | 4 +-- .../common/enums/EnumUtils.java | 4 +-- .../common/enums/IsActive.java | 4 +-- .../common/enums/TenantConfigurationType.java | 4 +-- .../common/lock/LockByKeyManager.java | 2 +- .../scope/fake/FakeRequestAttributes.java | 2 +- .../common/scope/fake/FakeRequestScope.java | 2 +- .../tenant/MultitenancyConfiguration.java | 2 +- .../scope/tenant/MultitenancyProperties.java | 2 +- .../common/scope/tenant/TenantScope.java | 4 +-- .../common/scope/tenant/TenantScoped.java | 2 +- .../common/scope/user/UserScope.java | 2 +- .../common/types/notification/Attachment.java | 2 +- .../types/notification/ContactPair.java | 4 +-- .../types/tenant/TenantConfigEntity.java | 2 +- .../tenant/TenantDepositConfigEntity.java | 2 +- .../TenantFileTransformersConfigEntity.java | 2 +- .../types/tenant/TenantSourceEntity.java | 2 +- ...tUserLocaleConfigurationDataContainer.java | 2 +- ...EmailClientConfigurationDataContainer.java | 2 +- .../types/user/AdditionalInfoEntity.java | 2 +- .../common/types/xml/XmlBuilder.java | 2 +- .../common/types/xml/XmlSerializable.java | 2 +- .../common/validation/BaseValidator.java | 6 ++-- .../config/db/NamingStrategyProperties.java | 2 +- .../db/PrefixPhysicalNamingStrategy.java | 4 +-- .../config/email/EmailConfig.java | 2 +- .../config/email/EmailProperties.java | 2 +- .../FormattingServiceConfiguration.java | 2 +- .../FormattingServiceProperties.java | 2 +- .../FormattingUserprofileCacheOptions.java | 2 +- .../convention/ConventionService.java | 2 +- .../convention/ConventionServiceImpl.java | 4 +-- .../data/LanguageEntity.java | 8 ++--- .../data/QueueInboxEntity.java | 8 ++--- .../data/QueueOutboxEntity.java | 6 ++-- .../data/TenantConfigurationEntity.java | 12 +++---- .../data/TenantEntity.java | 6 ++-- .../data/TenantScopedEntityManager.java | 8 ++--- .../data/TenantUserEntity.java | 8 ++--- .../data/UserContactInfoEntity.java | 12 +++---- .../data/UserCredentialEntity.java | 8 ++--- .../data/UserEntity.java | 6 ++-- .../data/UserRoleEntity.java | 8 ++--- .../conventers/ContactInfoTypeConverter.java | 4 +-- .../data/conventers/DatabaseEnum.java | 2 +- .../conventers/DatabaseEnumConverter.java | 2 +- .../data/conventers/IsActiveConverter.java | 4 +-- .../TenantConfigurationTypeConverter.java | 4 +-- .../data/tenant/TenantFilterAspect.java | 4 +-- .../data/tenant/TenantListener.java | 6 ++-- .../data/tenant/TenantScopedBaseEntity.java | 4 +-- .../data/types/JsonSQLType.java | 2 +- .../errorcode/ErrorDescription.java | 2 +- .../ErrorThesaurusConfiguration.java | 2 +- .../errorcode/ErrorThesaurusProperties.java | 2 +- .../event/EventBroker.java | 2 +- .../event/TenantTouchedEvent.java | 2 +- .../event/UserAddedToTenantEvent.java | 2 +- .../event/UserRemovedFromTenantEvent.java | 2 +- .../event/UserTouchedEvent.java | 2 +- .../integrationevent/AppRabbitConfigurer.java | 6 ++-- .../InboxIntegrationEventConfigurer.java | 6 ++-- .../IntegrationEventContextImpl.java | 2 +- .../OutboxIntegrationEventConfigurer.java | 6 ++-- .../integrationevent/TrackedEvent.java | 2 +- .../inbox/ConsistencyHandler.java | 2 +- .../inbox/ConsistencyPredicates.java | 5 +++ .../inbox/EventProcessingStatus.java | 2 +- .../inbox/InboxPrincipal.java | 2 +- .../inbox/InboxProperties.java | 2 +- .../inbox/InboxRepositoryImpl.java | 22 ++++++------ .../inbox/IntegrationEventHandler.java | 2 +- .../inbox/IntegrationEventProperties.java | 2 +- .../TenantRemovalConsistencyHandler.java | 6 ++-- .../TenantRemovalConsistencyPredicates.java | 4 +-- .../TenantRemovalIntegrationEvent.java | 4 +-- .../TenantRemovalIntegrationEventHandler.java | 7 ++++ ...antRemovalIntegrationEventHandlerImpl.java | 18 +++++----- .../TenantTouchedIntegrationEvent.java | 4 +-- .../TenantTouchedIntegrationEventHandler.java | 7 ++++ ...antTouchedIntegrationEventHandlerImpl.java | 18 +++++----- .../UserRemovalConsistencyHandler.java | 6 ++-- .../UserRemovalConsistencyPredicates.java | 4 +-- .../UserRemovalIntegrationEvent.java | 4 +-- .../UserRemovalIntegrationEventHandler.java | 7 ++++ ...serRemovalIntegrationEventHandlerImpl.java | 26 +++++++------- .../UserTouchedIntegrationEvent.java | 14 ++++---- .../UserTouchedIntegrationEventHandler.java | 7 ++++ ...serTouchedIntegrationEventHandlerImpl.java | 24 ++++++------- .../outbox/OutboxIntegrationEvent.java | 4 +-- .../outbox/OutboxProperties.java | 2 +- .../outbox/OutboxRepositoryImpl.java | 12 +++---- .../locale/LocaleConfiguration.java | 2 +- .../locale/LocaleProperties.java | 2 +- .../locale/LocaleService.java | 2 +- .../locale/LocaleServiceImpl.java | 4 +-- .../model/Tenant.java | 4 +-- .../model/TenantConfiguration.java | 10 +++--- .../model/User.java | 4 +-- .../model/UserCredential.java | 4 +-- .../model/builder/BaseBuilder.java | 4 +-- .../model/builder/TenantBuilder.java | 10 +++--- .../builder/TenantConfigurationBuilder.java | 14 ++++---- .../model/builder/UserBuilder.java | 10 +++--- .../tenantconfig/TenantConfigBuilder.java | 12 +++---- .../TenantDepositConfigBuilder.java | 12 +++---- .../TenantFileTransformersBuilder.java | 12 +++---- .../tenantconfig/TenantSourceBuilder.java | 12 +++---- .../model/censorship/BaseCensor.java | 4 +-- .../model/censorship/TenantCensor.java | 6 ++-- .../censorship/TenantConfigurationCensor.java | 6 ++-- .../model/censorship/UserCensor.java | 10 +++--- .../deleter/TenantConfigurationDeleter.java | 10 +++--- .../model/deleter/TenantDeleter.java | 10 +++--- .../model/deleter/UserCredentialDeleter.java | 10 +++--- .../model/deleter/UserDeleter.java | 12 +++---- .../TenantTouchedIntegrationEventPersist.java | 8 ++--- .../UserTouchedIntegrationEventPersist.java | 10 +++--- ...TenantConfigurationEmailClientPersist.java | 8 ++--- ...igurationUserLocaleIntegrationPersist.java | 8 ++--- .../model/tenantconfig/TenantConfig.java | 2 +- .../tenantconfig/TenantDepositConfig.java | 2 +- .../TenantFileTransformersConfig.java | 2 +- .../model/tenantconfig/TenantSource.java | 2 +- .../model/user/PublicUser.java | 2 +- .../query/QueueInboxQuery.java | 6 ++-- .../query/QueueOutboxQuery.java | 6 ++-- .../query/TenantConfigurationQuery.java | 10 +++--- .../query/TenantQuery.java | 10 +++--- .../query/UserCredentialQuery.java | 14 ++++---- .../query/UserQuery.java | 16 ++++----- .../lookup/TenantConfigurationLookup.java | 8 ++--- .../query/lookup/TenantLookup.java | 6 ++-- .../query/lookup/UserLookup.java | 6 ++-- .../service/AuthnSandbox.java | 2 +- .../service/formatting/FormattingService.java | 2 +- .../formatting/FormattingServiceImpl.java | 10 +++--- .../service/tenant/TenantService.java | 6 ++-- .../service/tenant/TenantServiceImpl.java | 20 +++++------ .../TenantConfigurationService.java | 12 +++---- .../TenantConfigurationServiceImpl.java | 34 +++++++++---------- .../service/user/UserService.java | 6 ++-- .../service/user/UserServiceImpl.java | 26 +++++++------- .../inbox/ConsistencyPredicates.java | 5 --- .../TenantRemovalIntegrationEventHandler.java | 7 ---- .../TenantTouchedIntegrationEventHandler.java | 7 ---- .../UserRemovalIntegrationEventHandler.java | 7 ---- .../UserTouchedIntegrationEventHandler.java | 7 ---- 187 files changed, 559 insertions(+), 559 deletions(-) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/AnnotationApplication.java (84%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/WebConfiguration.java (83%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/authorization/OwnedAuthorizationHandler.java (85%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/config/AppMessageSourceConfiguration.java (95%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/config/SecurityConfiguration.java (96%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/controllerhandler/GlobalExceptionHandler.java (98%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/controllers/PrincipalController.java (92%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/controllers/TenantConfigurationController.java (86%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/controllers/error/GenericErrorHandler.java (100%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/interceptors/UserInterceptor.java (90%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/interceptors/UserInterceptorCacheOptions.java (87%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/interceptors/UserInterceptorCacheService.java (97%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/model/Account.java (98%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/model/AccountBuilder.java (97%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/model/QueryResult.java (93%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/tenant/TenantByCodeCacheOptions.java (87%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/tenant/TenantByCodeCacheService.java (92%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/tenant/TenantByIdCacheOptions.java (86%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/tenant/TenantByIdCacheService.java (91%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/tenant/TenantInterceptor.java (93%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/tenant/TenantScopeClaimInterceptor.java (96%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/tenant/TenantScopeConfiguration.java (84%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/tenant/TenantScopeHeaderInterceptor.java (95%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/tenant/TenantScopeProperties.java (96%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/tenant/UserAllowedTenantCacheOptions.java (87%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/tenant/UserAllowedTenantCacheService.java (92%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/user/UserInterceptor.java (100%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/user/UserInterceptorCacheOptions.java (100%) rename annotation-service/annotation-web/src/main/java/gr/cite/{notification => annotation}/web/scope/user/UserInterceptorCacheService.java (100%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/audit/AuditableAction.java (98%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/authorization/AuthorizationFlags.java (81%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/authorization/OwnedAuthorizationRequirement.java (77%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/authorization/OwnedResource.java (91%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/authorization/Permission.java (97%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/cache/FormattingUserprofileCacheCacheService.java (92%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/JsonHandlingService.java (97%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/StringUtils.java (79%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/XmlHandlingService.java (98%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/enums/ContactInfoType.java (84%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/enums/EnumUtils.java (80%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/enums/IsActive.java (82%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/enums/TenantConfigurationType.java (86%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/lock/LockByKeyManager.java (97%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/scope/fake/FakeRequestAttributes.java (98%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/scope/fake/FakeRequestScope.java (95%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/scope/tenant/MultitenancyConfiguration.java (84%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/scope/tenant/MultitenancyProperties.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/scope/tenant/TenantScope.java (95%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/scope/tenant/TenantScoped.java (70%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/scope/user/UserScope.java (94%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/types/notification/Attachment.java (92%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/types/notification/ContactPair.java (80%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/types/tenant/TenantConfigEntity.java (95%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/types/tenant/TenantDepositConfigEntity.java (92%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/types/tenant/TenantFileTransformersConfigEntity.java (92%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/types/tenant/TenantSourceEntity.java (97%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/types/tenantconfiguration/DefaultUserLocaleConfigurationDataContainer.java (92%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/types/tenantconfiguration/EmailClientConfigurationDataContainer.java (97%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/types/user/AdditionalInfoEntity.java (95%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/types/xml/XmlBuilder.java (98%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/types/xml/XmlSerializable.java (77%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/common/validation/BaseValidator.java (90%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/config/db/NamingStrategyProperties.java (92%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/config/db/PrefixPhysicalNamingStrategy.java (93%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/config/email/EmailConfig.java (84%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/config/email/EmailProperties.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/config/formatting/FormattingServiceConfiguration.java (85%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/config/formatting/FormattingServiceProperties.java (95%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/config/formatting/FormattingUserprofileCacheOptions.java (87%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/convention/ConventionService.java (95%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/convention/ConventionServiceImpl.java (97%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/LanguageEntity.java (90%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/QueueInboxEntity.java (95%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/QueueOutboxEntity.java (96%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/TenantConfigurationEntity.java (86%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/TenantEntity.java (91%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/TenantScopedEntityManager.java (93%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/TenantUserEntity.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/UserContactInfoEntity.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/UserCredentialEntity.java (90%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/UserEntity.java (93%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/UserRoleEntity.java (90%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/conventers/ContactInfoTypeConverter.java (69%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/conventers/DatabaseEnum.java (72%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/conventers/DatabaseEnumConverter.java (92%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/conventers/IsActiveConverter.java (67%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/conventers/TenantConfigurationTypeConverter.java (70%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/tenant/TenantFilterAspect.java (94%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/tenant/TenantListener.java (91%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/tenant/TenantScopedBaseEntity.java (92%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/data/types/JsonSQLType.java (97%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/errorcode/ErrorDescription.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/errorcode/ErrorThesaurusConfiguration.java (93%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/errorcode/ErrorThesaurusProperties.java (98%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/event/EventBroker.java (96%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/event/TenantTouchedEvent.java (95%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/event/UserAddedToTenantEvent.java (93%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/event/UserRemovedFromTenantEvent.java (93%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/event/UserTouchedEvent.java (95%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/AppRabbitConfigurer.java (91%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/InboxIntegrationEventConfigurer.java (86%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/IntegrationEventContextImpl.java (90%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/OutboxIntegrationEventConfigurer.java (92%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/TrackedEvent.java (89%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/ConsistencyHandler.java (70%) create mode 100644 annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/ConsistencyPredicates.java rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/EventProcessingStatus.java (62%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/InboxPrincipal.java (97%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/InboxProperties.java (96%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/InboxRepositoryImpl.java (95%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/IntegrationEventHandler.java (72%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/IntegrationEventProperties.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyHandler.java (81%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyPredicates.java (73%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEvent.java (64%) create mode 100644 annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandler.java rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandlerImpl.java (89%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEvent.java (75%) create mode 100644 annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandler.java rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandlerImpl.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/userremoval/UserRemovalConsistencyHandler.java (81%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/userremoval/UserRemovalConsistencyPredicates.java (72%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/userremoval/UserRemovalIntegrationEvent.java (77%) create mode 100644 annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandler.java rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java (89%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/usertouched/UserTouchedIntegrationEvent.java (92%) create mode 100644 annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandler.java rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/outbox/OutboxIntegrationEvent.java (76%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/outbox/OutboxProperties.java (96%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/integrationevent/outbox/OutboxRepositoryImpl.java (97%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/locale/LocaleConfiguration.java (87%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/locale/LocaleProperties.java (94%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/locale/LocaleService.java (90%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/locale/LocaleServiceImpl.java (96%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/Tenant.java (94%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/TenantConfiguration.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/User.java (93%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/UserCredential.java (94%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/builder/BaseBuilder.java (97%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/builder/TenantBuilder.java (91%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/builder/TenantConfigurationBuilder.java (94%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/builder/UserBuilder.java (91%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/builder/tenantconfig/TenantConfigBuilder.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/builder/tenantconfig/TenantDepositConfigBuilder.java (86%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/builder/tenantconfig/TenantFileTransformersBuilder.java (86%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/builder/tenantconfig/TenantSourceBuilder.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/censorship/BaseCensor.java (82%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/censorship/TenantCensor.java (87%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/censorship/TenantConfigurationCensor.java (87%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/censorship/UserCensor.java (87%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/deleter/TenantConfigurationDeleter.java (91%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/deleter/TenantDeleter.java (91%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/deleter/UserCredentialDeleter.java (90%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/deleter/UserDeleter.java (91%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/persist/TenantTouchedIntegrationEventPersist.java (93%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/persist/UserTouchedIntegrationEventPersist.java (89%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/persist/tenantconfiguration/TenantConfigurationEmailClientPersist.java (96%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/persist/tenantconfiguration/TenantConfigurationUserLocaleIntegrationPersist.java (93%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/tenantconfig/TenantConfig.java (93%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/tenantconfig/TenantDepositConfig.java (87%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/tenantconfig/TenantFileTransformersConfig.java (87%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/tenantconfig/TenantSource.java (96%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/model/user/PublicUser.java (90%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/query/QueueInboxQuery.java (98%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/query/QueueOutboxQuery.java (98%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/query/TenantConfigurationQuery.java (94%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/query/TenantQuery.java (94%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/query/UserCredentialQuery.java (95%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/query/UserQuery.java (92%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/query/lookup/TenantConfigurationLookup.java (84%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/query/lookup/TenantLookup.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/query/lookup/UserLookup.java (87%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/service/AuthnSandbox.java (96%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/service/formatting/FormattingService.java (93%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/service/formatting/FormattingServiceImpl.java (96%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/service/tenant/TenantService.java (81%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/service/tenant/TenantServiceImpl.java (87%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/service/tenantconfiguration/TenantConfigurationService.java (53%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/service/tenantconfiguration/TenantConfigurationServiceImpl.java (88%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/service/user/UserService.java (80%) rename annotation-service/annotation/src/main/java/gr/cite/{notification => annotation}/service/user/UserServiceImpl.java (89%) delete mode 100644 annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyPredicates.java delete mode 100644 annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandler.java delete mode 100644 annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandler.java delete mode 100644 annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandler.java delete mode 100644 annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandler.java diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/AnnotationApplication.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/AnnotationApplication.java similarity index 84% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/AnnotationApplication.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/AnnotationApplication.java index c001b9329..5b9afe561 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/AnnotationApplication.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/AnnotationApplication.java @@ -1,4 +1,4 @@ -package gr.cite.notification.web; +package gr.cite.annotation.web; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -11,11 +11,11 @@ import org.springframework.scheduling.annotation.EnableAsync; "gr.cite", "gr.cite.queueoutbox", "gr.cite.queueinbox", - "gr.cite.notification.integrationevent", + "gr.cite.annotation.integrationevent", "gr.cite.tools", "gr.cite.commons"}) @EntityScan({ - "gr.cite.notification.data"}) + "gr.cite.annotation.data"}) @EnableAsync public class AnnotationApplication { diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/WebConfiguration.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/WebConfiguration.java similarity index 83% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/WebConfiguration.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/WebConfiguration.java index a72bf0588..775e62087 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/WebConfiguration.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/WebConfiguration.java @@ -1,9 +1,9 @@ -package gr.cite.notification.web; +package gr.cite.annotation.web; -import gr.cite.notification.web.interceptors.UserInterceptor; -import gr.cite.notification.web.scope.tenant.TenantInterceptor; -import gr.cite.notification.web.scope.tenant.TenantScopeClaimInterceptor; -import gr.cite.notification.web.scope.tenant.TenantScopeHeaderInterceptor; +import gr.cite.annotation.web.interceptors.UserInterceptor; +import gr.cite.annotation.web.scope.tenant.TenantInterceptor; +import gr.cite.annotation.web.scope.tenant.TenantScopeClaimInterceptor; +import gr.cite.annotation.web.scope.tenant.TenantScopeHeaderInterceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/authorization/OwnedAuthorizationHandler.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/authorization/OwnedAuthorizationHandler.java similarity index 85% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/authorization/OwnedAuthorizationHandler.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/authorization/OwnedAuthorizationHandler.java index e95eb1556..922dc5266 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/authorization/OwnedAuthorizationHandler.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/authorization/OwnedAuthorizationHandler.java @@ -1,12 +1,12 @@ -package gr.cite.notification.web.authorization; +package gr.cite.annotation.web.authorization; import gr.cite.commons.web.authz.handler.AuthorizationHandler; import gr.cite.commons.web.authz.handler.AuthorizationHandlerContext; import gr.cite.commons.web.authz.policy.AuthorizationRequirement; import gr.cite.commons.web.oidc.principal.MyPrincipal; -import gr.cite.notification.authorization.OwnedAuthorizationRequirement; -import gr.cite.notification.authorization.OwnedResource; -import gr.cite.notification.common.scope.user.UserScope; +import gr.cite.annotation.authorization.OwnedAuthorizationRequirement; +import gr.cite.annotation.authorization.OwnedResource; +import gr.cite.annotation.common.scope.user.UserScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/config/AppMessageSourceConfiguration.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/config/AppMessageSourceConfiguration.java similarity index 95% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/config/AppMessageSourceConfiguration.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/config/AppMessageSourceConfiguration.java index 66adc10da..971e1eb3c 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/config/AppMessageSourceConfiguration.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/config/AppMessageSourceConfiguration.java @@ -1,4 +1,4 @@ -package gr.cite.notification.web.config; +package gr.cite.annotation.web.config; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/config/SecurityConfiguration.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/config/SecurityConfiguration.java similarity index 96% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/config/SecurityConfiguration.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/config/SecurityConfiguration.java index 439186b82..e51b096d2 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/config/SecurityConfiguration.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/config/SecurityConfiguration.java @@ -1,4 +1,4 @@ -package gr.cite.notification.web.config; +package gr.cite.annotation.web.config; import gr.cite.commons.web.authz.handler.AuthorizationHandler; import gr.cite.commons.web.authz.handler.PermissionClientAuthorizationHandler; @@ -8,9 +8,9 @@ import gr.cite.commons.web.authz.policy.AuthorizationResource; import gr.cite.commons.web.authz.policy.resolver.AuthorizationPolicyConfigurer; import gr.cite.commons.web.authz.policy.resolver.AuthorizationPolicyResolverStrategy; import gr.cite.commons.web.oidc.configuration.WebSecurityProperties; -import gr.cite.notification.authorization.OwnedAuthorizationRequirement; -import gr.cite.notification.authorization.OwnedResource; -import gr.cite.notification.web.authorization.OwnedAuthorizationHandler; +import gr.cite.annotation.authorization.OwnedAuthorizationRequirement; +import gr.cite.annotation.authorization.OwnedResource; +import gr.cite.annotation.web.authorization.OwnedAuthorizationHandler; import jakarta.servlet.Filter; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/controllerhandler/GlobalExceptionHandler.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllerhandler/GlobalExceptionHandler.java similarity index 98% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/controllerhandler/GlobalExceptionHandler.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllerhandler/GlobalExceptionHandler.java index b8a3b685c..5e7763b30 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/controllerhandler/GlobalExceptionHandler.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllerhandler/GlobalExceptionHandler.java @@ -1,6 +1,6 @@ -package gr.cite.notification.web.controllerhandler; +package gr.cite.annotation.web.controllerhandler; -import gr.cite.notification.common.JsonHandlingService; +import gr.cite.annotation.common.JsonHandlingService; import gr.cite.tools.exception.*; import gr.cite.tools.logging.LoggerService; import org.slf4j.LoggerFactory; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/controllers/PrincipalController.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/PrincipalController.java similarity index 92% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/controllers/PrincipalController.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/PrincipalController.java index c8ff2443d..597a2a3b7 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/controllers/PrincipalController.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/PrincipalController.java @@ -1,12 +1,12 @@ -package gr.cite.notification.web.controllers; +package gr.cite.annotation.web.controllers; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; import gr.cite.commons.web.oidc.principal.MyPrincipal; import gr.cite.commons.web.oidc.principal.extractor.ClaimExtractor; -import gr.cite.notification.audit.AuditableAction; -import gr.cite.notification.common.scope.tenant.TenantScope; -import gr.cite.notification.web.model.Account; -import gr.cite.notification.web.model.AccountBuilder; +import gr.cite.annotation.audit.AuditableAction; +import gr.cite.annotation.common.scope.tenant.TenantScope; +import gr.cite.annotation.web.model.Account; +import gr.cite.annotation.web.model.AccountBuilder; import gr.cite.tools.auditing.AuditService; import gr.cite.tools.fieldset.BaseFieldSet; import gr.cite.tools.fieldset.FieldSet; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/controllers/TenantConfigurationController.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/TenantConfigurationController.java similarity index 86% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/controllers/TenantConfigurationController.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/TenantConfigurationController.java index 5680757be..dcdff05c9 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/controllers/TenantConfigurationController.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/TenantConfigurationController.java @@ -1,17 +1,17 @@ -package gr.cite.notification.web.controllers; +package gr.cite.annotation.web.controllers; -import gr.cite.notification.audit.AuditableAction; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.common.enums.TenantConfigurationType; -import gr.cite.notification.data.TenantConfigurationEntity; -import gr.cite.notification.model.TenantConfiguration; -import gr.cite.notification.model.builder.TenantConfigurationBuilder; -import gr.cite.notification.model.censorship.TenantConfigurationCensor; -import gr.cite.notification.model.persist.tenantconfiguration.TenantConfigurationEmailClientPersist; -import gr.cite.notification.query.TenantConfigurationQuery; -import gr.cite.notification.query.lookup.TenantConfigurationLookup; -import gr.cite.notification.service.tenantconfiguration.TenantConfigurationService; -import gr.cite.notification.web.model.QueryResult; +import gr.cite.annotation.audit.AuditableAction; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.common.enums.TenantConfigurationType; +import gr.cite.annotation.data.TenantConfigurationEntity; +import gr.cite.annotation.model.TenantConfiguration; +import gr.cite.annotation.model.builder.TenantConfigurationBuilder; +import gr.cite.annotation.model.censorship.TenantConfigurationCensor; +import gr.cite.annotation.model.persist.tenantconfiguration.TenantConfigurationEmailClientPersist; +import gr.cite.annotation.query.TenantConfigurationQuery; +import gr.cite.annotation.query.lookup.TenantConfigurationLookup; +import gr.cite.annotation.service.tenantconfiguration.TenantConfigurationService; +import gr.cite.annotation.web.model.QueryResult; import gr.cite.tools.auditing.AuditService; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.data.censor.CensorFactory; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/controllers/error/GenericErrorHandler.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/error/GenericErrorHandler.java similarity index 100% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/controllers/error/GenericErrorHandler.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/error/GenericErrorHandler.java diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptor.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/interceptors/UserInterceptor.java similarity index 90% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptor.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/interceptors/UserInterceptor.java index 7d3d4c03e..918705a1d 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptor.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/interceptors/UserInterceptor.java @@ -1,13 +1,13 @@ -package gr.cite.notification.web.interceptors; +package gr.cite.annotation.web.interceptors; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; import gr.cite.commons.web.oidc.principal.extractor.ClaimExtractor; -import gr.cite.notification.common.JsonHandlingService; -import gr.cite.notification.common.lock.LockByKeyManager; -import gr.cite.notification.common.scope.user.UserScope; -import gr.cite.notification.data.UserCredentialEntity; -import gr.cite.notification.model.UserCredential; -import gr.cite.notification.query.UserCredentialQuery; +import gr.cite.annotation.common.JsonHandlingService; +import gr.cite.annotation.common.lock.LockByKeyManager; +import gr.cite.annotation.common.scope.user.UserScope; +import gr.cite.annotation.data.UserCredentialEntity; +import gr.cite.annotation.model.UserCredential; +import gr.cite.annotation.query.UserCredentialQuery; import gr.cite.tools.data.query.QueryFactory; import gr.cite.tools.exception.MyForbiddenException; import gr.cite.tools.fieldset.BaseFieldSet; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheOptions.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/interceptors/UserInterceptorCacheOptions.java similarity index 87% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheOptions.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/interceptors/UserInterceptorCacheOptions.java index adc161299..30c08781e 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheOptions.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/interceptors/UserInterceptorCacheOptions.java @@ -1,4 +1,4 @@ -package gr.cite.notification.web.interceptors; +package gr.cite.annotation.web.interceptors; import gr.cite.tools.cache.CacheOptions; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheService.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/interceptors/UserInterceptorCacheService.java similarity index 97% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheService.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/interceptors/UserInterceptorCacheService.java index 543003902..af5012905 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheService.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/interceptors/UserInterceptorCacheService.java @@ -1,4 +1,4 @@ -package gr.cite.notification.web.interceptors; +package gr.cite.annotation.web.interceptors; import gr.cite.tools.cache.CacheService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/model/Account.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/model/Account.java similarity index 98% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/model/Account.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/model/Account.java index 601dc19b0..d92dcf6d2 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/model/Account.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/model/Account.java @@ -1,4 +1,4 @@ -package gr.cite.notification.web.model; +package gr.cite.annotation.web.model; import gr.cite.tools.logging.annotation.LogSensitive; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/model/AccountBuilder.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/model/AccountBuilder.java similarity index 97% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/model/AccountBuilder.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/model/AccountBuilder.java index 17deb15fb..b00ff09e9 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/model/AccountBuilder.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/model/AccountBuilder.java @@ -1,11 +1,11 @@ -package gr.cite.notification.web.model; +package gr.cite.annotation.web.model; import gr.cite.commons.web.authz.configuration.AuthorizationConfiguration; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; import gr.cite.commons.web.oidc.principal.MyPrincipal; import gr.cite.commons.web.oidc.principal.extractor.ClaimExtractor; import gr.cite.commons.web.oidc.principal.extractor.ClaimExtractorKeys; -import gr.cite.notification.common.scope.user.UserScope; +import gr.cite.annotation.common.scope.user.UserScope; import gr.cite.tools.fieldset.BaseFieldSet; import gr.cite.tools.fieldset.FieldSet; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/model/QueryResult.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/model/QueryResult.java similarity index 93% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/model/QueryResult.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/model/QueryResult.java index 471a27f4e..13ccd82b5 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/model/QueryResult.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/model/QueryResult.java @@ -1,4 +1,4 @@ -package gr.cite.notification.web.model; +package gr.cite.annotation.web.model; import java.util.ArrayList; import java.util.List; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheOptions.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantByCodeCacheOptions.java similarity index 87% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheOptions.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantByCodeCacheOptions.java index 752c8965f..3836bd8b3 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheOptions.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantByCodeCacheOptions.java @@ -1,4 +1,4 @@ -package gr.cite.notification.web.scope.tenant; +package gr.cite.annotation.web.scope.tenant; import gr.cite.tools.cache.CacheOptions; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheService.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantByCodeCacheService.java similarity index 92% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheService.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantByCodeCacheService.java index 6c2d2107a..f73d0b019 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheService.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantByCodeCacheService.java @@ -1,7 +1,7 @@ -package gr.cite.notification.web.scope.tenant; +package gr.cite.annotation.web.scope.tenant; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.event.TenantTouchedEvent; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.event.TenantTouchedEvent; import gr.cite.tools.cache.CacheService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheOptions.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantByIdCacheOptions.java similarity index 86% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheOptions.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantByIdCacheOptions.java index 1c5f69520..9de5b4803 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheOptions.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantByIdCacheOptions.java @@ -1,4 +1,4 @@ -package gr.cite.notification.web.scope.tenant; +package gr.cite.annotation.web.scope.tenant; import gr.cite.tools.cache.CacheOptions; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheService.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantByIdCacheService.java similarity index 91% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheService.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantByIdCacheService.java index 89ab6c35d..4fd3db8f6 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheService.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantByIdCacheService.java @@ -1,7 +1,7 @@ -package gr.cite.notification.web.scope.tenant; +package gr.cite.annotation.web.scope.tenant; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.event.TenantTouchedEvent; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.event.TenantTouchedEvent; import gr.cite.tools.cache.CacheService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantInterceptor.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantInterceptor.java similarity index 93% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantInterceptor.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantInterceptor.java index 950039cc6..9bbc9df2d 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantInterceptor.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantInterceptor.java @@ -1,16 +1,16 @@ -package gr.cite.notification.web.scope.tenant; +package gr.cite.annotation.web.scope.tenant; import gr.cite.commons.web.authz.service.AuthorizationService; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; import gr.cite.commons.web.oidc.principal.extractor.ClaimExtractor; -import gr.cite.notification.authorization.Permission; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.common.scope.tenant.TenantScope; -import gr.cite.notification.common.scope.user.UserScope; -import gr.cite.notification.data.TenantUserEntity; -import gr.cite.notification.data.UserEntity; -import gr.cite.notification.data.tenant.TenantScopedBaseEntity; -import gr.cite.notification.errorcode.ErrorThesaurusProperties; +import gr.cite.annotation.authorization.Permission; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.common.scope.tenant.TenantScope; +import gr.cite.annotation.common.scope.user.UserScope; +import gr.cite.annotation.data.TenantUserEntity; +import gr.cite.annotation.data.UserEntity; +import gr.cite.annotation.data.tenant.TenantScopedBaseEntity; +import gr.cite.annotation.errorcode.ErrorThesaurusProperties; import gr.cite.tools.exception.MyForbiddenException; import gr.cite.tools.logging.LoggerService; import jakarta.persistence.EntityManager; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeClaimInterceptor.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantScopeClaimInterceptor.java similarity index 96% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeClaimInterceptor.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantScopeClaimInterceptor.java index 293190b4f..4f8b6d11b 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeClaimInterceptor.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantScopeClaimInterceptor.java @@ -1,14 +1,14 @@ -package gr.cite.notification.web.scope.tenant; +package gr.cite.annotation.web.scope.tenant; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; import gr.cite.commons.web.oidc.principal.MyPrincipal; import gr.cite.commons.web.oidc.principal.extractor.ClaimExtractor; import gr.cite.commons.web.oidc.principal.extractor.ClaimExtractorContext; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.common.scope.tenant.TenantScope; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.data.TenantEntity; -import gr.cite.notification.errorcode.ErrorThesaurusProperties; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.common.scope.tenant.TenantScope; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.data.TenantEntity; +import gr.cite.annotation.errorcode.ErrorThesaurusProperties; import gr.cite.tools.exception.MyForbiddenException; import gr.cite.tools.logging.LoggerService; import jakarta.persistence.EntityManager; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeConfiguration.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantScopeConfiguration.java similarity index 84% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeConfiguration.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantScopeConfiguration.java index 13d77c9ad..5a1d50b06 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeConfiguration.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantScopeConfiguration.java @@ -1,4 +1,4 @@ -package gr.cite.notification.web.scope.tenant; +package gr.cite.annotation.web.scope.tenant; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeHeaderInterceptor.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantScopeHeaderInterceptor.java similarity index 95% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeHeaderInterceptor.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantScopeHeaderInterceptor.java index 5fdf3455c..52acfc28f 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeHeaderInterceptor.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantScopeHeaderInterceptor.java @@ -1,11 +1,11 @@ -package gr.cite.notification.web.scope.tenant; +package gr.cite.annotation.web.scope.tenant; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; import gr.cite.commons.web.oidc.principal.extractor.ClaimExtractorContext; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.common.scope.tenant.TenantScope; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.data.TenantEntity; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.common.scope.tenant.TenantScope; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.data.TenantEntity; import gr.cite.tools.logging.LoggerService; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeProperties.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantScopeProperties.java similarity index 96% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeProperties.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantScopeProperties.java index 6ed29645b..da4705961 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeProperties.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/TenantScopeProperties.java @@ -1,4 +1,4 @@ -package gr.cite.notification.web.scope.tenant; +package gr.cite.annotation.web.scope.tenant; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheOptions.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/UserAllowedTenantCacheOptions.java similarity index 87% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheOptions.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/UserAllowedTenantCacheOptions.java index 30606754c..a24fe89d6 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheOptions.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/UserAllowedTenantCacheOptions.java @@ -1,4 +1,4 @@ -package gr.cite.notification.web.scope.tenant; +package gr.cite.annotation.web.scope.tenant; import gr.cite.tools.cache.CacheOptions; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheService.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/UserAllowedTenantCacheService.java similarity index 92% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheService.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/UserAllowedTenantCacheService.java index 0cebe00ea..a31d8ace4 100644 --- a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheService.java +++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/tenant/UserAllowedTenantCacheService.java @@ -1,7 +1,7 @@ -package gr.cite.notification.web.scope.tenant; +package gr.cite.annotation.web.scope.tenant; -import gr.cite.notification.event.UserAddedToTenantEvent; -import gr.cite.notification.event.UserRemovedFromTenantEvent; +import gr.cite.annotation.event.UserAddedToTenantEvent; +import gr.cite.annotation.event.UserRemovedFromTenantEvent; import gr.cite.tools.cache.CacheService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptor.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/user/UserInterceptor.java similarity index 100% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptor.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/user/UserInterceptor.java diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptorCacheOptions.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/user/UserInterceptorCacheOptions.java similarity index 100% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptorCacheOptions.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/user/UserInterceptorCacheOptions.java diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptorCacheService.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/user/UserInterceptorCacheService.java similarity index 100% rename from annotation-service/annotation-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptorCacheService.java rename to annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/scope/user/UserInterceptorCacheService.java diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/audit/AuditableAction.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/audit/AuditableAction.java similarity index 98% rename from annotation-service/annotation/src/main/java/gr/cite/notification/audit/AuditableAction.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/audit/AuditableAction.java index 0ad1baed7..16d97dea3 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/audit/AuditableAction.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/audit/AuditableAction.java @@ -1,4 +1,4 @@ -package gr.cite.notification.audit; +package gr.cite.annotation.audit; import gr.cite.tools.logging.EventId; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/authorization/AuthorizationFlags.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/authorization/AuthorizationFlags.java similarity index 81% rename from annotation-service/annotation/src/main/java/gr/cite/notification/authorization/AuthorizationFlags.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/authorization/AuthorizationFlags.java index 2cba3132b..6b0192388 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/authorization/AuthorizationFlags.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/authorization/AuthorizationFlags.java @@ -1,4 +1,4 @@ -package gr.cite.notification.authorization; +package gr.cite.annotation.authorization; import java.util.EnumSet; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/authorization/OwnedAuthorizationRequirement.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/authorization/OwnedAuthorizationRequirement.java similarity index 77% rename from annotation-service/annotation/src/main/java/gr/cite/notification/authorization/OwnedAuthorizationRequirement.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/authorization/OwnedAuthorizationRequirement.java index 8171339da..553104fc7 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/authorization/OwnedAuthorizationRequirement.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/authorization/OwnedAuthorizationRequirement.java @@ -1,4 +1,4 @@ -package gr.cite.notification.authorization; +package gr.cite.annotation.authorization; import gr.cite.commons.web.authz.policy.AuthorizationRequirement; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/authorization/OwnedResource.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/authorization/OwnedResource.java similarity index 91% rename from annotation-service/annotation/src/main/java/gr/cite/notification/authorization/OwnedResource.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/authorization/OwnedResource.java index 124f7ba2b..83018ff3e 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/authorization/OwnedResource.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/authorization/OwnedResource.java @@ -1,4 +1,4 @@ -package gr.cite.notification.authorization; +package gr.cite.annotation.authorization; import gr.cite.commons.web.authz.policy.AuthorizationResource; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/authorization/Permission.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/authorization/Permission.java similarity index 97% rename from annotation-service/annotation/src/main/java/gr/cite/notification/authorization/Permission.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/authorization/Permission.java index 59b247dec..00d6fec0e 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/authorization/Permission.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/authorization/Permission.java @@ -1,4 +1,4 @@ -package gr.cite.notification.authorization; +package gr.cite.annotation.authorization; public final class Permission { //User diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/cache/FormattingUserprofileCacheCacheService.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/cache/FormattingUserprofileCacheCacheService.java similarity index 92% rename from annotation-service/annotation/src/main/java/gr/cite/notification/cache/FormattingUserprofileCacheCacheService.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/cache/FormattingUserprofileCacheCacheService.java index c4de4eb45..346050a47 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/cache/FormattingUserprofileCacheCacheService.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/cache/FormattingUserprofileCacheCacheService.java @@ -1,7 +1,7 @@ -package gr.cite.notification.cache; +package gr.cite.annotation.cache; -import gr.cite.notification.config.formatting.FormattingUserprofileCacheOptions; -import gr.cite.notification.event.UserTouchedEvent; +import gr.cite.annotation.config.formatting.FormattingUserprofileCacheOptions; +import gr.cite.annotation.event.UserTouchedEvent; import gr.cite.tools.cache.CacheService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/JsonHandlingService.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/JsonHandlingService.java similarity index 97% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/JsonHandlingService.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/JsonHandlingService.java index f9dd4accc..e1b68a157 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/JsonHandlingService.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/JsonHandlingService.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common; +package gr.cite.annotation.common; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/StringUtils.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/StringUtils.java similarity index 79% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/StringUtils.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/StringUtils.java index 0a73b94ef..804747d1a 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/StringUtils.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/StringUtils.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common; +package gr.cite.annotation.common; public class StringUtils { diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/XmlHandlingService.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/XmlHandlingService.java similarity index 98% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/XmlHandlingService.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/XmlHandlingService.java index cb65cfb54..89fdc44f9 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/XmlHandlingService.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/XmlHandlingService.java @@ -1,7 +1,7 @@ -package gr.cite.notification.common; +package gr.cite.annotation.common; import com.fasterxml.jackson.core.JsonProcessingException; -import gr.cite.notification.common.types.xml.XmlSerializable; +import gr.cite.annotation.common.types.xml.XmlSerializable; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Marshaller; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/enums/ContactInfoType.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/enums/ContactInfoType.java similarity index 84% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/enums/ContactInfoType.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/enums/ContactInfoType.java index 292ec6b33..a15c9b41c 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/enums/ContactInfoType.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/enums/ContactInfoType.java @@ -1,7 +1,7 @@ -package gr.cite.notification.common.enums; +package gr.cite.annotation.common.enums; import com.fasterxml.jackson.annotation.JsonValue; -import gr.cite.notification.data.conventers.DatabaseEnum; +import gr.cite.annotation.data.conventers.DatabaseEnum; import java.util.Map; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/enums/EnumUtils.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/enums/EnumUtils.java similarity index 80% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/enums/EnumUtils.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/enums/EnumUtils.java index fa581f847..630bab33e 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/enums/EnumUtils.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/enums/EnumUtils.java @@ -1,6 +1,6 @@ -package gr.cite.notification.common.enums; +package gr.cite.annotation.common.enums; -import gr.cite.notification.data.conventers.DatabaseEnum; +import gr.cite.annotation.data.conventers.DatabaseEnum; import java.util.HashMap; import java.util.Map; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/enums/IsActive.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/enums/IsActive.java similarity index 82% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/enums/IsActive.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/enums/IsActive.java index 10b9dc528..ca0fac96d 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/enums/IsActive.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/enums/IsActive.java @@ -1,7 +1,7 @@ -package gr.cite.notification.common.enums; +package gr.cite.annotation.common.enums; import com.fasterxml.jackson.annotation.JsonValue; -import gr.cite.notification.data.conventers.DatabaseEnum; +import gr.cite.annotation.data.conventers.DatabaseEnum; import java.util.Map; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/enums/TenantConfigurationType.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/enums/TenantConfigurationType.java similarity index 86% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/enums/TenantConfigurationType.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/enums/TenantConfigurationType.java index 799a59c7f..0b93bb7c6 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/enums/TenantConfigurationType.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/enums/TenantConfigurationType.java @@ -1,7 +1,7 @@ -package gr.cite.notification.common.enums; +package gr.cite.annotation.common.enums; import com.fasterxml.jackson.annotation.JsonValue; -import gr.cite.notification.data.conventers.DatabaseEnum; +import gr.cite.annotation.data.conventers.DatabaseEnum; import java.util.Map; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/lock/LockByKeyManager.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/lock/LockByKeyManager.java similarity index 97% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/lock/LockByKeyManager.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/lock/LockByKeyManager.java index 8c33cb9f7..038923309 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/lock/LockByKeyManager.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/lock/LockByKeyManager.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.lock; +package gr.cite.annotation.common.lock; import org.springframework.stereotype.Service; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestAttributes.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/fake/FakeRequestAttributes.java similarity index 98% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestAttributes.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/fake/FakeRequestAttributes.java index f8f2df085..62390b7d6 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestAttributes.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/fake/FakeRequestAttributes.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.scope.fake; +package gr.cite.annotation.common.scope.fake; import org.springframework.util.Assert; import org.springframework.web.context.request.RequestAttributes; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestScope.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/fake/FakeRequestScope.java similarity index 95% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestScope.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/fake/FakeRequestScope.java index e8b6716e2..d39057662 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestScope.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/fake/FakeRequestScope.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.scope.fake; +package gr.cite.annotation.common.scope.fake; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyConfiguration.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/tenant/MultitenancyConfiguration.java similarity index 84% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyConfiguration.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/tenant/MultitenancyConfiguration.java index 52ed9fa9f..da3e14576 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyConfiguration.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/tenant/MultitenancyConfiguration.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.scope.tenant; +package gr.cite.annotation.common.scope.tenant; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyProperties.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/tenant/MultitenancyProperties.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyProperties.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/tenant/MultitenancyProperties.java index 56f8dd353..584a66925 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyProperties.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/tenant/MultitenancyProperties.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.scope.tenant; +package gr.cite.annotation.common.scope.tenant; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/tenant/TenantScope.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/tenant/TenantScope.java similarity index 95% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/tenant/TenantScope.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/tenant/TenantScope.java index a2f8c7dee..e477668ed 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/tenant/TenantScope.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/tenant/TenantScope.java @@ -1,6 +1,6 @@ -package gr.cite.notification.common.scope.tenant; +package gr.cite.annotation.common.scope.tenant; -import gr.cite.notification.data.tenant.TenantScopedBaseEntity; +import gr.cite.annotation.data.tenant.TenantScopedBaseEntity; import gr.cite.tools.logging.LoggerService; import jakarta.persistence.EntityManager; import org.hibernate.Session; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/tenant/TenantScoped.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/tenant/TenantScoped.java similarity index 70% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/tenant/TenantScoped.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/tenant/TenantScoped.java index 77ecacaea..ac36b0022 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/tenant/TenantScoped.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/tenant/TenantScoped.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.scope.tenant; +package gr.cite.annotation.common.scope.tenant; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/user/UserScope.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/user/UserScope.java similarity index 94% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/user/UserScope.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/user/UserScope.java index 0315f7dac..a027aefcb 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/scope/user/UserScope.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/scope/user/UserScope.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.scope.user; +package gr.cite.annotation.common.scope.user; import gr.cite.tools.logging.LoggerService; import org.slf4j.LoggerFactory; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/notification/Attachment.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/notification/Attachment.java similarity index 92% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/types/notification/Attachment.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/notification/Attachment.java index da6249e93..1fbcbb6c5 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/notification/Attachment.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/notification/Attachment.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.types.notification; +package gr.cite.annotation.common.types.notification; public class Attachment { diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/notification/ContactPair.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/notification/ContactPair.java similarity index 80% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/types/notification/ContactPair.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/notification/ContactPair.java index dcb9adac2..4d3a973a5 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/notification/ContactPair.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/notification/ContactPair.java @@ -1,6 +1,6 @@ -package gr.cite.notification.common.types.notification; +package gr.cite.annotation.common.types.notification; -import gr.cite.notification.common.enums.ContactInfoType; +import gr.cite.annotation.common.enums.ContactInfoType; public class ContactPair { private ContactInfoType type; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenant/TenantConfigEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenant/TenantConfigEntity.java similarity index 95% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenant/TenantConfigEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenant/TenantConfigEntity.java index 4d5a0a7db..7904c6a48 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenant/TenantConfigEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenant/TenantConfigEntity.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.types.tenant; +package gr.cite.annotation.common.types.tenant; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenant/TenantDepositConfigEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenant/TenantDepositConfigEntity.java similarity index 92% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenant/TenantDepositConfigEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenant/TenantDepositConfigEntity.java index 675520200..1ea1a3817 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenant/TenantDepositConfigEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenant/TenantDepositConfigEntity.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.types.tenant; +package gr.cite.annotation.common.types.tenant; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenant/TenantFileTransformersConfigEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenant/TenantFileTransformersConfigEntity.java similarity index 92% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenant/TenantFileTransformersConfigEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenant/TenantFileTransformersConfigEntity.java index 6ce32c8b8..74e5faa59 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenant/TenantFileTransformersConfigEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenant/TenantFileTransformersConfigEntity.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.types.tenant; +package gr.cite.annotation.common.types.tenant; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenant/TenantSourceEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenant/TenantSourceEntity.java similarity index 97% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenant/TenantSourceEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenant/TenantSourceEntity.java index ff46bba7a..90e80fbd5 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenant/TenantSourceEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenant/TenantSourceEntity.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.types.tenant; +package gr.cite.annotation.common.types.tenant; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenantconfiguration/DefaultUserLocaleConfigurationDataContainer.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenantconfiguration/DefaultUserLocaleConfigurationDataContainer.java similarity index 92% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenantconfiguration/DefaultUserLocaleConfigurationDataContainer.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenantconfiguration/DefaultUserLocaleConfigurationDataContainer.java index 2724f54c1..9e708aafa 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenantconfiguration/DefaultUserLocaleConfigurationDataContainer.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenantconfiguration/DefaultUserLocaleConfigurationDataContainer.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.types.tenantconfiguration; +package gr.cite.annotation.common.types.tenantconfiguration; public class DefaultUserLocaleConfigurationDataContainer { diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenantconfiguration/EmailClientConfigurationDataContainer.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenantconfiguration/EmailClientConfigurationDataContainer.java similarity index 97% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenantconfiguration/EmailClientConfigurationDataContainer.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenantconfiguration/EmailClientConfigurationDataContainer.java index 71d70a997..f202852ab 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/tenantconfiguration/EmailClientConfigurationDataContainer.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/tenantconfiguration/EmailClientConfigurationDataContainer.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.types.tenantconfiguration; +package gr.cite.annotation.common.types.tenantconfiguration; public class EmailClientConfigurationDataContainer { diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/user/AdditionalInfoEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/user/AdditionalInfoEntity.java similarity index 95% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/types/user/AdditionalInfoEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/user/AdditionalInfoEntity.java index 1c8c6f4b1..17af7cf93 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/user/AdditionalInfoEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/user/AdditionalInfoEntity.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.types.user; +package gr.cite.annotation.common.types.user; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/xml/XmlBuilder.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/xml/XmlBuilder.java similarity index 98% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/types/xml/XmlBuilder.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/xml/XmlBuilder.java index 356bbd0a1..405501d23 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/xml/XmlBuilder.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/xml/XmlBuilder.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.types.xml; +package gr.cite.annotation.common.types.xml; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/xml/XmlSerializable.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/xml/XmlSerializable.java similarity index 77% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/types/xml/XmlSerializable.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/xml/XmlSerializable.java index 8a9d2bc7c..b9712f9b5 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/types/xml/XmlSerializable.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/types/xml/XmlSerializable.java @@ -1,4 +1,4 @@ -package gr.cite.notification.common.types.xml; +package gr.cite.annotation.common.types.xml; import org.w3c.dom.Document; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/common/validation/BaseValidator.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/validation/BaseValidator.java similarity index 90% rename from annotation-service/annotation/src/main/java/gr/cite/notification/common/validation/BaseValidator.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/common/validation/BaseValidator.java index 97f72042a..9c83f55ac 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/common/validation/BaseValidator.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/common/validation/BaseValidator.java @@ -1,7 +1,7 @@ -package gr.cite.notification.common.validation; +package gr.cite.annotation.common.validation; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.errorcode.ErrorThesaurusProperties; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.errorcode.ErrorThesaurusProperties; import gr.cite.tools.exception.MyValidationException; import gr.cite.tools.validation.AbstractValidator; import gr.cite.tools.validation.ValidationResult; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/config/db/NamingStrategyProperties.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/db/NamingStrategyProperties.java similarity index 92% rename from annotation-service/annotation/src/main/java/gr/cite/notification/config/db/NamingStrategyProperties.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/config/db/NamingStrategyProperties.java index 60d731cf9..f9621650a 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/config/db/NamingStrategyProperties.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/db/NamingStrategyProperties.java @@ -1,4 +1,4 @@ -package gr.cite.notification.config.db; +package gr.cite.annotation.config.db; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.bind.ConstructorBinding; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/config/db/PrefixPhysicalNamingStrategy.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/db/PrefixPhysicalNamingStrategy.java similarity index 93% rename from annotation-service/annotation/src/main/java/gr/cite/notification/config/db/PrefixPhysicalNamingStrategy.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/config/db/PrefixPhysicalNamingStrategy.java index d058a1fa5..e833fa8a4 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/config/db/PrefixPhysicalNamingStrategy.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/db/PrefixPhysicalNamingStrategy.java @@ -1,6 +1,6 @@ -package gr.cite.notification.config.db; +package gr.cite.annotation.config.db; -import gr.cite.notification.common.StringUtils; +import gr.cite.annotation.common.StringUtils; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/config/email/EmailConfig.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/email/EmailConfig.java similarity index 84% rename from annotation-service/annotation/src/main/java/gr/cite/notification/config/email/EmailConfig.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/config/email/EmailConfig.java index d3d210f40..acb6a8b79 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/config/email/EmailConfig.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/email/EmailConfig.java @@ -1,4 +1,4 @@ -package gr.cite.notification.config.email; +package gr.cite.annotation.config.email; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/config/email/EmailProperties.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/email/EmailProperties.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/config/email/EmailProperties.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/config/email/EmailProperties.java index 505b2bd96..65e80a319 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/config/email/EmailProperties.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/email/EmailProperties.java @@ -1,4 +1,4 @@ -package gr.cite.notification.config.email; +package gr.cite.annotation.config.email; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/config/formatting/FormattingServiceConfiguration.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/formatting/FormattingServiceConfiguration.java similarity index 85% rename from annotation-service/annotation/src/main/java/gr/cite/notification/config/formatting/FormattingServiceConfiguration.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/config/formatting/FormattingServiceConfiguration.java index 2287c3638..20b43545f 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/config/formatting/FormattingServiceConfiguration.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/formatting/FormattingServiceConfiguration.java @@ -1,4 +1,4 @@ -package gr.cite.notification.config.formatting; +package gr.cite.annotation.config.formatting; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/config/formatting/FormattingServiceProperties.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/formatting/FormattingServiceProperties.java similarity index 95% rename from annotation-service/annotation/src/main/java/gr/cite/notification/config/formatting/FormattingServiceProperties.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/config/formatting/FormattingServiceProperties.java index 39f517869..e9427a2c6 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/config/formatting/FormattingServiceProperties.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/formatting/FormattingServiceProperties.java @@ -1,4 +1,4 @@ -package gr.cite.notification.config.formatting; +package gr.cite.annotation.config.formatting; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/config/formatting/FormattingUserprofileCacheOptions.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/formatting/FormattingUserprofileCacheOptions.java similarity index 87% rename from annotation-service/annotation/src/main/java/gr/cite/notification/config/formatting/FormattingUserprofileCacheOptions.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/config/formatting/FormattingUserprofileCacheOptions.java index 9363efbd6..7c473bfeb 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/config/formatting/FormattingUserprofileCacheOptions.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/config/formatting/FormattingUserprofileCacheOptions.java @@ -1,4 +1,4 @@ -package gr.cite.notification.config.formatting; +package gr.cite.annotation.config.formatting; import gr.cite.tools.cache.CacheOptions; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/convention/ConventionService.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/convention/ConventionService.java similarity index 95% rename from annotation-service/annotation/src/main/java/gr/cite/notification/convention/ConventionService.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/convention/ConventionService.java index cfc2c3a02..8821066d5 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/convention/ConventionService.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/convention/ConventionService.java @@ -1,4 +1,4 @@ -package gr.cite.notification.convention; +package gr.cite.annotation.convention; import gr.cite.tools.exception.MyApplicationException; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/convention/ConventionServiceImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/convention/ConventionServiceImpl.java similarity index 97% rename from annotation-service/annotation/src/main/java/gr/cite/notification/convention/ConventionServiceImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/convention/ConventionServiceImpl.java index 2ae59083c..03b10882e 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/convention/ConventionServiceImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/convention/ConventionServiceImpl.java @@ -1,6 +1,6 @@ -package gr.cite.notification.convention; +package gr.cite.annotation.convention; -import gr.cite.notification.errorcode.ErrorThesaurusProperties; +import gr.cite.annotation.errorcode.ErrorThesaurusProperties; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.logging.LoggerService; import org.slf4j.LoggerFactory; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/LanguageEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/LanguageEntity.java similarity index 90% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/LanguageEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/LanguageEntity.java index d7ef04cec..460ee1a22 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/LanguageEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/LanguageEntity.java @@ -1,8 +1,8 @@ -package gr.cite.notification.data; +package gr.cite.annotation.data; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.conventers.IsActiveConverter; -import gr.cite.notification.data.tenant.TenantScopedBaseEntity; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.conventers.IsActiveConverter; +import gr.cite.annotation.data.tenant.TenantScopedBaseEntity; import jakarta.persistence.*; import java.time.Instant; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/QueueInboxEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/QueueInboxEntity.java similarity index 95% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/QueueInboxEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/QueueInboxEntity.java index c59bccb11..3b16254b7 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/QueueInboxEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/QueueInboxEntity.java @@ -1,8 +1,8 @@ -package gr.cite.notification.data; +package gr.cite.annotation.data; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.conventers.IsActiveConverter; -import gr.cite.notification.data.types.JsonSQLType; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.conventers.IsActiveConverter; +import gr.cite.annotation.data.types.JsonSQLType; import gr.cite.queueinbox.entity.QueueInbox; import gr.cite.queueinbox.entity.QueueInboxStatus; import jakarta.persistence.*; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/QueueOutboxEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/QueueOutboxEntity.java similarity index 96% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/QueueOutboxEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/QueueOutboxEntity.java index e62f2ec4d..bef7a6c94 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/QueueOutboxEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/QueueOutboxEntity.java @@ -1,7 +1,7 @@ -package gr.cite.notification.data; +package gr.cite.annotation.data; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.conventers.IsActiveConverter; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.conventers.IsActiveConverter; import gr.cite.queueoutbox.entity.QueueOutbox; import gr.cite.queueoutbox.entity.QueueOutboxNotifyStatus; import jakarta.persistence.*; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/TenantConfigurationEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/TenantConfigurationEntity.java similarity index 86% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/TenantConfigurationEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/TenantConfigurationEntity.java index 44c8d6030..71363e1c2 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/TenantConfigurationEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/TenantConfigurationEntity.java @@ -1,10 +1,10 @@ -package gr.cite.notification.data; +package gr.cite.annotation.data; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.common.enums.TenantConfigurationType; -import gr.cite.notification.data.conventers.IsActiveConverter; -import gr.cite.notification.data.conventers.TenantConfigurationTypeConverter; -import gr.cite.notification.data.tenant.TenantScopedBaseEntity; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.common.enums.TenantConfigurationType; +import gr.cite.annotation.data.conventers.IsActiveConverter; +import gr.cite.annotation.data.conventers.TenantConfigurationTypeConverter; +import gr.cite.annotation.data.tenant.TenantScopedBaseEntity; import jakarta.persistence.*; import java.time.Instant; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/TenantEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/TenantEntity.java similarity index 91% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/TenantEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/TenantEntity.java index f893aaa8c..bf7ceb77f 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/TenantEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/TenantEntity.java @@ -1,7 +1,7 @@ -package gr.cite.notification.data; +package gr.cite.annotation.data; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.conventers.IsActiveConverter; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.conventers.IsActiveConverter; import jakarta.persistence.*; import java.time.Instant; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/TenantScopedEntityManager.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/TenantScopedEntityManager.java similarity index 93% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/TenantScopedEntityManager.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/TenantScopedEntityManager.java index a6580bbbe..e6675a4f0 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/TenantScopedEntityManager.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/TenantScopedEntityManager.java @@ -1,9 +1,9 @@ -package gr.cite.notification.data; +package gr.cite.annotation.data; import gr.cite.commons.web.authz.service.AuthorizationService; -import gr.cite.notification.authorization.Permission; -import gr.cite.notification.common.scope.tenant.TenantScope; -import gr.cite.notification.common.scope.tenant.TenantScoped; +import gr.cite.annotation.authorization.Permission; +import gr.cite.annotation.common.scope.tenant.TenantScope; +import gr.cite.annotation.common.scope.tenant.TenantScoped; import gr.cite.tools.exception.MyForbiddenException; import jakarta.persistence.EntityManager; import jakarta.persistence.FlushModeType; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/TenantUserEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/TenantUserEntity.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/TenantUserEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/TenantUserEntity.java index 3ff3e610e..fd4e79311 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/TenantUserEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/TenantUserEntity.java @@ -1,8 +1,8 @@ -package gr.cite.notification.data; +package gr.cite.annotation.data; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.conventers.IsActiveConverter; -import gr.cite.notification.data.tenant.TenantScopedBaseEntity; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.conventers.IsActiveConverter; +import gr.cite.annotation.data.tenant.TenantScopedBaseEntity; import jakarta.persistence.*; import java.time.Instant; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/UserContactInfoEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserContactInfoEntity.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/UserContactInfoEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserContactInfoEntity.java index bfd2acc6b..05bc96dd7 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/UserContactInfoEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserContactInfoEntity.java @@ -1,10 +1,10 @@ -package gr.cite.notification.data; +package gr.cite.annotation.data; -import gr.cite.notification.common.enums.ContactInfoType; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.conventers.ContactInfoTypeConverter; -import gr.cite.notification.data.conventers.IsActiveConverter; -import gr.cite.notification.data.tenant.TenantScopedBaseEntity; +import gr.cite.annotation.common.enums.ContactInfoType; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.conventers.ContactInfoTypeConverter; +import gr.cite.annotation.data.conventers.IsActiveConverter; +import gr.cite.annotation.data.tenant.TenantScopedBaseEntity; import jakarta.persistence.*; import java.time.Instant; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/UserCredentialEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserCredentialEntity.java similarity index 90% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/UserCredentialEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserCredentialEntity.java index 51470a896..0186287bb 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/UserCredentialEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserCredentialEntity.java @@ -1,8 +1,8 @@ -package gr.cite.notification.data; +package gr.cite.annotation.data; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.conventers.IsActiveConverter; -import gr.cite.notification.data.tenant.TenantScopedBaseEntity; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.conventers.IsActiveConverter; +import gr.cite.annotation.data.tenant.TenantScopedBaseEntity; import jakarta.persistence.*; import java.time.Instant; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/UserEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserEntity.java similarity index 93% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/UserEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserEntity.java index 477695f65..8938c1b01 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/UserEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserEntity.java @@ -1,7 +1,7 @@ -package gr.cite.notification.data; +package gr.cite.annotation.data; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.conventers.IsActiveConverter; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.conventers.IsActiveConverter; import jakarta.persistence.*; import java.time.Instant; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/UserRoleEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserRoleEntity.java similarity index 90% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/UserRoleEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserRoleEntity.java index ba3e9baf1..52c7e2d3b 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/UserRoleEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserRoleEntity.java @@ -1,8 +1,8 @@ -package gr.cite.notification.data; +package gr.cite.annotation.data; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.conventers.IsActiveConverter; -import gr.cite.notification.data.tenant.TenantScopedBaseEntity; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.conventers.IsActiveConverter; +import gr.cite.annotation.data.tenant.TenantScopedBaseEntity; import jakarta.persistence.*; import java.time.Instant; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/ContactInfoTypeConverter.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/ContactInfoTypeConverter.java similarity index 69% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/ContactInfoTypeConverter.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/ContactInfoTypeConverter.java index 15d74a2f6..66c3a42df 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/ContactInfoTypeConverter.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/ContactInfoTypeConverter.java @@ -1,6 +1,6 @@ -package gr.cite.notification.data.conventers; +package gr.cite.annotation.data.conventers; -import gr.cite.notification.common.enums.ContactInfoType; +import gr.cite.annotation.common.enums.ContactInfoType; import jakarta.persistence.Converter; @Converter diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/DatabaseEnum.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/DatabaseEnum.java similarity index 72% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/DatabaseEnum.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/DatabaseEnum.java index 4dd378c02..6ba8567f8 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/DatabaseEnum.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/DatabaseEnum.java @@ -1,4 +1,4 @@ -package gr.cite.notification.data.conventers; +package gr.cite.annotation.data.conventers; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/DatabaseEnumConverter.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/DatabaseEnumConverter.java similarity index 92% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/DatabaseEnumConverter.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/DatabaseEnumConverter.java index 6cb0dd82c..fdba31797 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/DatabaseEnumConverter.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/DatabaseEnumConverter.java @@ -1,4 +1,4 @@ -package gr.cite.notification.data.conventers; +package gr.cite.annotation.data.conventers; import jakarta.persistence.AttributeConverter; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/IsActiveConverter.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/IsActiveConverter.java similarity index 67% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/IsActiveConverter.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/IsActiveConverter.java index 0374a9a57..195d7e3c4 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/IsActiveConverter.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/IsActiveConverter.java @@ -1,6 +1,6 @@ -package gr.cite.notification.data.conventers; +package gr.cite.annotation.data.conventers; -import gr.cite.notification.common.enums.IsActive; +import gr.cite.annotation.common.enums.IsActive; import jakarta.persistence.Converter; @Converter diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/TenantConfigurationTypeConverter.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/TenantConfigurationTypeConverter.java similarity index 70% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/TenantConfigurationTypeConverter.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/TenantConfigurationTypeConverter.java index 4c06472e0..63623104d 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/conventers/TenantConfigurationTypeConverter.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/conventers/TenantConfigurationTypeConverter.java @@ -1,6 +1,6 @@ -package gr.cite.notification.data.conventers; +package gr.cite.annotation.data.conventers; -import gr.cite.notification.common.enums.TenantConfigurationType; +import gr.cite.annotation.common.enums.TenantConfigurationType; import jakarta.persistence.Converter; @Converter diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/tenant/TenantFilterAspect.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/tenant/TenantFilterAspect.java similarity index 94% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/tenant/TenantFilterAspect.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/tenant/TenantFilterAspect.java index d48cea78c..7fe28f065 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/tenant/TenantFilterAspect.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/tenant/TenantFilterAspect.java @@ -1,8 +1,8 @@ -package gr.cite.notification.data.tenant; +package gr.cite.annotation.data.tenant; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; import gr.cite.commons.web.oidc.principal.extractor.ClaimExtractor; -import gr.cite.notification.common.scope.tenant.TenantScope; +import gr.cite.annotation.common.scope.tenant.TenantScope; import jakarta.persistence.EntityManager; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/tenant/TenantListener.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/tenant/TenantListener.java similarity index 91% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/tenant/TenantListener.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/tenant/TenantListener.java index 76cfef99e..ae9ccc9d8 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/tenant/TenantListener.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/tenant/TenantListener.java @@ -1,7 +1,7 @@ -package gr.cite.notification.data.tenant; +package gr.cite.annotation.data.tenant; -import gr.cite.notification.common.scope.tenant.TenantScope; -import gr.cite.notification.common.scope.tenant.TenantScoped; +import gr.cite.annotation.common.scope.tenant.TenantScope; +import gr.cite.annotation.common.scope.tenant.TenantScoped; import gr.cite.tools.exception.MyForbiddenException; import gr.cite.tools.logging.LoggerService; import jakarta.persistence.PrePersist; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/tenant/TenantScopedBaseEntity.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/tenant/TenantScopedBaseEntity.java similarity index 92% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/tenant/TenantScopedBaseEntity.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/tenant/TenantScopedBaseEntity.java index 79728dc37..dc5acf522 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/tenant/TenantScopedBaseEntity.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/tenant/TenantScopedBaseEntity.java @@ -1,6 +1,6 @@ -package gr.cite.notification.data.tenant; +package gr.cite.annotation.data.tenant; -import gr.cite.notification.common.scope.tenant.TenantScoped; +import gr.cite.annotation.common.scope.tenant.TenantScoped; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/data/types/JsonSQLType.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/types/JsonSQLType.java similarity index 97% rename from annotation-service/annotation/src/main/java/gr/cite/notification/data/types/JsonSQLType.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/data/types/JsonSQLType.java index 434f8eda1..73fa089f7 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/data/types/JsonSQLType.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/data/types/JsonSQLType.java @@ -1,4 +1,4 @@ -package gr.cite.notification.data.types; +package gr.cite.annotation.data.types; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/errorcode/ErrorDescription.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/errorcode/ErrorDescription.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/errorcode/ErrorDescription.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/errorcode/ErrorDescription.java index eb1279ae6..3de0020f5 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/errorcode/ErrorDescription.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/errorcode/ErrorDescription.java @@ -1,4 +1,4 @@ -package gr.cite.notification.errorcode; +package gr.cite.annotation.errorcode; public class ErrorDescription { private int code; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusConfiguration.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/errorcode/ErrorThesaurusConfiguration.java similarity index 93% rename from annotation-service/annotation/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusConfiguration.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/errorcode/ErrorThesaurusConfiguration.java index 08adb6f11..b05bbad1e 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusConfiguration.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/errorcode/ErrorThesaurusConfiguration.java @@ -1,4 +1,4 @@ -package gr.cite.notification.errorcode; +package gr.cite.annotation.errorcode; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusProperties.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/errorcode/ErrorThesaurusProperties.java similarity index 98% rename from annotation-service/annotation/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusProperties.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/errorcode/ErrorThesaurusProperties.java index d19b62512..990ab50ee 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusProperties.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/errorcode/ErrorThesaurusProperties.java @@ -1,4 +1,4 @@ -package gr.cite.notification.errorcode; +package gr.cite.annotation.errorcode; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/event/EventBroker.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/event/EventBroker.java similarity index 96% rename from annotation-service/annotation/src/main/java/gr/cite/notification/event/EventBroker.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/event/EventBroker.java index 3bc5a14b8..788baa252 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/event/EventBroker.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/event/EventBroker.java @@ -1,4 +1,4 @@ -package gr.cite.notification.event; +package gr.cite.annotation.event; import gr.cite.commons.web.oidc.apikey.events.ApiKeyStaleEvent; import org.springframework.beans.factory.annotation.Autowired; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/event/TenantTouchedEvent.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/event/TenantTouchedEvent.java similarity index 95% rename from annotation-service/annotation/src/main/java/gr/cite/notification/event/TenantTouchedEvent.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/event/TenantTouchedEvent.java index 29be1cb7e..878a77e01 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/event/TenantTouchedEvent.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/event/TenantTouchedEvent.java @@ -1,4 +1,4 @@ -package gr.cite.notification.event; +package gr.cite.annotation.event; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/event/UserAddedToTenantEvent.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/event/UserAddedToTenantEvent.java similarity index 93% rename from annotation-service/annotation/src/main/java/gr/cite/notification/event/UserAddedToTenantEvent.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/event/UserAddedToTenantEvent.java index c6c0c0f58..c3b90bbc9 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/event/UserAddedToTenantEvent.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/event/UserAddedToTenantEvent.java @@ -1,4 +1,4 @@ -package gr.cite.notification.event; +package gr.cite.annotation.event; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/event/UserRemovedFromTenantEvent.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/event/UserRemovedFromTenantEvent.java similarity index 93% rename from annotation-service/annotation/src/main/java/gr/cite/notification/event/UserRemovedFromTenantEvent.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/event/UserRemovedFromTenantEvent.java index 6a175e34f..7b118e088 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/event/UserRemovedFromTenantEvent.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/event/UserRemovedFromTenantEvent.java @@ -1,4 +1,4 @@ -package gr.cite.notification.event; +package gr.cite.annotation.event; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/event/UserTouchedEvent.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/event/UserTouchedEvent.java similarity index 95% rename from annotation-service/annotation/src/main/java/gr/cite/notification/event/UserTouchedEvent.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/event/UserTouchedEvent.java index 44b83cd9a..507c20fe7 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/event/UserTouchedEvent.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/event/UserTouchedEvent.java @@ -1,4 +1,4 @@ -package gr.cite.notification.event; +package gr.cite.annotation.event; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/AppRabbitConfigurer.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/AppRabbitConfigurer.java similarity index 91% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/AppRabbitConfigurer.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/AppRabbitConfigurer.java index a0e003cb9..087f6cf42 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/AppRabbitConfigurer.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/AppRabbitConfigurer.java @@ -1,7 +1,7 @@ -package gr.cite.notification.integrationevent; +package gr.cite.annotation.integrationevent; -import gr.cite.notification.integrationevent.inbox.InboxProperties; -import gr.cite.notification.integrationevent.outbox.OutboxProperties; +import gr.cite.annotation.integrationevent.inbox.InboxProperties; +import gr.cite.annotation.integrationevent.outbox.OutboxProperties; import gr.cite.queueinbox.repository.InboxRepository; import gr.cite.rabbitmq.RabbitConfigurer; import gr.cite.rabbitmq.consumer.InboxBindings; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/InboxIntegrationEventConfigurer.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/InboxIntegrationEventConfigurer.java similarity index 86% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/InboxIntegrationEventConfigurer.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/InboxIntegrationEventConfigurer.java index 998ce70f3..cf81badb5 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/InboxIntegrationEventConfigurer.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/InboxIntegrationEventConfigurer.java @@ -1,7 +1,7 @@ -package gr.cite.notification.integrationevent; +package gr.cite.annotation.integrationevent; -import gr.cite.notification.integrationevent.inbox.InboxProperties; -import gr.cite.notification.integrationevent.inbox.InboxRepositoryImpl; +import gr.cite.annotation.integrationevent.inbox.InboxProperties; +import gr.cite.annotation.integrationevent.inbox.InboxRepositoryImpl; import gr.cite.queueinbox.InboxConfigurer; import gr.cite.queueinbox.repository.InboxRepository; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/IntegrationEventContextImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/IntegrationEventContextImpl.java similarity index 90% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/IntegrationEventContextImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/IntegrationEventContextImpl.java index fd8c02dc3..dae6eddde 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/IntegrationEventContextImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/IntegrationEventContextImpl.java @@ -1,4 +1,4 @@ -package gr.cite.notification.integrationevent; +package gr.cite.annotation.integrationevent; import gr.cite.rabbitmq.IntegrationEventContext; import org.springframework.stereotype.Component; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/OutboxIntegrationEventConfigurer.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/OutboxIntegrationEventConfigurer.java similarity index 92% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/OutboxIntegrationEventConfigurer.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/OutboxIntegrationEventConfigurer.java index 70ebc5361..8a5eca059 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/OutboxIntegrationEventConfigurer.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/OutboxIntegrationEventConfigurer.java @@ -1,7 +1,7 @@ -package gr.cite.notification.integrationevent; +package gr.cite.annotation.integrationevent; -import gr.cite.notification.integrationevent.outbox.OutboxProperties; -import gr.cite.notification.integrationevent.outbox.OutboxRepositoryImpl; +import gr.cite.annotation.integrationevent.outbox.OutboxProperties; +import gr.cite.annotation.integrationevent.outbox.OutboxRepositoryImpl; import gr.cite.queueoutbox.IntegrationEventContextCreator; import gr.cite.queueoutbox.OutboxConfigurer; import gr.cite.queueoutbox.repository.OutboxRepository; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/TrackedEvent.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/TrackedEvent.java similarity index 89% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/TrackedEvent.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/TrackedEvent.java index c5ecb2542..d184dd1e5 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/TrackedEvent.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/TrackedEvent.java @@ -1,4 +1,4 @@ -package gr.cite.notification.integrationevent; +package gr.cite.annotation.integrationevent; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyHandler.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/ConsistencyHandler.java similarity index 70% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyHandler.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/ConsistencyHandler.java index 78f4f7f67..158bf3dc4 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyHandler.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/ConsistencyHandler.java @@ -1,4 +1,4 @@ -package gr.cite.notification.integrationevent.inbox; +package gr.cite.annotation.integrationevent.inbox; public interface ConsistencyHandler { diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/ConsistencyPredicates.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/ConsistencyPredicates.java new file mode 100644 index 000000000..c6077c6de --- /dev/null +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/ConsistencyPredicates.java @@ -0,0 +1,5 @@ +package gr.cite.annotation.integrationevent.inbox; + +public interface ConsistencyPredicates { + +} diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/EventProcessingStatus.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/EventProcessingStatus.java similarity index 62% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/EventProcessingStatus.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/EventProcessingStatus.java index 274049473..c4041160b 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/EventProcessingStatus.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/EventProcessingStatus.java @@ -1,4 +1,4 @@ -package gr.cite.notification.integrationevent.inbox; +package gr.cite.annotation.integrationevent.inbox; public enum EventProcessingStatus { Error, diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/InboxPrincipal.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxPrincipal.java similarity index 97% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/InboxPrincipal.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxPrincipal.java index 9fbc1521e..c94019a04 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/InboxPrincipal.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxPrincipal.java @@ -1,4 +1,4 @@ -package gr.cite.notification.integrationevent.inbox; +package gr.cite.annotation.integrationevent.inbox; import gr.cite.commons.web.oidc.principal.MyPrincipal; import org.springframework.security.oauth2.core.ClaimAccessor; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/InboxProperties.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxProperties.java similarity index 96% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/InboxProperties.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxProperties.java index 18e14699b..cff363a6e 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/InboxProperties.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxProperties.java @@ -1,4 +1,4 @@ -package gr.cite.notification.integrationevent.inbox; +package gr.cite.annotation.integrationevent.inbox; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/InboxRepositoryImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxRepositoryImpl.java similarity index 95% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/InboxRepositoryImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxRepositoryImpl.java index 6205c99ca..1be479469 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/InboxRepositoryImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxRepositoryImpl.java @@ -1,15 +1,15 @@ -package gr.cite.notification.integrationevent.inbox; +package gr.cite.annotation.integrationevent.inbox; -import gr.cite.notification.common.JsonHandlingService; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.common.scope.fake.FakeRequestScope; -import gr.cite.notification.data.QueueInboxEntity; -import gr.cite.notification.integrationevent.TrackedEvent; -import gr.cite.notification.integrationevent.inbox.tenantremoval.TenantRemovalIntegrationEventHandler; -import gr.cite.notification.integrationevent.inbox.tenanttouched.TenantTouchedIntegrationEventHandler; -import gr.cite.notification.integrationevent.inbox.userremoval.UserRemovalIntegrationEventHandler; -import gr.cite.notification.integrationevent.inbox.usertouched.UserTouchedIntegrationEventHandler; -import gr.cite.notification.query.QueueInboxQuery; +import gr.cite.annotation.common.JsonHandlingService; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.common.scope.fake.FakeRequestScope; +import gr.cite.annotation.data.QueueInboxEntity; +import gr.cite.annotation.integrationevent.TrackedEvent; +import gr.cite.annotation.integrationevent.inbox.tenantremoval.TenantRemovalIntegrationEventHandler; +import gr.cite.annotation.integrationevent.inbox.tenanttouched.TenantTouchedIntegrationEventHandler; +import gr.cite.annotation.integrationevent.inbox.userremoval.UserRemovalIntegrationEventHandler; +import gr.cite.annotation.integrationevent.inbox.usertouched.UserTouchedIntegrationEventHandler; +import gr.cite.annotation.query.QueueInboxQuery; import gr.cite.queueinbox.entity.QueueInbox; import gr.cite.queueinbox.entity.QueueInboxStatus; import gr.cite.queueinbox.repository.CandidateInfo; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventHandler.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/IntegrationEventHandler.java similarity index 72% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventHandler.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/IntegrationEventHandler.java index 729cd7642..25e76c126 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventHandler.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/IntegrationEventHandler.java @@ -1,4 +1,4 @@ -package gr.cite.notification.integrationevent.inbox; +package gr.cite.annotation.integrationevent.inbox; public interface IntegrationEventHandler { diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventProperties.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/IntegrationEventProperties.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventProperties.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/IntegrationEventProperties.java index 9d5fcea93..2e504fa83 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventProperties.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/IntegrationEventProperties.java @@ -1,4 +1,4 @@ -package gr.cite.notification.integrationevent.inbox; +package gr.cite.annotation.integrationevent.inbox; public class IntegrationEventProperties { diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyHandler.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyHandler.java similarity index 81% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyHandler.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyHandler.java index 685597a98..96b0f51a7 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyHandler.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyHandler.java @@ -1,7 +1,7 @@ -package gr.cite.notification.integrationevent.inbox.tenantremoval; +package gr.cite.annotation.integrationevent.inbox.tenantremoval; -import gr.cite.notification.integrationevent.inbox.ConsistencyHandler; -import gr.cite.notification.query.TenantQuery; +import gr.cite.annotation.integrationevent.inbox.ConsistencyHandler; +import gr.cite.annotation.query.TenantQuery; import gr.cite.tools.data.query.QueryFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Scope; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyPredicates.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyPredicates.java similarity index 73% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyPredicates.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyPredicates.java index f55869126..1daa0d483 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyPredicates.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyPredicates.java @@ -1,6 +1,6 @@ -package gr.cite.notification.integrationevent.inbox.tenantremoval; +package gr.cite.annotation.integrationevent.inbox.tenantremoval; -import gr.cite.notification.integrationevent.inbox.ConsistencyPredicates; +import gr.cite.annotation.integrationevent.inbox.ConsistencyPredicates; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEvent.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEvent.java similarity index 64% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEvent.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEvent.java index cf1201688..dd6e0cd74 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEvent.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEvent.java @@ -1,6 +1,6 @@ -package gr.cite.notification.integrationevent.inbox.tenantremoval; +package gr.cite.annotation.integrationevent.inbox.tenantremoval; -import gr.cite.notification.integrationevent.TrackedEvent; +import gr.cite.annotation.integrationevent.TrackedEvent; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandler.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandler.java new file mode 100644 index 000000000..201a15af6 --- /dev/null +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandler.java @@ -0,0 +1,7 @@ +package gr.cite.annotation.integrationevent.inbox.tenantremoval; + +import gr.cite.annotation.integrationevent.inbox.IntegrationEventHandler; + +public interface TenantRemovalIntegrationEventHandler extends IntegrationEventHandler { + +} diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandlerImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandlerImpl.java similarity index 89% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandlerImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandlerImpl.java index c27824f3f..87fb9f3b4 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandlerImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandlerImpl.java @@ -1,14 +1,14 @@ -package gr.cite.notification.integrationevent.inbox.tenantremoval; +package gr.cite.annotation.integrationevent.inbox.tenantremoval; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; -import gr.cite.notification.audit.AuditableAction; -import gr.cite.notification.common.JsonHandlingService; -import gr.cite.notification.common.scope.fake.FakeRequestScope; -import gr.cite.notification.errorcode.ErrorThesaurusProperties; -import gr.cite.notification.integrationevent.inbox.EventProcessingStatus; -import gr.cite.notification.integrationevent.inbox.InboxPrincipal; -import gr.cite.notification.integrationevent.inbox.IntegrationEventProperties; -import gr.cite.notification.service.tenant.TenantService; +import gr.cite.annotation.audit.AuditableAction; +import gr.cite.annotation.common.JsonHandlingService; +import gr.cite.annotation.common.scope.fake.FakeRequestScope; +import gr.cite.annotation.errorcode.ErrorThesaurusProperties; +import gr.cite.annotation.integrationevent.inbox.EventProcessingStatus; +import gr.cite.annotation.integrationevent.inbox.InboxPrincipal; +import gr.cite.annotation.integrationevent.inbox.IntegrationEventProperties; +import gr.cite.annotation.service.tenant.TenantService; import gr.cite.tools.auditing.AuditService; import gr.cite.tools.logging.LoggerService; import jakarta.persistence.EntityManager; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEvent.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEvent.java similarity index 75% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEvent.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEvent.java index 899d22db8..60824de80 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEvent.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEvent.java @@ -1,6 +1,6 @@ -package gr.cite.notification.integrationevent.inbox.tenanttouched; +package gr.cite.annotation.integrationevent.inbox.tenanttouched; -import gr.cite.notification.integrationevent.TrackedEvent; +import gr.cite.annotation.integrationevent.TrackedEvent; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandler.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandler.java new file mode 100644 index 000000000..2e5391235 --- /dev/null +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandler.java @@ -0,0 +1,7 @@ +package gr.cite.annotation.integrationevent.inbox.tenanttouched; + +import gr.cite.annotation.integrationevent.inbox.IntegrationEventHandler; + +public interface TenantTouchedIntegrationEventHandler extends IntegrationEventHandler { + +} diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandlerImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandlerImpl.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandlerImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandlerImpl.java index 013a2698f..d7ba365ec 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandlerImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandlerImpl.java @@ -1,14 +1,14 @@ -package gr.cite.notification.integrationevent.inbox.tenanttouched; +package gr.cite.annotation.integrationevent.inbox.tenanttouched; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; -import gr.cite.notification.audit.AuditableAction; -import gr.cite.notification.common.JsonHandlingService; -import gr.cite.notification.common.scope.fake.FakeRequestScope; -import gr.cite.notification.integrationevent.inbox.EventProcessingStatus; -import gr.cite.notification.integrationevent.inbox.InboxPrincipal; -import gr.cite.notification.integrationevent.inbox.IntegrationEventProperties; -import gr.cite.notification.model.persist.TenantTouchedIntegrationEventPersist; -import gr.cite.notification.service.tenant.TenantService; +import gr.cite.annotation.audit.AuditableAction; +import gr.cite.annotation.common.JsonHandlingService; +import gr.cite.annotation.common.scope.fake.FakeRequestScope; +import gr.cite.annotation.integrationevent.inbox.EventProcessingStatus; +import gr.cite.annotation.integrationevent.inbox.InboxPrincipal; +import gr.cite.annotation.integrationevent.inbox.IntegrationEventProperties; +import gr.cite.annotation.model.persist.TenantTouchedIntegrationEventPersist; +import gr.cite.annotation.service.tenant.TenantService; import gr.cite.tools.auditing.AuditService; import gr.cite.tools.logging.LoggerService; import gr.cite.tools.validation.ValidatorFactory; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyHandler.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalConsistencyHandler.java similarity index 81% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyHandler.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalConsistencyHandler.java index 958d00b84..d1699bd97 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyHandler.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalConsistencyHandler.java @@ -1,7 +1,7 @@ -package gr.cite.notification.integrationevent.inbox.userremoval; +package gr.cite.annotation.integrationevent.inbox.userremoval; -import gr.cite.notification.integrationevent.inbox.ConsistencyHandler; -import gr.cite.notification.query.UserQuery; +import gr.cite.annotation.integrationevent.inbox.ConsistencyHandler; +import gr.cite.annotation.query.UserQuery; import gr.cite.tools.data.query.QueryFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Scope; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyPredicates.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalConsistencyPredicates.java similarity index 72% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyPredicates.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalConsistencyPredicates.java index 2c9974a7d..cfc98997c 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyPredicates.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalConsistencyPredicates.java @@ -1,6 +1,6 @@ -package gr.cite.notification.integrationevent.inbox.userremoval; +package gr.cite.annotation.integrationevent.inbox.userremoval; -import gr.cite.notification.integrationevent.inbox.ConsistencyPredicates; +import gr.cite.annotation.integrationevent.inbox.ConsistencyPredicates; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEvent.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalIntegrationEvent.java similarity index 77% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEvent.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalIntegrationEvent.java index 2ce9f613d..b0a3e9564 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEvent.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalIntegrationEvent.java @@ -1,6 +1,6 @@ -package gr.cite.notification.integrationevent.inbox.userremoval; +package gr.cite.annotation.integrationevent.inbox.userremoval; -import gr.cite.notification.integrationevent.TrackedEvent; +import gr.cite.annotation.integrationevent.TrackedEvent; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandler.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandler.java new file mode 100644 index 000000000..e9e641f35 --- /dev/null +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandler.java @@ -0,0 +1,7 @@ +package gr.cite.annotation.integrationevent.inbox.userremoval; + +import gr.cite.annotation.integrationevent.inbox.IntegrationEventHandler; + +public interface UserRemovalIntegrationEventHandler extends IntegrationEventHandler { + +} diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java similarity index 89% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java index 326325373..07e0b5346 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java @@ -1,18 +1,18 @@ -package gr.cite.notification.integrationevent.inbox.userremoval; +package gr.cite.annotation.integrationevent.inbox.userremoval; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; -import gr.cite.notification.audit.AuditableAction; -import gr.cite.notification.common.JsonHandlingService; -import gr.cite.notification.common.scope.fake.FakeRequestScope; -import gr.cite.notification.common.scope.tenant.TenantScope; -import gr.cite.notification.data.TenantEntity; -import gr.cite.notification.errorcode.ErrorThesaurusProperties; -import gr.cite.notification.integrationevent.inbox.EventProcessingStatus; -import gr.cite.notification.integrationevent.inbox.InboxPrincipal; -import gr.cite.notification.integrationevent.inbox.IntegrationEventProperties; -import gr.cite.notification.model.Tenant; -import gr.cite.notification.query.TenantQuery; -import gr.cite.notification.service.user.UserService; +import gr.cite.annotation.audit.AuditableAction; +import gr.cite.annotation.common.JsonHandlingService; +import gr.cite.annotation.common.scope.fake.FakeRequestScope; +import gr.cite.annotation.common.scope.tenant.TenantScope; +import gr.cite.annotation.data.TenantEntity; +import gr.cite.annotation.errorcode.ErrorThesaurusProperties; +import gr.cite.annotation.integrationevent.inbox.EventProcessingStatus; +import gr.cite.annotation.integrationevent.inbox.InboxPrincipal; +import gr.cite.annotation.integrationevent.inbox.IntegrationEventProperties; +import gr.cite.annotation.model.Tenant; +import gr.cite.annotation.query.TenantQuery; +import gr.cite.annotation.service.user.UserService; import gr.cite.tools.auditing.AuditService; import gr.cite.tools.data.query.QueryFactory; import gr.cite.tools.exception.MyValidationException; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEvent.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/usertouched/UserTouchedIntegrationEvent.java similarity index 92% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEvent.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/usertouched/UserTouchedIntegrationEvent.java index daa3d9a54..3b4e9b837 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEvent.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/usertouched/UserTouchedIntegrationEvent.java @@ -1,11 +1,11 @@ -package gr.cite.notification.integrationevent.inbox.usertouched; +package gr.cite.annotation.integrationevent.inbox.usertouched; -import gr.cite.notification.common.enums.ContactInfoType; -import gr.cite.notification.common.validation.BaseValidator; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.errorcode.ErrorThesaurusProperties; -import gr.cite.notification.integrationevent.TrackedEvent; -import gr.cite.notification.model.persist.UserTouchedIntegrationEventPersist; +import gr.cite.annotation.common.enums.ContactInfoType; +import gr.cite.annotation.common.validation.BaseValidator; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.errorcode.ErrorThesaurusProperties; +import gr.cite.annotation.integrationevent.TrackedEvent; +import gr.cite.annotation.model.persist.UserTouchedIntegrationEventPersist; import gr.cite.tools.validation.specification.Specification; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.MessageSource; diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandler.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandler.java new file mode 100644 index 000000000..42f140ba2 --- /dev/null +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandler.java @@ -0,0 +1,7 @@ +package gr.cite.annotation.integrationevent.inbox.usertouched; + +import gr.cite.annotation.integrationevent.inbox.IntegrationEventHandler; + +public interface UserTouchedIntegrationEventHandler extends IntegrationEventHandler { + +} diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java index 4b0bafa27..d389fde94 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java @@ -1,17 +1,17 @@ -package gr.cite.notification.integrationevent.inbox.usertouched; +package gr.cite.annotation.integrationevent.inbox.usertouched; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; -import gr.cite.notification.audit.AuditableAction; -import gr.cite.notification.common.JsonHandlingService; -import gr.cite.notification.common.scope.fake.FakeRequestScope; -import gr.cite.notification.common.scope.tenant.TenantScope; -import gr.cite.notification.data.TenantEntity; -import gr.cite.notification.integrationevent.inbox.EventProcessingStatus; -import gr.cite.notification.integrationevent.inbox.InboxPrincipal; -import gr.cite.notification.integrationevent.inbox.IntegrationEventProperties; -import gr.cite.notification.model.Tenant; -import gr.cite.notification.query.TenantQuery; -import gr.cite.notification.service.user.UserService; +import gr.cite.annotation.audit.AuditableAction; +import gr.cite.annotation.common.JsonHandlingService; +import gr.cite.annotation.common.scope.fake.FakeRequestScope; +import gr.cite.annotation.common.scope.tenant.TenantScope; +import gr.cite.annotation.data.TenantEntity; +import gr.cite.annotation.integrationevent.inbox.EventProcessingStatus; +import gr.cite.annotation.integrationevent.inbox.InboxPrincipal; +import gr.cite.annotation.integrationevent.inbox.IntegrationEventProperties; +import gr.cite.annotation.model.Tenant; +import gr.cite.annotation.query.TenantQuery; +import gr.cite.annotation.service.user.UserService; import gr.cite.tools.auditing.AuditService; import gr.cite.tools.data.query.QueryFactory; import gr.cite.tools.fieldset.BaseFieldSet; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxIntegrationEvent.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/outbox/OutboxIntegrationEvent.java similarity index 76% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxIntegrationEvent.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/outbox/OutboxIntegrationEvent.java index 5961fe016..ceca4f86e 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxIntegrationEvent.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/outbox/OutboxIntegrationEvent.java @@ -1,7 +1,7 @@ -package gr.cite.notification.integrationevent.outbox; +package gr.cite.annotation.integrationevent.outbox; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import gr.cite.notification.integrationevent.TrackedEvent; +import gr.cite.annotation.integrationevent.TrackedEvent; import gr.cite.rabbitmq.IntegrationEvent; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxProperties.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/outbox/OutboxProperties.java similarity index 96% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxProperties.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/outbox/OutboxProperties.java index af5e77173..669a7bc42 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxProperties.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/outbox/OutboxProperties.java @@ -1,4 +1,4 @@ -package gr.cite.notification.integrationevent.outbox; +package gr.cite.annotation.integrationevent.outbox; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxRepositoryImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/outbox/OutboxRepositoryImpl.java similarity index 97% rename from annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxRepositoryImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/outbox/OutboxRepositoryImpl.java index c8a841597..61f663054 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxRepositoryImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/outbox/OutboxRepositoryImpl.java @@ -1,10 +1,10 @@ -package gr.cite.notification.integrationevent.outbox; +package gr.cite.annotation.integrationevent.outbox; -import gr.cite.notification.common.JsonHandlingService; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.common.scope.fake.FakeRequestScope; -import gr.cite.notification.data.QueueOutboxEntity; -import gr.cite.notification.query.QueueOutboxQuery; +import gr.cite.annotation.common.JsonHandlingService; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.common.scope.fake.FakeRequestScope; +import gr.cite.annotation.data.QueueOutboxEntity; +import gr.cite.annotation.query.QueueOutboxQuery; import gr.cite.queueoutbox.entity.QueueOutbox; import gr.cite.queueoutbox.entity.QueueOutboxNotifyStatus; import gr.cite.queueoutbox.repository.CandidateInfo; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/locale/LocaleConfiguration.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/locale/LocaleConfiguration.java similarity index 87% rename from annotation-service/annotation/src/main/java/gr/cite/notification/locale/LocaleConfiguration.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/locale/LocaleConfiguration.java index b6699c02f..85c77e490 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/locale/LocaleConfiguration.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/locale/LocaleConfiguration.java @@ -1,4 +1,4 @@ -package gr.cite.notification.locale; +package gr.cite.annotation.locale; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/locale/LocaleProperties.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/locale/LocaleProperties.java similarity index 94% rename from annotation-service/annotation/src/main/java/gr/cite/notification/locale/LocaleProperties.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/locale/LocaleProperties.java index 296b55a92..781fc203b 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/locale/LocaleProperties.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/locale/LocaleProperties.java @@ -1,4 +1,4 @@ -package gr.cite.notification.locale; +package gr.cite.annotation.locale; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/locale/LocaleService.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/locale/LocaleService.java similarity index 90% rename from annotation-service/annotation/src/main/java/gr/cite/notification/locale/LocaleService.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/locale/LocaleService.java index f2f54e6e7..eaea37fec 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/locale/LocaleService.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/locale/LocaleService.java @@ -1,4 +1,4 @@ -package gr.cite.notification.locale; +package gr.cite.annotation.locale; import java.util.Locale; import java.util.TimeZone; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/locale/LocaleServiceImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/locale/LocaleServiceImpl.java similarity index 96% rename from annotation-service/annotation/src/main/java/gr/cite/notification/locale/LocaleServiceImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/locale/LocaleServiceImpl.java index 71bdb83e7..48375d791 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/locale/LocaleServiceImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/locale/LocaleServiceImpl.java @@ -1,6 +1,6 @@ -package gr.cite.notification.locale; +package gr.cite.annotation.locale; -import gr.cite.notification.convention.ConventionService; +import gr.cite.annotation.convention.ConventionService; import gr.cite.tools.logging.LoggerService; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/Tenant.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/Tenant.java similarity index 94% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/Tenant.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/Tenant.java index ab585cf72..0187ba26a 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/Tenant.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/Tenant.java @@ -1,6 +1,6 @@ -package gr.cite.notification.model; +package gr.cite.annotation.model; -import gr.cite.notification.common.enums.IsActive; +import gr.cite.annotation.common.enums.IsActive; import java.time.Instant; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/TenantConfiguration.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/TenantConfiguration.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/TenantConfiguration.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/TenantConfiguration.java index f14234bc9..5d62340df 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/TenantConfiguration.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/TenantConfiguration.java @@ -1,9 +1,9 @@ -package gr.cite.notification.model; +package gr.cite.annotation.model; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.common.enums.TenantConfigurationType; -import gr.cite.notification.common.types.tenantconfiguration.DefaultUserLocaleConfigurationDataContainer; -import gr.cite.notification.common.types.tenantconfiguration.EmailClientConfigurationDataContainer; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.common.enums.TenantConfigurationType; +import gr.cite.annotation.common.types.tenantconfiguration.DefaultUserLocaleConfigurationDataContainer; +import gr.cite.annotation.common.types.tenantconfiguration.EmailClientConfigurationDataContainer; import java.time.Instant; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/User.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/User.java similarity index 93% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/User.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/User.java index 7231b2245..58cfaa3ef 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/User.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/User.java @@ -1,6 +1,6 @@ -package gr.cite.notification.model; +package gr.cite.annotation.model; -import gr.cite.notification.common.enums.IsActive; +import gr.cite.annotation.common.enums.IsActive; import java.time.Instant; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/UserCredential.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/UserCredential.java similarity index 94% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/UserCredential.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/UserCredential.java index 826a39d20..f894fc5f3 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/UserCredential.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/UserCredential.java @@ -1,6 +1,6 @@ -package gr.cite.notification.model; +package gr.cite.annotation.model; -import gr.cite.notification.common.enums.IsActive; +import gr.cite.annotation.common.enums.IsActive; import java.time.Instant; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/BaseBuilder.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/BaseBuilder.java similarity index 97% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/BaseBuilder.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/BaseBuilder.java index 087df8b45..5987e6ca0 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/BaseBuilder.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/BaseBuilder.java @@ -1,6 +1,6 @@ -package gr.cite.notification.model.builder; +package gr.cite.annotation.model.builder; -import gr.cite.notification.convention.ConventionService; +import gr.cite.annotation.convention.ConventionService; import gr.cite.tools.data.builder.Builder; import gr.cite.tools.data.query.QueryBase; import gr.cite.tools.exception.MyApplicationException; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/TenantBuilder.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/TenantBuilder.java similarity index 91% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/TenantBuilder.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/TenantBuilder.java index c1fd44c14..1718ff3d8 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/TenantBuilder.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/TenantBuilder.java @@ -1,9 +1,9 @@ -package gr.cite.notification.model.builder; +package gr.cite.annotation.model.builder; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.data.TenantEntity; -import gr.cite.notification.model.Tenant; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.data.TenantEntity; +import gr.cite.annotation.model.Tenant; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.fieldset.FieldSet; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/TenantConfigurationBuilder.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/TenantConfigurationBuilder.java similarity index 94% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/TenantConfigurationBuilder.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/TenantConfigurationBuilder.java index c8668d105..dd283c672 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/TenantConfigurationBuilder.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/TenantConfigurationBuilder.java @@ -1,13 +1,13 @@ -package gr.cite.notification.model.builder; +package gr.cite.annotation.model.builder; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.common.types.tenantconfiguration.DefaultUserLocaleConfigurationDataContainer; -import gr.cite.notification.common.types.tenantconfiguration.EmailClientConfigurationDataContainer; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.data.TenantConfigurationEntity; -import gr.cite.notification.model.TenantConfiguration; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.common.types.tenantconfiguration.DefaultUserLocaleConfigurationDataContainer; +import gr.cite.annotation.common.types.tenantconfiguration.EmailClientConfigurationDataContainer; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.data.TenantConfigurationEntity; +import gr.cite.annotation.model.TenantConfiguration; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.logging.DataLogEntry; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/UserBuilder.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/UserBuilder.java similarity index 91% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/UserBuilder.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/UserBuilder.java index e65104883..05882378c 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/UserBuilder.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/UserBuilder.java @@ -1,9 +1,9 @@ -package gr.cite.notification.model.builder; +package gr.cite.annotation.model.builder; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.data.UserEntity; -import gr.cite.notification.model.User; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.data.UserEntity; +import gr.cite.annotation.model.User; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.data.query.QueryFactory; import gr.cite.tools.exception.MyApplicationException; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantConfigBuilder.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/tenantconfig/TenantConfigBuilder.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantConfigBuilder.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/tenantconfig/TenantConfigBuilder.java index 57ad4bea8..67bf9508a 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantConfigBuilder.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/tenantconfig/TenantConfigBuilder.java @@ -1,10 +1,10 @@ -package gr.cite.notification.model.builder.tenantconfig; +package gr.cite.annotation.model.builder.tenantconfig; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.common.types.tenant.TenantConfigEntity; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.model.builder.BaseBuilder; -import gr.cite.notification.model.tenantconfig.TenantConfig; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.common.types.tenant.TenantConfigEntity; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.model.builder.BaseBuilder; +import gr.cite.annotation.model.tenantconfig.TenantConfig; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.fieldset.FieldSet; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantDepositConfigBuilder.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/tenantconfig/TenantDepositConfigBuilder.java similarity index 86% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantDepositConfigBuilder.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/tenantconfig/TenantDepositConfigBuilder.java index ec7c4b901..e59cc77c5 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantDepositConfigBuilder.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/tenantconfig/TenantDepositConfigBuilder.java @@ -1,10 +1,10 @@ -package gr.cite.notification.model.builder.tenantconfig; +package gr.cite.annotation.model.builder.tenantconfig; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.common.types.tenant.TenantDepositConfigEntity; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.model.builder.BaseBuilder; -import gr.cite.notification.model.tenantconfig.TenantDepositConfig; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.common.types.tenant.TenantDepositConfigEntity; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.model.builder.BaseBuilder; +import gr.cite.annotation.model.tenantconfig.TenantDepositConfig; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.fieldset.FieldSet; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantFileTransformersBuilder.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/tenantconfig/TenantFileTransformersBuilder.java similarity index 86% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantFileTransformersBuilder.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/tenantconfig/TenantFileTransformersBuilder.java index 5ea102750..8f2bce918 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantFileTransformersBuilder.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/tenantconfig/TenantFileTransformersBuilder.java @@ -1,10 +1,10 @@ -package gr.cite.notification.model.builder.tenantconfig; +package gr.cite.annotation.model.builder.tenantconfig; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.common.types.tenant.TenantFileTransformersConfigEntity; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.model.builder.BaseBuilder; -import gr.cite.notification.model.tenantconfig.TenantFileTransformersConfig; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.common.types.tenant.TenantFileTransformersConfigEntity; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.model.builder.BaseBuilder; +import gr.cite.annotation.model.tenantconfig.TenantFileTransformersConfig; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.fieldset.FieldSet; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantSourceBuilder.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/tenantconfig/TenantSourceBuilder.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantSourceBuilder.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/tenantconfig/TenantSourceBuilder.java index 0260ab410..748c9111d 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantSourceBuilder.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/builder/tenantconfig/TenantSourceBuilder.java @@ -1,10 +1,10 @@ -package gr.cite.notification.model.builder.tenantconfig; +package gr.cite.annotation.model.builder.tenantconfig; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.common.types.tenant.TenantSourceEntity; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.model.builder.BaseBuilder; -import gr.cite.notification.model.tenantconfig.TenantSource; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.common.types.tenant.TenantSourceEntity; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.model.builder.BaseBuilder; +import gr.cite.annotation.model.tenantconfig.TenantSource; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.fieldset.FieldSet; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/censorship/BaseCensor.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/censorship/BaseCensor.java similarity index 82% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/censorship/BaseCensor.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/censorship/BaseCensor.java index 12d1b9360..127cb0b4b 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/censorship/BaseCensor.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/censorship/BaseCensor.java @@ -1,6 +1,6 @@ -package gr.cite.notification.model.censorship; +package gr.cite.annotation.model.censorship; -import gr.cite.notification.convention.ConventionService; +import gr.cite.annotation.convention.ConventionService; import gr.cite.tools.data.censor.Censor; import gr.cite.tools.fieldset.FieldSet; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/censorship/TenantCensor.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/censorship/TenantCensor.java similarity index 87% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/censorship/TenantCensor.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/censorship/TenantCensor.java index 4440362e2..fb2096b70 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/censorship/TenantCensor.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/censorship/TenantCensor.java @@ -1,8 +1,8 @@ -package gr.cite.notification.model.censorship; +package gr.cite.annotation.model.censorship; import gr.cite.commons.web.authz.service.AuthorizationService; -import gr.cite.notification.authorization.Permission; -import gr.cite.notification.convention.ConventionService; +import gr.cite.annotation.authorization.Permission; +import gr.cite.annotation.convention.ConventionService; import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.logging.DataLogEntry; import gr.cite.tools.logging.LoggerService; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/censorship/TenantConfigurationCensor.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/censorship/TenantConfigurationCensor.java similarity index 87% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/censorship/TenantConfigurationCensor.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/censorship/TenantConfigurationCensor.java index d3b099193..fdd870bf0 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/censorship/TenantConfigurationCensor.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/censorship/TenantConfigurationCensor.java @@ -1,8 +1,8 @@ -package gr.cite.notification.model.censorship; +package gr.cite.annotation.model.censorship; import gr.cite.commons.web.authz.service.AuthorizationService; -import gr.cite.notification.authorization.Permission; -import gr.cite.notification.convention.ConventionService; +import gr.cite.annotation.authorization.Permission; +import gr.cite.annotation.convention.ConventionService; import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.logging.DataLogEntry; import gr.cite.tools.logging.LoggerService; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/censorship/UserCensor.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/censorship/UserCensor.java similarity index 87% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/censorship/UserCensor.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/censorship/UserCensor.java index ffe0677b3..cdd9fb976 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/censorship/UserCensor.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/censorship/UserCensor.java @@ -1,10 +1,10 @@ -package gr.cite.notification.model.censorship; +package gr.cite.annotation.model.censorship; import gr.cite.commons.web.authz.service.AuthorizationService; -import gr.cite.notification.authorization.OwnedResource; -import gr.cite.notification.authorization.Permission; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.model.User; +import gr.cite.annotation.authorization.OwnedResource; +import gr.cite.annotation.authorization.Permission; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.model.User; import gr.cite.tools.data.censor.CensorFactory; import gr.cite.tools.exception.MyForbiddenException; import gr.cite.tools.fieldset.FieldSet; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/deleter/TenantConfigurationDeleter.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/TenantConfigurationDeleter.java similarity index 91% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/deleter/TenantConfigurationDeleter.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/TenantConfigurationDeleter.java index ffbb084fc..9a12418e1 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/deleter/TenantConfigurationDeleter.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/TenantConfigurationDeleter.java @@ -1,9 +1,9 @@ -package gr.cite.notification.model.deleter; +package gr.cite.annotation.model.deleter; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.TenantConfigurationEntity; -import gr.cite.notification.data.TenantScopedEntityManager; -import gr.cite.notification.query.TenantConfigurationQuery; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.TenantConfigurationEntity; +import gr.cite.annotation.data.TenantScopedEntityManager; +import gr.cite.annotation.query.TenantConfigurationQuery; import gr.cite.tools.data.deleter.Deleter; import gr.cite.tools.data.deleter.DeleterFactory; import gr.cite.tools.data.query.QueryFactory; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/deleter/TenantDeleter.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/TenantDeleter.java similarity index 91% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/deleter/TenantDeleter.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/TenantDeleter.java index db4900766..9e4e6c8b4 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/deleter/TenantDeleter.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/TenantDeleter.java @@ -1,9 +1,9 @@ -package gr.cite.notification.model.deleter; +package gr.cite.annotation.model.deleter; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.TenantEntity; -import gr.cite.notification.data.TenantScopedEntityManager; -import gr.cite.notification.query.TenantQuery; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.TenantEntity; +import gr.cite.annotation.data.TenantScopedEntityManager; +import gr.cite.annotation.query.TenantQuery; import gr.cite.tools.data.deleter.Deleter; import gr.cite.tools.data.deleter.DeleterFactory; import gr.cite.tools.data.query.QueryFactory; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/deleter/UserCredentialDeleter.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/UserCredentialDeleter.java similarity index 90% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/deleter/UserCredentialDeleter.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/UserCredentialDeleter.java index b29145af9..d08e71b71 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/deleter/UserCredentialDeleter.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/UserCredentialDeleter.java @@ -1,9 +1,9 @@ -package gr.cite.notification.model.deleter; +package gr.cite.annotation.model.deleter; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.TenantScopedEntityManager; -import gr.cite.notification.data.UserCredentialEntity; -import gr.cite.notification.query.UserCredentialQuery; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.TenantScopedEntityManager; +import gr.cite.annotation.data.UserCredentialEntity; +import gr.cite.annotation.query.UserCredentialQuery; import gr.cite.tools.data.deleter.Deleter; import gr.cite.tools.data.query.QueryFactory; import gr.cite.tools.logging.LoggerService; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/deleter/UserDeleter.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/UserDeleter.java similarity index 91% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/deleter/UserDeleter.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/UserDeleter.java index 09ad26512..11656c29b 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/deleter/UserDeleter.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/UserDeleter.java @@ -1,10 +1,10 @@ -package gr.cite.notification.model.deleter; +package gr.cite.annotation.model.deleter; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.UserCredentialEntity; -import gr.cite.notification.data.UserEntity; -import gr.cite.notification.query.UserCredentialQuery; -import gr.cite.notification.query.UserQuery; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.UserCredentialEntity; +import gr.cite.annotation.data.UserEntity; +import gr.cite.annotation.query.UserCredentialQuery; +import gr.cite.annotation.query.UserQuery; import gr.cite.tools.data.deleter.Deleter; import gr.cite.tools.data.deleter.DeleterFactory; import gr.cite.tools.data.query.QueryFactory; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/persist/TenantTouchedIntegrationEventPersist.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/persist/TenantTouchedIntegrationEventPersist.java similarity index 93% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/persist/TenantTouchedIntegrationEventPersist.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/persist/TenantTouchedIntegrationEventPersist.java index e8932c3de..dc02ad6da 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/persist/TenantTouchedIntegrationEventPersist.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/persist/TenantTouchedIntegrationEventPersist.java @@ -1,8 +1,8 @@ -package gr.cite.notification.model.persist; +package gr.cite.annotation.model.persist; -import gr.cite.notification.common.validation.BaseValidator; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.errorcode.ErrorThesaurusProperties; +import gr.cite.annotation.common.validation.BaseValidator; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.errorcode.ErrorThesaurusProperties; import gr.cite.tools.validation.specification.Specification; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.MessageSource; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/persist/UserTouchedIntegrationEventPersist.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/persist/UserTouchedIntegrationEventPersist.java similarity index 89% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/persist/UserTouchedIntegrationEventPersist.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/persist/UserTouchedIntegrationEventPersist.java index 0d658d200..5a40c8329 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/persist/UserTouchedIntegrationEventPersist.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/persist/UserTouchedIntegrationEventPersist.java @@ -1,9 +1,9 @@ -package gr.cite.notification.model.persist; +package gr.cite.annotation.model.persist; -import gr.cite.notification.common.validation.BaseValidator; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.errorcode.ErrorThesaurusProperties; -import gr.cite.notification.integrationevent.inbox.usertouched.UserTouchedIntegrationEvent; +import gr.cite.annotation.common.validation.BaseValidator; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.errorcode.ErrorThesaurusProperties; +import gr.cite.annotation.integrationevent.inbox.usertouched.UserTouchedIntegrationEvent; import gr.cite.tools.validation.specification.Specification; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.MessageSource; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationEmailClientPersist.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/persist/tenantconfiguration/TenantConfigurationEmailClientPersist.java similarity index 96% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationEmailClientPersist.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/persist/tenantconfiguration/TenantConfigurationEmailClientPersist.java index 7f3063e6d..dfdc3dd71 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationEmailClientPersist.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/persist/tenantconfiguration/TenantConfigurationEmailClientPersist.java @@ -1,8 +1,8 @@ -package gr.cite.notification.model.persist.tenantconfiguration; +package gr.cite.annotation.model.persist.tenantconfiguration; -import gr.cite.notification.common.validation.BaseValidator; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.errorcode.ErrorThesaurusProperties; +import gr.cite.annotation.common.validation.BaseValidator; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.errorcode.ErrorThesaurusProperties; import gr.cite.tools.validation.specification.Specification; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.MessageSource; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationUserLocaleIntegrationPersist.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/persist/tenantconfiguration/TenantConfigurationUserLocaleIntegrationPersist.java similarity index 93% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationUserLocaleIntegrationPersist.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/persist/tenantconfiguration/TenantConfigurationUserLocaleIntegrationPersist.java index a6e15c081..e269c44a1 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationUserLocaleIntegrationPersist.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/persist/tenantconfiguration/TenantConfigurationUserLocaleIntegrationPersist.java @@ -1,8 +1,8 @@ -package gr.cite.notification.model.persist.tenantconfiguration; +package gr.cite.annotation.model.persist.tenantconfiguration; -import gr.cite.notification.common.validation.BaseValidator; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.errorcode.ErrorThesaurusProperties; +import gr.cite.annotation.common.validation.BaseValidator; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.errorcode.ErrorThesaurusProperties; import gr.cite.tools.validation.specification.Specification; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.MessageSource; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/tenantconfig/TenantConfig.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/tenantconfig/TenantConfig.java similarity index 93% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/tenantconfig/TenantConfig.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/tenantconfig/TenantConfig.java index cd55d9c64..823f357c6 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/tenantconfig/TenantConfig.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/tenantconfig/TenantConfig.java @@ -1,4 +1,4 @@ -package gr.cite.notification.model.tenantconfig; +package gr.cite.annotation.model.tenantconfig; public class TenantConfig { diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/tenantconfig/TenantDepositConfig.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/tenantconfig/TenantDepositConfig.java similarity index 87% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/tenantconfig/TenantDepositConfig.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/tenantconfig/TenantDepositConfig.java index 2a0517b64..fa520a4ff 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/tenantconfig/TenantDepositConfig.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/tenantconfig/TenantDepositConfig.java @@ -1,4 +1,4 @@ -package gr.cite.notification.model.tenantconfig; +package gr.cite.annotation.model.tenantconfig; import java.util.List; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/tenantconfig/TenantFileTransformersConfig.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/tenantconfig/TenantFileTransformersConfig.java similarity index 87% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/tenantconfig/TenantFileTransformersConfig.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/tenantconfig/TenantFileTransformersConfig.java index c7b6c0cc2..e7163e071 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/tenantconfig/TenantFileTransformersConfig.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/tenantconfig/TenantFileTransformersConfig.java @@ -1,4 +1,4 @@ -package gr.cite.notification.model.tenantconfig; +package gr.cite.annotation.model.tenantconfig; import java.util.List; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/tenantconfig/TenantSource.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/tenantconfig/TenantSource.java similarity index 96% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/tenantconfig/TenantSource.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/tenantconfig/TenantSource.java index 5003b7781..6fa62ba14 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/tenantconfig/TenantSource.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/tenantconfig/TenantSource.java @@ -1,4 +1,4 @@ -package gr.cite.notification.model.tenantconfig; +package gr.cite.annotation.model.tenantconfig; import java.util.List; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/model/user/PublicUser.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/user/PublicUser.java similarity index 90% rename from annotation-service/annotation/src/main/java/gr/cite/notification/model/user/PublicUser.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/model/user/PublicUser.java index 0e683ce0d..9ae1cb0ac 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/model/user/PublicUser.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/model/user/PublicUser.java @@ -1,4 +1,4 @@ -package gr.cite.notification.model.user; +package gr.cite.annotation.model.user; import java.util.UUID; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/query/QueueInboxQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueInboxQuery.java similarity index 98% rename from annotation-service/annotation/src/main/java/gr/cite/notification/query/QueueInboxQuery.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueInboxQuery.java index f33bbe037..c99534127 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/query/QueueInboxQuery.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueInboxQuery.java @@ -1,7 +1,7 @@ -package gr.cite.notification.query; +package gr.cite.annotation.query; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.QueueInboxEntity; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.QueueInboxEntity; import gr.cite.queueinbox.entity.QueueInboxStatus; import gr.cite.tools.data.query.FieldResolver; import gr.cite.tools.data.query.Ordering; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/query/QueueOutboxQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueOutboxQuery.java similarity index 98% rename from annotation-service/annotation/src/main/java/gr/cite/notification/query/QueueOutboxQuery.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueOutboxQuery.java index 36f0584cf..a6083fa61 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/query/QueueOutboxQuery.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueOutboxQuery.java @@ -1,7 +1,7 @@ -package gr.cite.notification.query; +package gr.cite.annotation.query; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.QueueOutboxEntity; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.QueueOutboxEntity; import gr.cite.queueoutbox.entity.QueueOutboxNotifyStatus; import gr.cite.tools.data.query.FieldResolver; import gr.cite.tools.data.query.Ordering; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/query/TenantConfigurationQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantConfigurationQuery.java similarity index 94% rename from annotation-service/annotation/src/main/java/gr/cite/notification/query/TenantConfigurationQuery.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantConfigurationQuery.java index 5a5a7ead9..c1c0e7c26 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/query/TenantConfigurationQuery.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantConfigurationQuery.java @@ -1,9 +1,9 @@ -package gr.cite.notification.query; +package gr.cite.annotation.query; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.common.enums.TenantConfigurationType; -import gr.cite.notification.data.TenantConfigurationEntity; -import gr.cite.notification.model.TenantConfiguration; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.common.enums.TenantConfigurationType; +import gr.cite.annotation.data.TenantConfigurationEntity; +import gr.cite.annotation.model.TenantConfiguration; import gr.cite.tools.data.query.FieldResolver; import gr.cite.tools.data.query.QueryBase; import gr.cite.tools.data.query.QueryContext; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/query/TenantQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantQuery.java similarity index 94% rename from annotation-service/annotation/src/main/java/gr/cite/notification/query/TenantQuery.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantQuery.java index 4ffd3bf0a..b0d02ba5e 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/query/TenantQuery.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantQuery.java @@ -1,9 +1,9 @@ -package gr.cite.notification.query; +package gr.cite.annotation.query; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.data.TenantEntity; -import gr.cite.notification.model.Tenant; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.data.TenantEntity; +import gr.cite.annotation.model.Tenant; import gr.cite.tools.data.query.FieldResolver; import gr.cite.tools.data.query.QueryBase; import gr.cite.tools.data.query.QueryContext; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/query/UserCredentialQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserCredentialQuery.java similarity index 95% rename from annotation-service/annotation/src/main/java/gr/cite/notification/query/UserCredentialQuery.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserCredentialQuery.java index 2ac910df3..014582bf8 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/query/UserCredentialQuery.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserCredentialQuery.java @@ -1,12 +1,12 @@ -package gr.cite.notification.query; +package gr.cite.annotation.query; import gr.cite.commons.web.authz.service.AuthorizationService; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.authorization.Permission; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.common.scope.user.UserScope; -import gr.cite.notification.data.UserCredentialEntity; -import gr.cite.notification.model.UserCredential; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.authorization.Permission; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.common.scope.user.UserScope; +import gr.cite.annotation.data.UserCredentialEntity; +import gr.cite.annotation.model.UserCredential; import gr.cite.tools.data.query.FieldResolver; import gr.cite.tools.data.query.QueryBase; import gr.cite.tools.data.query.QueryContext; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/query/UserQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserQuery.java similarity index 92% rename from annotation-service/annotation/src/main/java/gr/cite/notification/query/UserQuery.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserQuery.java index 26d778a1c..97de609ba 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/query/UserQuery.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserQuery.java @@ -1,13 +1,13 @@ -package gr.cite.notification.query; +package gr.cite.annotation.query; import gr.cite.commons.web.authz.service.AuthorizationService; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.authorization.Permission; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.common.scope.user.UserScope; -import gr.cite.notification.data.UserEntity; -import gr.cite.notification.model.User; -import gr.cite.notification.model.user.PublicUser; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.authorization.Permission; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.common.scope.user.UserScope; +import gr.cite.annotation.data.UserEntity; +import gr.cite.annotation.model.User; +import gr.cite.annotation.model.user.PublicUser; import gr.cite.tools.data.query.FieldResolver; import gr.cite.tools.data.query.QueryBase; import gr.cite.tools.data.query.QueryContext; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/query/lookup/TenantConfigurationLookup.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/lookup/TenantConfigurationLookup.java similarity index 84% rename from annotation-service/annotation/src/main/java/gr/cite/notification/query/lookup/TenantConfigurationLookup.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/query/lookup/TenantConfigurationLookup.java index 48e5963c3..00bb4940e 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/query/lookup/TenantConfigurationLookup.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/lookup/TenantConfigurationLookup.java @@ -1,8 +1,8 @@ -package gr.cite.notification.query.lookup; +package gr.cite.annotation.query.lookup; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.common.enums.TenantConfigurationType; -import gr.cite.notification.query.TenantConfigurationQuery; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.common.enums.TenantConfigurationType; +import gr.cite.annotation.query.TenantConfigurationQuery; import gr.cite.tools.data.query.Lookup; import gr.cite.tools.data.query.QueryFactory; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/query/lookup/TenantLookup.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/lookup/TenantLookup.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/query/lookup/TenantLookup.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/query/lookup/TenantLookup.java index 21886546e..f2e663e33 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/query/lookup/TenantLookup.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/lookup/TenantLookup.java @@ -1,7 +1,7 @@ -package gr.cite.notification.query.lookup; +package gr.cite.annotation.query.lookup; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.query.TenantQuery; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.query.TenantQuery; import gr.cite.tools.data.query.Lookup; import gr.cite.tools.data.query.QueryFactory; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/query/lookup/UserLookup.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/lookup/UserLookup.java similarity index 87% rename from annotation-service/annotation/src/main/java/gr/cite/notification/query/lookup/UserLookup.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/query/lookup/UserLookup.java index f96b12909..0b32ffd55 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/query/lookup/UserLookup.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/lookup/UserLookup.java @@ -1,7 +1,7 @@ -package gr.cite.notification.query.lookup; +package gr.cite.annotation.query.lookup; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.query.UserQuery; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.query.UserQuery; import gr.cite.tools.data.query.Lookup; import gr.cite.tools.data.query.QueryFactory; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/service/AuthnSandbox.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/AuthnSandbox.java similarity index 96% rename from annotation-service/annotation/src/main/java/gr/cite/notification/service/AuthnSandbox.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/service/AuthnSandbox.java index 3e5a408b3..02aca445b 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/service/AuthnSandbox.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/AuthnSandbox.java @@ -1,4 +1,4 @@ -package gr.cite.notification.service; +package gr.cite.annotation.service; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; import gr.cite.commons.web.oidc.principal.MyPrincipal; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/service/formatting/FormattingService.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/formatting/FormattingService.java similarity index 93% rename from annotation-service/annotation/src/main/java/gr/cite/notification/service/formatting/FormattingService.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/service/formatting/FormattingService.java index eb4ddb426..da1b8646f 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/service/formatting/FormattingService.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/formatting/FormattingService.java @@ -1,4 +1,4 @@ -package gr.cite.notification.service.formatting; +package gr.cite.annotation.service.formatting; import java.time.Instant; import java.util.Locale; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/service/formatting/FormattingServiceImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/formatting/FormattingServiceImpl.java similarity index 96% rename from annotation-service/annotation/src/main/java/gr/cite/notification/service/formatting/FormattingServiceImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/service/formatting/FormattingServiceImpl.java index a5eb69cfb..5229e52e4 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/service/formatting/FormattingServiceImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/formatting/FormattingServiceImpl.java @@ -1,9 +1,9 @@ -package gr.cite.notification.service.formatting; +package gr.cite.annotation.service.formatting; -import gr.cite.notification.cache.FormattingUserprofileCacheCacheService; -import gr.cite.notification.config.formatting.FormattingServiceProperties; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.locale.LocaleService; +import gr.cite.annotation.cache.FormattingUserprofileCacheCacheService; +import gr.cite.annotation.config.formatting.FormattingServiceProperties; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.locale.LocaleService; import gr.cite.tools.data.query.QueryFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/service/tenant/TenantService.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/tenant/TenantService.java similarity index 81% rename from annotation-service/annotation/src/main/java/gr/cite/notification/service/tenant/TenantService.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/service/tenant/TenantService.java index ef8af48f7..8e343f11a 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/service/tenant/TenantService.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/tenant/TenantService.java @@ -1,8 +1,8 @@ -package gr.cite.notification.service.tenant; +package gr.cite.annotation.service.tenant; import com.fasterxml.jackson.core.JsonProcessingException; -import gr.cite.notification.model.Tenant; -import gr.cite.notification.model.persist.TenantTouchedIntegrationEventPersist; +import gr.cite.annotation.model.Tenant; +import gr.cite.annotation.model.persist.TenantTouchedIntegrationEventPersist; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyForbiddenException; import gr.cite.tools.exception.MyNotFoundException; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/service/tenant/TenantServiceImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/tenant/TenantServiceImpl.java similarity index 87% rename from annotation-service/annotation/src/main/java/gr/cite/notification/service/tenant/TenantServiceImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/service/tenant/TenantServiceImpl.java index 8437565d8..eb82cd50f 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/service/tenant/TenantServiceImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/tenant/TenantServiceImpl.java @@ -1,16 +1,16 @@ -package gr.cite.notification.service.tenant; +package gr.cite.annotation.service.tenant; import com.fasterxml.jackson.core.JsonProcessingException; import gr.cite.commons.web.authz.service.AuthorizationService; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.authorization.Permission; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.data.TenantEntity; -import gr.cite.notification.model.Tenant; -import gr.cite.notification.model.builder.TenantBuilder; -import gr.cite.notification.model.deleter.TenantDeleter; -import gr.cite.notification.model.persist.TenantTouchedIntegrationEventPersist; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.authorization.Permission; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.data.TenantEntity; +import gr.cite.annotation.model.Tenant; +import gr.cite.annotation.model.builder.TenantBuilder; +import gr.cite.annotation.model.deleter.TenantDeleter; +import gr.cite.annotation.model.persist.TenantTouchedIntegrationEventPersist; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.data.deleter.DeleterFactory; import gr.cite.tools.exception.MyApplicationException; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationService.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/tenantconfiguration/TenantConfigurationService.java similarity index 53% rename from annotation-service/annotation/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationService.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/service/tenantconfiguration/TenantConfigurationService.java index bd3b0b9d9..ee6842398 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationService.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/tenantconfiguration/TenantConfigurationService.java @@ -1,10 +1,10 @@ -package gr.cite.notification.service.tenantconfiguration; +package gr.cite.annotation.service.tenantconfiguration; -import gr.cite.notification.common.types.tenantconfiguration.DefaultUserLocaleConfigurationDataContainer; -import gr.cite.notification.common.types.tenantconfiguration.EmailClientConfigurationDataContainer; -import gr.cite.notification.model.TenantConfiguration; -import gr.cite.notification.model.persist.tenantconfiguration.TenantConfigurationEmailClientPersist; -import gr.cite.notification.model.persist.tenantconfiguration.TenantConfigurationUserLocaleIntegrationPersist; +import gr.cite.annotation.common.types.tenantconfiguration.DefaultUserLocaleConfigurationDataContainer; +import gr.cite.annotation.common.types.tenantconfiguration.EmailClientConfigurationDataContainer; +import gr.cite.annotation.model.TenantConfiguration; +import gr.cite.annotation.model.persist.tenantconfiguration.TenantConfigurationEmailClientPersist; +import gr.cite.annotation.model.persist.tenantconfiguration.TenantConfigurationUserLocaleIntegrationPersist; import gr.cite.tools.fieldset.FieldSet; import javax.management.InvalidApplicationException; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationServiceImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/tenantconfiguration/TenantConfigurationServiceImpl.java similarity index 88% rename from annotation-service/annotation/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationServiceImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/service/tenantconfiguration/TenantConfigurationServiceImpl.java index 4941ec4f3..acc101a8b 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationServiceImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/tenantconfiguration/TenantConfigurationServiceImpl.java @@ -1,23 +1,23 @@ -package gr.cite.notification.service.tenantconfiguration; +package gr.cite.annotation.service.tenantconfiguration; import com.fasterxml.jackson.core.JsonProcessingException; import gr.cite.commons.web.authz.service.AuthorizationService; -import gr.cite.notification.authorization.Permission; -import gr.cite.notification.common.JsonHandlingService; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.common.enums.TenantConfigurationType; -import gr.cite.notification.common.types.tenantconfiguration.DefaultUserLocaleConfigurationDataContainer; -import gr.cite.notification.common.types.tenantconfiguration.EmailClientConfigurationDataContainer; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.data.TenantConfigurationEntity; -import gr.cite.notification.data.TenantScopedEntityManager; -import gr.cite.notification.errorcode.ErrorThesaurusProperties; -import gr.cite.notification.model.TenantConfiguration; -import gr.cite.notification.model.builder.TenantConfigurationBuilder; -import gr.cite.notification.model.deleter.TenantConfigurationDeleter; -import gr.cite.notification.model.persist.tenantconfiguration.TenantConfigurationEmailClientPersist; -import gr.cite.notification.model.persist.tenantconfiguration.TenantConfigurationUserLocaleIntegrationPersist; -import gr.cite.notification.query.TenantConfigurationQuery; +import gr.cite.annotation.authorization.Permission; +import gr.cite.annotation.common.JsonHandlingService; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.common.enums.TenantConfigurationType; +import gr.cite.annotation.common.types.tenantconfiguration.DefaultUserLocaleConfigurationDataContainer; +import gr.cite.annotation.common.types.tenantconfiguration.EmailClientConfigurationDataContainer; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.data.TenantConfigurationEntity; +import gr.cite.annotation.data.TenantScopedEntityManager; +import gr.cite.annotation.errorcode.ErrorThesaurusProperties; +import gr.cite.annotation.model.TenantConfiguration; +import gr.cite.annotation.model.builder.TenantConfigurationBuilder; +import gr.cite.annotation.model.deleter.TenantConfigurationDeleter; +import gr.cite.annotation.model.persist.tenantconfiguration.TenantConfigurationEmailClientPersist; +import gr.cite.annotation.model.persist.tenantconfiguration.TenantConfigurationUserLocaleIntegrationPersist; +import gr.cite.annotation.query.TenantConfigurationQuery; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.data.deleter.DeleterFactory; import gr.cite.tools.exception.MyNotFoundException; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/service/user/UserService.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/user/UserService.java similarity index 80% rename from annotation-service/annotation/src/main/java/gr/cite/notification/service/user/UserService.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/service/user/UserService.java index 3442efb49..8d32d3d12 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/service/user/UserService.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/user/UserService.java @@ -1,8 +1,8 @@ -package gr.cite.notification.service.user; +package gr.cite.annotation.service.user; import com.fasterxml.jackson.core.JsonProcessingException; -import gr.cite.notification.integrationevent.inbox.usertouched.UserTouchedIntegrationEvent; -import gr.cite.notification.model.User; +import gr.cite.annotation.integrationevent.inbox.usertouched.UserTouchedIntegrationEvent; +import gr.cite.annotation.model.User; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyForbiddenException; import gr.cite.tools.exception.MyNotFoundException; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/service/user/UserServiceImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/user/UserServiceImpl.java similarity index 89% rename from annotation-service/annotation/src/main/java/gr/cite/notification/service/user/UserServiceImpl.java rename to annotation-service/annotation/src/main/java/gr/cite/annotation/service/user/UserServiceImpl.java index 28ea3ddb0..3c8e116a4 100644 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/service/user/UserServiceImpl.java +++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/service/user/UserServiceImpl.java @@ -1,19 +1,19 @@ -package gr.cite.notification.service.user; +package gr.cite.annotation.service.user; import com.fasterxml.jackson.core.JsonProcessingException; import gr.cite.commons.web.authz.service.AuthorizationService; -import gr.cite.notification.authorization.AuthorizationFlags; -import gr.cite.notification.authorization.Permission; -import gr.cite.notification.common.JsonHandlingService; -import gr.cite.notification.common.enums.IsActive; -import gr.cite.notification.convention.ConventionService; -import gr.cite.notification.data.UserContactInfoEntity; -import gr.cite.notification.data.UserCredentialEntity; -import gr.cite.notification.data.UserEntity; -import gr.cite.notification.integrationevent.inbox.usertouched.UserTouchedIntegrationEvent; -import gr.cite.notification.model.User; -import gr.cite.notification.model.builder.UserBuilder; -import gr.cite.notification.model.deleter.UserDeleter; +import gr.cite.annotation.authorization.AuthorizationFlags; +import gr.cite.annotation.authorization.Permission; +import gr.cite.annotation.common.JsonHandlingService; +import gr.cite.annotation.common.enums.IsActive; +import gr.cite.annotation.convention.ConventionService; +import gr.cite.annotation.data.UserContactInfoEntity; +import gr.cite.annotation.data.UserCredentialEntity; +import gr.cite.annotation.data.UserEntity; +import gr.cite.annotation.integrationevent.inbox.usertouched.UserTouchedIntegrationEvent; +import gr.cite.annotation.model.User; +import gr.cite.annotation.model.builder.UserBuilder; +import gr.cite.annotation.model.deleter.UserDeleter; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.data.deleter.DeleterFactory; import gr.cite.tools.data.query.QueryFactory; diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyPredicates.java b/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyPredicates.java deleted file mode 100644 index e77c546a2..000000000 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyPredicates.java +++ /dev/null @@ -1,5 +0,0 @@ -package gr.cite.notification.integrationevent.inbox; - -public interface ConsistencyPredicates { - -} diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandler.java b/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandler.java deleted file mode 100644 index a6e5d27ed..000000000 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandler.java +++ /dev/null @@ -1,7 +0,0 @@ -package gr.cite.notification.integrationevent.inbox.tenantremoval; - -import gr.cite.notification.integrationevent.inbox.IntegrationEventHandler; - -public interface TenantRemovalIntegrationEventHandler extends IntegrationEventHandler { - -} diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandler.java b/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandler.java deleted file mode 100644 index f476601f3..000000000 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandler.java +++ /dev/null @@ -1,7 +0,0 @@ -package gr.cite.notification.integrationevent.inbox.tenanttouched; - -import gr.cite.notification.integrationevent.inbox.IntegrationEventHandler; - -public interface TenantTouchedIntegrationEventHandler extends IntegrationEventHandler { - -} diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandler.java b/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandler.java deleted file mode 100644 index 7bc8d1245..000000000 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandler.java +++ /dev/null @@ -1,7 +0,0 @@ -package gr.cite.notification.integrationevent.inbox.userremoval; - -import gr.cite.notification.integrationevent.inbox.IntegrationEventHandler; - -public interface UserRemovalIntegrationEventHandler extends IntegrationEventHandler { - -} diff --git a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandler.java b/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandler.java deleted file mode 100644 index 24b11d5f3..000000000 --- a/annotation-service/annotation/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandler.java +++ /dev/null @@ -1,7 +0,0 @@ -package gr.cite.notification.integrationevent.inbox.usertouched; - -import gr.cite.notification.integrationevent.inbox.IntegrationEventHandler; - -public interface UserTouchedIntegrationEventHandler extends IntegrationEventHandler { - -}