[FIX] Fix write conflict (#563) (692db820) · Commits · dad / Cines Vitamui

Unverified Commit 692db820 authored 3 years ago by

youcefxelians Committed by GitHub 3 years ago

[FIX] Fix write conflict (#563)


Co-authored-by: Julien CORNILLE <julien.cornille@xelians.fr>

parent 4d1ec7f6

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/application/service/ApplicationInternalService.java 3 additions, 2 deletions

...erver/application/service/ApplicationInternalService.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/config/ApiIamServerConfig.java 29 additions, 28 deletions

...itamui/iam/internal/server/config/ApiIamServerConfig.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/service/CustomerInternalService.java 3 additions, 2 deletions

...rnal/server/customer/service/CustomerInternalService.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/service/InitCustomerService.java 4 additions, 8 deletions

...internal/server/customer/service/InitCustomerService.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/group/service/GroupInternalService.java 3 additions, 4 deletions

...m/internal/server/group/service/GroupInternalService.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/idp/service/IdentityProviderInternalService.java 4 additions, 3 deletions

...l/server/idp/service/IdentityProviderInternalService.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/owner/service/OwnerInternalService.java 3 additions, 3 deletions

...m/internal/server/owner/service/OwnerInternalService.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/profile/service/ProfileInternalService.java 3 additions, 3 deletions

...ternal/server/profile/service/ProfileInternalService.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/subrogation/service/SubrogationInternalService.java 3 additions, 5 deletions

...erver/subrogation/service/SubrogationInternalService.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/tenant/service/TenantInternalService.java 7 additions, 12 deletions

...internal/server/tenant/service/TenantInternalService.java
api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/user/service/UserInternalService.java 3 additions, 3 deletions

...iam/internal/server/user/service/UserInternalService.java
api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/application/service/ApplicationInternalServiceTest.java 5 additions, 8 deletions

...r/application/service/ApplicationInternalServiceTest.java
api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/customer/service/CustomerInternalServiceIntegrationTest.java 32 additions, 34 deletions

...tomer/service/CustomerInternalServiceIntegrationTest.java
api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/customer/service/CustomerInternalServiceTest.java 6 additions, 10 deletions

.../server/customer/service/CustomerInternalServiceTest.java
api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/group/service/GroupInternalServiceIntegrationTest.java 2 additions, 1 deletion

...er/group/service/GroupInternalServiceIntegrationTest.java
api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/group/service/GroupInternalServiceTest.java 3 additions, 4 deletions

...ternal/server/group/service/GroupInternalServiceTest.java
api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/idp/service/IdentityProviderInternalIntegrationTest.java 4 additions, 11 deletions

.../idp/service/IdentityProviderInternalIntegrationTest.java
api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/idp/service/IdentityProviderInternalServiceTest.java 5 additions, 9 deletions

...rver/idp/service/IdentityProviderInternalServiceTest.java
api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/owner/service/OwnerInternalServiceIntegTest.java 4 additions, 12 deletions

...l/server/owner/service/OwnerInternalServiceIntegTest.java
api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/owner/service/OwnerInternalServiceTest.java 5 additions, 7 deletions

...ternal/server/owner/service/OwnerInternalServiceTest.java

with 131 additions and 169 deletions

Please register or to comment