Merge pull request #2066 from ProgrammeVitam/bugs_13279

bugs #13279 fix: imports and method calls
ProgrammeVitam · Sep 27, 2024 · 4665263 · 4665263
2 parents e32a370 + 17b521f
commit 4665263
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/...tial-commons/src/main/java/fr/gouv/vitamui/referential/common/dto/ProfileResponseDto.java b/...tial-commons/src/main/java/fr/gouv/vitamui/referential/common/dto/ProfileResponseDto.java
@@ -36,7 +36,7 @@
  */
 package fr.gouv.vitamui.referential.common.dto;
 
-import fr.gouv.vitam.common.model.administration.ProfileModel;
+import fr.gouv.vitam.common.model.administration.profile.ProfileModel;
 import fr.gouv.vitamui.commons.vitam.api.dto.AbstractVitamUIResponseDto;
 
 public class ProfileResponseDto extends AbstractVitamUIResponseDto<ProfileModel> {}
diff --git a/...commons/src/main/java/fr/gouv/vitamui/referential/common/service/VitamProfileService.java b/...commons/src/main/java/fr/gouv/vitamui/referential/common/service/VitamProfileService.java
@@ -47,7 +47,7 @@
 import fr.gouv.vitam.common.exception.InvalidParseOperationException;
 import fr.gouv.vitam.common.exception.VitamClientException;
 import fr.gouv.vitam.common.model.RequestResponse;
-import fr.gouv.vitam.common.model.administration.ProfileModel;
+import fr.gouv.vitam.common.model.administration.profile.ProfileModel;
 import fr.gouv.vitamui.commons.vitam.api.util.VitamRestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...l/src/main/java/fr/gouv/vitamui/referential/internal/server/profile/ProfileConverter.java b/...l/src/main/java/fr/gouv/vitamui/referential/internal/server/profile/ProfileConverter.java
@@ -36,7 +36,7 @@
  */
 package fr.gouv.vitamui.referential.internal.server.profile;
 
-import fr.gouv.vitam.common.model.administration.ProfileModel;
+import fr.gouv.vitam.common.model.administration.profile.ProfileModel;
 import fr.gouv.vitamui.commons.utils.VitamUIUtils;
 import fr.gouv.vitamui.referential.common.dto.ProfileDto;
 
@@ -46,17 +46,15 @@
 public class ProfileConverter {
 
     public ProfileModel convertDtoToVitam(final ProfileDto dto) {
-        final ProfileModel Profile = VitamUIUtils.copyProperties(dto, new ProfileModel());
-
-        return Profile;
+        return VitamUIUtils.copyProperties(dto, new ProfileModel());
     }
 
     public ProfileDto convertVitamToDto(final ProfileModel profile) {
         final ProfileDto dto = VitamUIUtils.copyProperties(profile, new ProfileDto());
-        dto.setActivationDate(profile.getActivationdate());
-        dto.setCreationDate(profile.getCreationdate());
-        dto.setDeactivationDate(profile.getDeactivationdate());
-        dto.setLastUpdate(profile.getLastupdate());
+        dto.setActivationDate(profile.getActivationDate());
+        dto.setCreationDate(profile.getCreationDate());
+        dto.setDeactivationDate(profile.getDeactivationDate());
+        dto.setLastUpdate(profile.getLastUpdate());
         return dto;
     }
 

diff --git a/...main/java/fr/gouv/vitamui/referential/internal/server/profile/ProfileInternalService.java b/...main/java/fr/gouv/vitamui/referential/internal/server/profile/ProfileInternalService.java
@@ -52,7 +52,7 @@
 import fr.gouv.vitam.common.json.JsonHandler;
 import fr.gouv.vitam.common.model.RequestResponse;
 import fr.gouv.vitam.common.model.RequestResponseOK;
-import fr.gouv.vitam.common.model.administration.ProfileModel;
+import fr.gouv.vitam.common.model.administration.profile.ProfileModel;
 import fr.gouv.vitamui.commons.api.domain.DirectionDto;
 import fr.gouv.vitamui.commons.api.domain.PaginatedValuesDto;
 import fr.gouv.vitamui.commons.api.exception.BadRequestException;