.gitignore

@@ -81,4 +81,6 @@ Temporary Items
 .apdisk
 
 /target/
-.idea
+.idea
+/.apt_generated/
+/.apt_generated_tests/

src/main/java/ua/be/wee/controller/EnactmentControllerMVC.java

@@ -367,7 +367,6 @@ public class EnactmentControllerMVC {
 
         if (act instanceof InvokingActivity) {
             InvokingActivity invokingAct = (InvokingActivity) act;
-
             pt.setEvents(controller.getAllEventsForTrace(pt.getIri()));
 
             List<TraceArtifact> propagatedArtifacts = controller.propagateArtifactsForInvokingActivity(invokingAct, pt);

src/main/java/ua/be/wee/model/EnactmentController.java

@@ -153,30 +153,25 @@ public class EnactmentController {
 	}
 	
 	public List<TraceArtifact> propagateArtifactsForInvokingActivity(InvokingActivity invokingAct, PT pt) throws Exception {
-
 		String invokedPMIri = invokingAct.getInvokedPM();
-		PM subPm = this.getPM(invokedPMIri); // Usando o método getPM do próprio controller
+		PM subPm = this.getPM(invokedPMIri); 
 
 		List<DataOutputPort> subProcessParamPorts = nodeRepo.getParameterOutputPorts(subPm.getIri());
 
 		List<TraceArtifact> propagatedArtifacts = new ArrayList<>();
 
-		for (DataOutputPort invokerPort : invokingAct.getDataOutPorts()) {
-			
+		for (DataOutputPort invokerPort : invokingAct.getDataOutPorts()) {			
 			DataOutputPort matchedSubPort = subProcessParamPorts.stream()
 				.filter(p -> p.getName().equals(invokerPort.getName()))
 				.findFirst().orElse(null);
 
-			if (matchedSubPort != null) {
-				
+			if (matchedSubPort != null) {				
 				Artifact sourceArtifactDef = nodeRepo.getSourceArtifactForParameterOutputPort(matchedSubPort.getIri());
 
 				if (sourceArtifactDef != null) {
-
 					TraceArtifact subProcessTraceArtifact = traceRepo.findLatestTraceArtifactForDefinition(sourceArtifactDef.getIri(), pt.getEvents());
 
-					if (subProcessTraceArtifact != null) {
-						
+					if (subProcessTraceArtifact != null) {						
 						TraceArtifact propagatedArtifact = new TraceArtifact();
 						propagatedArtifact.setRelatesTo(invokerPort.getArtifact());
 						propagatedArtifact.setLocation(subProcessTraceArtifact.getLocation());
@@ -239,7 +234,6 @@ public class EnactmentController {
 	            }
 	        }
 //	        } else if (node instanceof FinalNode) {
-//                // O fim de um processo agora é detectado quando a lista de ações fica vazia.
 //	        }
 	    }
 	    return triggers;

src/main/java/ua/be/wee/model/ExecutionFlowManager.java

@@ -72,7 +72,7 @@ public class ExecutionFlowManager {
         }
 
 		arrivedInputs.add(arrivingInputIri);
-		
+
 		if (arrivedInputs.containsAll(requiredInputs)) {
 			joinSynchronizationMap.remove(joinKey);
 			return true;

src/main/java/ua/be/wee/model/repository/FusekiWrapper.java

@@ -9,8 +9,6 @@ import org.apache.jena.sparql.util.Context;
 import org.apache.jena.sparql.util.Symbol;
 import org.apache.jena.update.UpdateFactory;
 import org.apache.jena.update.UpdateRequest;
-import org.apache.jena.riot.RIOT;
-
 
 public class FusekiWrapper {
 	
@@ -19,18 +17,12 @@ public class FusekiWrapper {
 	private RDFConnectionRemoteBuilder builder;
 	
 	private String serviceURI;
-	
+
+	private static final Symbol SYM_JSON_READER_LENIENT = Symbol.create("http://jena.apache.org/riot#jsonReaderLenient");
 
 	public String getServiceURI() {
 		return serviceURI;
 	}
-	
-	// Just to prevent the Malformed Json error
-	static {
-		Symbol symJsonReaderLenient = Symbol.create("http://jena.apache.org/riot#jsonReaderLenient");
-		Context context = RIOT.getContext();
-		context.set(symJsonReaderLenient, true);
-	}
 
 	private FusekiWrapper() {
 		
@@ -50,43 +42,47 @@ public class FusekiWrapper {
 	}
 	
 	public ResultSet execQuery(String queryStr) {
-		if (!"".equals(serviceURI)) {
-			QueryExecution q = QueryExecutionHTTP.service(serviceURI, queryStr);
-			return q.execSelect();
+		if (serviceURI == null || serviceURI.isEmpty()) {
+			throw new NullPointerException("Service URI not specified");
 		}
-		throw new NullPointerException("Service URI not specified");
 		
+		QueryExecution qExec = QueryExecutionHTTP.service(serviceURI, queryStr);
+		
+		qExec.getContext().set(SYM_JSON_READER_LENIENT, true);
+		
+		return qExec.execSelect();
 	}
 	
 	public boolean updateQuery(String query) {
-		if (!"".equals(serviceURI)) {
-			try {
-				RDFConnectionFuseki conn = (RDFConnectionFuseki) builder.build();
-				UpdateRequest request = UpdateFactory.create();
-				request.add(query);
-				conn.update(request);
-				conn.close();
-				return true;
-			} catch (Exception e) {
-				e.printStackTrace();
-				return false;
-			}
-			
+		if (serviceURI == null || serviceURI.isEmpty()) {
+			throw new NullPointerException("Service URI not specified");
+		}
+		
+		try {
+			RDFConnectionFuseki conn = (RDFConnectionFuseki) builder.build();
+			UpdateRequest request = UpdateFactory.create();
+			request.add(query);
+			conn.update(request);
+			conn.close();
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
 		}
-		throw new NullPointerException("Service URI not specified");
-
 	}
 	
 	public boolean execAsk(String queryStr) {
-	    if (!"".equals(serviceURI)) {
-	        try (QueryExecution qExec = QueryExecutionHTTP.service(serviceURI, queryStr)) {
-	            return qExec.execAsk();
-	        } catch (Exception e) {
-	            e.printStackTrace();
-	            return false;
-	        }
+	    if (serviceURI == null || serviceURI.isEmpty()) {
+	        throw new NullPointerException("Service URI not specified");
+	    }
+		
+	    try (QueryExecution qExec = QueryExecutionHTTP.service(serviceURI, queryStr)) {
+			qExec.getContext().set(SYM_JSON_READER_LENIENT, true);
+	        return qExec.execAsk();
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        return false;
 	    }
-	    throw new NullPointerException("Service URI not specified");
 	}
 	
 	public boolean testEndpoint() {
@@ -94,13 +90,13 @@ public class FusekiWrapper {
 				+ "SELECT ?pm WHERE {\n"
 				+ "  ?pm a pm:Model .\n"
 				+ "}";
-		QueryExecutionHTTP service = QueryExecutionHTTP.service(serviceURI, query);
-		ResultSet execSelect;
-		try {
-			execSelect = service.execSelect();
+		
+		try (QueryExecutionHTTP service = QueryExecutionHTTP.service(serviceURI, query)) {
+			service.getContext().set(SYM_JSON_READER_LENIENT, true);
+			ResultSet execSelect = service.execSelect();
+			return execSelect.hasNext();
 		} catch (Exception e) {
 			return false;
 		}
-		return execSelect.hasNext();
 	}
 }

src/main/java/ua/be/wee/model/repository/PTRepository.java

@@ -197,7 +197,6 @@ public class PTRepository {
 	    String branchId = isHierarchical
 	        ? (parentBranchId != null ? parentBranchId : generateBranchId(pt.getIri(), null))
 	        : parentBranchId;
-
 		
 	    if (isActivityAlreadyStarted(pt, act.getIri(), branchId)) {
 	        return null; 
@@ -225,7 +224,6 @@ public class PTRepository {
 	    
 		String portiri = port.getIri();
 
-
 	    StringBuilder query = new StringBuilder();
 	    query.append("PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n")
 	         .append("PREFIX tr: <http://ua.be/sdo2l/vocabulary/formalisms/processtraces#>\n")
@@ -264,7 +262,6 @@ public class PTRepository {
 	    ev.setIri(iri);
 	    ev.setRelatesTo(port);
 	    pt.addEvent(ev);
-
 	    String tsQuery = "PREFIX tr: <http://ua.be/sdo2l/vocabulary/formalisms/processtraces#>\n"
 	            + "PREFIX owl: <http://www.w3.org/2002/07/owl#>\n"
 	            + "SELECT ?ts WHERE {\n"
@@ -443,6 +440,7 @@ public class PTRepository {
 	    }
 
 	    if (source == null) {
+
 	        String activityIRI = p.getActivity().getIri();
 	        String pmGraphIRI = activityIRI.split("#")[0];