From 84d9a866b367bc1ae3c95569b7f6c744f18ff7c8 Mon Sep 17 00:00:00 2001 From: "R.W.Majeed" Date: Tue, 28 Jun 2016 19:03:11 +0200 Subject: [PATCH] example for repeated execution added --- .../org/aktin/exchange/QuerySchedule.java | 4 +-- .../org/aktin/exchange/RepeatedExecution.java | 2 +- .../exchange/TestUnmarshallDocuments.java | 2 +- src/test/resources/query-repeating.xml | 27 +++++++++++++++++++ src/test/resources/query.xml | 7 ++++- 5 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 src/test/resources/query-repeating.xml diff --git a/src/main/java/org/aktin/exchange/QuerySchedule.java b/src/main/java/org/aktin/exchange/QuerySchedule.java index f5b0f0a..ae87ae3 100644 --- a/src/main/java/org/aktin/exchange/QuerySchedule.java +++ b/src/main/java/org/aktin/exchange/QuerySchedule.java @@ -14,8 +14,8 @@ import javax.xml.bind.annotation.XmlSeeAlso; public abstract class QuerySchedule { /** - * Duration for the query. The duration is relative - * to a reference timestamp and might also be negative. + * Duration for the queried data, relative to the request reference date + * {@link QueryRequest#referenceDate}. Usually negative: e.g. -D1M for previous month. */ @XmlElement(required=true) public Period duration; diff --git a/src/main/java/org/aktin/exchange/RepeatedExecution.java b/src/main/java/org/aktin/exchange/RepeatedExecution.java index e1a7555..9406863 100644 --- a/src/main/java/org/aktin/exchange/RepeatedExecution.java +++ b/src/main/java/org/aktin/exchange/RepeatedExecution.java @@ -18,5 +18,5 @@ public class RepeatedExecution extends QuerySchedule{ * This property will not cause any execution on the data warehouse side. * It is solely for information purposes. */ - public Duration repeats; + public Duration interval; } diff --git a/src/test/java/org/aktin/exchange/TestUnmarshallDocuments.java b/src/test/java/org/aktin/exchange/TestUnmarshallDocuments.java index 16fd991..e224c7f 100644 --- a/src/test/java/org/aktin/exchange/TestUnmarshallDocuments.java +++ b/src/test/java/org/aktin/exchange/TestUnmarshallDocuments.java @@ -72,7 +72,7 @@ public class TestUnmarshallDocuments { public void unmarshallQuery() throws IOException, SAXException{ Source xml = getResource("/query.xml"); Query query = JAXB.unmarshal(xml, Query.class); - Assert.assertEquals(query.schedule.getClass(), SingleExecution.class); + Assert.assertEquals(SingleExecution.class, query.schedule.getClass()); SingleExecution se = (SingleExecution)query.schedule; Assert.assertNotNull(se.duration); Assert.assertNotNull(se.reference); diff --git a/src/test/resources/query-repeating.xml b/src/test/resources/query-repeating.xml new file mode 100644 index 0000000..417b892 --- /dev/null +++ b/src/test/resources/query-repeating.xml @@ -0,0 +1,27 @@ + + 123 + Lala + + Prince Ipal + AKTIN + it-support@aktin.org + +49 (441) 798 - 2772 + + + -1W + P1D + + + + + + + + SELECT a, b; + + diff --git a/src/test/resources/query.xml b/src/test/resources/query.xml index acdca87..ca1625c 100644 --- a/src/test/resources/query.xml +++ b/src/test/resources/query.xml @@ -1,6 +1,7 @@ + xmlns:dwh="http://aktin.org/ns/dwh" + xmlns:psm="http://www.i2b2.org/xsd/cell/crc/psm/1.1/"> 123 Lala @@ -16,6 +17,10 @@ + + SELECT a, b; -- GitLab