Skip to content

Commit 955dc47

Browse files
author
Noa Campos
committed
Update test files to use ERMR URL as environment variable
1 parent 77b5c7a commit 955dc47

36 files changed

+147
-123
lines changed

‎btm1.tlog‎

0 Bytes
Binary file not shown.

‎src/main/java/eu/pericles/processcompiler/cli/CommandlineInterface.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,7 @@
44
import java.io.IOException;
55
import java.net.URL;
66

7-
import net.sourceforge.argparse4j.ArgumentParsers;
8-
import net.sourceforge.argparse4j.inf.ArgumentParser;
9-
import net.sourceforge.argparse4j.inf.ArgumentParserException;
10-
import net.sourceforge.argparse4j.inf.Namespace;
11-
import net.sourceforge.argparse4j.inf.Subparser;
12-
137
import org.apache.commons.io.FileUtils;
14-
import org.eclipse.jetty.server.Server;
15-
import org.eclipse.jetty.servlet.DefaultServlet;
16-
import org.eclipse.jetty.servlet.ServletContextHandler;
17-
import org.eclipse.jetty.servlet.ServletHolder;
18-
import org.glassfish.jersey.servlet.ServletContainer;
198

209
import com.fasterxml.jackson.annotation.JsonAnySetter;
2110
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -33,6 +22,11 @@
3322
import eu.pericles.processcompiler.exceptions.PCException;
3423
import eu.pericles.processcompiler.web.ApiApplication;
3524
import eu.pericles.processcompiler.web.ApiApplication.ERMRConfig;
25+
import net.sourceforge.argparse4j.ArgumentParsers;
26+
import net.sourceforge.argparse4j.inf.ArgumentParser;
27+
import net.sourceforge.argparse4j.inf.ArgumentParserException;
28+
import net.sourceforge.argparse4j.inf.Namespace;
29+
import net.sourceforge.argparse4j.inf.Subparser;
3630

