Added default constructor

corehunter · Mar 13, 2016 · be6056e · be6056e
1 parent 7010f09
commit be6056e
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/...ervices-simple/src/main/java/org/corehunter/services/simple/FileBasedDatasetServices.java b/...ervices-simple/src/main/java/org/corehunter/services/simple/FileBasedDatasetServices.java
@@ -22,7 +22,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.rmi.server.UID;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -39,7 +38,6 @@
 
 import uno.informatics.common.io.FileType;
 import uno.informatics.data.Dataset;
-import uno.informatics.data.FeatureDataset;
 import uno.informatics.data.SimpleEntity;
 import uno.informatics.data.dataset.DatasetException;
 import uno.informatics.data.feature.array.ArrayFeatureDataset;
@@ -58,6 +56,12 @@ public class FileBasedDatasetServices implements DatasetServices {
 
     private Path path;
 
+    public FileBasedDatasetServices() throws DatasetException {
+        setPath(Paths.get(""));
+
+        initialise();
+    }
+
     public FileBasedDatasetServices(Path path) throws DatasetException {
         setPath(path);
 
@@ -68,12 +72,14 @@ public synchronized final Path getPath() {
         return path;
     }
 
-    protected synchronized final void setPath(Path path) {
+    public synchronized final void setPath(Path path) throws DatasetException {
         if (path == null) {
             throw new IllegalArgumentException("Path must be defined!");
         }
 
         this.path = path;
+
+        initialise();
     }
 
     @Override
@@ -173,6 +179,10 @@ public boolean removeDataset(String datasetId) throws DatasetException {
     @SuppressWarnings("unchecked")
     private void initialise() throws DatasetException {
         try {
+            if (!Files.exists(getPath())) {
+                Files.createDirectories(getPath());
+            }
+
             Path datasetDescriptionsPath = Paths.get(getPath().toString(), DATASET_DESCRIPTIONS);
 
             if (Files.exists(datasetDescriptionsPath)) {
@@ -195,10 +205,12 @@ private void initialise() throws DatasetException {
     private Dataset loadDataset(String datasetId) throws DatasetException {
         Dataset dataset = null;
 
-        ZipFeatureDatasetReader reader = new ZipFeatureDatasetReader(
-                Paths.get(getPath().toString(), datasetId).toFile());
+        if (datasetId != null) {
+            ZipFeatureDatasetReader reader = new ZipFeatureDatasetReader(
+                    Paths.get(getPath().toString(), datasetId).toFile());
 
-        dataset = reader.read();
+            dataset = reader.read();
+        }
 
         return dataset;
     }