issue new date format, set Time Zone to header
@@ -34,13 +34,15 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.TimeZone;
import java.util.stream.Collectors;
public class UserExporter {
private static final String LIST_DELIMITER = "|";
private static final DateTimeFormatter USER_DATE_FORMATTER =
- DateTimeFormatter.ofPattern("dd-MM-yy HH:mm");
+ DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ public static final String COMMA = ", ";
public String exportUsers(final PipelineUserExportVO exportSettings,
final Collection<PipelineUserWithStoragePath> users) {
@@ -78,10 +80,12 @@ public class UserExporter {
result.addAll(ListUtils.emptyIfNull(attributeNames));
}
if (exportSettings.isIncludeRegistrationDate()) {
- result.add(PipelineUserWithStoragePath.PipelineUserFields.REGISTRATION_DATE.getValue());
+ result.add(PipelineUserWithStoragePath.PipelineUserFields.REGISTRATION_DATE.getValue()
+ + COMMA + TimeZone.getDefault().toZoneId());
}
if (exportSettings.isIncludeFirstLoginDate()) {
- result.add(PipelineUserWithStoragePath.PipelineUserFields.FIRST_LOGIN_DATE.getValue());
+ result.add(PipelineUserWithStoragePath.PipelineUserFields.FIRST_LOGIN_DATE.getValue()
+ + COMMA + TimeZone.getDefault().toZoneId());
}
if (exportSettings.isIncludeRoles()) {
result.add(PipelineUserWithStoragePath.PipelineUserFields.ROLES.getValue());
