removed static code for registering the existing data source types

Author: Olaf Hartig

src/org/linkeddatafragments/datasource/hdt/HdtDataSourceType.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.linkeddatafragments.datasource.DataSourceTypesRegistry;
 import org.linkeddatafragments.datasource.IDataSource;
 import org.linkeddatafragments.datasource.IDataSourceType;
 import org.linkeddatafragments.exceptions.DataSourceException;
@@ -17,15 +16,6 @@
  */
 public class HdtDataSourceType implements IDataSourceType
 {
-    public static final String TYPE_NAME = "HdtDatasource";
-
-    public static void register() {
-        if ( ! DataSourceTypesRegistry.isRegistered(TYPE_NAME) ) {
-            DataSourceTypesRegistry.register( TYPE_NAME,
-                                              new HdtDataSourceType() );
-        }
-    }
-
     @Override
     public IDataSource createDataSource( final String title,
                                          final String description,

src/org/linkeddatafragments/datasource/tdb/JenaTDBDataSourceType.java

@@ -2,7 +2,6 @@
 
 import java.io.File;
 
-import org.linkeddatafragments.datasource.DataSourceTypesRegistry;
 import org.linkeddatafragments.datasource.IDataSource;
 import org.linkeddatafragments.datasource.IDataSourceType;
 import org.linkeddatafragments.exceptions.DataSourceException;
@@ -17,15 +16,6 @@
  */
 public class JenaTDBDataSourceType implements IDataSourceType
 {
-    public static final String TYPE_NAME = "JenaTDBDatasource";
-
-    public static void register() {
-        if ( ! DataSourceTypesRegistry.isRegistered(TYPE_NAME) ) {
-            DataSourceTypesRegistry.register( TYPE_NAME,
-                                              new JenaTDBDataSourceType() );
-        }
-    }
-
     @Override
     public IDataSource createDataSource( final String title,
                                          final String description,

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

@@ -7,6 +7,7 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.linkeddatafragments.datasource.DataSourceFactory;
+import org.linkeddatafragments.datasource.DataSourceTypesRegistry;
 import org.linkeddatafragments.datasource.hdt.HdtDataSourceType;
 import org.rdfhdt.hdt.enums.RDFNotation;
 import org.rdfhdt.hdt.hdt.HDT;
@@ -24,7 +25,11 @@ public class HdtDataSourceTest extends DataSourceTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        HdtDataSourceType.register();
+        final String typeName = "HdtTestSourceType";
+        if ( ! DataSourceTypesRegistry.isRegistered(typeName) ) {
+            DataSourceTypesRegistry.register( typeName, new HdtDataSourceType() );
+        }
+
         // HDT does not seem to support an InputReader, so write to temp file
         File temp = getResourceAsFile();
 
@@ -37,8 +42,7 @@ public static void setUpClass() throws Exception {
         temp.getAbsoluteFile().delete();
 
         // Everything is in place, now create the LDF datasource
-        JsonObject config = createConfig("hdt test", "hdt test", 
-                HdtDataSourceType.TYPE_NAME);
+        JsonObject config = createConfig("hdt test", "hdt test", typeName);
 
         JsonObject settings = new JsonObject();
         settings.addProperty("file", hdtfile.getAbsolutePath());

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

@@ -19,6 +19,7 @@
 import org.junit.BeforeClass;
 
 import org.linkeddatafragments.datasource.DataSourceFactory;
+import org.linkeddatafragments.datasource.DataSourceTypesRegistry;
 import org.linkeddatafragments.datasource.tdb.JenaTDBDataSourceType;
 
 /**
@@ -31,7 +32,11 @@ public class JenaTDBDataSourceTest extends DataSourceTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        JenaTDBDataSourceType.register();
+        final String typeName = "JenaSourceType";
+        if ( ! DataSourceTypesRegistry.isRegistered(typeName) ) {
+            DataSourceTypesRegistry.register( typeName,
+                                              new JenaTDBDataSourceType() );
+        }
 
         String tmpdir = System.getProperty("java.io.tmpdir");
         jena = new File(tmpdir, "ldf-jena-test");
@@ -46,7 +51,7 @@ public static void setUpClass() throws Exception {
 
         // Everything is in place, now create the LDF datasource                
         JsonObject config = createConfig("jena tdb test", "jena tdb test",
-                                                    JenaTDBDataSourceType.TYPE_NAME);
+                                         typeName);
 
         JsonObject settings = new JsonObject();
         settings.addProperty("directory", jena.getAbsolutePath());