From 8aa41781c95a5cdf70a47ef7a5afd1535d78910c Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Wed, 15 Nov 2023 12:08:07 +0100 Subject: [PATCH] OZG-3532 OZG-4580 Move classes --- .../user/FindUserProfilesQuery.java | 2 +- .../user/RemoteUserIterator.java | 2 +- .../kop => ozgcloud}/user/RoleHierarchy.java | 2 +- .../de/{itvsh/kop => ozgcloud}/user/User.java | 4 ++-- .../user/UserIdProjection.java | 2 +- .../user/UserProfileResource.java | 2 +- .../user/UserProfileResourceAssembler.java | 4 ++-- .../kop => ozgcloud}/user/UserRepository.java | 6 +++--- .../user/UserResourceMapper.java | 4 ++-- .../{itvsh/kop => ozgcloud}/user/UserRole.java | 2 +- .../kop => ozgcloud}/user/UserService.java | 8 ++++---- .../kop => ozgcloud}/user/common/JwtUtil.java | 5 ++--- .../user/common/LivenessCheck.java | 2 +- .../user/common/NativeConfig.java | 5 +++-- .../user/common/TargetTypeProvider.java | 2 +- .../common/callcontext/CallContextUser.java | 2 +- .../CurrentCallContextUserService.java | 5 ++--- .../GrpcCallContextInterceptor.java | 4 ++-- .../user/common/callcontext/GrpcUtil.java | 2 +- .../callcontext/HttpRequestInterceptor.java | 2 +- .../common/callcontext/HttpSecurityFilter.java | 4 ++-- .../AccessForbiddenException.java | 2 +- .../user/common/errorhandling/ApiError.java | 2 +- .../common/errorhandling/ApiErrorUtil.java | 2 +- .../common/errorhandling/ExceptionHandler.java | 2 +- .../errorhandling/FunctionalException.java | 2 +- .../user/common/errorhandling/Issue.java | 2 +- .../KeycloakUnavailableException.java | 2 +- .../errorhandling/LockCreationException.java | 2 +- .../ResourceNotFoundException.java | 2 +- .../errorhandling/TechnicalException.java | 2 +- .../user/common/lock/Lock.java | 2 +- .../user/common/lock/LockRepository.java | 2 +- .../user/common/lock/LockService.java | 4 ++-- .../user/keycloak/KeycloakApiProperties.java | 2 +- .../user/keycloak/KeycloakApiService.java | 10 +++++----- .../user/keycloak/KeycloakProvider.java | 2 +- .../keycloak/KeycloakUserRemoteService.java | 4 ++-- .../user/keycloak/OlderUserRepresentation.java | 2 +- .../OrganisationsEinheitGrpcService.java | 6 +++--- .../OrganisationsEinheitRepository.java | 6 +++--- .../OrganisationsEinheitService.java | 2 +- .../user/recipient/RecipientGrpcService.java | 10 +++++----- .../user/recipient/RecipientMapper.java | 4 ++-- .../user/recipient/RecipientRepository.java | 8 ++++---- .../user/recipient/RecipientService.java | 6 +++--- .../user/settings/NotificationsSendFor.java | 2 +- .../settings/SendNewVorgangNotification.java | 2 +- .../user/settings/Settings.java | 2 +- .../user/settings/UserSettings.java | 2 +- .../user/settings/UserSettingsRepository.java | 4 ++-- .../user/settings/UserSettingsResource.java | 10 +++++----- .../UserSettingsResourceAssembler.java | 8 ++++---- .../user/settings/UserSettingsService.java | 4 ++-- .../user/sync/SyncScheduler.java | 4 ++-- .../user/sync/SyncService.java | 8 ++++---- .../userprofile/UserProfileGrpcService.java | 8 ++++---- .../user/userprofile/UserProfileMapper.java | 4 ++-- .../user/GroupRepresentationTestFactory.java | 2 +- .../user/RoleHierarchyTest.java | 5 ++++- .../user/TestDatabaseUtils.java | 2 +- .../user/UserProfileResourceAssemblerTest.java | 4 ++-- .../user/UserProfileResourceITCase.java | 10 +++++----- .../user/UserProfileResourceTest.java | 2 +- .../user/UserProfileResourceTestProfile.java | 2 +- .../user/UserRepositoryITCase.java | 4 ++-- .../user/UserRepositoryTest.java | 4 ++-- .../user/UserRepresentationTestFactory.java | 2 +- .../user/UserResourceMapperTest.java | 4 ++-- .../user/UserResourceStub.java | 2 +- .../user/UserResourceTestFactory.java | 2 +- .../kop => ozgcloud}/user/UserRoleTest.java | 4 +++- .../user/UserServiceITCase.java | 8 ++++---- .../kop => ozgcloud}/user/UserServiceTest.java | 10 +++++----- .../kop => ozgcloud}/user/UserTestFactory.java | 4 ++-- .../user/common/JwtUtilTest.java | 10 +++++----- .../user/common/MongoDbTestProfile.java | 2 +- .../CallContextInterceptorTestFactory.java | 4 +++- .../CallContextMetadataTestFactory.java | 4 +++- .../CallContextUserTestFactory.java | 2 +- .../CurrentCallContextUserServiceTest.java | 4 ++-- .../GrpcCallContextInterceptorTest.java | 12 ++++++------ .../user/common/callcontext/GrpcUtilTest.java | 3 ++- .../HttpRequestInterceptorTest.java | 4 ++-- .../callcontext/HttpSecurityFilterTest.java | 4 ++-- .../common/errorhandling/ApiErrorUtilTest.java | 9 +++++++-- .../errorhandling/ExceptionHandlerTest.java | 6 +++--- .../user/common/lock/LockRepositoryITCase.java | 4 ++-- .../user/common/lock/LockRepositoryTest.java | 2 +- .../user/common/lock/LockServiceTest.java | 4 ++-- .../user/common/lock/LockTestFactory.java | 4 ++-- .../keycloak/KeycloakApiServiceITCase.java | 2 +- .../user/keycloak/KeycloakApiServiceTest.java | 16 ++++++++-------- .../user/keycloak/KeycloakProviderITCase.java | 2 +- .../user/keycloak/KeycloakProviderTest.java | 4 +++- .../user/keycloak/KeycloakTestProfile.java | 2 +- .../KeycloakUserRemoteServiceITCase.java | 4 +++- .../KeycloakUserRemoteServiceTest.java | 6 ++---- .../OrganisationsEinheitRepositoryITCase.java | 8 ++++---- .../OrganisationsEinheitRepositoryTest.java | 5 +++-- .../OrganisationsEinheitServiceTest.java | 5 ++++- .../OrganisationseinheitGrpcServiceTest.java | 6 ++++-- .../recipient/RecipientGrpcServiceTest.java | 6 +++--- .../user/recipient/RecipientMapperTest.java | 4 ++-- .../recipient/RecipientRepositoryITCase.java | 14 +++++++------- .../recipient/RecipientRepositoryTest.java | 10 +++++----- .../user/recipient/RecipientServiceTest.java | 6 +++--- .../user/recipient/RecipientTestFactory.java | 8 ++++---- .../settings/UserSettingsRepositoryITCase.java | 6 +++--- .../UserSettingsResourceAssemblerTest.java | 6 +++--- .../settings/UserSettingsResourceITCase.java | 12 ++++++------ .../settings/UserSettingsResourceTest.java | 12 ++++++------ .../UserSettingsResourceTestProfile.java | 2 +- .../settings/UserSettingsServiceITCase.java | 6 +++--- .../user/settings/UserSettingsServiceTest.java | 6 +++--- .../user/settings/UserSettingsTestFactory.java | 5 ++++- .../user/sync/SyncSchedulerITCase.java | 18 +++++++++--------- .../user/sync/SyncSchedulerTest.java | 8 +++++--- .../user/sync/SyncServiceITCase.java | 16 ++++++++-------- .../user/sync/SyncServiceTest.java | 12 ++++++------ ...pcDeleteInactiveUserRequestTestFactory.java | 4 ++-- ...cGetInactiveUserIdsResponseTestFactory.java | 2 +- .../GrpcUserProfileIdTestFactory.java | 4 ++-- .../GrpcUserProfileTestFactory.java | 4 ++-- .../UserProfileGrpcServiceITCase.java | 10 +++++----- .../UserProfileGrpcServiceTest.java | 8 ++++---- .../userprofile/UserProfileMapperTest.java | 6 +++--- 127 files changed, 325 insertions(+), 298 deletions(-) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/FindUserProfilesQuery.java (93%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/RemoteUserIterator.java (98%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/RoleHierarchy.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/User.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/UserIdProjection.java (98%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/UserProfileResource.java (99%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/UserProfileResourceAssembler.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/UserRepository.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/UserResourceMapper.java (98%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/UserRole.java (98%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/UserService.java (95%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/JwtUtil.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/LivenessCheck.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/NativeConfig.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/TargetTypeProvider.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/CallContextUser.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/CurrentCallContextUserService.java (94%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/GrpcCallContextInterceptor.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/GrpcUtil.java (95%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/HttpRequestInterceptor.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/HttpSecurityFilter.java (95%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/errorhandling/AccessForbiddenException.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/errorhandling/ApiError.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/errorhandling/ApiErrorUtil.java (98%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/errorhandling/ExceptionHandler.java (98%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/errorhandling/FunctionalException.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/errorhandling/Issue.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/errorhandling/KeycloakUnavailableException.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/errorhandling/LockCreationException.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/errorhandling/ResourceNotFoundException.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/errorhandling/TechnicalException.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/lock/Lock.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/lock/LockRepository.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/common/lock/LockService.java (95%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/keycloak/KeycloakApiProperties.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/keycloak/KeycloakApiService.java (94%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/keycloak/KeycloakProvider.java (98%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/keycloak/KeycloakUserRemoteService.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/keycloak/OlderUserRepresentation.java (98%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/organisationseinheit/OrganisationsEinheitGrpcService.java (88%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/organisationseinheit/OrganisationsEinheitRepository.java (93%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/organisationseinheit/OrganisationsEinheitService.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/recipient/RecipientGrpcService.java (86%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/recipient/RecipientMapper.java (95%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/recipient/RecipientRepository.java (79%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/recipient/RecipientService.java (92%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/settings/NotificationsSendFor.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/settings/SendNewVorgangNotification.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/settings/Settings.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettings.java (97%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettingsRepository.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettingsResource.java (93%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettingsResourceAssembler.java (91%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettingsService.java (95%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/sync/SyncScheduler.java (96%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/sync/SyncService.java (91%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/userprofile/UserProfileGrpcService.java (93%) rename user-manager-server/src/main/java/de/{itvsh/kop => ozgcloud}/user/userprofile/UserProfileMapper.java (95%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/GroupRepresentationTestFactory.java (98%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/RoleHierarchyTest.java (95%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/TestDatabaseUtils.java (97%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserProfileResourceAssemblerTest.java (97%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserProfileResourceITCase.java (96%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserProfileResourceTest.java (99%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserProfileResourceTestProfile.java (98%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserRepositoryITCase.java (99%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserRepositoryTest.java (98%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserRepresentationTestFactory.java (98%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserResourceMapperTest.java (99%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserResourceStub.java (99%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserResourceTestFactory.java (98%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserRoleTest.java (93%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserServiceITCase.java (91%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserServiceTest.java (96%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/UserTestFactory.java (96%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/JwtUtilTest.java (95%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/MongoDbTestProfile.java (88%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/CallContextInterceptorTestFactory.java (94%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/CallContextMetadataTestFactory.java (93%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/CallContextUserTestFactory.java (97%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/CurrentCallContextUserServiceTest.java (97%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/GrpcCallContextInterceptorTest.java (96%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/GrpcUtilTest.java (95%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/HttpRequestInterceptorTest.java (95%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/callcontext/HttpSecurityFilterTest.java (97%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/errorhandling/ApiErrorUtilTest.java (94%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/errorhandling/ExceptionHandlerTest.java (97%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/lock/LockRepositoryITCase.java (96%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/lock/LockRepositoryTest.java (98%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/lock/LockServiceTest.java (97%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/common/lock/LockTestFactory.java (93%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/keycloak/KeycloakApiServiceITCase.java (97%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/keycloak/KeycloakApiServiceTest.java (96%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/keycloak/KeycloakProviderITCase.java (97%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/keycloak/KeycloakProviderTest.java (93%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/keycloak/KeycloakTestProfile.java (97%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/keycloak/KeycloakUserRemoteServiceITCase.java (90%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/keycloak/KeycloakUserRemoteServiceTest.java (93%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java (88%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java (90%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/organisationseinheit/OrganisationsEinheitServiceTest.java (76%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java (76%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/recipient/RecipientGrpcServiceTest.java (93%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/recipient/RecipientMapperTest.java (96%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/recipient/RecipientRepositoryITCase.java (89%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/recipient/RecipientRepositoryTest.java (90%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/recipient/RecipientServiceTest.java (94%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/recipient/RecipientTestFactory.java (88%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettingsRepositoryITCase.java (93%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettingsResourceAssemblerTest.java (95%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettingsResourceITCase.java (91%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettingsResourceTest.java (96%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettingsResourceTestProfile.java (97%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettingsServiceITCase.java (94%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettingsServiceTest.java (96%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/settings/UserSettingsTestFactory.java (90%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/sync/SyncSchedulerITCase.java (89%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/sync/SyncSchedulerTest.java (93%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/sync/SyncServiceITCase.java (90%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/sync/SyncServiceTest.java (92%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java (81%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java (87%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/userprofile/GrpcUserProfileIdTestFactory.java (76%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/userprofile/GrpcUserProfileTestFactory.java (94%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/userprofile/UserProfileGrpcServiceITCase.java (84%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/userprofile/UserProfileGrpcServiceTest.java (97%) rename user-manager-server/src/test/java/de/{itvsh/kop => ozgcloud}/user/userprofile/UserProfileMapperTest.java (94%) diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/FindUserProfilesQuery.java b/user-manager-server/src/main/java/de/ozgcloud/user/FindUserProfilesQuery.java similarity index 93% rename from user-manager-server/src/main/java/de/itvsh/kop/user/FindUserProfilesQuery.java rename to user-manager-server/src/main/java/de/ozgcloud/user/FindUserProfilesQuery.java index 9489b7ba..93e4b0ff 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/FindUserProfilesQuery.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/FindUserProfilesQuery.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user; +package de.ozgcloud.user; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/RemoteUserIterator.java b/user-manager-server/src/main/java/de/ozgcloud/user/RemoteUserIterator.java similarity index 98% rename from user-manager-server/src/main/java/de/itvsh/kop/user/RemoteUserIterator.java rename to user-manager-server/src/main/java/de/ozgcloud/user/RemoteUserIterator.java index a336f04d..2af5b34a 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/RemoteUserIterator.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/RemoteUserIterator.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.Iterator; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/RoleHierarchy.java b/user-manager-server/src/main/java/de/ozgcloud/user/RoleHierarchy.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/RoleHierarchy.java rename to user-manager-server/src/main/java/de/ozgcloud/user/RoleHierarchy.java index 73eb8337..f09047a2 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/RoleHierarchy.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/RoleHierarchy.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.ArrayDeque; import java.util.Deque; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/User.java b/user-manager-server/src/main/java/de/ozgcloud/user/User.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/User.java rename to user-manager-server/src/main/java/de/ozgcloud/user/User.java index 2f9a17ac..0d645513 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/User.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/User.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.Collection; import java.util.Date; @@ -31,7 +31,7 @@ import org.bson.types.ObjectId; import com.fasterxml.jackson.annotation.JsonIgnore; -import de.itvsh.kop.user.settings.UserSettings; +import de.ozgcloud.user.settings.UserSettings; import io.quarkus.runtime.annotations.RegisterForReflection; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserIdProjection.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserIdProjection.java similarity index 98% rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserIdProjection.java rename to user-manager-server/src/main/java/de/ozgcloud/user/UserIdProjection.java index 330046cd..1ccc0aa6 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserIdProjection.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserIdProjection.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import org.bson.codecs.pojo.annotations.BsonIgnore; import org.bson.types.ObjectId; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResource.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResource.java similarity index 99% rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResource.java rename to user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResource.java index 29b2ddb2..3f9fa358 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResource.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResource.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.Optional; import java.util.stream.Stream; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResourceAssembler.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResourceAssembler.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResourceAssembler.java rename to user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResourceAssembler.java index ebfcc495..57c96412 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResourceAssembler.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResourceAssembler.java @@ -21,14 +21,14 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.List; +import de.ozgcloud.user.settings.UserSettingsResource; import jakarta.enterprise.context.ApplicationScoped; import jakarta.ws.rs.core.Link; -import de.itvsh.kop.user.settings.UserSettingsResource; import io.quarkus.hal.HalCollectionWrapper; import io.quarkus.hal.HalEntityWrapper; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserRepository.java rename to user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java index 58fe0f14..b13ef3cf 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserRepository.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java @@ -21,9 +21,9 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; -import static de.itvsh.kop.user.User.*; +import static de.ozgcloud.user.User.*; import java.util.Optional; import java.util.stream.Stream; @@ -33,7 +33,7 @@ import jakarta.enterprise.context.ApplicationScoped; import org.bson.types.ObjectId; import de.itvsh.kop.common.logging.KopLogging; -import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException; +import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException; import io.quarkus.mongodb.panache.PanacheMongoRepository; import io.quarkus.panache.common.Parameters; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserResourceMapper.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserResourceMapper.java similarity index 98% rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserResourceMapper.java rename to user-manager-server/src/main/java/de/ozgcloud/user/UserResourceMapper.java index d15c1c2d..52f53b25 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserResourceMapper.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserResourceMapper.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.Collections; import java.util.Date; @@ -44,7 +44,7 @@ import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; -import de.itvsh.kop.user.keycloak.KeycloakApiProperties; +import de.ozgcloud.user.keycloak.KeycloakApiProperties; @Mapper(unmappedTargetPolicy = ReportingPolicy.WARN) public abstract class UserResourceMapper { diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserRole.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserRole.java similarity index 98% rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserRole.java rename to user-manager-server/src/main/java/de/ozgcloud/user/UserRole.java index dc694061..4c8c9c5d 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserRole.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserRole.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.Collection; import java.util.Collections; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserService.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserService.java similarity index 95% rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserService.java rename to user-manager-server/src/main/java/de/ozgcloud/user/UserService.java index 700348fb..ee505dd9 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserService.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserService.java @@ -21,20 +21,20 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.Optional; import java.util.stream.Stream; +import de.ozgcloud.user.common.errorhandling.TechnicalException; +import de.ozgcloud.user.keycloak.KeycloakUserRemoteService; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import de.itvsh.kop.common.logging.KopLogging; -import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException; -import de.itvsh.kop.user.common.errorhandling.TechnicalException; -import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService; +import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException; import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.infrastructure.Infrastructure; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/JwtUtil.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/JwtUtil.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/JwtUtil.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/JwtUtil.java index 10b6fe56..70da1473 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/JwtUtil.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/JwtUtil.java @@ -21,13 +21,14 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common; +package de.ozgcloud.user.common; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Optional; +import de.ozgcloud.user.keycloak.KeycloakApiProperties; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.json.JsonArray; @@ -36,8 +37,6 @@ import jakarta.json.JsonString; import org.apache.commons.lang3.StringUtils; import org.eclipse.microprofile.jwt.JsonWebToken; -import de.itvsh.kop.user.keycloak.KeycloakApiProperties; - @ApplicationScoped public class JwtUtil { diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/LivenessCheck.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/LivenessCheck.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/LivenessCheck.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/LivenessCheck.java index fba90fa4..ff475784 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/LivenessCheck.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/LivenessCheck.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common; +package de.ozgcloud.user.common; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/NativeConfig.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/NativeConfig.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/NativeConfig.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/NativeConfig.java index 17a03635..9e49c6cf 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/NativeConfig.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/NativeConfig.java @@ -21,8 +21,9 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common; +package de.ozgcloud.user.common; +import de.ozgcloud.user.UserIdProjection; import io.quarkus.runtime.annotations.RegisterForReflection; @RegisterForReflection(targets = { @@ -43,7 +44,7 @@ import io.quarkus.runtime.annotations.RegisterForReflection; org.jboss.resteasy.plugins.providers.multipart.MimeMultipartProvider.class, org.jboss.resteasy.plugins.providers.multipart.XopWithMultipartRelatedReader.class, org.jboss.resteasy.plugins.providers.multipart.XopWithMultipartRelatedWriter.class, - de.itvsh.kop.user.UserIdProjection.class + UserIdProjection.class }) public class NativeConfig { } diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/TargetTypeProvider.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/TargetTypeProvider.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/TargetTypeProvider.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/TargetTypeProvider.java index bcdc58e4..c48bd0e8 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/TargetTypeProvider.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/TargetTypeProvider.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common; +package de.ozgcloud.user.common; import java.lang.reflect.Type; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/CallContextUser.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/CallContextUser.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/CallContextUser.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/CallContextUser.java index 633efe7b..9b352b7e 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/CallContextUser.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/CallContextUser.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; import java.io.Serializable; import java.security.Principal; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/CurrentCallContextUserService.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/CurrentCallContextUserService.java similarity index 94% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/CurrentCallContextUserService.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/CurrentCallContextUserService.java index 98b6984d..8add5bb4 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/CurrentCallContextUserService.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/CurrentCallContextUserService.java @@ -21,14 +21,13 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; import java.util.Optional; +import de.ozgcloud.user.UserRole; import jakarta.enterprise.context.RequestScoped; -import de.itvsh.kop.user.UserRole; - @RequestScoped public class CurrentCallContextUserService { diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptor.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/GrpcCallContextInterceptor.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptor.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/GrpcCallContextInterceptor.java index 9717a5bd..00232b6b 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptor.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/GrpcCallContextInterceptor.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; import java.util.Optional; import java.util.UUID; @@ -31,7 +31,7 @@ import jakarta.inject.Inject; import org.apache.logging.log4j.CloseableThreadContext; -import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException; +import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException; import io.grpc.ForwardingServerCallListener; import io.grpc.Metadata; import io.grpc.ServerCall; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/GrpcUtil.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/GrpcUtil.java similarity index 95% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/GrpcUtil.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/GrpcUtil.java index 07b3cfb4..592cf317 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/GrpcUtil.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/GrpcUtil.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; import java.nio.charset.StandardCharsets; import java.util.Collection; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/HttpRequestInterceptor.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptor.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/HttpRequestInterceptor.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptor.java index 81e3f3f9..225abf0d 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/HttpRequestInterceptor.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptor.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; import java.io.IOException; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/HttpSecurityFilter.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/HttpSecurityFilter.java similarity index 95% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/HttpSecurityFilter.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/HttpSecurityFilter.java index aabdd9cd..5afe4bb6 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/HttpSecurityFilter.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/HttpSecurityFilter.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; import java.io.IOException; @@ -31,7 +31,7 @@ import jakarta.ws.rs.container.ContainerRequestFilter; import jakarta.ws.rs.container.PreMatching; import jakarta.ws.rs.ext.Provider; -import de.itvsh.kop.user.common.JwtUtil; +import de.ozgcloud.user.common.JwtUtil; @Provider @PreMatching diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/AccessForbiddenException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/AccessForbiddenException.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/AccessForbiddenException.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/AccessForbiddenException.java index 31100db1..471b24a9 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/AccessForbiddenException.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/AccessForbiddenException.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.errorhandling; +package de.ozgcloud.user.common.errorhandling; import de.itvsh.kop.common.errorhandling.FunctionalErrorCode; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ApiError.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiError.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ApiError.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiError.java index ed83cb42..9e43a49a 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ApiError.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiError.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.errorhandling; +package de.ozgcloud.user.common.errorhandling; import java.util.List; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ApiErrorUtil.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtil.java similarity index 98% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ApiErrorUtil.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtil.java index c11c6eb5..ae340c42 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ApiErrorUtil.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtil.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.errorhandling; +package de.ozgcloud.user.common.errorhandling; import java.util.UUID; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ExceptionHandler.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ExceptionHandler.java similarity index 98% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ExceptionHandler.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ExceptionHandler.java index 9453922c..1392a361 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ExceptionHandler.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ExceptionHandler.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.errorhandling; +package de.ozgcloud.user.common.errorhandling; import jakarta.inject.Inject; import jakarta.ws.rs.NotFoundException; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/FunctionalException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/FunctionalException.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/FunctionalException.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/FunctionalException.java index a304ccf2..f6a5819e 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/FunctionalException.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/FunctionalException.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.errorhandling; +package de.ozgcloud.user.common.errorhandling; import de.itvsh.kop.common.errorhandling.ExceptionUtil; import de.itvsh.kop.common.errorhandling.FunctionalErrorCode; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/Issue.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/Issue.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/Issue.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/Issue.java index 7ef4deb7..455386e2 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/Issue.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/Issue.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.errorhandling; +package de.ozgcloud.user.common.errorhandling; import java.util.List; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/KeycloakUnavailableException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/KeycloakUnavailableException.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/KeycloakUnavailableException.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/KeycloakUnavailableException.java index 5eadd9f3..1030fce6 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/KeycloakUnavailableException.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/KeycloakUnavailableException.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.errorhandling; +package de.ozgcloud.user.common.errorhandling; public class KeycloakUnavailableException extends TechnicalException { diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/LockCreationException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/LockCreationException.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/LockCreationException.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/LockCreationException.java index 92602127..48d6009e 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/LockCreationException.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/LockCreationException.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.errorhandling; +package de.ozgcloud.user.common.errorhandling; public class LockCreationException extends TechnicalException { diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ResourceNotFoundException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ResourceNotFoundException.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ResourceNotFoundException.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ResourceNotFoundException.java index d6346d09..dda73e7f 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ResourceNotFoundException.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ResourceNotFoundException.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.errorhandling; +package de.ozgcloud.user.common.errorhandling; import de.itvsh.kop.common.errorhandling.FunctionalErrorCode; import lombok.Getter; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/TechnicalException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/TechnicalException.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/TechnicalException.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/TechnicalException.java index 67dd8ec8..0f36a742 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/TechnicalException.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/TechnicalException.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.errorhandling; +package de.ozgcloud.user.common.errorhandling; import java.util.UUID; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/Lock.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/Lock.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/Lock.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/lock/Lock.java index f6399a5d..27553ad3 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/Lock.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/Lock.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.lock; +package de.ozgcloud.user.common.lock; import io.quarkus.mongodb.panache.PanacheMongoEntity; import io.quarkus.mongodb.panache.common.MongoEntity; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/LockRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockRepository.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/LockRepository.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockRepository.java index 6ca0b99f..bfc94d6c 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/LockRepository.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockRepository.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.lock; +package de.ozgcloud.user.common.lock; import java.time.Instant; import java.util.Optional; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/LockService.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java similarity index 95% rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/LockService.java rename to user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java index 85de5686..50c50047 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/LockService.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java @@ -21,16 +21,16 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.lock; +package de.ozgcloud.user.common.lock; import java.time.Instant; import java.time.temporal.ChronoUnit; +import de.ozgcloud.user.common.errorhandling.LockCreationException; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import de.itvsh.kop.common.logging.KopLogging; -import de.itvsh.kop.user.common.errorhandling.LockCreationException; import lombok.extern.log4j.Log4j2; @Log4j2 diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiProperties.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java rename to user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiProperties.java index b480c6c4..c815eea6 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiProperties.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.keycloak; +package de.ozgcloud.user.keycloak; import jakarta.validation.constraints.NotBlank; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiService.java similarity index 94% rename from user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java rename to user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiService.java index 2c36eea9..3cc6c2de 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiService.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.keycloak; +package de.ozgcloud.user.keycloak; import java.util.Optional; import java.util.Spliterators; @@ -29,6 +29,7 @@ import java.util.function.Supplier; import java.util.stream.Stream; import java.util.stream.StreamSupport; +import de.ozgcloud.user.common.errorhandling.KeycloakUnavailableException; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.BadRequestException; @@ -43,10 +44,9 @@ import org.keycloak.admin.client.resource.UserResource; import org.keycloak.representations.idm.UserRepresentation; import de.itvsh.kop.common.logging.KopLogging; -import de.itvsh.kop.user.RemoteUserIterator; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserResourceMapper; -import de.itvsh.kop.user.common.errorhandling.KeycloakUnavailableException; +import de.ozgcloud.user.RemoteUserIterator; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserResourceMapper; import lombok.extern.log4j.Log4j2; @ApplicationScoped diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakProvider.java similarity index 98% rename from user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java rename to user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakProvider.java index 5c59bbf5..e7fba2dc 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakProvider.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.keycloak; +package de.ozgcloud.user.keycloak; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteService.java b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteService.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteService.java rename to user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteService.java index b6c910d2..bf0508c2 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteService.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteService.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.keycloak; +package de.ozgcloud.user.keycloak; import java.util.Optional; import java.util.stream.Stream; @@ -30,7 +30,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import de.itvsh.kop.common.logging.KopLogging; -import de.itvsh.kop.user.User; +import de.ozgcloud.user.User; @ApplicationScoped @KopLogging diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/OlderUserRepresentation.java b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/OlderUserRepresentation.java similarity index 98% rename from user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/OlderUserRepresentation.java rename to user-manager-server/src/main/java/de/ozgcloud/user/keycloak/OlderUserRepresentation.java index 493d8451..7ba8ca44 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/OlderUserRepresentation.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/OlderUserRepresentation.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user.keycloak; +package de.ozgcloud.user.keycloak; import org.keycloak.representations.idm.UserProfileMetadata; import org.keycloak.representations.idm.UserRepresentation; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitGrpcService.java b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitGrpcService.java similarity index 88% rename from user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitGrpcService.java rename to user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitGrpcService.java index 430440ae..b4dc3e8b 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitGrpcService.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitGrpcService.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.organisationseinheit; +package de.ozgcloud.user.organisationseinheit; import java.util.Collection; @@ -29,8 +29,8 @@ import jakarta.inject.Inject; import com.google.protobuf.Empty; -import de.itvsh.kop.user.grpc.organisationseinheit.GrpcGetSupportedOrganisationsEinheitenResponse; -import de.itvsh.kop.user.grpc.organisationseinheit.OrganisationsEinheitServiceGrpc.OrganisationsEinheitServiceImplBase; +import de.ozgcloud.user.grpc.organisationseinheit.GrpcGetSupportedOrganisationsEinheitenResponse; +import de.ozgcloud.user.grpc.organisationseinheit.OrganisationsEinheitServiceGrpc.OrganisationsEinheitServiceImplBase; import io.grpc.stub.StreamObserver; import io.quarkus.grpc.GrpcService; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepository.java similarity index 93% rename from user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepository.java rename to user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepository.java index 5f22d5f5..896fc8eb 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepository.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepository.java @@ -21,9 +21,9 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.organisationseinheit; +package de.ozgcloud.user.organisationseinheit; -import static de.itvsh.kop.user.User.*; +import static de.ozgcloud.user.User.*; import static org.apache.commons.collections4.IterableUtils.*; import java.util.Collection; @@ -33,7 +33,7 @@ import jakarta.enterprise.context.ApplicationScoped; import com.mongodb.client.model.Filters; import de.itvsh.kop.common.logging.KopLogging; -import de.itvsh.kop.user.User; +import de.ozgcloud.user.User; import io.quarkus.mongodb.panache.PanacheMongoRepository; @ApplicationScoped diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitService.java b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitService.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitService.java rename to user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitService.java index f5f77cde..bf096522 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitService.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitService.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.organisationseinheit; +package de.ozgcloud.user.organisationseinheit; import java.util.Collection; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientGrpcService.java b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientGrpcService.java similarity index 86% rename from user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientGrpcService.java rename to user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientGrpcService.java index 16e7f06e..fa9dc41d 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientGrpcService.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientGrpcService.java @@ -21,16 +21,16 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.recipient; +package de.ozgcloud.user.recipient; import java.util.Collection; import jakarta.inject.Inject; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientRequest; -import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientResponse; -import de.itvsh.kop.user.grpc.recipient.RecipientServiceGrpc.RecipientServiceImplBase; +import de.ozgcloud.user.User; +import de.ozgcloud.user.grpc.recipient.GrpcFindRecipientRequest; +import de.ozgcloud.user.grpc.recipient.GrpcFindRecipientResponse; +import de.ozgcloud.user.grpc.recipient.RecipientServiceGrpc.RecipientServiceImplBase; import io.grpc.stub.StreamObserver; import io.quarkus.grpc.GrpcService; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientMapper.java b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientMapper.java similarity index 95% rename from user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientMapper.java rename to user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientMapper.java index 2274a16a..bea3d985 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientMapper.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientMapper.java @@ -21,14 +21,14 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.recipient; +package de.ozgcloud.user.recipient; import org.mapstruct.CollectionMappingStrategy; import org.mapstruct.Mapper; import org.mapstruct.NullValueCheckStrategy; import org.mapstruct.ReportingPolicy; -import de.itvsh.kop.user.User; +import de.ozgcloud.user.User; @Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, // unmappedSourcePolicy = ReportingPolicy.WARN, // diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientRepository.java similarity index 79% rename from user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientRepository.java rename to user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientRepository.java index 70ea06ce..b64ac4c6 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientRepository.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientRepository.java @@ -1,14 +1,14 @@ -package de.itvsh.kop.user.recipient; +package de.ozgcloud.user.recipient; -import static de.itvsh.kop.user.User.*; +import static de.ozgcloud.user.User.*; import java.util.List; +import de.ozgcloud.user.settings.NotificationsSendFor; import jakarta.enterprise.context.ApplicationScoped; import de.itvsh.kop.common.logging.KopLogging; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.settings.NotificationsSendFor; +import de.ozgcloud.user.User; import io.quarkus.mongodb.panache.PanacheMongoRepository; @ApplicationScoped diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientService.java b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientService.java similarity index 92% rename from user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientService.java rename to user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientService.java index 8958d2ee..b383eceb 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientService.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientService.java @@ -21,17 +21,17 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.recipient; +package de.ozgcloud.user.recipient; import java.util.List; +import de.ozgcloud.user.common.errorhandling.FunctionalException; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import com.cronutils.utils.StringUtils; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.common.errorhandling.FunctionalException; +import de.ozgcloud.user.User; @ApplicationScoped class RecipientService { diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/NotificationsSendFor.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/NotificationsSendFor.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/NotificationsSendFor.java rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/NotificationsSendFor.java index 81d73b17..8233b5e9 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/NotificationsSendFor.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/NotificationsSendFor.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; public enum NotificationsSendFor { ALL, NONE; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/SendNewVorgangNotification.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/SendNewVorgangNotification.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/SendNewVorgangNotification.java rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/SendNewVorgangNotification.java index 2f5d0b84..2cc61c6a 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/SendNewVorgangNotification.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/SendNewVorgangNotification.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; public enum SendNewVorgangNotification { NONE, ALL; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/Settings.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/Settings.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/Settings.java rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/Settings.java index 2ae73eb2..a359065d 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/Settings.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/Settings.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettings.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettings.java similarity index 97% rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettings.java rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettings.java index b9c12a6a..08fd9756 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettings.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettings.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsRepository.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsRepository.java rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsRepository.java index d3089627..b54e4c75 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsRepository.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsRepository.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; import java.util.Optional; @@ -30,7 +30,7 @@ import jakarta.enterprise.context.ApplicationScoped; import org.bson.types.ObjectId; import de.itvsh.kop.common.logging.KopLogging; -import de.itvsh.kop.user.User; +import de.ozgcloud.user.User; import io.quarkus.mongodb.panache.PanacheMongoRepository; @ApplicationScoped diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResource.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsResource.java similarity index 93% rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResource.java rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsResource.java index 2b2f7c60..87b8f6fe 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResource.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsResource.java @@ -21,10 +21,12 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; import java.util.Objects; +import de.ozgcloud.user.common.errorhandling.AccessForbiddenException; +import de.ozgcloud.user.common.errorhandling.FunctionalException; import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.PATCH; @@ -39,10 +41,8 @@ import org.eclipse.microprofile.jwt.JsonWebToken; import org.jboss.resteasy.reactive.ResponseStatus; import org.jboss.resteasy.reactive.common.util.RestMediaType; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserService; -import de.itvsh.kop.user.common.errorhandling.AccessForbiddenException; -import de.itvsh.kop.user.common.errorhandling.FunctionalException; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserService; import io.quarkus.hal.HalEntityWrapper; @Path(UserSettingsResource.USER_PATH) diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResourceAssembler.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsResourceAssembler.java similarity index 91% rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResourceAssembler.java rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsResourceAssembler.java index 3f3c6528..92e356df 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResourceAssembler.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsResourceAssembler.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; @@ -29,9 +29,9 @@ import jakarta.ws.rs.core.Link; import org.apache.commons.lang3.StringUtils; -import de.itvsh.kop.user.UserRole; -import de.itvsh.kop.user.common.callcontext.CallContextUser; -import de.itvsh.kop.user.common.callcontext.CurrentCallContextUserService; +import de.ozgcloud.user.UserRole; +import de.ozgcloud.user.common.callcontext.CallContextUser; +import de.ozgcloud.user.common.callcontext.CurrentCallContextUserService; import io.quarkus.hal.HalEntityWrapper; @ApplicationScoped diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsService.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsService.java similarity index 95% rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsService.java rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsService.java index d05de31f..11459e7a 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsService.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsService.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; import java.util.Objects; import java.util.Optional; @@ -29,7 +29,7 @@ import java.util.Optional; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import de.itvsh.kop.user.UserService; +import de.ozgcloud.user.UserService; @ApplicationScoped class UserSettingsService { diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java b/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncScheduler.java similarity index 96% rename from user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java rename to user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncScheduler.java index 86d8def9..0fe18bc2 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncScheduler.java @@ -21,14 +21,14 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.sync; +package de.ozgcloud.user.sync; import static io.quarkus.scheduler.Scheduled.ConcurrentExecution.*; +import de.ozgcloud.user.common.lock.LockService; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import de.itvsh.kop.user.common.lock.LockService; import io.quarkus.scheduler.Scheduled; import lombok.extern.log4j.Log4j2; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncService.java b/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncService.java similarity index 91% rename from user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncService.java rename to user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncService.java index baed27bb..ad9ad6fa 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncService.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncService.java @@ -21,19 +21,19 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.sync; +package de.ozgcloud.user.sync; import java.util.function.Predicate; +import de.ozgcloud.user.keycloak.KeycloakUserRemoteService; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.apache.commons.collections4.CollectionUtils; import de.itvsh.kop.common.logging.KopLogging; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserService; -import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserService; @ApplicationScoped @KopLogging diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/userprofile/UserProfileGrpcService.java b/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileGrpcService.java similarity index 93% rename from user-manager-server/src/main/java/de/itvsh/kop/user/userprofile/UserProfileGrpcService.java rename to user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileGrpcService.java index 81106fa8..481f6c4a 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/userprofile/UserProfileGrpcService.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileGrpcService.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.userprofile; +package de.ozgcloud.user.userprofile; import java.util.stream.Stream; @@ -29,9 +29,9 @@ import jakarta.inject.Inject; import com.google.protobuf.Empty; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserService; -import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceImplBase; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserService; +import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceImplBase; import io.grpc.stub.StreamObserver; import io.quarkus.grpc.GrpcService; diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/userprofile/UserProfileMapper.java b/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java similarity index 95% rename from user-manager-server/src/main/java/de/itvsh/kop/user/userprofile/UserProfileMapper.java rename to user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java index bc17b796..8f16ad1b 100644 --- a/user-manager-server/src/main/java/de/itvsh/kop/user/userprofile/UserProfileMapper.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java @@ -21,14 +21,14 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.userprofile; +package de.ozgcloud.user.userprofile; import org.bson.types.ObjectId; import org.mapstruct.Mapper; import org.mapstruct.NullValueCheckStrategy; import org.mapstruct.ReportingPolicy; -import de.itvsh.kop.user.User; +import de.ozgcloud.user.User; @Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, // unmappedSourcePolicy = ReportingPolicy.WARN, // diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/GroupRepresentationTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/GroupRepresentationTestFactory.java similarity index 98% rename from user-manager-server/src/test/java/de/itvsh/kop/user/GroupRepresentationTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/GroupRepresentationTestFactory.java index b6555495..fcc0dd78 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/GroupRepresentationTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/GroupRepresentationTestFactory.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.List; import java.util.Map; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/RoleHierarchyTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/RoleHierarchyTest.java similarity index 95% rename from user-manager-server/src/test/java/de/itvsh/kop/user/RoleHierarchyTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/RoleHierarchyTest.java index 817276ee..88776017 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/RoleHierarchyTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/RoleHierarchyTest.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user; +package de.ozgcloud.user; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -10,6 +10,9 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.mockito.Spy; +import de.ozgcloud.user.RoleHierarchy; +import de.ozgcloud.user.UserRole; + class RoleHierarchyTest { private final RoleHierarchy subRole = RoleHierarchy.builder().roleName(UserRole.VERWALTUNG_USER).build(); diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/TestDatabaseUtils.java b/user-manager-server/src/test/java/de/ozgcloud/user/TestDatabaseUtils.java similarity index 97% rename from user-manager-server/src/test/java/de/itvsh/kop/user/TestDatabaseUtils.java rename to user-manager-server/src/test/java/de/ozgcloud/user/TestDatabaseUtils.java index 81646a39..f1916e8c 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/TestDatabaseUtils.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/TestDatabaseUtils.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoDatabase; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceAssemblerTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceAssemblerTest.java similarity index 97% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceAssemblerTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceAssemblerTest.java index 3ca7db44..53bf19f4 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceAssemblerTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceAssemblerTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import static org.assertj.core.api.Assertions.*; @@ -34,7 +34,7 @@ import org.mockito.Spy; import com.thedeanda.lorem.LoremIpsum; -import de.itvsh.kop.user.settings.UserSettingsResource; +import de.ozgcloud.user.settings.UserSettingsResource; class UserProfileResourceAssemblerTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceITCase.java similarity index 96% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceITCase.java index 449be255..f61597e2 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceITCase.java @@ -21,9 +21,9 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; -import static de.itvsh.kop.user.UserTestFactory.*; +import static de.ozgcloud.user.UserTestFactory.*; import static io.restassured.RestAssured.*; import static org.hamcrest.CoreMatchers.*; import static org.mockito.ArgumentMatchers.any; @@ -37,9 +37,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import de.itvsh.kop.user.common.errorhandling.ApiErrorUtil; -import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException; -import de.itvsh.kop.user.settings.UserSettingsResource; +import de.ozgcloud.user.common.errorhandling.ApiErrorUtil; +import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException; +import de.ozgcloud.user.settings.UserSettingsResource; import io.quarkus.test.InjectMock; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceTest.java similarity index 99% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceTest.java index 487b12e8..b642eff4 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceTestProfile.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceTestProfile.java similarity index 98% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceTestProfile.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceTestProfile.java index 16cb762e..db61e3bb 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceTestProfile.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceTestProfile.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.Map; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRepositoryITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryITCase.java similarity index 99% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserRepositoryITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryITCase.java index 35691484..e2a645da 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRepositoryITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryITCase.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import static java.util.function.Predicate.not; import static org.assertj.core.api.Assertions.*; @@ -44,7 +44,7 @@ import org.junit.jupiter.params.provider.MethodSource; import com.thedeanda.lorem.LoremIpsum; -import de.itvsh.kop.user.common.MongoDbTestProfile; +import de.ozgcloud.user.common.MongoDbTestProfile; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRepositoryTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryTest.java similarity index 98% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserRepositoryTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryTest.java index 409eb4b4..98c81190 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRepositoryTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -42,7 +42,7 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.Spy; -import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException; +import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException; import io.quarkus.mongodb.panache.PanacheQuery; import io.quarkus.mongodb.panache.common.PanacheUpdate; import io.quarkus.panache.common.Parameters; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRepresentationTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepresentationTestFactory.java similarity index 98% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserRepresentationTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserRepresentationTestFactory.java index 626b6953..5f1b3caf 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRepresentationTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepresentationTestFactory.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.time.Instant; import java.util.List; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceMapperTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceMapperTest.java similarity index 99% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceMapperTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserResourceMapperTest.java index 4817dc2e..d50c9ee0 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceMapperTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceMapperTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -45,7 +45,7 @@ import org.mapstruct.factory.Mappers; import org.mockito.InjectMocks; import org.mockito.Mock; -import de.itvsh.kop.user.keycloak.KeycloakApiProperties; +import de.ozgcloud.user.keycloak.KeycloakApiProperties; class UserResourceMapperTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceStub.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceStub.java similarity index 99% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceStub.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserResourceStub.java index 723b6076..81959e38 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceStub.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceStub.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.List; import java.util.Map; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceTestFactory.java similarity index 98% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserResourceTestFactory.java index f94763b5..8de656cf 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceTestFactory.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.List; import java.util.Map; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRoleTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserRoleTest.java similarity index 93% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserRoleTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserRoleTest.java index b38a8a5b..f0d55610 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRoleTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserRoleTest.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user; +package de.ozgcloud.user; import static org.assertj.core.api.Assertions.*; @@ -7,6 +7,8 @@ import java.util.List; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import de.ozgcloud.user.UserRole; + class UserRoleTest { @Nested diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserServiceITCase.java similarity index 91% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserServiceITCase.java index 7375478b..261684be 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserServiceITCase.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import static org.assertj.core.api.Assertions.*; @@ -32,9 +32,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import de.itvsh.kop.user.common.MongoDbTestProfile; -import de.itvsh.kop.user.settings.NotificationsSendFor; -import de.itvsh.kop.user.settings.UserSettingsTestFactory; +import de.ozgcloud.user.common.MongoDbTestProfile; +import de.ozgcloud.user.settings.NotificationsSendFor; +import de.ozgcloud.user.settings.UserSettingsTestFactory; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserServiceTest.java similarity index 96% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserServiceTest.java index 32dfcee0..a78a6738 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserServiceTest.java @@ -21,9 +21,9 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; -import static de.itvsh.kop.user.UserTestFactory.*; +import static de.ozgcloud.user.UserTestFactory.*; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -42,9 +42,9 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException; -import de.itvsh.kop.user.common.errorhandling.TechnicalException; -import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService; +import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException; +import de.ozgcloud.user.common.errorhandling.TechnicalException; +import de.ozgcloud.user.keycloak.KeycloakUserRemoteService; class UserServiceTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserTestFactory.java similarity index 96% rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/UserTestFactory.java index d48a9ceb..2853171b 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserTestFactory.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user; +package de.ozgcloud.user; import java.util.List; import java.util.UUID; @@ -30,7 +30,7 @@ import org.bson.types.ObjectId; import com.thedeanda.lorem.LoremIpsum; -import de.itvsh.kop.user.settings.UserSettingsTestFactory; +import de.ozgcloud.user.settings.UserSettingsTestFactory; public class UserTestFactory { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/JwtUtilTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/JwtUtilTest.java similarity index 95% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/JwtUtilTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/JwtUtilTest.java index db2c0070..bcb47047 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/JwtUtilTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/JwtUtilTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common; +package de.ozgcloud.user.common; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -30,6 +30,7 @@ import static org.mockito.Mockito.*; import java.util.List; import java.util.Map; +import de.ozgcloud.user.common.callcontext.CallContextMetadataTestFactory; import jakarta.json.Json; import jakarta.json.JsonArray; @@ -45,10 +46,9 @@ import org.mockito.Spy; import com.cronutils.utils.StringUtils; import com.thedeanda.lorem.LoremIpsum; -import de.itvsh.kop.user.UserRole; -import de.itvsh.kop.user.common.callcontext.CallContextMetadataTestFactory; -import de.itvsh.kop.user.common.callcontext.CurrentCallContextUserService; -import de.itvsh.kop.user.keycloak.KeycloakApiProperties; +import de.ozgcloud.user.UserRole; +import de.ozgcloud.user.common.callcontext.CurrentCallContextUserService; +import de.ozgcloud.user.keycloak.KeycloakApiProperties; class JwtUtilTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/MongoDbTestProfile.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/MongoDbTestProfile.java similarity index 88% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/MongoDbTestProfile.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/MongoDbTestProfile.java index 90522d04..7a980b18 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/MongoDbTestProfile.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/MongoDbTestProfile.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user.common; +package de.ozgcloud.user.common; import java.util.Map; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextInterceptorTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextInterceptorTestFactory.java similarity index 94% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextInterceptorTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextInterceptorTestFactory.java index 742e5475..4c3ab3d1 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextInterceptorTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextInterceptorTestFactory.java @@ -1,5 +1,7 @@ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; +import de.ozgcloud.user.common.callcontext.GrpcCallContextInterceptor; +import de.ozgcloud.user.common.callcontext.GrpcUtil; import io.grpc.CallOptions; import io.grpc.Channel; import io.grpc.ClientCall; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextMetadataTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextMetadataTestFactory.java similarity index 93% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextMetadataTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextMetadataTestFactory.java index 18ab2084..602e8f15 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextMetadataTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextMetadataTestFactory.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; import java.util.UUID; @@ -29,6 +29,8 @@ import org.bson.types.ObjectId; import com.thedeanda.lorem.LoremIpsum; +import de.ozgcloud.user.common.callcontext.GrpcCallContextInterceptor; +import de.ozgcloud.user.common.callcontext.GrpcUtil; import io.grpc.Metadata; public class CallContextMetadataTestFactory { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextUserTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextUserTestFactory.java similarity index 97% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextUserTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextUserTestFactory.java index 35314f68..bbd50814 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextUserTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextUserTestFactory.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; import java.util.Optional; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CurrentCallContextUserServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CurrentCallContextUserServiceTest.java similarity index 97% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CurrentCallContextUserServiceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CurrentCallContextUserServiceTest.java index 2ac6b2be..30c54589 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CurrentCallContextUserServiceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CurrentCallContextUserServiceTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -34,7 +34,7 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.mockito.Spy; -import de.itvsh.kop.user.UserRole; +import de.ozgcloud.user.UserRole; class CurrentCallContextUserServiceTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptorTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcCallContextInterceptorTest.java similarity index 96% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptorTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcCallContextInterceptorTest.java index 10c7379c..54fc62f7 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptorTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcCallContextInterceptorTest.java @@ -21,9 +21,9 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; -import static de.itvsh.kop.user.common.callcontext.GrpcCallContextInterceptor.*; +import static de.ozgcloud.user.common.callcontext.GrpcCallContextInterceptor.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -36,10 +36,10 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.common.callcontext.GrpcCallContextInterceptor.*; -import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.common.callcontext.GrpcCallContextInterceptor.*; +import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException; import io.grpc.Metadata; import io.grpc.ServerCall; import io.grpc.Status; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcUtilTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcUtilTest.java similarity index 95% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcUtilTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcUtilTest.java index 0a8f3621..0278cb8b 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcUtilTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcUtilTest.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; import static org.assertj.core.api.Assertions.*; @@ -6,6 +6,7 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import de.ozgcloud.user.common.callcontext.GrpcUtil; import io.grpc.Metadata; class GrpcUtilTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/HttpRequestInterceptorTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptorTest.java similarity index 95% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/HttpRequestInterceptorTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptorTest.java index c52e0e90..9db7e5c7 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/HttpRequestInterceptorTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptorTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.Spy; -import de.itvsh.kop.user.common.callcontext.HttpRequestInterceptor; +import de.ozgcloud.user.common.callcontext.HttpRequestInterceptor; class HttpRequestInterceptorTest { @Spy diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/HttpSecurityFilterTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpSecurityFilterTest.java similarity index 97% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/HttpSecurityFilterTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpSecurityFilterTest.java index 3c6898e7..825d24bb 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/HttpSecurityFilterTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpSecurityFilterTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.callcontext; +package de.ozgcloud.user.common.callcontext; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -39,7 +39,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import de.itvsh.kop.user.common.JwtUtil; +import de.ozgcloud.user.common.JwtUtil; class HttpSecurityFilterTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/errorhandling/ApiErrorUtilTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtilTest.java similarity index 94% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/errorhandling/ApiErrorUtilTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtilTest.java index 5d6ecf25..8aedffd5 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/errorhandling/ApiErrorUtilTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtilTest.java @@ -21,13 +21,18 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.errorhandling; +package de.ozgcloud.user.common.errorhandling; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.UUID; +import de.ozgcloud.user.common.errorhandling.AccessForbiddenException; +import de.ozgcloud.user.common.errorhandling.ApiError; +import de.ozgcloud.user.common.errorhandling.ApiErrorUtil; +import de.ozgcloud.user.common.errorhandling.KeycloakUnavailableException; +import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException; import jakarta.ws.rs.NotFoundException; import org.junit.jupiter.api.BeforeEach; @@ -39,7 +44,7 @@ import org.mockito.Spy; import com.cronutils.utils.StringUtils; import com.thedeanda.lorem.LoremIpsum; -import de.itvsh.kop.user.User; +import de.ozgcloud.user.User; class ApiErrorUtilTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/errorhandling/ExceptionHandlerTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ExceptionHandlerTest.java similarity index 97% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/errorhandling/ExceptionHandlerTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ExceptionHandlerTest.java index 87f36bfb..04335185 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/errorhandling/ExceptionHandlerTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ExceptionHandlerTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.errorhandling; +package de.ozgcloud.user.common.errorhandling; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -40,8 +40,8 @@ import org.mockito.Mock; import com.thedeanda.lorem.LoremIpsum; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserTestFactory; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserTestFactory; class ExceptionHandlerTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockRepositoryITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockRepositoryITCase.java similarity index 96% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockRepositoryITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockRepositoryITCase.java index 37acb819..4f9b32da 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockRepositoryITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockRepositoryITCase.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.lock; +package de.ozgcloud.user.common.lock; import static org.assertj.core.api.Assertions.*; @@ -33,7 +33,7 @@ import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.itvsh.kop.user.common.MongoDbTestProfile; +import de.ozgcloud.user.common.MongoDbTestProfile; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockRepositoryTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockRepositoryTest.java similarity index 98% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockRepositoryTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockRepositoryTest.java index bd8e0f5c..32ed63d5 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockRepositoryTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockRepositoryTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.lock; +package de.ozgcloud.user.common.lock; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockServiceTest.java similarity index 97% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockServiceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockServiceTest.java index 544bfda0..b5e957f6 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockServiceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockServiceTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.lock; +package de.ozgcloud.user.common.lock; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import de.itvsh.kop.user.common.errorhandling.LockCreationException; +import de.ozgcloud.user.common.errorhandling.LockCreationException; class LockServiceTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockTestFactory.java similarity index 93% rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockTestFactory.java index 0d9ed3f7..a01208dd 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockTestFactory.java @@ -21,11 +21,11 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.common.lock; +package de.ozgcloud.user.common.lock; import java.time.Instant; -import de.itvsh.kop.user.common.lock.Lock; +import de.ozgcloud.user.common.lock.Lock; public class LockTestFactory { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakApiServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakApiServiceITCase.java similarity index 97% rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakApiServiceITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakApiServiceITCase.java index 5514fea7..d39d0e4b 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakApiServiceITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakApiServiceITCase.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.keycloak; +package de.ozgcloud.user.keycloak; import static org.assertj.core.api.Assertions.*; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakApiServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakApiServiceTest.java similarity index 96% rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakApiServiceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakApiServiceTest.java index ffade1d3..e74d6d99 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakApiServiceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakApiServiceTest.java @@ -21,9 +21,9 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.keycloak; +package de.ozgcloud.user.keycloak; -import static de.itvsh.kop.user.UserTestFactory.*; +import static de.ozgcloud.user.UserTestFactory.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -50,12 +50,12 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import de.itvsh.kop.user.RemoteUserIterator; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserRepresentationTestFactory; -import de.itvsh.kop.user.UserResourceMapper; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.common.errorhandling.KeycloakUnavailableException; +import de.ozgcloud.user.RemoteUserIterator; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserRepresentationTestFactory; +import de.ozgcloud.user.UserResourceMapper; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.common.errorhandling.KeycloakUnavailableException; class KeycloakApiServiceTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakProviderITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderITCase.java similarity index 97% rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakProviderITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderITCase.java index 02c286d7..ffe409b4 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakProviderITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderITCase.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.keycloak; +package de.ozgcloud.user.keycloak; import static org.assertj.core.api.Assertions.*; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakProviderTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderTest.java similarity index 93% rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakProviderTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderTest.java index 38ccbb59..fcb0e78f 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakProviderTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.keycloak; +package de.ozgcloud.user.keycloak; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -35,6 +35,8 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; +import de.ozgcloud.user.keycloak.KeycloakApiProperties; +import de.ozgcloud.user.keycloak.KeycloakProvider; import lombok.SneakyThrows; class KeycloakProviderTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakTestProfile.java similarity index 97% rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakTestProfile.java index 8896b913..18f54e38 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakTestProfile.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.keycloak; +package de.ozgcloud.user.keycloak; import java.util.Map; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceITCase.java similarity index 90% rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteServiceITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceITCase.java index e98d518f..5b17b582 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteServiceITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceITCase.java @@ -21,12 +21,14 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.keycloak; +package de.ozgcloud.user.keycloak; import static org.mockito.Mockito.*; import org.junit.jupiter.api.Test; +import de.ozgcloud.user.keycloak.KeycloakApiService; +import de.ozgcloud.user.keycloak.KeycloakUserRemoteService; import io.quarkus.test.InjectMock; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectSpy; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceTest.java similarity index 93% rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteServiceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceTest.java index 853804b6..4604a2c4 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteServiceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceTest.java @@ -21,21 +21,19 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.keycloak; +package de.ozgcloud.user.keycloak; -import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Optional; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import de.itvsh.kop.user.UserTestFactory; +import de.ozgcloud.user.UserTestFactory; class KeycloakUserRemoteServiceTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java similarity index 88% rename from user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java index 1f1082a1..ce3e1ec5 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java @@ -1,7 +1,8 @@ -package de.itvsh.kop.user.organisationseinheit; +package de.ozgcloud.user.organisationseinheit; import static org.assertj.core.api.Assertions.*; +import de.ozgcloud.user.TestDatabaseUtils; import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; @@ -11,9 +12,8 @@ import org.junit.jupiter.api.Test; import com.mongodb.client.MongoClient; -import de.itvsh.kop.user.TestDatabaseUtils; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.common.MongoDbTestProfile; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.common.MongoDbTestProfile; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java similarity index 90% rename from user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java index 2eee86f1..e6081670 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user.organisationseinheit; +package de.ozgcloud.user.organisationseinheit; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -15,7 +15,8 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoCursor; import com.mongodb.client.model.Filters; -import de.itvsh.kop.user.User; +import de.ozgcloud.user.User; +import de.ozgcloud.user.organisationseinheit.OrganisationsEinheitRepository; class OrganisationsEinheitRepositoryTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitServiceTest.java similarity index 76% rename from user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitServiceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitServiceTest.java index 27266281..e51e051d 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitServiceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitServiceTest.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user.organisationseinheit; +package de.ozgcloud.user.organisationseinheit; import static org.mockito.Mockito.*; @@ -8,6 +8,9 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; +import de.ozgcloud.user.organisationseinheit.OrganisationsEinheitRepository; +import de.ozgcloud.user.organisationseinheit.OrganisationsEinheitService; + class OrganisationsEinheitServiceTest { @InjectMocks diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java similarity index 76% rename from user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java index 4a2fff86..9a5bf656 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user.organisationseinheit; +package de.ozgcloud.user.organisationseinheit; import static org.mockito.Mockito.*; @@ -10,7 +10,9 @@ import org.mockito.Mock; import com.google.protobuf.Empty; -import de.itvsh.kop.user.grpc.organisationseinheit.GrpcGetSupportedOrganisationsEinheitenResponse; +import de.ozgcloud.user.grpc.organisationseinheit.GrpcGetSupportedOrganisationsEinheitenResponse; +import de.ozgcloud.user.organisationseinheit.OrganisationsEinheitGrpcService; +import de.ozgcloud.user.organisationseinheit.OrganisationsEinheitService; import io.grpc.stub.StreamObserver; public class OrganisationseinheitGrpcServiceTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientGrpcServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientGrpcServiceTest.java similarity index 93% rename from user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientGrpcServiceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientGrpcServiceTest.java index ed3567f9..28f13543 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientGrpcServiceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientGrpcServiceTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.recipient; +package de.ozgcloud.user.recipient; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -35,8 +35,8 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientResponse; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.grpc.recipient.GrpcFindRecipientResponse; import io.grpc.stub.StreamObserver; class RecipientGrpcServiceTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientMapperTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientMapperTest.java similarity index 96% rename from user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientMapperTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientMapperTest.java index c360d315..0241aa00 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientMapperTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientMapperTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.recipient; +package de.ozgcloud.user.recipient; import static org.assertj.core.api.Assertions.*; @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.mapstruct.factory.Mappers; -import de.itvsh.kop.user.UserTestFactory; +import de.ozgcloud.user.UserTestFactory; class RecipientMapperTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientRepositoryITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientRepositoryITCase.java similarity index 89% rename from user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientRepositoryITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientRepositoryITCase.java index 368f71a4..57448ee0 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientRepositoryITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientRepositoryITCase.java @@ -1,8 +1,10 @@ -package de.itvsh.kop.user.recipient; +package de.ozgcloud.user.recipient; -import static de.itvsh.kop.user.settings.NotificationsSendFor.*; +import static de.ozgcloud.user.settings.NotificationsSendFor.*; import static org.assertj.core.api.Assertions.*; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.settings.UserSettingsTestFactory; import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; @@ -13,11 +15,9 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.EnumSource.Mode; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.common.MongoDbTestProfile; -import de.itvsh.kop.user.settings.NotificationsSendFor; -import de.itvsh.kop.user.settings.UserSettingsTestFactory; +import de.ozgcloud.user.User; +import de.ozgcloud.user.common.MongoDbTestProfile; +import de.ozgcloud.user.settings.NotificationsSendFor; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientRepositoryTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientRepositoryTest.java similarity index 90% rename from user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientRepositoryTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientRepositoryTest.java index cbaa0e31..addd8cf2 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientRepositoryTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientRepositoryTest.java @@ -21,9 +21,9 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.recipient; +package de.ozgcloud.user.recipient; -import static de.itvsh.kop.user.User.*; +import static de.ozgcloud.user.User.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -35,9 +35,9 @@ import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.Spy; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.settings.NotificationsSendFor; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.settings.NotificationsSendFor; import io.quarkus.mongodb.panache.PanacheQuery; class RecipientRepositoryTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientServiceTest.java similarity index 94% rename from user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientServiceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientServiceTest.java index dc816a3b..ce40a974 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientServiceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientServiceTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.recipient; +package de.ozgcloud.user.recipient; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -34,8 +34,8 @@ import org.mockito.Mock; import com.cronutils.utils.StringUtils; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.common.errorhandling.FunctionalException; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.common.errorhandling.FunctionalException; class RecipientServiceTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientTestFactory.java similarity index 88% rename from user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientTestFactory.java index f90a1b5e..4e46e17c 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientTestFactory.java @@ -21,12 +21,12 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.recipient; +package de.ozgcloud.user.recipient; -import static de.itvsh.kop.user.UserTestFactory.*; +import static de.ozgcloud.user.UserTestFactory.*; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientRequest; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.grpc.recipient.GrpcFindRecipientRequest; public class RecipientTestFactory { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsRepositoryITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsRepositoryITCase.java similarity index 93% rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsRepositoryITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsRepositoryITCase.java index 5b7e3a40..d9b84e4d 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsRepositoryITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsRepositoryITCase.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; import static org.assertj.core.api.Assertions.*; @@ -9,8 +9,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.common.MongoDbTestProfile; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.common.MongoDbTestProfile; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceAssemblerTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceAssemblerTest.java similarity index 95% rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceAssemblerTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceAssemblerTest.java index 3a20f53a..8bb2edbc 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceAssemblerTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceAssemblerTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -39,8 +39,8 @@ import org.mockito.Spy; import com.thedeanda.lorem.LoremIpsum; -import de.itvsh.kop.user.common.callcontext.CallContextUserTestFactory; -import de.itvsh.kop.user.common.callcontext.CurrentCallContextUserService; +import de.ozgcloud.user.common.callcontext.CallContextUserTestFactory; +import de.ozgcloud.user.common.callcontext.CurrentCallContextUserService; import io.quarkus.hal.HalEntityWrapper; class UserSettingsResourceAssemblerTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceITCase.java similarity index 91% rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceITCase.java index 43d94773..42c89399 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceITCase.java @@ -21,13 +21,14 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; -import static de.itvsh.kop.user.settings.UserSettings.*; -import static de.itvsh.kop.user.settings.UserSettingsResource.*; +import static de.ozgcloud.user.settings.UserSettings.*; +import static de.ozgcloud.user.settings.UserSettingsResource.*; import static io.restassured.RestAssured.*; import static org.hamcrest.CoreMatchers.*; +import de.ozgcloud.user.TestDatabaseUtils; import jakarta.inject.Inject; import jakarta.ws.rs.core.MediaType; @@ -38,9 +39,8 @@ import org.junit.jupiter.api.Test; import com.mongodb.client.MongoClient; -import de.itvsh.kop.user.TestDatabaseUtils; -import de.itvsh.kop.user.UserService; -import de.itvsh.kop.user.UserTestFactory; +import de.ozgcloud.user.UserService; +import de.ozgcloud.user.UserTestFactory; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceTest.java similarity index 96% rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceTest.java index 5b9c8c29..df8ea4ff 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -44,11 +44,11 @@ import org.mockito.Spy; import com.thedeanda.lorem.LoremIpsum; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserService; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.common.errorhandling.AccessForbiddenException; -import de.itvsh.kop.user.common.errorhandling.FunctionalException; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserService; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.common.errorhandling.AccessForbiddenException; +import de.ozgcloud.user.common.errorhandling.FunctionalException; import io.quarkus.hal.HalEntityWrapper; class UserSettingsResourceTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTestProfile.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceTestProfile.java similarity index 97% rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTestProfile.java rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceTestProfile.java index 0245ce5d..343447ad 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTestProfile.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceTestProfile.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; import java.util.Map; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceITCase.java similarity index 94% rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsServiceITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceITCase.java index 525c4af5..6f0d5f1d 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsServiceITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceITCase.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; import static org.assertj.core.api.Assertions.*; @@ -32,8 +32,8 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.common.MongoDbTestProfile; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.common.MongoDbTestProfile; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceTest.java similarity index 96% rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsServiceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceTest.java index 7c7e7c2b..5eeac12f 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsServiceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -36,8 +36,8 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import de.itvsh.kop.user.UserService; -import de.itvsh.kop.user.UserTestFactory; +import de.ozgcloud.user.UserService; +import de.ozgcloud.user.UserTestFactory; class UserSettingsServiceTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java similarity index 90% rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java index 50bb9d27..e77c6bb4 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java @@ -21,7 +21,10 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.settings; +package de.ozgcloud.user.settings; + +import de.ozgcloud.user.settings.NotificationsSendFor; +import de.ozgcloud.user.settings.UserSettings; public class UserSettingsTestFactory { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerITCase.java similarity index 89% rename from user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerITCase.java index 969600a2..c2a948e6 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerITCase.java @@ -1,6 +1,6 @@ -package de.itvsh.kop.user.sync; +package de.ozgcloud.user.sync; -import static de.itvsh.kop.user.User.*; +import static de.ozgcloud.user.User.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -10,6 +10,7 @@ import java.util.Arrays; import java.util.Map; import java.util.stream.Stream; +import de.ozgcloud.user.TestDatabaseUtils; import jakarta.inject.Inject; import org.bson.Document; @@ -21,13 +22,12 @@ import org.junit.jupiter.api.Test; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoDatabase; -import de.itvsh.kop.user.TestDatabaseUtils; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserService; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.common.MongoDbTestProfile; -import de.itvsh.kop.user.common.lock.Lock; -import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserService; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.common.MongoDbTestProfile; +import de.ozgcloud.user.common.lock.Lock; +import de.ozgcloud.user.keycloak.KeycloakUserRemoteService; import io.quarkus.test.InjectMock; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java similarity index 93% rename from user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java index 99927df2..2b2992f7 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.sync; +package de.ozgcloud.user.sync; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -36,8 +36,10 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import de.itvsh.kop.user.common.lock.Lock; -import de.itvsh.kop.user.common.lock.LockService; +import de.ozgcloud.user.common.lock.Lock; +import de.ozgcloud.user.common.lock.LockService; +import de.ozgcloud.user.sync.SyncScheduler; +import de.ozgcloud.user.sync.SyncService; class SyncSchedulerTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncServiceITCase.java similarity index 90% rename from user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncServiceITCase.java index e1685bd2..b8f4b508 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncServiceITCase.java @@ -21,9 +21,9 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.sync; +package de.ozgcloud.user.sync; -import static de.itvsh.kop.user.User.*; +import static de.ozgcloud.user.User.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -32,6 +32,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Stream; +import de.ozgcloud.user.TestDatabaseUtils; import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; @@ -40,12 +41,11 @@ import org.junit.jupiter.api.Test; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoDatabase; -import de.itvsh.kop.user.TestDatabaseUtils; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserService; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.common.MongoDbTestProfile; -import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserService; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.common.MongoDbTestProfile; +import de.ozgcloud.user.keycloak.KeycloakUserRemoteService; import io.quarkus.test.InjectMock; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncServiceTest.java similarity index 92% rename from user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncServiceTest.java index 9dd04c7e..8cd308cc 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncServiceTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.sync; +package de.ozgcloud.user.sync; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -39,11 +39,11 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserService; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.common.lock.LockService; -import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserService; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.common.lock.LockService; +import de.ozgcloud.user.keycloak.KeycloakUserRemoteService; class SyncServiceTest { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java similarity index 81% rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java index d8a76fa4..e8f7b29f 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java @@ -1,6 +1,6 @@ -package de.itvsh.kop.user.userprofile; +package de.ozgcloud.user.userprofile; -import de.itvsh.kop.user.UserTestFactory; +import de.ozgcloud.user.UserTestFactory; public class GrpcDeleteInactiveUserRequestTestFactory { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java similarity index 87% rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java index a02edd08..478ce6a3 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user.userprofile; +package de.ozgcloud.user.userprofile; class GrpcGetInactiveUserIdsResponseTestFactory { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcUserProfileIdTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcUserProfileIdTestFactory.java similarity index 76% rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcUserProfileIdTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcUserProfileIdTestFactory.java index 5180348b..d23f7027 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcUserProfileIdTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcUserProfileIdTestFactory.java @@ -1,6 +1,6 @@ -package de.itvsh.kop.user.userprofile; +package de.ozgcloud.user.userprofile; -import de.itvsh.kop.user.UserTestFactory; +import de.ozgcloud.user.UserTestFactory; class GrpcUserProfileIdTestFactory { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcUserProfileTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcUserProfileTestFactory.java similarity index 94% rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcUserProfileTestFactory.java rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcUserProfileTestFactory.java index 1ebb5779..16fd8ad1 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcUserProfileTestFactory.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcUserProfileTestFactory.java @@ -21,9 +21,9 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.userprofile; +package de.ozgcloud.user.userprofile; -import de.itvsh.kop.user.UserTestFactory; +import de.ozgcloud.user.UserTestFactory; public class GrpcUserProfileTestFactory { diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceITCase.java similarity index 84% rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceITCase.java rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceITCase.java index 972f94a7..57da92d0 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceITCase.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceITCase.java @@ -1,4 +1,4 @@ -package de.itvsh.kop.user.userprofile; +package de.ozgcloud.user.userprofile; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -10,10 +10,10 @@ import org.junit.jupiter.api.Test; import com.google.rpc.Code; -import de.itvsh.kop.user.UserService; -import de.itvsh.kop.user.UserTestFactory; -import de.itvsh.kop.user.common.callcontext.CallContextInterceptorTestFactory; -import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub; +import de.ozgcloud.user.UserService; +import de.ozgcloud.user.UserTestFactory; +import de.ozgcloud.user.common.callcontext.CallContextInterceptorTestFactory; +import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub; import io.grpc.StatusRuntimeException; import io.quarkus.grpc.GrpcClient; import io.quarkus.test.InjectMock; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceTest.java similarity index 97% rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceTest.java index 1f0c6c71..157375ca 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.userprofile; +package de.ozgcloud.user.userprofile; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -42,9 +42,9 @@ import org.mockito.Spy; import com.google.protobuf.Empty; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserService; -import de.itvsh.kop.user.UserTestFactory; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserService; +import de.ozgcloud.user.UserTestFactory; import io.grpc.stub.StreamObserver; import lombok.SneakyThrows; diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileMapperTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java similarity index 94% rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileMapperTest.java rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java index 9e79187d..c9002fa3 100644 --- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileMapperTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java @@ -21,7 +21,7 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -package de.itvsh.kop.user.userprofile; +package de.ozgcloud.user.userprofile; import static org.assertj.core.api.Assertions.*; @@ -31,8 +31,8 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.mapstruct.factory.Mappers; -import de.itvsh.kop.user.User; -import de.itvsh.kop.user.UserTestFactory; +import de.ozgcloud.user.User; +import de.ozgcloud.user.UserTestFactory; class UserProfileMapperTest { -- GitLab