Repository initialization moved to fitlayout core

Author: radkovo

FitLayoutWebService/src/main/java/cz/vutbr/fit/layout/web/services/AdminResource.java

@@ -5,18 +5,13 @@
  */
 package cz.vutbr.fit.layout.web.services;
 
-import java.io.IOException;
-import java.util.Scanner;
-
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.core.Response;
 
 import org.eclipse.rdf4j.model.Value;
 import org.eclipse.rdf4j.model.vocabulary.RDF;
-import org.eclipse.rdf4j.repository.RepositoryException;
-import org.eclipse.rdf4j.rio.RDFParseException;
 
 import cz.vutbr.fit.layout.ontology.BOX;
 import cz.vutbr.fit.layout.web.data.ResultErrorMessage;
@@ -30,8 +25,6 @@
 @Path("admin")
 public class AdminResource
 {
-    private static String[] owls = new String[] {"render.owl", "segmentation.owl", "fitlayout.owl", "mapping.owl"};
-
     @Inject
     private StorageService storage;
 
@@ -51,33 +44,10 @@ public Response checkRepo()
     @Path("/initRepo")
     public Response initRepo()
     {
-        int cnt = 0;
-        //load the ontologies
-        for (String owl : owls)
-        {
-            String owlFile = loadResource("/rdf/" + owl);
-            try
-            {
-                storage.getStorage().importXML(owlFile);
-                cnt++;
-            } catch (RDFParseException e) {
-                return Response.serverError().entity(new ResultErrorMessage(e.getMessage())).build();
-            } catch (RepositoryException e) {
-                return Response.serverError().entity(new ResultErrorMessage(e.getMessage())).build();
-            } catch (IOException e) {
-                return Response.serverError().entity(new ResultErrorMessage(e.getMessage())).build();
-            }
-        }
-        return Response.ok(new ResultValue(cnt)).build();
-    }
-    
-    private static String loadResource(String filePath)
-    {
-        try (Scanner scanner = new Scanner(AdminResource.class.getResourceAsStream(filePath), "UTF-8")) {
-            scanner.useDelimiter("\\A");
-            return scanner.next();
-        }
+        if (storage.getArtifactRepository().isInitialized())
+            return Response.ok(new ResultValue("ok")).build();
+        else
+            return Response.serverError().entity("error during repository initialization").build();
     }
-
 
 }