Restart server on error

Author: hvarg

server/src/main/java/org/diskproject/server/api/impl/DiskResource.java

@@ -62,17 +62,11 @@ public class DiskResource implements DiskService {
   @Context HttpServletRequest request;
   @Context SecurityContext securityContext;
 
-  DiskRepository repo;
-
-  public DiskResource() {
-    this.repo = DiskRepository.get();
-  }
-
   @GET
   @Path("server/endpoints")
   @Override
   public List<DataAdapterResponse> getEndpoints() {
-    return this.repo.getDataAdapters();
+    return DiskRepository.get().getDataAdapters();
   }
 
   /*
@@ -82,7 +76,7 @@ public List<DataAdapterResponse> getEndpoints() {
   @Path("vocabulary")
   @Override
   public Map<String, Vocabulary> getVocabularies() {
-    return this.repo.getVocabularies();
+    return DiskRepository.get().getVocabularies();
   }
 
   @GET
@@ -91,7 +85,7 @@ public Map<String, Vocabulary> getVocabularies() {
   @Override
   public String reloadVocabularies() {
     try {
-      this.repo.reloadKBCaches();
+      DiskRepository.get().reloadKBCaches();
       return "OK";
     } catch (Exception e) {
       e.printStackTrace();
@@ -114,7 +108,7 @@ private void addAuthorFromRequest (DISKResource obj, HttpServletRequest request)
 
     String username = (String) request.getAttribute("username"); //username is an email.
     if (username != null) {
-      Entity author = this.repo.getOrCreateEntity(username);
+      Entity author = DiskRepository.get().getOrCreateEntity(username);
       obj.setAuthor(author);
     }
   }
@@ -128,22 +122,22 @@ private void addAuthorFromRequest (DISKResource obj, HttpServletRequest request)
   public Goal addGoal(
       @JsonProperty("goal") Goal goal) {
     this.addAuthorFromRequest(goal, request);
-    return this.repo.addGoal(goal);
+    return DiskRepository.get().addGoal(goal);
   }
 
   @GET
   @Path("goals")
   @Override
   public List<Goal> listGoals() {
-    return this.repo.listGoals();
+    return DiskRepository.get().listGoals();
   }
 
   @GET
   @Path("goals/{id}")
   @Override
   public Goal getGoal(
       @PathParam("id") String id) {
-    return this.repo.getGoal(id);
+    return DiskRepository.get().getGoal(id);
   }
 
   @PUT
@@ -153,15 +147,15 @@ public Goal updateGoal(
       @PathParam("id") String id,
       @JsonProperty("goal") Goal goal) {
     this.addAuthorFromRequest(goal, request);
-    return this.repo.updateGoal(id, goal);
+    return DiskRepository.get().updateGoal(id, goal);
   }
 
   @DELETE
   @Path("goals/{id}")
   @Override
   public void deleteGoal(
       @PathParam("id") String id) {
-    this.repo.removeGoal(id);
+    DiskRepository.get().removeGoal(id);
   }
 
   @GET
@@ -173,7 +167,7 @@ public List<TriggeredLOI> queryGoal(
     response.setContentType("application/json");
     response.setCharacterEncoding("utf-8");
     try {
-      return this.repo.queryGoal(id);
+      return DiskRepository.get().queryGoal(id);
     } catch (NotFoundException e) {
       try {
         ErrorMessage error = new ErrorMessage(e.getMessage());
@@ -222,22 +216,22 @@ public List<TriggeredLOI> queryGoal(
   public LineOfInquiry addLOI(
       @JsonProperty("loi") LineOfInquiry loi) {
     this.addAuthorFromRequest(loi, request);
-    return this.repo.addLOI(loi);
+    return DiskRepository.get().addLOI(loi);
   }
 
   @GET
   @Path("lois")
   @Override
   public List<LineOfInquiry> listLOIs() {
-    return this.repo.listLOIs();
+    return DiskRepository.get().listLOIs();
   }
 
   @GET
   @Path("lois/{id}")
   @Override
   public LineOfInquiry getLOI(
       @PathParam("id") String id) {
-    return this.repo.getLOI(id);
+    return DiskRepository.get().getLOI(id);
   }
 
   @PUT
@@ -247,15 +241,15 @@ public LineOfInquiry updateLOI(
       @PathParam("id") String id,
       @JsonProperty("loi") LineOfInquiry loi) {
     this.addAuthorFromRequest(loi, request);
-    return this.repo.updateLOI(id, loi);
+    return DiskRepository.get().updateLOI(id, loi);
   }
 
   @DELETE
   @Path("lois/{id}")
   @Override
   public void deleteLOI(
       @PathParam("id") String id) {
-    this.repo.removeLOI(id);
+    DiskRepository.get().removeLOI(id);
   }
 
   /*
@@ -266,7 +260,7 @@ public void deleteLOI(
   @Override
   public TriggeredLOI addTriggeredLOI(
       @JsonProperty("tloi") TriggeredLOI tloi) {
-    return this.repo.addTriggeredLOI(tloi);
+    return DiskRepository.get().addTriggeredLOI(tloi);
   }
 
   @PUT
@@ -276,30 +270,30 @@ public TriggeredLOI updateTLOI(
       @PathParam("id") String id,
       @JsonProperty("tloi") TriggeredLOI tloi) {
     this.addAuthorFromRequest(tloi, request);
-    return this.repo.updateTriggeredLOI(id, tloi);
+    return DiskRepository.get().updateTriggeredLOI(id, tloi);
   }
 
   @GET
   @Path("tlois")
   @Override
   public List<TriggeredLOI> listTriggeredLOIs() {
-    return this.repo.listTriggeredLOIs();
+    return DiskRepository.get().listTriggeredLOIs();
   }
 
   @GET
   @Path("tlois/{id}")
   @Override
   public TriggeredLOI getTriggeredLOI(
       @PathParam("id") String id) {
-    return this.repo.getTriggeredLOI(id);
+    return DiskRepository.get().getTriggeredLOI(id);
   }
 
   @DELETE
   @Path("tlois/{id}")
   @Override
   public void deleteTriggeredLOI(
       @PathParam("id") String id) {
-    this.repo.removeTriggeredLOI(id);
+    DiskRepository.get().removeTriggeredLOI(id);
   }
 
   /*
@@ -311,7 +305,7 @@ public void deleteTriggeredLOI(
   public List<WorkflowTemplateResponse> listWorkflows() {
     Gson response_error = new Gson();
     try {
-      return this.repo.methodAdapters.getWorkflowList();
+      return DiskRepository.get().methodAdapters.getWorkflowList();
     } catch (Exception e) {
       try {
         // Create Json error response
@@ -339,7 +333,7 @@ public List<WorkflowTemplateResponse> listWorkflows() {
   public List<WorkflowVariable> getWorkflowVariables(
       @PathParam("source") String source,
       @PathParam("id") String id) {
-    return this.repo.methodAdapters.getWorkflowVariablesByName(source, id);
+    return DiskRepository.get().methodAdapters.getWorkflowVariablesByName(source, id);
   }
 
   @GET
@@ -348,7 +342,7 @@ public List<WorkflowVariable> getWorkflowVariables(
   public Execution monitorWorkflow(
       @PathParam("source") String source,
       @PathParam("id") String id) {
-    return this.repo.getWorkflowRunStatus(source, id);
+    return DiskRepository.get().getWorkflowRunStatus(source, id);
   }
 
   @GET
@@ -360,7 +354,7 @@ public Map<String, List<String>> queryExternalStore(
       @QueryParam("query") String query) {
     try {
       // return WingsAdapter.get().getWorkflowList();
-      return repo.queryExternalStore(endpoint, query, variables);
+      return DiskRepository.get().queryExternalStore(endpoint, query, variables);
     } catch (Exception e) {
       try {
         // Create Json error response
@@ -390,15 +384,15 @@ public Map<String, List<String>> queryExternalStore(
   @Path("questions")
   @Override
   public List<Question> listQuestions() {
-    return this.repo.listHypothesesQuestions();
+    return DiskRepository.get().listHypothesesQuestions();
   }
 
   @POST
   @Path("question/options")
   public Map<String, List<VariableOption>> listDynamicOptions(
       @JsonProperty("config") QuestionOptionsRequest opts) {
     try {
-      return this.repo.listDynamicOptions(opts);
+      return DiskRepository.get().listDynamicOptions(opts);
     } catch (Exception e) {
       try {
         e.printStackTrace();
@@ -431,7 +425,7 @@ public Map<String, List<VariableOption>> listDynamicOptions(
   public List<TriggeredLOI> getExecutions(
       @PathParam("hid") String hid,
       @PathParam("lid") String lid) {
-    return this.repo.getTLOIsForHypothesisAndLOI(hid, lid);
+    return DiskRepository.get().getTLOIsForHypothesisAndLOI(hid, lid);
   }
 
   @GET
@@ -441,7 +435,7 @@ public List<TriggeredLOI> runHypothesisAndLOI(
       @PathParam("hid") String hid,
       @PathParam("lid") String lid) {
     try {
-      return this.repo.runHypothesisAndLOI(hid, lid);
+      return DiskRepository.get().runHypothesisAndLOI(hid, lid);
     } catch (Exception e) {
       try {
         // Create Json error response
@@ -469,7 +463,7 @@ public List<TriggeredLOI> runHypothesisAndLOI(
   @Override
   public Boolean runHypotheses() {
     try {
-      return this.repo.runAllHypotheses();
+      return DiskRepository.get().runAllHypotheses();
     } catch (Exception e) {
       try {
         // Create Json error response
@@ -496,7 +490,7 @@ public Boolean runHypotheses() {
   @Path("getData")
   @Override
   public Response getOutputData(@JsonProperty("request") ExternalDataRequest r) {
-    FileAndMeta result = this.repo.getOutputData(r.getSource(), r.getDataId());
+    FileAndMeta result = DiskRepository.get().getOutputData(r.getSource(), r.getDataId());
     if (result == null) {
       ResponseBuilder rBuilder = Response.status(Response.Status.NOT_FOUND);
       return rBuilder.type(MediaType.TEXT_PLAIN)
@@ -513,7 +507,7 @@ public Response getOutputData(@JsonProperty("request") ExternalDataRequest r) {
   @Override
   public Response getOntologyAll() {
     try {
-      FileAndMeta all = this.repo.getOntologyAll();
+      FileAndMeta all = DiskRepository.get().getOntologyAll();
       ResponseBuilder rBuild = Response.ok(all.data, all.contentType);
       return rBuild.build();
     } catch (Exception e) {

server/src/main/java/org/diskproject/server/repository/DiskRepository.java

@@ -87,7 +87,12 @@ public static void main(String[] args) {
     public static DiskRepository get() {
         if (!creatingKB && singleton == null) {
             creatingKB = true;
-            singleton = new DiskRepository();
+            try {
+                singleton = new DiskRepository();
+            } catch (Exception e) {
+                System.err.println("Error while creating DISK Repository. Could not connect with one or more services.");
+                e.printStackTrace();
+            }
             creatingKB = false;
         }
         return singleton;