X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.enterprise%2Fsrc%2Forg%2Fargeo%2Fnaming%2FNamingUtils.java;h=cb93e825786d56f3c90edc20f7759743cb793d13;hb=43e8bb2c3186c925991091e2b0f7002a940093c3;hp=0b74ee18c4f4521ad4ceb48994594665fecbd9b6;hpb=9c1e0062044a1dcf34d34c7cda840334e56a289c;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 0b74ee18c..cb93e8257 100644
--- a/org.argeo.enterprise/src/org/argeo/naming/NamingUtils.java
+++ b/org.argeo.enterprise/src/org/argeo/naming/NamingUtils.java
@@ -9,6 +9,10 @@ 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;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -18,8 +22,22 @@ public class NamingUtils {
 	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;
+		}
+	}
+
+	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));
+		return calendar;
 	}
 
 	public static String instantToLdapDate(ZonedDateTime instant) {
@@ -54,7 +72,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;
@@ -67,10 +86,11 @@ public class NamingUtils {
 
 	}
 
-//	public static void main(String args[]) {
-//		ZonedDateTime now = ZonedDateTime.now().withZoneSameInstant(ZoneOffset.UTC);
-//		String str = utcLdapDate.format(now);
-//		System.out.println(str);
-//		utcLdapDate.parse(str);
-//	}
+	public static void main(String args[]) {
+		ZonedDateTime now = ZonedDateTime.now().withZoneSameInstant(ZoneOffset.UTC);
+		String str = utcLdapDate.format(now);
+		System.out.println(str);
+		utcLdapDate.parse(str);
+		utcLdapDate.parse("19520512000000Z");
+	}
 }