3731
public class CommandlineInterface {
3832

‎src/main/java/eu/pericles/processcompiler/core/ProcessCompiler.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ private PCAggregatedProcess createPCAggregatedProcess(String repository, Aggrega
182182
throw new PCException("Process flow is empty");
183183
try {
184184
for (String subprocessID : subprocessIDs) {
185-
if(ermrCommunications.isAggregatedProcess(repository, subprocessID)) {
185+
if (!ermrCommunications.existsEntity(repository, subprocessID))
186+
throw new PCException("Process " + subprocessID + " is bad defined or missing");
187+
if (ermrCommunications.isAggregatedProcess(repository, subprocessID)) {
186188
AggregatedProcess process = getAggregatedProcess(repository, subprocessID);
187189
pcAggProcess.getSubprocesses().add(createPCAggregatedProcess(repository, process));
188190
} else {
@@ -293,7 +295,7 @@ private void compileRecursively(String repository, String processId, Map<String,
293295
}
294296

295297
CompiledProcess cp = createCompiledProcess(repository, createPCAggregatedProcess(repository, ap));
296-
log.info("Compiling (recusrively): {} from {}", id, processId);
298+
log.info("Compiling (recursively): {} from {}", id, processId);
297299
compilation.put(id, compile(cp));
298300
} else {
299301
ProcessBase p = getProcess(repository, processId);

‎src/main/java/eu/pericles/processcompiler/ermr/ERMRClientAPI.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@
2727
public class ERMRClientAPI {
2828

2929
Client client;
30-
private URI tripleStore = URI.create("https://pericles1:[email protected]/api/triple");
31-
private URI objectStore = URI.create("https://pericles1:[email protected]/api/cdmi");
30+
private URI tripleStore;
31+
private URI objectStore;
32+
33+
public ERMRClientAPI(String service) throws ERMRClientException {
34+
this.tripleStore = URI.create(service + "/triple");
35+
this.objectStore = URI.create(service + "/cdmi");
3236

33-
public ERMRClientAPI() throws ERMRClientException {
3437
client = createClient();
3538
}
3639

@@ -43,13 +46,6 @@ private Client createClient() throws ERMRClientException {
4346
}
4447
}
4548

46-
public ERMRClientAPI(String service) throws ERMRClientException {
47-
this.tripleStore = URI.create(service + "/triple");
48-
this.objectStore = URI.create(service + "/cdmi");
49-
50-
client = createClient();
51-
}
52-
5349
public Builder getTripleStoreBuilder(URI target, String path) {
5450
return client.target(target).path(path).request();
5551
}

‎src/main/java/eu/pericles/processcompiler/ermr/ERMRComm.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,7 @@ InputStream getProcessImplementationFile(String repository, String uri)
6161
boolean isSubclass(String repository, String parentClass, String childClass) throws ERMRClientException;
6262

6363
boolean isAggregatedProcess(String repository, String processId) throws ERMRClientException;
64+
65+
boolean existsEntity(String repository, String entityId);
6466

6567
}

‎src/main/java/eu/pericles/processcompiler/ermr/ERMRCommunications.java‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ public class ERMRCommunications implements ERMRComm {
1818

1919
private ERMRClientAPI client;
2020

21-
public ERMRCommunications() throws ERMRClientException {
22-
client = new ERMRClientAPI();
23-
}
24-
2521
public ERMRCommunications(String service) throws ERMRClientException {
2622
client = new ERMRClientAPI(service);
2723
}
@@ -243,9 +239,27 @@ private Response validateResponse(Response response) throws ERMRClientException
243239
return response;
244240
}
245241

242+
/* (non-Javadoc)
243+
* @see eu.pericles.processcompiler.ermr.ERMRComm#isAggregatedProcess(java.lang.String, java.lang.String, java.lang.String)
244+
*/
246245
@Override
247246
public boolean isAggregatedProcess(String repository, String processId) throws ERMRClientException {
248247
return getEntityTypeURI(repository, processId).contains("AggregatedProcess");
249248
}
249+
250+
/* (non-Javadoc)
251+
* @see eu.pericles.processcompiler.ermr.ERMRComm#existsEntity(java.lang.String, java.lang.String, java.lang.String)
252+
*/
253+
@Override
254+
public boolean existsEntity(String repository, String entityId) {
255+
try {
256+
if (getEntityTypeURI(repository, entityId) != null)
257+
return true;
258+
else
259+
return false;
260+
} catch (ERMRClientException e) {
261+
return false;
262+
}
263+
}
250264

251265
}

‎src/main/java/eu/pericles/processcompiler/ermr/ERMRCommunicationsFake.java‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,6 @@ public String getParentEntityURI(String repository, String uri) throws ERMRClien
267267
return null;
268268
}
269269

270-
public boolean isAggregatedProcess(String repository, String uri) throws ERMRClientException {
271-
return getEntityTypeURI(repository, uri).contains("AggregatedProcess");
272-
}
273-
274270
@Override
275271
public String getEntityTypeURI(String repository, String uri) throws ERMRClientException {
276272
for (QuerySolution x : query(SPARQLQuery.createQueryGetEntityTypeURI(uri))) {
@@ -299,6 +295,22 @@ public boolean isSubclass(String repository, String parentClass, String childCla
299295
return false;
300296
}
301297

298+
public boolean isAggregatedProcess(String repository, String uri) throws ERMRClientException {
299+
return getEntityTypeURI(repository, uri).contains("AggregatedProcess");
300+
}
301+
302+
@Override
303+
public boolean existsEntity(String repository, String entityId) {
304+
try {
305+
if (getEntityTypeURI(repository, entityId) != null)
306+
return true;
307+
else
308+
return false;
309+
} catch (ERMRClientException e) {
310+
return false;
311+
}
312+
}
313+
302314
@Override
303315
public ERMRClientAPI getClient() {
304316
return null;

‎src/main/java/eu/pericles/processcompiler/web/ApiApplication.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313

1414
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
1515

16-
import eu.pericles.processcompiler.web.ApiApplication.ERMRConfig;
17-
import eu.pericles.processcompiler.web.providers.TemplateBodyWriter;
18-
import eu.pericles.processcompiler.web.resources.BaseResource;
1916
import freemarker.template.Configuration;
2017
import freemarker.template.DefaultObjectWrapperBuilder;
2118

‎src/main/java/eu/pericles/processcompiler/web/providers/ApiExceptionMapper.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.slf4j.LoggerFactory;
99

1010
import eu.pericles.processcompiler.web.ApiException;
11-
import eu.pericles.processcompiler.web.resources.BaseResource;
1211

1312
@Provider
1413
public class ApiExceptionMapper implements ExceptionMapper<ApiException> {

‎src/main/java/eu/pericles/processcompiler/web/resources/CompilerResource.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@
88
import javax.ws.rs.Path;
99
import javax.ws.rs.Produces;
1010

11-
import com.google.inject.Inject;
12-
1311
import eu.pericles.processcompiler.core.ProcessCompiler;
1412
import eu.pericles.processcompiler.ecosystem.AggregatedProcess;
15-
import eu.pericles.processcompiler.exceptions.ERMRClientException;
1613
import eu.pericles.processcompiler.exceptions.BaseException;
17-
import eu.pericles.processcompiler.web.ApiApplication.ERMRConfig;
14+
import eu.pericles.processcompiler.exceptions.ERMRClientException;
1815
import eu.pericles.processcompiler.web.ApiException;
1916

2017
@Path("/compile")

0 commit comments

Comments
 (0)