Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugs #13279 fix: imports and method calls #2066

Merged
merged 1 commit into from
Sep 27, 2024
Merged

bugs #13279 fix: imports and method calls #2066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...tial-commons/src/main/java/fr/gouv/vitamui/referential/common/dto/ProfileResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {}
2 changes: 1 addition & 1 deletion ...commons/src/main/java/fr/gouv/vitamui/referential/common/service/VitamProfileService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 6 additions & 8 deletions ...l/src/main/java/fr/gouv/vitamui/referential/internal/server/profile/ProfileConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion ...main/java/fr/gouv/vitamui/referential/internal/server/profile/ProfileInternalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down