replaced the fixed data source types by a registry of such types

Author: Olaf Hartig

src/org/linkeddatafragments/datasource/DataSourceFactory.java

@@ -1,20 +1,16 @@
 package org.linkeddatafragments.datasource;
 
 import com.google.gson.JsonObject;
-import java.io.File;
-import java.io.IOException;
 import org.linkeddatafragments.exceptions.DataSourceException;
 import org.linkeddatafragments.exceptions.UnknownDataSourceTypeException;
 
 /**
  *
  * @author Miel Vander Sande
  * @author Bart Hanssens
+ * @author <a href="http://olafhartig.de">Olaf Hartig</a>
  */
 public class DataSourceFactory {
-    public final static String HDT = "HdtDatasource";
-    public final static String JENA_TDB = "JenaTDBDatasource";
-
     /**
      * Create a datasource using a JSON config
      * 
@@ -25,28 +21,15 @@ public class DataSourceFactory {
     public static IDataSource create(JsonObject config) throws DataSourceException {
         String title = config.getAsJsonPrimitive("title").getAsString();
         String description = config.getAsJsonPrimitive("description").getAsString();
-        String type = config.getAsJsonPrimitive("type").getAsString();
+        String typeName = config.getAsJsonPrimitive("type").getAsString();
 
         JsonObject settings = config.getAsJsonObject("settings");
 
-        switch (type) {
-            case HDT:
-                try {
-                    File file = new File(settings.getAsJsonPrimitive("file").getAsString());
-                    return new HdtDataSource(title, description, file.getAbsolutePath());
-                } catch (IOException ex) {
-                    throw new DataSourceException(ex);
-                }
-                
-            case JENA_TDB:                
-                File file = new File(settings.getAsJsonPrimitive("directory").getAsString());
-                return new JenaTDBDataSource(title, description, file);
-                
-            default:
-                throw new UnknownDataSourceTypeException(type);
-
-        }
+        final IDataSourceType type = DataSourceTypesRegistry.getType(typeName);
+        if ( type == null )
+            throw new UnknownDataSourceTypeException(typeName);
 
+        return type.createDataSource( title, description, settings );
     }
 
 }

src/org/linkeddatafragments/servlet/TriplePatternFragmentServlet.java

@@ -31,8 +31,10 @@
 import org.apache.jena.riot.RDFLanguages;
 import org.linkeddatafragments.config.ConfigReader;
 import org.linkeddatafragments.datasource.DataSourceFactory;
+import org.linkeddatafragments.datasource.HdtDataSourceType;
 import org.linkeddatafragments.datasource.IDataSource;
 import org.linkeddatafragments.datasource.IndexDataSource;
+import org.linkeddatafragments.datasource.JenaTDBDataSourceType;
 import org.linkeddatafragments.datasource.TriplePatternFragment;
 import org.linkeddatafragments.exceptions.DataSourceException;
 import org.linkeddatafragments.util.CommonResources;
@@ -64,6 +66,11 @@ public class TriplePatternFragmentServlet extends HttpServlet {
     private final HashMap<String, IDataSource> dataSources = new HashMap<>();
     private final Collection<String> mimeTypes = new ArrayList<>();
 
+    public TriplePatternFragmentServlet() {
+        HdtDataSourceType.register();
+        JenaTDBDataSourceType.register();
+    }
+
     private File getConfigFile(ServletConfig config) throws IOException {
         String path = config.getServletContext().getRealPath("/");
         if (path == null) {

src/test/java/org/linkeddatafragments/datasource/JenaTDBDataSourceTest.java

@@ -20,6 +20,7 @@
 import org.junit.Test;
 import org.linkeddatafragments.datasource.DataSourceFactory;
 import org.linkeddatafragments.datasource.IDataSource;
+import org.linkeddatafragments.datasource.JenaTDBDataSourceType;
 import org.linkeddatafragments.datasource.TriplePatternFragment;
 
 /**
@@ -35,6 +36,8 @@ public class JenaTDBDataSourceTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
+        JenaTDBDataSourceType.register();
+
         String tmpdir = System.getProperty("java.io.tmpdir");
         jena = new File(tmpdir, "ldf-jena-test");
         jena.mkdir();
@@ -44,7 +47,7 @@ public static void setUpClass() throws Exception {
         JsonObject config = new JsonObject();
         config.addProperty("title", "jena test");
         config.addProperty("description", "jena tdb test");
-        config.addProperty("type", DataSourceFactory.JENA_TDB);
+        config.addProperty("type", JenaTDBDataSourceType.TYPE_NAME);
 
         JsonObject settings = new JsonObject();
         settings.addProperty("directory", jena.getAbsolutePath());