X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.enterprise%2Fsrc%2Forg%2Fargeo%2Fnaming%2FNamingUtils.java;h=5a868ddb42b885afbad49925c247407ff3907182;hb=f9efbe5228615951dd8482a4582aa24e00c10ce5;hp=64fd65faa470aea8721334f0defef883fe9bd7e3;hpb=0a91fbf74e55efcd33b7b225690b9807b791219a;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.enterprise/src/org/argeo/naming/NamingUtils.java b/org.argeo.enterprise/src/org/argeo/naming/NamingUtils.java
index 64fd65faa..5a868ddb4 100644
--- a/org.argeo.enterprise/src/org/argeo/naming/NamingUtils.java
+++ b/org.argeo.enterprise/src/org/argeo/naming/NamingUtils.java
@@ -9,6 +9,7 @@ import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.time.temporal.ChronoField;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -18,19 +19,34 @@ import java.util.List;
 import java.util.Map;
 
 public class NamingUtils {
+	/** As per https://tools.ietf.org/html/rfc4517#section-3.3.13 */
 	private final static DateTimeFormatter utcLdapDate = DateTimeFormatter.ofPattern("uuuuMMddHHmmssX")
 			.withZone(ZoneOffset.UTC);
 
+	/** @return null if not parseable */
 	public static Instant ldapDateToInstant(String ldapDate) {
-		return OffsetDateTime.parse(ldapDate, utcLdapDate).toInstant();
+		try {
+			return OffsetDateTime.parse(ldapDate, utcLdapDate).toInstant();
+		} catch (DateTimeParseException e) {
+			return null;
+		}
+	}
+
+	/** @return null if not parseable */
+	public static ZonedDateTime ldapDateToZonedDateTime(String ldapDate) {
+		try {
+			return OffsetDateTime.parse(ldapDate, utcLdapDate).toZonedDateTime();
+		} catch (DateTimeParseException e) {
+			return null;
+		}
 	}
 
 	public static Calendar ldapDateToCalendar(String ldapDate) {
 		OffsetDateTime instant = OffsetDateTime.parse(ldapDate, utcLdapDate);
 		GregorianCalendar calendar = new GregorianCalendar();
-		calendar.set(calendar.DAY_OF_MONTH, instant.get(ChronoField.DAY_OF_MONTH));
-		calendar.set(calendar.MONTH, instant.get(ChronoField.MONTH_OF_YEAR));
-		calendar.set(calendar.YEAR, instant.get(ChronoField.YEAR));
+		calendar.set(Calendar.DAY_OF_MONTH, instant.get(ChronoField.DAY_OF_MONTH));
+		calendar.set(Calendar.MONTH, instant.get(ChronoField.MONTH_OF_YEAR));
+		calendar.set(Calendar.YEAR, instant.get(ChronoField.YEAR));
 		return calendar;
 	}
 
@@ -66,7 +82,8 @@ public class NamingUtils {
 					query_pairs.put(key, new LinkedList<String>());
 				}
 				final String value = idx > 0 && pair.length() > idx + 1
-						? URLDecoder.decode(pair.substring(idx + 1), StandardCharsets.UTF_8.name()) : null;
+						? URLDecoder.decode(pair.substring(idx + 1), StandardCharsets.UTF_8.name())
+						: null;
 				query_pairs.get(key).add(value);
 			}
 			return query_pairs;