Added functionality ( get models and query) for aba website

Author: “jklein94”

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/RequestController.java

@@ -73,6 +73,7 @@
 import org.tweetyproject.arg.delp.syntax.DefeasibleLogicProgram;
 import org.tweetyproject.arg.dung.reasoner.AbstractExtensionReasoner;
 import org.tweetyproject.arg.dung.semantics.Extension;
+import org.tweetyproject.web.pyargservices.aba.AbaGetSemanticsResponse;
 import org.tweetyproject.web.pyargservices.aba.AbaReasonerCalleeFactory;
 import org.tweetyproject.web.pyargservices.aba.AbaReasonerGetModelsCallee;
 import org.tweetyproject.web.pyargservices.aba.AbaReasonerPost;
@@ -91,16 +92,15 @@ public class RequestController {
 	private final int SERVICES_TIMEOUT_DELP = 600;
 	private final int SERVICES_TIMEOUT_INCMES = 300;
 
-	private AbaReasonerResponse handleQueryAbaRequest(AbaReasonerPost AbaReasonerPost){
-
-
-		return null;
-	}
-
 	@PostMapping(value = "/aba", produces = "application/json", consumes = "application/json")
 	@ResponseBody
 	public Response handleRequest(
-			@RequestBody AbaReasonerPost AbaReasonerPost) throws ParserException, IOException {
+			@RequestBody AbaReasonerPost AbaReasonerPost) throws ParserException, IOException, JSONException, org.codehaus.jettison.json.JSONException {
+
+
+			if (AbaReasonerPost.getCmd().equals("semantics")) {
+				return handleGetSemantics(AbaReasonerPost);
+			}
 
 
 			// DungTheory dungTheory =
@@ -173,8 +173,11 @@ public Response handleRequest(
 				// handle timeout
 				if (AbaReasonerPost.getCmd().equals("get_models") || AbaReasonerPost.getCmd().equals("get_model")) {
 										Future<Collection<AbaExtension<Formula>>> future = executor.submit(callee);
+
+					System.out.print("Run command: "+ AbaReasonerPost.getCmd() + " with timeout: " + user_timeout + ".....");
 					Pair<Collection<AbaExtension<Formula>>, Long> result = Utils.runServicesWithTimeout(future,
 						user_timeout, unit);
+					System.out.println("DONE!");
 						reasonerResponse.setTime(result.getValue());
 						reasonerResponse.setAnswer(result.getKey().toString());
 						reasonerResponse.setStatus("SUCCESS");
@@ -496,4 +499,31 @@ private InconsistencyGetMeasuresResponse handleGetMeasures(InconsistencyPost que
 		return response;
 	}
 
+
+	/**
+	 * Handles the "List semanctics" command for aba
+	 *
+	 * @param query some query
+	 * @return the reply
+	 * @throws JSONException                            if some JSON issue occurs.
+	 * @throws org.codehaus.jettison.json.JSONException
+	 */
+	private AbaGetSemanticsResponse handleGetSemantics(AbaReasonerPost query)
+			throws JSONException, org.codehaus.jettison.json.JSONException {
+		AbaGetSemanticsResponse response = new AbaGetSemanticsResponse();
+		List<HashMap<String, String>> value = new LinkedList<HashMap<String, String>>();
+		HashMap<String, String> jsonMes;
+		for (org.tweetyproject.web.pyargservices.aba.GeneralAbaReasonerFactory.Semantics m : GeneralAbaReasonerFactory.Semantics.values()) {
+			jsonMes = new HashMap<String, String>();
+			jsonMes.put(InconsistencyMeasurementService.JSON_ATTR_ID, m.id);
+			jsonMes.put(InconsistencyMeasurementService.JSON_ATTR_LABEL, m.label);
+			value.add(jsonMes);
+		}
+		response.setSemantics(value);
+		response.setEmail(query.getEmail());
+		response.reply(query.getCmd());
+		return response;
+	}
+
+
 }

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/RestServiceCorsApplication.java

@@ -11,6 +11,7 @@
 @SpringBootApplication
 public class RestServiceCorsApplication {
     String allowedOrigins = "http://tweetyproject.org";
+	String debug_allowedOrigins = "http://127.0.0.1:5500/";
 	public static void main(String[] args) {
 		SpringApplication.run(RestServiceCorsApplication.class, args);
 	}
@@ -23,6 +24,7 @@ public void addCorsMappings(CorsRegistry registry) {
 				registry.addMapping("/delp").allowedOrigins(allowedOrigins);
 				registry.addMapping("/ping").allowedOrigins(allowedOrigins);
 				registry.addMapping("/incmes").allowedOrigins(allowedOrigins);
+				registry.addMapping("/aba").allowedOrigins(debug_allowedOrigins);
 			}
 		};
 	}

org-tweetyproject-web/src/main/java/org/tweetyproject/web/pyargservices/aba/AbaGetSemanticsResponse.java

@@ -0,0 +1,89 @@
+package org.tweetyproject.web.pyargservices.aba;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.tweetyproject.web.pyargservices.Response;
+
+import java.util.Objects;
+
+public class AbaGetSemanticsResponse extends Response {
+    private List<HashMap<String, String>> semantics;
+    private String reply;
+    private String email;
+
+    public AbaGetSemanticsResponse() {
+    }
+
+    public AbaGetSemanticsResponse(List<HashMap<String,String>> measures, String reply, String email) {
+        this.semantics = measures;
+        this.reply = reply;
+        this.email = email;
+    }
+
+    public List<HashMap<String,String>> getSemantics() {
+        return this.semantics;
+    }
+
+    public void setSemantics(List<HashMap<String,String>> measures) {
+        this.semantics = measures;
+    }
+
+    public String getReply() {
+        return this.reply;
+    }
+
+    public void setReply(String reply) {
+        this.reply = reply;
+    }
+
+    public String getEmail() {
+        return this.email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public AbaGetSemanticsResponse measures(List<HashMap<String,String>> measures) {
+        setSemantics(measures);
+        return this;
+    }
+
+    public AbaGetSemanticsResponse reply(String reply) {
+        setReply(reply);
+        return this;
+    }
+
+    public AbaGetSemanticsResponse email(String email) {
+        setEmail(email);
+        return this;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this)
+            return true;
+        if (!(o instanceof AbaGetSemanticsResponse)) {
+            return false;
+        }
+        AbaGetSemanticsResponse inconsistencyInfoResponse = (AbaGetSemanticsResponse) o;
+        return Objects.equals(semantics, inconsistencyInfoResponse.semantics) && Objects.equals(reply, inconsistencyInfoResponse.reply) && Objects.equals(email, inconsistencyInfoResponse.email);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(semantics, reply, email);
+    }
+
+    @Override
+    public String toString() {
+        return "{" +
+            " measures='" + getSemantics() + "'" +
+            ", reply='" + getReply() + "'" +
+            ", email='" + getEmail() + "'" +
+            "}";
+    }
+
+
+}