From afa69cef86bf287e471c9551c164a6fe47c9eaa3 Mon Sep 17 00:00:00 2001
From: Pieter Heyvaert <pheyvaer.heyvaert@ugent.be>
Date: Thu, 16 Aug 2018 14:37:39 +0200
Subject: [PATCH] Hotfix/bug 64

---
 CHANGELOG.md                                |  8 ++++++++
 buildNumber.properties                      |  4 ++--
 pom.xml                                     |  2 +-
 src/main/java/be/ugent/rml/MyFileUtils.java | 12 ++++++++++--
 src/main/java/be/ugent/rml/Utils.java       |  2 +-
 src/main/java/be/ugent/rml/cli/Main.java    | 10 ++++++----
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a4c7e09..faeaac08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - support for SPARQL endpoints
 - support for TPF servers
 
+## [0.2.1] - 2018-08-14
+
+### Fixed
+
+- Create valid temp file for prepackaged functions jars
+- Use GrelProcessor.class by default instead of GrelFunctions.jar
+
 ## [0.2.0] - 2018-08-09
 
 ### Added
@@ -67,6 +74,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - support for accessing remote files (via HTTP GET)
 - basic support for functions
 
+[0.2.1]: https://github.com/RMLio/rmlmapper-java/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/RMLio/rmlmapper-java/compare/v0.1.6...v0.2.0
 [0.1.6]: https://github.com/RMLio/rmlmapper-java/compare/v0.1.5...v0.1.6
 [0.1.5]: https://github.com/RMLio/rmlmapper-java/compare/v0.1.4...v0.1.5
diff --git a/buildNumber.properties b/buildNumber.properties
index a7443507..d0201df9 100644
--- a/buildNumber.properties
+++ b/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Thu Aug 09 14:40:24 CEST 2018
-buildNumber0=32
+#Tue Aug 14 10:23:00 CEST 2018
+buildNumber0=40
diff --git a/pom.xml b/pom.xml
index 2c1d51fb..1dba7fb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>be.ugent.rml</groupId>
     <artifactId>rmlmapper</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <junit.version>4.12</junit.version>
diff --git a/src/main/java/be/ugent/rml/MyFileUtils.java b/src/main/java/be/ugent/rml/MyFileUtils.java
index ba841a07..2d2fef30 100644
--- a/src/main/java/be/ugent/rml/MyFileUtils.java
+++ b/src/main/java/be/ugent/rml/MyFileUtils.java
@@ -1,6 +1,7 @@
 package be.ugent.rml;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -42,6 +43,7 @@ public static class ClasspathResourceFileResource implements FileResource {
 
         private ClassLoader cl;
         private String resource;
+        private String extension;
 
         /**
          * @param cl
@@ -50,6 +52,7 @@ public static class ClasspathResourceFileResource implements FileResource {
         ClasspathResourceFileResource(ClassLoader cl, String resource) {
             this.cl = cl;
             this.resource = resource;
+            this.extension = FilenameUtils.getExtension(resource);
         }
 
         /**
@@ -57,13 +60,18 @@ public static class ClasspathResourceFileResource implements FileResource {
          * @throws IOException
          */
         public File getFile() throws IOException {
+            String suffix = "temp";
+
+            if (this.extension != null) {
+                suffix += "." + this.extension;
+            }
+
             InputStream cpResource = cl.getResourceAsStream(resource);
-            File tmpFile = File.createTempFile("file", "temp");
+            File tmpFile = File.createTempFile("file", suffix);
             FileUtils.copyInputStreamToFile(cpResource, tmpFile);
             tmpFile.deleteOnExit();
             return tmpFile;
         }
-
     }
 
     public static class URLClassLoaderFileResource implements FileResource {
diff --git a/src/main/java/be/ugent/rml/Utils.java b/src/main/java/be/ugent/rml/Utils.java
index f2210921..46319256 100644
--- a/src/main/java/be/ugent/rml/Utils.java
+++ b/src/main/java/be/ugent/rml/Utils.java
@@ -389,7 +389,7 @@ private static String getNTripleOfQuad(Quad q) {
     }
 
     private static String getNQuadOfQuad(Quad q) {
-        return q.getSubject() + " " + q.getPredicate() + " " + q.getObject() + "" + q.getGraph() + ".";
+        return q.getSubject() + " " + q.getPredicate() + " " + q.getObject() + " " + q.getGraph() + ".";
     }
 
     public static String encodeURI(String url) {
diff --git a/src/main/java/be/ugent/rml/cli/Main.java b/src/main/java/be/ugent/rml/cli/Main.java
index c0d77af8..abbd8ca5 100644
--- a/src/main/java/be/ugent/rml/cli/Main.java
+++ b/src/main/java/be/ugent/rml/cli/Main.java
@@ -2,6 +2,7 @@
 
 import be.ugent.rml.*;
 import be.ugent.rml.functions.FunctionLoader;
+import be.ugent.rml.functions.lib.GrelProcessor;
 import be.ugent.rml.records.RecordsFactory;
 import be.ugent.rml.store.Quad;
 import be.ugent.rml.store.QuadStore;
@@ -14,9 +15,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 public class Main {
 
@@ -84,7 +83,10 @@ public static void main(String [] args) {
                     FunctionLoader functionLoader = new FunctionLoader(functionFile);
                     executor = new Executor(rmlStore, factory, functionLoader);
                 } else {
-                    executor = new Executor(rmlStore, factory);
+                    Map<String, Class> libraryMap = new HashMap<>();
+                    libraryMap.put("GrelFunctions", GrelProcessor.class);
+                    FunctionLoader functionLoader = new FunctionLoader(null, null, libraryMap);
+                    executor = new Executor(rmlStore, factory, functionLoader);
                 }
 
                 List<Term> triplesMaps = new ArrayList<>();