Merge pull request LinkedDataFragments#1 from LinkedDataFragments/master

Catch up with changes in upstream repo

Author: larsgsvensson

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.linkeddatafragments</groupId>
     <artifactId>ldfserver</artifactId>
-    <version>0.2.1</version>
+    <version>0.2.2</version>
     <packaging>war</packaging>
     <name>Linked Data Fragments Server</name>
     <url>http://linkeddatafragments.org</url>
@@ -20,7 +20,7 @@
     <scm>
         <connection>https://github.com/LinkedDataFragments/Server.Java.git</connection>
         <developerConnection>https://github.com/LinkedDataFragments/Server.Java.git</developerConnection>
-        <tag>v0.2.1</tag>
+        <tag>v0.2.2</tag>
         <url>https://github.com/LinkedDataFragments/Server.Java</url>
     </scm>
     <developers>
@@ -38,7 +38,7 @@
             <name>Miel Vander Sande</name>
             <email>[email protected]</email>
             <url>http://semweb.mmlab.be</url>
-            <organization>iMinds</organization>
+            <organization>imec</organization>
             <organizationUrl>http://imec.be</organizationUrl>
             <timezone>Europe/Brussels</timezone>
         </developer>
@@ -54,18 +54,18 @@
         </contributor>
     </contributors>
     <properties>
-        <jettyVersion>9.3.6.v20151106</jettyVersion>
+        <jettyVersion>9.4.9.v20180320</jettyVersion>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-core</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-arq</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.3.2</version>
+            <version>3.4</version>
             <type>jar</type>
         </dependency>
         <dependency>
@@ -113,7 +113,7 @@
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-tdb</artifactId>
-            <version>3.0.0</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.rdfhdt</groupId>
@@ -125,6 +125,16 @@
             <artifactId>freemarker</artifactId>
             <version>2.3.25-incubating</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.21</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.10</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java

@@ -4,6 +4,7 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -13,6 +14,8 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.http.HttpHeaders;
 import org.apache.jena.riot.Lang;
 import org.linkeddatafragments.config.ConfigReader;
 import org.linkeddatafragments.datasource.DataSourceFactory;
@@ -94,10 +97,10 @@ public void init(ServletConfig servletConfig) throws ServletException {
 
             // register content types
             MIMEParse.register("text/html");
-            MIMEParse.register(Lang.TTL.getHeaderString());
-            MIMEParse.register(Lang.JSONLD.getHeaderString());
-            MIMEParse.register(Lang.NTRIPLES.getHeaderString());
             MIMEParse.register(Lang.RDFXML.getHeaderString());
+            MIMEParse.register(Lang.NTRIPLES.getHeaderString());
+            MIMEParse.register(Lang.JSONLD.getHeaderString());
+            MIMEParse.register(Lang.TTL.getHeaderString());
         } catch (Exception e) {
             throw new ServletException(e);
         }
@@ -158,13 +161,14 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
         ILinkedDataFragment fragment = null;
         try {
             // do conneg
-            String bestMatch = MIMEParse.bestMatch(request.getHeader("Accept"));
+            String acceptHeader = request.getHeader(HttpHeaders.ACCEPT);
+            String bestMatch = MIMEParse.bestMatch(acceptHeader);
 
             // set additional response headers
-            response.setHeader("Server", "Linked Data Fragments Server");
+            response.setHeader(HttpHeaders.SERVER, "Linked Data Fragments Server");
             response.setContentType(bestMatch);
-            response.setCharacterEncoding("utf-8");
-            
+            response.setCharacterEncoding(StandardCharsets.UTF_8.name());
+
             // create a writer depending on the best matching mimeType
             ILinkedDataFragmentWriter writer = LinkedDataFragmentWriterFactory.create(config.getPrefixes(), dataSources, bestMatch);
 
@@ -178,7 +182,6 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
 
                 fragment = dataSource.getRequestProcessor()
                                   .createRequestedFragment( ldfRequest );
-
                 writer.writeFragment(response.getOutputStream(), dataSource, fragment, ldfRequest);
 
             } catch (DataSourceNotFoundException ex) {
@@ -189,11 +192,13 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
                     throw new ServletException(ex1);
                 }
             } catch (Exception e) {
+                e.printStackTrace();
                 response.setStatus(500);
                 writer.writeError(response.getOutputStream(), e);
             }
 
         } catch (Exception e) {
+            e.printStackTrace();
             throw new ServletException(e);
         }
         finally {

src/main/java/org/linkeddatafragments/util/MIMEParse.java

@@ -264,8 +264,11 @@ public static String bestMatch(List<String> supported, String header) throws NoR
 
         List<ParseResults> parseResults = new LinkedList<ParseResults>();
         List<FitnessAndQuality> weightedMatches = new LinkedList<FitnessAndQuality>();
-        for (String r : StringUtils.split(header, ','))
-            parseResults.add(parseMediaRange(r));
+        for (String r : StringUtils.split(header, ',')) {
+            try {
+                parseResults.add(parseMediaRange(r));
+            } catch (Exception ex) {} // Fail silently on malformed media type and omit from list.
+        }
 
         for (String s : supported)
         {
@@ -274,10 +277,13 @@ public static String bestMatch(List<String> supported, String header) throws NoR
             fitnessAndQuality.mimeType = s;
             weightedMatches.add(fitnessAndQuality);
         }
-        Collections.sort(weightedMatches);
 
+
+
+        Collections.sort(weightedMatches);
         FitnessAndQuality lastOne = weightedMatches
                 .get(weightedMatches.size() - 1);
+
         return NumberUtils.compare(lastOne.quality, 0) != 0 ? lastOne.mimeType : supported.get(0);
     }
 

src/main/java/org/linkeddatafragments/views/RdfWriterImpl.java

@@ -5,6 +5,8 @@
 import java.util.Map;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
+
+import org.apache.jena.query.ARQ;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.riot.Lang;
@@ -26,6 +28,7 @@ class RdfWriterImpl extends LinkedDataFragmentWriterBase implements ILinkedDataF
     public RdfWriterImpl(Map<String, String> prefixes, HashMap<String, IDataSource> datasources, String mimeType) {
         super(prefixes, datasources);
         this.contentType = RDFLanguages.contentTypeToLang(mimeType);
+        ARQ.init();
     }
 
     @Override
@@ -47,7 +50,6 @@ public void writeFragment(ServletOutputStream outputStream, IDataSource datasour
         output.add(fragment.getMetadata());
         output.add(fragment.getTriples());
         output.add(fragment.getControls());
-
         RDFDataMgr.write(outputStream, output, contentType);
     }