Merge pull request #183 from fanavarro/4.0

Fix typo in _subPropertyOfRel map key and new date parser added

Author: jbarrasa

src/main/java/n10s/RDFToLPGStatementProcessor.java

@@ -2,6 +2,7 @@
 
 import n10s.graphconfig.GraphConfig;
 import n10s.graphconfig.RDFParserConfig;
+import n10s.utils.DateUtils;
 import n10s.utils.InvalidNamespacePrefixDefinitionInDB;
 import n10s.utils.NsPrefixMap;
 import org.eclipse.rdf4j.model.*;
@@ -14,11 +15,14 @@
 import org.neo4j.internal.helpers.collection.Iterables;
 import org.neo4j.logging.Log;
 
+import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeParseException;
 import java.util.*;
 
+import javax.xml.bind.DatatypeConverter;
+
 import static n10s.graphconfig.GraphConfig.*;
 import static n10s.graphconfig.Params.CUSTOM_DATA_TYPE_SEPERATOR;
 import static n10s.graphconfig.Params.PREFIX_SEPARATOR;
@@ -113,15 +117,15 @@ protected Object getObjectValue(IRI propertyIRI, Literal object) {
       return object.booleanValue();
     } else if (datatype.equals(XMLSchema.DATETIME)) {
       try {
-        return LocalDateTime.parse(object.stringValue());
-      } catch (DateTimeParseException e) {
+        return DateUtils.parseDateTime(object.stringValue());
+      } catch (IllegalArgumentException e) {
         //if date cannot be parsed we return string value
         return object.stringValue();
       }
     } else if (datatype.equals(XMLSchema.DATE)) {
       try {
-        return LocalDate.parse(object.stringValue());
-      } catch (DateTimeParseException e) {
+        return DateUtils.parseDateTime(object.stringValue());
+      } catch (IllegalArgumentException e) {
         //if date cannot be parsed we return string value
         return object.stringValue();
       }
@@ -143,6 +147,8 @@ protected Object getObjectValue(IRI propertyIRI, Literal object) {
     // default
     return object.stringValue();
   }
+  
+  
 
   protected String getValueWithDatatype(IRI datatype, String value) {
     StringBuilder result = new StringBuilder(value);

src/main/java/n10s/graphconfig/GraphConfig.java

@@ -313,7 +313,7 @@ public Map<String, Object> serialiseConfig() {
     configAsMap.put("_subClassOfRel", this.subClassOfRelName);
     configAsMap.put("_dataTypePropertyLabel", this.dataTypePropertyLabelName);
     configAsMap.put("_objectPropertyLabel", this.objectPropertyLabelName);
-    configAsMap.put("_subPropertyOfRell", this.subPropertyOfRelName);
+    configAsMap.put("_subPropertyOfRel", this.subPropertyOfRelName);
     configAsMap.put("_domainRel", this.domainRelName);
     configAsMap.put("_rangeRel", this.rangeRelName);
 

src/main/java/n10s/utils/DateUtils.java

@@ -0,0 +1,54 @@
+package n10s.utils;
+
+import java.time.DateTimeException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeParseException;
+import java.util.Calendar;
+
+import javax.xml.bind.DatatypeConverter;
+
+public class DateUtils {
+	/**
+	 * Convert a String-formatted date into a LocalDateTime object by using
+	 * LocalDateTime.parse first, and DatatypeConverter.parseDateTime if the
+	 * first one fails.
+	 * @param stringDateTime
+	 *            The string-formatted date.
+	 * @return LocalDateTime object.
+	 * @throws IllegalArgumentException if the string is not parseable to a date.
+	 */
+	public static LocalDateTime parseDateTime(String stringDateTime) {
+		boolean dateParsed = false;
+		LocalDateTime localDateTime = null;
+		StringBuilder parserErrors = new StringBuilder("Error parsing ").append(stringDateTime).append(":\n");
+
+		/* Try date parsing with LocalDateTime.parse */
+		try {
+			localDateTime = LocalDateTime.parse(stringDateTime);
+			dateParsed = true;
+		} catch (DateTimeParseException e) {
+			dateParsed = false;
+			parserErrors.append(e.getMessage()).append("\n");
+		}
+
+		/* If date is not parsed */
+		if (!dateParsed) {
+			/* Try with DatatypeConverter.parseDateTime */
+			try {
+				Calendar calendar = DatatypeConverter.parseDateTime(stringDateTime);
+				localDateTime = LocalDateTime.ofInstant(calendar.toInstant(), calendar.getTimeZone().toZoneId());
+				dateParsed = true;
+			} catch (IllegalArgumentException | DateTimeException e) {
+				dateParsed = false;
+				parserErrors.append(e.getMessage()).append("\n");
+			}
+		}
+
+		/* If date is not parsed, throw exception */
+		if (!dateParsed) {
+			throw new IllegalArgumentException(parserErrors.toString());
+		} else {
+			return localDateTime;
+		}
+	}
+}