changed the servlet to make use of thespecification of relevant IDataSourceType implementations as given in the config file

Olaf Hartig · Olaf Hartig · commit 5022839d7e12 · 2015-12-25T22:04:55.000+01:00
diff --git a/src/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java b/src/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java
@@ -20,11 +20,10 @@
 import org.apache.jena.riot.RDFLanguages;
 import org.linkeddatafragments.config.ConfigReader;
 import org.linkeddatafragments.datasource.DataSourceFactory;
+import org.linkeddatafragments.datasource.DataSourceTypesRegistry;
 import org.linkeddatafragments.datasource.IDataSource;
-import org.linkeddatafragments.datasource.hdt.HdtDataSourceType;
+import org.linkeddatafragments.datasource.IDataSourceType;
 import org.linkeddatafragments.datasource.index.IndexDataSource;
-import org.linkeddatafragments.datasource.tdb.JenaTDBDataSourceType;
-import org.linkeddatafragments.exceptions.DataSourceException;
 import org.linkeddatafragments.exceptions.DataSourceNotFoundException;
 import org.linkeddatafragments.fragments.FragmentRequestParserBase;
 import org.linkeddatafragments.fragments.LinkedDataFragment;
@@ -49,11 +48,6 @@ public class LinkedDataFragmentServlet extends HttpServlet {
     private final HashMap<String, IDataSource> dataSources = new HashMap<>();
     private final Collection<String> mimeTypes = new ArrayList<>();
 
-    public LinkedDataFragmentServlet() {
-        HdtDataSourceType.register();
-        JenaTDBDataSourceType.register();
-    }
-
     private File getConfigFile(ServletConfig config) throws IOException {
         String path = config.getServletContext().getRealPath("/");
         if (path == null) {
@@ -80,6 +74,13 @@ public void init(ServletConfig servletConfig) throws ServletException {
             File configFile = getConfigFile(servletConfig);
             config = new ConfigReader(new FileReader(configFile));
 
+            // register data source types
+            for ( Entry<String,IDataSourceType> typeEntry : config.getDataSourceTypes().entrySet() ) {
+                DataSourceTypesRegistry.register( typeEntry.getKey(),
+                                                  typeEntry.getValue() );
+            }
+
+            // register data sources
             for (Entry<String, JsonObject> dataSource : config.getDataSources().entrySet()) {
                 dataSources.put(dataSource.getKey(), DataSourceFactory.create(dataSource.getValue()));
             }
@@ -89,7 +90,7 @@ public void init(ServletConfig servletConfig) throws ServletException {
             mimeTypes.add(Lang.JSONLD.getHeaderString());
             mimeTypes.add(Lang.NTRIPLES.getHeaderString());
             mimeTypes.add(Lang.RDFXML.getHeaderString());
-        } catch (IOException | DataSourceException e) {
+        } catch (Exception e) {
             throw new ServletException(e);
         }
     }
