diff --git a/SdmxDataParser/src/test/resources/data/Compact-VersionTwoPointOne-ts.xml b/SdmxDataParser/src/test/resources/data/Compact-VersionTwoPointOne-ts.xml index d6872ec..5d0307e 100644 --- a/SdmxDataParser/src/test/resources/data/Compact-VersionTwoPointOne-ts.xml +++ b/SdmxDataParser/src/test/resources/data/Compact-VersionTwoPointOne-ts.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2013-01-17T15:02:14 + 2013-01-17T15:02:14Z TEST SENDER diff --git a/SdmxDataParser/src/test/resources/data/Compact-VersionTwoPointOne.xml b/SdmxDataParser/src/test/resources/data/Compact-VersionTwoPointOne.xml index 33f67ac..6c0efbd 100644 --- a/SdmxDataParser/src/test/resources/data/Compact-VersionTwoPointOne.xml +++ b/SdmxDataParser/src/test/resources/data/Compact-VersionTwoPointOne.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2013-01-17T15:02:14 + 2013-01-17T15:02:14Z TEST SENDER diff --git a/SdmxDataParser/src/test/resources/data/Compact21-ADJUSTMENT.xml b/SdmxDataParser/src/test/resources/data/Compact21-ADJUSTMENT.xml index 01a19b7..95153aa 100644 --- a/SdmxDataParser/src/test/resources/data/Compact21-ADJUSTMENT.xml +++ b/SdmxDataParser/src/test/resources/data/Compact21-ADJUSTMENT.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2014-08-01T17:33:40 + 2014-08-01T17:33:40Z TEST SENDER diff --git a/SdmxDataParser/src/test/resources/data/Compact21-FREQ.xml b/SdmxDataParser/src/test/resources/data/Compact21-FREQ.xml index 50034d7..cede6c0 100644 --- a/SdmxDataParser/src/test/resources/data/Compact21-FREQ.xml +++ b/SdmxDataParser/src/test/resources/data/Compact21-FREQ.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2014-08-01T17:33:40 + 2014-08-01T17:33:40Z TEST SENDER diff --git a/SdmxDataParser/src/test/resources/data/Compact21-STS_ACTIVITY.xml b/SdmxDataParser/src/test/resources/data/Compact21-STS_ACTIVITY.xml index 3705cc1..2420706 100644 --- a/SdmxDataParser/src/test/resources/data/Compact21-STS_ACTIVITY.xml +++ b/SdmxDataParser/src/test/resources/data/Compact21-STS_ACTIVITY.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2014-08-01T17:33:40 + 2014-08-01T17:33:40Z TEST SENDER diff --git a/SdmxDataParser/src/test/resources/data/Compact21-alldim.xml b/SdmxDataParser/src/test/resources/data/Compact21-alldim.xml index 0aea349..0ec3b5a 100644 --- a/SdmxDataParser/src/test/resources/data/Compact21-alldim.xml +++ b/SdmxDataParser/src/test/resources/data/Compact21-alldim.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2014-07-31T11:11:46 + 2014-07-31T11:11:46Z TEST SENDER diff --git a/SdmxDataParser/src/test/resources/data/ESTAT_NA_MAIN_1_0.xml b/SdmxDataParser/src/test/resources/data/ESTAT_NA_MAIN_1_0.xml index cac34b9..e3d8d77 100644 --- a/SdmxDataParser/src/test/resources/data/ESTAT_NA_MAIN_1_0.xml +++ b/SdmxDataParser/src/test/resources/data/ESTAT_NA_MAIN_1_0.xml @@ -3,7 +3,7 @@ IT1001 true - 2001-03-11T15:30:47 + 2001-03-11T15:30:47Z Italian Statistical Institute diff --git a/SdmxDataParser/src/test/resources/data/Generic-VersionTwoPointOne-ts.xml b/SdmxDataParser/src/test/resources/data/Generic-VersionTwoPointOne-ts.xml index 3cc6b8d..dd62a34 100644 --- a/SdmxDataParser/src/test/resources/data/Generic-VersionTwoPointOne-ts.xml +++ b/SdmxDataParser/src/test/resources/data/Generic-VersionTwoPointOne-ts.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2013-01-17T15:02:14 + 2013-01-17T15:02:14Z TEST SENDER diff --git a/SdmxDataParser/src/test/resources/data/Generic-VersionTwoPointOne.xml b/SdmxDataParser/src/test/resources/data/Generic-VersionTwoPointOne.xml index b8f25af..89cec3f 100644 --- a/SdmxDataParser/src/test/resources/data/Generic-VersionTwoPointOne.xml +++ b/SdmxDataParser/src/test/resources/data/Generic-VersionTwoPointOne.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2013-01-17T15:02:14 + 2013-01-17T15:02:14Z TEST SENDER diff --git a/SdmxDataParser/src/test/resources/data/Generic21-ADJUSTMENT.xml b/SdmxDataParser/src/test/resources/data/Generic21-ADJUSTMENT.xml index 094c254..62b024d 100644 --- a/SdmxDataParser/src/test/resources/data/Generic21-ADJUSTMENT.xml +++ b/SdmxDataParser/src/test/resources/data/Generic21-ADJUSTMENT.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2014-08-01T17:33:40 + 2014-08-01T17:33:40Z TEST SENDER diff --git a/SdmxDataParser/src/test/resources/data/Generic21-FREQ.xml b/SdmxDataParser/src/test/resources/data/Generic21-FREQ.xml index 740c743..39a32dc 100644 --- a/SdmxDataParser/src/test/resources/data/Generic21-FREQ.xml +++ b/SdmxDataParser/src/test/resources/data/Generic21-FREQ.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2014-08-01T17:33:41 + 2014-08-01T17:33:41Z TEST SENDER diff --git a/SdmxDataParser/src/test/resources/data/Generic21-STS_ACTIVITY.xml b/SdmxDataParser/src/test/resources/data/Generic21-STS_ACTIVITY.xml index f57c69d..3ee9bb6 100644 --- a/SdmxDataParser/src/test/resources/data/Generic21-STS_ACTIVITY.xml +++ b/SdmxDataParser/src/test/resources/data/Generic21-STS_ACTIVITY.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2014-08-01T17:33:40 + 2014-08-01T17:33:40Z TEST SENDER diff --git a/SdmxDataParser/src/test/resources/writer/Compact_flat.xml b/SdmxDataParser/src/test/resources/writer/Compact_flat.xml index 87820ef..360682b 100644 --- a/SdmxDataParser/src/test/resources/writer/Compact_flat.xml +++ b/SdmxDataParser/src/test/resources/writer/Compact_flat.xml @@ -1 +1 @@ -MESSAGE_IDtrue2021-07-07T00:00:00+02:00Information \ No newline at end of file +MESSAGE_IDtrue2021-07-07T00:00:00Z+02:00Information \ No newline at end of file diff --git a/SdmxDataParser/src/test/resources/writer/Compact_ts.xml b/SdmxDataParser/src/test/resources/writer/Compact_ts.xml index 1d5f935..65712ae 100644 --- a/SdmxDataParser/src/test/resources/writer/Compact_ts.xml +++ b/SdmxDataParser/src/test/resources/writer/Compact_ts.xml @@ -1 +1 @@ -MESSAGE_IDtrue2021-07-07T00:00:00+02:00Information \ No newline at end of file +MESSAGE_IDtrue2021-07-07T00:00:00Z+02:00Information \ No newline at end of file diff --git a/SdmxDataParser/src/test/resources/writer/Compact_ts_with_ds_attribute.xml b/SdmxDataParser/src/test/resources/writer/Compact_ts_with_ds_attribute.xml index 69e8afa..8b97229 100644 --- a/SdmxDataParser/src/test/resources/writer/Compact_ts_with_ds_attribute.xml +++ b/SdmxDataParser/src/test/resources/writer/Compact_ts_with_ds_attribute.xml @@ -1 +1 @@ -MESSAGE_IDtrue2021-07-07T00:00:00+02:00Information \ No newline at end of file +MESSAGE_IDtrue2021-07-07T00:00:00Z+02:00Information \ No newline at end of file diff --git a/SdmxDataParser/src/test/resources/writer/Generic_flat.xml b/SdmxDataParser/src/test/resources/writer/Generic_flat.xml index 87820ef..360682b 100644 --- a/SdmxDataParser/src/test/resources/writer/Generic_flat.xml +++ b/SdmxDataParser/src/test/resources/writer/Generic_flat.xml @@ -1 +1 @@ -MESSAGE_IDtrue2021-07-07T00:00:00+02:00Information \ No newline at end of file +MESSAGE_IDtrue2021-07-07T00:00:00Z+02:00Information \ No newline at end of file diff --git a/SdmxDataParser/src/test/resources/writer/Generic_ts.xml b/SdmxDataParser/src/test/resources/writer/Generic_ts.xml index 5b1b57d..41c0d6d 100644 --- a/SdmxDataParser/src/test/resources/writer/Generic_ts.xml +++ b/SdmxDataParser/src/test/resources/writer/Generic_ts.xml @@ -1 +1 @@ -MESSAGE_IDtrue2021-07-07T00:00:00+02:00Information \ No newline at end of file +MESSAGE_IDtrue2021-07-07T00:00:00Z+02:00Information \ No newline at end of file diff --git a/SdmxDataParser/src/test/resources/writer/Json_ts_0.json b/SdmxDataParser/src/test/resources/writer/Json_ts_0.json index aaee1c3..b626939 100644 --- a/SdmxDataParser/src/test/resources/writer/Json_ts_0.json +++ b/SdmxDataParser/src/test/resources/writer/Json_ts_0.json @@ -1 +1 @@ -{"header":{"id":"MESSAGE_ID","prepared":"2021-07-07T00:00:00","test":true,"sender":{"id":"SENDER_ID","name":"unknown"}},"dataSets":[{"action":"Information","series":{"0:0:0":{"attributes":[0],"observations":{"0":["10"],"1":["11"],"2":["12"],"3":["25"]}},"1:0:0":{"attributes":[null],"observations":{"4":["0"],"5":["1"],"6":["2"],"7":["3"],"8":["4"],"9":["5"]}}}}],"structure":{"name":"FLOW_NAME","description":null,"dimensions":{"dataset":[],"series":[{"id":"FREQ","name":"FREQ","keyPosition":0,"role":null,"values":[{"id":"Q","name":"Quarterly"},{"id":"M","name":"Monthly"}]},{"id":"ADJUSTMENT","name":"ADJUSTMENT","keyPosition":1,"role":null,"values":[{"id":"N","name":"No"}]},{"id":"STS_ACTIVITY","name":"STS_ACTIVITY","keyPosition":2,"role":null,"values":[{"id":"A","name":"Act"}]}],"observation":[{"id":"TIME_PERIOD","name":"TIME_PERIOD","keyPosition":3,"role":"time","values":[{"start":"2021-01-01T00:00:00","end":"2021-03-31T23:59:59","id":"2021-Q1","name":"2021-Q1"},{"start":"2021-04-01T00:00:00","end":"2021-06-30T23:59:59","id":"2021-Q2","name":"2021-Q2"},{"start":"2021-07-01T00:00:00","end":"2021-09-30T23:59:59","id":"2021-Q3","name":"2021-Q3"},{"start":"2021-10-01T00:00:00","end":"2021-12-31T23:59:59","id":"2021-Q4","name":"2021-Q4"},{"start":"2022-01-01T00:00:00","end":"2022-01-31T23:59:59","id":"2022-M01","name":"2022-M01"},{"start":"2022-02-01T00:00:00","end":"2022-02-28T23:59:59","id":"2022-M02","name":"2022-M02"},{"start":"2022-03-01T00:00:00","end":"2022-03-31T23:59:59","id":"2022-M03","name":"2022-M03"},{"start":"2022-04-01T00:00:00","end":"2022-04-30T23:59:59","id":"2022-M04","name":"2022-M04"},{"start":"2022-05-01T00:00:00","end":"2022-05-31T23:59:59","id":"2022-M05","name":"2022-M05"},{"start":"2022-06-01T00:00:00","end":"2022-06-30T23:59:59","id":"2022-M06","name":"2022-M06"}]}]},"attributes":{"dataSet":[],"series":[{"id":"DECIMALS","name":"DECIMALS","role":null,"relationship":{"dimensions":["FREQ","ADJUSTMENT","STS_ACTIVITY"]},"values":[{"id":"1","name":"1"}]}],"observation":[]}}} \ No newline at end of file +{"header":{"id":"MESSAGE_ID","prepared":"2021-07-07T00:00:00Z","test":true,"sender":{"id":"SENDER_ID","name":"unknown"}},"dataSets":[{"action":"Information","series":{"0:0:0":{"attributes":[0],"observations":{"0":["10"],"1":["11"],"2":["12"],"3":["25"]}},"1:0:0":{"attributes":[null],"observations":{"4":["0"],"5":["1"],"6":["2"],"7":["3"],"8":["4"],"9":["5"]}}}}],"structure":{"name":"FLOW_NAME","description":null,"dimensions":{"dataset":[],"series":[{"id":"FREQ","name":"FREQ","keyPosition":0,"role":null,"values":[{"id":"Q","name":"Quarterly"},{"id":"M","name":"Monthly"}]},{"id":"ADJUSTMENT","name":"ADJUSTMENT","keyPosition":1,"role":null,"values":[{"id":"N","name":"No"}]},{"id":"STS_ACTIVITY","name":"STS_ACTIVITY","keyPosition":2,"role":null,"values":[{"id":"A","name":"Act"}]}],"observation":[{"id":"TIME_PERIOD","name":"TIME_PERIOD","keyPosition":3,"role":"time","values":[{"start":"2021-01-01T00:00:00Z","end":"2021-03-31T23:59:59Z","id":"2021-Q1","name":"2021-Q1"},{"start":"2021-04-01T00:00:00Z","end":"2021-06-30T23:59:59Z","id":"2021-Q2","name":"2021-Q2"},{"start":"2021-07-01T00:00:00Z","end":"2021-09-30T23:59:59Z","id":"2021-Q3","name":"2021-Q3"},{"start":"2021-10-01T00:00:00Z","end":"2021-12-31T23:59:59Z","id":"2021-Q4","name":"2021-Q4"},{"start":"2022-01-01T00:00:00Z","end":"2022-01-31T23:59:59Z","id":"2022-M01","name":"2022-M01"},{"start":"2022-02-01T00:00:00Z","end":"2022-02-28T23:59:59Z","id":"2022-M02","name":"2022-M02"},{"start":"2022-03-01T00:00:00Z","end":"2022-03-31T23:59:59Z","id":"2022-M03","name":"2022-M03"},{"start":"2022-04-01T00:00:00Z","end":"2022-04-30T23:59:59Z","id":"2022-M04","name":"2022-M04"},{"start":"2022-05-01T00:00:00Z","end":"2022-05-31T23:59:59Z","id":"2022-M05","name":"2022-M05"},{"start":"2022-06-01T00:00:00Z","end":"2022-06-30T23:59:59Z","id":"2022-M06","name":"2022-M06"}]}]},"attributes":{"dataSet":[],"series":[{"id":"DECIMALS","name":"DECIMALS","role":null,"relationship":{"dimensions":["FREQ","ADJUSTMENT","STS_ACTIVITY"]},"values":[{"id":"1","name":"1"}]}],"observation":[]}}} \ No newline at end of file diff --git a/SdmxDataParser/src/test/resources/writer/Json_ts_3.json b/SdmxDataParser/src/test/resources/writer/Json_ts_3.json index 6097001..c13af3d 100644 --- a/SdmxDataParser/src/test/resources/writer/Json_ts_3.json +++ b/SdmxDataParser/src/test/resources/writer/Json_ts_3.json @@ -1 +1 @@ -{"header":{"id":"MESSAGE_ID","prepared":"2021-07-07T00:00:00","test":true,"sender":{"id":"SENDER_ID","name":"unknown"}},"dataSets":[{"action":"Information","series":{"0:0:0":{"attributes":[0],"observations":{}},"1:0:0":{"attributes":[1],"observations":{"0":["10"],"1":["11"],"2":["12"],"3":["25"]}},"2:0:0":{"attributes":[null],"observations":{"4":["0"],"5":["1"],"6":["2"],"7":["3"],"8":["4"],"9":["5"]}}}}],"structure":{"name":"FLOW_NAME","description":null,"dimensions":{"dataset":[],"series":[{"id":"FREQ","name":"FREQ","keyPosition":0,"role":null,"values":[{"id":"A","name":"Annually"},{"id":"Q","name":"Quarterly"},{"id":"M","name":"Monthly"}]},{"id":"ADJUSTMENT","name":"ADJUSTMENT","keyPosition":1,"role":null,"values":[{"id":"N","name":"No"}]},{"id":"STS_ACTIVITY","name":"STS_ACTIVITY","keyPosition":2,"role":null,"values":[{"id":"A","name":"Act"}]}],"observation":[{"id":"TIME_PERIOD","name":"TIME_PERIOD","keyPosition":3,"role":"time","values":[{"start":"2021-01-01T00:00:00","end":"2021-03-31T23:59:59","id":"2021-Q1","name":"2021-Q1"},{"start":"2021-04-01T00:00:00","end":"2021-06-30T23:59:59","id":"2021-Q2","name":"2021-Q2"},{"start":"2021-07-01T00:00:00","end":"2021-09-30T23:59:59","id":"2021-Q3","name":"2021-Q3"},{"start":"2021-10-01T00:00:00","end":"2021-12-31T23:59:59","id":"2021-Q4","name":"2021-Q4"},{"start":"2022-01-01T00:00:00","end":"2022-01-31T23:59:59","id":"2022-M01","name":"2022-M01"},{"start":"2022-02-01T00:00:00","end":"2022-02-28T23:59:59","id":"2022-M02","name":"2022-M02"},{"start":"2022-03-01T00:00:00","end":"2022-03-31T23:59:59","id":"2022-M03","name":"2022-M03"},{"start":"2022-04-01T00:00:00","end":"2022-04-30T23:59:59","id":"2022-M04","name":"2022-M04"},{"start":"2022-05-01T00:00:00","end":"2022-05-31T23:59:59","id":"2022-M05","name":"2022-M05"},{"start":"2022-06-01T00:00:00","end":"2022-06-30T23:59:59","id":"2022-M06","name":"2022-M06"}]}]},"attributes":{"dataSet":[],"series":[{"id":"DECIMALS","name":"DECIMALS","role":null,"relationship":{"dimensions":["FREQ","ADJUSTMENT","STS_ACTIVITY"]},"values":[{"id":"2","name":"2"},{"id":"1","name":"1"}]}],"observation":[]}}} \ No newline at end of file +{"header":{"id":"MESSAGE_ID","prepared":"2021-07-07T00:00:00Z","test":true,"sender":{"id":"SENDER_ID","name":"unknown"}},"dataSets":[{"action":"Information","series":{"0:0:0":{"attributes":[0],"observations":{}},"1:0:0":{"attributes":[1],"observations":{"0":["10"],"1":["11"],"2":["12"],"3":["25"]}},"2:0:0":{"attributes":[null],"observations":{"4":["0"],"5":["1"],"6":["2"],"7":["3"],"8":["4"],"9":["5"]}}}}],"structure":{"name":"FLOW_NAME","description":null,"dimensions":{"dataset":[],"series":[{"id":"FREQ","name":"FREQ","keyPosition":0,"role":null,"values":[{"id":"A","name":"Annually"},{"id":"Q","name":"Quarterly"},{"id":"M","name":"Monthly"}]},{"id":"ADJUSTMENT","name":"ADJUSTMENT","keyPosition":1,"role":null,"values":[{"id":"N","name":"No"}]},{"id":"STS_ACTIVITY","name":"STS_ACTIVITY","keyPosition":2,"role":null,"values":[{"id":"A","name":"Act"}]}],"observation":[{"id":"TIME_PERIOD","name":"TIME_PERIOD","keyPosition":3,"role":"time","values":[{"start":"2021-01-01T00:00:00Z","end":"2021-03-31T23:59:59Z","id":"2021-Q1","name":"2021-Q1"},{"start":"2021-04-01T00:00:00Z","end":"2021-06-30T23:59:59Z","id":"2021-Q2","name":"2021-Q2"},{"start":"2021-07-01T00:00:00Z","end":"2021-09-30T23:59:59Z","id":"2021-Q3","name":"2021-Q3"},{"start":"2021-10-01T00:00:00Z","end":"2021-12-31T23:59:59Z","id":"2021-Q4","name":"2021-Q4"},{"start":"2022-01-01T00:00:00Z","end":"2022-01-31T23:59:59Z","id":"2022-M01","name":"2022-M01"},{"start":"2022-02-01T00:00:00Z","end":"2022-02-28T23:59:59Z","id":"2022-M02","name":"2022-M02"},{"start":"2022-03-01T00:00:00Z","end":"2022-03-31T23:59:59Z","id":"2022-M03","name":"2022-M03"},{"start":"2022-04-01T00:00:00Z","end":"2022-04-30T23:59:59Z","id":"2022-M04","name":"2022-M04"},{"start":"2022-05-01T00:00:00Z","end":"2022-05-31T23:59:59Z","id":"2022-M05","name":"2022-M05"},{"start":"2022-06-01T00:00:00Z","end":"2022-06-30T23:59:59Z","id":"2022-M06","name":"2022-M06"}]}]},"attributes":{"dataSet":[],"series":[{"id":"DECIMALS","name":"DECIMALS","role":null,"relationship":{"dimensions":["FREQ","ADJUSTMENT","STS_ACTIVITY"]},"values":[{"id":"2","name":"2"},{"id":"1","name":"1"}]}],"observation":[]}}} \ No newline at end of file diff --git a/SdmxDataParser/src/test/resources/writer/Json_ts_4.json b/SdmxDataParser/src/test/resources/writer/Json_ts_4.json index 6919efc..c6f54f4 100644 --- a/SdmxDataParser/src/test/resources/writer/Json_ts_4.json +++ b/SdmxDataParser/src/test/resources/writer/Json_ts_4.json @@ -1 +1 @@ -{"header":{"id":"MESSAGE_ID","prepared":"2021-07-07T00:00:00","test":true,"sender":{"id":"SENDER_ID","name":"unknown"}},"dataSets":[{"action":"Information","attributes":[0],"series":{"0:0:0":{"attributes":[],"observations":{}},"1:0:0":{"attributes":[],"observations":{"0":["10"],"1":["11"],"2":["12"],"3":["25"]}},"2:0:0":{"attributes":[],"observations":{"4":["0"],"5":["1"],"6":["2"],"7":["3"],"8":["4"],"9":["5"]}}}}],"structure":{"name":"FLOW_NAME","description":null,"dimensions":{"dataset":[],"series":[{"id":"FREQ","name":"FREQ","keyPosition":0,"role":null,"values":[{"id":"A","name":"Annually"},{"id":"Q","name":"Quarterly"},{"id":"M","name":"Monthly"}]},{"id":"ADJUSTMENT","name":"ADJUSTMENT","keyPosition":1,"role":null,"values":[{"id":"N","name":"No"}]},{"id":"STS_ACTIVITY","name":"STS_ACTIVITY","keyPosition":2,"role":null,"values":[{"id":"A","name":"Act"}]}],"observation":[{"id":"TIME_PERIOD","name":"TIME_PERIOD","keyPosition":3,"role":"time","values":[{"start":"2021-01-01T00:00:00","end":"2021-03-31T23:59:59","id":"2021-Q1","name":"2021-Q1"},{"start":"2021-04-01T00:00:00","end":"2021-06-30T23:59:59","id":"2021-Q2","name":"2021-Q2"},{"start":"2021-07-01T00:00:00","end":"2021-09-30T23:59:59","id":"2021-Q3","name":"2021-Q3"},{"start":"2021-10-01T00:00:00","end":"2021-12-31T23:59:59","id":"2021-Q4","name":"2021-Q4"},{"start":"2022-01-01T00:00:00","end":"2022-01-31T23:59:59","id":"2022-M01","name":"2022-M01"},{"start":"2022-02-01T00:00:00","end":"2022-02-28T23:59:59","id":"2022-M02","name":"2022-M02"},{"start":"2022-03-01T00:00:00","end":"2022-03-31T23:59:59","id":"2022-M03","name":"2022-M03"},{"start":"2022-04-01T00:00:00","end":"2022-04-30T23:59:59","id":"2022-M04","name":"2022-M04"},{"start":"2022-05-01T00:00:00","end":"2022-05-31T23:59:59","id":"2022-M05","name":"2022-M05"},{"start":"2022-06-01T00:00:00","end":"2022-06-30T23:59:59","id":"2022-M06","name":"2022-M06"}]}]},"attributes":{"dataSet":[{"id":"DECIMALS","name":"DECIMALS","role":null,"values":[{"id":"2","name":"2"}]}],"series":[],"observation":[]}}} \ No newline at end of file +{"header":{"id":"MESSAGE_ID","prepared":"2021-07-07T00:00:00Z","test":true,"sender":{"id":"SENDER_ID","name":"unknown"}},"dataSets":[{"action":"Information","attributes":[0],"series":{"0:0:0":{"attributes":[],"observations":{}},"1:0:0":{"attributes":[],"observations":{"0":["10"],"1":["11"],"2":["12"],"3":["25"]}},"2:0:0":{"attributes":[],"observations":{"4":["0"],"5":["1"],"6":["2"],"7":["3"],"8":["4"],"9":["5"]}}}}],"structure":{"name":"FLOW_NAME","description":null,"dimensions":{"dataset":[],"series":[{"id":"FREQ","name":"FREQ","keyPosition":0,"role":null,"values":[{"id":"A","name":"Annually"},{"id":"Q","name":"Quarterly"},{"id":"M","name":"Monthly"}]},{"id":"ADJUSTMENT","name":"ADJUSTMENT","keyPosition":1,"role":null,"values":[{"id":"N","name":"No"}]},{"id":"STS_ACTIVITY","name":"STS_ACTIVITY","keyPosition":2,"role":null,"values":[{"id":"A","name":"Act"}]}],"observation":[{"id":"TIME_PERIOD","name":"TIME_PERIOD","keyPosition":3,"role":"time","values":[{"start":"2021-01-01T00:00:00Z","end":"2021-03-31T23:59:59Z","id":"2021-Q1","name":"2021-Q1"},{"start":"2021-04-01T00:00:00Z","end":"2021-06-30T23:59:59Z","id":"2021-Q2","name":"2021-Q2"},{"start":"2021-07-01T00:00:00Z","end":"2021-09-30T23:59:59Z","id":"2021-Q3","name":"2021-Q3"},{"start":"2021-10-01T00:00:00Z","end":"2021-12-31T23:59:59Z","id":"2021-Q4","name":"2021-Q4"},{"start":"2022-01-01T00:00:00Z","end":"2022-01-31T23:59:59Z","id":"2022-M01","name":"2022-M01"},{"start":"2022-02-01T00:00:00Z","end":"2022-02-28T23:59:59Z","id":"2022-M02","name":"2022-M02"},{"start":"2022-03-01T00:00:00Z","end":"2022-03-31T23:59:59Z","id":"2022-M03","name":"2022-M03"},{"start":"2022-04-01T00:00:00Z","end":"2022-04-30T23:59:59Z","id":"2022-M04","name":"2022-M04"},{"start":"2022-05-01T00:00:00Z","end":"2022-05-31T23:59:59Z","id":"2022-M05","name":"2022-M05"},{"start":"2022-06-01T00:00:00Z","end":"2022-06-30T23:59:59Z","id":"2022-M06","name":"2022-M06"}]}]},"attributes":{"dataSet":[{"id":"DECIMALS","name":"DECIMALS","role":null,"values":[{"id":"2","name":"2"}]}],"series":[],"observation":[]}}} \ No newline at end of file diff --git a/SdmxDataParser/src/test/resources/writer/Json_ts_empty.json b/SdmxDataParser/src/test/resources/writer/Json_ts_empty.json index f1f5b8f..1ae5d21 100644 --- a/SdmxDataParser/src/test/resources/writer/Json_ts_empty.json +++ b/SdmxDataParser/src/test/resources/writer/Json_ts_empty.json @@ -1 +1 @@ -{"header":{"id":"MESSAGE_ID","prepared":"2021-07-07T00:00:00","test":true,"sender":{"id":"SENDER_ID","name":"unknown"}},"dataSets":[{"action":"Information","series":{"0:0:0":{"attributes":[null],"observations":{}},"1:0:0":{"attributes":[0],"observations":{}},"2:0:0":{"attributes":[1],"observations":{}}}}],"structure":{"name":"FLOW_NAME","description":null,"dimensions":{"dataset":[],"series":[{"id":"FREQ","name":"FREQ","keyPosition":0,"role":null,"values":[{"id":"A","name":"Annually"},{"id":"Q","name":"Quarterly"},{"id":"M","name":"Monthly"}]},{"id":"ADJUSTMENT","name":"ADJUSTMENT","keyPosition":1,"role":null,"values":[{"id":"N","name":"No"}]},{"id":"STS_ACTIVITY","name":"STS_ACTIVITY","keyPosition":2,"role":null,"values":[{"id":"A","name":"Act"}]}],"observation":[{"id":"TIME_PERIOD","name":"TIME_PERIOD","keyPosition":3,"role":"time","values":[]}]},"attributes":{"dataSet":[],"series":[{"id":"DECIMALS","name":"DECIMALS","role":null,"relationship":{"dimensions":["FREQ","ADJUSTMENT","STS_ACTIVITY"]},"values":[{"id":"1","name":"1"},{"id":"2","name":"2"}]}],"observation":[]}}} \ No newline at end of file +{"header":{"id":"MESSAGE_ID","prepared":"2021-07-07T00:00:00Z","test":true,"sender":{"id":"SENDER_ID","name":"unknown"}},"dataSets":[{"action":"Information","series":{"0:0:0":{"attributes":[null],"observations":{}},"1:0:0":{"attributes":[0],"observations":{}},"2:0:0":{"attributes":[1],"observations":{}}}}],"structure":{"name":"FLOW_NAME","description":null,"dimensions":{"dataset":[],"series":[{"id":"FREQ","name":"FREQ","keyPosition":0,"role":null,"values":[{"id":"A","name":"Annually"},{"id":"Q","name":"Quarterly"},{"id":"M","name":"Monthly"}]},{"id":"ADJUSTMENT","name":"ADJUSTMENT","keyPosition":1,"role":null,"values":[{"id":"N","name":"No"}]},{"id":"STS_ACTIVITY","name":"STS_ACTIVITY","keyPosition":2,"role":null,"values":[{"id":"A","name":"Act"}]}],"observation":[{"id":"TIME_PERIOD","name":"TIME_PERIOD","keyPosition":3,"role":"time","values":[]}]},"attributes":{"dataSet":[],"series":[{"id":"DECIMALS","name":"DECIMALS","role":null,"relationship":{"dimensions":["FREQ","ADJUSTMENT","STS_ACTIVITY"]},"values":[{"id":"1","name":"1"},{"id":"2","name":"2"}]}],"observation":[]}}} \ No newline at end of file diff --git a/SdmxDataParser/src/test/resources/writer/Json_ts_empty_2.json b/SdmxDataParser/src/test/resources/writer/Json_ts_empty_2.json index 7450012..f8b4e98 100644 --- a/SdmxDataParser/src/test/resources/writer/Json_ts_empty_2.json +++ b/SdmxDataParser/src/test/resources/writer/Json_ts_empty_2.json @@ -1 +1 @@ -{"header":{"id":"MESSAGE_ID","prepared":"2021-07-07T00:00:00","test":true,"sender":{"id":"SENDER_ID","name":"unknown"}},"dataSets":[{"action":"Information","series":{"0:0:0":{"attributes":[0],"observations":{}},"1:0:0":{"attributes":[1],"observations":{}}}}],"structure":{"name":"FLOW_NAME","description":null,"dimensions":{"dataset":[],"series":[{"id":"FREQ","name":"FREQ","keyPosition":0,"role":null,"values":[{"id":"A","name":"Annually"},{"id":"Q","name":"Quarterly"}]},{"id":"ADJUSTMENT","name":"ADJUSTMENT","keyPosition":1,"role":null,"values":[{"id":"N","name":"No"}]},{"id":"STS_ACTIVITY","name":"STS_ACTIVITY","keyPosition":2,"role":null,"values":[{"id":"A","name":"Act"}]}],"observation":[{"id":"TIME_PERIOD","name":"TIME_PERIOD","keyPosition":3,"role":"time","values":[]}]},"attributes":{"dataSet":[],"series":[{"id":"DECIMALS","name":"DECIMALS","role":null,"relationship":{"dimensions":["FREQ","ADJUSTMENT","STS_ACTIVITY"]},"values":[{"id":"2","name":"2"},{"id":"1","name":"1"}]}],"observation":[]}}} \ No newline at end of file +{"header":{"id":"MESSAGE_ID","prepared":"2021-07-07T00:00:00Z","test":true,"sender":{"id":"SENDER_ID","name":"unknown"}},"dataSets":[{"action":"Information","series":{"0:0:0":{"attributes":[0],"observations":{}},"1:0:0":{"attributes":[1],"observations":{}}}}],"structure":{"name":"FLOW_NAME","description":null,"dimensions":{"dataset":[],"series":[{"id":"FREQ","name":"FREQ","keyPosition":0,"role":null,"values":[{"id":"A","name":"Annually"},{"id":"Q","name":"Quarterly"}]},{"id":"ADJUSTMENT","name":"ADJUSTMENT","keyPosition":1,"role":null,"values":[{"id":"N","name":"No"}]},{"id":"STS_ACTIVITY","name":"STS_ACTIVITY","keyPosition":2,"role":null,"values":[{"id":"A","name":"Act"}]}],"observation":[{"id":"TIME_PERIOD","name":"TIME_PERIOD","keyPosition":3,"role":"time","values":[]}]},"attributes":{"dataSet":[],"series":[{"id":"DECIMALS","name":"DECIMALS","role":null,"relationship":{"dimensions":["FREQ","ADJUSTMENT","STS_ACTIVITY"]},"values":[{"id":"2","name":"2"},{"id":"1","name":"1"}]}],"observation":[]}}} \ No newline at end of file diff --git a/SdmxSourceUtil/src/main/java/org/sdmxsource/sdmx/util/date/DateUtil.java b/SdmxSourceUtil/src/main/java/org/sdmxsource/sdmx/util/date/DateUtil.java index f57d046..f645348 100644 --- a/SdmxSourceUtil/src/main/java/org/sdmxsource/sdmx/util/date/DateUtil.java +++ b/SdmxSourceUtil/src/main/java/org/sdmxsource/sdmx/util/date/DateUtil.java @@ -518,7 +518,7 @@ public static String formatDate(Date dt) { */ public static DateFormat getDateTimeFormat() { // ISO8601 Standard Date/Time format - return getDateFormatter("yyyy-MM-dd'T'HH:mm:ss"); + return getDateFormatter("yyyy-MM-dd'T'HH:mm:ss'Z'"); } /** diff --git a/SdmxSourceUtil/src/test/java/org/sdmxsource/data/DataProvider.java b/SdmxSourceUtil/src/test/java/org/sdmxsource/data/DataProvider.java index 9770bb8..f041085 100644 --- a/SdmxSourceUtil/src/test/java/org/sdmxsource/data/DataProvider.java +++ b/SdmxSourceUtil/src/test/java/org/sdmxsource/data/DataProvider.java @@ -42,7 +42,12 @@ public static Stream provideDateValidParams() { Arguments.of("2012-12-31T23:59:59", TIME_FORMAT.HOUR), Arguments.of("2012-12-31T00:00:00", TIME_FORMAT.HOUR), Arguments.of("2012-01-01T00:00:00", TIME_FORMAT.HOUR), - Arguments.of("2012-01-01T13:00:59", TIME_FORMAT.HOUR) + Arguments.of("2012-01-01T13:00:59", TIME_FORMAT.HOUR), + + Arguments.of("2012-12-31T23:59:59Z", TIME_FORMAT.HOUR), + Arguments.of("2012-12-31T00:00:00Z", TIME_FORMAT.HOUR), + Arguments.of("2012-01-01T00:00:00Z", TIME_FORMAT.HOUR), + Arguments.of("2012-01-01T13:00:59Z", TIME_FORMAT.HOUR) ); } diff --git a/SdmxSourceUtil/src/test/java/org/sdmxsource/test/sdmx/util/DateUtilTest.java b/SdmxSourceUtil/src/test/java/org/sdmxsource/test/sdmx/util/DateUtilTest.java index 5810ed3..8e2f8e3 100644 --- a/SdmxSourceUtil/src/test/java/org/sdmxsource/test/sdmx/util/DateUtilTest.java +++ b/SdmxSourceUtil/src/test/java/org/sdmxsource/test/sdmx/util/DateUtilTest.java @@ -1,5 +1,6 @@ package org.sdmxsource.test.sdmx.util; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.sdmxsource.sdmx.api.constants.TIME_FORMAT; @@ -8,6 +9,11 @@ import static org.junit.jupiter.api.Assertions.*; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.Date; + public class DateUtilTest { @ParameterizedTest @@ -24,4 +30,13 @@ public void shouldCheckGetTimeFormatOfValidDate(String dateStr, TIME_FORMAT time public void shouldCheckGetTimeFormatOfInvalidDate(String dateStr) { assertThrows(SdmxSemmanticException.class, () -> DateUtil.getTimeFormatOfDate(dateStr)); } + + @Test + public void shouldCheckGetTimeFormatOfDate() { + LocalDateTime ldt = LocalDateTime.of(2025, 7, 25, 14, 22, 5); // Year, Month, Day, Hour, Minute, Second + Instant instant = ldt.toInstant(ZoneOffset.UTC); + String formatedDate = DateUtil.formatDate(Date.from(instant)); + + assertEquals("2025-07-25T14:22:05Z", formatedDate); + } } diff --git a/SdmxSourceUtil/src/test/resources/Compact-VersionTwoPointOne.xml b/SdmxSourceUtil/src/test/resources/Compact-VersionTwoPointOne.xml index 0800d27..4b772ed 100644 --- a/SdmxSourceUtil/src/test/resources/Compact-VersionTwoPointOne.xml +++ b/SdmxSourceUtil/src/test/resources/Compact-VersionTwoPointOne.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2013-01-17T15:02:14 + 2013-01-17T15:02:14Z TEST SENDER diff --git a/SdmxSourceUtil/src/test/resources/Generic-VersionTwoPointOne.xml b/SdmxSourceUtil/src/test/resources/Generic-VersionTwoPointOne.xml index d057d87..76272ca 100644 --- a/SdmxSourceUtil/src/test/resources/Generic-VersionTwoPointOne.xml +++ b/SdmxSourceUtil/src/test/resources/Generic-VersionTwoPointOne.xml @@ -3,7 +3,7 @@ TEST_DATAFLOW true - 2013-01-17T15:02:14 + 2013-01-17T15:02:14Z TEST SENDER