Added default mimeType

Author: Miel Vander Sande

src/org/linkeddatafragments/servlet/TriplePatternFragmentServlet.java

@@ -27,6 +27,7 @@
 import org.linkeddatafragments.datasource.tdb.JenaTDBDataSourceType;
 import org.linkeddatafragments.exceptions.DataSourceException;
 import org.linkeddatafragments.exceptions.DataSourceNotFoundException;
+import org.linkeddatafragments.exceptions.NoRegisteredMimeTypesException;
 import org.linkeddatafragments.fragments.LinkedDataFragment;
 import org.linkeddatafragments.fragments.LinkedDataFragmentRequest;
 import org.linkeddatafragments.fragments.LinkedDataFragmentRequestBase;
@@ -87,10 +88,10 @@ public void init(ServletConfig servletConfig) throws ServletException {
             }
 
             // register content types
-            mimeTypes.add(Lang.TTL.getHeaderString());
-            mimeTypes.add(Lang.JSONLD.getHeaderString());
-            mimeTypes.add(Lang.NTRIPLES.getHeaderString());
-            mimeTypes.add(Lang.RDFXML.getHeaderString());
+            MIMEParse.register(Lang.TTL.getHeaderString());
+            MIMEParse.register(Lang.JSONLD.getHeaderString());
+            MIMEParse.register(Lang.NTRIPLES.getHeaderString());
+            MIMEParse.register(Lang.RDFXML.getHeaderString());
         } catch (IOException | DataSourceException e) {
             throw new ServletException(e);
         }
@@ -152,7 +153,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
             output.add( fragment.getControls() );
 
             // do conneg
-            String bestMatch = MIMEParse.bestMatch(mimeTypes, request.getHeader("Accept"));
+            String bestMatch = MIMEParse.bestMatch(request.getHeader("Accept"));
             Lang contentType = RDFLanguages.contentTypeToLang(bestMatch);
 
             // serialize the output
@@ -161,7 +162,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
             response.setCharacterEncoding("utf-8");
 
             RDFDataMgr.write(response.getOutputStream(), output, contentType);
-        } catch (IOException e) {
+        } catch (IOException | NoRegisteredMimeTypesException e) {
             throw new ServletException(e);
         } catch (DataSourceNotFoundException ex) {
             try {

src/org/linkeddatafragments/util/MIMEParse.java

@@ -1,5 +1,7 @@
 package org.linkeddatafragments.util;
 
+import org.linkeddatafragments.exceptions.NoRegisteredMimeTypesException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -24,10 +26,21 @@
  * http://code.google.com/p/mimeparse/
  * 
  * Ported by Tom Zellman <tzellman@gmail.com>.
+ * Extended by Miel Vander Sande <miel.vandersande@ugent.be>
  * 
  */
 public final class MIMEParse
 {
+    private final static List<String> mimeTypes = new ArrayList<>();
+    
+    /**
+     * Register mimeType in collection
+     * @param mimeType 
+     */
+    public static void register(String mimeType) {
+        mimeTypes.add(mimeType);
+    }
+    
 
     /**
      * Parse results container
@@ -233,8 +246,11 @@ public static float quality(String mimeType, String ranges)
      * @param header
      * @return
      */
-    public static String bestMatch(Collection<String> supported, String header)
+    public static String bestMatch(List<String> supported, String header) throws NoRegisteredMimeTypesException
     {
+        if (supported.isEmpty())
+            throw new NoRegisteredMimeTypesException();
+        
         List<ParseResults> parseResults = new LinkedList<ParseResults>();
         List<FitnessAndQuality> weightedMatches = new LinkedList<FitnessAndQuality>();
         for (String r : StringUtils.split(header, ','))
@@ -251,8 +267,12 @@ public static String bestMatch(Collection<String> supported, String header)
 
         FitnessAndQuality lastOne = weightedMatches
                 .get(weightedMatches.size() - 1);
-        return NumberUtils.compare(lastOne.quality, 0) != 0 ? lastOne.mimeType
-                : "";
+        return NumberUtils.compare(lastOne.quality, 0) != 0 ? lastOne.mimeType : supported.get(0);
+    }
+    
+    public static String bestMatch(String header) throws NoRegisteredMimeTypesException
+    {
+        return bestMatch(mimeTypes, header);
     }
 
     // hidden