From cf44edea820840b32a6fb4ea9c79db2d289c6d30 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Sep 2020 04:36:42 +0000 Subject: [PATCH 001/456] Bump version.junit from 5.6.2 to 5.7.0 Bumps `version.junit` from 5.6.2 to 5.7.0. Updates `junit-jupiter-api` from 5.6.2 to 5.7.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.6.2...r5.7.0) Updates `junit-jupiter-engine` from 5.6.2 to 5.7.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.6.2...r5.7.0) Updates `junit-jupiter-params` from 5.6.2 to 5.7.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.6.2...r5.7.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2b9b0063..e3cd9ee77 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 1.3.2 3.16.0 2.11.2 - 5.6.2 + 5.7.0 3.5.10 2.2 4.4.13 From 87ece1f581d44ff7824f36f721a738025bce628c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2020 04:37:02 +0000 Subject: [PATCH 002/456] Bump version.spring from 5.2.8.RELEASE to 5.2.9.RELEASE Bumps `version.spring` from 5.2.8.RELEASE to 5.2.9.RELEASE. Updates `spring-test` from 5.2.8.RELEASE to 5.2.9.RELEASE - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.8.RELEASE...v5.2.9.RELEASE) Updates `spring-web` from 5.2.8.RELEASE to 5.2.9.RELEASE - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.8.RELEASE...v5.2.9.RELEASE) Updates `spring-beans` from 5.2.8.RELEASE to 5.2.9.RELEASE - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.8.RELEASE...v5.2.9.RELEASE) Updates `spring-core` from 5.2.8.RELEASE to 5.2.9.RELEASE - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.8.RELEASE...v5.2.9.RELEASE) Updates `spring-context` from 5.2.8.RELEASE to 5.2.9.RELEASE - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.8.RELEASE...v5.2.9.RELEASE) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3cd9ee77..91645cd7f 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ ${maven.build.timestamp} - 5.2.8.RELEASE + 5.2.9.RELEASE 1.7.30 3.1.0 1.0.4 From ad09875582e03fcefd706a39b8e8039252ebd97c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 04:36:11 +0000 Subject: [PATCH 003/456] Bump version.mockito from 3.5.10 to 3.5.11 Bumps `version.mockito` from 3.5.10 to 3.5.11. Updates `mockito-core` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.10...v3.5.11) Updates `mockito-junit-jupiter` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.10...v3.5.11) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91645cd7f..67490d3a7 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 3.16.0 2.11.2 5.7.0 - 3.5.10 + 3.5.11 2.2 4.4.13 7.9.1 From 03150dce215da5b719d8a48ecdd7bfb65b8cce1e Mon Sep 17 00:00:00 2001 From: Christian Autermann Date: Mon, 21 Sep 2020 09:54:40 +0200 Subject: [PATCH 004/456] [maven-release-plugin] prepare release v8.0.2 --- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 7 +++---- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 24 files changed, 26 insertions(+), 27 deletions(-) diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index d86aa4537..96b5359aa 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0-SNAPSHOT + 8.0.2 faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index f2300431e..64296d51b 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0-SNAPSHOT + 8.0.2 faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 342b0f7c4..5d2d93ce1 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0-SNAPSHOT + 8.0.2 faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index 16e9c5887..7587bdafc 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.0.2 faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 6166ae4ed..bf06266ba 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0-SNAPSHOT + 8.0.2 faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 518e78449..449735394 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.0.2 iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index 5731b5a74..b88b2444a 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.0.2 iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 1815dddf6..85b887860 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.0.2 ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 5e7f489b9..af842b429 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.0.2 ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index bb0c4733c..86dfc8ac7 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.0.2 ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 0bb44bffe..a40b3ca58 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.0.2 ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 9acc7e849..47512beb6 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.0.2 janmayen diff --git a/pom.xml b/pom.xml index 67490d3a7..0e4ceb8e4 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,7 @@ limitations under the License. --> - + 4.0.0 @@ -29,7 +28,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.0.2 pom 52°North Arctic Sea @@ -88,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - HEAD + v8.0.2 diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index b140dc2f0..8f85bc841 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea shetland-parent - 8.1.0-SNAPSHOT + 8.0.2 shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index 673f535c7..b13730364 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.0.2 shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 6b7276a4a..05a08407e 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 8.1.0-SNAPSHOT + 8.0.2 shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index b01da3b74..c93616b20 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.2 svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 29c9632c6..2c49b2976 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.2 svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index c5be67c70..1b76fad94 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.2 svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 9ae5e3db4..9aabf873e 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.2 svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 408a144be..1395f20fd 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.2 svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index a8d64913a..dd5fbfe10 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.0.2 svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 13ee65f65..0e57873c5 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.2 svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 7e94156e8..a65186b6a 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.2 svalbard-xmlstream 52°North Svalbard XML Stream From 987e58581e00cf9dc1262676903e30c02a323265 Mon Sep 17 00:00:00 2001 From: Christian Autermann Date: Mon, 21 Sep 2020 09:54:48 +0200 Subject: [PATCH 005/456] [maven-release-plugin] prepare for next development iteration --- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 96b5359aa..d86aa4537 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.0.2 + 8.1.0-SNAPSHOT faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 64296d51b..f2300431e 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.0.2 + 8.1.0-SNAPSHOT faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 5d2d93ce1..342b0f7c4 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.0.2 + 8.1.0-SNAPSHOT faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index 7587bdafc..16e9c5887 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.0.2 + 8.1.0-SNAPSHOT faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index bf06266ba..6166ae4ed 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.0.2 + 8.1.0-SNAPSHOT faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 449735394..518e78449 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.0.2 + 8.1.0-SNAPSHOT iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index b88b2444a..5731b5a74 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.0.2 + 8.1.0-SNAPSHOT iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 85b887860..1815dddf6 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.0.2 + 8.1.0-SNAPSHOT ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index af842b429..5e7f489b9 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.0.2 + 8.1.0-SNAPSHOT ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 86dfc8ac7..bb0c4733c 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.0.2 + 8.1.0-SNAPSHOT ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index a40b3ca58..0bb44bffe 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.0.2 + 8.1.0-SNAPSHOT ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 47512beb6..9acc7e849 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.0.2 + 8.1.0-SNAPSHOT janmayen diff --git a/pom.xml b/pom.xml index 0e4ceb8e4..40c3749c1 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.n52.arctic-sea arctic-sea - 8.0.2 + 8.1.0-SNAPSHOT pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - v8.0.2 + HEAD diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 8f85bc841..b140dc2f0 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea shetland-parent - 8.0.2 + 8.1.0-SNAPSHOT shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index b13730364..673f535c7 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.0.2 + 8.1.0-SNAPSHOT shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 05a08407e..6b7276a4a 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 8.0.2 + 8.1.0-SNAPSHOT shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index c93616b20..b01da3b74 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.2 + 8.1.0-SNAPSHOT svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 2c49b2976..29c9632c6 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.2 + 8.1.0-SNAPSHOT svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 1b76fad94..c5be67c70 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.2 + 8.1.0-SNAPSHOT svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 9aabf873e..9ae5e3db4 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.2 + 8.1.0-SNAPSHOT svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 1395f20fd..408a144be 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.2 + 8.1.0-SNAPSHOT svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index dd5fbfe10..a8d64913a 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.0.2 + 8.1.0-SNAPSHOT svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 0e57873c5..13ee65f65 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.2 + 8.1.0-SNAPSHOT svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index a65186b6a..7e94156e8 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.2 + 8.1.0-SNAPSHOT svalbard-xmlstream 52°North Svalbard XML Stream From 83dc3ab83760b3e58c826c25ccf4854956b2bd40 Mon Sep 17 00:00:00 2001 From: Christian Autermann Date: Mon, 21 Sep 2020 12:21:53 +0200 Subject: [PATCH 006/456] update version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dacba15c9..c45cb1684 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ All projects are available on Maven Central. ```xml - 8.0.1 + 8.0.2 From d1abd2d92bf3543fa53198c91fa8e0734948716b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 25 Sep 2020 04:37:55 +0000 Subject: [PATCH 007/456] Bump version.elastic from 7.9.1 to 7.9.2 Bumps `version.elastic` from 7.9.1 to 7.9.2. Updates `elasticsearch` from 7.9.1 to 7.9.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.1...v7.9.2) Updates `elasticsearch-rest-client` from 7.9.1 to 7.9.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.1...v7.9.2) Updates `elasticsearch-rest-high-level-client` from 7.9.1 to 7.9.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.1...v7.9.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40c3749c1..f8bb6cc34 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ 3.5.11 2.2 4.4.13 - 7.9.1 + 7.9.2 4.8-1 3.2.0 From f884e097e29609c0560c99fa4eec70fd4a89401e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 25 Sep 2020 04:38:50 +0000 Subject: [PATCH 008/456] Bump spotbugs-annotations from 4.1.2 to 4.1.3 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.1.2...4.1.3) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40c3749c1..d046ee861 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 2.7.0 4.7.1 3.0.2 - 4.1.2 + 4.1.3 1.3.2 3.16.0 2.11.2 From 80143135cf66bc6f2fba681fe33040e0289e2d1d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 25 Sep 2020 04:39:16 +0000 Subject: [PATCH 009/456] Bump version.mockito from 3.5.11 to 3.5.13 Bumps `version.mockito` from 3.5.11 to 3.5.13. Updates `mockito-core` from 3.5.11 to 3.5.13 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.11...v3.5.13) Updates `mockito-junit-jupiter` from 3.5.11 to 3.5.13 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.11...v3.5.13) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40c3749c1..9da0a288f 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 3.16.0 2.11.2 5.7.0 - 3.5.11 + 3.5.13 2.2 4.4.13 7.9.1 From 2c95ef3ee708cfb67741fb60fa601ef408a5d65b Mon Sep 17 00:00:00 2001 From: speckij Date: Tue, 29 Sep 2020 17:29:26 +0200 Subject: [PATCH 010/456] fix typo in constant literal --- .../main/java/org/n52/shetland/oasis/odata/ODataConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shetland/core/src/main/java/org/n52/shetland/oasis/odata/ODataConstants.java b/shetland/core/src/main/java/org/n52/shetland/oasis/odata/ODataConstants.java index fdddda6e3..780ebb7a1 100644 --- a/shetland/core/src/main/java/org/n52/shetland/oasis/odata/ODataConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/oasis/odata/ODataConstants.java @@ -79,7 +79,7 @@ interface DateAndTimeFunctions { String MINUTE = "minute"; String MONTH = "month"; String NOW = "now"; - String SECOND = "secopnd"; + String SECOND = "second"; String TIME = "time"; String TOTALOFFSETMINUTES = "totaloffsetminutes"; String TOTALSECONDS = "totalseconds"; From b145baada70a869fa66fa9ff2fef1ac70810b426 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Thu, 1 Oct 2020 11:24:26 +0200 Subject: [PATCH 011/456] Add TimeValue, similar to TimeRangeValue but for a single time stamp --- .../n52/shetland/ogc/om/values/TimeValue.java | 104 ++++++++++++++++++ .../ogc/om/values/visitor/ValueVisitor.java | 4 + .../java/org/n52/shetland/util/OMHelper.java | 6 + .../java/org/n52/svalbard/util/SweHelper.java | 8 ++ .../encode/json/ObservationEncoder.java | 7 ++ ...actCVDiscretePointCoverageTypeEncoder.java | 6 + .../svalbard/encode/AbstractOmEncoderv20.java | 8 ++ .../org/n52/svalbard/encode/OmEncoderv20.java | 6 + 8 files changed, 149 insertions(+) create mode 100644 shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TimeValue.java diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TimeValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TimeValue.java new file mode 100644 index 000000000..69b5289d2 --- /dev/null +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TimeValue.java @@ -0,0 +1,104 @@ +/* + * Copyright 2015-2020 52°North Initiative for Geospatial Open Source + * Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.shetland.ogc.om.values; + +import org.joda.time.DateTime; +import org.n52.shetland.ogc.UoM; +import org.n52.shetland.ogc.om.values.visitor.ValueVisitor; +import org.n52.shetland.ogc.swe.simpleType.SweTime; + +public class TimeValue extends SweTime implements Value { + + /** + * constructor + * + * @param value + * Measurement value + */ + public TimeValue(DateTime value) { + setValue(value); + } + + /** + * * constructor + * + * @param value + * Measurement value + * @param unit + * Unit of measure + */ + public TimeValue(DateTime value, String unit) { + setValue(value); + setUnit(unit); + } + + /** + * * constructor + * + * @param value + * Measurement value + * @param unit + * Unit of measure + */ + public TimeValue(DateTime value, UoM unit) { + setValue(value); + setUnit(unit); + } + + @Override + public TimeValue setValue(final DateTime value) { + super.setValue(value); + return this; + } + + @Override + public void setUnit(String unit) { + super.setUom(unit); + } + + @Override + public TimeValue setUnit(UoM unit) { + super.setUom(unit); + return this; + } + + @Override + public String getUnit() { + return super.getUom(); + } + + @Override + public UoM getUnitObject() { + return super.getUomObject(); + } + + @Override + public boolean isSetUnit() { + return super.isSetUom(); + } + + @Override + public String toString() { + return String.format("TimeValue [value=%s, unit=%s]", getValue(), getUnit()); + } + + @Override + public X accept(ValueVisitor visitor) throws E { + return visitor.visit(this); + } + +} diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java index ea03eec9f..568a91c2d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java @@ -35,6 +35,7 @@ import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; +import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.XmlValue; @@ -103,6 +104,9 @@ T visit(ProfileValue value) T visit(UnknownValue value) throws X; + T visit(TimeValue value) + throws X; + T visit(TimeRangeValue value) throws X; diff --git a/shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java b/shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java index 32d2ad886..26306155d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java @@ -47,6 +47,7 @@ import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; +import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; import org.n52.shetland.ogc.om.values.XmlValue; @@ -287,6 +288,11 @@ public String visit(TimeRangeValue value) { return defaultValue(); } + @Override + public String visit(TimeValue value) throws RuntimeException { + return OmConstants.OBS_TYPE_TEMPORAL_OBSERVATION; + } + @Override public String visit(XmlValue value) { return defaultValue(); diff --git a/svalbard/core/src/main/java/org/n52/svalbard/util/SweHelper.java b/svalbard/core/src/main/java/org/n52/svalbard/util/SweHelper.java index e31222bb0..688f67cd4 100644 --- a/svalbard/core/src/main/java/org/n52/svalbard/util/SweHelper.java +++ b/svalbard/core/src/main/java/org/n52/svalbard/util/SweHelper.java @@ -54,6 +54,7 @@ import org.n52.shetland.ogc.om.values.TLVTValue; import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; +import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; @@ -362,6 +363,13 @@ public SweAbstractDataComponent visit(ProfileValue value) throws EncodingExcepti throw notSupported(); } + @Override + public SweAbstractDataComponent visit(TimeValue value) throws EncodingException { + SweTime sweTime = new SweTime(); + sweTime.setUom(value.getUnit()); + return sweTime; + } + @Override public SweAbstractDataComponent visit(TimeRangeValue value) throws EncodingException { SweTimeRange sweTimeRange = new SweTimeRange(); diff --git a/svalbard/json/src/main/java/org/n52/svalbard/encode/json/ObservationEncoder.java b/svalbard/json/src/main/java/org/n52/svalbard/encode/json/ObservationEncoder.java index cfe90d3c8..76142e38b 100644 --- a/svalbard/json/src/main/java/org/n52/svalbard/encode/json/ObservationEncoder.java +++ b/svalbard/json/src/main/java/org/n52/svalbard/encode/json/ObservationEncoder.java @@ -45,6 +45,7 @@ import org.n52.shetland.ogc.om.values.TLVTValue; import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; +import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; @@ -305,6 +306,12 @@ public JsonNode visit(ProfileValue value) throw new UnsupportedEncoderInputException(ObservationEncoder.this, value); } + @Override + public JsonNode visit(TimeValue value) + throws EncodingException { + throw new UnsupportedEncoderInputException(ObservationEncoder.this, value); + } + @Override public JsonNode visit(TimeRangeValue value) throws EncodingException { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java index 05a3a4023..782474f55 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java @@ -45,6 +45,7 @@ import org.n52.shetland.ogc.om.values.TLVTValue; import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; +import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; @@ -326,6 +327,11 @@ public XmlObject visit(ProfileValue value) throws EncodingException { return encodeObjectToXml(value.getDefaultElementEncoding(), value); } + @Override + public XmlObject visit(TimeValue value) throws EncodingException { + return null; + } + @Override public XmlObject visit(TimeRangeValue value) throws EncodingException { return null; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java index 5f908ee0f..f4ce54eb8 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java @@ -63,6 +63,7 @@ import org.n52.shetland.ogc.om.values.TLVTValue; import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; +import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; @@ -782,6 +783,13 @@ public XmlObject visit(ProfileValue value) return defaultValue(value); } + @Override + public XmlObject visit(TimeValue value) + throws EncodingException { + return encodeObjectToXml(SweConstants.NS_SWE_20, value, + EncodingContext.of(XmlBeansEncodingFlags.PROPERTY_TYPE)); + } + @Override public XmlObject visit(TimeRangeValue value) throws EncodingException { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java index 0895ba006..5fe346edf 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java @@ -63,6 +63,7 @@ import org.n52.shetland.ogc.om.values.TLVTValue; import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; +import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.XmlValue; @@ -574,6 +575,11 @@ public XmlObject visit(ProfileValue value) throws EncodingException { return encodeGWML(value, EncodingContext.of(XmlBeansEncodingFlags.FOR_OBSERVATION)); } + @Override + public XmlObject visit(TimeValue value) throws EncodingException { + return null; + } + @Override public XmlObject visit(TimeRangeValue value) throws EncodingException { return null; From 318f7653e85b88c837cc433abb1e589458de9100 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 2 Oct 2020 04:35:21 +0000 Subject: [PATCH 012/456] Bump version.jackson from 2.11.2 to 2.11.3 Bumps `version.jackson` from 2.11.2 to 2.11.3. Updates `jackson-core` from 2.11.2 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.11.2...jackson-core-2.11.3) Updates `jackson-annotations` from 2.11.2 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-databind` from 2.11.2 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-datatype-jdk8` from 2.11.2 to 2.11.3 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9974d2f46..f552ff13d 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ 4.1.3 1.3.2 3.16.0 - 2.11.2 + 2.11.3 5.7.0 3.5.13 2.2 From ed309aad8e656563c2c4e540c67af4d456e07c83 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 7 Oct 2020 04:35:22 +0000 Subject: [PATCH 013/456] Bump httpclient from 4.5.12 to 4.5.13 Bumps httpclient from 4.5.12 to 4.5.13. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f552ff13d..762a50599 100644 --- a/pom.xml +++ b/pom.xml @@ -429,7 +429,7 @@ org.apache.httpcomponents httpclient - 4.5.12 + 4.5.13 org.apache.httpcomponents From e60994f8faecdda479f6a1c031f43ddc8f92df57 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 8 Oct 2020 04:35:28 +0000 Subject: [PATCH 014/456] Bump lucene-core from 8.6.2 to 8.6.3 Bumps lucene-core from 8.6.2 to 8.6.3. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f552ff13d..3621e6ffa 100644 --- a/pom.xml +++ b/pom.xml @@ -578,7 +578,7 @@ org.apache.lucene lucene-core - 8.6.2 + 8.6.3 com.maxmind.db From edfed4a7177b0e81007dfd33bbdd8da5387b5d16 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 14 Oct 2020 04:36:33 +0000 Subject: [PATCH 015/456] Bump maxmind-db from 1.4.0 to 2.0.0 Bumps [maxmind-db](https://github.com/maxmind/MaxMind-DB-Reader-java) from 1.4.0 to 2.0.0. - [Release notes](https://github.com/maxmind/MaxMind-DB-Reader-java/releases) - [Changelog](https://github.com/maxmind/MaxMind-DB-Reader-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/maxmind/MaxMind-DB-Reader-java/compare/v1.4.0...v2.0.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37ede1a9c..eca5a4c68 100644 --- a/pom.xml +++ b/pom.xml @@ -583,7 +583,7 @@ com.maxmind.db maxmind-db - 1.4.0 + 2.0.0 com.maxmind.geoip2 From d4e25ff909b1e95884b90bc472c236e5a0ab9996 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 15 Oct 2020 04:36:20 +0000 Subject: [PATCH 016/456] Bump geoip2 from 2.14.0 to 2.15.0 Bumps [geoip2](https://github.com/maxmind/GeoIP2-java) from 2.14.0 to 2.15.0. - [Release notes](https://github.com/maxmind/GeoIP2-java/releases) - [Changelog](https://github.com/maxmind/GeoIP2-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/maxmind/GeoIP2-java/compare/v2.14.0...v2.15.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37ede1a9c..beb67b194 100644 --- a/pom.xml +++ b/pom.xml @@ -588,7 +588,7 @@ com.maxmind.geoip2 geoip2 - 2.14.0 + 2.15.0 commons-logging From 7932a11d609113e4a75c3f5e96d94258bc1898ea Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 16 Oct 2020 04:37:53 +0000 Subject: [PATCH 017/456] Bump spotbugs-annotations from 4.1.3 to 4.1.4 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.1.3 to 4.1.4. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.1.3...4.1.4) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37ede1a9c..76a83a70d 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 2.7.0 4.7.1 3.0.2 - 4.1.3 + 4.1.4 1.3.2 3.16.0 2.11.3 From 08e20c3367ab8af9259dab82f0afacd7e5c66866 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 20 Oct 2020 04:35:08 +0000 Subject: [PATCH 018/456] Bump version.mockito from 3.5.13 to 3.5.15 Bumps `version.mockito` from 3.5.13 to 3.5.15. Updates `mockito-core` from 3.5.13 to 3.5.15 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.13...v3.5.15) Updates `mockito-junit-jupiter` from 3.5.13 to 3.5.15 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.13...v3.5.15) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8967f0d9c..84194120d 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 3.16.0 2.11.3 5.7.0 - 3.5.13 + 3.5.15 2.2 4.4.13 7.9.2 From 7cb2cb6f4a4a8fecc5f271adfce81cbe65b1a9ca Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 22 Oct 2020 04:37:48 +0000 Subject: [PATCH 019/456] Bump joda-time from 2.10.6 to 2.10.7 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.6 to 2.10.7. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.6...v2.10.7) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84194120d..c20ae5ab8 100644 --- a/pom.xml +++ b/pom.xml @@ -311,7 +311,7 @@ joda-time joda-time - 2.10.6 + 2.10.7 org.locationtech.jts From b236800cda5763555da1d6365645869f86894bd5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 23 Oct 2020 04:35:52 +0000 Subject: [PATCH 020/456] Bump version.elastic from 7.9.2 to 7.9.3 Bumps `version.elastic` from 7.9.2 to 7.9.3. Updates `elasticsearch` from 7.9.2 to 7.9.3 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.2...v7.9.3) Updates `elasticsearch-rest-client` from 7.9.2 to 7.9.3 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.2...v7.9.3) Updates `elasticsearch-rest-high-level-client` from 7.9.2 to 7.9.3 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.2...v7.9.3) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c20ae5ab8..e2f2a98f6 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ 3.5.15 2.2 4.4.13 - 7.9.2 + 7.9.3 4.8-1 3.2.0 From bb9a421ca4feec50c0dea83c364275c98f827eab Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 04:33:48 +0000 Subject: [PATCH 021/456] Bump joda-time from 2.10.7 to 2.10.8 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.7 to 2.10.8. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.7...v2.10.8) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2f2a98f6..3c125a63a 100644 --- a/pom.xml +++ b/pom.xml @@ -311,7 +311,7 @@ joda-time joda-time - 2.10.7 + 2.10.8 org.locationtech.jts From 193f9da1dbd7ece46af1fc3b34580a11f2e92b1a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 27 Oct 2020 04:34:04 +0000 Subject: [PATCH 022/456] Bump version.mockito from 3.5.15 to 3.6.0 Bumps `version.mockito` from 3.5.15 to 3.6.0. Updates `mockito-core` from 3.5.15 to 3.6.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.15...v3.6.0) Updates `mockito-junit-jupiter` from 3.5.15 to 3.6.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.15...v3.6.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c125a63a..a8797b576 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 3.16.0 2.11.3 5.7.0 - 3.5.15 + 3.6.0 2.2 4.4.13 7.9.3 From 3882b8321c5544872626297d77c566eb9c734d38 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 28 Oct 2020 04:35:04 +0000 Subject: [PATCH 023/456] Bump version.spring from 5.2.9.RELEASE to 5.3.0 Bumps `version.spring` from 5.2.9.RELEASE to 5.3.0. Updates `spring-test` from 5.2.9.RELEASE to 5.3.0 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.9.RELEASE...v5.3.0) Updates `spring-web` from 5.2.9.RELEASE to 5.3.0 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.9.RELEASE...v5.3.0) Updates `spring-beans` from 5.2.9.RELEASE to 5.3.0 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.9.RELEASE...v5.3.0) Updates `spring-core` from 5.2.9.RELEASE to 5.3.0 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.9.RELEASE...v5.3.0) Updates `spring-context` from 5.2.9.RELEASE to 5.3.0 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.9.RELEASE...v5.3.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8797b576..c9be78b8d 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.2.9.RELEASE + 5.3.0 1.7.30 3.1.0 1.0.4 From 56c60f0f7d4ecaca613dd8a54434a9b64d4e340c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 29 Oct 2020 04:31:30 +0000 Subject: [PATCH 024/456] Bump Saxon-HE from 10.2 to 10.3 Bumps Saxon-HE from 10.2 to 10.3. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c9be78b8d..7c9b98c9a 100644 --- a/pom.xml +++ b/pom.xml @@ -533,7 +533,7 @@ net.sf.saxon Saxon-HE - 10.2 + 10.3 From b96b222c1a839abd86c2955a1fc350238d783683 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2020 04:33:54 +0000 Subject: [PATCH 025/456] Bump lucene-core from 8.6.3 to 8.7.0 Bumps lucene-core from 8.6.3 to 8.7.0. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c9b98c9a..c7d05dedc 100644 --- a/pom.xml +++ b/pom.xml @@ -578,7 +578,7 @@ org.apache.lucene lucene-core - 8.6.3 + 8.7.0 com.maxmind.db From 7a0b6247ea417c99800600d30687bf9b98fd24eb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 6 Nov 2020 04:34:25 +0000 Subject: [PATCH 026/456] Bump istack-commons-runtime from 3.0.11 to 4.0.0 Bumps istack-commons-runtime from 3.0.11 to 4.0.0. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c7d05dedc..b43fc197e 100644 --- a/pom.xml +++ b/pom.xml @@ -1123,7 +1123,7 @@ com.sun.istack istack-commons-runtime - 3.0.11 + 4.0.0 runtime From de77568242dbec9bda993c468ae08bc898edbbb2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 11 Nov 2020 04:35:42 +0000 Subject: [PATCH 027/456] Bump version.spring from 5.3.0 to 5.3.1 Bumps `version.spring` from 5.3.0 to 5.3.1. Updates `spring-test` from 5.3.0 to 5.3.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.0...v5.3.1) Updates `spring-web` from 5.3.0 to 5.3.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.0...v5.3.1) Updates `spring-beans` from 5.3.0 to 5.3.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.0...v5.3.1) Updates `spring-core` from 5.3.0 to 5.3.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.0...v5.3.1) Updates `spring-context` from 5.3.0 to 5.3.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.0...v5.3.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b43fc197e..dbac38adb 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.3.0 + 5.3.1 1.7.30 3.1.0 1.0.4 From 1e6e8c7e7b6a87213a6cf0426aaf6ff37270c02d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 12 Nov 2020 04:32:23 +0000 Subject: [PATCH 028/456] Bump version.elastic from 7.9.3 to 7.10.0 Bumps `version.elastic` from 7.9.3 to 7.10.0. Updates `elasticsearch` from 7.9.3 to 7.10.0 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.3...v7.10.0) Updates `elasticsearch-rest-client` from 7.9.3 to 7.10.0 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.3...v7.10.0) Updates `elasticsearch-rest-high-level-client` from 7.9.3 to 7.10.0 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.9.3...v7.10.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dbac38adb..626be256a 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ 3.6.0 2.2 4.4.13 - 7.9.3 + 7.10.0 4.8-1 3.2.0 From 477d3cc4a6758127e8bf762af97fc0f4f830d8e0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 25 Nov 2020 09:01:32 +0000 Subject: [PATCH 029/456] Bump version.antlr4 from 4.8-1 to 4.9 Bumps `version.antlr4` from 4.8-1 to 4.9. Updates `antlr4` from 4.8-1 to 4.9 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/commits/4.9) Updates `antlr4-runtime` from 4.8-1 to 4.9 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/commits/4.9) Updates `antlr4-maven-plugin` from 4.8-1 to 4.9 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/commits/4.9) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 626be256a..4f26996dd 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 2.2 4.4.13 7.10.0 - 4.8-1 + 4.9 3.2.0 From 822ea861f7a60e863a725dcaf28d8e6087c5fa8e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Nov 2020 04:43:47 +0000 Subject: [PATCH 030/456] Bump version.mockito from 3.6.0 to 3.6.28 Bumps `version.mockito` from 3.6.0 to 3.6.28. Updates `mockito-core` from 3.6.0 to 3.6.28 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.6.0...v3.6.28) Updates `mockito-junit-jupiter` from 3.6.0 to 3.6.28 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.6.0...v3.6.28) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 626be256a..1a9d7287c 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 3.16.0 2.11.3 5.7.0 - 3.6.0 + 3.6.28 2.2 4.4.13 7.10.0 From d15b576846b32786c3772c7ab61f10a64b1ef1bd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 04:32:48 +0000 Subject: [PATCH 031/456] Bump version.jackson from 2.11.3 to 2.12.0 Bumps `version.jackson` from 2.11.3 to 2.12.0. Updates `jackson-core` from 2.11.3 to 2.12.0 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.11.3...jackson-core-2.12.0) Updates `jackson-annotations` from 2.11.3 to 2.12.0 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-databind` from 2.11.3 to 2.12.0 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-datatype-jdk8` from 2.11.3 to 2.12.0 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c27dfe5d..056a3431f 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ 4.1.4 1.3.2 3.16.0 - 2.11.3 + 2.12.0 5.7.0 3.6.28 2.2 From 1b6465def25f4b393f1f3a5b77f844d5589398ac Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 04:33:23 +0000 Subject: [PATCH 032/456] Bump spotbugs-annotations from 4.1.4 to 4.2.0 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.1.4 to 4.2.0. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.1.4...4.2.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c27dfe5d..5ca407259 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 2.7.0 4.7.1 3.0.2 - 4.1.4 + 4.2.0 1.3.2 3.16.0 2.11.3 From 926b47d9837eace6ab89f85e5c5e16d989fda945 Mon Sep 17 00:00:00 2001 From: Christian Autermann Date: Mon, 30 Nov 2020 10:06:20 +0100 Subject: [PATCH 033/456] update version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c45cb1684..43106ec21 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ All projects are available on Maven Central. ```xml - 8.0.2 + 8.0.3 From 3ecf4fe84ad2455749ff8e9bf81be0ea3557de92 Mon Sep 17 00:00:00 2001 From: Christian Autermann Date: Mon, 30 Nov 2020 10:09:23 +0100 Subject: [PATCH 034/456] [maven-release-plugin] prepare release v8.0.3 --- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index d86aa4537..de2d3c8d1 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0-SNAPSHOT + 8.0.3 faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index f2300431e..fc2a451dc 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0-SNAPSHOT + 8.0.3 faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 342b0f7c4..0c25b0707 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0-SNAPSHOT + 8.0.3 faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index 16e9c5887..3fe234186 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.0.3 faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 6166ae4ed..6e1249b0b 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0-SNAPSHOT + 8.0.3 faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 518e78449..d073c6cb2 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.0.3 iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index 5731b5a74..4fd9736b4 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.0.3 iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 1815dddf6..7789ff7ba 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.0.3 ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 5e7f489b9..7361312f9 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.0.3 ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index bb0c4733c..8992162e0 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.0.3 ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 0bb44bffe..a072577d6 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.0.3 ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 9acc7e849..aba4868e0 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.0.3 janmayen diff --git a/pom.xml b/pom.xml index e69e15a8f..268a014bb 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.0.3 pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - HEAD + v8.0.3 diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index b140dc2f0..36d1e68a4 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea shetland-parent - 8.1.0-SNAPSHOT + 8.0.3 shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index 673f535c7..ccec2e20a 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.0.3 shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 6b7276a4a..8e6514365 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 8.1.0-SNAPSHOT + 8.0.3 shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index b01da3b74..43454a0a2 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.3 svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 29c9632c6..5de67468a 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.3 svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index c5be67c70..862eb9f3a 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.3 svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 9ae5e3db4..98d164b96 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.3 svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 408a144be..fc11aedb9 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.3 svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index a8d64913a..70d35fb7d 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.0.3 svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 13ee65f65..cb56808e6 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.3 svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 7e94156e8..fd84105f8 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.0.3 svalbard-xmlstream 52°North Svalbard XML Stream From 11aeebf8be3fb052f5d1c49cdfed54f5f4e50f8e Mon Sep 17 00:00:00 2001 From: Christian Autermann Date: Mon, 30 Nov 2020 10:09:30 +0100 Subject: [PATCH 035/456] [maven-release-plugin] prepare for next development iteration --- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index de2d3c8d1..d86aa4537 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.0.3 + 8.1.0-SNAPSHOT faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index fc2a451dc..f2300431e 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.0.3 + 8.1.0-SNAPSHOT faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 0c25b0707..342b0f7c4 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.0.3 + 8.1.0-SNAPSHOT faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index 3fe234186..16e9c5887 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.0.3 + 8.1.0-SNAPSHOT faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 6e1249b0b..6166ae4ed 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.0.3 + 8.1.0-SNAPSHOT faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index d073c6cb2..518e78449 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.0.3 + 8.1.0-SNAPSHOT iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index 4fd9736b4..5731b5a74 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.0.3 + 8.1.0-SNAPSHOT iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 7789ff7ba..1815dddf6 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.0.3 + 8.1.0-SNAPSHOT ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 7361312f9..5e7f489b9 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.0.3 + 8.1.0-SNAPSHOT ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 8992162e0..bb0c4733c 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.0.3 + 8.1.0-SNAPSHOT ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index a072577d6..0bb44bffe 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.0.3 + 8.1.0-SNAPSHOT ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index aba4868e0..9acc7e849 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.0.3 + 8.1.0-SNAPSHOT janmayen diff --git a/pom.xml b/pom.xml index 268a014bb..e69e15a8f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.n52.arctic-sea arctic-sea - 8.0.3 + 8.1.0-SNAPSHOT pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - v8.0.3 + HEAD diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 36d1e68a4..b140dc2f0 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea shetland-parent - 8.0.3 + 8.1.0-SNAPSHOT shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index ccec2e20a..673f535c7 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.0.3 + 8.1.0-SNAPSHOT shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 8e6514365..6b7276a4a 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 8.0.3 + 8.1.0-SNAPSHOT shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 43454a0a2..b01da3b74 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.3 + 8.1.0-SNAPSHOT svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 5de67468a..29c9632c6 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.3 + 8.1.0-SNAPSHOT svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 862eb9f3a..c5be67c70 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.3 + 8.1.0-SNAPSHOT svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 98d164b96..9ae5e3db4 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.3 + 8.1.0-SNAPSHOT svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index fc11aedb9..408a144be 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.3 + 8.1.0-SNAPSHOT svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 70d35fb7d..a8d64913a 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.0.3 + 8.1.0-SNAPSHOT svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index cb56808e6..13ee65f65 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.3 + 8.1.0-SNAPSHOT svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index fd84105f8..7e94156e8 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.0.3 + 8.1.0-SNAPSHOT svalbard-xmlstream 52°North Svalbard XML Stream From d7be20039115a14a2572ac54e8d3e12577111519 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 04:34:43 +0000 Subject: [PATCH 036/456] Bump version.httpcore from 4.4.13 to 4.4.14 Bumps `version.httpcore` from 4.4.13 to 4.4.14. Updates `httpcore` from 4.4.13 to 4.4.14 Updates `httpcore-nio` from 4.4.13 to 4.4.14 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e69e15a8f..1489991ff 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ 5.7.0 3.6.28 2.2 - 4.4.13 + 4.4.14 7.10.0 4.9 3.2.0 From 76b5475f576728dd4c4aa238923a3f9b10aff1b5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 04:31:05 +0000 Subject: [PATCH 037/456] Bump version.jena from 3.16.0 to 3.17.0 Bumps `version.jena` from 3.16.0 to 3.17.0. Updates `jena-core` from 3.16.0 to 3.17.0 Updates `jena-arq` from 3.16.0 to 3.17.0 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e69e15a8f..729c9a486 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 3.0.2 4.2.0 1.3.2 - 3.16.0 + 3.17.0 2.12.0 5.7.0 3.6.28 From 6fbc7cf03c9434442e8a701ca1d1bc015b2be4b8 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Mon, 7 Dec 2020 13:55:27 +0100 Subject: [PATCH 038/456] Add Value implementation for trajectory observations --- NOTICE | 26 +-- .../org/n52/shetland/ogc/om/OmConstants.java | 5 + .../n52/shetland/ogc/om/OmObservation.java | 6 + .../AbstractPofileTrajectoryElement.java | 131 ++++++++++++++ .../shetland/ogc/om/values/ProfileLevel.java | 90 +--------- .../ogc/om/values/TrajectoryElement.java | 131 ++++++++++++++ .../ogc/om/values/TrajectoryValue.java | 161 ++++++++++++++++++ .../visitor/TrajectoryElementVisitor.java | 28 +++ .../ogc/om/values/visitor/ValueVisitor.java | 4 + .../java/org/n52/shetland/util/OMHelper.java | 6 + .../java/org/n52/svalbard/util/SweHelper.java | 6 + .../encode/json/ObservationEncoder.java | 6 + ...actCVDiscretePointCoverageTypeEncoder.java | 6 + .../svalbard/encode/AbstractOmEncoderv20.java | 6 + .../org/n52/svalbard/encode/OmEncoderv20.java | 7 + 15 files changed, 518 insertions(+), 101 deletions(-) create mode 100644 shetland/core/src/main/java/org/n52/shetland/ogc/om/values/AbstractPofileTrajectoryElement.java create mode 100644 shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryElement.java create mode 100644 shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryValue.java create mode 100644 shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/TrajectoryElementVisitor.java diff --git a/NOTICE b/NOTICE index 24a4306ae..a1e3540fc 100644 --- a/NOTICE +++ b/NOTICE @@ -117,19 +117,19 @@ This project includes: JSONLD Java :: Core under Revised BSD License lang-mustache under The Apache Software License, Version 2.0 libphonenumber under The Apache Software License, Version 2.0 - Lucene Common Analyzers under Apache 2 - Lucene Core under Apache 2 - Lucene Grouping under Apache 2 - Lucene Highlighter under Apache 2 - Lucene Join under Apache 2 - Lucene Memory under Apache 2 - Lucene Miscellaneous under Apache 2 - Lucene Queries under Apache 2 - Lucene QueryParsers under Apache 2 - Lucene Sandbox under Apache 2 - Lucene Spatial 3D under Apache 2 - Lucene Spatial Extras under Apache 2 - Lucene Suggest under Apache 2 + Lucene Common Analyzers under Apache License, Version 2.0 + Lucene Core under Apache License, Version 2.0 + Lucene Grouping under Apache License, Version 2.0 + Lucene Highlighter under Apache License, Version 2.0 + Lucene Join under Apache License, Version 2.0 + Lucene Memory under Apache License, Version 2.0 + Lucene Miscellaneous under Apache License, Version 2.0 + Lucene Queries under Apache License, Version 2.0 + Lucene QueryParsers under Apache License, Version 2.0 + Lucene Sandbox under Apache License, Version 2.0 + Lucene Spatial 3D under Apache License, Version 2.0 + Lucene Spatial Extras under Apache License, Version 2.0 + Lucene Suggest under Apache License, Version 2.0 mapper-extras under The Apache Software License, Version 2.0 MaxMind DB Reader under Apache License 2.0 MaxMind GeoIP2 API under Apache License, Version 2.0 diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java index 193f9e75f..57f997559 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java @@ -253,6 +253,9 @@ public interface OmConstants { String OBS_TYPE_PROFILE_OBSERVATION = "http://www.opengis.net/def/observationType/OGC-OM/2.0/OM_ProfileObservation"; + String OBS_TYPE_TRAJECTORY_OBSERVATION = + "http://www.opengis.net/def/observationType/OGC-OM/2.0/OM_TrajectoryObservation"; + String OBS_TYPE_UNKNOWN = OGCConstants.UNKNOWN; String OBS_TYPE_SWE_ARRAY_OBSERVATION = @@ -325,6 +328,7 @@ public interface OmConstants { ObservationType OBS_TYPE_TRUTH_OBSERVATION_TYPE = new ObservationType(OBS_TYPE_TRUTH_OBSERVATION); ObservationType OBS_TYPE_MEASUREMENT_TYPE = new ObservationType(OBS_TYPE_MEASUREMENT); ObservationType OBS_TYPE_REFERENCE_OBSERVATION_TYPE = new ObservationType(OBS_TYPE_REFERENCE_OBSERVATION); + ObservationType OBS_TYPE_TRAJECTORY_OBSERVATION_TYPE = new ObservationType(OBS_TYPE_TRAJECTORY_OBSERVATION); Set OBSERVATION_TYPES = ImmutableSet.of(OBS_TYPE_MEASUREMENT, @@ -336,5 +340,6 @@ public interface OmConstants { OBS_TYPE_TRUTH_OBSERVATION, OBS_TYPE_SWE_ARRAY_OBSERVATION, OBS_TYPE_PROFILE_OBSERVATION, + OBS_TYPE_TRAJECTORY_OBSERVATION, OBS_TYPE_REFERENCE_OBSERVATION); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java index 150532980..17061bf0c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java @@ -34,6 +34,7 @@ import org.n52.shetland.ogc.om.values.ProfileValue; import org.n52.shetland.ogc.om.values.SweDataArrayValue; import org.n52.shetland.ogc.om.values.TVPValue; +import org.n52.shetland.ogc.om.values.TrajectoryValue; import org.n52.shetland.ogc.swe.SweDataArray; import org.n52.shetland.util.CollectionHelper; @@ -410,6 +411,11 @@ protected boolean mergeValues(final ObservationValue observationValue) { ((ProfileValue) getValue().getValue()) .addValues(((ProfileValue) observationValue.getValue()).getValue()); return true; + } else if (getValue().getValue() instanceof TrajectoryValue + && observationValue.getValue() instanceof TrajectoryValue) { + ((TrajectoryValue) getValue().getValue()) + .addValues(((TrajectoryValue) observationValue.getValue()).getValue()); + return true; } else if (getValue().getValue() instanceof SweDataArrayValue && observationValue.getValue() instanceof SweDataArrayValue && ((SweDataArray) getValue().getValue().getValue()).getElementType() diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/AbstractPofileTrajectoryElement.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/AbstractPofileTrajectoryElement.java new file mode 100644 index 000000000..64d43c334 --- /dev/null +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/AbstractPofileTrajectoryElement.java @@ -0,0 +1,131 @@ +/* + * Copyright 2015-2020 52°North Initiative for Geospatial Open Source + * Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.shetland.ogc.om.values; + +import java.util.List; + +import org.locationtech.jts.geom.Geometry; +import org.n52.shetland.ogc.gml.time.Time; +import com.google.common.collect.Lists; + +public abstract class AbstractPofileTrajectoryElement { + + private List> value = Lists.newArrayList(); + private Geometry location; + private Time phenomenonTime; + + + public AbstractPofileTrajectoryElement() { + this(null, null, null); + } + + + public AbstractPofileTrajectoryElement(List> value) { + this(null, null, value); + } + + public AbstractPofileTrajectoryElement(Time phenomenonTime, Geometry location, List> values) { + setPhenomenonTime(phenomenonTime); + setLocation(location); + setValue(values); + } + + + /** + * @return the value + */ + public List> getValue() { + return value; + } + + /** + * @param value + * the value to set + * @return {@code this} + */ + public T setValue(List> value) { + this.value.clear(); + if (value != null) { + this.value.addAll(value); + } + return (T) this; + } + + /** + * @param value + * the value to set + * @return {@code this} + */ + public T addValue(Value value) { + if (value != null) { + this.value.add(value); + } + return (T) this; + } + + public boolean isSetValue() { + return getValue() != null; + } + + /** + * @return the simpleValue + */ + public Value getSimpleValue() { + return value.iterator().next(); + } + + /** + * @return the location + */ + public Geometry getLocation() { + return location; + } + + /** + * @param location + * the location to set + * @return {@code this} + */ + public T setLocation(Geometry location) { + this.location = location; + return (T) this; + } + + public boolean isSetLocation() { + return getLocation() != null; + } + + /** + * @return the phenomenonTime + */ + public Time getPhenomenonTime() { + return phenomenonTime; + } + + /** + * @param phenomenonTime + * the phenomenonTime to set + */ + public void setPhenomenonTime(Time phenomenonTime) { + this.phenomenonTime = phenomenonTime; + } + + public boolean isSetPhenomenonTime() { + return getPhenomenonTime() != null; + } + +} diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java index e62b75c60..22e94e478 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java @@ -23,9 +23,7 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.gml.ReferenceType; -import org.n52.shetland.ogc.gml.time.Time; import org.n52.shetland.ogc.om.NamedValue; import org.n52.shetland.ogc.om.values.visitor.ProfileLevelVisitor; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; @@ -33,8 +31,6 @@ import org.n52.shetland.ogc.swe.SweDataRecord; import org.n52.shetland.ogc.swe.SweField; -import com.google.common.collect.Lists; - /** * Represents the level of a profile * @@ -42,14 +38,11 @@ * @since 1.0.0 * */ -public class ProfileLevel +public class ProfileLevel extends AbstractPofileTrajectoryElement implements Comparable { private QuantityValue levelStart; private QuantityValue levelEnd; - private List> value = Lists.newArrayList(); - private Geometry location; - private Time phenomenonTime; /** * constructor @@ -69,10 +62,9 @@ public ProfileLevel() { * the values */ public ProfileLevel(QuantityValue levelStart, QuantityValue levelEnd, List> value) { - super(); + super(value); this.levelStart = levelStart; this.levelEnd = levelEnd; - this.value = value; } /** @@ -117,84 +109,6 @@ public boolean isSetLevelEnd() { return getLevelEnd() != null; } - /** - * @return the value - */ - public List> getValue() { - return value; - } - - /** - * @param value - * the value to set - * @return {@code this} - */ - public ProfileLevel setValue(List> value) { - this.value.clear(); - this.value.addAll(value); - return this; - } - - /** - * @param value - * the value to set - * @return {@code this} - */ - public ProfileLevel addValue(Value value) { - this.value.add(value); - return this; - } - - public boolean isSetValue() { - return getValue() != null; - } - - /** - * @return the simpleValue - */ - public Value getSimpleValue() { - return value.iterator().next(); - } - - /** - * @return the location - */ - public Geometry getLocation() { - return location; - } - - /** - * @param location - * the location to set - * @return {@code this} - */ - public ProfileLevel setLocation(Geometry location) { - this.location = location; - return this; - } - - public boolean isSetLocation() { - return getLocation() != null; - } - - /** - * @return the phenomenonTime - */ - public Time getPhenomenonTime() { - return phenomenonTime; - } - - /** - * @param phenomenonTime - * the phenomenonTime to set - */ - public void setPhenomenonTime(Time phenomenonTime) { - this.phenomenonTime = phenomenonTime; - } - - public boolean isSetPhenomenonTime() { - return getPhenomenonTime() != null; - } @Override public int compareTo(ProfileLevel o) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryElement.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryElement.java new file mode 100644 index 000000000..8d16568de --- /dev/null +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryElement.java @@ -0,0 +1,131 @@ +/* + * Copyright 2015-2020 52°North Initiative for Geospatial Open Source + * Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.shetland.ogc.om.values; + +import java.util.Collection; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +import org.locationtech.jts.geom.Geometry; +import org.n52.shetland.ogc.gml.time.Time; +import org.n52.shetland.ogc.om.values.visitor.TrajectoryElementVisitor; +import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; +import org.n52.shetland.ogc.swe.SweAbstractDataComponent; +import org.n52.shetland.ogc.swe.SweDataRecord; +import org.n52.shetland.ogc.swe.SweField; + +public class TrajectoryElement extends AbstractPofileTrajectoryElement + implements Comparable { + + public TrajectoryElement() { + super(); + } + + public TrajectoryElement(Time phenomenonTime, Geometry location, List> values) { + super(phenomenonTime, location, values); + } + + @Override + public int compareTo(TrajectoryElement o) { + if (o == null) { + throw new NullPointerException(); + } + if (getPhenomenonTime() == null ^ o.getPhenomenonTime() == null) { + return (getPhenomenonTime() == null) ? -1 : 1; + } + if (getPhenomenonTime() == null && o.getPhenomenonTime() == null) { + return 0; + } + return this.getPhenomenonTime() + .equals(o.getPhenomenonTime()) ? 0 : 1; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final TrajectoryElement other = (TrajectoryElement) obj; + if ((getPhenomenonTime() == null) ? (other.getPhenomenonTime() != null) + : !getPhenomenonTime().equals(other.getPhenomenonTime())) { + return false; + } + if ((getLocation() == null) ? (other.getLocation() != null) : !getLocation().equals(other.getLocation())) { + return false; + } + return super.equals(obj); + } + + @Override + public int hashCode() { + int hash = super.hashCode(); + hash = 37 * hash + Objects.hashCode(this.getLocation()); + hash = 37 * hash + Objects.hashCode(this.getPhenomenonTime()); + hash = 37 * hash + Objects.hashCode(this.getValue()); + return hash; + } + + public Collection accept(TrajectoryElementVisitor visitor) throws OwsExceptionReport { + return visitor.visit(this); + } + + public SweDataRecord asDataRecord() { + return valueAsDataRecord(new SweDataRecord()); + } + + public SweDataRecord valueAsDataRecord() { + return valueAsDataRecord(new SweDataRecord()); + } + + public SweDataRecord valueAsDataRecord(SweDataRecord dataRecord) { + int counter = 1; + for (Value v : getValue()) { + if (v instanceof SweAbstractDataComponent) { + SweAbstractDataComponent adc = (SweAbstractDataComponent) v; + String name; + if (adc.isSetName()) { + name = adc.getName() + .getValue(); + } else if (adc.isSetDefinition()) { + name = adc.getDefinition(); + } else { + name = "component_" + counter++; + } + dataRecord.addField(new SweField(name, adc)); + } + } + if (counter == 1 && dataRecord.getFields() + .size() > 1 && dataRecord.getFields() + .stream() + .map(f -> f.getName() + .getValue()) + .collect(Collectors.toSet()) + .size() != dataRecord.getFields() + .size()) { + for (SweField field : dataRecord.getFields()) { + field.getName() + .setValue(field.getName() + .getValue() + "_" + counter++); + } + } + return dataRecord; + } +} diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryValue.java new file mode 100644 index 000000000..b844cbc77 --- /dev/null +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryValue.java @@ -0,0 +1,161 @@ +/* + * Copyright 2015-2020 52°North Initiative for Geospatial Open Source + * Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.shetland.ogc.om.values; + +import java.util.HashSet; +import java.util.List; +import java.util.TreeMap; + +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.PrecisionModel; +import org.n52.shetland.ogc.UoM; +import org.n52.shetland.ogc.gml.AbstractFeature; +import org.n52.shetland.ogc.gml.CodeWithAuthority; +import org.n52.shetland.ogc.gml.time.Time; +import org.n52.shetland.ogc.gml.time.TimePeriod; +import org.n52.shetland.ogc.om.values.visitor.ValueVisitor; +import org.n52.shetland.ogc.swe.SweDataRecord; +import org.n52.shetland.ogc.swe.SweField; + +import com.google.common.collect.Lists; + +public class TrajectoryValue extends AbstractFeature implements Value> { + + private List values = Lists.newArrayList(); + + public TrajectoryValue(String identifier) { + super(identifier); + } + + public TrajectoryValue(CodeWithAuthority identifier) { + super(identifier); + } + + public TrajectoryValue(CodeWithAuthority identifier, String gmlId) { + super(identifier, gmlId); + } + + @Override + public TrajectoryValue setValue(List value) { + this.values.clear(); + this.values.addAll(value); + return null; + } + + public TrajectoryValue addValue(TrajectoryElement value) { + this.values.add(value); + return this; + } + + public TrajectoryValue addValues(List value) { + this.values.addAll(value); + return this; + } + + @Override + public List getValue() { + return values; + } + + @Override + public void setUnit(String unit) { + } + + @Override + public Value> setUnit(UoM unit) { + // nothing to do + return this; + } + + @Override + public UoM getUnitObject() { + return null; + } + + @Override + public String getUnit() { + return null; + } + + @Override + public X accept(ValueVisitor visitor) throws E { + return visitor.visit(this); + } + + public boolean isSetPhenomenonTime() { + return values.stream().anyMatch(l -> l.isSetPhenomenonTime()); + } + + public Time getPhenomenonTime() { + TimePeriod time = new TimePeriod(); + for (TrajectoryElement trajectoryElement : values) { + if (trajectoryElement.isSetPhenomenonTime()) { + time.extendToContain(trajectoryElement.getPhenomenonTime()); + } + } + return time; + } + + public boolean isSetGeometry() { + return isSetValue() && getValue().iterator().next().isSetLocation(); + } + + public Geometry getGeometry() { + if (isSetGeometry()) { + TreeMap map = new TreeMap<>(); + int srid = -1; + for (TrajectoryElement element : getValue()) { + if (element.isSetPhenomenonTime() && element.isSetLocation()) { + if (srid < 0) { + srid = element.getLocation().getSRID(); + } + map.put(element.getPhenomenonTime(), element.getLocation().getCoordinate()); + } + } + if (!map.isEmpty()) { + if (new HashSet<>(map.values()).size() == 1) { + return getValue().iterator().next().getLocation(); + } else { + return new GeometryFactory(new PrecisionModel(), srid) + .createLineString(map.values().toArray(new Coordinate[1])); + } + } + } + return null; + } + + public SweDataRecord asDataRecord() { + SweDataRecord dataRecord = new SweDataRecord(); + if (isSetIdentifier()) { + dataRecord.setIdentifier(getIdentifier()); + } + if (isSetName()) { + dataRecord.setName(getName()); + } + if (isSetDescription()) { + dataRecord.setDescription(getDescription()); + } + int counter = 0; + for (TrajectoryElement elem : getValue()) { + dataRecord.addField(new SweField("element_" + counter++, elem.asDataRecord())); + } + return dataRecord; + } + +} diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/TrajectoryElementVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/TrajectoryElementVisitor.java new file mode 100644 index 000000000..9e0f3f57a --- /dev/null +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/TrajectoryElementVisitor.java @@ -0,0 +1,28 @@ +/* + * Copyright 2015-2020 52°North Initiative for Geospatial Open Source + * Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.shetland.ogc.om.values.visitor; + +import java.util.Collection; + +import org.n52.shetland.ogc.om.values.TrajectoryElement; +import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; + +public interface TrajectoryElementVisitor { + + Collection visit(TrajectoryElement value) + throws OwsExceptionReport; +} diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java index 568a91c2d..464d8e91a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java @@ -36,6 +36,7 @@ import org.n52.shetland.ogc.om.values.TextValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.TimeValue; +import org.n52.shetland.ogc.om.values.TrajectoryValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.XmlValue; @@ -101,6 +102,9 @@ T visit(RectifiedGridCoverage value) T visit(ProfileValue value) throws X; + T visit(TrajectoryValue value) + throws X; + T visit(UnknownValue value) throws X; diff --git a/shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java b/shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java index 26306155d..f9c9bac09 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java @@ -48,6 +48,7 @@ import org.n52.shetland.ogc.om.values.TextValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.TimeValue; +import org.n52.shetland.ogc.om.values.TrajectoryValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; import org.n52.shetland.ogc.om.values.XmlValue; @@ -283,6 +284,11 @@ public String visit(ProfileValue value) { return defaultValue(); } + @Override + public String visit(TrajectoryValue value) throws RuntimeException { + return defaultValue(); + } + @Override public String visit(TimeRangeValue value) { return defaultValue(); diff --git a/svalbard/core/src/main/java/org/n52/svalbard/util/SweHelper.java b/svalbard/core/src/main/java/org/n52/svalbard/util/SweHelper.java index 688f67cd4..77df56fd6 100644 --- a/svalbard/core/src/main/java/org/n52/svalbard/util/SweHelper.java +++ b/svalbard/core/src/main/java/org/n52/svalbard/util/SweHelper.java @@ -55,6 +55,7 @@ import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; import org.n52.shetland.ogc.om.values.TimeValue; +import org.n52.shetland.ogc.om.values.TrajectoryValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; @@ -363,6 +364,11 @@ public SweAbstractDataComponent visit(ProfileValue value) throws EncodingExcepti throw notSupported(); } + @Override + public SweAbstractDataComponent visit(TrajectoryValue value) throws EncodingException { + throw notSupported(); + } + @Override public SweAbstractDataComponent visit(TimeValue value) throws EncodingException { SweTime sweTime = new SweTime(); diff --git a/svalbard/json/src/main/java/org/n52/svalbard/encode/json/ObservationEncoder.java b/svalbard/json/src/main/java/org/n52/svalbard/encode/json/ObservationEncoder.java index 76142e38b..4638e0310 100644 --- a/svalbard/json/src/main/java/org/n52/svalbard/encode/json/ObservationEncoder.java +++ b/svalbard/json/src/main/java/org/n52/svalbard/encode/json/ObservationEncoder.java @@ -46,6 +46,7 @@ import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; import org.n52.shetland.ogc.om.values.TimeValue; +import org.n52.shetland.ogc.om.values.TrajectoryValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; @@ -306,6 +307,11 @@ public JsonNode visit(ProfileValue value) throw new UnsupportedEncoderInputException(ObservationEncoder.this, value); } + @Override + public JsonNode visit(TrajectoryValue value) throws EncodingException { + throw new UnsupportedEncoderInputException(ObservationEncoder.this, value); + } + @Override public JsonNode visit(TimeValue value) throws EncodingException { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java index 782474f55..1f6f0ff08 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java @@ -46,6 +46,7 @@ import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; import org.n52.shetland.ogc.om.values.TimeValue; +import org.n52.shetland.ogc.om.values.TrajectoryValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; @@ -327,6 +328,11 @@ public XmlObject visit(ProfileValue value) throws EncodingException { return encodeObjectToXml(value.getDefaultElementEncoding(), value); } + @Override + public XmlObject visit(TrajectoryValue value) throws EncodingException { + return encodeObjectToXml(value.getDefaultElementEncoding(), value); + } + @Override public XmlObject visit(TimeValue value) throws EncodingException { return null; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java index f4ce54eb8..a0253803b 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java @@ -64,6 +64,7 @@ import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; import org.n52.shetland.ogc.om.values.TimeValue; +import org.n52.shetland.ogc.om.values.TrajectoryValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; @@ -783,6 +784,11 @@ public XmlObject visit(ProfileValue value) return defaultValue(value); } + @Override + public XmlObject visit(TrajectoryValue value) throws EncodingException { + return defaultValue(value); + } + @Override public XmlObject visit(TimeValue value) throws EncodingException { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java index 5fe346edf..367f5236b 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java @@ -64,6 +64,7 @@ import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; import org.n52.shetland.ogc.om.values.TimeValue; +import org.n52.shetland.ogc.om.values.TrajectoryValue; import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.XmlValue; @@ -133,6 +134,7 @@ public class OmEncoderv20 extends AbstractOmEncoderv20 { OmConstants.OBS_TYPE_MEASUREMENT_TYPE, OmConstants.OBS_TYPE_TEXT_OBSERVATION_TYPE, OmConstants.OBS_TYPE_TRUTH_OBSERVATION_TYPE, + OmConstants.OBS_TYPE_TRAJECTORY_OBSERVATION_TYPE, OmConstants.OBS_TYPE_REFERENCE_OBSERVATION_TYPE)); private static final Map>> SUPPORTED_RESPONSE_FORMATS = Collections.singletonMap( @@ -575,6 +577,11 @@ public XmlObject visit(ProfileValue value) throws EncodingException { return encodeGWML(value, EncodingContext.of(XmlBeansEncodingFlags.FOR_OBSERVATION)); } + @Override + public XmlObject visit(TrajectoryValue value) throws EncodingException { + return null; + } + @Override public XmlObject visit(TimeValue value) throws EncodingException { return null; From 8d1a77c500a8bf587b579cbf5e8c8fdce913a9fd Mon Sep 17 00:00:00 2001 From: Christian Autermann Date: Mon, 7 Dec 2020 15:07:27 +0100 Subject: [PATCH 039/456] spotbugs --- janmayen/src/main/java/org/n52/janmayen/http/MediaType.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/janmayen/src/main/java/org/n52/janmayen/http/MediaType.java b/janmayen/src/main/java/org/n52/janmayen/http/MediaType.java index 6830e5c1b..f67d7c1e2 100644 --- a/janmayen/src/main/java/org/n52/janmayen/http/MediaType.java +++ b/janmayen/src/main/java/org/n52/janmayen/http/MediaType.java @@ -169,9 +169,9 @@ public boolean hasParameter(String parameter) { public float getQuality() { if (hasParameter(QUALITY_PARAMETER)) { - return Float.valueOf(getParameter(QUALITY_PARAMETER).iterator().next()); + return Float.parseFloat(getParameter(QUALITY_PARAMETER).iterator().next()); } else { - return 1; + return 1.0f; } } From b4f8cce6b589c9b414ff0714a3468637dd071970 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Tue, 8 Dec 2020 15:31:03 +0100 Subject: [PATCH 040/456] add text decoding to jason decoder --- .../src/main/resources/schema/Parameter.json | 22 ++++++++++++++++++- .../decode/json/ObservationDecoder.java | 14 ++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/svalbard/json-common/src/main/resources/schema/Parameter.json b/svalbard/json-common/src/main/resources/schema/Parameter.json index 613545eb0..dbc1be48c 100644 --- a/svalbard/json-common/src/main/resources/schema/Parameter.json +++ b/svalbard/json-common/src/main/resources/schema/Parameter.json @@ -31,7 +31,9 @@ { "$ref": "#/definitions/category" }, - + { + "$ref": "#/definitions/text" + }, { "$ref": "http://www.52north.org/schema/json/Geometry#" } @@ -70,6 +72,24 @@ "type": "string" } } + }, + "text": { + "type": "object", + "required": [ + "name", + "value" + ], + "properties": { + "name": { + "type": "string" + }, + "description": { + "type": "string" + }, + "value": { + "type": "string" + } + } } } } \ No newline at end of file diff --git a/svalbard/json/src/main/java/org/n52/svalbard/decode/json/ObservationDecoder.java b/svalbard/json/src/main/java/org/n52/svalbard/decode/json/ObservationDecoder.java index c37c051d7..b779b5043 100644 --- a/svalbard/json/src/main/java/org/n52/svalbard/decode/json/ObservationDecoder.java +++ b/svalbard/json/src/main/java/org/n52/svalbard/decode/json/ObservationDecoder.java @@ -126,6 +126,7 @@ public OmObservationConstellation parseObservationConstellation(JsonNode node) oc.setObservableProperty(parseObservableProperty(node)); oc.setObservationType(parseObservationType(node)); oc.setFeatureOfInterest(parseFeatureOfInterest(node)); + oc.setParameter(parseParameter(node)); return oc; } @@ -210,6 +211,10 @@ private NamedValue parseNamedValueValue(JsonNode value) NamedValue nv = new NamedValue<>(); nv.setValue(new GeometryValue(geometryDecoder.decodeJSON(value, false))); return nv; + } else if (value.has(JSONConstants.NAME)) { + NamedValue nv = new NamedValue<>(); + nv.setValue(parseTextValue(value)); + return nv; } } throw new DecodingException("%s is not yet supported", value.toString()); @@ -257,6 +262,15 @@ private QuantityValue parseQuantityValue(JsonNode node) node.path(JSONConstants.UOM).textValue()); } + private TextValue parseTextValue(JsonNode node) { + TextValue textValue = new TextValue(node.path(JSONConstants.VALUE).textValue()); + textValue.setName(node.path(JSONConstants.NAME).textValue()); + if (node.has(JSONConstants.DESCRIPTION)) { + textValue.setDescription(node.path(JSONConstants.DESCRIPTION).textValue()); + } + return textValue; + } + private ObservationValue parseTextObservationValue(JsonNode node) throws DecodingException { final TextValue v = new TextValue(node.path(JSONConstants.RESULT).textValue()); From cd55bea4ee7c7748e89e471c91aa57f274ed3099 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Tue, 8 Dec 2020 15:31:25 +0100 Subject: [PATCH 041/456] add category handling from older version --- .../org/n52/shetland/ogc/om/OmConstants.java | 2 + .../n52/shetland/ogc/om/OmObservation.java | 62 ++++++++++++++++- .../ogc/om/OmObservationConstellation.java | 69 +++++++++++++++++++ .../n52/shetland/ogc/om/ParameterHolder.java | 6 +- 4 files changed, 137 insertions(+), 2 deletions(-) diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java index 57f997559..0fcaa2acb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java @@ -212,6 +212,8 @@ public interface OmConstants { String PARAMETER_NAME_TO_ELEVATION = "toElevation"; + String PARAMETER_NAME_CATEGORY = "category"; + String PARAMETER = EN_PARAMETER; String OM_PARAMETER = "om:" + PARAMETER; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java index 17061bf0c..aa8ced9b9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java @@ -23,8 +23,10 @@ import java.util.Objects; import java.util.Set; +import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.gml.CodeWithAuthority; +import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.gml.time.IndeterminateValue; import org.n52.shetland.ogc.gml.time.Time; import org.n52.shetland.ogc.gml.time.TimeInstant; @@ -34,13 +36,13 @@ import org.n52.shetland.ogc.om.values.ProfileValue; import org.n52.shetland.ogc.om.values.SweDataArrayValue; import org.n52.shetland.ogc.om.values.TVPValue; +import org.n52.shetland.ogc.om.values.TextValue; import org.n52.shetland.ogc.om.values.TrajectoryValue; import org.n52.shetland.ogc.swe.SweDataArray; import org.n52.shetland.util.CollectionHelper; import com.google.common.base.Strings; import com.google.common.collect.Sets; -import org.locationtech.jts.geom.Geometry; /** * Class represents a SOS/O&M observation @@ -162,6 +164,9 @@ public OmObservation(CodeWithAuthority identifier, String gmlId) { * @return the observationConstellation */ public OmObservationConstellation getObservationConstellation() { + if (isSetCategoryParameter() && observationConstellation != null && !observationConstellation.isSetCategoryParameter()) { + observationConstellation.addCategoryParameter(getCategoryParameter()); + } return observationConstellation; } @@ -711,6 +716,61 @@ public NamedValue getHeightDepthParameter() { return parameterHolder.getHeightDepthParameter(); } + /** + * Check whether category parameter is set + * + * @return true, if category parameter is set + */ + public boolean isSetCategoryParameter() { + return parameterHolder.hasParameter(OmConstants.PARAMETER_NAME_CATEGORY); + } + + /** + * Remove category parameter + */ + public void removeCategoryParameter() { + if (isSetCategoryParameter()) { + removeParameter(getCategoryParameter()); + } + } + + /** + * Add category to observation + * + * @param category + * The category to set + * @return this + */ + public OmObservation addCategoryParameter(String category) { + return addCategoryParameter(new TextValue(category)); + } + + public OmObservation addCategoryParameter(TextValue category) { + return addCategoryParameter(new NamedValue(new ReferenceType(OmConstants.PARAMETER_NAME_CATEGORY), + category)); + } + + public OmObservation addCategoryParameter(NamedValue categoryParameter) { + parameterHolder.addParameter(categoryParameter); + return this; + } + + /** + * Get category parameter + * + * @return category parameter + */ + public NamedValue getCategoryParameter() { + if (parameterHolder.isSetParameter()) { + for (NamedValue namedValue : parameterHolder.getParameter()) { + if (namedValue.getName().getHref().equalsIgnoreCase(OmConstants.PARAMETER_NAME_CATEGORY)) { + return (NamedValue) namedValue; + } + } + } + return null; + } + public OmObservation cloneTemplate() { return cloneTemplate(new OmObservation()); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java index 741c91109..cc6deac98 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java @@ -16,14 +16,19 @@ */ package org.n52.shetland.ogc.om; +import java.math.BigDecimal; +import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; import org.n52.janmayen.Copyable; import org.n52.shetland.ogc.gml.AbstractFeature; +import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.om.series.DefaultPointMetadata; import org.n52.shetland.ogc.om.series.Metadata; +import org.n52.shetland.ogc.om.values.TextValue; +import org.n52.shetland.ogc.om.values.Value; import org.n52.shetland.w3c.Nillable; import com.google.common.base.Objects; @@ -64,6 +69,11 @@ public class OmObservationConstellation private Metadata metadata; + /** + * O&M parameter. + */ + private final ParameterHolder parameterHolder = new ParameterHolder(); + /** * default constructor */ @@ -427,6 +437,65 @@ public void setMetadata(Metadata metadata) { this.metadata = metadata; } + public void setParameter(Collection> parameter) { + this.parameterHolder.addParameter(parameter); + } + + /** + * Check whether category parameter is set + * + * @return true, if category parameter is set + */ + public boolean isSetCategoryParameter() { + return parameterHolder.hasParameter(OmConstants.PARAMETER_NAME_CATEGORY); + } + + /** + * Remove category parameter + */ + public void removeCategoryParameter() { + if (isSetCategoryParameter()) { + parameterHolder.removeParameter(getCategoryParameter()); + } + } + + /** + * Add category to observation + * + * @param category + * The category to set + * @return this + */ + public OmObservationConstellation addCategoryParameter(String category) { + return addCategoryParameter(new TextValue(category)); + } + + public OmObservationConstellation addCategoryParameter(TextValue category) { + return addCategoryParameter(new NamedValue(new ReferenceType(OmConstants.PARAMETER_NAME_CATEGORY), + category)); + } + + public OmObservationConstellation addCategoryParameter(NamedValue categoryParameter) { + parameterHolder.addParameter(categoryParameter); + return this; + } + + /** + * Get category parameter + * + * @return category parameter + */ + public NamedValue getCategoryParameter() { + if (parameterHolder.isSetParameter()) { + for (NamedValue namedValue : parameterHolder.getParameter()) { + if (namedValue.getName().getHref().equalsIgnoreCase(OmConstants.PARAMETER_NAME_CATEGORY)) { + return (NamedValue) namedValue; + } + } + } + return null; + } + @Override public String toString() { StringBuilder builder = new StringBuilder("OmObservationConstellation ["); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java index 176931ce7..4eebcf04d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java @@ -40,7 +40,7 @@ public SortedSet> getParameter() { @SuppressWarnings("unchecked") public Optional> getParameter(String name) { - if (name == null || !name.isEmpty()) { + if (name == null || name.isEmpty()) { return Optional.empty(); } return this.parameter.stream() @@ -49,6 +49,10 @@ public Optional> getParameter(String name) { .findAny(); } + public boolean hasParameter(String name) { + return getParameter(name).isPresent(); + } + public ParameterHolder setParameter(Collection> parameter) { this.parameter.clear(); if (parameter != null) { From 4b69779c305e963f85f69ede5b68a6548e01e2e5 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Wed, 9 Dec 2020 07:59:56 +0100 Subject: [PATCH 042/456] fix checkstyle --- .../src/main/java/org/n52/shetland/ogc/om/OmObservation.java | 3 ++- .../org/n52/shetland/ogc/om/OmObservationConstellation.java | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java index aa8ced9b9..15290e306 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java @@ -164,7 +164,8 @@ public OmObservation(CodeWithAuthority identifier, String gmlId) { * @return the observationConstellation */ public OmObservationConstellation getObservationConstellation() { - if (isSetCategoryParameter() && observationConstellation != null && !observationConstellation.isSetCategoryParameter()) { + if (isSetCategoryParameter() && observationConstellation != null + && !observationConstellation.isSetCategoryParameter()) { observationConstellation.addCategoryParameter(getCategoryParameter()); } return observationConstellation; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java index cc6deac98..1880fba21 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java @@ -16,7 +16,6 @@ */ package org.n52.shetland.ogc.om; -import java.math.BigDecimal; import java.util.Collection; import java.util.HashSet; import java.util.List; @@ -28,7 +27,6 @@ import org.n52.shetland.ogc.om.series.DefaultPointMetadata; import org.n52.shetland.ogc.om.series.Metadata; import org.n52.shetland.ogc.om.values.TextValue; -import org.n52.shetland.ogc.om.values.Value; import org.n52.shetland.w3c.Nillable; import com.google.common.base.Objects; From e6bbbd1f76339c825d5e9e410ccc0dae4bd12f19 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 10 Dec 2020 04:32:29 +0000 Subject: [PATCH 043/456] Bump version.spring from 5.3.1 to 5.3.2 Bumps `version.spring` from 5.3.1 to 5.3.2. Updates `spring-test` from 5.3.1 to 5.3.2 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.1...v5.3.2) Updates `spring-web` from 5.3.1 to 5.3.2 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.1...v5.3.2) Updates `spring-beans` from 5.3.1 to 5.3.2 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.1...v5.3.2) Updates `spring-core` from 5.3.1 to 5.3.2 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.1...v5.3.2) Updates `spring-context` from 5.3.1 to 5.3.2 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.1...v5.3.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 295e3d942..d982623a7 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.3.1 + 5.3.2 1.7.30 3.1.0 1.0.4 From c636fdd70942e0155bf065478a158c5a3e002af6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 10 Dec 2020 04:33:15 +0000 Subject: [PATCH 044/456] Bump version.elastic from 7.10.0 to 7.10.1 Bumps `version.elastic` from 7.10.0 to 7.10.1. Updates `elasticsearch` from 7.10.0 to 7.10.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.10.0...v7.10.1) Updates `elasticsearch-rest-client` from 7.10.0 to 7.10.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.10.0...v7.10.1) Updates `elasticsearch-rest-high-level-client` from 7.10.0 to 7.10.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.10.0...v7.10.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 295e3d942..deced2feb 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ 3.6.28 2.2 4.4.14 - 7.10.0 + 7.10.1 4.9 3.2.0 From de2b7d8de8819b447b47193b2103a5853696025d Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Thu, 10 Dec 2020 10:42:25 +0100 Subject: [PATCH 045/456] update jdks in traviy.yml to 8,11 and 15 --- .travis.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 771d95ce1..a2ebbd87c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,24 +2,11 @@ language: java dist: xenial jdk: - openjdk8 -- openjdk10 - openjdk11 matrix: include: # https://www.deps.co/guides/travis-ci-latest-java/#certificate-issues - - jdk: openjdk9 - before_install: - - rm "${JAVA_HOME}/lib/security/cacerts" - - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts" - - jdk: openjdk12 - before_install: - - rm "${JAVA_HOME}/lib/security/cacerts" - - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts" - - jdk: openjdk13 - before_install: - - rm "${JAVA_HOME}/lib/security/cacerts" - - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts" - - jdk: openjdk14 + - jdk: openjdk15 before_install: - rm "${JAVA_HOME}/lib/security/cacerts" - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts" From 0157411966758b8b1038e9e198583f8a5fa6534f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 04:27:32 +0000 Subject: [PATCH 046/456] Bump parent from 19 to 21 Bumps [parent](https://github.com/52North/maven-parents) from 19 to 21. - [Release notes](https://github.com/52North/maven-parents/releases) - [Commits](https://github.com/52North/maven-parents/compare/v19...v21) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ef665f6a..43009a64a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.n52 parent - 19 + 21 org.n52.arctic-sea From a7ad670d66182a112b18352a22e4427c5a0ee352 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Tue, 15 Dec 2020 13:55:41 +0100 Subject: [PATCH 047/456] [maven-release-plugin] prepare release v8.1.0 --- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index d86aa4537..da5cb2be4 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0-SNAPSHOT + 8.1.0 faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index f2300431e..a59939b58 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0-SNAPSHOT + 8.1.0 faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 342b0f7c4..9746dfb31 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0-SNAPSHOT + 8.1.0 faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index 16e9c5887..ba7679018 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.1.0 faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 6166ae4ed..82c52a57d 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0-SNAPSHOT + 8.1.0 faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 518e78449..791f97dbc 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.1.0 iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index 5731b5a74..ed641e204 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.1.0 iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 1815dddf6..cfb91400f 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.1.0 ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 5e7f489b9..12bb2465d 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.1.0 ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index bb0c4733c..6e9eff255 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.1.0 ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 0bb44bffe..da82c11a0 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0-SNAPSHOT + 8.1.0 ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 9acc7e849..380c28638 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.1.0 janmayen diff --git a/pom.xml b/pom.xml index 43009a64a..5a82e74e6 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.1.0 pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - HEAD + v8.1.0 diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index b140dc2f0..8ce6a6aa6 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea shetland-parent - 8.1.0-SNAPSHOT + 8.1.0 shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index 673f535c7..f4c3f9976 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.1.0 shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 6b7276a4a..6ff71015e 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 8.1.0-SNAPSHOT + 8.1.0 shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index b01da3b74..d83996cb7 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.1.0 svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 29c9632c6..94a28e23b 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.1.0 svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index c5be67c70..edd5ab2cf 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.1.0 svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 9ae5e3db4..b4bd5b6a7 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.1.0 svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 408a144be..6ebda6330 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.1.0 svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index a8d64913a..9a7e96c75 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0-SNAPSHOT + 8.1.0 svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 13ee65f65..ab787174d 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.1.0 svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 7e94156e8..156442bd4 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0-SNAPSHOT + 8.1.0 svalbard-xmlstream 52°North Svalbard XML Stream From 6776e3687ce73ae8d0532637efc5adb3e05a3e1b Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Tue, 15 Dec 2020 13:55:57 +0100 Subject: [PATCH 048/456] [maven-release-plugin] prepare for next development iteration --- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index da5cb2be4..53c17de1e 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0 + 8.2.0-SNAPSHOT faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index a59939b58..a1135a04c 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0 + 8.2.0-SNAPSHOT faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 9746dfb31..aae066b25 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0 + 8.2.0-SNAPSHOT faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index ba7679018..303a66a7a 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0 + 8.2.0-SNAPSHOT faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 82c52a57d..6cde23bc4 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.1.0 + 8.2.0-SNAPSHOT faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 791f97dbc..6bfb93817 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0 + 8.2.0-SNAPSHOT iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index ed641e204..073a5bb4d 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0 + 8.2.0-SNAPSHOT iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index cfb91400f..66cc209aa 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0 + 8.2.0-SNAPSHOT ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 12bb2465d..690c29b0d 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0 + 8.2.0-SNAPSHOT ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 6e9eff255..bc42953f1 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0 + 8.2.0-SNAPSHOT ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index da82c11a0..1d7c6a1ad 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.1.0 + 8.2.0-SNAPSHOT ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 380c28638..9f48e5d87 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0 + 8.2.0-SNAPSHOT janmayen diff --git a/pom.xml b/pom.xml index 5a82e74e6..9a2ae2c7f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0 + 8.2.0-SNAPSHOT pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - v8.1.0 + HEAD diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 8ce6a6aa6..31de85ba9 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea shetland-parent - 8.1.0 + 8.2.0-SNAPSHOT shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index f4c3f9976..d16b22af0 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0 + 8.2.0-SNAPSHOT shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 6ff71015e..257ab5c4c 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 8.1.0 + 8.2.0-SNAPSHOT shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index d83996cb7..eddcf6a07 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0 + 8.2.0-SNAPSHOT svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 94a28e23b..99a8abe48 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0 + 8.2.0-SNAPSHOT svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index edd5ab2cf..25717543b 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0 + 8.2.0-SNAPSHOT svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index b4bd5b6a7..7b56117b2 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0 + 8.2.0-SNAPSHOT svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 6ebda6330..247524115 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0 + 8.2.0-SNAPSHOT svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 9a7e96c75..7c8553366 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.1.0 + 8.2.0-SNAPSHOT svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index ab787174d..1ea569baa 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0 + 8.2.0-SNAPSHOT svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 156442bd4..9d79d724e 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.1.0 + 8.2.0-SNAPSHOT svalbard-xmlstream 52°North Svalbard XML Stream From 80d5ea896ffb4df1e47b9a161401c90b4a47ad2b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 24 Dec 2020 04:33:53 +0000 Subject: [PATCH 049/456] Bump jts-core from 1.17.1 to 1.18.0 Bumps jts-core from 1.17.1 to 1.18.0. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a2ae2c7f..c94fa5aca 100644 --- a/pom.xml +++ b/pom.xml @@ -316,7 +316,7 @@ org.locationtech.jts jts-core - 1.17.1 + 1.18.0 org.geolatte From d576c54bd9684e86894480b34b34ebe1b4a336b5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 28 Dec 2020 04:35:49 +0000 Subject: [PATCH 050/456] Bump version.olingo from 4.7.1 to 4.8.0 Bumps `version.olingo` from 4.7.1 to 4.8.0. Updates `odata-server-core` from 4.7.1 to 4.8.0 Updates `odata-commons-core` from 4.7.1 to 4.8.0 Updates `odata-server-api` from 4.7.1 to 4.8.0 Updates `odata-commons-api` from 4.7.1 to 4.8.0 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a2ae2c7f..d635a8910 100644 --- a/pom.xml +++ b/pom.xml @@ -144,7 +144,7 @@ 3.1.0 1.0.4 2.7.0 - 4.7.1 + 4.8.0 3.0.2 4.2.0 1.3.2 From 116a8f3a448f7f1850b96c2c40651d96215b1590 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Dec 2020 04:33:26 +0000 Subject: [PATCH 051/456] Bump joda-time from 2.10.8 to 2.10.9 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.8 to 2.10.9. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.8...v2.10.9) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a2ae2c7f..e400f653c 100644 --- a/pom.xml +++ b/pom.xml @@ -311,7 +311,7 @@ joda-time joda-time - 2.10.8 + 2.10.9 org.locationtech.jts From 04ea8037f4b9badbfc85ccf555886a225ec1728d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 Jan 2021 04:33:06 +0000 Subject: [PATCH 052/456] Bump version.mockito from 3.6.28 to 3.7.0 Bumps `version.mockito` from 3.6.28 to 3.7.0. Updates `mockito-core` from 3.6.28 to 3.7.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.6.28...v3.7.0) Updates `mockito-junit-jupiter` from 3.6.28 to 3.7.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.6.28...v3.7.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a2ae2c7f..1cb4445d6 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 3.17.0 2.12.0 5.7.0 - 3.6.28 + 3.7.0 2.2 4.4.14 7.10.1 From 47a4182288e2ff84e3f89e27ab6b43b3daea3124 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Tue, 5 Jan 2021 09:20:08 +0100 Subject: [PATCH 053/456] Update license header --- faroe/annotations/pom.xml | 2 +- .../src/main/java/org/n52/faroe/annotation/Configurable.java | 2 +- .../src/main/java/org/n52/faroe/annotation/Setting.java | 2 +- faroe/core/pom.xml | 2 +- faroe/core/src/main/java/org/n52/faroe/AbstractOrdered.java | 2 +- .../src/main/java/org/n52/faroe/AbstractSettingDefinition.java | 2 +- .../src/main/java/org/n52/faroe/FileSettingsConfiguration.java | 2 +- .../core/src/main/java/org/n52/faroe/JSONSettingConstants.java | 2 +- faroe/core/src/main/java/org/n52/faroe/Ordered.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingDefinition.java | 2 +- .../src/main/java/org/n52/faroe/SettingDefinitionGroup.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingType.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingValue.java | 2 +- .../core/src/main/java/org/n52/faroe/SettingValueFactory.java | 2 +- .../core/src/main/java/org/n52/faroe/SettingsChangeEvent.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingsDao.java | 2 +- .../core/src/main/java/org/n52/faroe/SettingsFileWatcher.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingsService.java | 2 +- .../core/src/main/java/org/n52/faroe/SettingsServiceImpl.java | 2 +- .../java/org/n52/faroe/settings/BooleanSettingDefinition.java | 2 +- .../java/org/n52/faroe/settings/ChoiceSettingDefinition.java | 2 +- .../java/org/n52/faroe/settings/DateTimeSettingDefinition.java | 2 +- .../java/org/n52/faroe/settings/FileSettingDefinition.java | 2 +- .../java/org/n52/faroe/settings/IntegerSettingDefinition.java | 2 +- .../faroe/settings/MultilingualStringSettingDefinition.java | 2 +- .../java/org/n52/faroe/settings/NumericSettingDefinition.java | 2 +- .../java/org/n52/faroe/settings/StringSettingDefinition.java | 2 +- .../main/java/org/n52/faroe/settings/UriSettingDefinition.java | 2 +- .../src/test/java/org/n52/faroe/SettingValueFactoryTest.java | 2 +- .../org/n52/faroe/settings/AbstractSettingsDefinitionTest.java | 2 +- .../org/n52/faroe/settings/BooleanSettingValueForTesting.java | 2 +- .../org/n52/faroe/settings/ChoiceSettingValueForTesting.java | 2 +- .../org/n52/faroe/settings/FileSettingValueForTesting.java | 2 +- .../org/n52/faroe/settings/IntegerSettingValueForTesting.java | 2 +- .../n52/faroe/settings/MultilingualStringValueForTesting.java | 2 +- .../org/n52/faroe/settings/NumericSettingValueForTesting.java | 2 +- .../org/n52/faroe/settings/StringSettingValueForTesting.java | 2 +- .../n52/faroe/settings/TimeInstantSettingValueForTesting.java | 2 +- .../java/org/n52/faroe/settings/UriSettingValueForTesting.java | 2 +- faroe/json/pom.xml | 2 +- .../json/src/main/java/org/n52/faroe/json/AbstractJsonDao.java | 2 +- .../src/main/java/org/n52/faroe/json/JsonConfiguration.java | 2 +- .../src/main/java/org/n52/faroe/json/JsonSettingValue.java | 2 +- .../main/java/org/n52/faroe/json/JsonSettingValueFactory.java | 2 +- .../json/src/main/java/org/n52/faroe/json/JsonSettingsDao.java | 2 +- .../src/main/java/org/n52/faroe/json/JsonSettingsDecoder.java | 2 +- .../src/main/java/org/n52/faroe/json/JsonSettingsEncoder.java | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- .../utils/src/main/java/org/n52/faroe/ConfigurationError.java | 2 +- faroe/utils/src/main/java/org/n52/faroe/Validation.java | 2 +- iceland/core/pom.xml | 2 +- .../main/java/org/n52/iceland/binding/AbstractXmlBinding.java | 2 +- .../core/src/main/java/org/n52/iceland/binding/Binding.java | 2 +- .../src/main/java/org/n52/iceland/binding/BindingFactory.java | 2 +- .../core/src/main/java/org/n52/iceland/binding/BindingKey.java | 2 +- .../main/java/org/n52/iceland/binding/BindingRepository.java | 2 +- .../java/org/n52/iceland/binding/EncodingExceptionHandler.java | 2 +- .../main/java/org/n52/iceland/binding/MediaTypeBindingKey.java | 2 +- .../src/main/java/org/n52/iceland/binding/PathBindingKey.java | 2 +- .../src/main/java/org/n52/iceland/binding/SimpleBinding.java | 2 +- .../src/main/java/org/n52/iceland/binding/exi/EXIBinding.java | 2 +- .../src/main/java/org/n52/iceland/binding/exi/EXISettings.java | 2 +- .../src/main/java/org/n52/iceland/binding/exi/EXIUtils.java | 2 +- .../main/java/org/n52/iceland/binding/json/JSONBinding.java | 2 +- .../java/org/n52/iceland/binding/kvp/AbstractKvpDecoder.java | 2 +- .../src/main/java/org/n52/iceland/binding/kvp/KvpBinding.java | 2 +- .../src/main/java/org/n52/iceland/binding/pox/PoxBinding.java | 2 +- .../main/java/org/n52/iceland/binding/soap/SoapBinding.java | 2 +- .../core/src/main/java/org/n52/iceland/cache/ContentCache.java | 2 +- .../java/org/n52/iceland/cache/ContentCacheController.java | 2 +- .../org/n52/iceland/cache/ContentCachePersistenceStrategy.java | 2 +- .../main/java/org/n52/iceland/cache/ContentCacheUpdate.java | 2 +- .../main/java/org/n52/iceland/cache/WritableContentCache.java | 2 +- .../cache/ctrl/AbstractSchedulingContentCacheController.java | 2 +- .../org/n52/iceland/cache/ctrl/CompleteCacheUpdateFactory.java | 2 +- .../org/n52/iceland/cache/ctrl/ContentCacheControllerImpl.java | 2 +- .../java/org/n52/iceland/cache/ctrl/ContentCacheFactory.java | 2 +- .../cache/ctrl/ScheduledContentCacheControllerSettings.java | 2 +- .../AbstractPersistingCachePersistenceStrategy.java | 2 +- .../cache/ctrl/persistence/AsyncCachePersistenceStrategy.java | 2 +- .../persistence/AsyncCachePersistenceStrategySettings.java | 2 +- .../cache/ctrl/persistence/ImmediatePersistenceStrategy.java | 2 +- .../cache/ctrl/persistence/NoOpCachePersistenceStrategy.java | 2 +- .../java/org/n52/iceland/coding/DocumentBuilderProvider.java | 2 +- .../java/org/n52/iceland/coding/SupportedTypeRepository.java | 2 +- .../n52/iceland/coding/SupportedTypeRepositoryInitializer.java | 2 +- .../org/n52/iceland/coding/decode/OwsDecodingException.java | 2 +- .../org/n52/iceland/coding/encode/AbstractResponseWriter.java | 2 +- .../org/n52/iceland/coding/encode/OwsEncodingException.java | 2 +- .../java/org/n52/iceland/coding/encode/ResponseFormatKey.java | 2 +- .../main/java/org/n52/iceland/coding/encode/ResponseProxy.java | 2 +- .../java/org/n52/iceland/coding/encode/ResponseWriter.java | 2 +- .../org/n52/iceland/coding/encode/ResponseWriterFactory.java | 2 +- .../java/org/n52/iceland/coding/encode/ResponseWriterKey.java | 2 +- .../n52/iceland/coding/encode/ResponseWriterRepository.java | 2 +- .../src/main/java/org/n52/iceland/config/ActivationDao.java | 2 +- .../main/java/org/n52/iceland/config/ActivationService.java | 2 +- .../src/main/java/org/n52/iceland/config/AdminUserDao.java | 2 +- .../src/main/java/org/n52/iceland/config/AdminUserService.java | 2 +- .../main/java/org/n52/iceland/config/AdminUserServiceImpl.java | 2 +- .../main/java/org/n52/iceland/config/AdministratorUser.java | 2 +- .../org/n52/iceland/config/json/AbstractJsonActivationDao.java | 2 +- .../java/org/n52/iceland/config/json/JsonActivationDao.java | 2 +- .../java/org/n52/iceland/config/json/JsonAdminUserDao.java | 2 +- .../org/n52/iceland/config/json/JsonAdministratorUser.java | 2 +- .../main/java/org/n52/iceland/config/json/JsonConstants.java | 2 +- .../iceland/config/spring/ConfiguringBeanPostProcessor.java | 2 +- .../n52/iceland/config/spring/LifecycleBeanPostProcessor.java | 2 +- .../config/spring/ProviderAwareListableBeanFactory.java | 2 +- .../config/spring/ProviderAwareXmlWebApplicationContext.java | 2 +- .../n52/iceland/config/spring/SettingsBeanPostProcessor.java | 2 +- .../n52/iceland/config/spring/converter/DurationConverter.java | 2 +- .../org/n52/iceland/config/spring/converter/PathConverter.java | 2 +- .../core/src/main/java/org/n52/iceland/convert/Converter.java | 2 +- .../main/java/org/n52/iceland/convert/ConverterException.java | 2 +- .../main/java/org/n52/iceland/convert/ConverterFactory.java | 2 +- .../src/main/java/org/n52/iceland/convert/ConverterKey.java | 2 +- .../main/java/org/n52/iceland/convert/ConverterRepository.java | 2 +- .../java/org/n52/iceland/convert/RequestResponseModifier.java | 2 +- .../iceland/convert/RequestResponseModifierFacilitator.java | 2 +- .../n52/iceland/convert/RequestResponseModifierFactory.java | 2 +- .../org/n52/iceland/convert/RequestResponseModifierKey.java | 2 +- .../n52/iceland/convert/RequestResponseModifierRepository.java | 2 +- .../src/main/java/org/n52/iceland/ds/ConnectionProvider.java | 2 +- .../java/org/n52/iceland/ds/ConnectionProviderException.java | 2 +- .../main/java/org/n52/iceland/ds/DataConnectionProvider.java | 2 +- iceland/core/src/main/java/org/n52/iceland/ds/Datasource.java | 2 +- .../src/main/java/org/n52/iceland/ds/DatasourceCallback.java | 2 +- .../java/org/n52/iceland/ds/UpdateableConnectionProvider.java | 2 +- .../src/main/java/org/n52/iceland/eu/InspireConstants.java | 2 +- .../java/org/n52/iceland/event/events/AbstractFlowEvent.java | 2 +- .../n52/iceland/event/events/CountingOutputStreamEvent.java | 2 +- .../main/java/org/n52/iceland/event/events/ExceptionEvent.java | 2 +- .../org/n52/iceland/event/events/IncomingRequestEvent.java | 2 +- .../n52/iceland/event/events/ModificationResponseEvent.java | 2 +- .../org/n52/iceland/event/events/OutgoingResponseEvent.java | 2 +- .../main/java/org/n52/iceland/event/events/RequestEvent.java | 2 +- .../main/java/org/n52/iceland/event/events/ResponseEvent.java | 2 +- .../src/main/java/org/n52/iceland/exception/HTTPException.java | 2 +- .../src/main/java/org/n52/iceland/exception/JSONException.java | 2 +- .../ows/concrete/ContentTypeNotSupportedException.java | 2 +- .../ows/concrete/GenericThrowableWrapperException.java | 2 +- .../ows/concrete/InvalidAcceptVersionsParameterException.java | 2 +- .../ows/concrete/InvalidServiceOrVersionException.java | 2 +- .../ows/concrete/InvalidServiceParameterException.java | 2 +- .../ows/concrete/MissingRequestParameterException.java | 2 +- .../exception/ows/concrete/MissingValueReferenceException.java | 2 +- .../exception/ows/concrete/NoEncoderForResponseException.java | 2 +- .../exception/ows/concrete/NoImplementationFoundException.java | 2 +- .../exception/ows/concrete/NotYetSupportedException.java | 2 +- .../exception/ows/concrete/ParameterNotSupportedException.java | 2 +- .../ows/concrete/ServiceOperatorNotFoundException.java | 2 +- .../exception/ows/concrete/VersionNotSupportedException.java | 2 +- iceland/core/src/main/java/org/n52/iceland/i18n/I18NDAO.java | 2 +- .../src/main/java/org/n52/iceland/i18n/I18NDAOFactory.java | 2 +- .../core/src/main/java/org/n52/iceland/i18n/I18NDAOKey.java | 2 +- .../src/main/java/org/n52/iceland/i18n/I18NDAORepository.java | 2 +- .../src/main/java/org/n52/iceland/i18n/I18NSerializer.java | 2 +- .../core/src/main/java/org/n52/iceland/i18n/I18NSettings.java | 2 +- .../main/java/org/n52/iceland/i18n/json/I18NJsonEncoder.java | 2 +- .../org/n52/iceland/i18n/metadata/AbstractI18NMetadata.java | 2 +- .../org/n52/iceland/i18n/metadata/I18NFeatureMetadata.java | 2 +- .../iceland/i18n/metadata/I18NObservablePropertyMetadata.java | 2 +- .../org/n52/iceland/i18n/metadata/I18NOfferingMetadata.java | 2 +- .../org/n52/iceland/i18n/metadata/I18NProcedureMetadata.java | 2 +- .../iceland/ogc/AbstractComparableServiceVersionDomainKey.java | 2 +- .../n52/iceland/ogc/ows/OwsServiceIdentificationFactory.java | 2 +- .../ogc/ows/OwsServiceIdentificationFactorySettings.java | 2 +- .../org/n52/iceland/ogc/ows/OwsServiceMetadataRepository.java | 2 +- .../n52/iceland/ogc/ows/OwsServiceMetadataRepositoryImpl.java | 2 +- .../org/n52/iceland/ogc/ows/OwsServiceProviderFactory.java | 2 +- .../n52/iceland/ogc/ows/OwsServiceProviderFactorySettings.java | 2 +- .../iceland/ogc/ows/extension/OwsCapabilitiesExtensionKey.java | 2 +- .../ogc/ows/extension/OwsCapabilitiesExtensionProvider.java | 2 +- .../ows/extension/OwsCapabilitiesExtensionProviderFactory.java | 2 +- .../ogc/ows/extension/OwsCapabilitiesExtensionRepository.java | 2 +- .../ows/extension/OwsOperationMetadataExtensionProvider.java | 2 +- .../OwsOperationMetadataExtensionProviderFactory.java | 2 +- .../extension/OwsOperationMetadataExtensionProviderKey.java | 2 +- .../OwsOperationMetadataExtensionProviderRepository.java | 2 +- .../org/n52/iceland/ogc/ows/extension/StaticCapabilities.java | 2 +- .../request/handler/AbstractGetCapabilitiesHandler.java | 2 +- .../n52/iceland/request/handler/AbstractOperationHandler.java | 2 +- .../n52/iceland/request/handler/GenericOperationHandler.java | 2 +- .../java/org/n52/iceland/request/handler/OperationHandler.java | 2 +- .../n52/iceland/request/handler/OperationHandlerFactory.java | 2 +- .../org/n52/iceland/request/handler/OperationHandlerKey.java | 2 +- .../iceland/request/handler/OperationHandlerRepository.java | 2 +- .../n52/iceland/request/operator/GenericRequestOperator.java | 2 +- .../org/n52/iceland/request/operator/ParameterValidator.java | 2 +- .../java/org/n52/iceland/request/operator/RequestOperator.java | 2 +- .../n52/iceland/request/operator/RequestOperatorFactory.java | 2 +- .../org/n52/iceland/request/operator/RequestOperatorKey.java | 2 +- .../iceland/request/operator/RequestOperatorRepository.java | 2 +- .../main/java/org/n52/iceland/response/EXIResponseWriter.java | 2 +- .../org/n52/iceland/response/EXIResponseWriterFactory.java | 2 +- .../main/java/org/n52/iceland/response/JSONResponseWriter.java | 2 +- .../org/n52/iceland/response/JSONResponseWriterFactory.java | 2 +- .../main/java/org/n52/iceland/response/NoContentResponse.java | 2 +- .../main/java/org/n52/iceland/response/ServiceResponse.java | 2 +- .../java/org/n52/iceland/response/SoapChainResponseWriter.java | 2 +- .../n52/iceland/response/SoapChainResponseWriterFactory.java | 2 +- .../main/java/org/n52/iceland/response/XmlResponseWriter.java | 2 +- .../org/n52/iceland/response/XmlResponseWriterFactory.java | 2 +- .../n52/iceland/service/CommunicationObjectWithSoapHeader.java | 2 +- .../java/org/n52/iceland/service/DatabaseSettingsHandler.java | 2 +- .../src/main/java/org/n52/iceland/service/ExceptionLogger.java | 2 +- .../n52/iceland/service/ImplementationVersionHeaderAdder.java | 2 +- .../src/main/java/org/n52/iceland/service/MiscSettings.java | 2 +- .../core/src/main/java/org/n52/iceland/service/Service.java | 2 +- .../src/main/java/org/n52/iceland/service/ServiceSettings.java | 2 +- .../org/n52/iceland/service/ServletConfigLocationProvider.java | 2 +- .../main/java/org/n52/iceland/service/StreamingSettings.java | 2 +- .../n52/iceland/service/operator/GenericServiceOperator.java | 2 +- .../java/org/n52/iceland/service/operator/ServiceOperator.java | 2 +- .../n52/iceland/service/operator/ServiceOperatorFactory.java | 2 +- .../iceland/service/operator/ServiceOperatorRepository.java | 2 +- .../n52/iceland/util/AbstractEnumPropertiesFileHandler.java | 2 +- .../org/n52/iceland/util/DelegatingPropertyFileHandler.java | 2 +- .../core/src/main/java/org/n52/iceland/util/FileIOHelper.java | 2 +- .../src/main/java/org/n52/iceland/util/IdentifiedProducer.java | 2 +- .../org/n52/iceland/util/LazyClosingThreadSafeProducer.java | 2 +- .../main/java/org/n52/iceland/util/LazyThreadSafeProducer.java | 2 +- .../org/n52/iceland/util/LocalizedLazyThreadSafeProducer.java | 2 +- .../src/main/java/org/n52/iceland/util/LocalizedProducer.java | 2 +- iceland/core/src/main/java/org/n52/iceland/util/MoreFiles.java | 2 +- .../main/java/org/n52/iceland/util/NonNegativeBigInteger.java | 2 +- .../src/main/java/org/n52/iceland/util/PositiveBigInteger.java | 2 +- .../main/java/org/n52/iceland/util/PropertyFileHandler.java | 2 +- .../java/org/n52/iceland/util/PropertyFileHandlerImpl.java | 2 +- iceland/core/src/main/java/org/n52/iceland/util/Range.java | 2 +- .../n52/iceland/util/ServletContextPropertyFileHandler.java | 2 +- .../core/src/main/java/org/n52/iceland/util/XmlFactories.java | 2 +- .../core/src/main/java/org/n52/iceland/util/action/Action.java | 2 +- .../main/java/org/n52/iceland/util/action/CompositeAction.java | 2 +- .../org/n52/iceland/util/action/CompositeParallelAction.java | 2 +- .../org/n52/iceland/util/action/CompositeSerialAction.java | 2 +- .../main/java/org/n52/iceland/util/action/RunnableAction.java | 2 +- .../java/org/n52/iceland/util/action/ThreadableAction.java | 2 +- .../main/java/org/n52/iceland/util/activation/Activatable.java | 2 +- .../java/org/n52/iceland/util/activation/Activatables.java | 2 +- .../org/n52/iceland/util/activation/ActivationInitializer.java | 2 +- .../org/n52/iceland/util/activation/ActivationListenable.java | 2 +- .../org/n52/iceland/util/activation/ActivationListener.java | 2 +- .../org/n52/iceland/util/activation/ActivationListeners.java | 2 +- .../org/n52/iceland/util/activation/ActivationManager.java | 2 +- .../org/n52/iceland/util/activation/ActivationProvider.java | 2 +- .../org/n52/iceland/util/activation/ActivationRegistrator.java | 2 +- .../java/org/n52/iceland/util/activation/ActivationSink.java | 2 +- .../java/org/n52/iceland/util/activation/ActivationSource.java | 2 +- .../iceland/util/activation/DefaultActivationInitializer.java | 2 +- .../java/org/n52/iceland/util/activation/DefaultActive.java | 2 +- .../iceland/util/activation/FunctionalActivationListener.java | 2 +- .../iceland/util/activation/SourceActivationInitializer.java | 2 +- .../src/main/java/org/n52/iceland/util/http/HttpUtils.java | 2 +- .../src/main/java/org/n52/iceland/util/http/NoContent.java | 2 +- .../java/org/n52/iceland/binding/AbstractXmlBindingTest.java | 2 +- .../test/java/org/n52/iceland/binding/SimpleBindingTest.java | 2 +- .../src/test/java/org/n52/iceland/binding/TestBinding.java | 2 +- .../src/test/java/org/n52/iceland/binding/TestXmlBinding.java | 2 +- .../iceland/converter/RequestResponseModifierKeyTypeTest.java | 2 +- .../src/test/java/org/n52/iceland/i18n/I18NSerializerTest.java | 2 +- .../java/org/n52/iceland/ogc/filter/ComparisonFilterTest.java | 2 +- .../iceland/ogc/ows/OwsServiceIdentificationFactoryTest.java | 2 +- .../src/test/java/org/n52/iceland/response/TestResponse.java | 2 +- .../core/src/test/java/org/n52/iceland/util/HasStatusCode.java | 2 +- .../test/java/org/n52/iceland/util/ValidatableBigIntegers.java | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- .../statistics/api/AbstractElasticSearchDataHolder.java | 2 +- .../org/n52/iceland/statistics/api/ElasticsearchSettings.java | 2 +- .../n52/iceland/statistics/api/ElasticsearchSettingsKeys.java | 2 +- .../statistics/api/StatisticsLocationUtilSettingsKeys.java | 2 +- .../api/interfaces/StatisticsServiceEventHandler.java | 2 +- .../api/interfaces/StatisticsServiceEventResolver.java | 2 +- .../api/interfaces/datahandler/IAdminDataHandler.java | 2 +- .../api/interfaces/datahandler/IStatisticsDataHandler.java | 2 +- .../iceland/statistics/api/mappings/MetadataDataMapping.java | 2 +- .../statistics/api/mappings/ServiceEventDataMapping.java | 2 +- .../iceland/statistics/api/parameters/AbstractEsParameter.java | 2 +- .../org/n52/iceland/statistics/api/parameters/Description.java | 2 +- .../statistics/api/parameters/ElasticsearchTypeRegistry.java | 2 +- .../iceland/statistics/api/parameters/ObjectEsParameter.java | 2 +- .../statistics/api/parameters/ObjectEsParameterFactory.java | 2 +- .../iceland/statistics/api/parameters/SingleEsParameter.java | 2 +- .../n52/iceland/statistics/api/utils/EventHandlerFinder.java | 2 +- .../org/n52/iceland/statistics/api/utils/FileDownloader.java | 2 +- .../iceland/statistics/api/utils/GeoLiteFileDownloader.java | 2 +- .../org/n52/iceland/statistics/api/utils/KibanaImporter.java | 2 +- .../iceland/statistics/api/utils/dto/KibanaConfigEntryDto.java | 2 +- .../statistics/api/utils/dto/KibanaConfigHolderDto.java | 2 +- .../impl/AbstractStatisticsServiceEventListener.java | 2 +- .../n52/iceland/statistics/impl/ElasticsearchAdminHandler.java | 2 +- .../n52/iceland/statistics/impl/ElasticsearchDataHandler.java | 2 +- .../n52/iceland/statistics/impl/StatisticsResolverFactory.java | 2 +- .../impl/handlers/CountingOutputStreamEventHandler.java | 2 +- .../statistics/impl/handlers/DefaultServiceEventHandler.java | 2 +- .../statistics/impl/handlers/OutgoingResponseEventHandler.java | 2 +- .../impl/handlers/exceptions/CodedExceptionEventHandler.java | 2 +- .../impl/handlers/exceptions/OwsExceptionEventHandler.java | 2 +- .../impl/resolvers/CountingOutputStreamEventResolver.java | 2 +- .../statistics/impl/resolvers/DefaultServiceEventResolver.java | 2 +- .../statistics/impl/resolvers/ExceptionEventResolver.java | 2 +- .../impl/resolvers/OutgoingResponseEventResolver.java | 2 +- .../impl/schemabuilders/DefaultElasticsearchSchemas.java | 2 +- .../iceland/statistics/impl/server/EmbeddedElasticsearch.java | 2 +- .../main/resources/statistics/countingoutputstream-event.xml | 2 +- .../core/src/main/resources/statistics/default-event.xml | 2 +- .../core/src/main/resources/statistics/exception-event.xml | 2 +- .../src/main/resources/statistics/outgoingresponse-event.xml | 2 +- .../n52/iceland/statistics/api/ElasticsearchSettingsTest.java | 2 +- .../iceland/statistics/api/utils/EventHandlerFinderTest.java | 2 +- .../iceland/statistics/api/utils/GeoLiteFileDownloaderIT.java | 2 +- .../org/n52/iceland/statistics/api/utils/KibanaImporterIT.java | 2 +- .../iceland/statistics/basetests/ElasticsearchAwareTest.java | 2 +- .../org/n52/iceland/statistics/basetests/MockitoBaseTest.java | 2 +- .../org/n52/iceland/statistics/basetests/SpringBaseTest.java | 2 +- .../iceland/statistics/impl/ElasticSearchDataHandlerIT.java | 2 +- .../iceland/statistics/impl/ElasticsearchAdminHandlerIT.java | 2 +- .../java/org/n52/iceland/statistics/impl/EmbeddedServerIT.java | 2 +- .../org/n52/iceland/statistics/mock/MockServletContext.java | 2 +- .../org/n52/iceland/statistics/mock/MockSettingsService.java | 2 +- .../n52/iceland/statistics/mock/TestElasticsearchSchema.java | 2 +- .../core/src/test/resources/statistics-test-context.xml | 2 +- .../resources/statistics-test/countingoutputstream-event.xml | 2 +- .../core/src/test/resources/statistics-test/default-event.xml | 2 +- .../src/test/resources/statistics-test/exception-event.xml | 2 +- .../test/resources/statistics-test/outgoingresponse-event.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- .../n52/iceland/statistics/generator/ParameterGenerator.java | 2 +- .../org/n52/iceland/statistics/generator/formats/MdFormat.java | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- .../api/interfaces/geolocation/IAdminStatisticsLocation.java | 2 +- .../api/interfaces/geolocation/IStatisticsLocationUtil.java | 2 +- .../statistics/impl/geolocation/StatisticsLocationUtil.java | 2 +- .../statistics/impl/geolocation/StatisticsLocationUtilIT.java | 2 +- iceland/statistics/kibana/pom.xml | 2 +- .../org/n52/iceland/statistics/api/utils/KibanaExporter.java | 2 +- janmayen/pom.xml | 2 +- janmayen/src/main/java/org/n52/janmayen/AbstractBuildable.java | 2 +- .../main/java/org/n52/janmayen/AbstractThrowingIterator.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Builder.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Chain.java | 2 +- janmayen/src/main/java/org/n52/janmayen/CharacterClass.java | 2 +- janmayen/src/main/java/org/n52/janmayen/CharacterClasses.java | 2 +- janmayen/src/main/java/org/n52/janmayen/ClassHelper.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Classes.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Comparables.java | 2 +- .../src/main/java/org/n52/janmayen/ConfigLocationProvider.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Copyable.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Debouncer.java | 2 +- .../java/org/n52/janmayen/GroupedAndNamedThreadFactory.java | 2 +- janmayen/src/main/java/org/n52/janmayen/IntervalMap.java | 2 +- janmayen/src/main/java/org/n52/janmayen/IntervalTree.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Json.java | 2 +- janmayen/src/main/java/org/n52/janmayen/MoreIterators.java | 2 +- janmayen/src/main/java/org/n52/janmayen/NcName.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Optionals.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Producer.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Producers.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Stopwatch.java | 2 +- janmayen/src/main/java/org/n52/janmayen/ThrowingIterator.java | 2 +- janmayen/src/main/java/org/n52/janmayen/TimeValue.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Times.java | 2 +- .../n52/janmayen/component/AbstractComponentRepository.java | 2 +- .../component/AbstractSimilarityKeyComponentRepository.java | 2 +- .../janmayen/component/AbstractSimilarityKeyRepository.java | 2 +- .../org/n52/janmayen/component/ClassBasedComponentKey.java | 2 +- .../src/main/java/org/n52/janmayen/component/Component.java | 2 +- .../main/java/org/n52/janmayen/component/ComponentFactory.java | 2 +- .../java/org/n52/janmayen/component/ComponentRepository.java | 2 +- janmayen/src/main/java/org/n52/janmayen/component/Keyed.java | 2 +- .../org/n52/janmayen/component/SingleTypeComponentFactory.java | 2 +- .../org/n52/janmayen/event/AbstractAsyncEventListener.java | 2 +- janmayen/src/main/java/org/n52/janmayen/event/Event.java | 2 +- janmayen/src/main/java/org/n52/janmayen/event/EventBus.java | 2 +- .../src/main/java/org/n52/janmayen/event/EventListener.java | 2 +- .../java/org/n52/janmayen/event/EventListenerRegistrator.java | 2 +- .../java/org/n52/janmayen/exception/CompositeException.java | 2 +- .../java/org/n52/janmayen/exception/LocationHintException.java | 2 +- .../n52/janmayen/exception/StringInterpolationException.java | 2 +- .../src/main/java/org/n52/janmayen/function/Consumers.java | 2 +- .../src/main/java/org/n52/janmayen/function/Functions.java | 2 +- .../src/main/java/org/n52/janmayen/function/Predicates.java | 2 +- .../src/main/java/org/n52/janmayen/function/Suppliers.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowableFunction.java | 2 +- .../java/org/n52/janmayen/function/ThrowingBiConsumer.java | 2 +- .../java/org/n52/janmayen/function/ThrowingBiFunction.java | 2 +- .../java/org/n52/janmayen/function/ThrowingBiPredicate.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingCallable.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingConsumer.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingFunction.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingPredicate.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingRunnable.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingSupplier.java | 2 +- .../java/org/n52/janmayen/function/ThrowingTriConsumer.java | 2 +- .../java/org/n52/janmayen/function/ThrowingUnaryOperator.java | 2 +- .../src/main/java/org/n52/janmayen/function/TriConsumer.java | 2 +- .../src/main/java/org/n52/janmayen/http/HTTPConstants.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/HTTPHeaders.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/HTTPMethods.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/HTTPStatus.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/MediaType.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/MediaTypes.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/QueryBuilder.java | 2 +- janmayen/src/main/java/org/n52/janmayen/i18n/ISO6392B.java | 2 +- janmayen/src/main/java/org/n52/janmayen/i18n/LocaleHelper.java | 2 +- .../src/main/java/org/n52/janmayen/i18n/LocalizedString.java | 2 +- .../main/java/org/n52/janmayen/i18n/MultilingualString.java | 2 +- .../main/java/org/n52/janmayen/lifecycle/Constructable.java | 2 +- .../src/main/java/org/n52/janmayen/lifecycle/Destroyable.java | 2 +- janmayen/src/main/java/org/n52/janmayen/net/IPAddress.java | 2 +- .../src/main/java/org/n52/janmayen/net/IPAddressRange.java | 2 +- janmayen/src/main/java/org/n52/janmayen/net/ProxyChain.java | 2 +- .../main/java/org/n52/janmayen/similar/CompositeSimilar.java | 2 +- .../org/n52/janmayen/similar/ProxySimilarityComparator.java | 2 +- janmayen/src/main/java/org/n52/janmayen/similar/Similar.java | 2 +- .../java/org/n52/janmayen/similar/SimilarityComparator.java | 2 +- .../src/main/java/org/n52/janmayen/stream/MoreCollectors.java | 2 +- janmayen/src/main/java/org/n52/janmayen/stream/Streamable.java | 2 +- .../main/java/org/n52/janmayen/stream/StreamingIterable.java | 2 +- janmayen/src/main/java/org/n52/janmayen/stream/Streams.java | 2 +- .../src/test/java/org/n52/janmayen/CharacterClassTest.java | 2 +- janmayen/src/test/java/org/n52/janmayen/NcNameTest.java | 2 +- .../src/test/java/org/n52/janmayen/i18n/LocaleHelperTest.java | 2 +- .../src/test/java/org/n52/janmayen/net/IPAddressRangeTest.java | 2 +- janmayen/src/test/java/org/n52/janmayen/net/IPAddressTest.java | 2 +- .../src/test/java/org/n52/janmayen/net/ProxyChainTest.java | 2 +- pom.xml | 2 +- shetland/core/pom.xml | 2 +- .../java/org/n52/shetland/aqd/AbstractEReportingHeader.java | 2 +- .../core/src/main/java/org/n52/shetland/aqd/AqdConstants.java | 2 +- .../core/src/main/java/org/n52/shetland/aqd/AqdNetwork.java | 2 +- .../src/main/java/org/n52/shetland/aqd/AqdSamplingPoint.java | 2 +- .../core/src/main/java/org/n52/shetland/aqd/AqdStation.java | 2 +- .../src/main/java/org/n52/shetland/aqd/AqdUomRepository.java | 2 +- .../java/org/n52/shetland/aqd/EReportObligationRepository.java | 2 +- .../src/main/java/org/n52/shetland/aqd/EReportingChange.java | 2 +- .../src/main/java/org/n52/shetland/aqd/EReportingHeader.java | 2 +- .../core/src/main/java/org/n52/shetland/aqd/ElementType.java | 2 +- .../src/main/java/org/n52/shetland/aqd/ReportObligation.java | 2 +- .../main/java/org/n52/shetland/aqd/ReportObligationType.java | 2 +- .../src/main/java/org/n52/shetland/aqd/ReportObligations.java | 2 +- .../core/src/main/java/org/n52/shetland/exi/EXIObject.java | 2 +- .../src/main/java/org/n52/shetland/filter/CountFilter.java | 2 +- .../src/main/java/org/n52/shetland/filter/ExpandFilter.java | 2 +- .../core/src/main/java/org/n52/shetland/filter/ExpandItem.java | 2 +- .../src/main/java/org/n52/shetland/filter/FilterFilter.java | 2 +- .../src/main/java/org/n52/shetland/filter/OrderByFilter.java | 2 +- .../src/main/java/org/n52/shetland/filter/OrderProperty.java | 2 +- .../src/main/java/org/n52/shetland/filter/SelectFilter.java | 2 +- .../src/main/java/org/n52/shetland/filter/SkipTopFilter.java | 2 +- .../java/org/n52/shetland/inspire/AbstractInspireKeyword.java | 2 +- .../main/java/org/n52/shetland/inspire/GeographicalName.java | 2 +- .../main/java/org/n52/shetland/inspire/InspireCitation.java | 2 +- .../main/java/org/n52/shetland/inspire/InspireConformity.java | 2 +- .../org/n52/shetland/inspire/InspireConformityCitation.java | 2 +- .../main/java/org/n52/shetland/inspire/InspireConstants.java | 2 +- .../src/main/java/org/n52/shetland/inspire/InspireDateOf.java | 2 +- .../java/org/n52/shetland/inspire/InspireDateOfCreation.java | 2 +- .../org/n52/shetland/inspire/InspireDateOfLastRevision.java | 2 +- .../org/n52/shetland/inspire/InspireDateOfPublication.java | 2 +- .../org/n52/shetland/inspire/InspireEuLanguageISO6392B.java | 2 +- .../src/main/java/org/n52/shetland/inspire/InspireKeyword.java | 2 +- .../java/org/n52/shetland/inspire/InspireLanguageISO6392B.java | 2 +- .../java/org/n52/shetland/inspire/InspireMandatoryKeyword.java | 2 +- .../org/n52/shetland/inspire/InspireMandatoryKeywordValue.java | 2 +- .../n52/shetland/inspire/InspireMetadataPointOfContact.java | 2 +- .../src/main/java/org/n52/shetland/inspire/InspireObject.java | 2 +- .../inspire/InspireOriginatingControlledVocabulary.java | 2 +- .../java/org/n52/shetland/inspire/InspireResourceLocator.java | 2 +- .../java/org/n52/shetland/inspire/InspireSupportedCRS.java | 2 +- .../org/n52/shetland/inspire/InspireSupportedLanguages.java | 2 +- .../org/n52/shetland/inspire/InspireTemporalReference.java | 2 +- .../n52/shetland/inspire/InspireUniqueResourceIdentifier.java | 2 +- .../src/main/java/org/n52/shetland/inspire/Pronunciation.java | 2 +- .../core/src/main/java/org/n52/shetland/inspire/Spelling.java | 2 +- .../org/n52/shetland/inspire/ad/AddressRepresentation.java | 2 +- .../main/java/org/n52/shetland/inspire/base/Identifier.java | 2 +- .../org/n52/shetland/inspire/base/InspireBaseConstants.java | 2 +- .../src/main/java/org/n52/shetland/inspire/base2/Contact.java | 2 +- .../java/org/n52/shetland/inspire/base2/DocumentCitation.java | 2 +- .../org/n52/shetland/inspire/base2/InspireBase2Constants.java | 2 +- .../org/n52/shetland/inspire/base2/LegislationCitation.java | 2 +- .../main/java/org/n52/shetland/inspire/base2/RelatedParty.java | 2 +- .../shetland/inspire/dls/FullInspireExtendedCapabilities.java | 2 +- .../java/org/n52/shetland/inspire/dls/InspireCapabilities.java | 2 +- .../n52/shetland/inspire/dls/InspireExtendedCapabilities.java | 2 +- .../shetland/inspire/dls/InspireExtendedCapabilitiesDLS.java | 2 +- .../inspire/dls/MinimalInspireExtendedCapabilities.java | 2 +- .../org/n52/shetland/inspire/ef/AbstractMonitoringFeature.java | 2 +- .../org/n52/shetland/inspire/ef/AbstractMonitoringObject.java | 2 +- .../main/java/org/n52/shetland/inspire/ef/AnyDomainLink.java | 2 +- .../n52/shetland/inspire/ef/EfAbstractMonitoringFeature.java | 2 +- .../n52/shetland/inspire/ef/EfAbstractMonitoringObject.java | 2 +- .../shetland/inspire/ef/EfEnvironmentalMonitoringFacility.java | 2 +- .../shetland/inspire/ef/EfEnvironmentalMonitoringNetwork.java | 2 +- .../shetland/inspire/ef/EnvironmentalMonitoringActivity.java | 2 +- .../shetland/inspire/ef/EnvironmentalMonitoringFacility.java | 2 +- .../shetland/inspire/ef/EnvironmentalMonitoringNetwork.java | 2 +- .../shetland/inspire/ef/EnvironmentalMonitoringProgramme.java | 2 +- .../src/main/java/org/n52/shetland/inspire/ef/Hierarchy.java | 2 +- .../java/org/n52/shetland/inspire/ef/InspireEfConstants.java | 2 +- .../main/java/org/n52/shetland/inspire/ef/NetworkFacility.java | 2 +- .../java/org/n52/shetland/inspire/ef/ObservingCapability.java | 2 +- .../org/n52/shetland/inspire/ef/OperationalActivityPeriod.java | 2 +- .../java/org/n52/shetland/inspire/ef/ReportToLegalAct.java | 2 +- .../org/n52/shetland/inspire/omor/InspireOMORConstants.java | 2 +- .../org/n52/shetland/inspire/ompr/InspireOMPRConstants.java | 2 +- .../src/main/java/org/n52/shetland/inspire/ompr/Process.java | 2 +- .../java/org/n52/shetland/inspire/ompr/ProcessParameter.java | 2 +- .../n52/shetland/inspire/omso/AbstractInspireObservation.java | 2 +- .../org/n52/shetland/inspire/omso/InspireOMSOConstants.java | 2 +- .../org/n52/shetland/inspire/omso/MultiPointObservation.java | 2 +- .../java/org/n52/shetland/inspire/omso/PointObservation.java | 2 +- .../n52/shetland/inspire/omso/PointTimeSeriesObservation.java | 2 +- .../java/org/n52/shetland/inspire/omso/ProfileObservation.java | 2 +- .../org/n52/shetland/inspire/omso/TrajectoryObservation.java | 2 +- shetland/core/src/main/java/org/n52/shetland/iso/CodeList.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/GcoConstants.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/IsoConstants.java | 2 +- .../src/main/java/org/n52/shetland/iso/gco/AbstractRole.java | 2 +- shetland/core/src/main/java/org/n52/shetland/iso/gco/Role.java | 2 +- .../org/n52/shetland/iso/gmd/AbstractMDIdentification.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/AbstractObject.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/AbtractGmd.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/gmd/CiAddress.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/gmd/CiContact.java | 2 +- .../main/java/org/n52/shetland/iso/gmd/CiOnlineResource.java | 2 +- .../main/java/org/n52/shetland/iso/gmd/CiResponsibleParty.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/CiTelephone.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/gmd/EXExtent.java | 2 +- .../main/java/org/n52/shetland/iso/gmd/EXVerticalExtent.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/GmdCitation.java | 2 +- .../main/java/org/n52/shetland/iso/gmd/GmdCitationDate.java | 2 +- .../java/org/n52/shetland/iso/gmd/GmdConformanceResult.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/GmdConstants.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/GmdDateType.java | 2 +- .../java/org/n52/shetland/iso/gmd/GmdDomainConsistency.java | 2 +- .../java/org/n52/shetland/iso/gmd/GmdQuantitativeResult.java | 2 +- .../main/java/org/n52/shetland/iso/gmd/GmdSpecification.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/GmlBaseUnit.java | 2 +- .../org/n52/shetland/iso/gmd/LocalisedCharacterString.java | 2 +- .../java/org/n52/shetland/iso/gmd/MDDataIdentification.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/MDMetadata.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/PT_FreeText.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/gmd/ScCRS.java | 2 +- .../main/java/org/n52/shetland/oasis/odata/ODataConstants.java | 2 +- .../src/main/java/org/n52/shetland/oasis/odata/ODataExpr.java | 2 +- .../n52/shetland/oasis/odata/query/option/QueryOptions.java | 2 +- .../src/main/java/org/n52/shetland/ogc/AbstractCodeType.java | 2 +- .../main/java/org/n52/shetland/ogc/AbstractMeasureType.java | 2 +- .../java/org/n52/shetland/ogc/AbstractSupportedStringType.java | 2 +- .../src/main/java/org/n52/shetland/ogc/HasDefaultEncoding.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/OGCConstants.java | 2 +- .../n52/shetland/ogc/PhenomenonNameDescriptionProvider.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/SupportedType.java | 2 +- .../org/n52/shetland/ogc/SupportsObservablePropertyNames.java | 2 +- shetland/core/src/main/java/org/n52/shetland/ogc/UoM.java | 2 +- .../src/main/java/org/n52/shetland/ogc/cv/CvConstants.java | 2 +- .../n52/shetland/ogc/filter/AbstractAdHocQueryExpression.java | 2 +- .../org/n52/shetland/ogc/filter/AbstractProjectionClause.java | 2 +- .../org/n52/shetland/ogc/filter/AbstractQueryExpression.java | 2 +- .../org/n52/shetland/ogc/filter/AbstractSelectionClause.java | 2 +- .../org/n52/shetland/ogc/filter/AbstractSortingClause.java | 2 +- .../java/org/n52/shetland/ogc/filter/BinaryLogicFilter.java | 2 +- .../java/org/n52/shetland/ogc/filter/ComparisonFilter.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/FesMeasureType.java | 2 +- .../src/main/java/org/n52/shetland/ogc/filter/FesSortBy.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/FesSortProperty.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/filter/Filter.java | 2 +- .../java/org/n52/shetland/ogc/filter/FilterCapabilities.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/FilterClause.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/FilterConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/filter/Filters.java | 2 +- .../src/main/java/org/n52/shetland/ogc/filter/IdFilter.java | 2 +- .../src/main/java/org/n52/shetland/ogc/filter/LogicFilter.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/SpatialFilter.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/TemporalFilter.java | 2 +- .../java/org/n52/shetland/ogc/filter/UnaryLogicFilter.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/AbstractCRS.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/AbstractCS.java | 2 +- .../org/n52/shetland/ogc/gml/AbstractCoordinateSystem.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/AbstractDatum.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/AbstractFeature.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/AbstractGML.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/AbstractGeometry.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/AbstractMetaData.java | 2 +- .../java/org/n52/shetland/ogc/gml/AbstractReferenceType.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/Aggregation.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/gml/CodeType.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/CodeWithAuthority.java | 2 +- .../java/org/n52/shetland/ogc/gml/CoordinateSystemAxis.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/Definition.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/DefinitionBase.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/DomainOfValidity.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/EngineeringCRS.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/FeatureWith.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/GenericMetaData.java | 2 +- .../java/org/n52/shetland/ogc/gml/GmlAbstractGeometry.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/GmlConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/GmlMeasureType.java | 2 +- .../java/org/n52/shetland/ogc/gml/GmlMetaDataProperty.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/IdentifiedObject.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/ReferenceType.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/gml/SortBy.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/UomIdentifier.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/gml/UomSymbol.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/VerticalCRS.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/VerticalCS.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/VerticalDatum.java | 2 +- .../java/org/n52/shetland/ogc/gml/time/IndeterminateValue.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/gml/time/Time.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/time/TimeInstant.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/time/TimePeriod.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/time/TimePosition.java | 2 +- .../java/org/n52/shetland/ogc/gmlcov/GmlCoverageConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gwml/GWMLConstants.java | 2 +- .../org/n52/shetland/ogc/om/AbstractObservationStream.java | 2 +- .../java/org/n52/shetland/ogc/om/AbstractObservationValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/AbstractPhenomenon.java | 2 +- .../java/org/n52/shetland/ogc/om/MultiObservationValues.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/om/NamedValue.java | 2 +- .../org/n52/shetland/ogc/om/ObservationMergeIndicator.java | 2 +- .../main/java/org/n52/shetland/ogc/om/ObservationStream.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/ObservationType.java | 2 +- .../main/java/org/n52/shetland/ogc/om/ObservationValue.java | 2 +- .../java/org/n52/shetland/ogc/om/OmCompositePhenomenon.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/OmConstants.java | 2 +- .../java/org/n52/shetland/ogc/om/OmObservableProperty.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/OmObservation.java | 2 +- .../org/n52/shetland/ogc/om/OmObservationConstellation.java | 2 +- .../java/org/n52/shetland/ogc/om/OmObservationContext.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/PointValuePair.java | 2 +- .../java/org/n52/shetland/ogc/om/SingleObservationValue.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/StreamingValue.java | 2 +- .../java/org/n52/shetland/ogc/om/TimeLocationValueTriple.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/TimeValuePair.java | 2 +- .../org/n52/shetland/ogc/om/features/FeatureCollection.java | 2 +- .../java/org/n52/shetland/ogc/om/features/SfConstants.java | 2 +- .../om/features/samplingFeatures/AbstractSamplingFeature.java | 2 +- .../om/features/samplingFeatures/FeatureOfInterestVisitor.java | 2 +- .../ogc/om/features/samplingFeatures/InvalidSridException.java | 2 +- .../ogc/om/features/samplingFeatures/PreparationStep.java | 2 +- .../ogc/om/features/samplingFeatures/SamplingFeature.java | 2 +- .../om/features/samplingFeatures/SamplingFeatureComplex.java | 2 +- .../shetland/ogc/om/features/samplingFeatures/SfProcess.java | 2 +- .../shetland/ogc/om/features/samplingFeatures/SfSpecimen.java | 2 +- .../ogc/om/features/samplingFeatures/SpecLocation.java | 2 +- .../java/org/n52/shetland/ogc/om/quality/OmResultQuality.java | 2 +- .../ogc/om/series/AbstractDefaultTVPMeasurementMetadata.java | 2 +- .../n52/shetland/ogc/om/series/AbstractInterpolationType.java | 2 +- .../n52/shetland/ogc/om/series/AbstractMonitoringFeature.java | 2 +- .../n52/shetland/ogc/om/series/AbstractObservationProcess.java | 2 +- .../org/n52/shetland/ogc/om/series/DefaultPointMetadata.java | 2 +- .../shetland/ogc/om/series/MeasurementTimeseriesMetadata.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/series/Metadata.java | 2 +- .../org/n52/shetland/ogc/om/series/TimeseriesMetadata.java | 2 +- .../shetland/ogc/om/series/tsml/ConformanceClassesTSML.java | 2 +- .../ogc/om/series/tsml/DefaultTVPMeasurementMetadata.java | 2 +- .../n52/shetland/ogc/om/series/tsml/ObservationProcess.java | 2 +- .../n52/shetland/ogc/om/series/tsml/TimeseriesMLConstants.java | 2 +- .../n52/shetland/ogc/om/series/tsml/TsmlMonitoringFeature.java | 2 +- .../n52/shetland/ogc/om/series/wml/ConformanceClassesWML2.java | 2 +- .../shetland/ogc/om/series/wml/ConformanceClassesWML2DR.java | 2 +- .../ogc/om/series/wml/DefaultTVPMeasurementMetadata.java | 2 +- .../org/n52/shetland/ogc/om/series/wml/ObservationProcess.java | 2 +- .../org/n52/shetland/ogc/om/series/wml/WaterMLConstants.java | 2 +- .../org/n52/shetland/ogc/om/series/wml/WmlMonitoringPoint.java | 2 +- .../ogc/om/values/AbstractPofileTrajectoryElement.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/BooleanValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/CategoryValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/ComparableValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/ComplexValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/CountValue.java | 2 +- .../n52/shetland/ogc/om/values/CvDiscretePointCoverage.java | 2 +- .../java/org/n52/shetland/ogc/om/values/DiscreteCoverage.java | 2 +- .../java/org/n52/shetland/ogc/om/values/GeometryValue.java | 2 +- .../org/n52/shetland/ogc/om/values/HrefAttributeValue.java | 2 +- .../org/n52/shetland/ogc/om/values/MultiPointCoverage.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/MultiValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/NilTemplateValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/ProfileValue.java | 2 +- .../org/n52/shetland/ogc/om/values/QuantityRangeValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/QuantityValue.java | 2 +- .../org/n52/shetland/ogc/om/values/RectifiedGridCoverage.java | 2 +- .../n52/shetland/ogc/om/values/ReferencableGridCoverage.java | 2 +- .../java/org/n52/shetland/ogc/om/values/ReferenceValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/SweDataArrayValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/TLVTValue.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/values/TVPValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/TextValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/TimeRangeValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/TimeValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/TrajectoryElement.java | 2 +- .../java/org/n52/shetland/ogc/om/values/TrajectoryValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/UnknownValue.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/values/Value.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/values/XmlValue.java | 2 +- .../shetland/ogc/om/values/visitor/ProfileLevelVisitor.java | 2 +- .../ogc/om/values/visitor/TrajectoryElementVisitor.java | 2 +- .../org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java | 2 +- .../n52/shetland/ogc/om/values/visitor/VoidValueVisitor.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/Enums.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/HasExtension.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OWSConstants.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsAcceptVersions.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsAddress.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsAllowedValues.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsAnyValue.java | 2 +- .../java/org/n52/shetland/ogc/ows/OwsBasicIdentification.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsBoundingBox.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsCRS.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsCapabilities.java | 2 +- .../org/n52/shetland/ogc/ows/OwsCapabilitiesExtension.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsCode.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsContact.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsDCP.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsDescription.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsDomain.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsDomainMetadata.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsHttp.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsKeyword.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsLanguageString.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsMetadata.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsNoValues.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsOnlineResource.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsOperation.java | 2 +- .../n52/shetland/ogc/ows/OwsOperationMetadataExtension.java | 2 +- .../java/org/n52/shetland/ogc/ows/OwsOperationsMetadata.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsPhone.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsPossibleValues.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsRange.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsReferenceSystem.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsRequestMethod.java | 2 +- .../java/org/n52/shetland/ogc/ows/OwsResponsibleParty.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsSections.java | 2 +- .../org/n52/shetland/ogc/ows/OwsServiceIdentification.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsServiceProvider.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsUOM.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsUnNamedDomain.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsValue.java | 2 +- .../java/org/n52/shetland/ogc/ows/OwsValueRestriction.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsValuesReference.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsValuesUnit.java | 2 +- .../org/n52/shetland/ogc/ows/exception/CodedException.java | 2 +- .../org/n52/shetland/ogc/ows/exception/CodedOwsException.java | 2 +- .../n52/shetland/ogc/ows/exception/CompositeOwsException.java | 2 +- .../java/org/n52/shetland/ogc/ows/exception/ExceptionCode.java | 2 +- .../ogc/ows/exception/InvalidParameterValueException.java | 2 +- .../ogc/ows/exception/InvalidUpdateSequenceException.java | 2 +- .../ogc/ows/exception/MissingParameterValueException.java | 2 +- .../ogc/ows/exception/MissingServiceParameterException.java | 2 +- .../ogc/ows/exception/MissingVersionParameterException.java | 2 +- .../shetland/ogc/ows/exception/NoApplicableCodeException.java | 2 +- .../ogc/ows/exception/OperationNotSupportedException.java | 2 +- .../ogc/ows/exception/OptionNotSupportedException.java | 2 +- .../org/n52/shetland/ogc/ows/exception/OwsExceptionCode.java | 2 +- .../org/n52/shetland/ogc/ows/exception/OwsExceptionReport.java | 2 +- .../ogc/ows/exception/VersionNegotiationFailedException.java | 2 +- .../org/n52/shetland/ogc/ows/extension/AbstractExtension.java | 2 +- .../n52/shetland/ogc/ows/extension/CapabilitiesExtension.java | 2 +- .../n52/shetland/ogc/ows/extension/DisableableExtension.java | 2 +- .../java/org/n52/shetland/ogc/ows/extension/Extension.java | 2 +- .../java/org/n52/shetland/ogc/ows/extension/Extensions.java | 2 +- .../org/n52/shetland/ogc/ows/extension/MergableExtension.java | 2 +- .../ogc/ows/extension/StringBasedCapabilitiesExtension.java | 2 +- .../n52/shetland/ogc/ows/extension/StringBasedExtension.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/extension/Value.java | 2 +- .../n52/shetland/ogc/ows/service/GetCapabilitiesRequest.java | 2 +- .../n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java | 2 +- .../java/org/n52/shetland/ogc/ows/service/OwsOperationKey.java | 2 +- .../ogc/ows/service/OwsServiceCommunicationObject.java | 2 +- .../java/org/n52/shetland/ogc/ows/service/OwsServiceKey.java | 2 +- .../org/n52/shetland/ogc/ows/service/OwsServiceRequest.java | 2 +- .../n52/shetland/ogc/ows/service/OwsServiceRequestContext.java | 2 +- .../org/n52/shetland/ogc/ows/service/OwsServiceResponse.java | 2 +- .../java/org/n52/shetland/ogc/ows/service/ResponseFormat.java | 2 +- .../n52/shetland/ogc/ows/service/VersionedOperationKey.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/AbstractComponent.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/AbstractProcess.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/AbstractSensorML.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sensorML/Component.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/HasComponents.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/HasConnections.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/HasPosition.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/HasProcessMethod.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/ProcessChain.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/ProcessMethod.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/ProcessModel.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/sensorML/Role.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/RulesDefinition.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sensorML/SensorML.java | 2 +- .../org/n52/shetland/ogc/sensorML/SensorML20Constants.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/SensorMLConstants.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/SmlContact.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/SmlContactList.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sensorML/SmlPerson.java | 2 +- .../org/n52/shetland/ogc/sensorML/SmlReferencedContact.java | 2 +- .../org/n52/shetland/ogc/sensorML/SmlResponsibleParty.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sensorML/System.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/sensorML/Term.java | 2 +- .../ogc/sensorML/elements/AbstractDataComponentContainer.java | 2 +- .../sensorML/elements/AbstractSmlDataComponentContainer.java | 2 +- .../ogc/sensorML/elements/AbstractSmlDocumentation.java | 2 +- .../n52/shetland/ogc/sensorML/elements/SmlCapabilities.java | 2 +- .../ogc/sensorML/elements/SmlCapabilitiesPredicates.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlCapability.java | 2 +- .../n52/shetland/ogc/sensorML/elements/SmlCharacteristic.java | 2 +- .../n52/shetland/ogc/sensorML/elements/SmlCharacteristics.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlClassifier.java | 2 +- .../ogc/sensorML/elements/SmlClassifierPredicates.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlComponent.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlConnection.java | 2 +- .../n52/shetland/ogc/sensorML/elements/SmlDocumentation.java | 2 +- .../shetland/ogc/sensorML/elements/SmlDocumentationList.java | 2 +- .../ogc/sensorML/elements/SmlDocumentationListMember.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlIdentifier.java | 2 +- .../ogc/sensorML/elements/SmlIdentifierPredicates.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/elements/SmlIo.java | 2 +- .../n52/shetland/ogc/sensorML/elements/SmlIoPredicates.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/elements/SmlLink.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlLocation.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlParameter.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlPosition.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/AbstractAlgorithm.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/v20/AbstractModes.java | 2 +- .../n52/shetland/ogc/sensorML/v20/AbstractPhysicalProcess.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/AbstractSettings.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/AggregateProcess.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/DescribedObject.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/PhysicalComponent.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/v20/PhysicalSystem.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/v20/SimpleProcess.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/SmlDataInterface.java | 2 +- .../n52/shetland/ogc/sensorML/v20/SmlFeatureOfInterest.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/v20/SpatialFrame.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/v20/TemporalFrame.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/BatchConstants.java | 2 +- .../org/n52/shetland/ogc/sos/ExtendedIndeterminateTime.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/FeatureType.java | 2 +- .../java/org/n52/shetland/ogc/sos/ObjectWithXmlString.java | 2 +- .../org/n52/shetland/ogc/sos/ProcedureDescriptionFormat.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/ResultFilter.java | 2 +- .../java/org/n52/shetland/ogc/sos/ResultFilterConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/Sos1Constants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/Sos2Constants.java | 2 +- .../java/org/n52/shetland/ogc/sos/Sos2StreamingConstants.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/SosCapabilities.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/SosConstants.java | 2 +- .../org/n52/shetland/ogc/sos/SosInsertionCapabilities.java | 2 +- .../java/org/n52/shetland/ogc/sos/SosInsertionMetadata.java | 2 +- .../java/org/n52/shetland/ogc/sos/SosObservationOffering.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/SosOffering.java | 2 +- .../java/org/n52/shetland/ogc/sos/SosProcedureDescription.java | 2 +- .../shetland/ogc/sos/SosProcedureDescriptionUnknownType.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/SosResultEncoding.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/SosResultStructure.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/SosResultTemplate.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/SosSoapConstants.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/SosSpatialFilter.java | 2 +- .../org/n52/shetland/ogc/sos/SosSpatialFilterConstants.java | 2 +- .../shetland/ogc/sos/delobs/DeleteObservationConstants.java | 2 +- .../n52/shetland/ogc/sos/delobs/DeleteObservationRequest.java | 2 +- .../n52/shetland/ogc/sos/delobs/DeleteObservationResponse.java | 2 +- .../shetland/ogc/sos/drt/DeleteResultTemplateConstants.java | 2 +- .../n52/shetland/ogc/sos/drt/DeleteResultTemplateRequest.java | 2 +- .../n52/shetland/ogc/sos/drt/DeleteResultTemplateResponse.java | 2 +- .../org/n52/shetland/ogc/sos/exception/CodedSosException.java | 2 +- .../ogc/sos/exception/ResponseExceedsSizeLimitException.java | 2 +- .../org/n52/shetland/ogc/sos/exception/SosExceptionCode.java | 2 +- .../ogc/sos/extension/SosObservationOfferingExtension.java | 2 +- .../n52/shetland/ogc/sos/gda/GetDataAvailabilityConstants.java | 2 +- .../n52/shetland/ogc/sos/gda/GetDataAvailabilityRequest.java | 2 +- .../n52/shetland/ogc/sos/gda/GetDataAvailabilityResponse.java | 2 +- .../ogc/sos/ifoi/InsertFeatureOfInterestConstants.java | 2 +- .../shetland/ogc/sos/ifoi/InsertFeatureOfInterestRequest.java | 2 +- .../shetland/ogc/sos/ifoi/InsertFeatureOfInterestResponse.java | 2 +- .../shetland/ogc/sos/request/AbstractObservationRequest.java | 2 +- .../java/org/n52/shetland/ogc/sos/request/BatchRequest.java | 2 +- .../org/n52/shetland/ogc/sos/request/DeleteSensorRequest.java | 2 +- .../n52/shetland/ogc/sos/request/DescribeSensorRequest.java | 2 +- .../ogc/sos/request/FeatureOfInterestIdentifierRequest.java | 2 +- .../shetland/ogc/sos/request/GetFeatureOfInterestRequest.java | 2 +- .../shetland/ogc/sos/request/GetObservationByIdRequest.java | 2 +- .../n52/shetland/ogc/sos/request/GetObservationRequest.java | 2 +- .../org/n52/shetland/ogc/sos/request/GetResultRequest.java | 2 +- .../n52/shetland/ogc/sos/request/GetResultTemplateRequest.java | 2 +- .../n52/shetland/ogc/sos/request/InsertObservationRequest.java | 2 +- .../org/n52/shetland/ogc/sos/request/InsertResultRequest.java | 2 +- .../shetland/ogc/sos/request/InsertResultTemplateRequest.java | 2 +- .../org/n52/shetland/ogc/sos/request/InsertSensorRequest.java | 2 +- .../ogc/sos/request/SosDescribeFeatureTypeRequest.java | 2 +- .../ogc/sos/request/SosDescribeObservationTypeRequest.java | 2 +- .../ogc/sos/request/SosGetFeatureOfInterestTimeRequest.java | 2 +- .../n52/shetland/ogc/sos/request/SosRegisterSensorRequest.java | 2 +- .../shetland/ogc/sos/request/SpatialFeatureQueryRequest.java | 2 +- .../ogc/sos/request/SpatialFilteringProfileRequest.java | 2 +- .../java/org/n52/shetland/ogc/sos/request/SrsNameRequest.java | 2 +- .../org/n52/shetland/ogc/sos/request/UpdateSensorRequest.java | 2 +- .../shetland/ogc/sos/response/AbstractObservationResponse.java | 2 +- .../shetland/ogc/sos/response/AbstractOperationResponse.java | 2 +- .../org/n52/shetland/ogc/sos/response/AbstractStreaming.java | 2 +- .../java/org/n52/shetland/ogc/sos/response/BatchResponse.java | 2 +- .../shetland/ogc/sos/response/BinaryAttachmentResponse.java | 2 +- .../n52/shetland/ogc/sos/response/DeleteSensorResponse.java | 2 +- .../n52/shetland/ogc/sos/response/DescribeSensorResponse.java | 2 +- .../ogc/sos/response/GetFeatureOfInterestResponse.java | 2 +- .../shetland/ogc/sos/response/GetObservationByIdResponse.java | 2 +- .../n52/shetland/ogc/sos/response/GetObservationResponse.java | 2 +- .../org/n52/shetland/ogc/sos/response/GetResultResponse.java | 2 +- .../shetland/ogc/sos/response/GetResultTemplateResponse.java | 2 +- .../ogc/sos/response/GlobalObservationResponseValues.java | 2 +- .../shetland/ogc/sos/response/InsertObservationResponse.java | 2 +- .../n52/shetland/ogc/sos/response/InsertResultResponse.java | 2 +- .../ogc/sos/response/InsertResultTemplateResponse.java | 2 +- .../n52/shetland/ogc/sos/response/InsertSensorResponse.java | 2 +- .../n52/shetland/ogc/sos/response/UpdateSensorResponse.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/ro/OfferingContext.java | 2 +- .../org/n52/shetland/ogc/sos/ro/RelatedOfferingConstants.java | 2 +- .../java/org/n52/shetland/ogc/sos/ro/RelatedOfferings.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sta/StaConstants.java | 2 +- .../org/n52/shetland/ogc/sta/exception/STACRUDException.java | 2 +- .../ogc/sta/exception/STAInvalidFilterExpressionException.java | 2 +- .../n52/shetland/ogc/sta/exception/STAInvalidQueryError.java | 2 +- .../shetland/ogc/sta/exception/STAInvalidQueryException.java | 2 +- .../n52/shetland/ogc/sta/exception/STAInvalidUrlException.java | 2 +- .../n52/shetland/ogc/sta/exception/STANotFoundException.java | 2 +- .../n52/shetland/ogc/sta/model/DatastreamEntityDefinition.java | 2 +- .../ogc/sta/model/FeatureOfInterestEntityDefinition.java | 2 +- .../ogc/sta/model/HistoricalLocationEntityDefinition.java | 2 +- .../n52/shetland/ogc/sta/model/LocationEntityDefinition.java | 2 +- .../shetland/ogc/sta/model/ObservationEntityDefinition.java | 2 +- .../ogc/sta/model/ObservedPropertyEntityDefinition.java | 2 +- .../org/n52/shetland/ogc/sta/model/STAEntityDefinition.java | 2 +- .../org/n52/shetland/ogc/sta/model/SensorEntityDefinition.java | 2 +- .../org/n52/shetland/ogc/sta/model/ThingEntityDefinition.java | 2 +- .../ogc/swe/AbstractOptionalSweDataComponentVisitor.java | 2 +- .../ogc/swe/AbstractThrowingSweDataComponentVisitor.java | 2 +- .../ogc/swe/AbstractThrowingVoidSweDataComponentVisitor.java | 2 +- .../shetland/ogc/swe/AbstractVoidSweDataComponentVisitor.java | 2 +- .../org/n52/shetland/ogc/swe/CoordinateSettingsProvider.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/DataRecord.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/RangeValue.java | 2 +- .../org/n52/shetland/ogc/swe/SweAbstractDataComponent.java | 2 +- .../java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/SweConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/SweCoordinate.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java | 2 +- .../java/org/n52/shetland/ogc/swe/SweDataComponentVisitor.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/SweDataRecord.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/SweEnvelope.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/swe/SweField.java | 2 +- .../java/org/n52/shetland/ogc/swe/SweSimpleDataRecord.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/swe/SweVector.java | 2 +- .../org/n52/shetland/ogc/swe/VoidSweDataComponentVisitor.java | 2 +- .../org/n52/shetland/ogc/swe/encoding/SweAbstractEncoding.java | 2 +- .../org/n52/shetland/ogc/swe/encoding/SweTextEncoding.java | 2 +- .../n52/shetland/ogc/swe/simpleType/SweAbstractSimpleType.java | 2 +- .../n52/shetland/ogc/swe/simpleType/SweAbstractUomType.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweAllowedTimes.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweAllowedTokens.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweAllowedValues.java | 2 +- .../java/org/n52/shetland/ogc/swe/simpleType/SweBoolean.java | 2 +- .../java/org/n52/shetland/ogc/swe/simpleType/SweCategory.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweCategoryRange.java | 2 +- .../java/org/n52/shetland/ogc/swe/simpleType/SweCount.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweCountRange.java | 2 +- .../n52/shetland/ogc/swe/simpleType/SweObservableProperty.java | 2 +- .../java/org/n52/shetland/ogc/swe/simpleType/SweQuality.java | 2 +- .../java/org/n52/shetland/ogc/swe/simpleType/SweQuantity.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweQuantityRange.java | 2 +- .../main/java/org/n52/shetland/ogc/swe/simpleType/SweText.java | 2 +- .../main/java/org/n52/shetland/ogc/swe/simpleType/SweTime.java | 2 +- .../java/org/n52/shetland/ogc/swe/simpleType/SweTimeRange.java | 2 +- .../org/n52/shetland/ogc/swe/stream/StreamingSweDataArray.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swes/AbstractSWES.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swes/SwesConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swes/SwesExtension.java | 2 +- .../org/n52/shetland/ogc/swes/SwesFeatureRelationship.java | 2 +- .../java/org/n52/shetland/ogc/swes/SwesStreamingConstants.java | 2 +- .../org/n52/shetland/ogc/swes/exception/SwesExceptionCode.java | 2 +- .../java/org/n52/shetland/ogc/wps/DataTransmissionMode.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/ExecutionMode.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/wps/Format.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/InputOccurence.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/JobControlOption.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/wps/JobId.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/wps/JobStatus.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/OutputDefinition.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/ProcessOffering.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/ProcessOfferings.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/ResponseMode.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/wps/Result.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/StatusInfo.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/WPS100Constants.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/WPS200Constants.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/WPSCapabilities.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/WPSConstants.java | 2 +- .../java/org/n52/shetland/ogc/wps/ap/ApplicationPackage.java | 2 +- .../java/org/n52/shetland/ogc/wps/ap/DockerExecutionUnit.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/ap/ExecutionUnit.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/wps/data/Body.java | 2 +- .../org/n52/shetland/ogc/wps/data/FormattedProcessData.java | 2 +- .../java/org/n52/shetland/ogc/wps/data/GroupProcessData.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/data/InlineBody.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/data/ProcessData.java | 2 +- .../org/n52/shetland/ogc/wps/data/ReferenceProcessData.java | 2 +- .../java/org/n52/shetland/ogc/wps/data/ReferencedBody.java | 2 +- .../java/org/n52/shetland/ogc/wps/data/ValueProcessData.java | 2 +- .../n52/shetland/ogc/wps/data/impl/FileBasedProcessData.java | 2 +- .../shetland/ogc/wps/data/impl/InMemoryValueProcessData.java | 2 +- .../n52/shetland/ogc/wps/data/impl/StringValueProcessData.java | 2 +- .../shetland/ogc/wps/description/BoundingBoxDescription.java | 2 +- .../ogc/wps/description/BoundingBoxInputDescription.java | 2 +- .../ogc/wps/description/BoundingBoxOutputDescription.java | 2 +- .../n52/shetland/ogc/wps/description/ComplexDescription.java | 2 +- .../shetland/ogc/wps/description/ComplexInputDescription.java | 2 +- .../shetland/ogc/wps/description/ComplexOutputDescription.java | 2 +- .../org/n52/shetland/ogc/wps/description/DataDescription.java | 2 +- .../java/org/n52/shetland/ogc/wps/description/Description.java | 2 +- .../shetland/ogc/wps/description/GroupInputDescription.java | 2 +- .../shetland/ogc/wps/description/GroupOutputDescription.java | 2 +- .../n52/shetland/ogc/wps/description/LiteralDataDomain.java | 2 +- .../n52/shetland/ogc/wps/description/LiteralDescription.java | 2 +- .../shetland/ogc/wps/description/LiteralInputDescription.java | 2 +- .../shetland/ogc/wps/description/LiteralOutputDescription.java | 2 +- .../n52/shetland/ogc/wps/description/ProcessDescription.java | 2 +- .../ogc/wps/description/ProcessDescriptionBuilderFactory.java | 2 +- .../shetland/ogc/wps/description/ProcessInputDescription.java | 2 +- .../ogc/wps/description/ProcessInputDescriptionContainer.java | 2 +- .../shetland/ogc/wps/description/ProcessOutputDescription.java | 2 +- .../ogc/wps/description/ProcessOutputDescriptionContainer.java | 2 +- .../ogc/wps/description/impl/AbstractDataDescription.java | 2 +- .../shetland/ogc/wps/description/impl/AbstractDescription.java | 2 +- .../wps/description/impl/AbstractProcessInputDescription.java | 2 +- .../wps/description/impl/AbstractProcessOutputDescription.java | 2 +- .../wps/description/impl/BoundingBoxInputDescriptionImpl.java | 2 +- .../wps/description/impl/BoundingBoxOutputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/ComplexInputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/ComplexOutputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/GroupInputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/GroupOutputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/LiteralDataDomainImpl.java | 2 +- .../ogc/wps/description/impl/LiteralInputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/LiteralOutputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/ProcessDescriptionFactory.java | 2 +- .../ogc/wps/description/impl/ProcessDescriptionImpl.java | 2 +- .../org/n52/shetland/ogc/wps/exception/CodedWpsException.java | 2 +- .../org/n52/shetland/ogc/wps/exception/NoSuchJobException.java | 2 +- .../shetland/ogc/wps/exception/ResultNotReadyException.java | 2 +- .../org/n52/shetland/ogc/wps/exception/WpsExceptionCode.java | 2 +- .../org/n52/shetland/ogc/wps/request/AbstractJobIdRequest.java | 2 +- .../n52/shetland/ogc/wps/request/DescribeProcessRequest.java | 2 +- .../java/org/n52/shetland/ogc/wps/request/DismissRequest.java | 2 +- .../java/org/n52/shetland/ogc/wps/request/ExecuteRequest.java | 2 +- .../org/n52/shetland/ogc/wps/request/GetResultRequest.java | 2 +- .../org/n52/shetland/ogc/wps/request/GetStatusRequest.java | 2 +- .../n52/shetland/ogc/wps/response/DescribeProcessResponse.java | 2 +- .../org/n52/shetland/ogc/wps/response/DismissResponse.java | 2 +- .../org/n52/shetland/ogc/wps/response/ExecuteResponse.java | 2 +- .../org/n52/shetland/ogc/wps/response/GetResultResponse.java | 2 +- .../org/n52/shetland/ogc/wps/response/GetStatusResponse.java | 2 +- .../core/src/main/java/org/n52/shetland/util/AqdHelper.java | 2 +- .../core/src/main/java/org/n52/shetland/util/CRSHelper.java | 2 +- .../src/main/java/org/n52/shetland/util/CollectionHelper.java | 2 +- .../src/main/java/org/n52/shetland/util/DateTimeException.java | 2 +- .../java/org/n52/shetland/util/DateTimeFormatException.java | 2 +- .../src/main/java/org/n52/shetland/util/DateTimeHelper.java | 2 +- .../java/org/n52/shetland/util/DateTimeParseException.java | 2 +- .../src/main/java/org/n52/shetland/util/EReportingSetting.java | 2 +- .../main/java/org/n52/shetland/util/EnvelopeOrGeometry.java | 2 +- .../main/java/org/n52/shetland/util/GeometryTransformer.java | 2 +- shetland/core/src/main/java/org/n52/shetland/util/HTTP.java | 2 +- .../core/src/main/java/org/n52/shetland/util/IdGenerator.java | 2 +- .../core/src/main/java/org/n52/shetland/util/JTSHelper.java | 2 +- .../core/src/main/java/org/n52/shetland/util/JavaHelper.java | 2 +- shetland/core/src/main/java/org/n52/shetland/util/MinMax.java | 2 +- .../core/src/main/java/org/n52/shetland/util/OMHelper.java | 2 +- .../src/main/java/org/n52/shetland/util/OwsQueryBuilder.java | 2 +- .../main/java/org/n52/shetland/util/ReferencedEnvelope.java | 2 +- .../src/main/java/org/n52/shetland/util/SosQueryBuilder.java | 2 +- .../core/src/main/java/org/n52/shetland/util/StringHelper.java | 2 +- .../core/src/main/java/org/n52/shetland/uvf/UVFConstants.java | 2 +- .../main/java/org/n52/shetland/uvf/UVFSettingsProvider.java | 2 +- shetland/core/src/main/java/org/n52/shetland/w3c/Nillable.java | 2 +- .../src/main/java/org/n52/shetland/w3c/SchemaLocation.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/W3CConstants.java | 2 +- .../src/main/java/org/n52/shetland/w3c/soap/AbstractSoap.java | 2 +- .../src/main/java/org/n52/shetland/w3c/soap/SoapChain.java | 2 +- .../src/main/java/org/n52/shetland/w3c/soap/SoapConstants.java | 2 +- .../src/main/java/org/n52/shetland/w3c/soap/SoapFault.java | 2 +- .../src/main/java/org/n52/shetland/w3c/soap/SoapHeader.java | 2 +- .../src/main/java/org/n52/shetland/w3c/soap/SoapRequest.java | 2 +- .../src/main/java/org/n52/shetland/w3c/soap/SoapResponse.java | 2 +- .../main/java/org/n52/shetland/w3c/wsa/WsaActionHeader.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsa/WsaConstants.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsa/WsaHeader.java | 2 +- .../main/java/org/n52/shetland/w3c/wsa/WsaMessageIDHeader.java | 2 +- .../main/java/org/n52/shetland/w3c/wsa/WsaRelatesToHeader.java | 2 +- .../main/java/org/n52/shetland/w3c/wsa/WsaReplyToHeader.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsa/WsaToHeader.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/AbstractAddress.java | 2 +- .../java/org/n52/shetland/w3c/wsdl/AbstractDocumentedWsdl.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/AbstractWsdl.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Binding.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/BindingFault.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/BindingInput.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/BindingMessage.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/BindingOperation.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/BindingOutput.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/Definitions.java | 2 +- .../java/org/n52/shetland/w3c/wsdl/ExtensibilityElement.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Fault.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Import.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Include.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Input.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Message.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/Operation.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Output.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Param.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Part.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Port.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/PortType.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Schema.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/SchemaReference.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Service.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Types.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/WSDLConstants.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/http/HttpAddress.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/http/HttpBinding.java | 2 +- .../java/org/n52/shetland/w3c/wsdl/http/HttpOperation.java | 2 +- .../java/org/n52/shetland/w3c/wsdl/http/HttpUrlEncoded.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/mime/MimeXml.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/soap/SoapAddress.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/soap/SoapBinding.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapBody.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/soap/SoapFault.java | 2 +- .../java/org/n52/shetland/w3c/wsdl/soap/SoapOperation.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/xlink/Actuate.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/xlink/Link.java | 2 +- .../src/main/java/org/n52/shetland/w3c/xlink/Reference.java | 2 +- .../main/java/org/n52/shetland/w3c/xlink/Referenceable.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/xlink/Show.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/xlink/Type.java | 2 +- .../main/java/org/n52/shetland/w3c/xlink/W3CHrefAttribute.java | 2 +- .../core/src/test/java/org/n52/shetland/ogc/gml/TimeTest.java | 2 +- .../java/org/n52/shetland/ogc/gml/time/TimeInstantTest.java | 2 +- .../java/org/n52/shetland/ogc/gml/time/TimePeriodTest.java | 2 +- .../n52/shetland/ogc/om/OmObservationConstellationTest.java | 2 +- .../test/java/org/n52/shetland/ogc/om/OmObservationTest.java | 2 +- .../n52/shetland/ogc/om/features/FeatureCollectionTest.java | 2 +- .../features/samplingFeatures/SamplingFeatureComplexTest.java | 2 +- .../ogc/om/features/samplingFeatures/SamplingFeatureTest.java | 2 +- .../java/org/n52/shetland/ogc/om/values/ProfileLevelTest.java | 2 +- .../java/org/n52/shetland/ogc/om/values/ProfileValueTest.java | 2 +- .../org/n52/shetland/ogc/ows/service/RequestContextTest.java | 2 +- .../java/org/n52/shetland/ogc/ows/service/TestRequest.java | 2 +- .../org/n52/shetland/ogc/sensorML/AbstractSensorMLTest.java | 2 +- .../n52/shetland/ogc/sensorML/elements/SmlClassifierTest.java | 2 +- .../n52/shetland/ogc/sensorML/elements/SmlIdentifierTest.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/elements/SmlIoTest.java | 2 +- .../test/java/org/n52/shetland/ogc/sos/ObjectWithXmlTest.java | 2 +- .../shetland/ogc/sos/request/GetObservationRequestTest.java | 2 +- .../test/java/org/n52/shetland/ogc/swe/SweDataRecordTest.java | 2 +- .../test/java/org/n52/shetland/ogc/swe/SweEnvelopeTest.java | 2 +- .../n52/shetland/ogc/swe/simpleType/SosSweCategoryTest.java | 2 +- .../test/java/org/n52/shetland/ogc/swes/ExtensionsTest.java | 2 +- .../src/test/java/org/n52/shetland/ogc/wps/FormatTest.java | 2 +- .../test/java/org/n52/shetland/util/CollectionHelperTest.java | 2 +- .../test/java/org/n52/shetland/util/DateTimeHelperTest.java | 2 +- .../src/test/java/org/n52/shetland/util/IdGeneratorTest.java | 2 +- .../test/java/org/n52/shetland/util/JTSHelperForTesting.java | 2 +- .../src/test/java/org/n52/shetland/util/JTSHelperTest.java | 2 +- .../java/org/n52/shetland/util/ReferencedEnvelopeTest.java | 2 +- .../core/src/test/java/org/n52/shetland/util/ReverseOf.java | 2 +- .../src/test/java/org/n52/shetland/util/StringHelperTest.java | 2 +- .../src/test/java/org/n52/shetland/util/UnknownGeometry.java | 2 +- .../test/java/org/n52/shetland/util/http/MediaTypeTest.java | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- .../src/main/java/org/n52/shetland/rdf/AbstractDatatype.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/AbstractLang.java | 2 +- .../src/main/java/org/n52/shetland/rdf/AbstractProperty.java | 2 +- .../src/main/java/org/n52/shetland/rdf/AbstractResource.java | 2 +- .../java/org/n52/shetland/rdf/AbstractTitleDescription.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/AbstractValue.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/ModelAdder.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/RDF.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/RDFDataTypes.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/RDFElement.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/RDFMediaTypes.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/RdfPrefix.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/ResourceAdder.java | 2 +- .../src/main/java/org/n52/shetland/rdf/ResourceCreator.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dcat/AccessURL.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dcat/Catalog.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dcat/ContactPoint.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dcat/Dataset.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dcat/DcatRdfPrefix.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dcat/Distribution.java | 2 +- .../java/org/n52/shetland/rdf/dcat/DistributionProperty.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dcat/DownloadURL.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dcat/Keyword.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dcat/LandingPage.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dcat/ThemeTaxonomy.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dct/AccessRights.java | 2 +- .../main/java/org/n52/shetland/rdf/dct/AccrualPeriodicity.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dct/CLDFrequency.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dct/DctRdfPrefix.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dct/Description.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Format.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Identifier.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Issued.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Language.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/License.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Location.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Modified.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Publisher.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Spatial.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Theme.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Title.java | 2 +- .../src/main/java/org/n52/shetland/rdf/foaf/FoafRdfPrefix.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/foaf/Homepage.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/foaf/MBox.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/foaf/Name.java | 2 +- .../src/main/java/org/n52/shetland/rdf/foaf/Organization.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/locn/Geometry.java | 2 +- .../src/main/java/org/n52/shetland/rdf/locn/LocnRdfPrefix.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/vcard4/Email.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/vcard4/FN.java | 2 +- .../src/main/java/org/n52/shetland/rdf/vcard4/HasEmail.java | 2 +- .../java/org/n52/shetland/rdf/vcard4/VCardOrganization.java | 2 +- .../main/java/org/n52/shetland/rdf/vcard4/Vcard4RdfPrefix.java | 2 +- .../src/main/java/org/n52/shetland/rdf/vocabulary/LOCN.java | 2 +- .../src/main/java/org/n52/shetland/rdf/vocabulary/TIME.java | 2 +- svalbard/core/pom.xml | 2 +- .../core/src/main/java/org/n52/svalbard/CodingSettings.java | 2 +- .../core/src/main/java/org/n52/svalbard/ConformanceClass.java | 2 +- .../src/main/java/org/n52/svalbard/ConformanceClasses.java | 2 +- .../core/src/main/java/org/n52/svalbard/ProcedureCoder.java | 2 +- .../org/n52/svalbard/decode/AbstractDelegatingDecoder.java | 2 +- .../java/org/n52/svalbard/decode/ConformanceClassDecoder.java | 2 +- .../core/src/main/java/org/n52/svalbard/decode/Decoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/DecoderFactory.java | 2 +- .../core/src/main/java/org/n52/svalbard/decode/DecoderKey.java | 2 +- .../main/java/org/n52/svalbard/decode/DecoderRepository.java | 2 +- .../src/main/java/org/n52/svalbard/decode/JsonDecoderKey.java | 2 +- .../main/java/org/n52/svalbard/decode/NamespaceDecoderKey.java | 2 +- .../main/java/org/n52/svalbard/decode/OperationDecoderKey.java | 2 +- .../main/java/org/n52/svalbard/decode/ProcedureDecoder.java | 2 +- .../java/org/n52/svalbard/decode/XmlNamespaceDecoderKey.java | 2 +- .../n52/svalbard/decode/XmlNamespaceOperationDecoderKey.java | 2 +- .../org/n52/svalbard/decode/XmlStringOperationDecoderKey.java | 2 +- .../decode/exception/DecoderResponseUnsupportedException.java | 2 +- .../org/n52/svalbard/decode/exception/DecodingException.java | 2 +- .../svalbard/decode/exception/NoDecoderForKeyException.java | 2 +- .../decode/exception/NotYetSupportedDecodingException.java | 2 +- .../decode/exception/UnsupportedDecoderInputException.java | 2 +- .../n52/svalbard/decode/exception/XmlDecodingException.java | 2 +- .../org/n52/svalbard/encode/AbstractDelegatingEncoder.java | 2 +- .../java/org/n52/svalbard/encode/ClassToClassEncoderKey.java | 2 +- .../java/org/n52/svalbard/encode/ConformanceClassEncoder.java | 2 +- .../core/src/main/java/org/n52/svalbard/encode/Encoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/EncoderFactory.java | 2 +- .../src/main/java/org/n52/svalbard/encode/EncoderFlags.java | 2 +- .../core/src/main/java/org/n52/svalbard/encode/EncoderKey.java | 2 +- .../main/java/org/n52/svalbard/encode/EncoderRepository.java | 2 +- .../src/main/java/org/n52/svalbard/encode/EncodingContext.java | 2 +- .../main/java/org/n52/svalbard/encode/ExceptionEncoderKey.java | 2 +- .../main/java/org/n52/svalbard/encode/ObservationEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/OperationEncoderKey.java | 2 +- .../org/n52/svalbard/encode/OperationRequestEncoderKey.java | 2 +- .../org/n52/svalbard/encode/OperationResponseEncoderKey.java | 2 +- .../main/java/org/n52/svalbard/encode/ProcedureEncoder.java | 2 +- .../org/n52/svalbard/encode/ResponseContentTypeEncoderKey.java | 2 +- .../main/java/org/n52/svalbard/encode/SchemaAwareEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/SchemaRepository.java | 2 +- .../main/java/org/n52/svalbard/encode/StreamingEncoder.java | 2 +- .../java/org/n52/svalbard/encode/StreamingEncoderFlags.java | 2 +- .../core/src/main/java/org/n52/svalbard/encode/UVFEncoder.java | 2 +- .../org/n52/svalbard/encode/VersionedOperationEncoderKey.java | 2 +- .../src/main/java/org/n52/svalbard/encode/WmlTmlHelper.java | 2 +- .../java/org/n52/svalbard/encode/XmlBeansEncodingFlags.java | 2 +- .../java/org/n52/svalbard/encode/XmlDocumentEncoderKey.java | 2 +- .../src/main/java/org/n52/svalbard/encode/XmlEncoderFlags.java | 2 +- .../src/main/java/org/n52/svalbard/encode/XmlEncoderKey.java | 2 +- .../org/n52/svalbard/encode/XmlPropertyTypeEncoderKey.java | 2 +- .../java/org/n52/svalbard/encode/XmlStreamEncoderFlags.java | 2 +- .../encode/exception/EncoderResponseUnsupportedException.java | 2 +- .../org/n52/svalbard/encode/exception/EncodingException.java | 2 +- .../svalbard/encode/exception/NoEncoderForKeyException.java | 2 +- .../encode/exception/NotYetSupportedEncodingException.java | 2 +- .../encode/exception/UnsupportedEncoderInputException.java | 2 +- .../core/src/main/java/org/n52/svalbard/util/CodingHelper.java | 2 +- .../core/src/main/java/org/n52/svalbard/util/GmlHelper.java | 2 +- .../core/src/main/java/org/n52/svalbard/util/N52XmlHelper.java | 2 +- .../java/org/n52/svalbard/util/NamespaceContextBuilder.java | 2 +- .../core/src/main/java/org/n52/svalbard/util/SweHelper.java | 2 +- .../core/src/main/java/org/n52/svalbard/util/XmlHelper.java | 2 +- .../src/main/java/org/n52/svalbard/util/XmlOptionsHelper.java | 2 +- svalbard/core/src/main/resources/svalbard-core-context.xml | 2 +- .../test/java/org/n52/svalbard/AbstractXmlBeansGenerator.java | 2 +- .../src/test/java/org/n52/svalbard/encode/UVFEncoderTest.java | 2 +- svalbard/exi/pom.xml | 2 +- .../exi/src/main/java/org/n52/svalbard/encode/ExiEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/ExiExceptionEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/ExiResponseEncoder.java | 2 +- svalbard/exi/src/main/resources/svalbard-exi-context.xml | 2 +- .../exi/src/test/java/org/n52/svalbard/XmlToExiConverter.java | 2 +- svalbard/exi/src/test/resources/xml/DescribeSensor.xml | 2 +- svalbard/exi/src/test/resources/xml/GetCapabilities.xml | 2 +- svalbard/exi/src/test/resources/xml/GetDataAvailability.xml | 2 +- svalbard/exi/src/test/resources/xml/GetFeatureOfInterest.xml | 2 +- svalbard/exi/src/test/resources/xml/GetObservation.xml | 2 +- svalbard/exi/src/test/resources/xml/GetObservationById.xml | 2 +- svalbard/json-common/pom.xml | 2 +- .../java/org/n52/svalbard/coding/json/AQDJSONConstants.java | 2 +- .../org/n52/svalbard/coding/json/GeoJSONDecodingException.java | 2 +- .../org/n52/svalbard/coding/json/GeoJSONEncodingException.java | 2 +- .../main/java/org/n52/svalbard/coding/json/JSONConstants.java | 2 +- .../main/java/org/n52/svalbard/coding/json/JSONValidator.java | 2 +- .../java/org/n52/svalbard/coding/json/SchemaConstants.java | 2 +- .../n52/svalbard/decode/json/AbstractSosRequestDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/json/JSONDecoder.java | 2 +- .../org/n52/svalbard/decode/json/JSONDecodingException.java | 2 +- .../n52/svalbard/encode/json/AbstractSosResponseEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/json/JSONEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/json/JSONEncoderKey.java | 2 +- .../org/n52/svalbard/encode/json/JSONEncodingException.java | 2 +- .../n52/svalbard/encode/json/base/BigDecimalJSONEncoder.java | 2 +- .../n52/svalbard/encode/json/base/BigIntegerJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/BooleanJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/ByteJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/DoubleJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/FloatJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/IntegerJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/LongJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/ShortJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/StringJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/TimeJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/base/URIJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/base/URLJSONEncoder.java | 2 +- .../src/main/resources/svalbard-json-common-context.xml | 2 +- .../svalbard/coding/json/JSONEncoderForExceptionTesting.java | 2 +- .../org/n52/svalbard/coding/json/JSONEncoderForTesting.java | 2 +- .../java/org/n52/svalbard/coding/json/JSONEncoderTest.java | 2 +- .../org/n52/svalbard/coding/json/JSONSchemaValidationTest.java | 2 +- .../java/org/n52/svalbard/coding/json/JSONValidatorTest.java | 2 +- .../test/java/org/n52/svalbard/coding/json/matchers/Does.java | 2 +- .../org/n52/svalbard/coding/json/matchers/JSONMatchers.java | 2 +- .../n52/svalbard/coding/json/matchers/ValidationMatchers.java | 2 +- svalbard/json/pom.xml | 2 +- .../java/org/n52/svalbard/decode/json/AbstractJSONDecoder.java | 2 +- .../java/org/n52/svalbard/decode/json/AddressJSONDecoder.java | 2 +- .../java/org/n52/svalbard/decode/json/BatchRequestDecoder.java | 2 +- .../java/org/n52/svalbard/decode/json/ContactJSONDecoder.java | 2 +- .../n52/svalbard/decode/json/DeleteObservationJsonDecoder.java | 2 +- .../n52/svalbard/decode/json/DeleteSensorRequestDecoder.java | 2 +- .../n52/svalbard/decode/json/DescribeSensorRequestDecoder.java | 2 +- .../n52/svalbard/decode/json/EReportingChangeJSONDecoder.java | 2 +- .../n52/svalbard/decode/json/EReportingHeaderJSONDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/json/FeatureDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/json/FieldDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/json/GeoJSONDecoder.java | 2 +- .../n52/svalbard/decode/json/GeographicalNameJSONDecoder.java | 2 +- .../svalbard/decode/json/GetCapabilitiesRequestDecoder.java | 2 +- .../svalbard/decode/json/GetDataAvailabilityJsonDecoder.java | 2 +- .../decode/json/GetFeatureOfInterestRequestDecoder.java | 2 +- .../svalbard/decode/json/GetObservationByIdRequestDecoder.java | 2 +- .../n52/svalbard/decode/json/GetObservationRequestDecoder.java | 2 +- .../org/n52/svalbard/decode/json/GetResultRequestDecoder.java | 2 +- .../svalbard/decode/json/GetResultTemplateRequestDecoder.java | 2 +- .../svalbard/decode/json/InsertObservationRequestDecoder.java | 2 +- .../n52/svalbard/decode/json/InsertResultRequestDecoder.java | 2 +- .../decode/json/InsertResultTemplateRequestDecoder.java | 2 +- .../n52/svalbard/decode/json/InsertSensorRequestDecoder.java | 2 +- .../org/n52/svalbard/decode/json/InspireIDJSONDecoder.java | 2 +- .../java/org/n52/svalbard/decode/json/ObservationDecoder.java | 2 +- .../org/n52/svalbard/decode/json/PronunciationJSONDecoder.java | 2 +- .../org/n52/svalbard/decode/json/RelatedPartyJSONDecoder.java | 2 +- .../n52/svalbard/decode/json/ReportObligationJSONDecoder.java | 2 +- .../org/n52/svalbard/decode/json/SpatialFilterDecoder.java | 2 +- .../java/org/n52/svalbard/decode/json/SpellingJSONDecoder.java | 2 +- .../org/n52/svalbard/decode/json/TemporalFilterDecoder.java | 2 +- .../n52/svalbard/decode/json/UpdateSensorRequestDecoder.java | 2 +- .../svalbard/decode/json/wps/ApplicationPackageDecoder.java | 2 +- .../svalbard/decode/json/wps/DockerExecutionUnitDecoder.java | 2 +- .../org/n52/svalbard/decode/json/wps/ExecutionUnitDecoder.java | 2 +- .../svalbard/decode/json/wps/ProcessDescriptionDecoder.java | 2 +- .../n52/svalbard/decode/json/wps/ProcessOfferingDecoder.java | 2 +- .../encode/json/AbstractObservationResponseEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/AddressJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/BatchResponseEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/CodeTypeJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/ContactJSONEncoder.java | 2 +- .../n52/svalbard/encode/json/DeleteObservationJsonEncoder.java | 2 +- .../n52/svalbard/encode/json/DeleteSensorResponseEncoder.java | 2 +- .../svalbard/encode/json/DescribeSensorResponseEncoder.java | 2 +- .../n52/svalbard/encode/json/EReportingChangeJSONEncoder.java | 2 +- .../n52/svalbard/encode/json/EReportingHeaderJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/FeatureOfInterestEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/json/FieldEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/json/GeoJSONEncoder.java | 2 +- .../n52/svalbard/encode/json/GeographicNameJSONEncoder.java | 2 +- .../svalbard/encode/json/GetCapabilitiesResponseEncoder.java | 2 +- .../svalbard/encode/json/GetDataAvailabilityJsonEncoder.java | 2 +- .../encode/json/GetFeatureOfInterestResponseEncoder.java | 2 +- .../encode/json/GetObservationByIdResponseEncoder.java | 2 +- .../svalbard/encode/json/GetObservationResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/json/GetResultResponseEncoder.java | 2 +- .../svalbard/encode/json/GetResultTemplateResponseEncoder.java | 2 +- .../svalbard/encode/json/InsertObservationResponseEncoder.java | 2 +- .../n52/svalbard/encode/json/InsertResultResponseEncoder.java | 2 +- .../encode/json/InsertResultTemplateResponseEncoder.java | 2 +- .../n52/svalbard/encode/json/InsertSensorResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/json/InspireIDJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/IterableJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/NillableJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/ObservationEncoder.java | 2 +- .../n52/svalbard/encode/json/OwsExceptionReportEncoder.java | 2 +- .../org/n52/svalbard/encode/json/PTFreeTextJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/PronunciationJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/ReferenceJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/ReferenceableJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/RelatedPartyJSONEncoder.java | 2 +- .../n52/svalbard/encode/json/ReportObligationJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/SpellingJSONEncoder.java | 2 +- .../n52/svalbard/encode/json/UpdateSensorResponseEncoder.java | 2 +- .../svalbard/encode/json/wps/ApplicationPackageEncoder.java | 2 +- .../svalbard/encode/json/wps/DockerExecutionUnitEncoder.java | 2 +- .../svalbard/encode/json/wps/ProcessDescriptionEncoder.java | 2 +- .../n52/svalbard/encode/json/wps/ProcessOfferingEncoder.java | 2 +- svalbard/json/src/main/resources/svalbard-json-context.xml | 2 +- .../test/java/org/n52/svalbard/ConfiguredSettingsManager.java | 2 +- .../json/src/test/java/org/n52/svalbard/XmlBeansGenerator.java | 2 +- .../n52/svalbard/coding/AbstractEReportingHeaderCoding.java | 2 +- .../src/test/java/org/n52/svalbard/coding/GeoJSONTest.java | 2 +- .../org/n52/svalbard/coding/ObservationValidationTest.java | 2 +- .../org/n52/svalbard/decode/json/BatchRequestDecodingTest.java | 2 +- .../svalbard/decode/json/CategoryObservationDecodingTest.java | 2 +- .../n52/svalbard/decode/json/CountObservationDecodingTest.java | 2 +- .../svalbard/decode/json/EReportingHeaderJSONDecoderTest.java | 2 +- .../java/org/n52/svalbard/decode/json/FieldDecoderTest.java | 2 +- .../svalbard/decode/json/GeometryObservationDecodingTest.java | 2 +- .../decode/json/GetCapabilitiesRequestDecoderTest.java | 2 +- .../svalbard/decode/json/GetObservationRequestDecoderTest.java | 2 +- .../decode/json/InsertObservationRequestDecoderTest.java | 2 +- .../decode/json/InsertResultTemplateRequestDecoderTest.java | 2 +- .../svalbard/decode/json/InsertSensorRequestDecoderTest.java | 2 +- .../org/n52/svalbard/decode/json/MeasurementDecodingTest.java | 2 +- .../n52/svalbard/decode/json/TextObservationDecodingTest.java | 2 +- .../n52/svalbard/decode/json/TruthObservationDecodingTest.java | 2 +- .../decode/json/wps/ApplicationPackageDecoderTest.java | 2 +- .../svalbard/encode/json/EReportingHeaderJSONEncoderTest.java | 2 +- .../svalbard/encode/json/OwsExceptionReportEncoderTest.java | 2 +- svalbard/odata/pom.xml | 2 +- .../src/main/java/org/n52/svalbard/odata/ODataFesParser.java | 2 +- .../org/n52/svalbard/odata/ObservationCsdlEdmProvider.java | 2 +- .../java/org/n52/svalbard/odata/core/QueryOptionsFactory.java | 3 +-- .../org/n52/svalbard/odata/core/STAQueryOptionVisitor.java | 3 +-- .../main/java/org/n52/svalbard/odata/core/expr/BinaryExpr.java | 2 +- .../java/org/n52/svalbard/odata/core/expr/DirectTextExpr.java | 2 +- .../src/main/java/org/n52/svalbard/odata/core/expr/Expr.java | 2 +- .../java/org/n52/svalbard/odata/core/expr/ExprVisitor.java | 2 +- .../java/org/n52/svalbard/odata/core/expr/GeoValueExpr.java | 2 +- .../main/java/org/n52/svalbard/odata/core/expr/MemberExpr.java | 2 +- .../java/org/n52/svalbard/odata/core/expr/MethodCallExpr.java | 2 +- .../java/org/n52/svalbard/odata/core/expr/StringValueExpr.java | 2 +- .../main/java/org/n52/svalbard/odata/core/expr/TextExpr.java | 2 +- .../main/java/org/n52/svalbard/odata/core/expr/UnaryExpr.java | 3 +-- .../svalbard/odata/core/expr/arithmetic/ArithmeticExpr.java | 2 +- .../svalbard/odata/core/expr/arithmetic/NumericValueExpr.java | 2 +- .../odata/core/expr/arithmetic/SimpleArithmeticExpr.java | 2 +- .../n52/svalbard/odata/core/expr/bool/BooleanBinaryExpr.java | 2 +- .../org/n52/svalbard/odata/core/expr/bool/BooleanExpr.java | 2 +- .../n52/svalbard/odata/core/expr/bool/BooleanUnaryExpr.java | 2 +- .../org/n52/svalbard/odata/core/expr/bool/ComparisonExpr.java | 3 +-- .../n52/svalbard/odata/core/expr/temporal/TemporalExpr.java | 2 +- .../n52/svalbard/odata/core/expr/temporal/TimeValueExpr.java | 2 +- svalbard/odata/src/main/spotbugs/ignore.xml | 2 +- .../org/n52/svalbard/odata/core/ExampleQueryOptionTest.java | 2 +- .../org/n52/svalbard/odata/core/ExpandQueryOptionTest.java | 2 +- .../java/org/n52/svalbard/odata/core/Iso8601ParserTest.java | 2 +- .../java/org/n52/svalbard/odata/core/ODataFesParserTest.java | 2 +- .../org/n52/svalbard/odata/core/OrderByQueryOptionTest.java | 2 +- .../n52/svalbard/odata/core/QueryOptionCombinationTest.java | 2 +- .../java/org/n52/svalbard/odata/core/QueryOptionTests.java | 2 +- .../org/n52/svalbard/odata/core/QueryOptionToStringTest.java | 2 +- .../org/n52/svalbard/odata/core/SelectQueryOptionTest.java | 2 +- .../java/org/n52/svalbard/odata/core/SkipQueryOptionTest.java | 2 +- .../test/java/org/n52/svalbard/odata/core/TestConstants.java | 2 +- .../java/org/n52/svalbard/odata/core/TopQueryOptionTest.java | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- .../src/main/java/org/n52/svalbard/OwsEncoderSettings.java | 2 +- .../src/main/java/org/n52/svalbard/XPathConstants.java | 2 +- .../svalbard/decode/AbstractCapabilitiesBaseTypeDecoder.java | 2 +- .../svalbard/decode/AbstractGetDataAvailabilityXmlDecoder.java | 2 +- .../java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java | 2 +- .../java/org/n52/svalbard/decode/AbstractOmDecoderv20.java | 2 +- .../java/org/n52/svalbard/decode/AbstractProcessDecoder.java | 2 +- .../java/org/n52/svalbard/decode/AbstractSensorMLDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/AbstractSoapDecoder.java | 2 +- .../org/n52/svalbard/decode/AbstractSoapStringDecoder.java | 2 +- .../org/n52/svalbard/decode/AbstractStringRequestDecoder.java | 2 +- .../java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java | 2 +- .../java/org/n52/svalbard/decode/AbstractWmlDecoderv20.java | 2 +- .../main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java | 2 +- .../main/java/org/n52/svalbard/decode/AqdStringDecoderv10.java | 2 +- .../org/n52/svalbard/decode/CapabilitiesBaseTypeDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/CapabilitiesDecoder.java | 2 +- .../org/n52/svalbard/decode/CapabilitiesDocumentDecoder.java | 2 +- .../java/org/n52/svalbard/decode/CapabilitiesTypeDecoder.java | 2 +- .../org/n52/svalbard/decode/CapabilitiesV1DocumentDecoder.java | 2 +- .../java/org/n52/svalbard/decode/DeleteObservationDecoder.java | 2 +- .../n52/svalbard/decode/DeleteObservationStringDecoder.java | 2 +- .../org/n52/svalbard/decode/DeleteObservationV20Decoder.java | 2 +- .../org/n52/svalbard/decode/DeleteResultTemplateDecoder.java | 2 +- .../n52/svalbard/decode/DeleteResultTemplateStringDecoder.java | 2 +- .../org/n52/svalbard/decode/DocumentCitationTypeDecoder.java | 2 +- .../org/n52/svalbard/decode/ExtensibleResponseDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/FesDecoderv20.java | 2 +- .../svalbard/decode/GetDataAvailabilityResponseDecoder.java | 2 +- .../n52/svalbard/decode/GetDataAvailabilityStringDecoder.java | 2 +- .../n52/svalbard/decode/GetDataAvailabilityV20XmlDecoder.java | 2 +- .../org/n52/svalbard/decode/GetDataAvailabilityXmlDecoder.java | 2 +- .../decode/GetFeatureOfInterestResponseDocumentDecoder.java | 2 +- .../decode/GetObservationByIdResponseDocumentDecoder.java | 2 +- .../svalbard/decode/GetObservationResponseDocumentDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/GmlDecoderv311.java | 2 +- .../src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java | 2 +- .../main/java/org/n52/svalbard/decode/InpspireOMSODecoder.java | 2 +- .../n52/svalbard/decode/InsertFeatureOfInterestDecoder.java | 2 +- .../svalbard/decode/InsertFeatureOfInterestStringDecoder.java | 2 +- .../svalbard/decode/InsertObservationResponseV20Decoder.java | 2 +- .../org/n52/svalbard/decode/InsertResultResponseDecoder.java | 2 +- .../svalbard/decode/InsertResultTemplateResponseDecoder.java | 2 +- .../org/n52/svalbard/decode/InsertSensorResponseDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/InspireXmlDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/Iso19139GcoDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/Iso19139GmdDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/OgcDecoderv100.java | 2 +- .../src/main/java/org/n52/svalbard/decode/OmDecoderv20.java | 2 +- .../org/n52/svalbard/decode/OwsExceptionReportDecoder.java | 2 +- .../java/org/n52/svalbard/decode/ProcessDocumentDecoder.java | 2 +- .../org/n52/svalbard/decode/ProcessPropertyTypeDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/ProcessTypeDecoder.java | 2 +- .../org/n52/svalbard/decode/RelatedOfferingTypeDecoder.java | 2 +- .../java/org/n52/svalbard/decode/RelatedPartyTypeDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/ResultFilterDecoder.java | 2 +- .../java/org/n52/svalbard/decode/ResultFilterDecoderv20.java | 2 +- .../main/java/org/n52/svalbard/decode/SamplingDecoderv20.java | 2 +- .../main/java/org/n52/svalbard/decode/SensorMLDecoderV101.java | 2 +- .../main/java/org/n52/svalbard/decode/SensorMLDecoderV20.java | 2 +- .../src/main/java/org/n52/svalbard/decode/Soap11Decoder.java | 2 +- .../main/java/org/n52/svalbard/decode/Soap11StringDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/Soap12Decoder.java | 2 +- .../main/java/org/n52/svalbard/decode/Soap12StringDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/SosDecoderv100.java | 2 +- .../src/main/java/org/n52/svalbard/decode/SosDecoderv20.java | 2 +- .../main/java/org/n52/svalbard/decode/SosResponseDecoder.java | 2 +- .../java/org/n52/svalbard/decode/SosSpatialFilterDecoder.java | 2 +- .../java/org/n52/svalbard/decode/SosStringDecoderv100.java | 2 +- .../main/java/org/n52/svalbard/decode/SosStringDecoderv20.java | 2 +- .../main/java/org/n52/svalbard/decode/SpecimenDecoderv20.java | 2 +- .../java/org/n52/svalbard/decode/SweCommonDecoderV101.java | 2 +- .../main/java/org/n52/svalbard/decode/SweCommonDecoderV20.java | 2 +- .../src/main/java/org/n52/svalbard/decode/SwesDecoderv20.java | 2 +- .../java/org/n52/svalbard/decode/SwesExtensionDecoderv20.java | 2 +- .../java/org/n52/svalbard/decode/SwesStringDecoderv20.java | 2 +- .../n52/svalbard/decode/TsmlObservationProcessDecoderv10.java | 2 +- .../org/n52/svalbard/decode/WmlMonitoringPointDecoderv20.java | 2 +- .../n52/svalbard/decode/WmlObservationProcessDecoderv20.java | 2 +- .../src/main/java/org/n52/svalbard/decode/WsaDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/XlinkDecoderv1999.java | 2 +- .../decode/exception/UnsupportedDecoderXmlInputException.java | 2 +- .../org/n52/svalbard/encode/AbstractAqdResponseEncoder.java | 2 +- .../encode/AbstractCVDiscretePointCoverageTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractCoverageEncoder.java | 2 +- .../svalbard/encode/AbstractEnvironmentalFaciltityEncoder.java | 2 +- .../AbstractEnvironmentalMonitoringFaciltityEncoder.java | 2 +- .../n52/svalbard/encode/AbstractGWGeologyLogCoverageType.java | 2 +- .../java/org/n52/svalbard/encode/AbstractGmlEncoderv321.java | 2 +- .../org/n52/svalbard/encode/AbstractGroundWaterMLEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractIdentifierEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractIso19139GcoEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractLogValueTypeEncoder.java | 2 +- .../n52/svalbard/encode/AbstractMonitoringFeatureEncoder.java | 2 +- .../n52/svalbard/encode/AbstractMonitoringObjectEncoder.java | 2 +- .../svalbard/encode/AbstractMultiPointCoverageTypeEncoder.java | 2 +- .../svalbard/encode/AbstractObservationResponseEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractOmEncoderv20.java | 2 +- .../java/org/n52/svalbard/encode/AbstractOmInspireEncoder.java | 2 +- .../encode/AbstractOperationalActivityPeriodEncoder.java | 2 +- .../encode/AbstractRectifiedGridCoverageTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractRequestEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractResponseEncoder.java | 2 +- .../svalbard/encode/AbstractReverencableGridCoverageType.java | 2 +- .../java/org/n52/svalbard/encode/AbstractSensorMLEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/AbstractSoapEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractSosRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractSosResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractSosV1RequestEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractSosV1ResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractSwesRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractSwesResponseEncoder.java | 2 +- .../encode/AbstractTimeLocationValueTripleTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractTsmlEncoderv10.java | 2 +- .../n52/svalbard/encode/AbstractVersionedResponseEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractWmlEncoderv20.java | 2 +- .../main/java/org/n52/svalbard/encode/AbstractXmlEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractXmlResponseEncoder.java | 2 +- .../n52/svalbard/encode/AqdDescribeSensorResponseEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/AqdEncoder.java | 2 +- .../n52/svalbard/encode/AqdGetCapabilitiesResponseEncoder.java | 2 +- .../n52/svalbard/encode/AqdGetObservationResponseEncoder.java | 2 +- .../encode/CVDiscretePointCoveragePropertyTypeEncoder.java | 2 +- .../svalbard/encode/CVDiscreteTimeInstantCoverageEncoder.java | 2 +- .../java/org/n52/svalbard/encode/DeleteObservationEncoder.java | 2 +- .../org/n52/svalbard/encode/DeleteObservationV20Encoder.java | 2 +- .../org/n52/svalbard/encode/DeleteResultTemplateEncoder.java | 2 +- .../org/n52/svalbard/encode/DeleteSensorResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/DescribeSensorResponseEncoder.java | 2 +- .../n52/svalbard/encode/DescribeSensorV1RequestEncoder.java | 2 +- .../n52/svalbard/encode/DescribeSensorV2RequestEncoder.java | 2 +- .../org/n52/svalbard/encode/DocumentCitationTypeEncoder.java | 2 +- .../EnvironmentalMonitoringFaciltityDocumentEncoder.java | 2 +- ...talMonitoringFaciltityForGmlFeaturePropertyTypeEncoder.java | 2 +- .../EnvironmentalMonitoringFaciltityPropertyTypeEncoder.java | 2 +- .../encode/EnvironmentalMonitoringFaciltityTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/ExtensibleRequestEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/FesEncoderv20.java | 2 +- .../encode/GWGeologyLogCoveragePropertyTypeEncoder.java | 2 +- .../svalbard/encode/GWGeologyLogObservationTypeEncoder.java | 2 +- .../org/n52/svalbard/encode/GetCapabilitiesRequestEncoder.java | 2 +- .../n52/svalbard/encode/GetCapabilitiesResponseEncoder.java | 2 +- .../n52/svalbard/encode/GetCapabilitiesV1RequestEncoder.java | 2 +- .../n52/svalbard/encode/GetDataAvailabilityRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/GetDataAvailabilityXmlEncoder.java | 2 +- .../svalbard/encode/GetFeatureOfInterestRequestEncoder.java | 2 +- .../svalbard/encode/GetFeatureOfInterestResponseEncoder.java | 2 +- .../n52/svalbard/encode/GetObservationByIdRequestEncoder.java | 2 +- .../n52/svalbard/encode/GetObservationByIdResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/GetObservationRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/GetObservationResponseEncoder.java | 2 +- .../java/org/n52/svalbard/encode/GetResultResponseEncoder.java | 2 +- .../n52/svalbard/encode/GetResultTemplateResponseEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/GmlEncoderv311.java | 2 +- .../src/main/java/org/n52/svalbard/encode/GmlEncoderv321.java | 2 +- .../src/main/java/org/n52/svalbard/encode/GwmlEncoderv22.java | 2 +- .../org/n52/svalbard/encode/IdentifierPropertyTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/IdentifierTypeEncoder.java | 2 +- .../n52/svalbard/encode/InsertFeatureOfInterestEncoder.java | 2 +- .../n52/svalbard/encode/InsertObservationRequestEncoder.java | 2 +- .../n52/svalbard/encode/InsertObservationResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/InsertResultRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/InsertResultResponseEncoder.java | 2 +- .../svalbard/encode/InsertResultTemplateRequestEncoder.java | 2 +- .../svalbard/encode/InsertResultTemplateResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/InsertSensorRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/InsertSensorResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/InspireOmObservationEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/InspireXmlEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/Iso19139GcoEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/Iso19139GmdEncoder.java | 2 +- .../org/n52/svalbard/encode/LogValuePropertyTypeEncoder.java | 2 +- .../n52/svalbard/encode/MultiPointCoverageDocumentEncoder.java | 2 +- .../n52/svalbard/encode/MultiPointObservationTypeEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/OmEncoderv100.java | 2 +- .../src/main/java/org/n52/svalbard/encode/OmEncoderv20.java | 2 +- .../svalbard/encode/OperationalActivityPeriodTypeEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/OwsEncoderv110.java | 2 +- .../org/n52/svalbard/encode/PointObservationTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/PointPropertyTypeEncoder.java | 2 +- .../svalbard/encode/PointTimeSeriesObservationTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/ProcessDocumentEncoder.java | 2 +- .../org/n52/svalbard/encode/ProcessParameterTypeEncoder.java | 2 +- .../org/n52/svalbard/encode/ProcessPropertyTypeEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/ProcessTypeEncoder.java | 2 +- .../org/n52/svalbard/encode/ProfileObservationTypeEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/RdfEncoder.java | 2 +- .../svalbard/encode/RectifiedGridCoverageDocumentEncoder.java | 2 +- .../java/org/n52/svalbard/encode/RelatedOfferingsEncoder.java | 2 +- .../java/org/n52/svalbard/encode/RelatedPartyTypeEncoder.java | 2 +- .../encode/ReverencableGridCoverageDocumentEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/SamplingEncoderv100.java | 2 +- .../main/java/org/n52/svalbard/encode/SamplingEncoderv20.java | 2 +- .../main/java/org/n52/svalbard/encode/SensorMLEncoderv101.java | 2 +- .../main/java/org/n52/svalbard/encode/SensorMLEncoderv20.java | 2 +- .../src/main/java/org/n52/svalbard/encode/Soap11Encoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/Soap12Encoder.java | 2 +- .../n52/svalbard/encode/SosInsertionMetadataTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/SosRequestEncoderv20.java | 2 +- .../svalbard/encode/SosV1DescribeSensorResponseEncoder.java | 2 +- .../svalbard/encode/SosV1GetCapabilitiesResponseEncoder.java | 2 +- .../encode/SosV1GetFeatureOfInterestResponseEncoder.java | 2 +- .../encode/SosV1GetObservationByIdResponseEncoder.java | 2 +- .../svalbard/encode/SosV1GetObservationResponseEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/SpecimenEncoderv20.java | 2 +- .../java/org/n52/svalbard/encode/SweCommonEncoderv101.java | 2 +- .../main/java/org/n52/svalbard/encode/SweCommonEncoderv20.java | 2 +- .../java/org/n52/svalbard/encode/SwesExtensionEncoderv20.java | 2 +- .../svalbard/encode/TimeLocationValueTripleTypeEncoder.java | 2 +- .../n52/svalbard/encode/TrajectoryObservationTypeEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/TsmlTDREncoderv10.java | 2 +- .../main/java/org/n52/svalbard/encode/TsmlTVPEncoderv10.java | 2 +- .../org/n52/svalbard/encode/UpdateSensorResponseEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/WmlTDREncoderv20.java | 2 +- .../main/java/org/n52/svalbard/encode/WmlTVPEncoderv20.java | 2 +- .../src/main/java/org/n52/svalbard/encode/WsaEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/WsdlEncoderv11.java | 2 +- .../main/java/org/n52/svalbard/encode/XlinkEncoderv1999.java | 2 +- .../encode/exception/UnsupportedEncoderXmlInputException.java | 2 +- .../src/main/java/org/n52/svalbard/util/OwsHelper.java | 2 +- .../src/main/java/org/n52/svalbard/util/W3cHelper.java | 2 +- .../xmlbeans/src/main/resources/svalbard-xmlbeans-context.xml | 2 +- .../src/test/java/org/n52/svalbard/XmlBeansGenerator.java | 2 +- .../decode/AbstractCapabilitiesBaseTypeDecoderTest.java | 2 +- .../org/n52/svalbard/decode/AbtractProcessDecodingTest.java | 2 +- .../test/java/org/n52/svalbard/decode/DeleteDecoderTest.java | 2 +- .../org/n52/svalbard/decode/DeleteObservationDecoderTest.java | 2 +- .../n52/svalbard/decode/DeleteObservationV20DecoderTest.java | 2 +- .../n52/svalbard/decode/DeleteResultTemplateDecoderTest.java | 2 +- .../test/java/org/n52/svalbard/decode/FesDecoderV20Test.java | 2 +- .../svalbard/decode/GetCapabilitiesResponseDecoderTest.java | 2 +- .../n52/svalbard/decode/GetDataAvailabilityDecoderTest.java | 2 +- .../svalbard/decode/GetDataAvailabilityRequestDecoderTest.java | 2 +- .../decode/GetDataAvailabilityResponseDecoderTest.java | 2 +- .../decode/GetFeatureOfInterestResponseDecoderTest.java | 2 +- .../test/java/org/n52/svalbard/decode/InsertDecoderTest.java | 2 +- .../decode/InsertObservationResponseV20DecoderTest.java | 2 +- .../n52/svalbard/decode/InsertResultResponseDecoderTest.java | 2 +- .../decode/InsertResultTemplateResponseDecoderTest.java | 2 +- .../n52/svalbard/decode/InsertSensorResponseDecoderTest.java | 2 +- .../test/java/org/n52/svalbard/decode/OgcDecoderv100Test.java | 2 +- .../test/java/org/n52/svalbard/decode/OmDecoderV20Test.java | 2 +- .../org/n52/svalbard/decode/ProcessDocumentDecoderTest.java | 2 +- .../java/org/n52/svalbard/decode/SensorMLDecoderV101Test.java | 2 +- .../java/org/n52/svalbard/decode/SensorMLDecoderV20Test.java | 2 +- .../test/java/org/n52/svalbard/decode/SosDecoderv20Test.java | 2 +- .../java/org/n52/svalbard/decode/SweCommonDecoderV101Test.java | 2 +- .../java/org/n52/svalbard/decode/SweCommonDecoderV20Test.java | 2 +- .../svalbard/decode/WmlObservationProcessDecoderv20Test.java | 2 +- .../src/test/java/org/n52/svalbard/decode/WsaDecoderTest.java | 2 +- .../AbstractEnvironmentalMonitoringFacilityEncoderTest.java | 2 +- .../java/org/n52/svalbard/encode/AbstractMetadataTest.java | 2 +- .../org/n52/svalbard/encode/AbstractSensorMLEncoderTest.java | 2 +- .../n52/svalbard/encode/AbstractSwesRequestEncoderTest.java | 2 +- .../org/n52/svalbard/encode/CompositeExceptionMatcher.java | 2 +- .../org/n52/svalbard/encode/DeleteObservationEncoderTest.java | 2 +- .../n52/svalbard/encode/DeleteObservationV20EncoderTest.java | 2 +- .../n52/svalbard/encode/DeleteResultTemplateEncoderTest.java | 2 +- .../n52/svalbard/encode/DeleteSensorResponseEncoderTest.java | 2 +- .../n52/svalbard/encode/DescribeSensorResponseEncoderTest.java | 2 +- .../svalbard/encode/DescribeSensorV2RequestEncoderTest.java | 2 +- .../EnvironmentalMonitoringFacilityDocumentEncoderTest.java | 2 +- .../encode/EnvironmentalMonitoringFacilityTypeEncoderTest.java | 2 +- .../test/java/org/n52/svalbard/encode/FesEncoderv20Test.java | 2 +- .../encode/GWGeologyLogCoveragePropertyEncoderTest.java | 2 +- .../svalbard/encode/GetCapabilitiesResponseEncoderTest.java | 2 +- .../n52/svalbard/encode/GetDataAvailabilityXmlEncoderTest.java | 2 +- .../encode/GetFeatureOfInterestXmlStreamWriterTest.java | 2 +- .../n52/svalbard/encode/GetObservationResponseEncoderTest.java | 2 +- .../encode/GetObservationResponseXmlStreamWriterTest.java | 2 +- .../test/java/org/n52/svalbard/encode/GmlV321EncoderTest.java | 2 +- .../svalbard/encode/InsertObservationRequestEncoderTest.java | 2 +- .../n52/svalbard/encode/InsertResultRequestEncoderTest.java | 2 +- .../encode/InsertResultTemplateRequestEncoderTest.java | 2 +- .../n52/svalbard/encode/InsertSensorRequestEncoderTest.java | 2 +- .../n52/svalbard/encode/InsertSensorResponseEncoderTest.java | 2 +- .../test/java/org/n52/svalbard/encode/InspireEncoderTest.java | 2 +- .../java/org/n52/svalbard/encode/Iso19139GmdEncoderTest.java | 2 +- .../test/java/org/n52/svalbard/encode/OmEncoderv100Test.java | 2 +- .../test/java/org/n52/svalbard/encode/OmEncoderv20Test.java | 2 +- .../test/java/org/n52/svalbard/encode/OwsEncoderv110Test.java | 2 +- .../org/n52/svalbard/encode/ProcessDocumentEncoderTest.java | 2 +- .../encode/RectifiedGridCoverageDocumentEncoderTest.java | 2 +- .../java/org/n52/svalbard/encode/SamplingEncoderv20Test.java | 2 +- .../java/org/n52/svalbard/encode/SensorMLEncoderV101Test.java | 2 +- .../svalbard/encode/SosInsertionMetadataTypeEncoderTest.java | 2 +- .../java/org/n52/svalbard/encode/SweCommonEncoderv101Test.java | 2 +- .../java/org/n52/svalbard/encode/SweCommonEncoderv20Test.java | 2 +- .../org/n52/svalbard/encode/SwesExtensionEncoderv20Test.java | 2 +- .../org/n52/svalbard/encode/TestAbstractSensorMLEncoder.java | 2 +- .../encode/TimeLocationValueTripleTypeEncoderTest.java | 2 +- .../svalbard/encode/TrajectoryObservationTypeEncoderTest.java | 2 +- .../java/org/n52/svalbard/encode/TsmlTVPEncoderv10Test.java | 2 +- .../n52/svalbard/encode/UpdateSensorResponseEncoderTest.java | 2 +- .../java/org/n52/svalbard/encode/WmlTVPEncoderv20Test.java | 2 +- svalbard/xmlbeans/src/test/resources/AggregateProcess-dwd.xml | 2 +- svalbard/xmlbeans/src/test/resources/FesBeyond.xml | 2 +- svalbard/xmlbeans/src/test/resources/FesDWithin.xml | 2 +- svalbard/xmlbeans/src/test/resources/FesDisjoint.xml | 2 +- svalbard/xmlbeans/src/test/resources/FesOverlaps.xml | 2 +- svalbard/xmlbeans/src/test/resources/GDAResponseV1.xml | 2 +- svalbard/xmlbeans/src/test/resources/GDAResponseV2.xml | 2 +- .../src/test/resources/GetCapabilitiesResponseInspire.xml | 2 +- .../src/test/resources/GetFeatureOfInterestResponse.xml | 2 +- svalbard/xmlbeans/src/test/resources/GetFoiIrceline.xml | 2 +- svalbard/xmlbeans/src/test/resources/GetFoiWml.xml | 2 +- .../xmlbeans/src/test/resources/GetObsPropertyIsBetween.xml | 2 +- .../xmlbeans/src/test/resources/GetObsPropertyIsEqualTo.xml | 2 +- .../src/test/resources/GetObsPropertyIsGreaterThan.xml | 2 +- .../test/resources/GetObsPropertyIsGreaterThanOrEqualTo.xml | 2 +- .../xmlbeans/src/test/resources/GetObsPropertyIsLessThan.xml | 2 +- .../src/test/resources/GetObsPropertyIsLessThanOrEqualTo.xml | 2 +- svalbard/xmlbeans/src/test/resources/GetObsPropertyIsLike.xml | 2 +- .../xmlbeans/src/test/resources/GetObsPropertyIsNotEqualTo.xml | 2 +- svalbard/xmlbeans/src/test/resources/GetObsPropertyIsNull.xml | 2 +- svalbard/xmlbeans/src/test/resources/SoapWsa.xml | 2 +- svalbard/xmlbeans/src/test/resources/SoapWsa11.xml | 2 +- svalbard/xmlbeans/src/test/resources/process.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- .../main/java/org/n52/svalbard/read/AbstractFeatureReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/AddressAreaReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/AddressReader.java | 2 +- .../org/n52/svalbard/read/AddressRepresentationReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/AdminUnitReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/ChoiceReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/CodeTypeReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/ContactReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/FreeTextReader.java | 2 +- .../java/org/n52/svalbard/read/GeographicalNameReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/InpireIDReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/ListReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/LocatorNameReader.java | 2 +- .../java/org/n52/svalbard/read/NillableCodeTypeReader.java | 2 +- .../main/java/org/n52/svalbard/read/NillableContactReader.java | 2 +- .../java/org/n52/svalbard/read/NillableFreeTextReader.java | 2 +- .../org/n52/svalbard/read/NillableGeographicalNameReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/NillableReader.java | 2 +- .../java/org/n52/svalbard/read/NillableReferenceReader.java | 2 +- .../main/java/org/n52/svalbard/read/NillableStringReader.java | 2 +- .../main/java/org/n52/svalbard/read/NillableSubtagReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/PostNameReader.java | 2 +- .../main/java/org/n52/svalbard/read/PronounciationReader.java | 2 +- .../java/org/n52/svalbard/read/PronunciationOfNameReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/ReferenceReader.java | 2 +- .../java/org/n52/svalbard/read/ReferenceableFeatureReader.java | 2 +- .../main/java/org/n52/svalbard/read/ReferenceableReader.java | 2 +- .../main/java/org/n52/svalbard/read/RelatedPartyReader.java | 2 +- .../java/org/n52/svalbard/read/ReportingAuthorityReader.java | 2 +- .../main/java/org/n52/svalbard/read/ReportingHeaderReader.java | 2 +- .../main/java/org/n52/svalbard/read/ReportingPeriodReader.java | 2 +- .../main/java/org/n52/svalbard/read/SpellingOfNameReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/SpellingReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/StringReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/SubtagReader.java | 2 +- .../main/java/org/n52/svalbard/read/ThoroughfareReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/TimeInstantReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/TimePeriodReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/TimeReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/XmlReader.java | 2 +- .../write/AbstractGetDataAvailabilityStreamWriter.java | 2 +- .../org/n52/svalbard/write/AbstractOmV20XmlStreamWriter.java | 2 +- .../org/n52/svalbard/write/AbstractSwesXmlStreamWriter.java | 2 +- .../write/AqdGetObservationResponseXmlStreamWriter.java | 2 +- .../java/org/n52/svalbard/write/EReportingHeaderEncoder.java | 2 +- .../n52/svalbard/write/GetDataAvailabilityStreamWriter.java | 2 +- .../n52/svalbard/write/GetDataAvailabilityV20StreamWriter.java | 2 +- .../svalbard/write/GetFeatureOfInterestXmlStreamWriter.java | 2 +- .../svalbard/write/GetObservationResponseXmlStreamWriter.java | 2 +- .../java/org/n52/svalbard/write/GwmlV22XmlStreamWriter.java | 2 +- .../java/org/n52/svalbard/write/InspireXmlStreamWriter.java | 2 +- .../main/java/org/n52/svalbard/write/OmV20XmlStreamWriter.java | 2 +- .../write/PointTimeSeriesObservationXmlStreamWriter.java | 2 +- .../src/main/java/org/n52/svalbard/write/RdfStreamWriter.java | 2 +- .../org/n52/svalbard/write/RelatedOfferingXmlStreamWriter.java | 2 +- .../java/org/n52/svalbard/write/Soap12XmlStreamWriter.java | 2 +- .../n52/svalbard/write/TsmlTDREncoderv10XmlStreamWriter.java | 2 +- .../n52/svalbard/write/TsmlTVPEncoderv10XmlStreamWriter.java | 2 +- .../n52/svalbard/write/WmlTDREncoderv20XmlStreamWriter.java | 2 +- .../n52/svalbard/write/WmlTVPEncoderv20XmlStreamWriter.java | 2 +- .../java/org/n52/svalbard/write/Wsdlv11XmlStreamWriter.java | 2 +- .../src/main/java/org/n52/svalbard/write/XmlStreamWriter.java | 2 +- .../org/n52/svalbard/write/util/DelegatingXMLStreamWriter.java | 2 +- .../org/n52/svalbard/write/util/ExtendedXMLStreamWriter.java | 2 +- .../org/n52/svalbard/write/util/IndentingXMLStreamWriter.java | 2 +- .../src/main/resources/svalbard-xmlstream-context.xml | 2 +- .../src/test/java/org/n52/svalbard/XmlBeansGenerator.java | 2 +- .../java/org/n52/svalbard/read/GeographicalNameReaderTest.java | 2 +- .../org/n52/svalbard/write/EReportingHeaderEncoderTest.java | 2 +- .../org/n52/svalbard/write/IndentingXmlStreamWriterTest.java | 2 +- .../test/java/org/n52/svalbard/write/RdfStreamWriterTest.java | 2 +- .../n52/svalbard/write/RelatedOfferingXmlStreamWriterTest.java | 2 +- .../java/org/n52/svalbard/write/ReportingHeaderReaderTest.java | 2 +- .../org/n52/svalbard/write/Wsdlv11XmlStreanWriterTest.java | 2 +- 1894 files changed, 1894 insertions(+), 1898 deletions(-) diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 53c17de1e..8d592e0e7 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -1,7 +1,7 @@ http://www.opengis.net/sensorML/1.0.1 From 4c9fb4517dab7652790a54d2f62df8634424b1f7 Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Fri, 29 Jan 2021 09:50:16 +0100 Subject: [PATCH 063/456] update credits --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 43106ec21..37af3a91b 100644 --- a/README.md +++ b/README.md @@ -222,6 +222,9 @@ The development of the 52°North Faroe implementation was supported by several o | Project/Logo | Description | | :-------------: | :------------- | +| Cos4Cloud - Co-designed citizen observatories for the EOS-Cloud | The development of this version of the 52°North SOS was supported by the European Union’s Horizon 2020 research project Cos4Cloud (co-funded by the European Commission under the grant agreement n°863463) | +| BMBFTaMIS - Das Talsperren-Mess-Informations-System | The development of this version of the 52°North SOS was supported by the German Federal Ministry of Education and Research research project TaMIS (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0854[A-D]) | +| JERICO-S3 - Science - Services- Sustainability | The development of this version of the 52°North SOS was supported by the European Union’s Horizon 2020 research project JERICO-S3 (co-funded by the European Commission under the grant agreement n°871153) | | [![NeXOS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](http://www.nexosproject.eu/) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [NeXOS](http://www.nexosproject.eu/) (co-funded by the European Commission under the grant agreement n°614102) | | [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-geotechnologien-logo.png)](https://www.bmbf.de/)[![COLABIS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png)](https://colabis.de/) | The development of this version 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [COLABIS](https://colabis.de/) (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0852A) | | [![SeaDataCloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/seadatacloud-logo.png)](https://www.seadatanet.org/About-us/SeaDataCloud/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png) research project [SeaDataCloud](https://www.seadatanet.org/About-us/SeaDataCloud/) (co-funded by the European Commission under the grant agreement n°730960) | From 10fd07faebcb77a9bf9650b7b5087a7986fba627 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Fri, 29 Jan 2021 09:53:27 +0100 Subject: [PATCH 064/456] add logos --- README.md | 6 +++--- etc/images/TaMIS_Logo_small.png | Bin 0 -> 36120 bytes etc/images/cos4cloud.png | Bin 0 -> 12876 bytes etc/images/jerico_s3.png | Bin 0 -> 32092 bytes 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 etc/images/TaMIS_Logo_small.png create mode 100644 etc/images/cos4cloud.png create mode 100644 etc/images/jerico_s3.png diff --git a/README.md b/README.md index 37af3a91b..fa8a62a58 100644 --- a/README.md +++ b/README.md @@ -222,9 +222,9 @@ The development of the 52°North Faroe implementation was supported by several o | Project/Logo | Description | | :-------------: | :------------- | -| Cos4Cloud - Co-designed citizen observatories for the EOS-Cloud | The development of this version of the 52°North SOS was supported by the European Union’s Horizon 2020 research project Cos4Cloud (co-funded by the European Commission under the grant agreement n°863463) | -| BMBFTaMIS - Das Talsperren-Mess-Informations-System | The development of this version of the 52°North SOS was supported by the German Federal Ministry of Education and Research research project TaMIS (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0854[A-D]) | -| JERICO-S3 - Science - Services- Sustainability | The development of this version of the 52°North SOS was supported by the European Union’s Horizon 2020 research project JERICO-S3 (co-funded by the European Commission under the grant agreement n°871153) | +| Cos4Cloud - Co-designed citizen observatories for the EOS-Cloud | The development of this version of the 52°North SOS was supported by the European Union’s Horizon 2020 research project Cos4Cloud (co-funded by the European Commission under the grant agreement n°863463) | +| BMBFTaMIS - Das Talsperren-Mess-Informations-System | The development of this version of the 52°North SOS was supported by the German Federal Ministry of Education and Research research project TaMIS (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0854[A-D]) | +| JERICO-S3 - Science - Services- Sustainability | The development of this version of the 52°North SOS was supported by the European Union’s Horizon 2020 research project JERICO-S3 (co-funded by the European Commission under the grant agreement n°871153) | | [![NeXOS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](http://www.nexosproject.eu/) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [NeXOS](http://www.nexosproject.eu/) (co-funded by the European Commission under the grant agreement n°614102) | | [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-geotechnologien-logo.png)](https://www.bmbf.de/)[![COLABIS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png)](https://colabis.de/) | The development of this version 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [COLABIS](https://colabis.de/) (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0852A) | | [![SeaDataCloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/seadatacloud-logo.png)](https://www.seadatanet.org/About-us/SeaDataCloud/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png) research project [SeaDataCloud](https://www.seadatanet.org/About-us/SeaDataCloud/) (co-funded by the European Commission under the grant agreement n°730960) | diff --git a/etc/images/TaMIS_Logo_small.png b/etc/images/TaMIS_Logo_small.png new file mode 100644 index 0000000000000000000000000000000000000000..d981af8b0d32dd96aea3a72b34b74abaf5561e44 GIT binary patch literal 36120 zcmV)nK%KvdP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z004qRNkliIn-We z&;n-$RC3^)<6`)Ma*IV{8q>&{%%*D?0&B&lv#oM-uK1#3yp6M%#3FxvIGkr_ob8!? zXx!WH%k}KOp5Jrrf8ToqXrZD7Ex%#6Pnm|-60?gr{BH}8oSw$%t##jG1zT*wzvL61 z_c7nPFYC1x5nc+w)xi;@$ISZjtsk0uwfSW&&V4TkkeE{?NlC-wljifUdVU3v@(z2I zedv%S=9&E4;o?KCx?X@7`?7E;Dmp$XHGbv#g1hBi6&(OXMa6{6c7RnoJ_6t=N3&Ms zHwOVyTy=WF-5UC+*}f^;TgO9_H~hCZRd-?qTioKi<<01|&=SVk_w6^TT48Sw{z6{BiHp@}m76e$cqe+fePW}b3|7Z`AqRiN= z-|3yoE^omKw%E9c^64e5eE`oHEprDQ7jJ(s1>p6g-xHQE3-pp(d2V`knu`E(D$kL3 zpxczse&ciyAiKO>lC-g^d&Z1S|6pkAhO}}y+|`zl>=ET%`#bsow(L7DNzni^Gq))? z`~v_7+kP_TD~?@3QUbt>wfz9t0s-yvT?W8W+N}JV?}7k%Z+&scnb}hNqj@ys^fXRw ztG|d9<~guP`bClo-ub2vz-D+3oLE4-Va$BX9V>PB(mGRBKdgBB(zRy>Cb)muD!U}r zc207tf1H=v#`Wg0t5>=PCaC=6njU>JcipM}ac)ijjsNs8C5^qI%sVz!Xpt@2W(Auq zHln;Fr4`o8Y53(d{7QFwm9+eEr4@QZ^`d~BhF@ug^~x;rDyyi;jDr1vNA8Hmw$COa z-tQ@^vsB{iGw=DS{P(-DLWI~5zCo?_$tZ5RIalbOqV{L{Mv8`BN{ZYxAb$48P!lC1Vg_XIXO3mX(B!`*mq@(cOL>>mIC z0RR8&ms?0wQ51&%NoUki(TB1kRHB#A3ZuL#t#lh)DsXUOxwVbyU`>HXzkIjq_s)xA3__2S|1Mt(4fYV~&S81I zg5xCU&JzG!Ruz~n^JSh93d#B#vTyyA9wYqb^>z0xYf2|CKefWuW1&!(9-3|>$&t_B zcR)4?wE=suId*16)Ru@=VJ!5oqN)1LlSwG?Jue$aXzRdalobuxbmmwcRASAkip-XII=I0J)Ii8+W{2 ze4|wDRmGQB18=niufFu0%M(rs(Q>(i>&(S!oslF%lTO2L!x5u!c_7IZSyvgnv!QRi z=1h`dnJprC-kC>KDBS_TwWohr{0Kg)ch8rsysGGITkaww$-34)DjZ!9nb$r@k~_*e zsm{Mkk_^v0htR}hMv`2!rxBY9MSW#*S*HjdrF$rXmza7c?-eCUcD)!Tr0VVzn{xuV zsqGyBpyt{e;acXHR?$t8)a2hpcv`KIB)1mb1ArL0G%rXKAA0F*Tku;R)G+S}U$fc(M(GxyfKehNU=aC?Zk4Fd!qJ5WDN^QRwt zJM@hiCtp5^OgBNY<|^H0*-Zid1^|L$4kJiw7*}0A{9|y~yej9+_@}WHq%hDg?ZtN+_k&EK7*r2A8U(fm;f*Y#Cyp zR+lO@OVC^IFwO6SOI1>TjXuc+xZTpY60OuMOSKJ*ErLo@{OjQVs$~5H00960?3sH^ zQ&$|vzrB4}5DU6R=7QT$quUq^i#!DbijjvC#RUZllnn|ZDn3Gqk0?r!idrCyj7J2Y z!)A&)C2=#TQ-+SrWGpC7H@CrbGK_IE!3Xf$AD4S*p<{IETo!kdZ_<0uxu>U}d-^-) z{J#I`J^6Ey-itv(IT z!J6MVMm#NiL;v%Q(&?#HA~~PD7^XN&-BkuosX59iHAkg0G{um}2WlmD?h@a%t(*|c z#7^@H>1M}0y3x+-+x9NDeSF%}%kJN3zelGp-6YIT5s#F(lV3)y(ASmgcUZrU;YBpY zI}KyJ)6CjCOpDM8ZH}G4#@dgIEbfG-8UVO)^Yjmd`zZyV&`V)D0N`Gjm3_hVxHdDb zh9*Rnkbhb=J?wr$kDm09v;SIGAu;+ia>Gfor2>+RhfC!N>a)N}^jc&-8~m=?W^#?l zhe*U`lgp%~)nq)=Hss8E^;Q>6RaKjXu8DK98T5CwN60;SU!QP2CAO-?#C5?aN0-oF z`mLUXyn1p=+}k_Qwx-ilT?7E!l$bIGJ*&8ZCP(Q2z%gW%k&VSIv4(~XFVPzg!bi2m zwu;&QS210XVlZ@%rKJpd*|Bfvt+)>`bwMs~QF%r#h|r#*Hy7%*^cyh%AoWT){8)G< zFtd*QG=~5HZc(`mdfc{83BcIA{ml%HQoSduzmKWLbG%d3)Ov>`b_!|Gs#C0;PsVWu z-8=Oo27P1IWl|=7$PXOc%bLQ5A(NrK^LO$}uOq3wBWG$jc1LY(AX{qYdn20ZmKIe} zVESGLz54VG3S4#&-igeOatKMStWVN6(vNo^S~NOWmo?Mu6-EGnU;Iu6eVO4BN#zcB z(N#IC^L{rG5&in$5jjr_^3JK`O`o3LJ_^pLodIBU)aFLkXZZT_4Eo$P^$dFcp%w~V zUJKtP1%oHFEM$f8g0|u-v#}-WoA@)XPyCMS0qWhoww0k*B$JI4x~nPl`D^PK^xCr> z6p_O=?c+<2-x>h1>TtGD5t>?lP`JN&e;Y+>PXYkuq?9x0+NxHH&A$Wy2!6kGkEItD zt81#WcN`A@qmvB-iK4i|uRGQ11_0oeZ2N*iFFE!dy_-`H0E$I9r}kNhCep>58dxm+ zyrqkW?w7C&zHvKktArvzp%^K2vrJiB?imLC#N{rEEjR(WgA)LVmzV$W#1zu)`;XY? zrncYsb)fENN-n&}pP;f1Fz7mCJ82A8gzph&l-=w$?JK?P`^Qp#@dtp>YpQRvy3C4> zPIb{a0N~P!uQBL*KD$e=x&=Wb;wE1G$?`vsz4V$}6qRWl2rmn_o+Vq#%J4z}LM$yh zlid;k0Mi$*hn-@)#f3?3H`eU>4UcGODw>D1vv<&9{^k>~cN*GHVBDr5cGcjsy(I_e z&yLId^x@Z>S6&YS03;P$z@n8$`u#bTex+}G!6949Pqky8L?X8ax>;-wP~}(JdQAQ* z{W|xsOt^<-!fkFk24{Y34&B6(8v@-kV!c8czuU!@dOOzOB9o1>7J7!T;qi#oPq6iv zyb|-qMMocipqQAC|2^o|*yz^eBCQNBW_G+axyrw5-J6!+2XRkj100960 z?3{a8O!*(jKXX%TB9&CAK@_T|%S@p*`u)fyq!pS;s$Z9-%eMG!N?U1$N=doIWS3RD zi1d@>+H@hZA-lvbxh!@)c1vR2lKTAqn3?aHYFekBd3c`P&hvbGrgP4G=X+k?@Aq@g z_w)XIPA`OB;Jv_mi&~>Ygd(-Na+NmYE^d&G|70J!+JP%UH|`ZJ-V<;OvnIO0bvV56 zQ}o1&$TOVLF1FpdHU_8fSdLv-35OR^$*~VB=8SRo10`3aimeYrXXI>#ZAbyrHn@Oo z6P(Y~Hy^7U3B?(=D1+q?^()I^`2}Eo#OWYd3}71Z1A)K#1=A@38I$6X>G;Kc#-LF= za)x{CF{B&2MXMx~pj|+^!8?G50|2lGn7aJ=@-@=k*iMP~4q)vro;yFIQym;{xU z4F*pKm=d;2z3Nc-H)yvoX~;W(qpXp-=Eu+1wNrqa-;nrzys5Om?!jXm=(fH)=19*Y z<^bgYtN&A0=lurM<}cOm&kF(ViJvK-uRGLp3nC)6wh=u8^GmNI*apgZv$%Ut)skcS zZtElp0fiq#IVWpwJj9_Mo6*E`GiDdcT)6t~>1e=@1aOF4O*_bsZkh0DG|&OAVjG;4 zdyX{RWZtF{Rnr~-bToB_y69L;_v<%g%v6@uD#4 zmyxBQxkc95R=zu^WT1+l(cUs!u5hxrd8L$0H_Sav0sx>rW@^Zr7TL^r_Tn`Tb59zr zR5jaR;?h_XkFC3b!2p;MU8q(WZdPnD+WTkF8R4qLU&GYB)#QTA1=-RO9vg|P)zB$$ zH|AZ$K3e*qG0=$E=HXsnk#k4Q zOS`7{Tv%C$_8}4iyrAL+b)MH22>^fr-$$g}7LzF}S9Ce=rmftMbfZD(m4nC&+C~R> zmMY*G`8A~BHh#OMmO>)w>8{ACB*%)Y?%>zO*RbIk$#B7S-(Emhw?qOwaJ`fqvlL`y z&yS;|weh|?cX8*->h7bZXM4G>9uX10Dyl^-Lvt_kJLm48odP(6$t^r{i_$oS*%AN% zHm9%ojeC#D{RP+GcDm>Agz;+EJ;8J`9h0I;Y&P8bKQa)}F(gkqUO@V# zuXE&4oDg2ztYbZuIL0-#4b7#O9#9%(K#n3!PcJls>LBOH;!Sq`yRQ)OIpzeKI)?!O zu!V zzrICSCZ$h01?NO5fPbDvMfXmNDa!z0n4FS#&YPB2oaCS91PsQA%!9HU;p1noaD?-c z!Ma=?0e)p=Q-M3K!008Gm{U&eZi%Tzw4Oj&tC_JlP%{-jz3 z=DDIWwDr%V3w%gN;5(1jkw(spIxclux`%qMX0pwuMVDh<*)OQL!FAmJ6>)$7U$x`1 zQe8(g0YGC~R5{r{m)j7gtH=t&yqoGeUEZkU*X7*Ob3EC?SUmAo7ek zMu3a=P_sp__H3r&{MFyw=rl9d=hdOJV7<&IVeU+TpQ)|KkiZM_5zgjTT&XAD@ro;x z000ay80~02!P`~EqRjNjc}k>SoO<~o%tU{#>&caz;o~L~;8oY3VDR=!#D<@_Mx~z!ld2>D!13Eq`vMU$YG)n#re1pF zELa;oJ0dqXcr!H+o<48ENnY`$z+aTE_V9^5XRksxfLka7FFa4hA%<@LNh(M#k}XUI z=#M&8(@2iJX=%mhuVi-o^wlRyV5$2iVxIdQFRmMls4e!lAHfk zJhFyvsl6yV@CV-eqZwZ|x8k!GZ}G^*Cj26|9%l$Q40Q|IKqVcjHC9Db-kqnEE|>Wh zyg4w&$_`i@O>p#0Yj-nJ`U_(x%x(9*#c>CL#nI?g-^{o};2wWi<=u^IHKogip@mHd zEG+D~N7=ZxZheO7Au3mEo8}~({7Yi*6}XKcb(p#% zo)#?lq`M|Xennfsgm)U$-5y(E`cUNvEKkpGKOAs-p*WUqf+O9cSMd|02f#T1A~3M3 z0G?1Bt==|?V-(4m%H^MIQV;+{07-v;lfw5&38MX?7n z(`C9VrP7U*qU&^>R5BsmkZU9%rR!2;mvvv4#V#qkOWKRe^8EfVrRh_I{9g0j?Yv&^ ze`Y?(JssbrB(==~Gu%{f|YDlo671A2eO!L1~8dmyo=25Iyj)gNy`*8N8nm zX8pN^#13@r+b%x}dq2`Av`+;9AvQ#SOpyQ{ zK}i6z2>ZRL?7or)B)O(5BV3!7SfTBdc$k}^<&t!0($uR|0FlondH;X`9^e&JtmHHf$<5jlA<>k)*$l@)gL<4>rQ@022fZqC3oki|}y6H9T|q0XAQ{hx=+S<4nhFa_GmoLDMKTI3NO{gX&3G<}I{H1ywP;Cy z54)FqxWP`7Gsi7Uf_>Qhb4lLTH`JeJoV3AM^K|U~>m?3%`SZmqV@)%~D=fx8D9}{Rd88#W7~-ouKLt zpzP91auS&$Gj>6I*RJZz1R3|lBPeVX!xA-I4?JTh_6^%r5;0?Rc_&wVmfl~y`Ui#0 zQgF=N0O`>>zU(yiHtR*j<$z953 z^GyjW=8gW4v`D)-&Xn<2%=QL?GB@pP!ts{re@a*~uMuUlu1neE+>n|Z=PW!yYoO_u z+z+Hr{3D2o=?0Y9MI9o%m)^=E)LXfe__=Q}eq)swOBI)cUW}hUn0X;9VV&NdT>33X z9Yx1~Kv9bfLfr@JucP>)>`ook1W;Frem|0vC^8b3X#$YGMOc5+p!T7hJqrVwrwHFE zIPJg*#*vniDi+WK%KJ1`J$;@evpDU0zqFGavRCdtK^eO|oVJ2RsP}Nwk2u9{Tc^5z zKB#yy-}j$Pk&#}yxodwNF>PW1vj(TwGFg+Y;(O2XN@&y5jDzW3g2iTv-|a5G*@~sZ>S`fTf}I}*xN=>eCGZOILmo^t&&9|C|M=}50xX^ ztFV-o^IA3Uz1aTiAD=btRy5y61?OTEooy!rU;_Xq93-D&vbKz#bdn&qII;q#EsQCd zzM|ld<7e-1eE0m%mpI+27$>XwNK1?}1}RaC{{5AhYQACr;`N-S!n5udDDPZ?k}8Y+ zRlJBM($R14pu9^-r@9Xd*qI91BRN@S#)@rSm`&LSFA|iVTYd>Oym!?qIWj@XkqJEfqd7<}XBM9ConFTtiJoKd<_1*u z*o(>@d*7&f?5b2;o}I0@oS8G5#;Tf4FGGK3J)w=K-7iqtb1%-YPT-rlIF*Cs^48I1 zD>H~P_OT~X(`U~X>R1W2S?*={~;K!-yd)J301uhbgFrClAJ{1kx}(1>8kklE`?Bv*6V+O)NTXj8I|UPC?q1GV}qazWp53urEiC!Apyo}@ZaY?{6T ziAUgL?TF2>PcIM3IYT7vrW(}oDDt1{QN%%Vr6mbvf!SvUI5=8|#%rpw0DwYU@fm6POT9vR)02fB{6+$YGy>^zU!KBX)Tj~$>F#1YufOXi_Y(DOfV(=6;5 z-hcdjNHbse->=XswE^b^9(z5_z*C-sebdOs z*YiV9q5hhas2^O7`fF-%Zr}-Ax1DGftkn9;07V?5QOF@EP} z=s2fzX?drO9Y&HP062V%9*w5U9?$WQ){xa6ij?~fz(W+zOrLQq!i}c z#-3q>5!8a0skJP5=*e)Q~r(MhQ-Sri=v9I;-a-x5sSk)Hf+TVJ#))8?IL);^0=lfhlG~C zF2Tvm65G0)uMjs=e3%#T;%!cs-7io6!lm(TuQis1@l2$-_mW&{hMt2{8nIuEmpgG; z^2JVn&phz#Lvk{iBC|BMv8(Q4Cqaf;ehY1*YFJCx*Y})htFR;I_tpPQ zsQ>2A&v8jyYd1%RVB7cx?nOf5J9EW-v&1luDe>!f2~q z7I744?6d4_neq0U8ZMMI5M|sluA*)DA^m=B2mrveW$TW%Y%C?3MRB|D;PU92h~?`~ zagf}^cY7IQA903>D!hr#jMgk#!nZJ4asK=DfrOl{OZruO_Q$Ia&Kxgay+zmb%ecUo zCD%_MqbAKXaPZFgksx#C+OO!!yw>UCc>(D3dX9xBE%|&`)8*fY3-^lq=$O#N;vX%- zewH-ZDXH}**0Fo&k$DBZvabI!$2@R3nG8aG!W4Mf+xS8NFj>PgD8V`X3O*lTrey5D zgLct%+t~L>FgkQx(oowam8+pk&p_#{L!zY7qlcU1uLc=8NB|(^5L4Y$eug*_m7ncE zpRCKZj^RhaEw-Vr+-P+(pLG#M#L@rNKW{Oz=nk&R{{>fWxz!$!|MM&FoZDE|F!<4a z#(@XulGGUCoLI*}@orS=i_xj2R>MRWLS(SGi-@F;b zYw;E_F#i^MrC(nv$6wy(=UYk zruB_T0MVskd&=@o5Y3O2gO6}E>&Gm=>`M@^^*RU$aa^?_vSiKfg0v$8|EV%7I?ylo z`nH4(p^(BzhJ_0`!chcel^58Dmk`^$aJw6WcRud)W^t07LgAV0zvb5R^S6k51toRA zq3`BPEZ4YRb4AG9Cp#jjpdF94{PxLfm*Z_uF>uGv=#zD^V1Y~AyW21OdRK-$55;gJ zuKsJ9D?JbxWCx9Zw!Y(h$LPZ`ei`R;{4y_Od&HfNHCmpbD?5Gq$LvN50Ps##vsCm> zZO&g?+;J(asN+dk$&(l1#ZR8B+tu0XmDm_&ur!<(07$%40U_fR8(n?U&TjTiZ_V~) zo=>%O$ue?^+7F(2t^H>i{#kks+AbT)H~3|o%l2coWxFSwj#4)+R5Xh^2o}+Y!6N$b zK=;E?MZ{%9%)BzaJd>L7KHYFhj8eduBb0H98k*PLYIzca`?wI$0p zttHzp<7~2_UAm23NFmrC!TuLNP=G=aR5$aobdRe}^vyVz?Vt7iW_QNvNDVXJ*<&US z+7?AqbYA~aeHe-amT~(;?Cz`#U0(@MUNjwmUdhX&A+wN)Rkd7-#(fo zDLWf@fgfCxo50K~os;C6PK?+3URzM#JCCcO>z0YyOOqvdcm=)|$%}>>IHIU!3$in4 zASXWq?R=~oIm9TJQWzQ{EA1!*c4Iney5I#ckK~Eh!uG=#Z$p|{ zm}mDcdz2tmbYPNeERO+M?WG{Ay^O0dP2UOhtW$<_Gia!}bOC13K$jNJk!Xiop-oE! zEr$dS=(#e1OyT|Sl3d#<`Gr+vB`(}>oQrV+=ejXb#U)jeLKXO$BtP+9eX_kDPo8~& ztm~GEi(;y|T2EF{RjBQn{`hmq@-HVjhn(<_0Bqy3HFHJ)CqFLB} z?nU@P)TL*lveW;Ixq<+2>75EQ003dq>=v@FTPB)E9OP;}nTGC1Z94Pu=MqL%#Tdqj zP5Sqde2zm3XgYB}G@Mhw$ePi!ImrtEvFt7RuYt(EyP(Rm6hPf6<9|X=nzR(qaZ3GS z=+QU-dq_T#VQB;-Y2rpOg8y;+AA9E=)l~BK@c}|7(u;}&Q4wjDP(l@?iS!~Zq1RAU zSfwfo(ow3QB3KYmbnS=*8+K7q*A;iw-E~)83)MCjRQWeag75$u5o=oz;)cyI66f02!|0uCPfE)N^AzlFyc9(tWAI?gz&TPzf%%9}5YKwqjsFnv`tc_{ z4miik(0?7`5fuIwz+a6&>2bh0T2^7T-vT%wgyh)V{-+ED-#dc@Kl-?Lb1V<8fp-hm z>lZ*DLo)Du$Mf(GoQE}w#FsKvd@3u9K4y^^o_S)l2hTuRJVIy!LP!eX1STS0Vd;T- zKZT&+`hN|$d2lvDDC}DRU%_(ge25!26{qfz$E&^c60i1>i{DSt7x}azvXOu&Lfisl z0XGgIB*P^+(-k+{zk*kL$?)qx&qoZ~!>dkS#VtKokBjS@GNp(jUcp)1Q_W(y=Z4jC z&kNZ@bk6{Y%7^VOsB?Hn)ddEwOxxk~c$d5}v zR2&O9IqOGGPme;PWF9sSO7R{{H2!sfUt@iEys9pFiY^7PyWywrnjU3$!%r~Fvj~KB zBcqYJ`&a-j$FD)&ENPts$z`Wt=dq!4@2GEv{Mt*fte_rbZE`@!Eb~t;DP8`rIEN&U zl(GlEX$F`@ZH1hw3$VTJ=HPjD9=i=Cd#{2{;ARk7knx09Mvb++AdlSa#lq$puyNlt zICJASxP137XlQx}DO=BikXZ%@m?R1dm?R-yHAmKtA;%-F;v_hK%`-vMGzd)J4-HL^ z;6pby*wLdW?ND~G2}~ol0y0PeA;Z{xywi+_Eq)Iw28T7L!G3iE$I3e4Flc#ZG-y#b zd<)=xtPfC7E8$_43C( zsMA<9Vmv{9E^b~8Ve`xn<%e#3J}fc=0B?~6c+)6tRFBssJ|$&4v3!VCx{_s-vT%wgj9z;L27vQ&^9vCL z%`)jvU%md~b#(XifzX0Xm_Q0wV$J`$@f;pd$wtm>RDWt#`j+unRtyJzma2x1m#NAaXE zgx8}YWZ<6<3nF*Gg2?S0E0gdF(DBM>oVPghTLE7)>_Li%X$KeThHQf;FJHsMC+%$Y zw3R(X&)eRPSmw#gF0fcu1rp}TaY%js_XnI$h={k$r9XN3h9#mF0}frl#znMPx)UTV zQu6THAqcM>Iw+j@)RD&b%90kDFLoYhj(&Ul!Qb$VO?ymsECLC$WM@PSWdaHEUmLQJ6sT3Cz!g=3kk^9bdoy45Swo(1oY!@eNOI#mzqC zvABq`S@a~QQlQcMnL5uD$6`p?dI1BUqH8Hkv&e8J5i`)Rms%0LvITXz`$k}}{;KrS zV6tNgW8%UTG4%2KTnHgqY5lN0PKo=lsR+CKV6tN|OtQ;6E--P9Cco4)F+TCBQi79a zlcbH7t(UbacqwaJ2qpV(z>@rvAa9emgKw5T;!`z3DD+kmGD_lbt&B%Hp4o_BT;y8; zhXI$;aM(sV1cWBewk5chVRF#CdEX22&ZRKXbjg=??S4wsDu@sg;l>Hb;zXq83Qd}6 zBTUeBpD=3yMQDCw65{6J8x7!Gd_qJS`wbYtU$nmi8M^|Yti`7H(+b)F zG6wNqdgJ9r2r0=;y#=-(;;_Naez{OOps4A3l z%n;>6FAWHbH!~EhGsFhI&x5$Q2?|aH&v!N4!_*&L*Z@=P^Xl1ToBNdYj$cS#M_1k^ z=i*e4?HvUBG$q8v_3_uldR^LTPS4t=7oL`>f%k%-OC(`c=N&A zpx{#4E~{xVn6+)|N z%z%rlT2a+~x3RV0N}d%AMTcB5E-oH~5aQwHnpo&e5Op<0ZZ~v!ynJS{6hGlrw@wu+=S_#6)=mu zWuzBWUK}5usOVlnf7bSvsr<{1cQDOkYp;@X{^M;&@3Mq@?gtg`Z6K@TufjJ$4)INp zMO@gBZ}N(ZQci^Co@B||)(z7=%6q3e<^Qp67dAtLhTjfQ_1fS}3}psfLfx7=H?R_8 z!FzgXpyFN0nBlTcjEkEGA%wWOaD3CIxtG6hYQe^1FFSl2W{|hN_jd7Gx{v%NLF^2%3xVa%5O z2y+4|Pa@=iK8hLeX_vPo`G53+nZ$Y#z zGyUQSiYpi?Q>x(Z?`_N(CrTP&hJD)AX)fz-=G9)u)H^4z1~e!eF@Q^{+fcPacC)qM zYJN2g)x~+A0Ovy7JQG#PTb@-nw6JZDkemik_uoa6(;?dowDIU>unYoSjGOx zu`-XY0WHt8GrCKvzX#y`pK|~+0X~)FFehjaTfj8}YCyv)hoC{uM4A*Pz%Tl_pYFPs4jTT|pkbGxW@5D#&DIJU0$c!3 zoas|d|C=SJ=c~^5pb@;EE;3m|W0r3fgB8@ScRipPRLfAbTPaGgUxkF^REA%-jFLrk zsr8D37|+bS;98JSHa1iB+W2$9-e&ChK5P%n@!5<4Tz0ktl@z`Q>qY6K!|b41hMIek z7{BP?3JOsr^XScsSJ#i&>CfJJ0(ud9K`o%Vd#1yhWInu<FB zmEC#bJ}itq1ZsY}ff%~?p@vskxrTdjk*Zrk`P{&oCv$^q;lYy*tS^1T1(@rzwRWb> zTBJYRzQtgR+^mtb}ez^$nZ& zqo5al5J=(sTV^bb)8pb}>m(7GX}NrzdCU>agS`0DGa!ZUZ`JlMM>DOK4+C6;NDSG> z7I2-&qckyvxgx^SN;bNYhv3}@=IQO99<_p2=)U$zy1qzIj4(K>t3dKjGK)EixdzwO z4KUZYECeAWOZ4B-QgZMv<~v494}nh5HVokMbDgNB(T6b>yr+*2dQpcN^Sn#Nbb@y> zwS^+dKY|o-7=Hb$Hib_@gfyKWj7MjZh|$|i!5S1B^a0*=G+PY{%zVXQ5tsQsnkkidjV zY6dzHbE? zNiY1zKWooCVu6AI3*%0}tOZf7XvXwU6FbvM!8Ok|A7LK>t$=bd?SOJ5rEJ91?uz=95WR@Q zP`vM_QNOb^H2nnzQAfZaw7Q00P;96+ecwDV3N8hs;1Z6NVbBI3k#kRJhev-ez+qtd zA5))Y+zBua--!X7pzB6m6n~Pf1z)h@1j8t3hnP`tB{B}H!7O1G5uc)L z9Ce_@IQkfDsk;xowEizb-bKL&VGwXW0a2pK4=3p_ zJ6Qqm0gHt5H1WwAc!Us+Phf(YNzBQUxL7#4z3B-9Pdbn2`Z<1`j&r(6q8+FJAZ+ksrg}ux zrYpFdr}&OtO_YF>nv~uBt3OEGZFXuy-6i`KtZHALe*t#l6Ff8PwE>I{ZKMt>^-`5B z;B<};v)A;*T`7B+)!=i-`%|y6AzmN7TV{gSfTJM{h(q}x&dr8D+C@ns<}MvvuWEnT z(qH7_bl+bMyL2f&L|duqzQZPh4w6jDLXcMgtC5+yB6TlTIT20vQs`apW;7>cHBYGz zH2jAKw{zWLu9xctLQCv|L|e8v%It+fvvCL6J+#43t{=}>{d@%y3v69ShFV!_@)M_EfQle); z7r#Q$#B3%g&t!O|z~QrlakQ?!NSt*#C-}pgp0j1fNCgFIIf^`Q77MdCTe-HsV0054$AV2mkV@|^&rD66w4+Ej z)OFM80`$|=me6q7+itoIrpB_?PsRgDy0lPQdb<^8MV@T$TRz{z@+)mvQ@y2U5*YokC?s~7! zq)LYDgT|m-G%olC`>vae@qnQ$A3oNy{%(ZGRHHgTmF=!Xsi8(+huQP}P2c{_IYev% zpQ+JTDLZ#mmYKD+SwO)dayv=Otp3ij=cvTwZE}$4RZLF&EM`UY%phZQsy z*~ELvu9=2oUKgg{cC+4jRqZFZ*lQEuZASrw7Aqm1YOwO>p?(4HaMEvo75w&()k1=U zY+lfqEeZUm-#mAc?A)e}jJ^Bo@IE^SzEX}3QOMs8*j+(UhNPhJEj5pFbORi3Vss z`zd!vnFLP&v6;x@EM#MOU6gb0JtD!dXBn$3Z4kUGNtwE^Nkgh*&HKL4y=jHpTS?<=4U zuV-MJRwR+A_nolnL9x~I4k@b~k!7b32Y(iL;MdcZ6bOl~vSj#Pk#zz~5$lM7T{SC1 z?oQE8ClABa7M45A$J@a2PbIG&<$2nG>`M75fp?E_e;KvjRI4w%fV&=e*x{$=W< zcB^rcD2VGqCPIUG!w}!2Lj^yXjQ3jI)JGDRm-*WgMC@yq-m77Zy2}N}GIKBJW8W*k zFQ2EHrA$O!k?;1NfHo#@0{j=xd@6h zB57A!0Z|(txTGqN0M#X=gLHd4H?B_Y-|j-PL%JjZ3r{JK4DBB2_{h;ye$kK9dTzQF zo|{nd#<3k^ma+S^AB~{^3?vFA4*n9?&P&7e-u%8f>sqruca9sP*GWmmfuPg&sEt1q zL)N~$d(Op6{QkWg>ond0s&x>&cAM2HBC7Q$bhBu_LXv&(a66)vzs?Xfzl|*WQd0zs z!H;#(a8?GW49@C3+^r7hZP!k`uWT@aY(3y|PT}9g<-s8RQRAW|yVb)E2L8@H%1iv= zr-`etxl#ilkcj#tXO&x9_H^DsnDB1SFC&h(@CWx+$prOIL{d_|!<WIf|~d11>ck zoiT(Kd)3ZWS0M*?J$~fB9)At5Of)-v?e)>R7wL;2xa=vvLmnN*0Ee0|dtWWYnEhNr zCbE*f>8XXao?UaxX#voVeK~@nYj;SXFsI6k&T+a~&M;U!rf`6(?0f0ZgvF_`IWkk% z_)g~K@^;c_v>oybm#I<8i3Q1xMG&&b+MV8HdCrXm2&h_@{*c1zpSp`M`R6v!p(Y$8 zXKx)BEehd(N3Q52Do=wpz-o7f2cB=<`0)529z=kP#HlmC?>1AruHguR^y=(l!8PJm zer*u~t#oZiQW*o+{48K{M3bn#y_%u!hPl;wP)`=q1_UXb3Yx8&?^QxWf4dmr|Aww{ z>U#^UC9E&`^cK};p)WW=*J!VYXv|-6wH~-i?pVt^)8hHBw*firx@#qL{50_2r@OdsbA%x8!w84;4`1lu8pk#9zpEik?iyh?Me`=kM*Sal z19|W}O;5a>B{_#`bkY?BGz|YJ4r3T)cQeaaC5G7>NQqgW9YCBvn++_!qP>n!&UQvO zPy!0WPeW6)NDa`^@Y)T|2}TTQbota3Un^)@8XmPjrc`@ItUZ+qP5&lQQk4e%6b=Aq zD^%YqA5kiImmAu3=ZN&4mmhj5&Hnj7#~Vvqex6<8d78bvMFMX0NCKbEqL)Ukr`EJR2DGxx7`}PP|~1 zL)EZ5CV(>UlaUpV$yYH0?_I^8504pTFL!6fEsf_OX^ZLDD^?8sjd_Em zF{KO5`Se1(v%$-m^Nl!nM)Snl35nMVw)b#QcIa=88xBS|tLsc_r5f|7a4+brM_=O16aDi-@gTnWLQAZt_9p`;^S@k|Z$%cV&CH{yy#wai$>;e!jYVuOq2 z-nek?p#Vk|?{ zXMExMDE%uqW~dD$+C1R17UWPD_QjX+X8QPG82^UtF%lWU-U)}RC@1(;UsG_1RL~ap zM&IxJ{jd-C+N6j5H`w8V^~Y_jAJi}rodY>=Fmy5; z^F)^TzP*6y2(wn~+uhdxYd&E(hQAX2XtnLO>@Y( zOFkI@wg%p_tT58%bszd160NfZK_q&(4bZ=3KSoA&_H~k`E1$=1~^-Ih7^_B}wA83yJ-L z7CN;-6+#VE`fX*Uh+1Xo>Pi$47JTsb^|MO{0wLhq^YL@aCuh4bHpkJ#WIAX2Lf!L{ zuSq&jC=e1pW6*r&zlz)*tJ!}Qa(nFmDpFaH@W9H)7qaS|6qL${(M%qxe~2Yabgq8_ zoRRp^F1d#Ts2~=gGhq6<$omo2{8ASLh`$K_V|Ms0moN2!k$0I47Qqhd@1Gv1;SKv8 zO0oS2Dmb-G(=`KAJp%(AEo77Ao7j;VY`%xg9^8)xpeJd$)+9{B8a|I{KE1(#ad3$a zLea6(Lv)Le`5~qW{Hf_KmjV3cBY+JV5ci({9>VY~e)f%vxJ`Wg=UOCm#phGYC74H0-Drsz8s zTU6V<=N!W%{2A;gh)l58HU#`Yg2og45XC3_32dFO3-~Un>gGd70PKK(`hVZw{uJ{U zM8yFp68;o>6Bs}QC&u~tg9I7`8N{!=2f-ciLs*bd3J^~!rl*%o;TT~a$3?mTon`P( zaGJTk=h80PPBSoDqW#Nz=fw*j+CY$03M@4ZU%kIKQD==kgm;W6n{(A3OEIM(g7#Ql zKIM^~V$7qOL^hwcG|^tRB(VjNESe)-$^au9Ms)7@4UqSJw1HeEv%!J)+my^7k}RHl zSC`b@u!lB{*12c9eB;|XoCE;Og?s-Qor?wt3jer!io%AKXTl~Wk>bH0=IX%zaPYDkKNlf41|nf_Ednh9(ZM(d>kr_851e?G|OFU}hvPMhGg7sBgO z;DU?Xv=^6$6`EHMF60fJ(7b=eViBy$ESZk=^F;kS^Ueeupab|x(EuxF`ul;la9QUA zbHNa4A(c>wrKX3E49WAyEXI#fM2Ut6KrdJnuJWld z?tR(=%K8|0xa5MgAmk?a0js>2Poykr-RL0G(dj5N9oE>|t>jFEgvTbh5tA&p1jBxz z!VU+~&zDL6URwn4?o&ZjdqAEc!C4#DTks?zcmk@TU|+b-R%4V7%^7pqh!>z)jnra@ zs6!D(-icPQ(cSnYw*?P_b~6&X*f~wn=YmE?8lgbRM7W0ikF)w8 z*pZ&2Yce)0=99IAGG;u;t72`CDBQ%LW^Kmab9U3>bhTa!cl3EoFsxm7iUTA#iyKM^ zat%|5sjT#n#CZ3>HC_tPV_$#}G(uA{O*>N&E6ogIk3X+3z6AS%K6HMUa8lR^0Iya% zNJCd0u0jLC<#B&|(tbOY)x92(uBj0uV~;p|R=z$@NUzB19XyysN7_LTzdB z?d|UF&gIXMY0celigO;#%Z#cDDQBCQ`*R^k4v2#WkoF5Yj|mh09KsrO4oG|06S&bZ z(p$}e{oOi0zaDuNt{JyV*%hloQ<5ZN$d3^^47xL;2FT)$^p80$z)Y$8J#@-5@lHvq5THYF(9upAVBI0Rd zX7pg3Iw!`hvl?@>4qL_V^16JD2g3n2NIlTq*^RH6xw{T*vUk|ro~6ba$`dy!YzhY_ zK#kaCPY-9pwImsga?J zyq~-*1nZ2g#|^Mn#>&}BL3hY=Qgq0J+hLM{&WlF&<*14Mh}t-#g~_Spl%3mdl$9C6 z+EsCT+#3Iu_PoA0>zfJi9yLk}xCnt>j7rRUJsDmFY`SUY;n=>b?BzCjr|w3z1)60# z!C526&R{}IJ(?jkzE=*Sb>6+AeMEfAh5Ld7GC}CYfeb68jxj2x%W$i``Weyk^_q3X zpVKGdtv%mCLaUx}tBmj?X{LYb&*^s{KyO`BIq?8D$fxPaoC_b7>QO8nRfX((iK&-8 zRXP=j+C%jS!K3CGpHU)HV;=%{q#%U-jN<%QUUZTj(d?Qkjc`D;Q~3MmDh(ZQuf}!RLl4woV?D2w-@k64dd5G ztZ`NQEiuQ&Op#%=sCB@y8Snv^3JeuT)8O4TOsS~d;6oQV7aiH;^ON%a^lDV` zyP)ny0KA5_Cc2c6-UNIT>~9fi>V18yYF%b-%B$otVDAz1c~PA>kUT z`+cOmKEFO3ojO)3`l*ha3J#x4LPFx-?hf~+g9yeAk{68>;lRt}62aOXVK8+LBpce7Opwh5{ zg0C!LKL|Pal2T9~XlnnUyZm~RgraF>Bc!tV0Ska|H{(G#0PS|~ z!uL1a=QdF^`=upi_`OBw?|Ti}b9=Q0yj*rfy4#YaXHIJ!G>44C9kYeN5iU={I3maUf=Vfy!YE9ZK$`B zOX024zmx_YaLVJc%E{X;g&c|wOE3qm+FQI+tkd%9`tX!g)&AwmusvNN-B`MWQgsTf z@W@RQ*10=c0XXM1B+YgoBU3hT|F%L4T!y>@(6Pvb=TW#IqA|ceKHr1B*oh`68I42o z%=gHMGKpn1*28SKybHcq6r@FY1!svV0ZQc%SS3I7mOf)iA_XdEmxE$Z(a zvCqT8f_jr;6&G`WJE2QQsF=daJ8S(Jw3y^CNc@?J{5^+5@E+NSk_IB^C-!?*W0bX9 z$lwoEiE0*Z${Hd-^C7okC8r`$?SoAOLendVG;nJTbI%+$1Lj<%cxhH3B8 zAg%Y07`VtxN2;4%pfiP29Vy!9jMJ8sP507Ji4uAxze$QioB|D);B*0L9!IUlXi3=! zmk$NMrm?THgHjZ-vbDSvq@+h!s>|i=rWD z4N)c*XgPeTl{1;+z<4RMh#$wOI3o0~>K=xupXx;yuzoShJ0lmU#;H*w{~8^B4Y1*` zX*vGN9;O@>gKsS^J4^VhGDednLDh>W2?zJxGS~qiyumm^_4V#F0b)kb8zs%-9H<7W z9!txmKQ>3?C(6HIN4Tnoq2+1L2I=O9hN_tLtK|6WA}rxdI}W~9XaxX55h{{f;*#SG zz86tVu=`odUU5!T1JLxAiY#_uO32SU33K~x4kKh$eD;Xb+ZO$y3~RUU3W3GkQ1_sAWCOME@B zMjoEhS}i}&^v{glz+^6Jw3$ZBI%sdV%`&`|7*ij@L!m16RzLqPpzgziZ&e)j#*^l( zF;B7Au_(o@Lrwzy)Bk(Ak8FyJg->!WzfOCr60UV&yMX#OX38cjRW}rPGQSOTp(aJO zP9G%I$-g~Wr;`Gg!5ou3>deg;7EfiPS>_9pXJ%5L{_FJfGkUO|0R9AB1pw6 zINYe^`$cV%W0fk{49yi_op3hGeajdfALj%<*@Lz60pFn9eFy+VeJ>)LVkp-Gfs-BBGHDc7>4H?}cheiO*Zc_Catm&U zRMk#d~%c074G{aG{W!8o>#8YI{Ots?fb+%KLy;CecuXueh4!daV12o+m zt1RQQ9R#7#!coZF$Th*`oHSNz4pf6RV>hu<29FskC9q;Ey2Be`WQr~uxhT|1y%_A- zLBr*v6lR&ch>a&Lt5-8`ZvKu8SddI>^6Lpc2_-pcL^9(aP7lEy4>8_HAAg$kKz}QS z`%cMoNslwXimg)hqz?)J{FZA|I75Rfnv<+e0<#p@j;#3wfOcKK?+BK2s1e3^b9qtD zegZYsSr$Tlgf-4t7L2PDj*z7RA)`Qobbc%nCpcN&iQ&AE^m3$h^7>|*QZsf-{PJ(6 zeS)d+Gx&%xbbwOhSj9i}ys9*W3hH!5p??l~;VcbQQfcC<3U-wjw`06P)0)70v5OSl zzc=gC9J55Fe`MB1Y+K~}AEeLJT3Q~s0!~iwub=HeE+M))>{7SiO)~38ZIajwL@_MU zf%YZ#jD6H7YA+P<3zUjI`kl>kc5LZ+{9C6vVQtWJ21iWMD?yivp@-s7Dp&pb~+ey&X&4ZKb3-ZB4?X zMl5U!hrxJe49NXxt$@{#oP>>`s3O=@*jDgc{`xOEGg#_ZYjLq2xw4%Oq|!HQ(f_L0 zO%Tq)Ed?@j{8gN8c)DF!TSFdCCMX(oYr)E$OTG!uYFrYlWCTf6GD4G%WU^`Op1;Cn z(izHgF8=0^2)r|Po8fV5SO2{P;~u;mDhFBbKxR=#h85g~1G?bIFvl<16nKE>s#wXIyo-*D4pkjw zY88KYwl<&0gWz_)=^Ihf?ZynvvC{9U-eHC@B4Q4irRIkWiyL;@vV49d)9Ep&GIXuL zyY9>kG+xzJs#iohdt!fDBF;s2$*syNZA*FhE3-}sKAz%AC=zLGMJheVZKKvXWUOQ3 ztcI&fy)5?$#Q9ff@PN3y1Z}@g*C83P?@6_`M`Rax5}v~mrT~0ims>1)jn%Lc*w(_% zY4NNB#b6kaMTUb-n9AT}Q+K-v8tFu=RZNLFLkUrU`n2#bhZr!l(xE)*@M0$E-xvEr zGd3iCO`Fe;pSCicuz)>ZA*+wdL3h%{YGb@q_A;pJ-u~*;`pS;fiowVhZK1_px-#^- zeEAq9TKaP(INi9yBmf@EvmO|~6@bwtYj=Z_>|5>YS`ey8$B^ z%;Fc59uD=3jg`_Jtw7mHJFk0{Pa0WbUIHsg=ubp290C$P8U`@Fb4*ANbbNB|Kllh9 zOH9O80f}(NReKR=-t0}I?^gYzXd}0i9r*)j!0VRXPz+5O_OHMSADo(hE5_rJ8MKg8 z`YauNVYC5AIpbm_n@9dAV8G zqTX&Dt)gMw^Nh$M)Jh^b&w7%&+p=6bOOR0d2h9pN)%&03^U$l_Yzllmg5>U((i;3I zb!V7GQ`>9hCoR>2gZ2RBRZBYAhOjU8qC0Eto4c6#mOpn|u3}VrH0`B${h6^E5}%~c zUxpYt?Q20}Xr{A1WBk8iw<3TY0C&Mkvo@h(y`1Sy^=ZwYO{e^#GFkD zJV=^;^=V@FX|~EWXdzRwE^43x{3ZsWCk#WfwIx0htXWI~VyY{i*JQ9AT?~&x?pLG^ zOPuZ%aWW*XgeJLo*4RF%JK4OKfH+w4G+sV~U*QV%QWbxoHG7|_o;JLkMdVQh%xLzmndoejx zS)Y66HqzHuUM&1UR>J{7y<;K3)#?41RSzY(G&mq*yo|?|!(y_WkLAz0NRDIy3BV8V zpLUI}@6J8+J?qWhRVobDpO;A%5Ua(aSDPo#zKmU@zi2{IIOA!FDh_@YUGHFMHv;I9B%B75Ie+vw z2e|Ui!<36HCyA)}-eN7fBMB&Ltnt{b*F$0cal?f_UM{e>L0CxZ`keY5`tU;@X_W~a z+1)ODT0@Olca_YzGQ#qV9&LFcn^iofLerwU-E#{4H9fp0(Tehc`Dsb8sPsFVbPE=+ z`zeguJorjsp;_sc#EMC~5liE`*=s{R=ea!_Ok-)Ar*mSnklWELKkgjd)-vxf<3j%y zCBt;mUIQAQ54>D(#JpS*6KylVN`E1c19tRx@hYip6Sea3J7ELwv2RZ+^C6xN7Cj%v z`9s?EJ-JywsRvXxBgQiLjTy&Ct$v0(QjSf^RxV|AbWm8mngc_a@n^x8$v$w8=u6I- zqKk+3Q7Q(P0{HYULgsjEwF#fx`JPOjFAIM8#kS+07`9A=tw?M~O9d&%Ym=QUA8J1e zbdUX+K>YyWF^Xa~CTr-ETpga2V~=j(|0eUjzUf#s+Mt|8T=zS(H03QQ^$93FMD~0)Bw?9dOh&%-UTExEws$l$zyxhI2IWEvkQ$rqu<&}AtTF+$#I!DZR0iXZh9)q8Sh$}P=n?Uyzr zdrvVmpyUH4{9fu*qtZQv9a93gU!}wLSN7~vej$#G>$d0s#JjzQnsv6zjkNvc&S4&& z)&p8~-k~09GZrc9WoQS(_EBWx({a>2Q^RfaK59nMAWgniKSl8=A+aGY>zJNP!ra8d zA$Cr1at8lUW>cr?0w%cXB}Z0cy*xwRU7d}dSmAExqyp>lRe#>c{!7rm-qXkwL{8UJ zDOR<*9ub~0W~F&c2z81)T=GnKdi$Ytti|^HcaI~CZ!zsXTkaVOpm!j);F>A6e0(oW z=_|FV4++rmmkMEN`lOM^5yKtMl1sfcJf4AN+;pFd>0XU4>(TQqjqx>xyLOW!_Ln3D z>BS@tr{!67)9K#&=*o@>e{}nLngJDX{v?}{u8`QQ5taUh|sZLJDOMtOOeG8<~Qt*cP}G|1E8 z!C3ymi!FwGHlL}iT!8VbuN*@ST9+}a5qc1{symnH&D*mO3?L2~?;mIzkRP!THFP`Q z@1o7D;ncRQ_r>od$s1sP&aih|DYx=;wOl3P^s=Gc6j?1Y5d7}>aQvtCC^K(hvX}nG z+XcoNr0Tm5q7JeUk-vvCz`Y3>BWbB|=}vQ54_!O9@_D20Du=%US-0_;JwtpkU;QPA zJ9`JH-8_dE^iOv-##zoZjhDc3UyCM2KCrH=un#BG;B+an`TmyeZ2b9~S<-fp$%5Dd z=L^N6qHMwMPUSYcA$8e`&Zr?CTm989PqmhB{67RfemvL&`%l9Xx~pq9KU}jtqMmg+ zi>ZS#stK5yPT(>`mz*&twlK^0J3_1&JxNA05OL-6O%Hx4IsU83LH8-6D0tvyZ&f@G z_wD!FNHoKqU*Y3((Dl#JrNRM&eHJi5mp*lal!aY?oZ&6Of6gi4rz*acMp+vn5SuR> zz+3CC6dr}E(h@~>?>{(oOq?h<-_oSx4|t#E9mpXPhEOGF$~QG3!KUT(6Ti1Ww`?nA zf|gtQa_IpdmMrJOnpk((q;5f4zUY#3?g3gSkxH^hv-T6o#=cGq9x(x+gDxd$!3iao z+0(H}-hz*q<<1_JOL zEN%N$SP{9{S!RwKq=m=vev|v58LCFO_`O+F*o-u5S|d6z!Rpr}*voz-WYM%3zuT zDg-@U*vwvP@TiwFzyLvMf5jFkGAE?!!`ALsyzIf&DA)}qGGN=fZjt!iZV`O-%N)$Y zd%nV8Wu^*;_6+gF?=6X)1D6xv``P`ooDX`DO?Q9IIZaoyYdSSim`sv+t+G4)D0;l4 z$m)7v)fmn_V~^d^)k9YwCoeI26rs-R6mu&ucJdAtQ6gd2ahG~LQue)tSR-RCaDT{` zm<#FlN497*QHb4mUSRJ=dd~9UKA3!2twhA^xkAnm#}k?l=1H~aKyQ>?g8lMYYxnB~ zccz$!;Hh0F%jtK1zgD`o)^Uq*fsQu&d*Ifnc!JI&)?+};WS*d=aq6CJ| z`|PF0bQ=||YA>#3n5(X49WHfaBA>X*rpMd?85PJ8sB(a$XK+k#={DOc!_RmdCZC+N z^nAbYsQtIkVQiM-C=$nRIKePY!x_t#*CVh?px)`aF$ED*)dhOeAST~${9>PZ23r33bWrZ%#J<8jJKU&p#Jx+Np1{)q=yk<30ix7Ebnu3 z#|rF=1bM@uKBxhh(%-lqe(bjtGu$mTQwCFz_T#CS8c%xnjyJ8>#K`_4C~xCQ;n@|w_BE0ZEH~y^z6G^JvqBE zi3;{3W2J4MgD4xH%PgJSqI^)Fhvx`U)Ll_aw|b_-z*~0@E<=5}Pq~5<+*~$v})_Y^AZ$g!m zNJxT1te{ESdxCvz2&h_y=24K+xMuCNAY22?dRVTIev}U##-(24K(21w=s_`Zg+})5 z*7`o8N7_HQ9-Oq{s*8NW??v-wxpq}k1}@EQVuEC9;D7wBPvm#@Qn9Txg*Ob8qb856 zD_Ui^VrBl->_z@LyYtz4LsGr`8@k11I?KLGx<;NYK2k+vOX`*X5S?m`huQT6vqtu{sE?(HW6o~Nw@PgQ zRkp@}|9h`}D|m4Uy3}Kj#&)OD#e(lv9!}F98gGuld0LiJNw33=Ak%q)eutp;?emSi zQ%e|yZStr_z$DQN5{0^UKXMuG_Y%@+UqQC(4Dk_A#WuZ%Jhp}s$2+TH+I(GV>dyeY z`RRP?{#%xmzV!n)VithX9!OKOZ(Q4qC>=$m*n2IHsZMXi0Ajh!$DNFmyg=j=)p3TY z=tUjNEe+(nUoxZhkMQx6Hi*^1rPdDPui#LIZd`HMP7KG^jed1=)AuTL0?PDmJDgHu zBf7L;Ysh>lkMBt|y1xLu3sLWD$@7(c20jP+ov%iQ5VBiMg{{2+71bH;-GdISNS7C1 zgwi(Cf8`w}Q%bJW4vMY{t|d$`8_Zg)8}qmi+V>P;6L4gHk$An=$=P?_wqB1v4EA-& z=-G#Q*9?5*0xgfoHtb%YRluL?jbv}RKC3`*C&~Er(TqaKE8NU7X4{;`;3<>*Kp9Ti6ikh}$8(8%64wZ}B3&0-2ng}M z03OOmznCBBYI2etYAD=4t*zYe!~c2UW@FZ$VYi#;Uc1Qi>*x`9hD}l(lAgF9`1tat z0sL}RwU*q(UuqnaqQ=`yu0<|h7DSAhe-ZH8UiKc>@`ObBlMpXyyM^ogO`T;rya+sn zU0NSoZwsjC5*Wpqe)G{)0|*Mb6~rW3PsE?+{8hF8jNctR)6JKd5_9_3xpC1@wnX3C z3JwY?-8b)eN{CD$Ej#-Rmyx`(a+U3f6szMS)96>bMqU z4aSZ?d%b+D|AkvYY=N!w$fV{=K*7FucS<+`{2@q&)z{fR`ay`2e+?8OtxxdNF>I;nF@u zZ4vwOP^Q5cy9Un=J>utjv2fiw@B`r0*^g4XDt={iGy2!x@=2gC_V8vb1MU9!KC}g#Kp|l$rTvr%Y3Cx@A zSXS9h5X~kcfB_CI>0uC>N^NHP=OUHu5!D6KuNv6G>%oqi}=dtd9$Z_VaYEq=DuHmm;XQ%P@jU!B7S~aaDqq24*5CBNL z6t{fLtwilReOLG*P+*(=m&HF1V?7a9T&kJchS-;&UeiK?z3w*;RRn5#qz!|pBDsXe z3-gy>5URH;$tn6$opvK&4-;KW$7yy=MoS5wSrsh(Js)4onMA2O;Li7d(Qv$AY>3Iu zsg)XP3nZSBF`ke#VT*rPJ#f8@H2PwIQ6Sv6zcSa5NS7G?p0k&tE;iD+`l0QPGQDkG zs3D=v=iTlnU8A|Jj1kyNH}BhLu~`knNW`fiDrM`Cdk6bo>IAx1YtCH;9$~H)$eZ`FF?h#>v>m z-A~OegzSK&ry5wp@#_NH-A|k8szwN#v1ltBs_36>7wBbb!SJ0&(EfxqGGmf=6Mx@4 zX-EV3Alg?(G1 zr+9g`afkhlwrleW)wgJtxr|lS)1+!06Iu)cIbA+UkTm*~;K%+2Vx}D!K)_!zLGSQD zIdR?A>SG&UoYqvn3OnjKEl8Ol3Vz+%xw*5NZFyWlEgtN2jc zj~tdGU;W?@YxIh+A*ra1SYaJ}*=cepby8EHGy)Z-NAJq36-j0CfX+N136kdBC zW;5Y@`sG0P{UF;H7Nz29H(k@#t_>Qjc8!P0@SX&YvU7en#f5c_$pvGT?(qj^TPYm1 zedS-{MgDP{=K~wxfNI-Nc@EF}Zdep{-rl@qh4#;T22?lWEWP_FUT6@A)LtN`V4VXr z94l3DU~r=D5_3@%Yu=5#>fT%E$_9Ib*I`O)cAColPj48TLRTR4;fcwU>u|zk0F^}G zS4#{)-v2gGTFWb`YL4QNr67K2e0cr!$ zJ7r7w`UB@g*$xai^Wr_m&ojQO)>%Dw?DX4@mK61|@)k)}64-?zn|#xXTg<}YkE80ygrIhg-&a8F zSJ|oW#5+}ZtZJ6cWtLr?{#1oT+o#cZ9clOe0u3B}cdXEO&7z_baAA;MgQgy6-2CH% z5k^Udg5hBX1w3;?%wzeur_xXAJc6qdxWxb;^R7YNW}l#4bFKTDNr6J!CvFOsu^l`e?3P-Hh;Kon$v;T*j>cVABu& zWK+Y%MtBp4eWF3Ikcmt@>3} zTY3x*JIL6jMOPVibxdssOeVJO0k&J;8<{HtK4*RK5}8bOC-iT}+FTdBo>aN%@%W5P z%u1Fxxn%T~CkM&SR~{#4z{|h^%~{t(<|StP8PSx^ZP}{8H=Ig1ij)yF*}Na&cR=Ok zy{bSj3dedV+3g}!hTT=gh&TW0v9uS9f@6a{?B~8z2oT1K)oxt!#?bM}ZamN8C0;zh z`0MoieZ!^Qlb>bo^wrzj+wJN~GpfeTuTciyK(DXa8)4UT2H7H9ZmoV)o!ty-0MEyGcL!1lW# zrd}V!585`s{W33P{_VfOYyxq>PavBT$D^!mC$sIN;f6;88Zd+ux_Mv8Hy=V&9LrSq zvgEzp#Qiv$75GzS2B6VCoL5i)+TY(VBJEXGm7l14ReTORuCo_2Ukmh_pER}Vo~S~q ze711w9(Yy46D1GoElPxhgvM=}Lu)+)N^O)BpfAs^hMGe&n5-`EyZr)W$hy;`v-s2D z1wTBsflz1vUKaK3S!TlTi{QHEY5Sp^z2Shfav&TK6ELVg);$+3dg; zMV!NnM3+G8QS_N+na|QeXRuWJ3QyzFa`zI-a?c`~vW|I7Dhr!(>9Z~KhG82dD+HFy z-mzfNhX**{fI%d{89>k~jo1_%kRx@rRML$V{fKlp*;ZeVCg62}^}E75Y~?E-sukBa z8g_|q1fr4v7h#N#0zJVIz58c|FVaPTbVydY6lucWL->seFBTj`@!w55{mu+^X3sLb z-sf~JUFTn?uqB0!7`6OweutsD`m#eTaN3`s$JL$h)Kv#dm47So_t!*ffw`_ZLj6>m zX+4ct1LGO|5DZi#!U^cv8#LVjrR5;HePGTsEQ_xC~s~FS#iV8 zujCx~uet~x1;+-GI3s~b6jZgE?HRV};k&4c=U8{?&5+yZ>qBgR-;1ROnlZAX8Rr$< zTrnsA0!Ki`37}_W`TmB>!pO=atmhc(H@EQG=>_YWdl#;2!laGQvFd0Gp1S!CA2)x( zkDa}vl66nd=Qecy-Ur;&*ox^}Uf{yD&vE|R=NMXY=cs3Dy}NV#eijA>CNTBS1&6eQ z14~@pEwe|Rd!q+~kkKfYK8CBKNe=N;^A5-~DjH+tE*iCO= zg%n;c@yR+Y;+}UHe2Y(kNl?xpnF$0=L9r<^9P7f3p|A*`VfJ<<^nu1rtzU8si zukS6{^sYCevIQglaXihR&rw-3E~ibbHs zypn6XV{6_wFRFTt5f$HW_wzO*Dq1jh%ZGQ->zj^yC)CbTH>ZH(4un}X2sZ29475xv z5dfH2xcK=sXN5a1SpDE=T+REIsP(TgqPztoD!x0e@|PG<@d~5YxAn%=e7HM*-Gh9a zMeD?;7`edI>0ThEZa&y?kiX2l6qh#|uRAl!#d*=zWeZl_ZCJdq?RoV2R*a~4g%Rb= zxOjatrq;Az{?6C9eBWzab?`N=IoO7)4z}U)eXnup?$?;Ty%iHTy~4X$RP#Q)AtIe<2a z^=O@Nn8rv*Jc8!YyZ^-OlyBKSf)_`8?Iw{J7=e+E3)r}YNbEc!bnHCBbnHALWOiN= zf}D;EXw6CmQAv9U$vq4cz?ClIehrTacMsKvF^wriKUNMTCsJUB&pL34t_IB+UPDQIAfbOA3}9pj7LGCBo+~m3uPBL~M;KVR_(4i_ zCb090gLz=ysE-E#fR2F`*ti53x%nk{d4$GGicB$^s%$$?OV2UFV46p~nW2u#!hMmFC6$n-gS zdR7qNQv?|eYY>~L{?p%|BxetP8TH^1zYTnfPk~+hRs5)1s}{4@1-K9Xu4pBEtVVb5L z2V^qipCoYvfRg~A{PTSj5)epqKqQg-q5B78l`KHVyAYJ@6TrZ487SFBfQm~RX!#U^ znrp_;P|`ueGZ(ac3PIB|4`eMuLDnJ^c9B5*;r|&}xIoc18dPS* zf}&kC$XiE%gqq!uzxgdwEf;`6Krv{zW`L4o@(=s2c1Zkhf2y8!4}xrY7QL=qWf zj3Pnbrx3I}a(+PDD<7s92YsJMO_TWlH;GR%oeQ+`>k65k36$OQLE9=9*qHhMlWDDHNFGvlcWdDg6TbK6@wQKg7@(Lz-UsUr~3@{)v4XZdTH--QRy^JEeg- zB^A`1Qiep!Jr5=u2Lg$XktXr~j}q5(%LHxjJc5?bQi7JxG8&^m)4PzM?X{Gk=#mB+ z)003=c@B_B41b!$zx2j`?!^&PTtV7<4QNu5LCrOtpyrxEW3*6G3F?$oPP2y^9SsyjM@=(XG2zC66KL1H$ge?EOp1523K~?JnepREzK&E5- z6D5uSkkdap|6O4P0G}Takqswk`)2Ra^vXwV-{q)FYfGa>%V#NSdKENF8~SSex1>Uo z_@5|oN?M1uZz0ZzJBYT)$IvF}2#t}DT#ptpd;ZQ&@m|WW9Pq~tY<|mK08sp~*@+MM zaWVM@qP9=`9!;-2w20n?wkfo>H1f7|6s;2up=9c|dosvOo55E9)x2#VZp82OHO!Jc=k?3Kh5Q$`( z#Q&EiE^ihED$aSJ;F1lBlsp=vM9w)Mv~5GcYlbQ4s;L2)O#YK4j_~<4Zk#_hKRW<; z{`F&HRgZzDa}>xrXM%z=tu6g3l-!fS*M_8hhXCyCf4an9^mo0#Po@Nb`mZ13lRXNW zL6M;Do(QULNuc6NYfGae8Pq5Vpzf3m6K5>}X{Uq{5)U#i$sq5U57Ktgz`)K&llcFd z#MRw0?`wEup@v7!XFRiMj0BGy)bPwj4fh;Ww@IoI&)>quaqtWf*x3GbiT43O(T~0H z^nZLzP_CY!=@Ym1Ydv_<+R~`nl1C0|cx0oNSHZoB`o4;^m^e-1)U#9K5A|oK)YBLV z$w&X!vQxgL1psFKv-zb_$xdmYwTTh8rDJHFcnI|ZX#<-yiPI$h-<9~{z5kSW;Qx%o z5dgLV0MD=_9#cz`_^2gb_pfB9Ow_Uk0ja4piT_y=&v>r>_3@3ysPN214Ub$@bxp0+ zuuS09)LZ-~uAMSeY~23uW+n&#@?RM%M*(f0+-h}?+&&GDT-2nshhNj4Jo6t-n&zi6 z{Pk8w3mJewgz?JL!7uj$aPUd~@R?sFRhqAUr$K`T t4H`6w)1X0v1`V3TY0#iSfDHIRx?oiy_3L$vV;8xsg1tD%!t%3+BS_6dQ61=E z4dgYY5EddAaN~Os00u#f$=$#QQ8X1o%x_0kihuz*19`IwnqU0s=6*_rGd&6!zwd3l*x*qGVa7+)wDo!o69#%_$ZPL%(V zAOUg$I$GL8EbVN`UnLrw*f~Q4DPAo7mkVHf1%>|-Z0q#zK)r;F+0EFVnU#r!84P~) z>mO<-h$`rRneo4+c2ak@2QjOHoa~$(fiL+mqx=u^OYHvdivB}r3j8lRduKBT74e=K^joKMNo@+E=BHWGF~=hs;o2|)^HXG>E)P6;*^9$q#MUUo4l z2{BeyURDlK9!_2s33gUa79Me)S7omP{yXE#2$SgxFPkKns1zqVw>U4GC@ZU^C=VO2 zxEQyDC>#6B0FSuDe|TkVogl`xK+vnwS6<8i#mn`7<>eE11Q|o@9M$dYZ2nU!GB!5O zP7ue}VRAMOCKhs91!JJ4EyT{rg6=h$|27xoXz2nnm2$KLlmC+qKFj}&5uEJ25^QYT zoE%cz68|{B$-*ls!Ntk-QY}0jEF2X7<~99qQTvbc|K{cTKk_oa7-I_LgIGdrK>sdN zQ5(p=TQ-)jrNU=pY-|1!6Gl^znX$7CghEK%&WS_Z#?IN)NL)ujPJsEf6m2YDnEq+~ zi=X+wN&RQ|zt!%4C|?%DYxBQW;!Eeh)-uTUWdS?BtW=n*>QNXN#v>UCQFXV4!%XB1 zQjNrCrPi|51J2B2$Q2rr%v_h%oU5n^QKzWAw6du_;v@eCIlJvZ?f1rpMl3z?<;HOMQR}atolDk!->9D|^)?>XPPlF1lHm~ClMOTehk9ynX>LsU9 z&Zw3{6_hx!y3f`43g62cj}o+mqX{C9&@Rur_4X=OeZp1aiTzt3^0heXo*`C0=447;+?k^53B;5I+WV0OpnGMrr&Yop-7h5hXqNeWX1gNSpcGy$V&`3d;SxxGL7JW>0YLi`jxY!>=(!A(40y& zGz7vgsxybFXAj9ha(h+sA|y%PDC&wAC{#OQRj>pttT}B}Pk%ptbV${$@GpYDs8VRU zkbQkN)Byk-qJAn^hD2#md)cXvxCI=bj;v-VadKoNn>D$fied)Rn+C!0UJaOP_kgvWXKu zT(|L~04tSb#8`@4$;rG(WiV}z8fzcCFyD3YmD4oS>CKtz&#UxtNbp?~Jnll}+op^r z#ZP8MZQmAzQC|$A7%u@#hXvQ07Xb|!NS)7~E>Afbz@ivK1_8cQG)ITp$=P?MRv*wK zRMmzPZ0scO4M${=q#+5Zl@$@#&9XYOuDcIOb9nz`*xDq{z-H%b^%Zn#o~-@JJ)FL? z0P9l-(%-2$RpHqn(395^FI4|xS(nn;e1&La=oYF}8K`B1QI!M%7ncOif4x9bPX6>%|&o1?|zM>ct*))e-i zma?!4f);FO-~mjKoZnwdIxPy}TIZM23S8F8q0!)%seM$pHfOjYnkG|bWZ#)j0wMP5 zBo!93wr{&MSRwx8iqwGrQQz6~s|K$AAVNI{t zTjFBwLZi93g+EK364}?ni56cNj)haa!?B*3`-b%UK z#^}^oY^p8(e$JnX_-BE&0x)-A1-lc*@M($l4cPz}2pGHGhkqA>f!}HLaDLCNkSiIz zlu!x_92sti7^Aly!cT82hFTY{ILkZ5XffPd6|yl&Tt1Yp77M*ytN@b%TE_NU$%QtT zuN#pL%Ln9fK1R0M?I)^WlxLxVVll;9AIIF~`k!@%wY%ziozM6$P6ys$?O}p3GX&FJ zl=ZZxgiB36h`5cOyDrJHiI{nt1Xe z*@R|;)n?_~qjZFRKx$pjF>Hdt(Y2ec-`p~(oP_02v7zqsji#qs5>}7KnpC@LErI$y zId_{?*ac(%Y{)JV?Pt1nJGOFW zR@w|H82u#ZyNfW0L2$@-ET3+*N^YKcul8`FJMm+oJx0yo*z=I|b&CnaM26t+L&KYA zuT@=m%%5%C$AHZ}o9^wLxl(n`x|C%tU{bKoe6uy=US|ug%v-Ux*TD;c&e6q59PQ?M zAO`nEMim6_>vVp#n!97P%QcOmpXwZR zX`vMKk9^a%8epl=EXhKvcGV-ZY3hOTS5ab=- z#e+WsglH%IAb9tLa!^jGMiS^ILa($)GSNQ_^<8f!fByg zDcT}Co)1qIC&n<%<_6x<>!mQ)GhS%Zd(^2?*p_aZ2P&8;+n!hvmA{rFEu05lzf(1P z%TZN%eamMIgGT@r4X3gIk!N+)@U!__fx-{*Y7WQLL{%@;T@tu^6@3)CJ{QDna`;P! za%FMOIC^I|ZvaF&9iy3sicDs*>VxT@(mPPQ0zq`V_lECOZ@nl0n;#{wxi%gdUv`-9 zcsrpveYSQJZgA-Z4{_9*cLccc*|9i}ZKL2-j3F?PDE{l!>zMmL2_j%%A5Wo{rMqaS+ZUX^QS>gU;WL78YBqT-a5hF8IrnJhDW+~ zv>Dajm+32N^So@?pun{^?x`96;?cz}^;RXOX@ss{bh1Xo9AoIscSU#2Q`nF9!PvfyDkD0nhRss`< zu9b;rXX8brB{^+^nv`oBw+?^I3^RMG4D5d#;>b3-OyZ3|G*mE3IUbr^tER#6)%5uIE{$>>OusMvS&(s5pLC7=qslHdvfxORUQSnJG0_U4HqT}qMVJZ{yZ>w|K@*%FGy3+n>B$}66i(QG^Zxx~G-l2V5Cutu}k`sb6KKxbs5o}N$9=j!OA+=8Dn_q)iW z`p4-Jw1g)(3H_T5#&M5)yweZiY<<5Il$v<(MWL?hw>~DNr`~=vi{xMJpE-QBzEv`J zZ^TJ6pL*p{LaThJTd!l(JiX9)ZQklnW)=hRPtG1?a|5T?Z zjLekD1G}(~2wSBk`ksh+INx4v6!Xszk!0;fr8LG({7$W6)T$PO=a-%FQK^moHcx}q zEklrT(`kRI`z0^aG_ky$zZmyr6#!(PsstCMufpLKx~0#u+`x5B&lgA*E>&*i0G{7RNpjjT`V z$8t?Q{ZYh&!uaOQU+#Szm#S)EaPEMmA`i+tX~h?;$uqa?8ZF66MOOyJ3Wr!Oz!v{V zVx((ZB9t!e2F6E}gI!l3lD_uu&k;O7Gh%+i%rI4Q-^BX_-5vncen)D3NF^OqdoK7$ zd@Lhv21v#BUgVBuQ*3>JngECxuF6SjqR$%5@7-cbExwmjs1Bz6Zj)xO9hRT(^q=|l z&Q>@EFHOzrp^*?E{3S@Xh|G?GJ6fH5XzYjXLrR6wK||iAhNpI|xG4{kDC(tLzmC%T z2srDiitVo?!L317M3rH*TOgZxEzo`t1K9{b_jkKPXs`!c?BnPXrOUCBB6No-Q}@td z(GJf^GQ4+Ru_(J@;SFVbMJo3IAoX{nQF>WX3JyErv4rFPvJy$3=M5&WpFCEoY;hMA zQJ0ZE?~p&z`k@ny^D;$+dwbbJx0)x2_7rQwiHh3NP!-rM%k)Rv(@r=kM8YYhGZ~AveIndMf+qfk04v zMU<-ewnxGDsY-T+H+OCfLnS+haPm1=A{K97Kc}z%@lFMHW@P<1tFF7@I~5BClv;~VC%S%pf0|MhZQbfymhXhb+H-m(Ar6_z;!e5&*b&@_9MWM zpM1?&UClRm&->-1?(M04L{Hgg?h0@q*~4IEmCpzMe)GGk{7We7JeF4M&LiN$LuhL> z$~mC@J#i#8{`a^lQ%@tJZ|_~6gjA?98oXTGS?l!KLle6-WxhObF}x zq=J#nDqeuQNL2 zWJ0ip#hO|1@SQKayfNC3gN$N#uZ5~oL@0*GZYkHGIrsn#_U7LB08V=|2;%2rL->uc z)!xYIekdSy+SSe?O`u}>+huO6 z)r^#Pn@D??bC%}3p!IgB_X3p1eq91hT)=Iiiouta&V0MwbpJ zZ;*t!g;7RfJgJoljm3s187X!+qfdb`2tW?8r6#Px#dE$Ioa34jd9dw;Eq z1UW^XX=5rmy$(q{<(~!Uq*ISs)Xo;6{^|NN7$?w7rcT3u=Y0WXeJ&zGLsiPkbbpFM z8;LjL4&f3Tjbf1=ShP7i+963qk3gh2ueAep;>u$zrR*eppM!h(AuIZ5TA@FARyeW>n|>j2BNdlZ3VXEwg1sR#CF2`L=n5D2BZ6 z`a!_A*8+zD5Wy>uD&A-$qc}4-A|&)-^@M_;&q%s+md|dZZ5jj{J(AOc_hEbB$@J>U ziz~;RWDe5(cwwmtiB#!D3S3j4z5;b(oOB&+!9{yuX)4pJAlvWI4pOdUJD1|_3*ngB zKBkV59yKX{ej4cZ?#AqJTnYko^m!B}Reftsj*O#e%&s+!nf+m1`UqH;xlj_=D+e-O z^s7#Ifp%6hf3sFco~MdQ45Tyvj%1f`CYfw?6c4)T+-2lYJsQwQ2dRm_zeN9@bu@yJ zc%Huz8t!_7Sf~F8!+X#|`2NHC8{C}q4rHc7KB(0^hiyWq=Pf)+T>F`61npHc{HI|R z&vkswD#hy?rnb~pq-W{T8K`0E=xn3UJ7Ys+`GxjvYd5raUWHa6R%ECcGMp5P6WO*i zqs$bMXmJ8=Njd7IBy7fQ!qFN?b(;f^-;fS&j~ z$O)LeYuRYW?b-W&ohoIicZ23~0$mW|ACVCt)*pjNfAzhHJpK2+Xh&pTiS5?ooQM3{qEG#BhwO)g zH(_7P;m3O2o5&(NB-I75@{j*|*Rd%5*yy9nJG$}kqA0>g9P(P&7#R3-@3K`n+l1A{ z`1w1R*o3mCgXmxPl{RT_18i%^93C^Y*jfsJeJRCl%awnlK#Fv6qH)X4^2Vsx9iV!F zUeqP{g^~E!GgBQKzq$pC4PuI+P$HGX1DM#&{u1K<9J+h;%Qa1(VN zuB$xDb6(e%2q?Je#zd>7B#tl*@nGi|k1vQKDzh5^oy%g*?5^PDdm&qQPuzwmF@xP8 z)|DyTKw|)^H4j;kf7LkS-{`=hsdckoO@uS`UX8aX;*$H?b7HL}h!z%3!Pp~yw0}`K zqq|#$@ix{W9%zBLif!c!^o|?U^sF=@47u+;p(1W$gnjELavT+5B89QmyO>?tt0O8P z4HxqQm=^9E7Glt; z8fq#^&dj?M?gTWL9381O>dBrmZ4{yrgjN+acyRNHi2{SkB{MU}0c5+0foC=Z*H~sf ztVlUaznjdE0D8ZST67D&5p;Ntw}+kK`6gk6x^bQ?A|7ZT9JB#gg7xYEwD!{*hS<^h zqkwqxnormR7O=AIVmpL?DdwlaJ5%sh$MQY=JGDu5<;QB(VgkRf4+6NW|2kD>kM-$# zEG|hcTq5CLd0PwFFS}ThHP1)0se)p*S@V0d!vwT`%w}q>pV-bceC!}wd+NdNXH{?H zU~>GrUeKzv*|ggT9p%Tf4$@kg4VGgxef!>PZ=<3e2y zC(@Rys%F)vx+GTaiJ5U!)qDk8(O9!{(B?OA);Y>?Su z@AmT)$`}u=Z)!P=c+J@rvH)U+*ywpW35%4<7sQvtNN)vd8m>)yf)nPBg^RH{)e0JA zr2ST=G0_Rq-(a_lNUVs&C-K|IbKD}nG?5UwW8IlcL4`xK0iHq0Um*xiXS*NfW76Ap zx4zFu6jD>FP)02rOMTi>CB-jP6^a2a3)N3o$#v-B?q^)We0}RmfQok=ZJ@IqmXy-! zZM_;1fU9sb>6`oFC?SfaZ|=EPK*XlX2F_p7L3p3ew<2Gb&Gj!=B|&g}WU{gs#J)@y z&5Qj51JC?Q@=!(P;AsVoj}3#)0pncC&gY}j^wE4BgW3Jt^2=sa-tmLXL71rdV~x-z zpqEW6GUP{g6J6Jtx2Dhi;KPx}arM|aYxxg_{CWJeiw^>*7n$+R@oDk{>KPjY+TFbb zb)4nyCcv3csqi!P79lPnhqliG^Y87Veo<;JFI5YJFHC$N^Ubb0DH2f%jPlVk%hJ_| zduwBEZO-<5W-(5iwdlf0Y|U{;c#|*X^foS}@iRrU_wgT}-zGBm-C-Ktf37QDLUM8= z5<1*)L%LX@7iL)APD65E467g$fho4NF`xrWLy!2OBTMrnx7`0Ln!uzDnVW^INl znfyT&JX6|iu=IS1e7AC-c^Pm$>Y_73K>%iJcGIPvZ7{=1$zxe{op zD~!kdZFRg%KP4~ggsL4@mKI0`uTEFzXzHtjnLUD(&@IjHYttfZW9hm@L-YttHFT(Ij;A5%AlD!(xFU) z>G)s|`KC>rXl7p9JRMce^Al3;u*G}s$jbn(J`w|r>24t*aZlH#OqFBA`1(jv0TgFc zkTIQLjDkzWYHVt)1&WJ2_cthCH5%HZ&&EX0=7z0OT!V#babD*N38~m}NPgRJPvzXg zS;fac!VT*XF0&4}#?ei4o1MDk;BhbmFqZO!VCZch{AH%n&Ti1(N2BE1`+Eazj{Yi< zht8m-=xu+>^>E?go(qu}EY%Xs*l)R#v`tP7&!lhk=c1g;dutU<;2n?PJXT3$#+<(i zo$IP#TZRM>cQr-gZOD^errQbxWjprh4IulIR@)Ab!k)h6nyn&$;*%;#P%auBMa!oO z(higMs;d#6TYg*kb@R_dug)MhXM9f7x&qe$ok1++N|zO=;wZ z);fSad@ZClsD|Ws&M`8y9lE{w`P!4!bdz7uBo|VB=~tGwtG=G4jP82IgH+S9bK&Po z`KLQg!756t0@(A(wN1VKv6P|cQ9aydLgPL8I7abg$NOd))(H|R8z>DpwLk}HvzMls zcV%|G5<(U^UK6l*^tkQKq_woUp^a45-|`M~`Vsr19r%lAT zf4SfDsGjwjM3o~gG`E)K|gZp4eo|7T5 zWxTR=PSv^`lCy+76QHtWYznq6%`X2$Q)E*^I+Qi>kZ~PzuTF|2yDXx~-5k*4#@4D- zI~I=v3Ep7S9=yS6WI%p5)|Gihp!}Z5nqR`r_-=*C;=?d#no2jQ7D0Io2)K$ZCE}W?oAv1#N)nxk478e1b@iB>hDXNSQQQx&v?3aygB-M`GIAdnL6W|4 z$lB{rJ$G;46oG7BDxfLfpk@D|J5EgSc0TW0Sah6^N_rjN`|F~Cbr;wq@0(lEurW$z#rKer&)6 zdG06OzV4(V$?-{ngwycJ;{%Nz1FC)&;zu7=?v}6i$&~d@p>FkBj+2R3Wh}@C_O$I@ z7>DQlrT44*CT#p!861MNOhxFmS@3dkCnu06blbqKGId^T0IASlCi~+RemPV@YQ*{-zTcZ9zz?t=70LqrXI4i6oi3 z_yL<#lV#omC*}zot<@ra(XUhNkG(-nb$6%obcN09iTn-z?iOD&!N*8c+b0vRg1p1L z#ppu2VZ0LenzXGiS*nGy`d08cm%#3w+1wlKK<+rRgV91n1pijkLg@S`p>Ob=CccGh z%=Pm0Dcc9NpeHe%p^AjtN2Pg_ltOn>T7tQl^{GqU8aqloG21-(88y)Ljita(^>eYD zC;k~W-yY3f7fqj?Ds20j2y?C^7*gh3p!T2p`1{sQ*T?dEN7Oh0&&=Z5po7{6FK4_c zbWJZP!zve9#mIwaJ<9upd82RZqT_fO1~%&(8Ta!|Ato&!7)C{z3`A~yQZ8YK`E|bE z2%uh);qNQYTv41@mez^*Cc>>p3W%;Sq_mpl6UfWfaVv{kFB!^lKNM1%WMbU=J(Ej# z!^<7Uq42S29KXqnB5*FEgbt)^MT#GT+{ccfZ4Tn>r-B>s;=u9Vjpg}hsfH1MW=^%t3+M5=LlCj8SGiy zSRZ{QH-o~EXOiqNHpHTamVao|i^VoznF@L})H9Rp`iMao^k>Jc-#1r(`ONq=&c`9B zT{OqLG&ue;irzQawk(j)oxu)`;R$ZUTpw)wlt}Ee5>n(+yI=XkDQu@wxZw1B;*2Zi z<2aT^gQ2PRGEmuGRGJ%}*DqBzM@i74s%mu8H0kZ~Isy}D%YL`_d;15VoEG=!7k=y0 zY5aZW;w$v4_v#y3TRy_p^&$>8#%NjMjCJy2m{cfu%fjfJrTtxh891Mo$__Kh33aRmqK~6 zxgDtdY}?_#E^Q;Z@8gU6?RJ+Q3Dxah`O9{!E}Az%-z}-v9(zKs;Mb)i=Cz*5=7bD- z@1c_41WjKC-VmX+qnzFwFFg}5d|njHz*u*2feG*JE_FjkczAf~Lh;4C*xR)EdjK%d z;fLpYtKq|B;_!RIj>vcki&W+T3l?juK!-(va{qw3GU;#aS|ZvIdhh|?mpIbDhLXw- zsJ#2ha777g!RwuTiDj$gaCj8%SU-Jn+aG+~Vop#sBlNUByzN;Vm0UR}hPgw2jOIIy zo;gJuXZ#k_$W+vdtXVbr)(=vGv2FW_xr$u6c#&I>)~o3+GIe7M)3;WPQ~tHaCfN_P3x2Y?_ut}& zIp|8YT_pK&*FP&G<@3p&r@%A7cgkQXUb&nsu8hWew$U3{tdpIEmKf^6i520r5Ppy%99cLq|b}BL}lb7w4aO~m1;lW zC@t-AXX?)hpneyw5`~(*4}OkcieAP8C_OL@c>g9nHD4V6Gs%QA=dp{<}F46E+_zU&6MQZh-^jdu16iP9j)(V+DQHx59`#aF9j~dUEV;Z zB5{MW;W;P9Y%s&FO7$G-um!46Yf#(@%QeHxWSJni=owymEHLLctE<~(heyFlYU(s~ z@}F#-?>aK_`u+0anTq&#JL3?_gkZ6deDd&Zq5P2iN^?FPw=%TMC0XqBXv?;cPU}~? zNzG=ysIKQOemJ+3^|ItmN2`ubW;YI#E_?esae;X|5SXyM<*aDz>wRY$-FcSznMB-H zm@g{t8`-h5A9F@M_af5`-P*`$z47qWgV?^u_*p-aolq;-3_X=OOogv-6}H>bhk-0Z z;ZEGbLx~RpsLpo=i|!dYJQMOyZFE^mIS>=D7d!)TD)G{oKwT37GeucnSKn_ zRAIUI(u)7+gTDC)$eH_`Q_AfjcK*&<^n>1!YtWX@j0#K-v=|AusXgWyR2QC*e&Z|U zkq!?>&B8bpZieW@8}Ln)F#GLb61D1Ca4MpU3ab|VeECs~Mt;<8K_TY7EIy%M5EI7ztDmF0RyMME;Bq(j zK7*B;%iVU!e)Ue2N~F6sSzaFbZ2efi>g7rH<8&4aaDX*$6WaUjZyo5I_yuqzukVMx zHYEIV8dp1AopF>%5wm^-OIs_ zONvp>QL4Z;r}l6OH83{*iOpJfQv+n%L@!Qkhs_WIZZhAJ9efT=6baYTG<@@dLkbgx zTvdJ`J32`@#d_n(j_M28;?~-h%EbagxijhUM&^E$9IkFuy3M{=RUa1w_H?!O#f z6CpyV>&o{zJ&cI_QL{|W`pe%sEiEB6Anr-GGQZ<|2Ue7hAc`Na@^+VST)_i}`Y4iq zwHSBi{9qA=bR2MJNL=MK`3i&j+VeY<_PVko$<4lpvJ5^pGV~YN;a8@xgBhYrs^+I; zCW$nfLWIK6Oq&8-Vv`B&A0IhdLCHW$tIQQ#cBlLYr}_$|3SS#*Q;P$8fow)93M^nt zEynLeI(jOL92Wh3&FkhFdL0bz8fvnX>mAE<;zDX(=hCZhP6^E~_^4k5d&aWu*e`%H zxK5Id`&Z=I3+Cx1udm2ig4f;)==HVt0!e*ET>g(9rXSPm+zWp8b?$%kBywI+lrPxh re}KaO|K9&l^8ZGq3&T@83@nUvvqc=|kTS*V|2t$P6(!2WzWD!t1PW`d literal 0 HcmV?d00001 diff --git a/etc/images/jerico_s3.png b/etc/images/jerico_s3.png new file mode 100644 index 0000000000000000000000000000000000000000..2805b32e031b68c5d891efe5f35d6abd7ce1d175 GIT binary patch literal 32092 zcmbTc1y~&05-y6nyURcz3GNQTA-Dzx_rcxWEqHJXn&3_#*x>H&5-hm8yh-*x=ezg4 z`|R?;(9>OA@|Uct)g7s2p$Y{B!vr}VKth0g(!NewLH;2-$Y?u5 zK@q(9^9L=fN_z$c1y5qBuH~YoAkS}NZ_8|CYHw`D>|yHwp@xDI6!CB{GO;#up)xkJ zu(T5boVIiTs4Pu|0H3%NSQQ+^%|MniUQT9eUW)1_Ue+djrT`IPDnSo^2m@O)7b7YU zTN^uPeh(qQU%vd1<3Fca091cTT&#rvqJIQZX(=dEiQ7AwQE@Y~GMTWlvQzQ!F|%=V za&WUUQn9nLv$C+Vv#@b6v9j^A^6;~>Q~mn`fJk#PHRo5Akos2^~gY5rrSpWC(|0Dnct%AaTW&AI7v9Tk#<7eY!_~Ss z6DcHUOpRQO{$GhrP5902ootODCR^GXS(vdn*jWIm{tG0(xV??N6GSjXJC6VHysWsm zvXi~Jr48hQv#PWhm8_&VHya-}HxoNE+h27R6!>NBoL!9UOw42@ga8nDm@O?$`Hf9X zIC$AOc$v&OxcQhkjm^!OjLrDin9NPsxLD1NP1t$OjsA1LguRLDpCI_p{igpv?^klN zge0Mn&Hpx^KdJdAdiZ55ogsep{5N^j%pCtcvazK48!-GvCVvt^2w?Ij0?bSS|DLw| z-$vjcw(cM^2-E+ExcG<6+1}j6-N?yI)B=Lm|A)w9fvC^&Cu#q&gysKirLIfTGoCh%}p-Cf{Tj@NU`+rK0!lh*8WF-kqJ~6&nh@9=%ql` zuWjowFtSweXkM@5p1G&6ZZOM%^nnTi9QcSPtVC#Gb8oUwzEz!SYF4~(HtQk+mq$-j zSCP3|U^zmHz%^h;unL&{l#5aseeIUQko=6ufzpBJj0&(%goY5@$!fwXCU;C5P!}*A zFdfK&#q_Z*?YM31{T(Cv3j7M%6Mhr<opvPgy;POY06*cm~d~1i@ z5#S5L4gUb^%mtROqY4Jdagf7lmf!2qOp*IlBV9FGB9Z`$ppvx1ah#}JvXgc;0*jfEdr&tNwSWH=N5 zn1ROBzsXoX0{?>UAza=o0%m7D5DD`7(pwQ7*qd~1B7w|A@1igk5y7^@>jrFxd*Yw% zu`jnH@>T9B$d3Q>iJ_6Hm?!R@pga`RXa5cbS3nP>}_Q;L4%Amo~YE7Hvk%3iW7OyqMK&>TRDU7< zFQlI>=unuR!Ey1R>}a~lG5(DmnUK*RygmnyXt1Z!WXbDscTNBJ(8U~hHPMe{J7BsH z8zS=RH`SKDc4XYz*ZT+8uwr(#kQ5W_{z`bmN}Rutp)vKzV*%S?TOAW^pO9r) zf7oBFvi-vjskm;!Nf^g#g(s4`ks5h+XovCND**XV(kliqJZyY{JE&l>&tPMS0EF&( z!=IKw0_u_rdfcufC>ANzW75CorqRjMD-7!djLIt-Hj{w5kr@Ap6@lXDi3{nC%p{v% zdNM-USKBRrG7BNtsMON+QW?>KK54oVN)VNef%qRb#r3ttJ3fZ=Nw``$P`gHO1b;0k z7OHq(|HObp{v}O<)E_~UIwnOvD&PvRHUza_U}?H_@_%rv zkYPY#`T=VpUmJr-4g5zHG>$Lk5A`7d{_LKCJ90#U{{T;{R2M=3{{+ixmU#Sx<#GET zGxKIGQzkAxZPd#)I>MeU$=>$-@e>5buf$@*Re{d*i+v;;_pbZV|C-aKj>;qg$DCi%$#F!a)m%sjB2uav9#D=W{UdzP=D532jpMN1IDkfH= zuFpbz`igO^8%-O}@z+QPqA5_G*&Be3dHK4fIn*@{&=~yVaAvMM!gAm*+u%(q$jNq0MhI1ImD;~Hn`2#L0rjC;TQQEI1S8ag zxc~7iQNL+u3hOo3PHRW(f8>kGYl7}+tLrhIq3&=U^s<-O|I)H{BPneC7!G*-{z*FE zbgri2cT^~-itz)iHrUcC?ys64Y&x3yCmzH363ScHjw&^s3PsX0v<*&)vqQv(01T=q z+Wk6c!U3pvv`^lsX9630YU^fy11V!%A~fX_G)t+8$N@g{>Om{+-4vYP4>Dd{54N*+ zwDe=Yt`AfGLR>K};R_U2?-wT9IGdz!na_(c0|PgL`0LI72^%9oMhXvf+2KO?I#jT$ z4a-{sRz$XO7g*$NpF-?9d6IW?yhumzQU}%JaWFri*Tw4TlQs##3E&sm#=k)W2|Ufb zH*h{*$9(TpvX>b`(X-I9;K?w_pvxsfQm8(|cn9c#={Ards~J|J4xNs;fgPMCloIqB zs;+9cJ!(4o6X973^2^%aYGWx`AvWBh)`4XaKpN07U(+VG3!4f(4wo~uEze=QX8q1V zYSLXCECd#buRdOeZS)jyc$e?kOu}mg^X$b{teEu2WDH!ZYs-?`(wBKxyKyo0s~3U= z1RwmSw1>OIF9o=~lua<$x^n>83j(;OXM_zr)|5QEkAQYxl9>aD2Y_PqiXGcrqLq=(FR2i1V z?#CzGlHYhC(g7U`rPBWp;|57!wn6b$jy?Jkr8@+(Bi>Qcl7N0*n)Tf7hT}Kh`-5?4 zFCE^jY2-31SU<5o`3>z&)dafroc@kPKKdoN!37>eernX%|By8;68$9tX$V>7<`7m! zs9f^{wJ)*cLj&RhnxL$0zot^qTDao|s*FLVEK+2cE(Rlm)f_VDQV0OZ#NaX10D&^uEM!0j4_p%9L`5r|bZBn3E%FWOWTX1gAaR?iV>PjwG$ z{Isw;3x);n4g0)`RmF5?zdf@Hl8kr`i$rF!fUU{~p8{iiBPO!SH+htb+KH=42PsTN zU3e1x4Bt1zH>`y#ao2LZQI@g$9v$Eum=uun?nInAj@4Bx8eNdQ2`jQuFtYDXBvc7jDzoimCy^_*B4=u;3Y>AAZ%Wi9JcTp>V4zO&uB8S`7MlQ$f8@eQ>l zzHrnRD9d6nj9LNqp?Iu27P0txG?GmW%0gN+UiUMS@$PyUsJj4tY28ScOJR7Jw0^y% z%;%M0BNKh;M_ll>x+jbZ)2ZmpPrmKedK#W*V_LlzD?0tM61;H)VFJSz>4fiqowi)X zq=?Q5c`vNjY9%U--y%ID*dNN+2nW-iNe%?;6cAIWQQOUn+o5C~9wfKd9^X5$P=KuB z%%PG)QkXZ^Nvg;D-x=gBh+UKmRzW|)tE}n;e~&r++DQ5x@g4k`%eE1(Q=%^)imW^j zo`W|{IT0GJIJIZ-3ptznYg6;8CGV@`^KgYc;!o_$J?o6+7;z-(rAl|2`Q4~pHw!N{ zSr~ufe9P}Vm?`&9>Jl-Z>;vDx`yfXO@F+pF#*QaVbM)?DfH7BULE0i4GhR8%8CmAAgkdaicb7x2pQ( zHx&W&AOLJC_CVL+C;@mj1UD*VP+oyVH-GtgzEOSSOLy+o6ZfrRk=zpI75S-hG5dSq zJ($Ei%=z_;nj%O$>`s?6NQAJ>pX)j<=pMy*?4A{eU{MAk(4Ja_AR61EszZ5o^PEy% zR}NDD==$Xn%2zl7Szy*}-RLuVt|R)q`JLXJHJiH||5O?KR-}RkoH+Qc379 z?evke?BJY$R^t9LVs2j$Qt9!V@Xmqm@%WR7nN#Ayog2>BXF?KkYY)x0z%@mT6VqGW5%1a5EKI zdP=2_9|q>CSL!RODM48z%&!rljc#*q;L9X(v<&*bqx*d4&h=ht@EUxH-G5cW>!#2y zD9*AK?oO9D4Kj+cWfC1}psX-?B^fM&t5VX8Y?ER7;hg}65&4uXZW6l8n@D2~@CkX~ ztrm_Htiq&zcXvxI95x%PM{{XHnuuxvue!S{NJnY=NKE_lW+{^U>nc{wzM_ryXPZXv z#8pd$kI3{f>OA~1Qu7|peHT6;Z(bI?n%AU)0mFfM1oK*~oa1M><}9 zZM^V)wupWxGa=Nf;s{PrRQ}^msr`JWZN%ITJlwd4{y+;>g{lIt;%6CC%9;fXvTqc9 zpXUm-K%UxaUf5aCJ$rPk+kTKa;CJUI+3P=F zZCeIe)S&2R?=lYqanl#9I+8s^5}WD>DkYrUxH8#jKh0-zy_~#@Q1kqttIH#%v&=7+ zhs|>2X|DRVz8osnPE#7@OmyR?xqBC6h7>q~Jwa(YjzmA|H~rpFJQfV@joBZ-Gg0%t z=*WzJ5~%2@i+@`LMDiKc<56U63?3T`A21h4AEX`+6_aD2KWNVQomskQ$jX`9fw*Gl zD(=n3rkK|V6^7k&YeskXtQQngh-k*3Dp)g11T}X4g0Q1nsHlR^nJ&+gogFtZS!3Q8 z#{VdfnD++#$+}L!h?S_AOH@34Z_10$%}N1qOJJ_J@La@Y_X-32fpv_rp}=KBN&WR# z!yGj~|D2(=C6FP$>IIKt6(oDF2#1je~LEIS$7*`(spqW{PxHnsUd<|A2orx=< z`z%q9urtg#{+s)4hZxEM!p`qmZiiK($$bj`77D6VYYV!}Fe;XM2}=e46s8&a%K}Kp z-zp2g!YprHbR`1A+a7kjKK(tGGmrzxlmfbEvwweK%S@rP)pW z4OWl={G=NBmX9w1%`MdCZoF*5!EZItPY47~-XFPb_-C#nL$)$#kPb%pdS>2Gqjp7d z**w-sx#r8xQ-iZ_;Bdy-6oFSuudz8v+7SzSwRLQ*44Co zn!c+yps$_GK!yWzGw?A&+8XlqM{F0iHi|oG8i6S&zrdOI5Z*;1ZiD8J`@fr`C5)5y z#@R2=ZOtH~oDIC+%AYvoasnga^0)55qj8xZFx9rX>biK!N+zc z5A+EPJyJvMa7OvAei?&Q#(}XRVPlqD^U;(xb-pxyAzM^tg!zww2V?P`ko0v9BmxaRD~Ro}k1bA7=9p z>4dGs%(nSwnH~p8F@2f}JihvrITBvT;CZzTuwr;Vr#<`8=VB)2LSx=RHBz5pBO1yT zA8F5zbCuDHRWX1Rpvnv}=;7f-%3@EvaQe9yW>~lIMispwdWfBHQr!-=9p{Y40ydR; zbEzLkcNiHE@Pcs1Z1z4;M+SZ(@}p7A#)G*#7?S4R?Px0>Y}+L}zBXjR1X+ETUkL2djr`ZC0BG1l-lx!bkB$kFqi@m5JVcq<9PPunaLqi|-- zty*%Z5;YRl< zSR>D%6{WXBOmDTo5e@C92J+bYbA^>K{iaTox8rVWbDx;@M*Mx1CB`(2Sit&n>4OHb2qLaO$4Tl4Q^|=LkaZrgH3u(kV9%t^_q^cE4+?;H7u!0~Xi; zN;u#g;a)fer#-K#bP45S|CHaP^_y5vKRx@uPb?LGyT!2aMw=IUTb~uoyZOn4(0EiU zIz)F5i%AhPao_~BVcKUcAeOo}PrN{r+2AUX)OE)!*`+laD<- zpQSIf04ILAr5hq7V2t{AMo&HvBg7+@Wuy<}Uq=ZlrhKK#RXpV)e+K?UGKZ1hL}qH% z70}be#EG_Lkf*zKc~7sj62SOACbz{OC#i$6 z`+>>gG~h}j0q~AGM9Ws&xy?1*5>{&XTtQ6R`XC`O&=h8fj41-&`gMq#t;a^P44H{; zW>J}eyHmZK_44Q?Z19|ILvHj$0$vqP36H40amvMrva`UNfTxxQofhO*FLeL<9x&PV zHo52na&7+5={I)K6%8;f?%gV72?d`ZW{=Vhm?K-;YO7}>I1hUO$n zRIU+0<}|k4q6)hfob`mGM&z9+dO5TEv78Ycuy(10ykDdM5q-@W>T;F0&>KIvuFLt< zrwFVBH!G4y#0%0o*OUcNOYLC>6xR12%aRj0N&1rDh2hGLACMTabQ}B;DpH-TYvF`$ z>X34#i#4=DW?)gogg;0!C}Vt#apo%7O>%wjz=VT8Q%VNk+SGMBPYsl2v>N`oAj1xa zdCo!P6N}umD%`gih8~U_2XiV$U?F;;RZk*{$}5F6y)6&euNjBVSsjSw44B6r32Ds* zY>v7X?4KVNtW%Nne1vQT#`#CieRPIVwJTU^c=`HD89nEy$f-gV7KtU{iMb?_qrnRFqR0I^zCW!77QU(FCKKl6;QH>+-UcW z3_E8EmV-WIec`UAL>N3t&ujlB>jHDEEh8NMJI$t?><5*3g;iGU-J$O4!ihX_w+wkE z6-i+N@wUYKpi(ADMX_Z}`T8*j;OFBK872ooFSzSZGI zAu0Ce_{ju~knZ5#Wj~m~I8}yku~Cw?FS zuF6F@HASD{4+jleg>_|#L!%_EH3qUO)6vn@#(UQokhFn3hri|XR3vd;LnD#1QejW4 zoDDJtlOY`m-9}8z!2n(z;++cmvVY3KqDE#fY2c6fYTrofN~BOJB4TX?Iw8{G_m-oJ z2w8C;Wj~%kzaWqVh514Dyg|_2$`RBHrEwr}c<86;uadk)i{z~GsQCj?Z{E7&2-bbi zyY_&GAB%u&DQ!&g-xg^HB@WCxp zP^at4IN2cQDfjko*=@fVM5g&S&R6^AVgmM@0lX2aw2?@;-pG|)nbCK9HZWt%PhI&9 zI6ui3k1&Xe;r$Uc=c}LP9pwdeJ%b`sTVK(Q)pAeJpbg5-d49mMl>2`w&Z5T-pZwaB zfVE^oI+eN99AY?|jC#**_Fhj%GfciXE-&v_&Cv(`@N1dSZFm`iwKysjOHoha2FnMZ zoDb#nZ4p&VViH8!QFl$P$pGnJI9D{ko<%E4;K{Z|rzK)Rkm}Dg%1AqVY033cxgFKZ zTG52+u>FUXR$!wJyC;2K^y*^ZV`HY ztV|_=UY*8`s6?kz7T)c0geopScC-$$xq4AvA~-K_Nm!M{q=;npj=$TmW~2F_5T;pE-S z4IY)l=p1|9@swPD6W!vtdlPfI-ADwkE#MpYQ$_46=Llb$d^A{xd(J4KZuo( z4Q>PSYgWs3ulX1mVt&CfwP+@A8cRKCCLiZSfm%p=@zvYgodXEN<7cfI9Qi{V2+%ml zLkqQX#q~i#@SY!Hb4-^F^52?Hu+l&_LlJqK`_`Wswn#5JtwAiKFfpP8c~;kznP6!H)9%HXnIG zWH!b7Hkl?F_<>ijhpoRo71F<(n8+y)rT3g*Y_13Hsp!+Bejv-bopb&s`SfLIwrU(x zrA=&G-I@6;7&6Bx<4V&UxUbu3BgdG^e5S(m6_}8YoM@D-jV#H{%8BBQ3AN0YpBAo* zpIyJS%$_1o+Vqr>F|TOO77i%v&5bZIDvL*8HZe~6F@C-_Y$1~GN+}wWDz(~yGU?U| zLA*#1N)Wfn5671`_*|pLod(x2@u0sFn=s6+r=(sVKAe0*a&6u5?N0pQNLOtwneWKs z?<1f1goNa40<90Vn`==>y*qDH?K<=YwRavvsevqbS4Rh#M8MCAK$eTc_4Egz_-g&l z^Ku}P`Yhb=Z?Ibr+pQ7=&D#Wx8*$g;$(akNv-drCDwtkv^XhE=I2~=!Y`A`TioUUz5H{-)_LE%-|7>|(d>h#N4G8iqu=dc<327p@IQx+p3Bo`7@)xX% zMyFR!+`7kc7j}6}+z-l?(88RZ>o3sQTg4nAq9_{*(sTmmJ_+x!xu+viX-W?J^S;P2 z&nt2-_YWl-7|tDK5|QggsiK#);)>Px?#R$=PRA5N9*2-@vtSlwy++6T!3U$d)_x17EmrH!wxW3JS$9OM+>GV{Xjyf-K1Q&d?PfcV$l=V9|Gau-?bprR)7kBAINKCqE-8Jp?gLKIu z-N{-wts*;_ersyv8!SN* zJB{xf3Jf(!$ekI;&G=|)-G{6gE7KUE!3D;jOBS277Pcb}eHZv+Dw(>TxgtzXT1i^Y zd}x<IzAdpMn7aLDIAK9Q8Psi_#M482Lt7(e2h=dfR+l%XS3cWzZs z27*cmJEU-S(IF2IJi#i^ODNRO6&i+~42h*s1E@@gXBt- zi)_g}i*G9YrZnl9so6CN=kk7Ip{Ye6sFsG?Stk5sp%saR87*10=%o_X`R z-*vn2>+l*@QI##JbXG3rVo|0>p2^V>MlFA|`4A;fA)by_HjPd$=sFTC<69e@riHNT z<%GH=aBU2;Eir5^U}?P!o+?`Jb2LtV((+L(aCB{03%F__`Nji!wGP<9Gds8rO(CnW z1OR0NL(D+hB*_t0XtHismZne#Qu3l2&ZvV2x@=aXW&`^2RhPULaXz0>!`BpM$W15o zRfkdhig`oBOP;lY^p`&@YxA0_)6?9Dg&h?!Dj7(()MbA;kg7L|GO~sizX7Ba*>7lz z+iz~y*l&GjrI`!*8Z^9@uC-OGNXuuq4CiN!-8v%i^%#$tB=fTseZkV?!kUl{t~FL} zIKGU>oo&5TR1nxCtc$u}iMWO^vECf|V8gf&#b2tvMw-Sv{gHlR9OxL}PvvR43$sTp zOpdS8)bzfmy5)<*ErxMqh3S;&!bv($LnBc^-m30G` z|Ex0%mq@I=Ed%s5RY!ELy{!>+hLxMuaiNX)iz7*}k$qib+rYwvjT?z%|s5|%8Zr) z9pWEpB<=zA*b=Oz$`x96Ri6*2EJp#Qh;6?bh->z+r{0P2YnLUl4>Y`fxjhgC2*!#I znKMeU)46;2+H4C|Vj+$M4v|{wGEQmo(98)ESlDgeZDQ83d0|_dq+-t%)He&Lz)gV# zqteV?a3?-6d!Rs zDPU-h`Fs#kjjGKM;o;tL>m`sF^y;#~YdYBh7T9IJ82gD~{E_tRp`Bn-adoJNiJ8ZX z1wJbTNmZI=-V1umBlE+PwyvozrDWezOvJAfy$E~NUN(c#`+@c6R}s`Ew;*ymPIorp z)4#AbpU(S^gfKXV~VD& zRt-mw)1<^-3ec8OBU`++Gnyk!l0@>ywdJH5*ow`)$C`GW)&?_v4ll|t9qjJLj#qOz z(W$r-eUgl5Mnw8u6Dhy7)56#_CQPMMB~^B+UN0|eO`x6pwO?D>z>W!(n3 zIwPTvU8{%4Kc^2D8ytvgcDHbhWp}H};lk^y!{A8RlZzn)J|xVlw^@T{qFGcP5BgaPu&KLMRHjN%!&$Xw zrNmA*^Yh$m-#Vir9%*c=+hhUtOmJs|>jjo&fOSpHmmQw$PSB3-l+@XPeCgJmxhoPl z9pq3s#a`l?U7Sf8#-XQ}0@V&vzZ<*0@0I%tgM!u76NT;TAKUMAb-QRQgq_|?t*lB*V9rZ|u#DjQ%K5g{v-lPtwNjcBLerP` z9U8wTD|~b{Nuu67`BmBI?x?h7>%yOjJpW0{8bA_CXX~1zDg-%^medvpzbKHN*%Hoe zLI18SmCc$P0^hf~(E0;o+apzODHh|7Hj+=F5GN!5rmg6>i~mJlpE`AHv;AeVss@r_ z^(buS*J5LRAH#{XY!eO;1kgWMEPSr@$694@;rM5{r`Fzs(_wA%>Nkvs*m z!SUkZGhUgz@sqMm=e=1ji#QO?KLIzx;-oOFmhe!T~MSQH`aX}*mjBlSWpw8F>p+XPZ0jntM4bok<)SV=R~)JWrj1d{S} znUxJ$8PJiM{hZV^d)^6=0Mico(*(Q`my< zW_}PtSkxIA&?o_#;^tKeO`g_DM>w8I5^{D7ZKQ4-FS1S&mH>H*;9#x}wNkwEFb7dT z4Zg47A1EQ>=3~qjhpmkIs|&x{N7Zf)l{c_W9qlvX5ignbKCJV$PBVLoRaKB{Dw8lEz=YqJ11jwB1?Ec zFH`j|?AKPBI(Sp@^Sj%)H6A4Y^KLhAwgTER^fqyc>dc*~>JuwA>rmt^Z#o@i#^UVK z;`biyW3-{iG!M0^FX}i9zi};c_YR0f=k)?w z-x3~`_YJYJ6~qm_y4qG}<-2k6vQ_J*xps(~BCW6%nlpqEXcxBNX<~Gl07ja)r&7CK zQkPHfl9`rpppg-)sR`A3ZdzPyChP5;Yo^0dm>96=2Q>H0WDcyvaaEd3)de6mPO*32 z!ENGLQ1nM#f|~{X5QjGZ`@U+fTxxG@NFC%q_)hQp;@i?z^Kd6N z(4VLwt99^=m{f%)q?D2YK5N%i4<>5ZGLAll;`X)om#-9Z_3Y&`ccAafi z(lQ1htrcgK)I0a??8)A#2Lq)XMM0jDs=U8d(^gdzQyXWEn}7hru`MoMV8{W4%ytW< zMA{xCncl%+JpQK0OVB7kTgR72pFcC9btjsfF@XZNIgiVxC_XJA#L z;JPA4?u#nv&;`j$xhAUWAwDK_NZ&xk*FLmbC!c<+m|m;<&1%X5*gdh3eBk%WqThGo z-o!DV&>xvQONRsrpUF`)VBxzqSGsHieQStnhE0pHX}e_Urvz&?(_hA7=Ul8L6GoE} zWUV7>1w(h9NHU79(R=)J8u?8W~WyaQsljjG`zph4ZX ze_K+c7H_QvVmS3zW1szeBd-uaC(B2|fNCePDYe~_(|}P&;iQaVii^VI^4$}u=l69z z*rLYsN#JbO+Lsm_&=z{)J20StAL%#SlqMl{wh^R-k*eV14LNM` zLSzegYwRU*JjQ$?*BU9Xy!H!SnfZAUaerJWq^xU!zx!)jn(b!Yhj;Y|nP_dz{l6W4 z;J9OA&Cwt}=GJ>bdYD9w}VQS=C{v&DZdg$j0f~R&b*MBvE4(EXb{IEb>+gdqLLbW%JVoOO~ycX z&8LZ6?}$sON+{j1icn5ft#=Xy)q_*JCy@1D(gw}ogH{}lS+Gl$aP440|Suddup&`a3}0FY-#$%foe4|NP~^*nS^` zXBYXXGG^dzCxj@*u!zH#`dwfk-6Yq{8X+>{=KeVq8AT8BU$Kmt7 zMZCXGz=w=x4u-uHUAp(rVyckARrv;6*c9i)ac(+ON4jhE7qTET1~w!@WoL)0+u}c4 zSuE&B6ge}FtbI(aTbwR8A4oLxzC#N;_S6E_XI(nI7Si9s#YPz(qFI(@j&3?bMhW(1 z?e0+V(|nfOx3D)CLBa|I(Ge7ova?sSP*ff#9NxU>otFAckCIx*MH-G(Fh`aXAruFD zg92H6K{k-)?P`a@#O_3YTrjOenp?WZ8Pc}6?QWl3!f{o*MnP)+B7q+YL|AWnhttKv zkF?A-#PEn8Zzn^Ddnd7V-=LBjY-Az<1C#ML#l!Iw)#%Pbyqqx-&>QFgZ|JHOX2H zji~`C4g?6!aES}Wh3BDN=EKHV+ggGVK;6V1s2_f<;9MY9c#GW3`*{>XXyrBclh^3J zjpgnO4p4aL>K(uP8wbxi0X79Jz4{e?)CA>vjs#Xt#KCtH!6BVOVIe)oQeva0dss^L zz2CXQr~BG_*ai*a)v$HD3d>Jwx&0(#;}uOdvE~Z2`1|Ju7LU+!M}kIdul6Xq<}AtZ zdqpYi2ub0!_=7d`f=f>eX9WWBwH==DZCmPs!+%wo>Rov<4zBbZ%uqrag;r5sxxNEK zox68}6fGg~icS&-?pOTQkw1gqj!Pg62@vp!#70%~xG>Vp>8505y`P)Y#t6|& z(6AjD67o6YY5ehi9fvQx-y{`+MXcfrC8XU*q8a)=YjC0U6n_{(kG2uXkUYW;X$lJX ziIA9RHczfOy`Ej0he_``Z$tpYJlemT|Q~iWJM`O(1BMOaplq^W%%@%y4 zs##QJ?6^yie*zU7MTVEr7&dOMb_EkF|D3V7h)7(UD(`Vo=_YJ^0)48jxP=4h>7@Fo zb@X%EV?$bWI8_5e<(3YN zo$quL=NL7=`73F~vD=J_+`*w7Y&bq-Wb>1kTL2P~3glC_z*eL?AbuX}d_+N`<;3Iq z9b_g)$$m{jh8;__FI^2nG13?=S_#omDZH=(MjzMKfRTJ}zf6I2Ja?(j`_JLg^;#P* z;N!b~eDpE@QlvQMCMeqxKCsvI>;ZC6(>j;o7g>p%u#s`NG%1%+$z{8dNezmE;TL$ zsNoS5opY9b<=WfoIc7e-dhej2`dQj3{jPj$X~a$IRWvpQ}! z;@jSJi76a|s_zu0`Zsn2W_D(f2`gB!!g5x$My{&Ltll*Pi@56qsj^lUSm%JbCQz#} zvKkjkL-*c2t#CE`*D5Zeg3O6Du>jR^!T9EMoZ*#P#Wa)QWQu zyLcQKUy)Rl94vW@NE7H1hDF>cl`|AO@ovP4!c1jX(~5^x4lYZ=j~$m9Q`u!Tz`WtYEE4p?W3ua>Vwc-{z{7$qFKx8%%DW+hxwIQ zqYm|xT$N;0N_K>4hD$r3`@}6w}^pluc(x%;p&`7+P5k)i>#{z1=W&B`1UM_-PV4=yH962Eu zN~)1Jbu_#Go@Mtd=EP?$XW!G?x2p5oU!W8!;Kw9=%!jbW;c`9#GZZCIx2Y_frs0>v zvGU5NP9Z^HlXSaASEcecJcjHr?UwL;D)SjbPV!;+aohWAHE6kb>x_3VrO?0}9yRsC za+udZq#jR9pW12i%Gf!5&pQ}fQ91WMIlY0AZ zj#= zb4`rWf;Ejsv2**nUIS2AF2VU;YjW>JG+Ib*EwyEjf55`_Sc<^y#rfp6PW9(~m#t5X za|tW+@?qS4#?y6_DZNBRG!@%2D?u#PCrPkw8bXw%9ssjB??pmtG z0Fwl^_Nk_{4}JCM1I-tN)1l+#>mvR}=o6aESKumfRy{uSceD)%+V2!UiGi2nNewy9 zL?V#Ce*v>c$Ws_dR^}SK7TUoKM{vbKdSJ*if!zIb7*sIf04n1;Y^;Qj^)Ai)F9G<` zRXNMRBEq|{d3XQ#g|M021Bo%|Jo1BCne!gK0Y^fN8w}MtD~^2fh0il#=LV#$zCNY< zJh=!MRG5w>S(350&A}j&tv8LorBKq2X$;~l8JuFxX)yEs$uOMsZmEQ&GFv|xiRf)u ze90Q&WHuUi(MXl^h4TzFLv%o9#hlEj5aUdbBed}spFA~)L>k8Q@?{Y|eQ|UneA)%r z8(@0a+MhSBe$I*(z`iuk|DLN8|G3ZcWo+A*jNQ?4d-05Z9TltYH?stor5~|XxG=$c z2Wso71BbZ!`31D0H^6cCA@bMSzOOq&I6=8Cv~G;9&TGzklsbpOku7d9Ge}o#ww}RW ze9W34y)_X`K2V1c8Y?z6e+rm?ME=O4#U3HD0=*3+GceA4{SeEiRz2PlKSK~NVnLuf z;Y8_VU?UL(cOq()Y%4nUEG2=fCr_Cly1w6Vo;CFiDjt4|V7vW^?iYL{qti-Df^3Vr z#yO)CI#*&&f$qxv?}3^s>67PKv&PI|K}72W&x*5`rQPRenxgSj!08Wx_{*P78v=xb zoE@0WQm<0gfu;nBpWOs5$|-dw*1jb;j{9R!h~gppbBAiZLE<9069hsvFZCKi%|=~1-~ zol0PHiMV0C_WG(ilOsj(SyBU|!UM-M@hRj1!!!}7Q$I>G0L9;v7rL$w|MY#Mtz$_m z01e|*N}geyWx*Vi9ciR=V%#aC!Anhx^I8aein?|xPWO$HT3Cf@Y&mo#raa91{gF6_ zU+5!ia-2UKdy_#d+7M!V;KeD}Y=A@6icyXV24SG?^b)aYiXo7W< z-qwOkB;KJ9F&3ufjt}81-#uY#e{iL~^>XyijE6^x5ZSrqt5@DlT3dI5=M$-8Wsv;~oY=7^O45^7aS(4C~+9v}+u`QFy$uiy7qBk{xc_NeZj5e=y;rWtQQJH?bl`I1((1xeVGNpE zbL#&Hd^m&0w2UCDk|==P>^@{gy#bMs>uFc+@bZG>Nf{9(k5v!-YlANKzK z5E8$-!ThZY%iyChzqsWHsjV5E9CN88Y}6Mh`ASOj(d09E0#7@9zVM zrn8VSWI=H&GSL1ES@;716Z31{rrs_1Pa=N-ggF{{AnLBH}DWxH_}Mw&ge-xyOEo+`l`$zMV?x zU=qI{{uog_o^AH}QtF-wGESEJz8vMYy`|{AFBJLX@LuxQ%V#aJ2>Kb~4sa*(%zxMW z{xx{>MkS#IWbpkYQ?tTr7Dsxo*A#puak$c=h7E0|@)+qS=6)^`cM6TyPWFol>Io_MeubAtF|17LRR`~nL z`#(I4_)A?|;rAAmC*wk1>;1hNIj-L!Ld=^9F#c8G8f5GnMiw@IBYzK7!`B2}jR+vV z0RBcQN5DRnyq_P)GjcjI{%$9)fov5j34ewB9MQB~jwnoaBeKVp6qwwr2`$@@0r+(j z>FG44%X=M*IKDQM9mqAfiu|fKjSPrcf~}s5`7dN50FjEzKC~7&#;krE6(y`kJ>QnH z{alV{Th2fRKi@pkjZAjF7T}Xe=<`~}ubhj${p-bYL|aqHAFKSv_l3C#F)ge>2GMg7 ztwS+|Hui~{Rc9gg@j{AMQ`JZ#0!6XyyVBra%oT`M;4(z;?ni{%1ae-wz3mnu_fk2P z_A86tr^&0hi}6aN@n7Dn6yM=c$Jy%;oBT5o6T$Dj&wanDpixjD8d2X*p;#MO3$H19 zzlPG!>BY!-el{`|ul8QPU&)ZSO^~37eaO99tf?%g87byZ$e8d0#LUr$Xb%b z@-L>6Ca2tYS0NMBcgPFI=XfulZ&KN05`+X|cJ$i=5fa~sXpf%Gp+0dzS&A%dUW_b+ z&hh@fnDS9lAj0{Zkmtc4e?N&lb8kW>?Q-McD#n{o3i%VYj~T7Rn~;0X_YJ#^BCT~b zp#?>ZCctG> zf8IM0t;k=zb~WOQHBjYuh5Q0pOgshAfX+uI$P2t<@KyBxUE;Sv%tNK>dt8Z_1Wrc; z z{oRfDy3O*oA3zobAEf-){AWZ%G|$_A67g;MIwFW|LA0FH5r=%x1?2sZ4iZFYxgWV8 zFRHSgAsCyG)zy0`|Daz_<%hJE$e^XjVE$CZUfSV(em64EA1L)Bg-c3x11?V+`4CIe zH?co-1X4-4@CpMON6Va}-1_iDV! z``g8MM{b|zBMYW`Cb=Kqr1%}g%v;WZdLDUg+zRBp7xOAa@F?ZWwjD7gZYcQd9_0Lg z8M!|vDzvmhrolpC?~ur=YBnaHi9Gy<(u^UKXQi8CGOFo9{tX#KzJWM7bs&Bk=OYhl zNr45xB}CflXxmT%ktu24AllevLthfYUUUd6vDZuds=kt2RIQSr&}kK;TJ z_0Q=+RuCUXR;q0rO5yY9_tT%uPe(LG)hJBNebIMkA{vP=mD#7Cv*dv?eXjQWgDlLB zM<)0)5e?3T$TNBZ`4Hb?!J)A2T1;R6iJ1m{Pt_}3y#{+gB=Tl{CX)PAo(j=_&mE&P2C`6$EBk`Hw*9fx!=1Ev1J2D6+Ep2C}l8hiHcGMFxR|hzaTbg5R8nOc2{C?_2Q%VwT#Dm}LrI zE{EFuXCs4dJEbGOzJLhv`^l%6F61-FWcGD$AM+4%#l477wgM?+S$GcG5U2P1ykp;5 z)XzagD>msUKBXX+Q8-zJDs3>j(mSRXAwt-_$jZ;pLV7c@GWN}2#T?`H`5weHRD9lj ztwG_~v%=eUKcy2=-RS*p7}2_w!p~5=9ho>wO$I*aAP((25&xrNeuLbnA3?O9vk`&i z3G&C@?``MP=e2h?`7EV{$GwB`3CjG1%~?oBHqiM#78x5N*p1 zh(_2KlJ7(!i%z7pIq+KK`TQL6tYwi2b{8UaUV@l;3bBw$eGVe9T#rP-EJU8myAc!J z>69OQmLe1S0ZNapuSTA=EtD4|HzUIH2%-V;IS;w#x03g(Dx?>==T?+y_Y;T!ypQo? z#OsiAvySm${e`UYzDtw$Yw1PCiANBV=?=!<1tF_Taegzwhf}nh* zAe&ZX#w^-r<m31rMF9BT?GzL(Hu%{)50H1}yAH{)`zJ)rzPsAaH8x4Bms7{S&XK8K zGh)r71%(zv5z2yGT9HjzC`+!Fb``D*i7toP%QMVBCWV_*?0787?kA!ohb&_4p71h} z*erv=V5kAVN`1oJjYW>6>Lsh%%KA)dEFyY@s5^k&eqM3n&Wem6661w+==V%!1EOXx z)Q0pU`92m0Y~x=Lb?j~=G1V^-ZOu`LYPnQ4SCH%DOXCX=&-q?N=s6mZe6KJ4(>xXq zIn~BscolO;|4uHMCgVoQ=B%foKJ>tR|Y3|7)xKeQ%zKMxhbaqV`U*cczt%&W)jSX;diA!3RNE zpdGS&9AYEaAM@F@FHV1762~#abS)?aV*@swb8^gCohFwSUzJ%)GxRLV;^x#rvyX2c z%B56(Hq;PFxI_|~!5tyi{JDeC{Wghir=I4bmLN#XZ==u(qFIP!G?uH`-Di`ID7uGT zqG?UY(SX92+oi7>jlwE(AuJ84h$0nHSV0cVveC(5+_527W;-)@wJOD=klYkX46nG9iya}ZB!ayBGmsxJM} zh*l+*(d_H88EjXi!-~h2hRH+}9V42qQI|y0C6>|H-s0W0U^Hf-6-2U{;@d+5xsYP< z&K!LMF2ikV-0>WOvTz1>6PmS<*y=MuYjie6deg(?c0PfMwPVFQDl|}M3U8`HO-C_G zf#Zm9paIK5*+G3di`%ks(*wAv0eVh*2eJ95ptC752iB7t*@3bnxY;o}k9jGf_IV84 z_g%D;L0Mtk>=s)a!lsR`Q|GH&UBv+8UCE(^{7Pb3Id*J6jb|VK6R!D}x3Dh>*$S?e8c4(- z5(d|mZT)%DQV{ln-9}R|G$P}c1{TkS2i7L|_&1Lwow1qUKXyxU#>4jZETNDyA)%po-`T89GHK(w3fC3ku6W=6=h0}6o}Lt$jLpzc zgs!f1O~_C$xW&4~VcN%BR&32Nk`U|qM7p4r2tbjnX0Y92^Sm${=i7`XL>P)>H6aJGAw@0( zt`cpD@+Nbw+47;3rPl}!)hrxEMwBVvFoC7-u&00j~#s5ZV_F{AD5{T~s)Ziq}CK<4Mr&=pf{>U|9zzZLOXBJ`2yIlS4(~ zSaB&|rZXwD>tMw@Yns%R6(TpbhurXX=05uy%s%f8xLHqV)_EC9S)j8nT5GJR?FrS0 zBRh~C8YJA=MQ(T>yRLgT!|VPCu8W?fx61Wdc^P`)xmX*o z#@cj)?9lQ81+@#>MYqp~a2wP?yW^@5?ap3oSNvfua_BOF#J-tk%?BV~CtNvn?>2`tZ7*HsZhdW^Wc&l9fHq=c3@;#9h* z+J-ZnFLP*OqAwuXU5Ak9owqYS1o{7v5W^r`g(QLl31|BcB#G0_yiEX=qg$boJqoWbBS(_JK_9!cs5Au)O=d*2l2jQ@DNM9^VG(b;2*+nW9 zA{KM7EKMX*yII7tG|6NLrJ%omjBwbYt4myphKHkAR$g1t-kzbiCq++BivIplQ1Gi? z9nIz~o%GKh%}>@9k5x1*?R_G!gcB~wNeV1J+J#7)OC+Y*voXTvd*kfi8YY@>3CC*F zx+n#iq(wHR=$e-$-sRxtL~zL_E$oP9!7(XNu;Z~P+65=87~B!Y^)xV{h)Xy=G3Q`k zU>WGJ_}eKl_IFxzjJhn`m1Dsk2Ry+g;qG5W{VXs3*i!?DP1hD(_0eXhIRr!rAwy>EG`#RH$)L3Y;9yz%D{_ zmeKXRcVZc z*Jbq9|0BC=19tb^>Vk`sNiKU}1E86A@we$Y?WJS}M$y@%XC_nQ&$i!Yna{QB66)y1 z3R{dk{x=5h`wp2skD$T{&@S1bEm+YmF)fwqpPNMuZ-H1Z&VqArSH2i$)$`EpU=3!m zAN?6>^9`Uv(uZ(6L^`q8{R(nPbYd=fX{vTyWz(D8%+AP>{JHl(n4MYA^5kteDqK=< zaj`+clGJ^)IeST2?KmnzR>cDeFd7SmL%XvBn+y*m-pD@_Zzt~VA)-f0?z2$yqr6WF znT*f^lFQ*&lWAa@a}$!#syJ!U50K26pGI=7>|uO1$TO%dMSB9#uDlfySbl@}rYOWj z^cWHvHjFs>7LR!@l8>TXu7ZOo<+5{l0V{hR<8QBg5p&y9JiZ^ob(j=O;cHyx&xYYq z`1UWCanqgiiN_pf_oPrtmla+tOOsBA7#N6R+b)+~`Z%Yax}T8|h(sV$COFvg#;Wbx zWBm1&rR?7y$8i*6V_`ZwQ-OsgU%N9j9Obf09^<5w_K{9QG%ClH&5jq|!eOv&a2!ad zA(4Os2SWVjx2ssczL#j!p|dmP2|9=N!53H(Jq{;6e~4(? zCN$d~jxn$;OrocDVX}L~WlxXIUr&jV4MY2A-aKTvP-v0L*${F>JCcehvLVF@k7qb$ zeTGa}F%~Otez9EXf7sPTGcX!gtXmXf!@@9QadlAR(g^F9rC}r?$8-MODdz8S7;3l4 zs2uL_K9n6IG-o-T7haClISc2&PAJxBXjiluu?|m|(db-SJ`Y84M+eDldWiIf`*HSf zlN-bi$u>?774N7lX)6V;LvH^L;zyrD$3?FfVI`ZE-&q!*(b)_X>9$lj>Y1`UjX?pc8f$EAN(2sO4FlDi?4z+L?kawokDcg||CKn;&V zb`+wW=tN8cqy1B1fo_A)eZMFC=QlxS5Z%5AqFs4s;vikdBCJ!)&a7iw^ca3Q@B3sU zM}l(zv>z2-YTUCxMd?UC$oU7pOlNL4QFoLODMswsSh`U2qtIBy^omV924XCm?LBSzX7A7(es<~Gc=;*UvvynK z1eS68b)mOQ%u6@j+09?>n9sT=JLzoC5|8C@U4><7ayg6P;RsqoE@#uxkzv)UeVlUg zP8KgtGBl)c9OVfnr5|X2V(#qJjEz|&lVZBL_PUjx zTgU0A?PGWZayfO-)Kk2Ft<|{k-F2a})5Ue+;fH&9=;3}gZ0NzVG+kZeg%_nDHDZzI zaX9`t!$cA;$-(*xEaUqMp@=5h<}$K3#P0PGcCC$(8n%daItO#VxH&~?#L6F+hPEDu zIjhsmU7aT0QWEC&Vd z=#VEMRBNz6!=PPMIEvlggPR;Cw|_h2G7yTOLJ>yq{5_fV_hI+?b^D4lZdmBd7|y^h z;>TS;$3?G4XOf5ZrC6(R5KZv|V|UNS9UWxws;`jSy9K*vUS4p~8aFdcq<1AM6h*r( z?JF;)`=r+pYD1Ji$(dBn^rR*@WV-^V*NH|IRNF?pX=BB-Xx1ah5#` z=jh8JJ{xEGd2-(m4}+UIv_DpX2Fn|)bbBY(?seD?e;;f8?@&V<(d`Q%+T$I6LEr-x zHd!L>7%mnTE^W?!QdT=_=|xuhv#V`5 zL-`%zJ5ubY@@b?F#l{l9@hiUm2k`l#@4kUV_e2rL-eVARQU=kcyxjZ$4T#^$4-kQ7 z1rpWuQzSd$YY?;2El8x%3kXotXgJeGXC%!{FMl5M+V`?QSSq84*N??iuPWPv@SKFHec&j97TIumJ?6h$A}t*Y}_lba$t)ESFr?Lg(Ow=MU30 zH_OOAyPCjq9%824ReYXHuoOug`M-yJqamDdiNrNy12*gbkzmK8G2&gKqIO-y{G(Gu zVlLUVMJS?~wKPNftelvKl4?SZA=-s_w@YTk;?cjfvwuq%E3ApNyD|wYh-NkMln5l2 z3yuwYdTln(4YO&UExskG+64#S=Vc^e(LSbGx;@9DU0HeuTyi1NyhO4ZZ7J?NHbN#W z+L^%)i%3??LuF*E_aa%Li;E)`V<9=Q-iP?WRo+-bI-(d3rJ1wW;h8-zA+h2#aylz! zmt1yo6Sb#Zu_AF1HnfY1wxiP{3|;#z(ofz`sAste?{2zN!<^0U`5a{CVm_s_vuaVfd8KZe^s z8#M-MbQo&U_GlNd(H%Vy0kvxj_L?7JKlT%>!S(3&Md)}hxDGBBQJo~LlMLANuyC+- zmd)`~xxfAS48_g>cMNhn#RL@?4JrmI4E8J%nYEm8;2Ru~{2Ot1n1RrI!i4;H1Vd`AqZ}kvbKnf}SqaF>-AchdZ;rC^}??oJA zpI`9VD-Z!Cs1<)U;#hk%lJ@uj`D}wvMWUB3_4*R0%1xn^%g%vioW1lGu6og{7|B8= znEA8~Nx9q;u-`io0ViAPORXUhhgsclHR`iTlZ9AQTco zXLwklb?pK}A+8H;ZJKyovwnS?d+!yW7~9s^w#&dklw>lD>ni5V8RhuncX7h;d+6?V z7#Of{C%J(01*onrO*##aKiI#}(!U|EdZ^aE0l{2jYzE?73s&|W|hU3Dt)t!0Px(a?75FM>(`|bve?A#=5M4qg|Is z&n(iL{=uf(ze(=+e}&~|qS84SJ#eUbt`@YYDRrU?VhXi$3-;qbBlOr$Q2W>7bSxnf z4%6xEnXNMXCOB9YeO|FLim{PUqUe)E?F zoO$+ER<9gm-#+E}>ZzK29V#Ivc1>re_*(4S7xIJ&mmNDg7#N6QSuQJ946txvmZ2dS z8}lQD>eq)*NYmY|aU8h+{vK|>eIdJdCphEM{dCXGk{Y&x2n4S{v~EH9GKV^pkMElc zb_C*`4!a(Yl1W<3KPE+b*g7b%)ElkA4oehME~VJ|P@LiIHX#>oT9n|4`C;N2Eddv< zJ}5xc(=4MjWW$h*iY8_LZih%#vuS>akfX(~B^W_4v!2Vhey%wP*g$ONsD{U0PAsK4p2`d2(*rP+98K_RST&)2M z-PVO}v#_>rC3OE+u{Zpl&g6RTnD>7E+53KQ_JQ`+g|6>aP_Jts+8;u5L51i|-b&0J zB+5z&D!O5KH)!oEe@Tr3+A zpein8>w^d{nn+v|bzSy5A-=x7pVXK|%nmL!Oa`UFu^<(bTrY{F2rM-SNDUEMM9Z?9 zGkY)Q%-(0SKf6nkr%eUgMMV=>kvOR}x1yCIw)%8bB!M%uhe@j-EAL#Qj1pbwkVDAr zp*?gaTIbNgYx~w+Xo*^yC(}0jbBZXQ<5ok^a`Uxyp(8e3`yOZAqxbOFeJ4oXb3MwW zG%7*+fCcs}uwz71+vpn`#IXXKo@y3aCYY(GEH6hU;JI~fce?TMqW4?LPYV9T@M*^9 zP;m)v7OFe0wjdkhjVJzy-ga2Gr?wF1MxYc#EZDqXu_LJntH9djGY|o)oJUR@5=r$y zx&6AXBAw2kfZ|A`D&uezG0%l5FNAg=0_%oSUrJsr#ooP&_PEQ5N9^XVtuZogn2^=n zV(UslW~|VWvg%Jdkxb4G~-VkJQZhOP$-DZj1p}AbD)wf|ODdx)1D{X2FKHD6%yQ3|rIEZ8bKxsT_6sUDei9q{Z)bgdGz5sg|k z5$j_dT1I{xNCDog?K$>eR(4caT@+Ljkmn;+&Z}`D(`@|8 z=?v|mZemt~j2pP%_#1%t2iWc;N@w2A<7IFaUzUQ;s`DPiA-@tkkTJ8e23l+BgEK&0 z_1B0%^U7EXQZ6_eLexcmjnWD2=1lbS^3x^jtLhn#@QP7LLx5)mg0ILweBj(d_dU@L7_m zC8ff_Hg6Cb8LtBR0yg{H1||4&IR!<_8fEbMHd2e{a3zBHZTtwy-Liw~A$3h-@5pSP zw(K@8Kj|vA4>r&Q-C9hS0poDOToXev=AJN&qmf=ZA3(x)4`*J5_)Y|MP;Cl{=qPLV zF6M#li|CC{iLh)i7z_qO%{1Dz_+`Mu4cGN2yLdhgTc^ZOoh;L z010>8J_Y+~Rcxx{BxyGB&={n<`ObZ>Ln*M0w#8sD7z{1OR838LkR)r(37&5p_W_qt zJ&D(PV6gGsnK-Vt>F(aduh(A8U!FXUC7njwVlWsChSp*#*V7x30)I1wE0JVXzXe{2 z1jZkOB$2xgSXZ#^uco?l6CoZNLnpiW>BBF@3Iz_^GZ+j8gJDXTY9qkkkSvJJ(71dG zxVet)Eh>7SL#imh3rSkG8c9|EI^ZXD+UFc3UQ<-{m$!6*s^B*Jy+h*VgNZ4~Jo{AJnTvG6vLL!cS0(_xp`_mAi z@4tXA5xlB$U^*hhq(TV^(V5_L=qVc z27{qRXy!V44R8cy3ZzW~CR-l6I6d`MNMS|44#dZRdk{xopUsG1v(bD1p-J|kB=OJ~ zWZU`f1Fx0>o<`eZFc=Jm7NFVF(I&+A_rwE{)VG`XN#s8l)V;YYMh`9}-3l;*>jx_{P)?$=lM!ckVZN zTMPz+!O$AC(p2^n5h?yxG+7Ea?`=;i+}tu`aPb;x)5AbxvN%vOZ83o_{ z4axcP5+DhD6A8WkfcO3PfxjSGh=b4t`~vZxImATQ79L}0U>Vmu@ob*9>~RTHpW;VI zDcPs?b{%jq_zn_fRqi~@M$T=c7z93zRQOJn*=AnwKFHC#DAe>Udba(@@T( zvDf5Y;CsMcO5a8{&`$YCzm`RzaC8o(EYNPypZyg%=R3-LA4VqCU6b!&S+4Q^mfJ@M za_k3k zfSZ86CikTrPkMhXWU$MY-xLs2kb?}^!@yn0&02~yGN6D66~(+5IY+PZ-hU9uLGu_Q z5M`=$zJNa9S%@a+l;SU4Z9#N^zil~-fzhuJ3qg8{7cw~)I>VX+wj!s&4)#QRwZYx0 z#t?8tJsQ$L%!Xa5Hioh>B3AQPk`rJH67AMZ?qK@)&IKZ7C)kzR!nWi(R<)nZKz0wR z`qXiq_i84;rcQ1FT4%8BPGYguXq}~5df}Xgt`O|c!I%T#%9r66-m95>v2HCXh3&Y+ zaygs^YFt{$JXFYo$V7U5vpZ4(7kCRInL3D;q7p9!euoG*s}RXG3UpU!|LMre^o%mw zyb}1Z_y6mF{|CGm5r#&~{HBx{Xaiz)IvH{NJ%qlt-Q2PLWd8X0IrO)cX}N(o8rnk8 z8`b0jFCu3SwsOh3uyw2#^t9Eq7#fI$jiYlsI&>F~&S9%oT#Ggmh3k$GjjSLXT7av| ztp^*A14I<`gkR4-oraua zjiw{q&DP{PHjS;JBh-WD@R9Jf&SF_@M58Nkb(#j>$`u<|K-SZ?wArG0IV@0$kmHib zE6g!gL*tMI5{KSo8RQCz!puD-#P(S>0 zT?1p*c9tP^~}rHPb=HtzoDx z4dyh&E$9ow))a@$a-cnvA*5ZhR!!?A2e}4q1iJ>K(?Mtf(Gbi*CfoNkpnZ)DC~+os zi!CVeSv|E_3E(!wWb`&fGZI6zB(Eyk_EbcJ;%j)m23!K1@4bHr(a7vV>KIi-q3Lhi z&7ao%3m2sN_{ce*;OWaZl1jtQQSmvk6lo-y$)dV2qL2r_rde2P(K=WKPPsE3Tfs;+ zO45lCRy7MPzefb>AWLqG@(#m>`th$wmg}I`WGraI8cp18XMbiV`!hS47h6uwIUIx* zjY1I$%_8rrU(@LDG(^K3WZcrof~)F=u7;>OOvWn(XieC4acegVZAO9;g2Y)^Kz6za zEk5r>iXQ$Bh}5y&?;=`)%c^bIMD9i$a9<6~M?B9YNujRr82b&IfSP95z?L8<-~`uz;MVnhGel zvQJAnu0cY85G%Nh4;GuOZoDkDFwB7f!lIQ^O|2cje?N+dUP@ z_i_Mn(7ha~mGmHzefSMbAQz6SZDOG@=Ju{*DBZy|550<;HawFTAM-O-c5k3PGQvZ9 zj^o<(&tO(!KW{nlo4ow!>si?c+lNH+a=7@T7z_r3q5e!)p~dG>B+Kl-ASRwzbGy@U z`VnEI8ofv~(1*!ukXDjUoE4vF2eg;zts^o*cmIQoWZU@hy>9_G0?Gk9O(-(N?vaJO z{ZBvQOZVKvyH5EcZ#n7Dgu<}p0HkuJEP%maFc@lQrc50_MJDQRH@hPZCQk6;h^HY@ zS9^h-h_lm~-gmxJ^Noo42qY@0CXJKhhKSo~=5%jhPVZy%_dLOz&dv122D;{UY>Cb8 zd7KS(KS z?%a4GFaPl^{BiyHEUs%!YJ;F}F82WciTJeq z6p1M5050~vKM~2=>+^Rc^5lNRZ|EANbil8X`YnG)$_9KG(cs*TM0B~pXT8s^!mBak zY71Lw=5%j>*Z_m6o~fv*WiS{Fh8f6AR@84pqHNxSIP6{;@OK{qPNGCDo@vad$tR<$ zLDpOw_a# zvmG&wEJ2)gOI4Y@5%>g>*>*9K0P1igg5;6dh14@DSNo`tzabT?p9<`0T-OW+gTZjP zb2tbsKAV9zBI$zP46G~o?kFT{>@p->{^88Eh%TgBqP_bOjmy)hPzJzYFc=JmdT}@j zEj}6GJ4nK{Q-SXx{x8QOPNhw#Wjw9;Gm;nQB&4)}!C){L3{%44D6|xE50YqY4&to( zKy$m(vgDA;(`Nw}QDYeZgTY`h80x{{F0}aUMj~HM1eO9H0RGv;{_^~0-gsv7b!Z}-Mns18FvA{Ldqj-X>wl-27|$1IEWEi zDzg{3(tCkK)4T=|V2)^3r|L`&(JK8ENy<0S)ZQ2j27|#+1|zi8#+}{^B>nxF-s>c! z2GW8i^{W>4AwtSO5OdF+z)(|rWH1;E215Xh&@yrMAempUD)?*}5?Qkv(ZsAqd}QV` z_2+s3$vd+icpP{L@ljcaN$+Mb7z~DKh!I-q%SP{2Odpc8ZUK^Mb}mw}c^2X)(+RXA z1rcM&b%_9e!g~ivt)BzNyw@lqnCwNgC%cg>!2W9s65eev7z_r(jNtzR#re)oaRe>Z P00000NkvXXu0mjfujs2` literal 0 HcmV?d00001 From c614d5b33104b7c48fc32aaf0a60ffaa65c096ac Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Fri, 29 Jan 2021 09:54:57 +0100 Subject: [PATCH 065/456] fis project name --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fa8a62a58..6464c0562 100644 --- a/README.md +++ b/README.md @@ -222,9 +222,9 @@ The development of the 52°North Faroe implementation was supported by several o | Project/Logo | Description | | :-------------: | :------------- | -| Cos4Cloud - Co-designed citizen observatories for the EOS-Cloud | The development of this version of the 52°North SOS was supported by the European Union’s Horizon 2020 research project Cos4Cloud (co-funded by the European Commission under the grant agreement n°863463) | -| BMBFTaMIS - Das Talsperren-Mess-Informations-System | The development of this version of the 52°North SOS was supported by the German Federal Ministry of Education and Research research project TaMIS (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0854[A-D]) | -| JERICO-S3 - Science - Services- Sustainability | The development of this version of the 52°North SOS was supported by the European Union’s Horizon 2020 research project JERICO-S3 (co-funded by the European Commission under the grant agreement n°871153) | +| Cos4Cloud - Co-designed citizen observatories for the EOS-Cloud | The development of this version of the 52°North Arctic Sea was supported by the European Union’s Horizon 2020 research project Cos4Cloud (co-funded by the European Commission under the grant agreement n°863463) | +| BMBFTaMIS - Das Talsperren-Mess-Informations-System | The development of this version of the 52°North Arctic Sea was supported by the German Federal Ministry of Education and Research research project TaMIS (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0854[A-D]) | +| JERICO-S3 - Science - Services- Sustainability | The development of this version of the 52°North Arctic Sea was supported by the European Union’s Horizon 2020 research project JERICO-S3 (co-funded by the European Commission under the grant agreement n°871153) | | [![NeXOS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](http://www.nexosproject.eu/) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [NeXOS](http://www.nexosproject.eu/) (co-funded by the European Commission under the grant agreement n°614102) | | [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-geotechnologien-logo.png)](https://www.bmbf.de/)[![COLABIS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png)](https://colabis.de/) | The development of this version 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [COLABIS](https://colabis.de/) (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0852A) | | [![SeaDataCloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/seadatacloud-logo.png)](https://www.seadatanet.org/About-us/SeaDataCloud/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png) research project [SeaDataCloud](https://www.seadatanet.org/About-us/SeaDataCloud/) (co-funded by the European Commission under the grant agreement n°730960) | From ea9e731d3bb251f44e967f70333e330d89ad021d Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Fri, 29 Jan 2021 10:28:24 +0100 Subject: [PATCH 066/456] update credits --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6464c0562..d2ed890dc 100644 --- a/README.md +++ b/README.md @@ -230,7 +230,7 @@ The development of the 52°North Faroe implementation was supported by several o | [![SeaDataCloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/seadatacloud-logo.png)](https://www.seadatanet.org/About-us/SeaDataCloud/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png) research project [SeaDataCloud](https://www.seadatanet.org/About-us/SeaDataCloud/) (co-funded by the European Commission under the grant agreement n°730960) | | [![ODIP II](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/odip-ii-logo.png)](http://www.odip.org/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png) research project [ODIP II](http://www.odip.org/) (co-funded by the European Commission under the grant agreement n°654310) | | [![ConnectinGEO](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/connectingeo-logo.png)](http://www.connectingeo.net/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png) research project [ConnectinGEO](http://www.connectingeo.net/) (co-funded by the European Commission under the grant agreement n°641538) | -| [![GeoViQua](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/geoviqua-logo.png)](http://www.geoviqua.org/) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [GeoViQua](http://www.geoviqua.org/) (co-funded by the European Commission under the grant agreement n°265178) | +| [![GeoViQua](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/geoviqua-logo.png)](https://cordis.europa.eu/project/id/265178) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [GeoViQua](https://cordis.europa.eu/project/id/265178) (co-funded by the European Commission under the grant agreement n°265178) | | [![BMVI](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmvi-logo.png)](https://www.bmvi.de/)[![mFund](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/mfund-logo.jpg)](https://www.bmvi.de/DE/Themen/Digitales/mFund/Ueberblick/ueberblick.html)[![WaCoDis](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/wacodis-logo.png)](http://wacodis.fbg-hsbo.de/) | The development of this version of 52°North Arctic Sea was supported by the [German Federal Ministry of of Transport and Digital Infrastructure](https://www.bmvi.de/) research project [WaCoDis](http://wacodis.fbg-hsbo.de/) (co-funded by the German Federal Ministry of Transport and Digital Infrastructure, programme mFund) | | [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-logo.png)](https://www.bmbf.de/)[![fona](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/fona-logo.png)](https://www.fona.de/)[![MuDak-WRM](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/mudak-wrm-logo.png)](https://colabis.de/) | The development of this version of 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [MuDak-WRM](http://www.mudak-wrm.kit.edu/) (co-funded by the German Federal Ministry of Education and Research, programme [fona](https://www.fona.de/)) | | [![BRIDGES](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bridges-logo.jpg)](http://www.bridges-h2020.eu/)| The development of this version of the 52°North Arctic Sea was supported by the [Horizon 2020](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png) research project [BRIDGES](http://www.bridges-h2020.eu/) (co-funded by the European Commission under the grant agreement n°635359) From 4c0b70f13d28d67e5dc68bbdd10a627ce3c36325 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Fri, 29 Jan 2021 10:36:22 +0100 Subject: [PATCH 067/456] update credits --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d2ed890dc..98267a309 100644 --- a/README.md +++ b/README.md @@ -222,15 +222,15 @@ The development of the 52°North Faroe implementation was supported by several o | Project/Logo | Description | | :-------------: | :------------- | -| Cos4Cloud - Co-designed citizen observatories for the EOS-Cloud | The development of this version of the 52°North Arctic Sea was supported by the European Union’s Horizon 2020 research project Cos4Cloud (co-funded by the European Commission under the grant agreement n°863463) | -| BMBFTaMIS - Das Talsperren-Mess-Informations-System | The development of this version of the 52°North Arctic Sea was supported by the German Federal Ministry of Education and Research research project TaMIS (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0854[A-D]) | -| JERICO-S3 - Science - Services- Sustainability | The development of this version of the 52°North Arctic Sea was supported by the European Union’s Horizon 2020 research project JERICO-S3 (co-funded by the European Commission under the grant agreement n°871153) | +| [![Cos4Cloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](https://cos4cloud-eosc.eu/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [Cos4Cloud](https://cos4cloud-eosc.eu/) (co-funded by the European Commission under the grant agreement n°863463) | +| [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-geotechnologien-logo.png)](https://www.bmbf.de/)[![TaMIS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/TaMIS_Logo_small.png)](http://tamis.kn.e-technik.tu-dortmund.de/) | The development of this version 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [TaMIS](https://colabis.de/) (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0854) | +| [![JERICO-S3](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](https://www.jerico-ri.eu) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [JERICO-S3](https://www.jerico-ri.eu) (co-funded by the European Commission under the grant agreement n°871153) | | [![NeXOS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](http://www.nexosproject.eu/) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [NeXOS](http://www.nexosproject.eu/) (co-funded by the European Commission under the grant agreement n°614102) | | [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-geotechnologien-logo.png)](https://www.bmbf.de/)[![COLABIS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png)](https://colabis.de/) | The development of this version 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [COLABIS](https://colabis.de/) (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0852A) | -| [![SeaDataCloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/seadatacloud-logo.png)](https://www.seadatanet.org/About-us/SeaDataCloud/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png) research project [SeaDataCloud](https://www.seadatanet.org/About-us/SeaDataCloud/) (co-funded by the European Commission under the grant agreement n°730960) | -| [![ODIP II](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/odip-ii-logo.png)](http://www.odip.org/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png) research project [ODIP II](http://www.odip.org/) (co-funded by the European Commission under the grant agreement n°654310) | -| [![ConnectinGEO](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/connectingeo-logo.png)](http://www.connectingeo.net/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png) research project [ConnectinGEO](http://www.connectingeo.net/) (co-funded by the European Commission under the grant agreement n°641538) | +| [![SeaDataCloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/seadatacloud-logo.png)](https://www.seadatanet.org/About-us/SeaDataCloud/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [SeaDataCloud](https://www.seadatanet.org/About-us/SeaDataCloud/) (co-funded by the European Commission under the grant agreement n°730960) | +| [![ODIP II](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/odip-ii-logo.png)](http://www.odip.org/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [ODIP II](http://www.odip.org/) (co-funded by the European Commission under the grant agreement n°654310) | +| [![ConnectinGEO](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/connectingeo-logo.png)](http://www.connectingeo.net/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [ConnectinGEO](http://www.connectingeo.net/) (co-funded by the European Commission under the grant agreement n°641538) | | [![GeoViQua](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/geoviqua-logo.png)](https://cordis.europa.eu/project/id/265178) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [GeoViQua](https://cordis.europa.eu/project/id/265178) (co-funded by the European Commission under the grant agreement n°265178) | | [![BMVI](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmvi-logo.png)](https://www.bmvi.de/)[![mFund](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/mfund-logo.jpg)](https://www.bmvi.de/DE/Themen/Digitales/mFund/Ueberblick/ueberblick.html)[![WaCoDis](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/wacodis-logo.png)](http://wacodis.fbg-hsbo.de/) | The development of this version of 52°North Arctic Sea was supported by the [German Federal Ministry of of Transport and Digital Infrastructure](https://www.bmvi.de/) research project [WaCoDis](http://wacodis.fbg-hsbo.de/) (co-funded by the German Federal Ministry of Transport and Digital Infrastructure, programme mFund) | | [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-logo.png)](https://www.bmbf.de/)[![fona](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/fona-logo.png)](https://www.fona.de/)[![MuDak-WRM](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/mudak-wrm-logo.png)](https://colabis.de/) | The development of this version of 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [MuDak-WRM](http://www.mudak-wrm.kit.edu/) (co-funded by the German Federal Ministry of Education and Research, programme [fona](https://www.fona.de/)) | -| [![BRIDGES](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bridges-logo.jpg)](http://www.bridges-h2020.eu/)| The development of this version of the 52°North Arctic Sea was supported by the [Horizon 2020](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png) research project [BRIDGES](http://www.bridges-h2020.eu/) (co-funded by the European Commission under the grant agreement n°635359) +| [![BRIDGES](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bridges-logo.jpg)](http://www.bridges-h2020.eu/)| The development of this version of the 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [BRIDGES](http://www.bridges-h2020.eu/) (co-funded by the European Commission under the grant agreement n°635359) From 8a59a9a9b25976f358a498591be847660f15e5d2 Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Fri, 29 Jan 2021 10:39:19 +0100 Subject: [PATCH 068/456] update versions in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 98267a309..a5973fad2 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ All projects are available on Maven Central. ```xml - 8.0.3 + 8.1.0 @@ -191,7 +191,7 @@ Development versions can be optained from the Sonatype OSS snapshot repository: - 7.6.0-SNAPSHOT + 8.2.0-SNAPSHOT ``` From 4a3c5e12e8f0f106637c211df95cdbce86353667 Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Fri, 29 Jan 2021 13:58:10 +0100 Subject: [PATCH 069/456] update credits --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a5973fad2..2b37b2d1c 100644 --- a/README.md +++ b/README.md @@ -232,5 +232,5 @@ The development of the 52°North Faroe implementation was supported by several o | [![ConnectinGEO](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/connectingeo-logo.png)](http://www.connectingeo.net/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [ConnectinGEO](http://www.connectingeo.net/) (co-funded by the European Commission under the grant agreement n°641538) | | [![GeoViQua](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/geoviqua-logo.png)](https://cordis.europa.eu/project/id/265178) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [GeoViQua](https://cordis.europa.eu/project/id/265178) (co-funded by the European Commission under the grant agreement n°265178) | | [![BMVI](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmvi-logo.png)](https://www.bmvi.de/)[![mFund](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/mfund-logo.jpg)](https://www.bmvi.de/DE/Themen/Digitales/mFund/Ueberblick/ueberblick.html)[![WaCoDis](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/wacodis-logo.png)](http://wacodis.fbg-hsbo.de/) | The development of this version of 52°North Arctic Sea was supported by the [German Federal Ministry of of Transport and Digital Infrastructure](https://www.bmvi.de/) research project [WaCoDis](http://wacodis.fbg-hsbo.de/) (co-funded by the German Federal Ministry of Transport and Digital Infrastructure, programme mFund) | -| [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-logo.png)](https://www.bmbf.de/)[![fona](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/fona-logo.png)](https://www.fona.de/)[![MuDak-WRM](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/mudak-wrm-logo.png)](https://colabis.de/) | The development of this version of 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [MuDak-WRM](http://www.mudak-wrm.kit.edu/) (co-funded by the German Federal Ministry of Education and Research, programme [fona](https://www.fona.de/)) | +| [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-logo.png)](https://www.bmbf.de/)[![fona](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/fona-logo.png)](https://www.fona.de/)[![MuDak-WRM](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/mudak-wrm-logo.png)](http://www.mudak-wrm.kit.edu/) | The development of this version of 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [MuDak-WRM](http://www.mudak-wrm.kit.edu/) (co-funded by the German Federal Ministry of Education and Research, programme [fona](https://www.fona.de/)) | | [![BRIDGES](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bridges-logo.jpg)](http://www.bridges-h2020.eu/)| The development of this version of the 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [BRIDGES](http://www.bridges-h2020.eu/) (co-funded by the European Commission under the grant agreement n°635359) From 7da5cd488c8ba699cbc206c74877a9347425fa93 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 2 Feb 2021 04:29:55 +0000 Subject: [PATCH 070/456] Bump lucene-core from 8.7.0 to 8.8.0 Bumps lucene-core from 8.7.0 to 8.8.0. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ffc87f4d..7fa757b8c 100644 --- a/pom.xml +++ b/pom.xml @@ -578,7 +578,7 @@ org.apache.lucene lucene-core - 8.7.0 + 8.8.0 com.maxmind.db From cfdfd1a4117c7798b4d11e92abbec4a32b17a7f1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 04:31:45 +0000 Subject: [PATCH 071/456] Bump version.junit from 5.7.0 to 5.7.1 Bumps `version.junit` from 5.7.0 to 5.7.1. Updates `junit-jupiter-api` from 5.7.0 to 5.7.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.0...r5.7.1) Updates `junit-jupiter-engine` from 5.7.0 to 5.7.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.0...r5.7.1) Updates `junit-jupiter-params` from 5.7.0 to 5.7.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.0...r5.7.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2657bac22..5b526bb33 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ 1.3.2 3.17.0 2.12.1 - 5.7.0 + 5.7.1 3.7.7 2.2 4.4.14 From 4603b81cb14b316ee441fca2e131167b1bae0204 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 04:32:57 +0000 Subject: [PATCH 072/456] Bump geolatte-geom from 1.6.0 to 1.6.1 Bumps [geolatte-geom](https://github.com/geolatte/geolatte-geom) from 1.6.0 to 1.6.1. - [Release notes](https://github.com/geolatte/geolatte-geom/releases) - [Commits](https://github.com/geolatte/geolatte-geom/compare/v1.6.0...v1.6.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2657bac22..d1aac15d6 100644 --- a/pom.xml +++ b/pom.xml @@ -321,7 +321,7 @@ org.geolatte geolatte-geom - 1.6.0 + 1.6.1 org.locationtech.jts From b62635f12a35ca37031a1cf302a5341f18329df0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 04:33:49 +0000 Subject: [PATCH 073/456] Bump spotbugs-annotations from 4.2.0 to 4.2.1 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.2.0...4.2.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2657bac22..16d094aeb 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 2.7.0 4.8.0 3.0.2 - 4.2.0 + 4.2.1 1.3.2 3.17.0 2.12.1 From cad8fa36a9bc7ab71ecb801746d99281cd61d587 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Fri, 5 Feb 2021 09:16:05 +0100 Subject: [PATCH 074/456] some fixes for usage of exificient and jaxb dependencies --- NOTICE | 6 +++--- pom.xml | 30 ++++++++++++++++++++++++++++++ svalbard/exi/pom.xml | 29 +++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index c36b0f874..89f8ccc0e 100644 --- a/NOTICE +++ b/NOTICE @@ -61,8 +61,6 @@ This project includes: Apache Thrift under The Apache Software License, Version 2.0 c3p0 under GNU Lesser General Public License, Version 2.1 or Eclipse Public License, Version 1.0 Checker Qual under The MIT License - com.sun.xml.bind:jaxb-core under CDDL 1.1 or GPL2 w/ CPE - com.sun.xml.bind:jaxb-impl under CDDL 1.1 or GPL2 w/ CPE Commons Lang under The Apache Software License, Version 2.0 compiler under Apache License 2.0 dexx under MIT License @@ -107,12 +105,12 @@ This project includes: Jackson-core under The Apache Software License, Version 2.0 jackson-databind under The Apache Software License, Version 2.0 Jackson-dataformat-YAML under The Apache Software License, Version 2.0 - Java Architecture for XML Binding under CDDL 1.1 or GPL2 w/ CPE Java archiving library under Apache 2 JavaBeans(TM) Activation Framework under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 JavaMail API jar under CDDL or GPLv2+CE javax.annotation API under CDDL + GPLv2 with classpath exception javax.inject under The Apache Software License, Version 2.0 + jaxb-api under CDDL 1.1 or GPL2 w/ CPE JCL 1.2 implemented over SLF4J under Apache License, Version 2.0 Joda-Time under Apache License, Version 2.0 JOpt Simple under The MIT License @@ -184,6 +182,8 @@ This project includes: OGC WaterML DR schema (spec. v2.0) under The Apache Software License, Version 2.0 OGC WaterML schema (spec. v2.0) under The Apache Software License, Version 2.0 OGC XML schemas under The Apache Software License, Version 2.0 + Old JAXB Core under CDDL+GPL License + Old JAXB Runtime under CDDL+GPL License org.locationtech.jts:jts-core under Eclipse Public License, Version 2.0 or Eclipse Distribution License - v 1.0 parent-join under The Apache Software License, Version 2.0 Portele Schape Change schema (spec. v3.0) under The Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index 2657bac22..96e0e876c 100644 --- a/pom.xml +++ b/pom.xml @@ -143,6 +143,7 @@ 1.7.30 3.1.0 1.0.4 + 2.3.0 2.7.0 4.8.0 3.0.2 @@ -542,6 +543,20 @@ com.siemens.ct.exi exificient ${version.exificient} + + + javax.xml.bind + jaxb-api + + + javax.xml.bind + jaxb-core + + + javax.xml.bind + jaxb-impl + + com.siemens.ct.exi @@ -553,6 +568,21 @@ exificient-core ${version.exificient} + + javax.xml.bind + jaxb-api + ${version.jaxb} + + + com.sun.xml.bind + jaxb-core + ${version.jaxb} + + + com.sun.xml.bind + jaxb-impl + ${version.jaxb} + diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 067bf38bd..50a89eb59 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -59,6 +59,35 @@ com.siemens.ct.exi exificient + + + javax.xml.bind + jaxb-api + + + javax.xml.bind + jaxb-core + + + javax.xml.bind + jaxb-impl + + + + + javax.xml.bind + jaxb-api + runtime + + + com.sun.xml.bind + jaxb-core + runtime + + + com.sun.xml.bind + jaxb-impl + runtime xml-apis From 71957e6f8edf98317b2ea625ba00d9e24f350846 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Feb 2021 04:30:25 +0000 Subject: [PATCH 075/456] Bump geolatte-geom from 1.6.1 to 1.7.0 Bumps [geolatte-geom](https://github.com/geolatte/geolatte-geom) from 1.6.1 to 1.7.0. - [Release notes](https://github.com/geolatte/geolatte-geom/releases) - [Commits](https://github.com/geolatte/geolatte-geom/compare/v1.6.1...v1.7.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 810795ec8..800cde4d0 100644 --- a/pom.xml +++ b/pom.xml @@ -322,7 +322,7 @@ org.geolatte geolatte-geom - 1.6.1 + 1.7.0 org.locationtech.jts From 06fdbec20e5f4492528b946655c3d8f5c24e4601 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Feb 2021 04:31:28 +0000 Subject: [PATCH 076/456] Bump joda-time from 2.10.9 to 2.10.10 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.9 to 2.10.10. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.9...v2.10.10) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 810795ec8..1edcaf6e8 100644 --- a/pom.xml +++ b/pom.xml @@ -312,7 +312,7 @@ joda-time joda-time - 2.10.9 + 2.10.10 org.locationtech.jts From 0ef717e642cf49925e7e452f8e16eff3ffe4ee8f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 17 Feb 2021 04:28:50 +0000 Subject: [PATCH 077/456] Bump version.spring from 5.3.3 to 5.3.4 Bumps `version.spring` from 5.3.3 to 5.3.4. Updates `spring-test` from 5.3.3 to 5.3.4 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.3...v5.3.4) Updates `spring-web` from 5.3.3 to 5.3.4 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.3...v5.3.4) Updates `spring-beans` from 5.3.3 to 5.3.4 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.3...v5.3.4) Updates `spring-core` from 5.3.3 to 5.3.4 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.3...v5.3.4) Updates `spring-context` from 5.3.3 to 5.3.4 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.3...v5.3.4) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4d60e9d9d..d9859d9ff 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.3.3 + 5.3.4 1.7.30 3.1.0 1.0.4 From 79995266fc29eaed496165ad7c28e62ba519400d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 18 Feb 2021 04:28:31 +0000 Subject: [PATCH 078/456] Bump version.elastic from 7.10.2 to 7.11.1 Bumps `version.elastic` from 7.10.2 to 7.11.1. Updates `elasticsearch` from 7.10.2 to 7.11.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.10.2...v7.11.1) Updates `elasticsearch-rest-client` from 7.10.2 to 7.11.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.10.2...v7.11.1) Updates `elasticsearch-rest-high-level-client` from 7.10.2 to 7.11.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.10.2...v7.11.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9859d9ff..cd93bee89 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 3.7.7 2.2 4.4.14 - 7.10.2 + 7.11.1 4.9.1 3.2.0 From 1e6b5e7417d2d6c77af7c383c7ef7337dd0cb98d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 23 Feb 2021 04:31:59 +0000 Subject: [PATCH 079/456] Bump lucene-core from 8.8.0 to 8.8.1 Bumps lucene-core from 8.8.0 to 8.8.1. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cd93bee89..c527b7540 100644 --- a/pom.xml +++ b/pom.xml @@ -608,7 +608,7 @@ org.apache.lucene lucene-core - 8.8.0 + 8.8.1 com.maxmind.db From bdffd6d04682c68350864d039aa890247f470fcc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 23 Feb 2021 04:33:22 +0000 Subject: [PATCH 080/456] Bump version.mockito from 3.7.7 to 3.8.0 Bumps `version.mockito` from 3.7.7 to 3.8.0. Updates `mockito-core` from 3.7.7 to 3.8.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.7.7...v3.8.0) Updates `mockito-junit-jupiter` from 3.7.7 to 3.8.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.7.7...v3.8.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cd93bee89..f0f0e58d3 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 3.17.0 2.12.1 5.7.1 - 3.7.7 + 3.8.0 2.2 4.4.14 7.11.1 From 8dace46f0d348df59f1173e62f16c817035446f6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Mar 2021 04:36:19 +0000 Subject: [PATCH 081/456] Bump jts-core from 1.18.0 to 1.18.1 Bumps jts-core from 1.18.0 to 1.18.1. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 93920e135..64d22747a 100644 --- a/pom.xml +++ b/pom.xml @@ -317,7 +317,7 @@ org.locationtech.jts jts-core - 1.18.0 + 1.18.1 org.geolatte From 115c3cd2caaaa17654575def582d35fcbcb44da8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 3 Mar 2021 04:31:24 +0000 Subject: [PATCH 082/456] Bump spotbugs-annotations from 4.2.1 to 4.2.2 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.2.1...4.2.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64d22747a..fa37fea23 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 2.7.0 4.8.0 3.0.2 - 4.2.1 + 4.2.2 1.3.2 3.17.0 2.12.1 From b9160f524c863941dc9b0cfe50905e9fee08e5ec Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 4 Mar 2021 04:31:06 +0000 Subject: [PATCH 083/456] Bump version.jackson from 2.12.1 to 2.12.2 Bumps `version.jackson` from 2.12.1 to 2.12.2. Updates `jackson-core` from 2.12.1 to 2.12.2 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.12.1...jackson-core-2.12.2) Updates `jackson-annotations` from 2.12.1 to 2.12.2 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-databind` from 2.12.1 to 2.12.2 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-datatype-jdk8` from 2.12.1 to 2.12.2 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa37fea23..ce358c857 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ 4.2.2 1.3.2 3.17.0 - 2.12.1 + 2.12.2 5.7.1 3.8.0 2.2 From 2c2c0f30829831930fc2be5c67136ebf6058aed2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 10 Mar 2021 04:27:06 +0000 Subject: [PATCH 084/456] Bump geolatte-geom from 1.7.0 to 1.8.0 Bumps [geolatte-geom](https://github.com/geolatte/geolatte-geom) from 1.7.0 to 1.8.0. - [Release notes](https://github.com/geolatte/geolatte-geom/releases) - [Commits](https://github.com/geolatte/geolatte-geom/compare/v1.7.0...1.8.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa37fea23..7f294af3f 100644 --- a/pom.xml +++ b/pom.xml @@ -322,7 +322,7 @@ org.geolatte geolatte-geom - 1.7.0 + 1.8.0 org.locationtech.jts From 0372655b07136098bfa8d56de0c8c42afd3c4e2d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 12 Mar 2021 04:30:08 +0000 Subject: [PATCH 085/456] Bump version.antlr4 from 4.9.1 to 4.9.2 Bumps `version.antlr4` from 4.9.1 to 4.9.2. Updates `antlr4` from 4.9.1 to 4.9.2 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.9.1...4.9.2) Updates `antlr4-runtime` from 4.9.1 to 4.9.2 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.9.1...4.9.2) Updates `antlr4-maven-plugin` from 4.9.1 to 4.9.2 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.9.1...4.9.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2c7279e1..9a1c355e6 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ 2.2 4.4.14 7.11.1 - 4.9.1 + 4.9.2 3.2.0 From 3ac757ad1d36c7a7039d073ca03901e9db06ed22 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 12 Mar 2021 11:28:12 +0000 Subject: [PATCH 086/456] Bump version.elastic from 7.11.1 to 7.11.2 Bumps `version.elastic` from 7.11.1 to 7.11.2. Updates `elasticsearch` from 7.11.1 to 7.11.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.11.1...v7.11.2) Updates `elasticsearch-rest-client` from 7.11.1 to 7.11.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.11.1...v7.11.2) Updates `elasticsearch-rest-high-level-client` from 7.11.1 to 7.11.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.11.1...v7.11.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a1c355e6..5b5b33dc0 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 3.8.0 2.2 4.4.14 - 7.11.1 + 7.11.2 4.9.2 3.2.0 From fb70f0cf306f7e26490b109a6be2c79046026400 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 16 Mar 2021 04:29:33 +0000 Subject: [PATCH 087/456] Bump nv-i18n from 1.27 to 1.28 Bumps [nv-i18n](https://github.com/TakahikoKawasaki/nv-i18n) from 1.27 to 1.28. - [Release notes](https://github.com/TakahikoKawasaki/nv-i18n/releases) - [Changelog](https://github.com/TakahikoKawasaki/nv-i18n/blob/master/CHANGES.md) - [Commits](https://github.com/TakahikoKawasaki/nv-i18n/compare/nv-i18n-1.27...nv-i18n-1.28) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b5b33dc0..f6c2c4476 100644 --- a/pom.xml +++ b/pom.xml @@ -1046,7 +1046,7 @@ com.neovisionaries nv-i18n - 1.27 + 1.28 From fa0b2a0e357a8e45a988f5cafce556212e50c91d Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Tue, 16 Mar 2021 15:36:37 +0100 Subject: [PATCH 088/456] add check for attribute type to get namespace uri if null --- .../main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java index a85f0969c..cba014925 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java @@ -70,6 +70,9 @@ public DecoderKey getDecoderKey(XmlObject doc) { domNode.getFirstChild().getNextSibling() != null) { namespaceURI = domNode.getFirstChild().getNextSibling().getNamespaceURI(); } + if (namespaceURI == null && doc.schemaType().isAttributeType()) { + namespaceURI = doc.schemaType().getAttributeTypeAttributeName().getNamespaceURI() + } return new XmlNamespaceDecoderKey(namespaceURI, doc.getClass()); } From 809b1d43efb590da9d7352744087b8da7df23524 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Wed, 17 Mar 2021 16:09:58 +0100 Subject: [PATCH 089/456] fix build --- NOTICE | 25 ++++++++++--------- .../svalbard/decode/AbstractXmlDecoder.java | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/NOTICE b/NOTICE index 89f8ccc0e..3c05798ed 100644 --- a/NOTICE +++ b/NOTICE @@ -39,7 +39,7 @@ This project includes: 52°North Svalbard Parent under The Apache Software License, Version 2.0 52°North Svalbard XML Stream under The Apache Software License, Version 2.0 52°North Svalbard XmlBeans under The Apache Software License, Version 2.0 - aggs-matrix-stats under The Apache Software License, Version 2.0 + aggs-matrix-stats under Server Side Public License, v 1 or Elastic License 2.0 ANTLR 4 Runtime under The BSD License Apache Commons CLI under Apache License, Version 2.0 Apache Commons Codec under Apache License, Version 2.0 @@ -65,11 +65,12 @@ This project includes: compiler under Apache License 2.0 dexx under MIT License Elastic JNA Distribution under Apache License, Version 2.0 - elasticsearch-cli under The Apache Software License, Version 2.0 - elasticsearch-core under The Apache Software License, Version 2.0 - elasticsearch-geo under The Apache Software License, Version 2.0 - elasticsearch-secure-sm under The Apache Software License, Version 2.0 - elasticsearch-x-content under The Apache Software License, Version 2.0 + elasticsearch-cli under Server Side Public License, v 1 or Elastic License 2.0 + elasticsearch-core under Server Side Public License, v 1 or Elastic License 2.0 + elasticsearch-geo under Server Side Public License, v 1 or Elastic License 2.0 + elasticsearch-plugin-classloader under Server Side Public License, v 1 or Elastic License 2.0 + elasticsearch-secure-sm under Server Side Public License, v 1 or Elastic License 2.0 + elasticsearch-x-content under Server Side Public License, v 1 or Elastic License 2.0 embedded-elasticsearch under The Apache Software License, Version 2.0 error-prone annotations under Apache 2.0 EXIficient under MIT License @@ -115,7 +116,7 @@ This project includes: Joda-Time under Apache License, Version 2.0 JOpt Simple under The MIT License JSONLD Java :: Core under Revised BSD License - lang-mustache under The Apache Software License, Version 2.0 + lang-mustache under Server Side Public License, v 1 or Elastic License 2.0 libphonenumber under The Apache Software License, Version 2.0 Lucene Common Analyzers under Apache License, Version 2.0 Lucene Core under Apache License, Version 2.0 @@ -130,7 +131,7 @@ This project includes: Lucene Spatial 3D under Apache License, Version 2.0 Lucene Spatial Extras under Apache License, Version 2.0 Lucene Suggest under Apache License, Version 2.0 - mapper-extras under The Apache Software License, Version 2.0 + mapper-extras under Server Side Public License, v 1 or Elastic License 2.0 MaxMind DB Reader under Apache License 2.0 MaxMind GeoIP2 API under Apache License, Version 2.0 mchange-commons-java under GNU Lesser General Public License, Version 2.1 or Eclipse Public License, Version 1.0 @@ -185,14 +186,14 @@ This project includes: Old JAXB Core under CDDL+GPL License Old JAXB Runtime under CDDL+GPL License org.locationtech.jts:jts-core under Eclipse Public License, Version 2.0 or Eclipse Distribution License - v 1.0 - parent-join under The Apache Software License, Version 2.0 + parent-join under Server Side Public License, v 1 or Elastic License 2.0 Portele Schape Change schema (spec. v3.0) under The Apache Software License, Version 2.0 quartz under The Apache Software License, Version 2.0 - rank-eval under The Apache Software License, Version 2.0 + rank-eval under Server Side Public License, v 1 or Elastic License 2.0 rest under The Apache Software License, Version 2.0 - rest-high-level under The Apache Software License, Version 2.0 + rest-high-level under Elastic License 2.0 Saxon-HE under Mozilla Public License Version 2.0 - server under The Apache Software License, Version 2.0 + server under Server Side Public License, v 1 or Elastic License 2.0 SLF4J API Module under MIT License SnakeYAML under Apache License, Version 2.0 Spring AOP under Apache License, Version 2.0 diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java index cba014925..7c5861c51 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java @@ -71,7 +71,7 @@ public DecoderKey getDecoderKey(XmlObject doc) { namespaceURI = domNode.getFirstChild().getNextSibling().getNamespaceURI(); } if (namespaceURI == null && doc.schemaType().isAttributeType()) { - namespaceURI = doc.schemaType().getAttributeTypeAttributeName().getNamespaceURI() + namespaceURI = doc.schemaType().getAttributeTypeAttributeName().getNamespaceURI(); } return new XmlNamespaceDecoderKey(namespaceURI, doc.getClass()); From 08628fed4c9510191ef07f3ef72f2a654b097e29 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 17 Mar 2021 15:12:05 +0000 Subject: [PATCH 090/456] Bump version.spring from 5.3.4 to 5.3.5 Bumps `version.spring` from 5.3.4 to 5.3.5. Updates `spring-test` from 5.3.4 to 5.3.5 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.4...v5.3.5) Updates `spring-web` from 5.3.4 to 5.3.5 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.4...v5.3.5) Updates `spring-beans` from 5.3.4 to 5.3.5 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.4...v5.3.5) Updates `spring-core` from 5.3.4 to 5.3.5 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.4...v5.3.5) Updates `spring-context` from 5.3.4 to 5.3.5 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.4...v5.3.5) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f6c2c4476..c5c2b8998 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.3.4 + 5.3.5 1.7.30 3.1.0 1.0.4 From 67f274d4689b076632938779072d5fa4a3aae145 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Thu, 18 Mar 2021 08:32:11 +0100 Subject: [PATCH 091/456] [maven-release-plugin] prepare release v8.2.0 --- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 8d592e0e7..7c9c81f93 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.2.0-SNAPSHOT + 8.2.0 faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index dc54bdcca..419293d73 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.2.0-SNAPSHOT + 8.2.0 faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 13c3ac966..fecc0ba11 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.2.0-SNAPSHOT + 8.2.0 faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index 5ffb76ffb..fff0e02b7 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.2.0-SNAPSHOT + 8.2.0 faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 6a6440d5e..ad8588d88 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.2.0-SNAPSHOT + 8.2.0 faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 0702d995b..f805a4856 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.0-SNAPSHOT + 8.2.0 iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index 9f8ab92ff..99aeddd6a 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.2.0-SNAPSHOT + 8.2.0 iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 34b5fd669..f99aa865e 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.0-SNAPSHOT + 8.2.0 ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 95971556b..edfdccca7 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.0-SNAPSHOT + 8.2.0 ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index d6188a4f5..bd2d38216 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.0-SNAPSHOT + 8.2.0 ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index bb52aa32f..642c71433 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.0-SNAPSHOT + 8.2.0 ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 4e702c64c..814722d25 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.2.0-SNAPSHOT + 8.2.0 janmayen diff --git a/pom.xml b/pom.xml index c5c2b8998..61c4001e5 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.n52.arctic-sea arctic-sea - 8.2.0-SNAPSHOT + 8.2.0 pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - HEAD + v8.2.0 diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index b8fd616fa..65333b2d5 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea shetland-parent - 8.2.0-SNAPSHOT + 8.2.0 shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index 8d460121a..ad86d5284 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.2.0-SNAPSHOT + 8.2.0 shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 8aa851ff0..24d948a54 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 8.2.0-SNAPSHOT + 8.2.0 shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 827ea55d8..614eed8c2 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0-SNAPSHOT + 8.2.0 svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 50a89eb59..0574ff467 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0-SNAPSHOT + 8.2.0 svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index d08d317e6..6fbc6757c 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0-SNAPSHOT + 8.2.0 svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index b9fc9e6a6..67954f6aa 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0-SNAPSHOT + 8.2.0 svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 1106f18a5..c35ba56d8 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0-SNAPSHOT + 8.2.0 svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 9636ebc9f..0904e7330 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.2.0-SNAPSHOT + 8.2.0 svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 0a6662c99..dfc74b5b2 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0-SNAPSHOT + 8.2.0 svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 7e734567d..4a6f01aa7 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0-SNAPSHOT + 8.2.0 svalbard-xmlstream 52°North Svalbard XML Stream From bd04d745aff553ebd8c8cdd2a0694d411857072c Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Thu, 18 Mar 2021 08:32:21 +0100 Subject: [PATCH 092/456] [maven-release-plugin] prepare for next development iteration --- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 7c9c81f93..6dc9f32ef 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.2.0 + 8.3.0-SNAPSHOT faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 419293d73..1243ba5a8 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.2.0 + 8.3.0-SNAPSHOT faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index fecc0ba11..6cbf119b2 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.2.0 + 8.3.0-SNAPSHOT faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index fff0e02b7..fe33cea95 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.2.0 + 8.3.0-SNAPSHOT faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index ad8588d88..f4056fddc 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.2.0 + 8.3.0-SNAPSHOT faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index f805a4856..9e1593505 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.0 + 8.3.0-SNAPSHOT iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index 99aeddd6a..4ecc224a6 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.2.0 + 8.3.0-SNAPSHOT iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index f99aa865e..a451dd613 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.0 + 8.3.0-SNAPSHOT ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index edfdccca7..d7412c7e0 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.0 + 8.3.0-SNAPSHOT ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index bd2d38216..0a7bf55fb 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.0 + 8.3.0-SNAPSHOT ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 642c71433..1c7875ed2 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.0 + 8.3.0-SNAPSHOT ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 814722d25..c9d0dbe52 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.2.0 + 8.3.0-SNAPSHOT janmayen diff --git a/pom.xml b/pom.xml index 61c4001e5..a45797d70 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.n52.arctic-sea arctic-sea - 8.2.0 + 8.3.0-SNAPSHOT pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - v8.2.0 + HEAD diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 65333b2d5..659b58fec 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea shetland-parent - 8.2.0 + 8.3.0-SNAPSHOT shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index ad86d5284..9b740bd38 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.2.0 + 8.3.0-SNAPSHOT shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 24d948a54..b6e02c956 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 8.2.0 + 8.3.0-SNAPSHOT shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 614eed8c2..e61c0a641 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0 + 8.3.0-SNAPSHOT svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 0574ff467..5488001e4 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0 + 8.3.0-SNAPSHOT svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 6fbc6757c..83552f746 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0 + 8.3.0-SNAPSHOT svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 67954f6aa..c7089675c 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0 + 8.3.0-SNAPSHOT svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index c35ba56d8..427f20c9d 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0 + 8.3.0-SNAPSHOT svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 0904e7330..8fffca774 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.2.0 + 8.3.0-SNAPSHOT svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index dfc74b5b2..f3ac7800c 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0 + 8.3.0-SNAPSHOT svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 4a6f01aa7..67813ac4b 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.0 + 8.3.0-SNAPSHOT svalbard-xmlstream 52°North Svalbard XML Stream From 78d629a9639b69ff1bf60fd04d55da8aaa3809ca Mon Sep 17 00:00:00 2001 From: speckij Date: Tue, 23 Mar 2021 15:44:05 +0100 Subject: [PATCH 093/456] fix parsing of $count Query Option $count was not actually parsed before and defaulted to true. --- .../org/n52/svalbard/odata/core/STAQueryOptionVisitor.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/STAQueryOptionVisitor.java b/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/STAQueryOptionVisitor.java index e04efdb0a..3d67083de 100644 --- a/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/STAQueryOptionVisitor.java +++ b/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/STAQueryOptionVisitor.java @@ -106,9 +106,12 @@ public class STAQueryOptionVisitor extends STAQueryOptionsGrammarBaseVisitor { return new SkipTopFilter(FilterConstants.SkipTopOperator.Top, Long.parseLong(ctx.decimalLiteral().getText())); } - //TODO: check if we would like to also allow $count=false in the url @Override public CountFilter visitCount(STAQueryOptionsGrammar.CountContext ctx) { - return new CountFilter(true); + if (ctx.False_LLC() != null) { + return new CountFilter(false); + } else { + return new CountFilter(true); + } } @Override public SelectFilter visitSelect(STAQueryOptionsGrammar.SelectContext ctx) { From 91825e375197af5f94386b78ec50cd5ef5822ff0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 24 Mar 2021 04:30:56 +0000 Subject: [PATCH 094/456] Bump version.elastic from 7.11.2 to 7.12.0 Bumps `version.elastic` from 7.11.2 to 7.12.0. Updates `elasticsearch` from 7.11.2 to 7.12.0 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.11.2...v7.12.0) Updates `elasticsearch-rest-client` from 7.11.2 to 7.12.0 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.11.2...v7.12.0) Updates `elasticsearch-rest-high-level-client` from 7.11.2 to 7.12.0 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.11.2...v7.12.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a45797d70..70be451dc 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 3.8.0 2.2 4.4.14 - 7.11.2 + 7.12.0 4.9.2 3.2.0 From 14ae590dbf7064fbbe8bb3d3e2f197ceac3cf737 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 04:34:15 +0000 Subject: [PATCH 095/456] Bump istack-commons-runtime from 4.0.0 to 4.0.1 Bumps istack-commons-runtime from 4.0.0 to 4.0.1. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 70be451dc..ef81714bf 100644 --- a/pom.xml +++ b/pom.xml @@ -1153,7 +1153,7 @@ com.sun.istack istack-commons-runtime - 4.0.0 + 4.0.1 runtime From 6f1a6611378871a21731cd27f6209184e1da2569 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 04:33:40 +0000 Subject: [PATCH 096/456] Bump version.mockito from 3.8.0 to 3.9.0 Bumps `version.mockito` from 3.8.0 to 3.9.0. Updates `mockito-core` from 3.8.0 to 3.9.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.8.0...v3.9.0) Updates `mockito-junit-jupiter` from 3.8.0 to 3.9.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.8.0...v3.9.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef81714bf..25c2609e5 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 3.17.0 2.12.2 5.7.1 - 3.8.0 + 3.9.0 2.2 4.4.14 7.12.0 From 8335e122cd5c4cba8e75349f6f0f7137d9db0d07 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 04:34:15 +0000 Subject: [PATCH 097/456] Bump version.jackson from 2.12.2 to 2.12.3 Bumps `version.jackson` from 2.12.2 to 2.12.3. Updates `jackson-core` from 2.12.2 to 2.12.3 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.12.2...jackson-core-2.12.3) Updates `jackson-annotations` from 2.12.2 to 2.12.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-databind` from 2.12.2 to 2.12.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-datatype-jdk8` from 2.12.2 to 2.12.3 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 25c2609e5..0453894b7 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ 4.2.2 1.3.2 3.17.0 - 2.12.2 + 2.12.3 5.7.1 3.9.0 2.2 From c1af4e79e8f243ce8664fb5e026605cec2ab2dd9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 04:35:58 +0000 Subject: [PATCH 098/456] Bump lucene-core from 8.8.1 to 8.8.2 Bumps lucene-core from 8.8.1 to 8.8.2. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 25c2609e5..b1adef222 100644 --- a/pom.xml +++ b/pom.xml @@ -608,7 +608,7 @@ org.apache.lucene lucene-core - 8.8.1 + 8.8.2 com.maxmind.db From f7f9ccf0be8905069c3900ab8be4cef51a6be416 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 14 Apr 2021 04:34:47 +0000 Subject: [PATCH 099/456] Bump version.spring from 5.3.5 to 5.3.6 Bumps `version.spring` from 5.3.5 to 5.3.6. Updates `spring-test` from 5.3.5 to 5.3.6 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.5...v5.3.6) Updates `spring-web` from 5.3.5 to 5.3.6 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.5...v5.3.6) Updates `spring-beans` from 5.3.5 to 5.3.6 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.5...v5.3.6) Updates `spring-core` from 5.3.5 to 5.3.6 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.5...v5.3.6) Updates `spring-context` from 5.3.5 to 5.3.6 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.5...v5.3.6) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index be8f8e60c..180492636 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.3.5 + 5.3.6 1.7.30 3.1.0 1.0.4 From a45316ed627ba4be3fff7ab7525dc34335f6e31c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 16 Apr 2021 04:32:40 +0000 Subject: [PATCH 100/456] Bump Saxon-HE from 10.3 to 10.5 Bumps Saxon-HE from 10.3 to 10.5. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 180492636..87a4ecfe1 100644 --- a/pom.xml +++ b/pom.xml @@ -534,7 +534,7 @@ net.sf.saxon Saxon-HE - 10.3 + 10.5 From b77bd5f43b38178adcbe44fbc32c7385abb68039 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 16 Apr 2021 04:33:51 +0000 Subject: [PATCH 101/456] Bump spotbugs-annotations from 4.2.2 to 4.2.3 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.2.2 to 4.2.3. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.2.2...4.2.3) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 180492636..0cc281fc9 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 2.7.0 4.8.0 3.0.2 - 4.2.2 + 4.2.3 1.3.2 3.17.0 2.12.3 From 3fdd46234f5ac9a97b8c992495a056217c2cf2ae Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 04:35:04 +0000 Subject: [PATCH 102/456] Bump guava from 29.0-jre to 30.1.1-jre Bumps [guava](https://github.com/google/guava) from 29.0-jre to 30.1.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4d1b757c5..d797905c3 100644 --- a/pom.xml +++ b/pom.xml @@ -305,7 +305,7 @@ com.google.guava guava - 29.0-jre + 30.1.1-jre From f84027bbef63ed04e5b29865062f53003ba1833a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 28 Apr 2021 13:28:16 +0000 Subject: [PATCH 103/456] Bump version.elastic from 7.12.0 to 7.12.1 Bumps `version.elastic` from 7.12.0 to 7.12.1. Updates `elasticsearch` from 7.12.0 to 7.12.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.12.0...v7.12.1) Updates `elasticsearch-rest-client` from 7.12.0 to 7.12.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.12.0...v7.12.1) Updates `elasticsearch-rest-high-level-client` from 7.12.0 to 7.12.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.12.0...v7.12.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d797905c3..b55aeb64a 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 3.9.0 2.2 4.4.14 - 7.12.0 + 7.12.1 4.9.2 3.2.0 From fe7416a0a9a56c960616fe58de41f1e5b0e19049 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 15:25:46 +0000 Subject: [PATCH 104/456] Upgrade to GitHub-native Dependabot --- .github/dependabot.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..b77674ad0 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,21 @@ +version: 2 +updates: +- package-ecosystem: maven + directory: "/" + schedule: + interval: daily + time: "04:00" + open-pull-requests-limit: 10 + ignore: + - dependency-name: xml-apis:xml-apis + versions: + - ">= 2.a, < 3" + - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client + versions: + - 7.11.0 + - dependency-name: org.elasticsearch.client:elasticsearch-rest-client + versions: + - 7.11.0 + - dependency-name: org.elasticsearch:elasticsearch + versions: + - 7.11.0 From 04f95d064da54e153b95417f5dd12b9c308d6f91 Mon Sep 17 00:00:00 2001 From: Christian Autermann Date: Thu, 6 May 2021 09:36:11 +0200 Subject: [PATCH 105/456] [maven-release-plugin] prepare release v8.2.1 --- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 6dc9f32ef..abfc5a3d3 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.3.0-SNAPSHOT + 8.2.1 faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 1243ba5a8..558416efb 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.3.0-SNAPSHOT + 8.2.1 faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 6cbf119b2..659d40094 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.3.0-SNAPSHOT + 8.2.1 faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index fe33cea95..1808c4d53 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.3.0-SNAPSHOT + 8.2.1 faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index f4056fddc..8b1951fbc 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.3.0-SNAPSHOT + 8.2.1 faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 9e1593505..43ad69bd4 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.3.0-SNAPSHOT + 8.2.1 iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index 4ecc224a6..1b8c2a491 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.3.0-SNAPSHOT + 8.2.1 iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index a451dd613..b8e09e973 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.3.0-SNAPSHOT + 8.2.1 ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index d7412c7e0..8e3f3d6ec 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.3.0-SNAPSHOT + 8.2.1 ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 0a7bf55fb..bde8362ca 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.3.0-SNAPSHOT + 8.2.1 ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 1c7875ed2..24e37d38c 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.3.0-SNAPSHOT + 8.2.1 ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index c9d0dbe52..46c1b97ff 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.3.0-SNAPSHOT + 8.2.1 janmayen diff --git a/pom.xml b/pom.xml index b55aeb64a..85bc1cb13 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.n52.arctic-sea arctic-sea - 8.3.0-SNAPSHOT + 8.2.1 pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - HEAD + v8.2.1 diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 659b58fec..91bbe21f0 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea shetland-parent - 8.3.0-SNAPSHOT + 8.2.1 shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index 9b740bd38..4e97381ba 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.3.0-SNAPSHOT + 8.2.1 shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index b6e02c956..50cc7d2e3 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 8.3.0-SNAPSHOT + 8.2.1 shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index e61c0a641..00067ff03 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.3.0-SNAPSHOT + 8.2.1 svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 5488001e4..2b5ee04ac 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.3.0-SNAPSHOT + 8.2.1 svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 83552f746..c461e9159 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.3.0-SNAPSHOT + 8.2.1 svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index c7089675c..7def5ec20 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.3.0-SNAPSHOT + 8.2.1 svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 427f20c9d..006d5059a 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.3.0-SNAPSHOT + 8.2.1 svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 8fffca774..ce11fd4f2 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.3.0-SNAPSHOT + 8.2.1 svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index f3ac7800c..f730907fa 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.3.0-SNAPSHOT + 8.2.1 svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 67813ac4b..cf1a9db38 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.3.0-SNAPSHOT + 8.2.1 svalbard-xmlstream 52°North Svalbard XML Stream From 53a9138ce3d84f24c57f7216609d8b7b640a62ab Mon Sep 17 00:00:00 2001 From: Christian Autermann Date: Thu, 6 May 2021 09:36:16 +0200 Subject: [PATCH 106/456] [maven-release-plugin] prepare for next development iteration --- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index abfc5a3d3..6dc9f32ef 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.2.1 + 8.3.0-SNAPSHOT faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 558416efb..1243ba5a8 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.2.1 + 8.3.0-SNAPSHOT faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 659d40094..6cbf119b2 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.2.1 + 8.3.0-SNAPSHOT faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index 1808c4d53..fe33cea95 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.2.1 + 8.3.0-SNAPSHOT faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 8b1951fbc..f4056fddc 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea faroe-parent - 8.2.1 + 8.3.0-SNAPSHOT faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 43ad69bd4..9e1593505 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.1 + 8.3.0-SNAPSHOT iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index 1b8c2a491..4ecc224a6 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.2.1 + 8.3.0-SNAPSHOT iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index b8e09e973..a451dd613 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.1 + 8.3.0-SNAPSHOT ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 8e3f3d6ec..d7412c7e0 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.1 + 8.3.0-SNAPSHOT ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index bde8362ca..0a7bf55fb 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.1 + 8.3.0-SNAPSHOT ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 24e37d38c..1c7875ed2 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea iceland-parent - 8.2.1 + 8.3.0-SNAPSHOT ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 46c1b97ff..c9d0dbe52 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea arctic-sea - 8.2.1 + 8.3.0-SNAPSHOT janmayen diff --git a/pom.xml b/pom.xml index 85bc1cb13..b55aeb64a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.n52.arctic-sea arctic-sea - 8.2.1 + 8.3.0-SNAPSHOT pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - v8.2.1 + HEAD diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 91bbe21f0..659b58fec 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -23,7 +23,7 @@ org.n52.arctic-sea shetland-parent - 8.2.1 + 8.3.0-SNAPSHOT shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index 4e97381ba..9b740bd38 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.2.1 + 8.3.0-SNAPSHOT shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 50cc7d2e3..b6e02c956 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 8.2.1 + 8.3.0-SNAPSHOT shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 00067ff03..e61c0a641 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.1 + 8.3.0-SNAPSHOT svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 2b5ee04ac..5488001e4 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.1 + 8.3.0-SNAPSHOT svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index c461e9159..83552f746 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.1 + 8.3.0-SNAPSHOT svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 7def5ec20..c7089675c 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.1 + 8.3.0-SNAPSHOT svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 006d5059a..427f20c9d 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.1 + 8.3.0-SNAPSHOT svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index ce11fd4f2..8fffca774 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 8.2.1 + 8.3.0-SNAPSHOT svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index f730907fa..f3ac7800c 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.1 + 8.3.0-SNAPSHOT svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index cf1a9db38..67813ac4b 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea svalbard-parent - 8.2.1 + 8.3.0-SNAPSHOT svalbard-xmlstream 52°North Svalbard XML Stream From 0b18b7a61930bb9f53c80fe51c89a8490d3217cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 May 2021 04:00:47 +0000 Subject: [PATCH 107/456] Bump version.spring from 5.3.6 to 5.3.7 Bumps `version.spring` from 5.3.6 to 5.3.7. Updates `spring-test` from 5.3.6 to 5.3.7 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.6...v5.3.7) Updates `spring-web` from 5.3.6 to 5.3.7 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.6...v5.3.7) Updates `spring-beans` from 5.3.6 to 5.3.7 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.6...v5.3.7) Updates `spring-core` from 5.3.6 to 5.3.7 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.6...v5.3.7) Updates `spring-context` from 5.3.6 to 5.3.7 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.6...v5.3.7) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b55aeb64a..c33a7247f 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.3.6 + 5.3.7 1.7.30 3.1.0 1.0.4 From 71dc3c9aa04402e06ff88f392e17dd6d314ea533 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 May 2021 04:02:09 +0000 Subject: [PATCH 108/456] Bump version.mockito from 3.9.0 to 3.10.0 Bumps `version.mockito` from 3.9.0 to 3.10.0. Updates `mockito-core` from 3.9.0 to 3.10.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.9.0...v3.10.0) Updates `mockito-junit-jupiter` from 3.9.0 to 3.10.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.9.0...v3.10.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b55aeb64a..a06359749 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 3.17.0 2.12.3 5.7.1 - 3.9.0 + 3.10.0 2.2 4.4.14 7.12.1 From 689c82c07626390f9d632c051d7ce733f392e4d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 04:01:06 +0000 Subject: [PATCH 109/456] Bump version.junit from 5.7.1 to 5.7.2 Bumps `version.junit` from 5.7.1 to 5.7.2. Updates `junit-jupiter-api` from 5.7.1 to 5.7.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.1...r5.7.2) Updates `junit-jupiter-engine` from 5.7.1 to 5.7.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.1...r5.7.2) Updates `junit-jupiter-params` from 5.7.1 to 5.7.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.1...r5.7.2) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b55aeb64a..48cb02c10 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 1.3.2 3.17.0 2.12.3 - 5.7.1 + 5.7.2 3.9.0 2.2 4.4.14 From 5e8ab6d426ad9e78c28b360759bc63ee4edb4a05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 04:00:33 +0000 Subject: [PATCH 110/456] Bump geolatte-geom from 1.8.0 to 1.8.1 Bumps [geolatte-geom](https://github.com/geolatte/geolatte-geom) from 1.8.0 to 1.8.1. - [Release notes](https://github.com/geolatte/geolatte-geom/releases) - [Commits](https://github.com/geolatte/geolatte-geom/compare/1.8.0...v1.8.1) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 760ff89a0..40647910c 100644 --- a/pom.xml +++ b/pom.xml @@ -322,7 +322,7 @@ org.geolatte geolatte-geom - 1.8.0 + 1.8.1 org.locationtech.jts From f9a1d466cbc8694622d1499761fa958099138658 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 May 2021 04:00:53 +0000 Subject: [PATCH 111/456] Bump maven-javadoc-plugin from 3.2.0 to 3.3.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.2.0...maven-javadoc-plugin-3.3.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40647910c..ea84dd8da 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ 4.4.14 7.12.1 4.9.2 - 3.2.0 + 3.3.0 From 6dc4f8fa1f13614c2eaf5a3fd0232b8927325c3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 04:00:43 +0000 Subject: [PATCH 112/456] Bump version.elastic from 7.12.1 to 7.13.0 Bumps `version.elastic` from 7.12.1 to 7.13.0. Updates `elasticsearch` from 7.12.1 to 7.13.0 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.12.1...v7.13.0) Updates `elasticsearch-rest-client` from 7.12.1 to 7.13.0 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.12.1...v7.13.0) Updates `elasticsearch-rest-high-level-client` from 7.12.1 to 7.13.0 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.12.1...v7.13.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40647910c..3e64566f1 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 3.10.0 2.2 4.4.14 - 7.12.1 + 7.13.0 4.9.2 3.2.0 From 7cf4e7adc99060543ce8c913325a6533c14f1ab9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 04:02:03 +0000 Subject: [PATCH 113/456] Bump commons-io from 2.8.0 to 2.9.0 Bumps commons-io from 2.8.0 to 2.9.0. Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40647910c..3cb84b8d3 100644 --- a/pom.xml +++ b/pom.xml @@ -462,7 +462,7 @@ commons-io commons-io - 2.8.0 + 2.9.0 org.apache.commons From 3e1fda82768a8e63bd298d9a8654819d5eab2a1c Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Fri, 28 May 2021 12:21:38 +0200 Subject: [PATCH 114/456] fix references fix references development of arctic sea instead faroe --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b37b2d1c..8ff0eaac4 100644 --- a/README.md +++ b/README.md @@ -218,7 +218,7 @@ A link to the contributors license agreement and further explanations are availa ## References -The development of the 52°North Faroe implementation was supported by several organizations and projects. Among other we would like to thank the following organizations and project +The development of the 52°North Arctic Sea implementation was supported by several organizations and projects. Among other we would like to thank the following organizations and project | Project/Logo | Description | | :-------------: | :------------- | From c5e897903823ffae10897aefe13152252e1398fa Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Fri, 28 May 2021 12:57:28 +0200 Subject: [PATCH 115/456] update 52N company name --- NOTICE | 3 +-- etc/license-header.txt | 3 +-- etc/notice-template.txt | 3 +-- faroe/annotations/pom.xml | 3 +-- .../src/main/java/org/n52/faroe/annotation/Configurable.java | 3 +-- .../src/main/java/org/n52/faroe/annotation/Setting.java | 3 +-- faroe/core/pom.xml | 3 +-- faroe/core/src/main/java/org/n52/faroe/AbstractOrdered.java | 3 +-- .../main/java/org/n52/faroe/AbstractSettingDefinition.java | 3 +-- .../main/java/org/n52/faroe/FileSettingsConfiguration.java | 3 +-- .../src/main/java/org/n52/faroe/JSONSettingConstants.java | 3 +-- faroe/core/src/main/java/org/n52/faroe/Ordered.java | 3 +-- .../core/src/main/java/org/n52/faroe/SettingDefinition.java | 3 +-- .../src/main/java/org/n52/faroe/SettingDefinitionGroup.java | 3 +-- faroe/core/src/main/java/org/n52/faroe/SettingType.java | 3 +-- faroe/core/src/main/java/org/n52/faroe/SettingValue.java | 3 +-- .../src/main/java/org/n52/faroe/SettingValueFactory.java | 3 +-- .../src/main/java/org/n52/faroe/SettingsChangeEvent.java | 3 +-- faroe/core/src/main/java/org/n52/faroe/SettingsDao.java | 3 +-- .../src/main/java/org/n52/faroe/SettingsFileWatcher.java | 3 +-- faroe/core/src/main/java/org/n52/faroe/SettingsService.java | 3 +-- .../src/main/java/org/n52/faroe/SettingsServiceImpl.java | 3 +-- .../org/n52/faroe/settings/BooleanSettingDefinition.java | 3 +-- .../java/org/n52/faroe/settings/ChoiceSettingDefinition.java | 3 +-- .../org/n52/faroe/settings/DateTimeSettingDefinition.java | 3 +-- .../java/org/n52/faroe/settings/FileSettingDefinition.java | 3 +-- .../org/n52/faroe/settings/IntegerSettingDefinition.java | 3 +-- .../faroe/settings/MultilingualStringSettingDefinition.java | 3 +-- .../org/n52/faroe/settings/NumericSettingDefinition.java | 3 +-- .../java/org/n52/faroe/settings/StringSettingDefinition.java | 3 +-- .../java/org/n52/faroe/settings/UriSettingDefinition.java | 3 +-- .../src/test/java/org/n52/faroe/SettingValueFactoryTest.java | 3 +-- .../n52/faroe/settings/AbstractSettingsDefinitionTest.java | 3 +-- .../n52/faroe/settings/BooleanSettingValueForTesting.java | 3 +-- .../org/n52/faroe/settings/ChoiceSettingValueForTesting.java | 3 +-- .../org/n52/faroe/settings/FileSettingValueForTesting.java | 3 +-- .../n52/faroe/settings/IntegerSettingValueForTesting.java | 3 +-- .../faroe/settings/MultilingualStringValueForTesting.java | 3 +-- .../n52/faroe/settings/NumericSettingValueForTesting.java | 3 +-- .../org/n52/faroe/settings/StringSettingValueForTesting.java | 3 +-- .../faroe/settings/TimeInstantSettingValueForTesting.java | 3 +-- .../org/n52/faroe/settings/UriSettingValueForTesting.java | 3 +-- faroe/json/pom.xml | 3 +-- .../src/main/java/org/n52/faroe/json/AbstractJsonDao.java | 3 +-- .../src/main/java/org/n52/faroe/json/JsonConfiguration.java | 3 +-- .../src/main/java/org/n52/faroe/json/JsonSettingValue.java | 3 +-- .../java/org/n52/faroe/json/JsonSettingValueFactory.java | 3 +-- .../src/main/java/org/n52/faroe/json/JsonSettingsDao.java | 3 +-- .../main/java/org/n52/faroe/json/JsonSettingsDecoder.java | 3 +-- .../main/java/org/n52/faroe/json/JsonSettingsEncoder.java | 3 +-- faroe/pom.xml | 3 +-- faroe/utils/pom.xml | 3 +-- .../src/main/java/org/n52/faroe/ConfigurationError.java | 3 +-- faroe/utils/src/main/java/org/n52/faroe/Validation.java | 3 +-- iceland/core/pom.xml | 3 +-- .../java/org/n52/iceland/binding/AbstractXmlBinding.java | 3 +-- .../core/src/main/java/org/n52/iceland/binding/Binding.java | 3 +-- .../main/java/org/n52/iceland/binding/BindingFactory.java | 3 +-- .../src/main/java/org/n52/iceland/binding/BindingKey.java | 3 +-- .../main/java/org/n52/iceland/binding/BindingRepository.java | 3 +-- .../org/n52/iceland/binding/EncodingExceptionHandler.java | 3 +-- .../java/org/n52/iceland/binding/MediaTypeBindingKey.java | 3 +-- .../main/java/org/n52/iceland/binding/PathBindingKey.java | 3 +-- .../src/main/java/org/n52/iceland/binding/SimpleBinding.java | 3 +-- .../main/java/org/n52/iceland/binding/exi/EXIBinding.java | 3 +-- .../main/java/org/n52/iceland/binding/exi/EXISettings.java | 3 +-- .../src/main/java/org/n52/iceland/binding/exi/EXIUtils.java | 3 +-- .../main/java/org/n52/iceland/binding/json/JSONBinding.java | 3 +-- .../java/org/n52/iceland/binding/kvp/AbstractKvpDecoder.java | 3 +-- .../main/java/org/n52/iceland/binding/kvp/KvpBinding.java | 3 +-- .../main/java/org/n52/iceland/binding/pox/PoxBinding.java | 3 +-- .../main/java/org/n52/iceland/binding/soap/SoapBinding.java | 3 +-- .../src/main/java/org/n52/iceland/cache/ContentCache.java | 3 +-- .../java/org/n52/iceland/cache/ContentCacheController.java | 3 +-- .../n52/iceland/cache/ContentCachePersistenceStrategy.java | 3 +-- .../main/java/org/n52/iceland/cache/ContentCacheUpdate.java | 3 +-- .../java/org/n52/iceland/cache/WritableContentCache.java | 3 +-- .../cache/ctrl/AbstractSchedulingContentCacheController.java | 3 +-- .../n52/iceland/cache/ctrl/CompleteCacheUpdateFactory.java | 3 +-- .../n52/iceland/cache/ctrl/ContentCacheControllerImpl.java | 3 +-- .../java/org/n52/iceland/cache/ctrl/ContentCacheFactory.java | 3 +-- .../cache/ctrl/ScheduledContentCacheControllerSettings.java | 3 +-- .../AbstractPersistingCachePersistenceStrategy.java | 3 +-- .../ctrl/persistence/AsyncCachePersistenceStrategy.java | 3 +-- .../persistence/AsyncCachePersistenceStrategySettings.java | 3 +-- .../cache/ctrl/persistence/ImmediatePersistenceStrategy.java | 3 +-- .../cache/ctrl/persistence/NoOpCachePersistenceStrategy.java | 3 +-- .../java/org/n52/iceland/coding/DocumentBuilderProvider.java | 3 +-- .../java/org/n52/iceland/coding/SupportedTypeRepository.java | 3 +-- .../iceland/coding/SupportedTypeRepositoryInitializer.java | 3 +-- .../org/n52/iceland/coding/decode/OwsDecodingException.java | 3 +-- .../n52/iceland/coding/encode/AbstractResponseWriter.java | 3 +-- .../org/n52/iceland/coding/encode/OwsEncodingException.java | 3 +-- .../org/n52/iceland/coding/encode/ResponseFormatKey.java | 3 +-- .../java/org/n52/iceland/coding/encode/ResponseProxy.java | 3 +-- .../java/org/n52/iceland/coding/encode/ResponseWriter.java | 3 +-- .../org/n52/iceland/coding/encode/ResponseWriterFactory.java | 3 +-- .../org/n52/iceland/coding/encode/ResponseWriterKey.java | 3 +-- .../n52/iceland/coding/encode/ResponseWriterRepository.java | 3 +-- .../src/main/java/org/n52/iceland/config/ActivationDao.java | 3 +-- .../main/java/org/n52/iceland/config/ActivationService.java | 3 +-- .../src/main/java/org/n52/iceland/config/AdminUserDao.java | 3 +-- .../main/java/org/n52/iceland/config/AdminUserService.java | 3 +-- .../java/org/n52/iceland/config/AdminUserServiceImpl.java | 3 +-- .../main/java/org/n52/iceland/config/AdministratorUser.java | 3 +-- .../n52/iceland/config/json/AbstractJsonActivationDao.java | 3 +-- .../java/org/n52/iceland/config/json/JsonActivationDao.java | 3 +-- .../java/org/n52/iceland/config/json/JsonAdminUserDao.java | 3 +-- .../org/n52/iceland/config/json/JsonAdministratorUser.java | 3 +-- .../main/java/org/n52/iceland/config/json/JsonConstants.java | 3 +-- .../iceland/config/spring/ConfiguringBeanPostProcessor.java | 3 +-- .../iceland/config/spring/LifecycleBeanPostProcessor.java | 3 +-- .../config/spring/ProviderAwareListableBeanFactory.java | 3 +-- .../config/spring/ProviderAwareXmlWebApplicationContext.java | 3 +-- .../n52/iceland/config/spring/SettingsBeanPostProcessor.java | 3 +-- .../iceland/config/spring/converter/DurationConverter.java | 3 +-- .../n52/iceland/config/spring/converter/PathConverter.java | 3 +-- .../src/main/java/org/n52/iceland/convert/Converter.java | 3 +-- .../java/org/n52/iceland/convert/ConverterException.java | 3 +-- .../main/java/org/n52/iceland/convert/ConverterFactory.java | 3 +-- .../src/main/java/org/n52/iceland/convert/ConverterKey.java | 3 +-- .../java/org/n52/iceland/convert/ConverterRepository.java | 3 +-- .../org/n52/iceland/convert/RequestResponseModifier.java | 3 +-- .../iceland/convert/RequestResponseModifierFacilitator.java | 3 +-- .../n52/iceland/convert/RequestResponseModifierFactory.java | 3 +-- .../org/n52/iceland/convert/RequestResponseModifierKey.java | 3 +-- .../iceland/convert/RequestResponseModifierRepository.java | 3 +-- .../src/main/java/org/n52/iceland/ds/ConnectionProvider.java | 3 +-- .../java/org/n52/iceland/ds/ConnectionProviderException.java | 3 +-- .../main/java/org/n52/iceland/ds/DataConnectionProvider.java | 3 +-- .../core/src/main/java/org/n52/iceland/ds/Datasource.java | 3 +-- .../src/main/java/org/n52/iceland/ds/DatasourceCallback.java | 3 +-- .../org/n52/iceland/ds/UpdateableConnectionProvider.java | 3 +-- .../src/main/java/org/n52/iceland/eu/InspireConstants.java | 3 +-- .../java/org/n52/iceland/event/events/AbstractFlowEvent.java | 3 +-- .../n52/iceland/event/events/CountingOutputStreamEvent.java | 3 +-- .../java/org/n52/iceland/event/events/ExceptionEvent.java | 3 +-- .../org/n52/iceland/event/events/IncomingRequestEvent.java | 3 +-- .../n52/iceland/event/events/ModificationResponseEvent.java | 3 +-- .../org/n52/iceland/event/events/OutgoingResponseEvent.java | 3 +-- .../main/java/org/n52/iceland/event/events/RequestEvent.java | 3 +-- .../java/org/n52/iceland/event/events/ResponseEvent.java | 3 +-- .../main/java/org/n52/iceland/exception/HTTPException.java | 3 +-- .../main/java/org/n52/iceland/exception/JSONException.java | 3 +-- .../ows/concrete/ContentTypeNotSupportedException.java | 3 +-- .../ows/concrete/GenericThrowableWrapperException.java | 3 +-- .../concrete/InvalidAcceptVersionsParameterException.java | 3 +-- .../ows/concrete/InvalidServiceOrVersionException.java | 3 +-- .../ows/concrete/InvalidServiceParameterException.java | 3 +-- .../ows/concrete/MissingRequestParameterException.java | 3 +-- .../ows/concrete/MissingValueReferenceException.java | 3 +-- .../ows/concrete/NoEncoderForResponseException.java | 3 +-- .../ows/concrete/NoImplementationFoundException.java | 3 +-- .../exception/ows/concrete/NotYetSupportedException.java | 3 +-- .../ows/concrete/ParameterNotSupportedException.java | 3 +-- .../ows/concrete/ServiceOperatorNotFoundException.java | 3 +-- .../exception/ows/concrete/VersionNotSupportedException.java | 3 +-- iceland/core/src/main/java/org/n52/iceland/i18n/I18NDAO.java | 3 +-- .../src/main/java/org/n52/iceland/i18n/I18NDAOFactory.java | 3 +-- .../core/src/main/java/org/n52/iceland/i18n/I18NDAOKey.java | 3 +-- .../main/java/org/n52/iceland/i18n/I18NDAORepository.java | 3 +-- .../src/main/java/org/n52/iceland/i18n/I18NSerializer.java | 3 +-- .../src/main/java/org/n52/iceland/i18n/I18NSettings.java | 3 +-- .../main/java/org/n52/iceland/i18n/json/I18NJsonEncoder.java | 3 +-- .../org/n52/iceland/i18n/metadata/AbstractI18NMetadata.java | 3 +-- .../org/n52/iceland/i18n/metadata/I18NFeatureMetadata.java | 3 +-- .../i18n/metadata/I18NObservablePropertyMetadata.java | 3 +-- .../org/n52/iceland/i18n/metadata/I18NOfferingMetadata.java | 3 +-- .../org/n52/iceland/i18n/metadata/I18NProcedureMetadata.java | 3 +-- .../ogc/AbstractComparableServiceVersionDomainKey.java | 3 +-- .../n52/iceland/ogc/ows/OwsServiceIdentificationFactory.java | 3 +-- .../ogc/ows/OwsServiceIdentificationFactorySettings.java | 3 +-- .../n52/iceland/ogc/ows/OwsServiceMetadataRepository.java | 3 +-- .../iceland/ogc/ows/OwsServiceMetadataRepositoryImpl.java | 3 +-- .../org/n52/iceland/ogc/ows/OwsServiceProviderFactory.java | 3 +-- .../iceland/ogc/ows/OwsServiceProviderFactorySettings.java | 3 +-- .../ogc/ows/extension/OwsCapabilitiesExtensionKey.java | 3 +-- .../ogc/ows/extension/OwsCapabilitiesExtensionProvider.java | 3 +-- .../extension/OwsCapabilitiesExtensionProviderFactory.java | 3 +-- .../ows/extension/OwsCapabilitiesExtensionRepository.java | 3 +-- .../ows/extension/OwsOperationMetadataExtensionProvider.java | 3 +-- .../OwsOperationMetadataExtensionProviderFactory.java | 3 +-- .../extension/OwsOperationMetadataExtensionProviderKey.java | 3 +-- .../OwsOperationMetadataExtensionProviderRepository.java | 3 +-- .../n52/iceland/ogc/ows/extension/StaticCapabilities.java | 3 +-- .../request/handler/AbstractGetCapabilitiesHandler.java | 3 +-- .../iceland/request/handler/AbstractOperationHandler.java | 3 +-- .../n52/iceland/request/handler/GenericOperationHandler.java | 3 +-- .../org/n52/iceland/request/handler/OperationHandler.java | 3 +-- .../n52/iceland/request/handler/OperationHandlerFactory.java | 3 +-- .../org/n52/iceland/request/handler/OperationHandlerKey.java | 3 +-- .../iceland/request/handler/OperationHandlerRepository.java | 3 +-- .../n52/iceland/request/operator/GenericRequestOperator.java | 3 +-- .../org/n52/iceland/request/operator/ParameterValidator.java | 3 +-- .../org/n52/iceland/request/operator/RequestOperator.java | 3 +-- .../n52/iceland/request/operator/RequestOperatorFactory.java | 3 +-- .../org/n52/iceland/request/operator/RequestOperatorKey.java | 3 +-- .../iceland/request/operator/RequestOperatorRepository.java | 3 +-- .../java/org/n52/iceland/response/EXIResponseWriter.java | 3 +-- .../org/n52/iceland/response/EXIResponseWriterFactory.java | 3 +-- .../java/org/n52/iceland/response/JSONResponseWriter.java | 3 +-- .../org/n52/iceland/response/JSONResponseWriterFactory.java | 3 +-- .../java/org/n52/iceland/response/NoContentResponse.java | 3 +-- .../main/java/org/n52/iceland/response/ServiceResponse.java | 3 +-- .../org/n52/iceland/response/SoapChainResponseWriter.java | 3 +-- .../n52/iceland/response/SoapChainResponseWriterFactory.java | 3 +-- .../java/org/n52/iceland/response/XmlResponseWriter.java | 3 +-- .../org/n52/iceland/response/XmlResponseWriterFactory.java | 3 +-- .../iceland/service/CommunicationObjectWithSoapHeader.java | 3 +-- .../org/n52/iceland/service/DatabaseSettingsHandler.java | 3 +-- .../main/java/org/n52/iceland/service/ExceptionLogger.java | 3 +-- .../iceland/service/ImplementationVersionHeaderAdder.java | 3 +-- .../src/main/java/org/n52/iceland/service/MiscSettings.java | 3 +-- .../core/src/main/java/org/n52/iceland/service/Service.java | 3 +-- .../main/java/org/n52/iceland/service/ServiceSettings.java | 3 +-- .../n52/iceland/service/ServletConfigLocationProvider.java | 3 +-- .../main/java/org/n52/iceland/service/StreamingSettings.java | 3 +-- .../n52/iceland/service/operator/GenericServiceOperator.java | 3 +-- .../org/n52/iceland/service/operator/ServiceOperator.java | 3 +-- .../n52/iceland/service/operator/ServiceOperatorFactory.java | 3 +-- .../iceland/service/operator/ServiceOperatorRepository.java | 3 +-- .../n52/iceland/util/AbstractEnumPropertiesFileHandler.java | 3 +-- .../org/n52/iceland/util/DelegatingPropertyFileHandler.java | 3 +-- .../src/main/java/org/n52/iceland/util/FileIOHelper.java | 3 +-- .../main/java/org/n52/iceland/util/IdentifiedProducer.java | 3 +-- .../org/n52/iceland/util/LazyClosingThreadSafeProducer.java | 3 +-- .../java/org/n52/iceland/util/LazyThreadSafeProducer.java | 3 +-- .../n52/iceland/util/LocalizedLazyThreadSafeProducer.java | 3 +-- .../main/java/org/n52/iceland/util/LocalizedProducer.java | 3 +-- .../core/src/main/java/org/n52/iceland/util/MoreFiles.java | 3 +-- .../java/org/n52/iceland/util/NonNegativeBigInteger.java | 3 +-- .../main/java/org/n52/iceland/util/PositiveBigInteger.java | 3 +-- .../main/java/org/n52/iceland/util/PropertyFileHandler.java | 3 +-- .../java/org/n52/iceland/util/PropertyFileHandlerImpl.java | 3 +-- iceland/core/src/main/java/org/n52/iceland/util/Range.java | 3 +-- .../n52/iceland/util/ServletContextPropertyFileHandler.java | 3 +-- .../src/main/java/org/n52/iceland/util/XmlFactories.java | 3 +-- .../src/main/java/org/n52/iceland/util/action/Action.java | 3 +-- .../java/org/n52/iceland/util/action/CompositeAction.java | 3 +-- .../org/n52/iceland/util/action/CompositeParallelAction.java | 3 +-- .../org/n52/iceland/util/action/CompositeSerialAction.java | 3 +-- .../java/org/n52/iceland/util/action/RunnableAction.java | 3 +-- .../java/org/n52/iceland/util/action/ThreadableAction.java | 3 +-- .../java/org/n52/iceland/util/activation/Activatable.java | 3 +-- .../java/org/n52/iceland/util/activation/Activatables.java | 3 +-- .../n52/iceland/util/activation/ActivationInitializer.java | 3 +-- .../n52/iceland/util/activation/ActivationListenable.java | 3 +-- .../org/n52/iceland/util/activation/ActivationListener.java | 3 +-- .../org/n52/iceland/util/activation/ActivationListeners.java | 3 +-- .../org/n52/iceland/util/activation/ActivationManager.java | 3 +-- .../org/n52/iceland/util/activation/ActivationProvider.java | 3 +-- .../n52/iceland/util/activation/ActivationRegistrator.java | 3 +-- .../java/org/n52/iceland/util/activation/ActivationSink.java | 3 +-- .../org/n52/iceland/util/activation/ActivationSource.java | 3 +-- .../util/activation/DefaultActivationInitializer.java | 3 +-- .../java/org/n52/iceland/util/activation/DefaultActive.java | 3 +-- .../util/activation/FunctionalActivationListener.java | 3 +-- .../iceland/util/activation/SourceActivationInitializer.java | 3 +-- .../src/main/java/org/n52/iceland/util/http/HttpUtils.java | 3 +-- .../src/main/java/org/n52/iceland/util/http/NoContent.java | 3 +-- .../java/org/n52/iceland/binding/AbstractXmlBindingTest.java | 3 +-- .../test/java/org/n52/iceland/binding/SimpleBindingTest.java | 3 +-- .../src/test/java/org/n52/iceland/binding/TestBinding.java | 3 +-- .../test/java/org/n52/iceland/binding/TestXmlBinding.java | 3 +-- .../converter/RequestResponseModifierKeyTypeTest.java | 3 +-- .../test/java/org/n52/iceland/i18n/I18NSerializerTest.java | 3 +-- .../org/n52/iceland/ogc/filter/ComparisonFilterTest.java | 3 +-- .../iceland/ogc/ows/OwsServiceIdentificationFactoryTest.java | 3 +-- .../src/test/java/org/n52/iceland/response/TestResponse.java | 3 +-- .../src/test/java/org/n52/iceland/util/HasStatusCode.java | 3 +-- .../java/org/n52/iceland/util/ValidatableBigIntegers.java | 3 +-- iceland/pom.xml | 3 +-- iceland/statistics/core/pom.xml | 3 +-- .../statistics/api/AbstractElasticSearchDataHolder.java | 3 +-- .../n52/iceland/statistics/api/ElasticsearchSettings.java | 3 +-- .../iceland/statistics/api/ElasticsearchSettingsKeys.java | 3 +-- .../statistics/api/StatisticsLocationUtilSettingsKeys.java | 3 +-- .../api/interfaces/StatisticsServiceEventHandler.java | 3 +-- .../api/interfaces/StatisticsServiceEventResolver.java | 3 +-- .../api/interfaces/datahandler/IAdminDataHandler.java | 3 +-- .../api/interfaces/datahandler/IStatisticsDataHandler.java | 3 +-- .../iceland/statistics/api/mappings/MetadataDataMapping.java | 3 +-- .../statistics/api/mappings/ServiceEventDataMapping.java | 3 +-- .../statistics/api/parameters/AbstractEsParameter.java | 3 +-- .../n52/iceland/statistics/api/parameters/Description.java | 3 +-- .../statistics/api/parameters/ElasticsearchTypeRegistry.java | 3 +-- .../iceland/statistics/api/parameters/ObjectEsParameter.java | 3 +-- .../statistics/api/parameters/ObjectEsParameterFactory.java | 3 +-- .../iceland/statistics/api/parameters/SingleEsParameter.java | 3 +-- .../n52/iceland/statistics/api/utils/EventHandlerFinder.java | 3 +-- .../org/n52/iceland/statistics/api/utils/FileDownloader.java | 3 +-- .../iceland/statistics/api/utils/GeoLiteFileDownloader.java | 3 +-- .../org/n52/iceland/statistics/api/utils/KibanaImporter.java | 3 +-- .../statistics/api/utils/dto/KibanaConfigEntryDto.java | 3 +-- .../statistics/api/utils/dto/KibanaConfigHolderDto.java | 3 +-- .../impl/AbstractStatisticsServiceEventListener.java | 3 +-- .../iceland/statistics/impl/ElasticsearchAdminHandler.java | 3 +-- .../iceland/statistics/impl/ElasticsearchDataHandler.java | 3 +-- .../iceland/statistics/impl/StatisticsResolverFactory.java | 3 +-- .../impl/handlers/CountingOutputStreamEventHandler.java | 3 +-- .../statistics/impl/handlers/DefaultServiceEventHandler.java | 3 +-- .../impl/handlers/OutgoingResponseEventHandler.java | 3 +-- .../impl/handlers/exceptions/CodedExceptionEventHandler.java | 3 +-- .../impl/handlers/exceptions/OwsExceptionEventHandler.java | 3 +-- .../impl/resolvers/CountingOutputStreamEventResolver.java | 3 +-- .../impl/resolvers/DefaultServiceEventResolver.java | 3 +-- .../statistics/impl/resolvers/ExceptionEventResolver.java | 3 +-- .../impl/resolvers/OutgoingResponseEventResolver.java | 3 +-- .../impl/schemabuilders/DefaultElasticsearchSchemas.java | 3 +-- .../statistics/impl/server/EmbeddedElasticsearch.java | 3 +-- .../main/resources/statistics/countingoutputstream-event.xml | 3 +-- .../core/src/main/resources/statistics/default-event.xml | 3 +-- .../core/src/main/resources/statistics/exception-event.xml | 3 +-- .../src/main/resources/statistics/outgoingresponse-event.xml | 3 +-- .../iceland/statistics/api/ElasticsearchSettingsTest.java | 3 +-- .../iceland/statistics/api/utils/EventHandlerFinderTest.java | 3 +-- .../statistics/api/utils/GeoLiteFileDownloaderIT.java | 3 +-- .../n52/iceland/statistics/api/utils/KibanaImporterIT.java | 3 +-- .../iceland/statistics/basetests/ElasticsearchAwareTest.java | 3 +-- .../n52/iceland/statistics/basetests/MockitoBaseTest.java | 3 +-- .../org/n52/iceland/statistics/basetests/SpringBaseTest.java | 3 +-- .../iceland/statistics/impl/ElasticSearchDataHandlerIT.java | 3 +-- .../iceland/statistics/impl/ElasticsearchAdminHandlerIT.java | 3 +-- .../org/n52/iceland/statistics/impl/EmbeddedServerIT.java | 3 +-- .../org/n52/iceland/statistics/mock/MockServletContext.java | 3 +-- .../org/n52/iceland/statistics/mock/MockSettingsService.java | 3 +-- .../n52/iceland/statistics/mock/TestElasticsearchSchema.java | 3 +-- .../core/src/test/resources/statistics-test-context.xml | 3 +-- .../resources/statistics-test/countingoutputstream-event.xml | 3 +-- .../src/test/resources/statistics-test/default-event.xml | 3 +-- .../src/test/resources/statistics-test/exception-event.xml | 3 +-- .../resources/statistics-test/outgoingresponse-event.xml | 3 +-- iceland/statistics/generator/pom.xml | 3 +-- .../n52/iceland/statistics/generator/ParameterGenerator.java | 3 +-- .../n52/iceland/statistics/generator/formats/MdFormat.java | 3 +-- iceland/statistics/geolocation/pom.xml | 3 +-- .../api/interfaces/geolocation/IAdminStatisticsLocation.java | 3 +-- .../api/interfaces/geolocation/IStatisticsLocationUtil.java | 3 +-- .../statistics/impl/geolocation/StatisticsLocationUtil.java | 3 +-- .../impl/geolocation/StatisticsLocationUtilIT.java | 3 +-- iceland/statistics/kibana/pom.xml | 3 +-- .../org/n52/iceland/statistics/api/utils/KibanaExporter.java | 3 +-- janmayen/pom.xml | 3 +-- .../src/main/java/org/n52/janmayen/AbstractBuildable.java | 3 +-- .../main/java/org/n52/janmayen/AbstractThrowingIterator.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/Builder.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/Chain.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/CharacterClass.java | 3 +-- .../src/main/java/org/n52/janmayen/CharacterClasses.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/ClassHelper.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/Classes.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/Comparables.java | 3 +-- .../main/java/org/n52/janmayen/ConfigLocationProvider.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/Copyable.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/Debouncer.java | 3 +-- .../java/org/n52/janmayen/GroupedAndNamedThreadFactory.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/IntervalMap.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/IntervalTree.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/Json.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/MoreIterators.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/NcName.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/Optionals.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/Producer.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/Producers.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/Stopwatch.java | 3 +-- .../src/main/java/org/n52/janmayen/ThrowingIterator.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/TimeValue.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/Times.java | 3 +-- .../n52/janmayen/component/AbstractComponentRepository.java | 3 +-- .../component/AbstractSimilarityKeyComponentRepository.java | 3 +-- .../janmayen/component/AbstractSimilarityKeyRepository.java | 3 +-- .../org/n52/janmayen/component/ClassBasedComponentKey.java | 3 +-- .../src/main/java/org/n52/janmayen/component/Component.java | 3 +-- .../java/org/n52/janmayen/component/ComponentFactory.java | 3 +-- .../java/org/n52/janmayen/component/ComponentRepository.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/component/Keyed.java | 3 +-- .../n52/janmayen/component/SingleTypeComponentFactory.java | 3 +-- .../org/n52/janmayen/event/AbstractAsyncEventListener.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/event/Event.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/event/EventBus.java | 3 +-- .../src/main/java/org/n52/janmayen/event/EventListener.java | 3 +-- .../org/n52/janmayen/event/EventListenerRegistrator.java | 3 +-- .../java/org/n52/janmayen/exception/CompositeException.java | 3 +-- .../org/n52/janmayen/exception/LocationHintException.java | 3 +-- .../n52/janmayen/exception/StringInterpolationException.java | 3 +-- .../src/main/java/org/n52/janmayen/function/Consumers.java | 3 +-- .../src/main/java/org/n52/janmayen/function/Functions.java | 3 +-- .../src/main/java/org/n52/janmayen/function/Predicates.java | 3 +-- .../src/main/java/org/n52/janmayen/function/Suppliers.java | 3 +-- .../java/org/n52/janmayen/function/ThrowableFunction.java | 3 +-- .../java/org/n52/janmayen/function/ThrowingBiConsumer.java | 3 +-- .../java/org/n52/janmayen/function/ThrowingBiFunction.java | 3 +-- .../java/org/n52/janmayen/function/ThrowingBiPredicate.java | 3 +-- .../java/org/n52/janmayen/function/ThrowingCallable.java | 3 +-- .../java/org/n52/janmayen/function/ThrowingConsumer.java | 3 +-- .../java/org/n52/janmayen/function/ThrowingFunction.java | 3 +-- .../java/org/n52/janmayen/function/ThrowingPredicate.java | 3 +-- .../java/org/n52/janmayen/function/ThrowingRunnable.java | 3 +-- .../java/org/n52/janmayen/function/ThrowingSupplier.java | 3 +-- .../java/org/n52/janmayen/function/ThrowingTriConsumer.java | 3 +-- .../org/n52/janmayen/function/ThrowingUnaryOperator.java | 3 +-- .../src/main/java/org/n52/janmayen/function/TriConsumer.java | 3 +-- .../src/main/java/org/n52/janmayen/http/HTTPConstants.java | 3 +-- .../src/main/java/org/n52/janmayen/http/HTTPHeaders.java | 3 +-- .../src/main/java/org/n52/janmayen/http/HTTPMethods.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/http/HTTPStatus.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/http/MediaType.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/http/MediaTypes.java | 3 +-- .../src/main/java/org/n52/janmayen/http/QueryBuilder.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/i18n/ISO6392B.java | 3 +-- .../src/main/java/org/n52/janmayen/i18n/LocaleHelper.java | 3 +-- .../src/main/java/org/n52/janmayen/i18n/LocalizedString.java | 3 +-- .../main/java/org/n52/janmayen/i18n/MultilingualString.java | 3 +-- .../main/java/org/n52/janmayen/lifecycle/Constructable.java | 3 +-- .../main/java/org/n52/janmayen/lifecycle/Destroyable.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/net/IPAddress.java | 3 +-- .../src/main/java/org/n52/janmayen/net/IPAddressRange.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/net/ProxyChain.java | 3 +-- .../main/java/org/n52/janmayen/similar/CompositeSimilar.java | 3 +-- .../org/n52/janmayen/similar/ProxySimilarityComparator.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/similar/Similar.java | 3 +-- .../java/org/n52/janmayen/similar/SimilarityComparator.java | 3 +-- .../main/java/org/n52/janmayen/stream/MoreCollectors.java | 3 +-- .../src/main/java/org/n52/janmayen/stream/Streamable.java | 3 +-- .../main/java/org/n52/janmayen/stream/StreamingIterable.java | 3 +-- janmayen/src/main/java/org/n52/janmayen/stream/Streams.java | 3 +-- .../src/test/java/org/n52/janmayen/CharacterClassTest.java | 3 +-- janmayen/src/test/java/org/n52/janmayen/NcNameTest.java | 3 +-- .../test/java/org/n52/janmayen/i18n/LocaleHelperTest.java | 3 +-- .../test/java/org/n52/janmayen/net/IPAddressRangeTest.java | 3 +-- .../src/test/java/org/n52/janmayen/net/IPAddressTest.java | 3 +-- .../src/test/java/org/n52/janmayen/net/ProxyChainTest.java | 3 +-- pom.xml | 5 ++--- shetland/core/pom.xml | 3 +-- .../java/org/n52/shetland/aqd/AbstractEReportingHeader.java | 3 +-- .../src/main/java/org/n52/shetland/aqd/AqdConstants.java | 3 +-- .../core/src/main/java/org/n52/shetland/aqd/AqdNetwork.java | 3 +-- .../src/main/java/org/n52/shetland/aqd/AqdSamplingPoint.java | 3 +-- .../core/src/main/java/org/n52/shetland/aqd/AqdStation.java | 3 +-- .../src/main/java/org/n52/shetland/aqd/AqdUomRepository.java | 3 +-- .../org/n52/shetland/aqd/EReportObligationRepository.java | 3 +-- .../src/main/java/org/n52/shetland/aqd/EReportingChange.java | 3 +-- .../src/main/java/org/n52/shetland/aqd/EReportingHeader.java | 3 +-- .../core/src/main/java/org/n52/shetland/aqd/ElementType.java | 3 +-- .../src/main/java/org/n52/shetland/aqd/ReportObligation.java | 3 +-- .../main/java/org/n52/shetland/aqd/ReportObligationType.java | 3 +-- .../main/java/org/n52/shetland/aqd/ReportObligations.java | 3 +-- .../core/src/main/java/org/n52/shetland/exi/EXIObject.java | 3 +-- .../src/main/java/org/n52/shetland/filter/CountFilter.java | 3 +-- .../src/main/java/org/n52/shetland/filter/ExpandFilter.java | 3 +-- .../src/main/java/org/n52/shetland/filter/ExpandItem.java | 3 +-- .../src/main/java/org/n52/shetland/filter/FilterFilter.java | 3 +-- .../src/main/java/org/n52/shetland/filter/OrderByFilter.java | 3 +-- .../src/main/java/org/n52/shetland/filter/OrderProperty.java | 3 +-- .../src/main/java/org/n52/shetland/filter/SelectFilter.java | 3 +-- .../src/main/java/org/n52/shetland/filter/SkipTopFilter.java | 3 +-- .../org/n52/shetland/inspire/AbstractInspireKeyword.java | 3 +-- .../main/java/org/n52/shetland/inspire/GeographicalName.java | 3 +-- .../main/java/org/n52/shetland/inspire/InspireCitation.java | 3 +-- .../java/org/n52/shetland/inspire/InspireConformity.java | 3 +-- .../org/n52/shetland/inspire/InspireConformityCitation.java | 3 +-- .../main/java/org/n52/shetland/inspire/InspireConstants.java | 3 +-- .../main/java/org/n52/shetland/inspire/InspireDateOf.java | 3 +-- .../java/org/n52/shetland/inspire/InspireDateOfCreation.java | 3 +-- .../org/n52/shetland/inspire/InspireDateOfLastRevision.java | 3 +-- .../org/n52/shetland/inspire/InspireDateOfPublication.java | 3 +-- .../org/n52/shetland/inspire/InspireEuLanguageISO6392B.java | 3 +-- .../main/java/org/n52/shetland/inspire/InspireKeyword.java | 3 +-- .../org/n52/shetland/inspire/InspireLanguageISO6392B.java | 3 +-- .../org/n52/shetland/inspire/InspireMandatoryKeyword.java | 3 +-- .../n52/shetland/inspire/InspireMandatoryKeywordValue.java | 3 +-- .../n52/shetland/inspire/InspireMetadataPointOfContact.java | 3 +-- .../main/java/org/n52/shetland/inspire/InspireObject.java | 3 +-- .../inspire/InspireOriginatingControlledVocabulary.java | 3 +-- .../org/n52/shetland/inspire/InspireResourceLocator.java | 3 +-- .../java/org/n52/shetland/inspire/InspireSupportedCRS.java | 3 +-- .../org/n52/shetland/inspire/InspireSupportedLanguages.java | 3 +-- .../org/n52/shetland/inspire/InspireTemporalReference.java | 3 +-- .../shetland/inspire/InspireUniqueResourceIdentifier.java | 3 +-- .../main/java/org/n52/shetland/inspire/Pronunciation.java | 3 +-- .../src/main/java/org/n52/shetland/inspire/Spelling.java | 3 +-- .../org/n52/shetland/inspire/ad/AddressRepresentation.java | 3 +-- .../main/java/org/n52/shetland/inspire/base/Identifier.java | 3 +-- .../org/n52/shetland/inspire/base/InspireBaseConstants.java | 3 +-- .../main/java/org/n52/shetland/inspire/base2/Contact.java | 3 +-- .../org/n52/shetland/inspire/base2/DocumentCitation.java | 3 +-- .../n52/shetland/inspire/base2/InspireBase2Constants.java | 3 +-- .../org/n52/shetland/inspire/base2/LegislationCitation.java | 3 +-- .../java/org/n52/shetland/inspire/base2/RelatedParty.java | 3 +-- .../inspire/dls/FullInspireExtendedCapabilities.java | 3 +-- .../org/n52/shetland/inspire/dls/InspireCapabilities.java | 3 +-- .../shetland/inspire/dls/InspireExtendedCapabilities.java | 3 +-- .../shetland/inspire/dls/InspireExtendedCapabilitiesDLS.java | 3 +-- .../inspire/dls/MinimalInspireExtendedCapabilities.java | 3 +-- .../n52/shetland/inspire/ef/AbstractMonitoringFeature.java | 3 +-- .../n52/shetland/inspire/ef/AbstractMonitoringObject.java | 3 +-- .../main/java/org/n52/shetland/inspire/ef/AnyDomainLink.java | 3 +-- .../n52/shetland/inspire/ef/EfAbstractMonitoringFeature.java | 3 +-- .../n52/shetland/inspire/ef/EfAbstractMonitoringObject.java | 3 +-- .../inspire/ef/EfEnvironmentalMonitoringFacility.java | 3 +-- .../inspire/ef/EfEnvironmentalMonitoringNetwork.java | 3 +-- .../shetland/inspire/ef/EnvironmentalMonitoringActivity.java | 3 +-- .../shetland/inspire/ef/EnvironmentalMonitoringFacility.java | 3 +-- .../shetland/inspire/ef/EnvironmentalMonitoringNetwork.java | 3 +-- .../inspire/ef/EnvironmentalMonitoringProgramme.java | 3 +-- .../src/main/java/org/n52/shetland/inspire/ef/Hierarchy.java | 3 +-- .../java/org/n52/shetland/inspire/ef/InspireEfConstants.java | 3 +-- .../java/org/n52/shetland/inspire/ef/NetworkFacility.java | 3 +-- .../org/n52/shetland/inspire/ef/ObservingCapability.java | 3 +-- .../n52/shetland/inspire/ef/OperationalActivityPeriod.java | 3 +-- .../java/org/n52/shetland/inspire/ef/ReportToLegalAct.java | 3 +-- .../org/n52/shetland/inspire/omor/InspireOMORConstants.java | 3 +-- .../org/n52/shetland/inspire/ompr/InspireOMPRConstants.java | 3 +-- .../src/main/java/org/n52/shetland/inspire/ompr/Process.java | 3 +-- .../java/org/n52/shetland/inspire/ompr/ProcessParameter.java | 3 +-- .../shetland/inspire/omso/AbstractInspireObservation.java | 3 +-- .../org/n52/shetland/inspire/omso/InspireOMSOConstants.java | 3 +-- .../org/n52/shetland/inspire/omso/MultiPointObservation.java | 3 +-- .../java/org/n52/shetland/inspire/omso/PointObservation.java | 3 +-- .../shetland/inspire/omso/PointTimeSeriesObservation.java | 3 +-- .../org/n52/shetland/inspire/omso/ProfileObservation.java | 3 +-- .../org/n52/shetland/inspire/omso/TrajectoryObservation.java | 3 +-- .../core/src/main/java/org/n52/shetland/iso/CodeList.java | 3 +-- .../src/main/java/org/n52/shetland/iso/GcoConstants.java | 3 +-- .../src/main/java/org/n52/shetland/iso/IsoConstants.java | 3 +-- .../src/main/java/org/n52/shetland/iso/gco/AbstractRole.java | 3 +-- .../core/src/main/java/org/n52/shetland/iso/gco/Role.java | 3 +-- .../org/n52/shetland/iso/gmd/AbstractMDIdentification.java | 3 +-- .../main/java/org/n52/shetland/iso/gmd/AbstractObject.java | 3 +-- .../src/main/java/org/n52/shetland/iso/gmd/AbtractGmd.java | 3 +-- .../src/main/java/org/n52/shetland/iso/gmd/CiAddress.java | 3 +-- .../src/main/java/org/n52/shetland/iso/gmd/CiContact.java | 3 +-- .../main/java/org/n52/shetland/iso/gmd/CiOnlineResource.java | 3 +-- .../java/org/n52/shetland/iso/gmd/CiResponsibleParty.java | 3 +-- .../src/main/java/org/n52/shetland/iso/gmd/CiTelephone.java | 3 +-- .../src/main/java/org/n52/shetland/iso/gmd/EXExtent.java | 3 +-- .../main/java/org/n52/shetland/iso/gmd/EXVerticalExtent.java | 3 +-- .../src/main/java/org/n52/shetland/iso/gmd/GmdCitation.java | 3 +-- .../main/java/org/n52/shetland/iso/gmd/GmdCitationDate.java | 3 +-- .../java/org/n52/shetland/iso/gmd/GmdConformanceResult.java | 3 +-- .../src/main/java/org/n52/shetland/iso/gmd/GmdConstants.java | 3 +-- .../src/main/java/org/n52/shetland/iso/gmd/GmdDateType.java | 3 +-- .../java/org/n52/shetland/iso/gmd/GmdDomainConsistency.java | 3 +-- .../java/org/n52/shetland/iso/gmd/GmdQuantitativeResult.java | 3 +-- .../main/java/org/n52/shetland/iso/gmd/GmdSpecification.java | 3 +-- .../src/main/java/org/n52/shetland/iso/gmd/GmlBaseUnit.java | 3 +-- .../org/n52/shetland/iso/gmd/LocalisedCharacterString.java | 3 +-- .../java/org/n52/shetland/iso/gmd/MDDataIdentification.java | 3 +-- .../src/main/java/org/n52/shetland/iso/gmd/MDMetadata.java | 3 +-- .../src/main/java/org/n52/shetland/iso/gmd/PT_FreeText.java | 3 +-- .../core/src/main/java/org/n52/shetland/iso/gmd/ScCRS.java | 3 +-- .../java/org/n52/shetland/oasis/odata/ODataConstants.java | 3 +-- .../main/java/org/n52/shetland/oasis/odata/ODataExpr.java | 3 +-- .../n52/shetland/oasis/odata/query/option/QueryOptions.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/AbstractCodeType.java | 3 +-- .../main/java/org/n52/shetland/ogc/AbstractMeasureType.java | 3 +-- .../org/n52/shetland/ogc/AbstractSupportedStringType.java | 3 +-- .../main/java/org/n52/shetland/ogc/HasDefaultEncoding.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/OGCConstants.java | 3 +-- .../n52/shetland/ogc/PhenomenonNameDescriptionProvider.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/SupportedType.java | 3 +-- .../n52/shetland/ogc/SupportsObservablePropertyNames.java | 3 +-- shetland/core/src/main/java/org/n52/shetland/ogc/UoM.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/cv/CvConstants.java | 3 +-- .../shetland/ogc/filter/AbstractAdHocQueryExpression.java | 3 +-- .../n52/shetland/ogc/filter/AbstractProjectionClause.java | 3 +-- .../org/n52/shetland/ogc/filter/AbstractQueryExpression.java | 3 +-- .../org/n52/shetland/ogc/filter/AbstractSelectionClause.java | 3 +-- .../org/n52/shetland/ogc/filter/AbstractSortingClause.java | 3 +-- .../java/org/n52/shetland/ogc/filter/BinaryLogicFilter.java | 3 +-- .../java/org/n52/shetland/ogc/filter/ComparisonFilter.java | 3 +-- .../java/org/n52/shetland/ogc/filter/FesMeasureType.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/filter/FesSortBy.java | 3 +-- .../java/org/n52/shetland/ogc/filter/FesSortProperty.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/filter/Filter.java | 3 +-- .../java/org/n52/shetland/ogc/filter/FilterCapabilities.java | 3 +-- .../main/java/org/n52/shetland/ogc/filter/FilterClause.java | 3 +-- .../java/org/n52/shetland/ogc/filter/FilterConstants.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/filter/Filters.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/filter/IdFilter.java | 3 +-- .../main/java/org/n52/shetland/ogc/filter/LogicFilter.java | 3 +-- .../main/java/org/n52/shetland/ogc/filter/SpatialFilter.java | 3 +-- .../java/org/n52/shetland/ogc/filter/TemporalFilter.java | 3 +-- .../java/org/n52/shetland/ogc/filter/UnaryLogicFilter.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/gml/AbstractCRS.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/gml/AbstractCS.java | 3 +-- .../org/n52/shetland/ogc/gml/AbstractCoordinateSystem.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/AbstractDatum.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/AbstractFeature.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/gml/AbstractGML.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/AbstractGeometry.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/AbstractMetaData.java | 3 +-- .../java/org/n52/shetland/ogc/gml/AbstractReferenceType.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/gml/Aggregation.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/gml/CodeType.java | 3 +-- .../java/org/n52/shetland/ogc/gml/CodeWithAuthority.java | 3 +-- .../java/org/n52/shetland/ogc/gml/CoordinateSystemAxis.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/gml/Definition.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/DefinitionBase.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/DomainOfValidity.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/EngineeringCRS.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/gml/FeatureWith.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/GenericMetaData.java | 3 +-- .../java/org/n52/shetland/ogc/gml/GmlAbstractGeometry.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/gml/GmlConstants.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/GmlMeasureType.java | 3 +-- .../java/org/n52/shetland/ogc/gml/GmlMetaDataProperty.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/IdentifiedObject.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/ReferenceType.java | 3 +-- .../core/src/main/java/org/n52/shetland/ogc/gml/SortBy.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/UomIdentifier.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/gml/UomSymbol.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/gml/VerticalCRS.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/gml/VerticalCS.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/VerticalDatum.java | 3 +-- .../org/n52/shetland/ogc/gml/time/IndeterminateValue.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/gml/time/Time.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/time/TimeInstant.java | 3 +-- .../main/java/org/n52/shetland/ogc/gml/time/TimePeriod.java | 3 +-- .../java/org/n52/shetland/ogc/gml/time/TimePosition.java | 3 +-- .../org/n52/shetland/ogc/gmlcov/GmlCoverageConstants.java | 3 +-- .../main/java/org/n52/shetland/ogc/gwml/GWMLConstants.java | 3 +-- .../org/n52/shetland/ogc/om/AbstractObservationStream.java | 3 +-- .../org/n52/shetland/ogc/om/AbstractObservationValue.java | 3 +-- .../java/org/n52/shetland/ogc/om/AbstractPhenomenon.java | 3 +-- .../java/org/n52/shetland/ogc/om/MultiObservationValues.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/om/NamedValue.java | 3 +-- .../org/n52/shetland/ogc/om/ObservationMergeIndicator.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/ObservationStream.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/ObservationType.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/ObservationValue.java | 3 +-- .../java/org/n52/shetland/ogc/om/OmCompositePhenomenon.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/om/OmConstants.java | 3 +-- .../java/org/n52/shetland/ogc/om/OmObservableProperty.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/om/OmObservation.java | 3 +-- .../org/n52/shetland/ogc/om/OmObservationConstellation.java | 3 +-- .../java/org/n52/shetland/ogc/om/OmObservationContext.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/ParameterHolder.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/PointValuePair.java | 3 +-- .../java/org/n52/shetland/ogc/om/SingleObservationValue.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/StreamingValue.java | 3 +-- .../org/n52/shetland/ogc/om/TimeLocationValueTriple.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/om/TimeValuePair.java | 3 +-- .../org/n52/shetland/ogc/om/features/FeatureCollection.java | 3 +-- .../java/org/n52/shetland/ogc/om/features/SfConstants.java | 3 +-- .../features/samplingFeatures/AbstractSamplingFeature.java | 3 +-- .../features/samplingFeatures/FeatureOfInterestVisitor.java | 3 +-- .../om/features/samplingFeatures/InvalidSridException.java | 3 +-- .../ogc/om/features/samplingFeatures/PreparationStep.java | 3 +-- .../ogc/om/features/samplingFeatures/SamplingFeature.java | 3 +-- .../om/features/samplingFeatures/SamplingFeatureComplex.java | 3 +-- .../shetland/ogc/om/features/samplingFeatures/SfProcess.java | 3 +-- .../ogc/om/features/samplingFeatures/SfSpecimen.java | 3 +-- .../ogc/om/features/samplingFeatures/SpecLocation.java | 3 +-- .../org/n52/shetland/ogc/om/quality/OmResultQuality.java | 3 +-- .../ogc/om/series/AbstractDefaultTVPMeasurementMetadata.java | 3 +-- .../shetland/ogc/om/series/AbstractInterpolationType.java | 3 +-- .../shetland/ogc/om/series/AbstractMonitoringFeature.java | 3 +-- .../shetland/ogc/om/series/AbstractObservationProcess.java | 3 +-- .../org/n52/shetland/ogc/om/series/DefaultPointMetadata.java | 3 +-- .../ogc/om/series/MeasurementTimeseriesMetadata.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/series/Metadata.java | 3 +-- .../org/n52/shetland/ogc/om/series/TimeseriesMetadata.java | 3 +-- .../shetland/ogc/om/series/tsml/ConformanceClassesTSML.java | 3 +-- .../ogc/om/series/tsml/DefaultTVPMeasurementMetadata.java | 3 +-- .../n52/shetland/ogc/om/series/tsml/ObservationProcess.java | 3 +-- .../shetland/ogc/om/series/tsml/TimeseriesMLConstants.java | 3 +-- .../shetland/ogc/om/series/tsml/TsmlMonitoringFeature.java | 3 +-- .../shetland/ogc/om/series/wml/ConformanceClassesWML2.java | 3 +-- .../shetland/ogc/om/series/wml/ConformanceClassesWML2DR.java | 3 +-- .../ogc/om/series/wml/DefaultTVPMeasurementMetadata.java | 3 +-- .../n52/shetland/ogc/om/series/wml/ObservationProcess.java | 3 +-- .../org/n52/shetland/ogc/om/series/wml/WaterMLConstants.java | 3 +-- .../n52/shetland/ogc/om/series/wml/WmlMonitoringPoint.java | 3 +-- .../ogc/om/values/AbstractPofileTrajectoryElement.java | 3 +-- .../java/org/n52/shetland/ogc/om/values/BooleanValue.java | 3 +-- .../java/org/n52/shetland/ogc/om/values/CategoryValue.java | 3 +-- .../java/org/n52/shetland/ogc/om/values/ComparableValue.java | 3 +-- .../java/org/n52/shetland/ogc/om/values/ComplexValue.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/values/CountValue.java | 3 +-- .../n52/shetland/ogc/om/values/CvDiscretePointCoverage.java | 3 +-- .../org/n52/shetland/ogc/om/values/DiscreteCoverage.java | 3 +-- .../java/org/n52/shetland/ogc/om/values/GeometryValue.java | 3 +-- .../org/n52/shetland/ogc/om/values/HrefAttributeValue.java | 3 +-- .../org/n52/shetland/ogc/om/values/MultiPointCoverage.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/values/MultiValue.java | 3 +-- .../org/n52/shetland/ogc/om/values/NilTemplateValue.java | 3 +-- .../java/org/n52/shetland/ogc/om/values/ProfileLevel.java | 3 +-- .../java/org/n52/shetland/ogc/om/values/ProfileValue.java | 3 +-- .../org/n52/shetland/ogc/om/values/QuantityRangeValue.java | 3 +-- .../java/org/n52/shetland/ogc/om/values/QuantityValue.java | 3 +-- .../n52/shetland/ogc/om/values/RectifiedGridCoverage.java | 3 +-- .../n52/shetland/ogc/om/values/ReferencableGridCoverage.java | 3 +-- .../java/org/n52/shetland/ogc/om/values/ReferenceValue.java | 3 +-- .../org/n52/shetland/ogc/om/values/SweDataArrayValue.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/values/TLVTValue.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/values/TVPValue.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/values/TextValue.java | 3 +-- .../java/org/n52/shetland/ogc/om/values/TimeRangeValue.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/values/TimeValue.java | 3 +-- .../org/n52/shetland/ogc/om/values/TrajectoryElement.java | 3 +-- .../java/org/n52/shetland/ogc/om/values/TrajectoryValue.java | 3 +-- .../java/org/n52/shetland/ogc/om/values/UnknownValue.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/om/values/Value.java | 3 +-- .../main/java/org/n52/shetland/ogc/om/values/XmlValue.java | 3 +-- .../shetland/ogc/om/values/visitor/ProfileLevelVisitor.java | 3 +-- .../ogc/om/values/visitor/TrajectoryElementVisitor.java | 3 +-- .../org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java | 3 +-- .../n52/shetland/ogc/om/values/visitor/VoidValueVisitor.java | 3 +-- .../core/src/main/java/org/n52/shetland/ogc/ows/Enums.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/HasExtension.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OWSConstants.java | 3 +-- .../java/org/n52/shetland/ogc/ows/OwsAcceptVersions.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OwsAddress.java | 3 +-- .../main/java/org/n52/shetland/ogc/ows/OwsAllowedValues.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OwsAnyValue.java | 3 +-- .../org/n52/shetland/ogc/ows/OwsBasicIdentification.java | 3 +-- .../main/java/org/n52/shetland/ogc/ows/OwsBoundingBox.java | 3 +-- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsCRS.java | 3 +-- .../main/java/org/n52/shetland/ogc/ows/OwsCapabilities.java | 3 +-- .../org/n52/shetland/ogc/ows/OwsCapabilitiesExtension.java | 3 +-- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsCode.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OwsContact.java | 3 +-- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsDCP.java | 3 +-- .../main/java/org/n52/shetland/ogc/ows/OwsDescription.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OwsDomain.java | 3 +-- .../java/org/n52/shetland/ogc/ows/OwsDomainMetadata.java | 3 +-- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsHttp.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OwsKeyword.java | 3 +-- .../java/org/n52/shetland/ogc/ows/OwsLanguageString.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OwsMetadata.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OwsNoValues.java | 3 +-- .../java/org/n52/shetland/ogc/ows/OwsOnlineResource.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OwsOperation.java | 3 +-- .../n52/shetland/ogc/ows/OwsOperationMetadataExtension.java | 3 +-- .../java/org/n52/shetland/ogc/ows/OwsOperationsMetadata.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OwsPhone.java | 3 +-- .../java/org/n52/shetland/ogc/ows/OwsPossibleValues.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OwsRange.java | 3 +-- .../java/org/n52/shetland/ogc/ows/OwsReferenceSystem.java | 3 +-- .../main/java/org/n52/shetland/ogc/ows/OwsRequestMethod.java | 3 +-- .../java/org/n52/shetland/ogc/ows/OwsResponsibleParty.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OwsSections.java | 3 +-- .../org/n52/shetland/ogc/ows/OwsServiceIdentification.java | 3 +-- .../java/org/n52/shetland/ogc/ows/OwsServiceProvider.java | 3 +-- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsUOM.java | 3 +-- .../main/java/org/n52/shetland/ogc/ows/OwsUnNamedDomain.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/ows/OwsValue.java | 3 +-- .../java/org/n52/shetland/ogc/ows/OwsValueRestriction.java | 3 +-- .../java/org/n52/shetland/ogc/ows/OwsValuesReference.java | 3 +-- .../main/java/org/n52/shetland/ogc/ows/OwsValuesUnit.java | 3 +-- .../org/n52/shetland/ogc/ows/exception/CodedException.java | 3 +-- .../n52/shetland/ogc/ows/exception/CodedOwsException.java | 3 +-- .../shetland/ogc/ows/exception/CompositeOwsException.java | 3 +-- .../org/n52/shetland/ogc/ows/exception/ExceptionCode.java | 3 +-- .../ogc/ows/exception/InvalidParameterValueException.java | 3 +-- .../ogc/ows/exception/InvalidUpdateSequenceException.java | 3 +-- .../ogc/ows/exception/MissingParameterValueException.java | 3 +-- .../ogc/ows/exception/MissingServiceParameterException.java | 3 +-- .../ogc/ows/exception/MissingVersionParameterException.java | 3 +-- .../ogc/ows/exception/NoApplicableCodeException.java | 3 +-- .../ogc/ows/exception/OperationNotSupportedException.java | 3 +-- .../ogc/ows/exception/OptionNotSupportedException.java | 3 +-- .../org/n52/shetland/ogc/ows/exception/OwsExceptionCode.java | 3 +-- .../n52/shetland/ogc/ows/exception/OwsExceptionReport.java | 3 +-- .../ogc/ows/exception/VersionNegotiationFailedException.java | 3 +-- .../n52/shetland/ogc/ows/extension/AbstractExtension.java | 3 +-- .../shetland/ogc/ows/extension/CapabilitiesExtension.java | 3 +-- .../n52/shetland/ogc/ows/extension/DisableableExtension.java | 3 +-- .../java/org/n52/shetland/ogc/ows/extension/Extension.java | 3 +-- .../java/org/n52/shetland/ogc/ows/extension/Extensions.java | 3 +-- .../n52/shetland/ogc/ows/extension/MergableExtension.java | 3 +-- .../ogc/ows/extension/StringBasedCapabilitiesExtension.java | 3 +-- .../n52/shetland/ogc/ows/extension/StringBasedExtension.java | 3 +-- .../main/java/org/n52/shetland/ogc/ows/extension/Value.java | 3 +-- .../n52/shetland/ogc/ows/service/GetCapabilitiesRequest.java | 3 +-- .../shetland/ogc/ows/service/GetCapabilitiesResponse.java | 3 +-- .../org/n52/shetland/ogc/ows/service/OwsOperationKey.java | 3 +-- .../ogc/ows/service/OwsServiceCommunicationObject.java | 3 +-- .../java/org/n52/shetland/ogc/ows/service/OwsServiceKey.java | 3 +-- .../org/n52/shetland/ogc/ows/service/OwsServiceRequest.java | 3 +-- .../shetland/ogc/ows/service/OwsServiceRequestContext.java | 3 +-- .../org/n52/shetland/ogc/ows/service/OwsServiceResponse.java | 3 +-- .../org/n52/shetland/ogc/ows/service/ResponseFormat.java | 3 +-- .../n52/shetland/ogc/ows/service/VersionedOperationKey.java | 3 +-- .../org/n52/shetland/ogc/sensorML/AbstractComponent.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/AbstractProcess.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/AbstractSensorML.java | 3 +-- .../main/java/org/n52/shetland/ogc/sensorML/Component.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/HasComponents.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/HasConnections.java | 3 +-- .../main/java/org/n52/shetland/ogc/sensorML/HasPosition.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/HasProcessMethod.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/ProcessChain.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/ProcessMethod.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/ProcessModel.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/sensorML/Role.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/RulesDefinition.java | 3 +-- .../main/java/org/n52/shetland/ogc/sensorML/SensorML.java | 3 +-- .../org/n52/shetland/ogc/sensorML/SensorML20Constants.java | 3 +-- .../org/n52/shetland/ogc/sensorML/SensorMLConstants.java | 3 +-- .../main/java/org/n52/shetland/ogc/sensorML/SmlContact.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/SmlContactList.java | 3 +-- .../main/java/org/n52/shetland/ogc/sensorML/SmlPerson.java | 3 +-- .../org/n52/shetland/ogc/sensorML/SmlReferencedContact.java | 3 +-- .../org/n52/shetland/ogc/sensorML/SmlResponsibleParty.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/sensorML/System.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/sensorML/Term.java | 3 +-- .../sensorML/elements/AbstractDataComponentContainer.java | 3 +-- .../sensorML/elements/AbstractSmlDataComponentContainer.java | 3 +-- .../ogc/sensorML/elements/AbstractSmlDocumentation.java | 3 +-- .../n52/shetland/ogc/sensorML/elements/SmlCapabilities.java | 3 +-- .../ogc/sensorML/elements/SmlCapabilitiesPredicates.java | 3 +-- .../n52/shetland/ogc/sensorML/elements/SmlCapability.java | 3 +-- .../shetland/ogc/sensorML/elements/SmlCharacteristic.java | 3 +-- .../shetland/ogc/sensorML/elements/SmlCharacteristics.java | 3 +-- .../n52/shetland/ogc/sensorML/elements/SmlClassifier.java | 3 +-- .../ogc/sensorML/elements/SmlClassifierPredicates.java | 3 +-- .../org/n52/shetland/ogc/sensorML/elements/SmlComponent.java | 3 +-- .../n52/shetland/ogc/sensorML/elements/SmlConnection.java | 3 +-- .../n52/shetland/ogc/sensorML/elements/SmlDocumentation.java | 3 +-- .../shetland/ogc/sensorML/elements/SmlDocumentationList.java | 3 +-- .../ogc/sensorML/elements/SmlDocumentationListMember.java | 3 +-- .../n52/shetland/ogc/sensorML/elements/SmlIdentifier.java | 3 +-- .../ogc/sensorML/elements/SmlIdentifierPredicates.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/elements/SmlIo.java | 3 +-- .../n52/shetland/ogc/sensorML/elements/SmlIoPredicates.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/elements/SmlLink.java | 3 +-- .../org/n52/shetland/ogc/sensorML/elements/SmlLocation.java | 3 +-- .../org/n52/shetland/ogc/sensorML/elements/SmlParameter.java | 3 +-- .../org/n52/shetland/ogc/sensorML/elements/SmlPosition.java | 3 +-- .../org/n52/shetland/ogc/sensorML/v20/AbstractAlgorithm.java | 3 +-- .../org/n52/shetland/ogc/sensorML/v20/AbstractModes.java | 3 +-- .../shetland/ogc/sensorML/v20/AbstractPhysicalProcess.java | 3 +-- .../n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java | 3 +-- .../org/n52/shetland/ogc/sensorML/v20/AbstractSettings.java | 3 +-- .../org/n52/shetland/ogc/sensorML/v20/AggregateProcess.java | 3 +-- .../org/n52/shetland/ogc/sensorML/v20/DescribedObject.java | 3 +-- .../org/n52/shetland/ogc/sensorML/v20/PhysicalComponent.java | 3 +-- .../org/n52/shetland/ogc/sensorML/v20/PhysicalSystem.java | 3 +-- .../org/n52/shetland/ogc/sensorML/v20/SimpleProcess.java | 3 +-- .../org/n52/shetland/ogc/sensorML/v20/SmlDataInterface.java | 3 +-- .../n52/shetland/ogc/sensorML/v20/SmlFeatureOfInterest.java | 3 +-- .../java/org/n52/shetland/ogc/sensorML/v20/SpatialFrame.java | 3 +-- .../org/n52/shetland/ogc/sensorML/v20/TemporalFrame.java | 3 +-- .../main/java/org/n52/shetland/ogc/sos/BatchConstants.java | 3 +-- .../org/n52/shetland/ogc/sos/ExtendedIndeterminateTime.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/sos/FeatureType.java | 3 +-- .../java/org/n52/shetland/ogc/sos/ObjectWithXmlString.java | 3 +-- .../org/n52/shetland/ogc/sos/ProcedureDescriptionFormat.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/sos/ResultFilter.java | 3 +-- .../java/org/n52/shetland/ogc/sos/ResultFilterConstants.java | 3 +-- .../main/java/org/n52/shetland/ogc/sos/Sos1Constants.java | 3 +-- .../main/java/org/n52/shetland/ogc/sos/Sos2Constants.java | 3 +-- .../org/n52/shetland/ogc/sos/Sos2StreamingConstants.java | 3 +-- .../main/java/org/n52/shetland/ogc/sos/SosCapabilities.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/sos/SosConstants.java | 3 +-- .../org/n52/shetland/ogc/sos/SosInsertionCapabilities.java | 3 +-- .../java/org/n52/shetland/ogc/sos/SosInsertionMetadata.java | 3 +-- .../org/n52/shetland/ogc/sos/SosObservationOffering.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/sos/SosOffering.java | 3 +-- .../org/n52/shetland/ogc/sos/SosProcedureDescription.java | 3 +-- .../shetland/ogc/sos/SosProcedureDescriptionUnknownType.java | 3 +-- .../java/org/n52/shetland/ogc/sos/SosResultEncoding.java | 3 +-- .../java/org/n52/shetland/ogc/sos/SosResultStructure.java | 3 +-- .../java/org/n52/shetland/ogc/sos/SosResultTemplate.java | 3 +-- .../main/java/org/n52/shetland/ogc/sos/SosSoapConstants.java | 3 +-- .../main/java/org/n52/shetland/ogc/sos/SosSpatialFilter.java | 3 +-- .../org/n52/shetland/ogc/sos/SosSpatialFilterConstants.java | 3 +-- .../shetland/ogc/sos/delobs/DeleteObservationConstants.java | 3 +-- .../shetland/ogc/sos/delobs/DeleteObservationRequest.java | 3 +-- .../shetland/ogc/sos/delobs/DeleteObservationResponse.java | 3 +-- .../shetland/ogc/sos/drt/DeleteResultTemplateConstants.java | 3 +-- .../shetland/ogc/sos/drt/DeleteResultTemplateRequest.java | 3 +-- .../shetland/ogc/sos/drt/DeleteResultTemplateResponse.java | 3 +-- .../n52/shetland/ogc/sos/exception/CodedSosException.java | 3 +-- .../ogc/sos/exception/ResponseExceedsSizeLimitException.java | 3 +-- .../org/n52/shetland/ogc/sos/exception/SosExceptionCode.java | 3 +-- .../ogc/sos/extension/SosObservationOfferingExtension.java | 3 +-- .../shetland/ogc/sos/gda/GetDataAvailabilityConstants.java | 3 +-- .../n52/shetland/ogc/sos/gda/GetDataAvailabilityRequest.java | 3 +-- .../shetland/ogc/sos/gda/GetDataAvailabilityResponse.java | 3 +-- .../ogc/sos/ifoi/InsertFeatureOfInterestConstants.java | 3 +-- .../ogc/sos/ifoi/InsertFeatureOfInterestRequest.java | 3 +-- .../ogc/sos/ifoi/InsertFeatureOfInterestResponse.java | 3 +-- .../shetland/ogc/sos/request/AbstractObservationRequest.java | 3 +-- .../java/org/n52/shetland/ogc/sos/request/BatchRequest.java | 3 +-- .../n52/shetland/ogc/sos/request/DeleteSensorRequest.java | 3 +-- .../n52/shetland/ogc/sos/request/DescribeSensorRequest.java | 3 +-- .../ogc/sos/request/FeatureOfInterestIdentifierRequest.java | 3 +-- .../ogc/sos/request/GetFeatureOfInterestRequest.java | 3 +-- .../shetland/ogc/sos/request/GetObservationByIdRequest.java | 3 +-- .../n52/shetland/ogc/sos/request/GetObservationRequest.java | 3 +-- .../org/n52/shetland/ogc/sos/request/GetResultRequest.java | 3 +-- .../shetland/ogc/sos/request/GetResultTemplateRequest.java | 3 +-- .../shetland/ogc/sos/request/InsertObservationRequest.java | 3 +-- .../n52/shetland/ogc/sos/request/InsertResultRequest.java | 3 +-- .../ogc/sos/request/InsertResultTemplateRequest.java | 3 +-- .../n52/shetland/ogc/sos/request/InsertSensorRequest.java | 3 +-- .../ogc/sos/request/SosDescribeFeatureTypeRequest.java | 3 +-- .../ogc/sos/request/SosDescribeObservationTypeRequest.java | 3 +-- .../ogc/sos/request/SosGetFeatureOfInterestTimeRequest.java | 3 +-- .../shetland/ogc/sos/request/SosRegisterSensorRequest.java | 3 +-- .../shetland/ogc/sos/request/SpatialFeatureQueryRequest.java | 3 +-- .../ogc/sos/request/SpatialFilteringProfileRequest.java | 3 +-- .../org/n52/shetland/ogc/sos/request/SrsNameRequest.java | 3 +-- .../n52/shetland/ogc/sos/request/UpdateSensorRequest.java | 3 +-- .../ogc/sos/response/AbstractObservationResponse.java | 3 +-- .../shetland/ogc/sos/response/AbstractOperationResponse.java | 3 +-- .../org/n52/shetland/ogc/sos/response/AbstractStreaming.java | 3 +-- .../org/n52/shetland/ogc/sos/response/BatchResponse.java | 3 +-- .../shetland/ogc/sos/response/BinaryAttachmentResponse.java | 3 +-- .../n52/shetland/ogc/sos/response/DeleteSensorResponse.java | 3 +-- .../shetland/ogc/sos/response/DescribeSensorResponse.java | 3 +-- .../ogc/sos/response/GetFeatureOfInterestResponse.java | 3 +-- .../ogc/sos/response/GetObservationByIdResponse.java | 3 +-- .../shetland/ogc/sos/response/GetObservationResponse.java | 3 +-- .../org/n52/shetland/ogc/sos/response/GetResultResponse.java | 3 +-- .../shetland/ogc/sos/response/GetResultTemplateResponse.java | 3 +-- .../ogc/sos/response/GlobalObservationResponseValues.java | 3 +-- .../shetland/ogc/sos/response/InsertObservationResponse.java | 3 +-- .../n52/shetland/ogc/sos/response/InsertResultResponse.java | 3 +-- .../ogc/sos/response/InsertResultTemplateResponse.java | 3 +-- .../n52/shetland/ogc/sos/response/InsertSensorResponse.java | 3 +-- .../n52/shetland/ogc/sos/response/UpdateSensorResponse.java | 3 +-- .../java/org/n52/shetland/ogc/sos/ro/OfferingContext.java | 3 +-- .../n52/shetland/ogc/sos/ro/RelatedOfferingConstants.java | 3 +-- .../java/org/n52/shetland/ogc/sos/ro/RelatedOfferings.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/sta/StaConstants.java | 3 +-- .../org/n52/shetland/ogc/sta/exception/STACRUDException.java | 3 +-- .../sta/exception/STAInvalidFilterExpressionException.java | 3 +-- .../n52/shetland/ogc/sta/exception/STAInvalidQueryError.java | 3 +-- .../shetland/ogc/sta/exception/STAInvalidQueryException.java | 3 +-- .../shetland/ogc/sta/exception/STAInvalidUrlException.java | 3 +-- .../n52/shetland/ogc/sta/exception/STANotFoundException.java | 3 +-- .../shetland/ogc/sta/model/DatastreamEntityDefinition.java | 3 +-- .../ogc/sta/model/FeatureOfInterestEntityDefinition.java | 3 +-- .../ogc/sta/model/HistoricalLocationEntityDefinition.java | 3 +-- .../n52/shetland/ogc/sta/model/LocationEntityDefinition.java | 3 +-- .../shetland/ogc/sta/model/ObservationEntityDefinition.java | 3 +-- .../ogc/sta/model/ObservedPropertyEntityDefinition.java | 3 +-- .../org/n52/shetland/ogc/sta/model/STAEntityDefinition.java | 3 +-- .../n52/shetland/ogc/sta/model/SensorEntityDefinition.java | 3 +-- .../n52/shetland/ogc/sta/model/ThingEntityDefinition.java | 3 +-- .../ogc/swe/AbstractOptionalSweDataComponentVisitor.java | 3 +-- .../ogc/swe/AbstractThrowingSweDataComponentVisitor.java | 3 +-- .../ogc/swe/AbstractThrowingVoidSweDataComponentVisitor.java | 3 +-- .../ogc/swe/AbstractVoidSweDataComponentVisitor.java | 3 +-- .../org/n52/shetland/ogc/swe/CoordinateSettingsProvider.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/swe/DataRecord.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/swe/RangeValue.java | 3 +-- .../org/n52/shetland/ogc/swe/SweAbstractDataComponent.java | 3 +-- .../java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/swe/SweConstants.java | 3 +-- .../main/java/org/n52/shetland/ogc/swe/SweCoordinate.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java | 3 +-- .../org/n52/shetland/ogc/swe/SweDataComponentVisitor.java | 3 +-- .../main/java/org/n52/shetland/ogc/swe/SweDataRecord.java | 3 +-- .../main/java/org/n52/shetland/ogc/swe/SweDataStream.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/swe/SweEnvelope.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/swe/SweField.java | 3 +-- .../java/org/n52/shetland/ogc/swe/SweSimpleDataRecord.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/swe/SweVector.java | 3 +-- .../n52/shetland/ogc/swe/VoidSweDataComponentVisitor.java | 3 +-- .../n52/shetland/ogc/swe/encoding/SweAbstractEncoding.java | 3 +-- .../org/n52/shetland/ogc/swe/encoding/SweTextEncoding.java | 3 +-- .../shetland/ogc/swe/simpleType/SweAbstractSimpleType.java | 3 +-- .../n52/shetland/ogc/swe/simpleType/SweAbstractUomType.java | 3 +-- .../org/n52/shetland/ogc/swe/simpleType/SweAllowedTimes.java | 3 +-- .../n52/shetland/ogc/swe/simpleType/SweAllowedTokens.java | 3 +-- .../n52/shetland/ogc/swe/simpleType/SweAllowedValues.java | 3 +-- .../java/org/n52/shetland/ogc/swe/simpleType/SweBoolean.java | 3 +-- .../org/n52/shetland/ogc/swe/simpleType/SweCategory.java | 3 +-- .../n52/shetland/ogc/swe/simpleType/SweCategoryRange.java | 3 +-- .../java/org/n52/shetland/ogc/swe/simpleType/SweCount.java | 3 +-- .../org/n52/shetland/ogc/swe/simpleType/SweCountRange.java | 3 +-- .../shetland/ogc/swe/simpleType/SweObservableProperty.java | 3 +-- .../java/org/n52/shetland/ogc/swe/simpleType/SweQuality.java | 3 +-- .../org/n52/shetland/ogc/swe/simpleType/SweQuantity.java | 3 +-- .../n52/shetland/ogc/swe/simpleType/SweQuantityRange.java | 3 +-- .../java/org/n52/shetland/ogc/swe/simpleType/SweText.java | 3 +-- .../java/org/n52/shetland/ogc/swe/simpleType/SweTime.java | 3 +-- .../org/n52/shetland/ogc/swe/simpleType/SweTimeRange.java | 3 +-- .../n52/shetland/ogc/swe/stream/StreamingSweDataArray.java | 3 +-- .../main/java/org/n52/shetland/ogc/swes/AbstractSWES.java | 3 +-- .../main/java/org/n52/shetland/ogc/swes/SwesConstants.java | 3 +-- .../main/java/org/n52/shetland/ogc/swes/SwesExtension.java | 3 +-- .../org/n52/shetland/ogc/swes/SwesFeatureRelationship.java | 3 +-- .../org/n52/shetland/ogc/swes/SwesStreamingConstants.java | 3 +-- .../n52/shetland/ogc/swes/exception/SwesExceptionCode.java | 3 +-- .../java/org/n52/shetland/ogc/wps/DataTransmissionMode.java | 3 +-- .../main/java/org/n52/shetland/ogc/wps/ExecutionMode.java | 3 +-- .../core/src/main/java/org/n52/shetland/ogc/wps/Format.java | 3 +-- .../main/java/org/n52/shetland/ogc/wps/InputOccurence.java | 3 +-- .../main/java/org/n52/shetland/ogc/wps/JobControlOption.java | 3 +-- .../core/src/main/java/org/n52/shetland/ogc/wps/JobId.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/wps/JobStatus.java | 3 +-- .../main/java/org/n52/shetland/ogc/wps/OutputDefinition.java | 3 +-- .../main/java/org/n52/shetland/ogc/wps/ProcessOffering.java | 3 +-- .../main/java/org/n52/shetland/ogc/wps/ProcessOfferings.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/wps/ResponseMode.java | 3 +-- .../core/src/main/java/org/n52/shetland/ogc/wps/Result.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/wps/StatusInfo.java | 3 +-- .../main/java/org/n52/shetland/ogc/wps/WPS100Constants.java | 3 +-- .../main/java/org/n52/shetland/ogc/wps/WPS200Constants.java | 3 +-- .../main/java/org/n52/shetland/ogc/wps/WPSCapabilities.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/wps/WPSConstants.java | 3 +-- .../java/org/n52/shetland/ogc/wps/ap/ApplicationPackage.java | 3 +-- .../org/n52/shetland/ogc/wps/ap/DockerExecutionUnit.java | 3 +-- .../main/java/org/n52/shetland/ogc/wps/ap/ExecutionUnit.java | 3 +-- .../src/main/java/org/n52/shetland/ogc/wps/data/Body.java | 3 +-- .../org/n52/shetland/ogc/wps/data/FormattedProcessData.java | 3 +-- .../java/org/n52/shetland/ogc/wps/data/GroupProcessData.java | 3 +-- .../main/java/org/n52/shetland/ogc/wps/data/InlineBody.java | 3 +-- .../main/java/org/n52/shetland/ogc/wps/data/ProcessData.java | 3 +-- .../org/n52/shetland/ogc/wps/data/ReferenceProcessData.java | 3 +-- .../java/org/n52/shetland/ogc/wps/data/ReferencedBody.java | 3 +-- .../java/org/n52/shetland/ogc/wps/data/ValueProcessData.java | 3 +-- .../n52/shetland/ogc/wps/data/impl/FileBasedProcessData.java | 3 +-- .../shetland/ogc/wps/data/impl/InMemoryValueProcessData.java | 3 +-- .../shetland/ogc/wps/data/impl/StringValueProcessData.java | 3 +-- .../shetland/ogc/wps/description/BoundingBoxDescription.java | 3 +-- .../ogc/wps/description/BoundingBoxInputDescription.java | 3 +-- .../ogc/wps/description/BoundingBoxOutputDescription.java | 3 +-- .../n52/shetland/ogc/wps/description/ComplexDescription.java | 3 +-- .../ogc/wps/description/ComplexInputDescription.java | 3 +-- .../ogc/wps/description/ComplexOutputDescription.java | 3 +-- .../n52/shetland/ogc/wps/description/DataDescription.java | 3 +-- .../org/n52/shetland/ogc/wps/description/Description.java | 3 +-- .../shetland/ogc/wps/description/GroupInputDescription.java | 3 +-- .../shetland/ogc/wps/description/GroupOutputDescription.java | 3 +-- .../n52/shetland/ogc/wps/description/LiteralDataDomain.java | 3 +-- .../n52/shetland/ogc/wps/description/LiteralDescription.java | 3 +-- .../ogc/wps/description/LiteralInputDescription.java | 3 +-- .../ogc/wps/description/LiteralOutputDescription.java | 3 +-- .../n52/shetland/ogc/wps/description/ProcessDescription.java | 3 +-- .../wps/description/ProcessDescriptionBuilderFactory.java | 3 +-- .../ogc/wps/description/ProcessInputDescription.java | 3 +-- .../wps/description/ProcessInputDescriptionContainer.java | 3 +-- .../ogc/wps/description/ProcessOutputDescription.java | 3 +-- .../wps/description/ProcessOutputDescriptionContainer.java | 3 +-- .../ogc/wps/description/impl/AbstractDataDescription.java | 3 +-- .../ogc/wps/description/impl/AbstractDescription.java | 3 +-- .../description/impl/AbstractProcessInputDescription.java | 3 +-- .../description/impl/AbstractProcessOutputDescription.java | 3 +-- .../description/impl/BoundingBoxInputDescriptionImpl.java | 3 +-- .../description/impl/BoundingBoxOutputDescriptionImpl.java | 3 +-- .../wps/description/impl/ComplexInputDescriptionImpl.java | 3 +-- .../wps/description/impl/ComplexOutputDescriptionImpl.java | 3 +-- .../ogc/wps/description/impl/GroupInputDescriptionImpl.java | 3 +-- .../ogc/wps/description/impl/GroupOutputDescriptionImpl.java | 3 +-- .../ogc/wps/description/impl/LiteralDataDomainImpl.java | 3 +-- .../wps/description/impl/LiteralInputDescriptionImpl.java | 3 +-- .../wps/description/impl/LiteralOutputDescriptionImpl.java | 3 +-- .../ogc/wps/description/impl/ProcessDescriptionFactory.java | 3 +-- .../ogc/wps/description/impl/ProcessDescriptionImpl.java | 3 +-- .../n52/shetland/ogc/wps/exception/CodedWpsException.java | 3 +-- .../n52/shetland/ogc/wps/exception/NoSuchJobException.java | 3 +-- .../shetland/ogc/wps/exception/ResultNotReadyException.java | 3 +-- .../org/n52/shetland/ogc/wps/exception/WpsExceptionCode.java | 3 +-- .../n52/shetland/ogc/wps/request/AbstractJobIdRequest.java | 3 +-- .../n52/shetland/ogc/wps/request/DescribeProcessRequest.java | 3 +-- .../org/n52/shetland/ogc/wps/request/DismissRequest.java | 3 +-- .../org/n52/shetland/ogc/wps/request/ExecuteRequest.java | 3 +-- .../org/n52/shetland/ogc/wps/request/GetResultRequest.java | 3 +-- .../org/n52/shetland/ogc/wps/request/GetStatusRequest.java | 3 +-- .../shetland/ogc/wps/response/DescribeProcessResponse.java | 3 +-- .../org/n52/shetland/ogc/wps/response/DismissResponse.java | 3 +-- .../org/n52/shetland/ogc/wps/response/ExecuteResponse.java | 3 +-- .../org/n52/shetland/ogc/wps/response/GetResultResponse.java | 3 +-- .../org/n52/shetland/ogc/wps/response/GetStatusResponse.java | 3 +-- .../core/src/main/java/org/n52/shetland/util/AqdHelper.java | 3 +-- .../core/src/main/java/org/n52/shetland/util/CRSHelper.java | 3 +-- .../main/java/org/n52/shetland/util/CollectionHelper.java | 3 +-- .../main/java/org/n52/shetland/util/DateTimeException.java | 3 +-- .../java/org/n52/shetland/util/DateTimeFormatException.java | 3 +-- .../src/main/java/org/n52/shetland/util/DateTimeHelper.java | 3 +-- .../java/org/n52/shetland/util/DateTimeParseException.java | 3 +-- .../main/java/org/n52/shetland/util/EReportingSetting.java | 3 +-- .../main/java/org/n52/shetland/util/EnvelopeOrGeometry.java | 3 +-- .../main/java/org/n52/shetland/util/GeometryTransformer.java | 3 +-- shetland/core/src/main/java/org/n52/shetland/util/HTTP.java | 3 +-- .../src/main/java/org/n52/shetland/util/IdGenerator.java | 3 +-- .../core/src/main/java/org/n52/shetland/util/JTSHelper.java | 3 +-- .../core/src/main/java/org/n52/shetland/util/JavaHelper.java | 3 +-- .../core/src/main/java/org/n52/shetland/util/MinMax.java | 3 +-- .../core/src/main/java/org/n52/shetland/util/OMHelper.java | 3 +-- .../src/main/java/org/n52/shetland/util/OwsQueryBuilder.java | 3 +-- .../main/java/org/n52/shetland/util/ReferencedEnvelope.java | 3 +-- .../src/main/java/org/n52/shetland/util/SosQueryBuilder.java | 3 +-- .../src/main/java/org/n52/shetland/util/StringHelper.java | 3 +-- .../src/main/java/org/n52/shetland/uvf/UVFConstants.java | 3 +-- .../main/java/org/n52/shetland/uvf/UVFSettingsProvider.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/Nillable.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/SchemaLocation.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/W3CConstants.java | 3 +-- .../main/java/org/n52/shetland/w3c/soap/AbstractSoap.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/soap/SoapChain.java | 3 +-- .../main/java/org/n52/shetland/w3c/soap/SoapConstants.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/soap/SoapFault.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/soap/SoapHeader.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/soap/SoapRequest.java | 3 +-- .../main/java/org/n52/shetland/w3c/soap/SoapResponse.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsa/WsaActionHeader.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/wsa/WsaConstants.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/wsa/WsaHeader.java | 3 +-- .../java/org/n52/shetland/w3c/wsa/WsaMessageIDHeader.java | 3 +-- .../java/org/n52/shetland/w3c/wsa/WsaRelatesToHeader.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsa/WsaReplyToHeader.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/wsa/WsaToHeader.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsdl/AbstractAddress.java | 3 +-- .../org/n52/shetland/w3c/wsdl/AbstractDocumentedWsdl.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsdl/AbstractWsdl.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/wsdl/Binding.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsdl/BindingFault.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsdl/BindingInput.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsdl/BindingMessage.java | 3 +-- .../java/org/n52/shetland/w3c/wsdl/BindingOperation.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsdl/BindingOutput.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/wsdl/Definitions.java | 3 +-- .../java/org/n52/shetland/w3c/wsdl/ExtensibilityElement.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Fault.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Import.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/wsdl/Include.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Input.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/wsdl/Message.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/wsdl/Operation.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Output.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Param.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Part.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Port.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/wsdl/PortType.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Schema.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsdl/SchemaReference.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/wsdl/Service.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Types.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsdl/WSDLConstants.java | 3 +-- .../java/org/n52/shetland/w3c/wsdl/http/HttpAddress.java | 3 +-- .../java/org/n52/shetland/w3c/wsdl/http/HttpBinding.java | 3 +-- .../java/org/n52/shetland/w3c/wsdl/http/HttpOperation.java | 3 +-- .../java/org/n52/shetland/w3c/wsdl/http/HttpUrlEncoded.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsdl/mime/MimeXml.java | 3 +-- .../java/org/n52/shetland/w3c/wsdl/soap/SoapAddress.java | 3 +-- .../java/org/n52/shetland/w3c/wsdl/soap/SoapBinding.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsdl/soap/SoapBody.java | 3 +-- .../main/java/org/n52/shetland/w3c/wsdl/soap/SoapFault.java | 3 +-- .../java/org/n52/shetland/w3c/wsdl/soap/SoapOperation.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/xlink/Actuate.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/xlink/Link.java | 3 +-- .../src/main/java/org/n52/shetland/w3c/xlink/Reference.java | 3 +-- .../main/java/org/n52/shetland/w3c/xlink/Referenceable.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/xlink/Show.java | 3 +-- .../core/src/main/java/org/n52/shetland/w3c/xlink/Type.java | 3 +-- .../java/org/n52/shetland/w3c/xlink/W3CHrefAttribute.java | 3 +-- .../src/test/java/org/n52/shetland/ogc/gml/TimeTest.java | 3 +-- .../java/org/n52/shetland/ogc/gml/time/TimeInstantTest.java | 3 +-- .../java/org/n52/shetland/ogc/gml/time/TimePeriodTest.java | 3 +-- .../n52/shetland/ogc/om/OmObservationConstellationTest.java | 3 +-- .../test/java/org/n52/shetland/ogc/om/OmObservationTest.java | 3 +-- .../n52/shetland/ogc/om/features/FeatureCollectionTest.java | 3 +-- .../samplingFeatures/SamplingFeatureComplexTest.java | 3 +-- .../om/features/samplingFeatures/SamplingFeatureTest.java | 3 +-- .../org/n52/shetland/ogc/om/values/ProfileLevelTest.java | 3 +-- .../org/n52/shetland/ogc/om/values/ProfileValueTest.java | 3 +-- .../org/n52/shetland/ogc/ows/service/RequestContextTest.java | 3 +-- .../java/org/n52/shetland/ogc/ows/service/TestRequest.java | 3 +-- .../org/n52/shetland/ogc/sensorML/AbstractSensorMLTest.java | 3 +-- .../shetland/ogc/sensorML/elements/SmlClassifierTest.java | 3 +-- .../shetland/ogc/sensorML/elements/SmlIdentifierTest.java | 3 +-- .../org/n52/shetland/ogc/sensorML/elements/SmlIoTest.java | 3 +-- .../java/org/n52/shetland/ogc/sos/ObjectWithXmlTest.java | 3 +-- .../shetland/ogc/sos/request/GetObservationRequestTest.java | 3 +-- .../java/org/n52/shetland/ogc/swe/SweDataRecordTest.java | 3 +-- .../test/java/org/n52/shetland/ogc/swe/SweEnvelopeTest.java | 3 +-- .../n52/shetland/ogc/swe/simpleType/SosSweCategoryTest.java | 3 +-- .../test/java/org/n52/shetland/ogc/swes/ExtensionsTest.java | 3 +-- .../src/test/java/org/n52/shetland/ogc/wps/FormatTest.java | 3 +-- .../java/org/n52/shetland/util/CollectionHelperTest.java | 3 +-- .../test/java/org/n52/shetland/util/DateTimeHelperTest.java | 3 +-- .../src/test/java/org/n52/shetland/util/IdGeneratorTest.java | 3 +-- .../test/java/org/n52/shetland/util/JTSHelperForTesting.java | 3 +-- .../src/test/java/org/n52/shetland/util/JTSHelperTest.java | 3 +-- .../java/org/n52/shetland/util/ReferencedEnvelopeTest.java | 3 +-- .../core/src/test/java/org/n52/shetland/util/ReverseOf.java | 3 +-- .../test/java/org/n52/shetland/util/StringHelperTest.java | 3 +-- .../src/test/java/org/n52/shetland/util/UnknownGeometry.java | 3 +-- .../test/java/org/n52/shetland/util/http/MediaTypeTest.java | 3 +-- shetland/pom.xml | 3 +-- shetland/rdf/pom.xml | 3 +-- .../src/main/java/org/n52/shetland/rdf/AbstractDatatype.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/AbstractLang.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/AbstractProperty.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/AbstractResource.java | 3 +-- .../java/org/n52/shetland/rdf/AbstractTitleDescription.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/AbstractValue.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/ModelAdder.java | 3 +-- shetland/rdf/src/main/java/org/n52/shetland/rdf/RDF.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/RDFDataTypes.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/RDFElement.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/RDFMediaTypes.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/RdfPrefix.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/ResourceAdder.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/ResourceCreator.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/dcat/AccessURL.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/dcat/Catalog.java | 3 +-- .../main/java/org/n52/shetland/rdf/dcat/ContactPoint.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/dcat/Dataset.java | 3 +-- .../main/java/org/n52/shetland/rdf/dcat/DcatRdfPrefix.java | 3 +-- .../main/java/org/n52/shetland/rdf/dcat/Distribution.java | 3 +-- .../java/org/n52/shetland/rdf/dcat/DistributionProperty.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/dcat/DownloadURL.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/dcat/Keyword.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/dcat/LandingPage.java | 3 +-- .../main/java/org/n52/shetland/rdf/dcat/ThemeTaxonomy.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/dct/AccessRights.java | 3 +-- .../java/org/n52/shetland/rdf/dct/AccrualPeriodicity.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/dct/CLDFrequency.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/dct/DctRdfPrefix.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/dct/Description.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Format.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/dct/Identifier.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Issued.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Language.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/dct/License.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Location.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Modified.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/dct/Publisher.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Spatial.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Theme.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Title.java | 3 +-- .../main/java/org/n52/shetland/rdf/foaf/FoafRdfPrefix.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/foaf/Homepage.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/foaf/MBox.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/foaf/Name.java | 3 +-- .../main/java/org/n52/shetland/rdf/foaf/Organization.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/locn/Geometry.java | 3 +-- .../main/java/org/n52/shetland/rdf/locn/LocnRdfPrefix.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/vcard4/Email.java | 3 +-- .../rdf/src/main/java/org/n52/shetland/rdf/vcard4/FN.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/vcard4/HasEmail.java | 3 +-- .../java/org/n52/shetland/rdf/vcard4/VCardOrganization.java | 3 +-- .../java/org/n52/shetland/rdf/vcard4/Vcard4RdfPrefix.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/vocabulary/LOCN.java | 3 +-- .../src/main/java/org/n52/shetland/rdf/vocabulary/TIME.java | 3 +-- svalbard/core/pom.xml | 3 +-- .../core/src/main/java/org/n52/svalbard/CodingSettings.java | 3 +-- .../src/main/java/org/n52/svalbard/ConformanceClass.java | 3 +-- .../src/main/java/org/n52/svalbard/ConformanceClasses.java | 3 +-- .../core/src/main/java/org/n52/svalbard/ProcedureCoder.java | 3 +-- .../org/n52/svalbard/decode/AbstractDelegatingDecoder.java | 3 +-- .../org/n52/svalbard/decode/ConformanceClassDecoder.java | 3 +-- .../core/src/main/java/org/n52/svalbard/decode/Decoder.java | 3 +-- .../main/java/org/n52/svalbard/decode/DecoderFactory.java | 3 +-- .../src/main/java/org/n52/svalbard/decode/DecoderKey.java | 3 +-- .../main/java/org/n52/svalbard/decode/DecoderRepository.java | 3 +-- .../main/java/org/n52/svalbard/decode/JsonDecoderKey.java | 3 +-- .../java/org/n52/svalbard/decode/NamespaceDecoderKey.java | 3 +-- .../java/org/n52/svalbard/decode/OperationDecoderKey.java | 3 +-- .../main/java/org/n52/svalbard/decode/ProcedureDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/XmlNamespaceDecoderKey.java | 3 +-- .../n52/svalbard/decode/XmlNamespaceOperationDecoderKey.java | 3 +-- .../n52/svalbard/decode/XmlStringOperationDecoderKey.java | 3 +-- .../exception/DecoderResponseUnsupportedException.java | 3 +-- .../org/n52/svalbard/decode/exception/DecodingException.java | 3 +-- .../svalbard/decode/exception/NoDecoderForKeyException.java | 3 +-- .../decode/exception/NotYetSupportedDecodingException.java | 3 +-- .../decode/exception/UnsupportedDecoderInputException.java | 3 +-- .../n52/svalbard/decode/exception/XmlDecodingException.java | 3 +-- .../org/n52/svalbard/encode/AbstractDelegatingEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/ClassToClassEncoderKey.java | 3 +-- .../org/n52/svalbard/encode/ConformanceClassEncoder.java | 3 +-- .../core/src/main/java/org/n52/svalbard/encode/Encoder.java | 3 +-- .../main/java/org/n52/svalbard/encode/EncoderFactory.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/EncoderFlags.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/EncoderKey.java | 3 +-- .../main/java/org/n52/svalbard/encode/EncoderRepository.java | 3 +-- .../main/java/org/n52/svalbard/encode/EncodingContext.java | 3 +-- .../java/org/n52/svalbard/encode/ExceptionEncoderKey.java | 3 +-- .../java/org/n52/svalbard/encode/ObservationEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/OperationEncoderKey.java | 3 +-- .../org/n52/svalbard/encode/OperationRequestEncoderKey.java | 3 +-- .../org/n52/svalbard/encode/OperationResponseEncoderKey.java | 3 +-- .../main/java/org/n52/svalbard/encode/ProcedureEncoder.java | 3 +-- .../n52/svalbard/encode/ResponseContentTypeEncoderKey.java | 3 +-- .../java/org/n52/svalbard/encode/SchemaAwareEncoder.java | 3 +-- .../main/java/org/n52/svalbard/encode/SchemaRepository.java | 3 +-- .../main/java/org/n52/svalbard/encode/StreamingEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/StreamingEncoderFlags.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/UVFEncoder.java | 3 +-- .../n52/svalbard/encode/VersionedOperationEncoderKey.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/WmlTmlHelper.java | 3 +-- .../java/org/n52/svalbard/encode/XmlBeansEncodingFlags.java | 3 +-- .../java/org/n52/svalbard/encode/XmlDocumentEncoderKey.java | 3 +-- .../main/java/org/n52/svalbard/encode/XmlEncoderFlags.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/XmlEncoderKey.java | 3 +-- .../org/n52/svalbard/encode/XmlPropertyTypeEncoderKey.java | 3 +-- .../java/org/n52/svalbard/encode/XmlStreamEncoderFlags.java | 3 +-- .../exception/EncoderResponseUnsupportedException.java | 3 +-- .../org/n52/svalbard/encode/exception/EncodingException.java | 3 +-- .../svalbard/encode/exception/NoEncoderForKeyException.java | 3 +-- .../encode/exception/NotYetSupportedEncodingException.java | 3 +-- .../encode/exception/UnsupportedEncoderInputException.java | 3 +-- .../src/main/java/org/n52/svalbard/util/CodingHelper.java | 3 +-- .../core/src/main/java/org/n52/svalbard/util/GmlHelper.java | 3 +-- .../src/main/java/org/n52/svalbard/util/N52XmlHelper.java | 3 +-- .../java/org/n52/svalbard/util/NamespaceContextBuilder.java | 3 +-- .../core/src/main/java/org/n52/svalbard/util/SweHelper.java | 3 +-- .../core/src/main/java/org/n52/svalbard/util/XmlHelper.java | 3 +-- .../main/java/org/n52/svalbard/util/XmlOptionsHelper.java | 3 +-- svalbard/core/src/main/resources/svalbard-core-context.xml | 3 +-- .../java/org/n52/svalbard/AbstractXmlBeansGenerator.java | 3 +-- .../test/java/org/n52/svalbard/encode/UVFEncoderTest.java | 3 +-- svalbard/exi/pom.xml | 3 +-- .../src/main/java/org/n52/svalbard/encode/ExiEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/ExiExceptionEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/ExiResponseEncoder.java | 3 +-- svalbard/exi/src/main/resources/svalbard-exi-context.xml | 3 +-- .../src/test/java/org/n52/svalbard/XmlToExiConverter.java | 3 +-- svalbard/exi/src/test/resources/xml/DescribeSensor.xml | 3 +-- svalbard/exi/src/test/resources/xml/GetCapabilities.xml | 3 +-- svalbard/exi/src/test/resources/xml/GetDataAvailability.xml | 3 +-- svalbard/exi/src/test/resources/xml/GetFeatureOfInterest.xml | 3 +-- svalbard/exi/src/test/resources/xml/GetObservation.xml | 3 +-- svalbard/exi/src/test/resources/xml/GetObservationById.xml | 3 +-- svalbard/json-common/pom.xml | 3 +-- .../java/org/n52/svalbard/coding/json/AQDJSONConstants.java | 3 +-- .../n52/svalbard/coding/json/GeoJSONDecodingException.java | 3 +-- .../n52/svalbard/coding/json/GeoJSONEncodingException.java | 3 +-- .../java/org/n52/svalbard/coding/json/JSONConstants.java | 3 +-- .../java/org/n52/svalbard/coding/json/JSONValidator.java | 3 +-- .../java/org/n52/svalbard/coding/json/SchemaConstants.java | 3 +-- .../n52/svalbard/decode/json/AbstractSosRequestDecoder.java | 3 +-- .../main/java/org/n52/svalbard/decode/json/JSONDecoder.java | 3 +-- .../org/n52/svalbard/decode/json/JSONDecodingException.java | 3 +-- .../n52/svalbard/encode/json/AbstractSosResponseEncoder.java | 3 +-- .../main/java/org/n52/svalbard/encode/json/JSONEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/json/JSONEncoderKey.java | 3 +-- .../org/n52/svalbard/encode/json/JSONEncodingException.java | 3 +-- .../n52/svalbard/encode/json/base/BigDecimalJSONEncoder.java | 3 +-- .../n52/svalbard/encode/json/base/BigIntegerJSONEncoder.java | 3 +-- .../n52/svalbard/encode/json/base/BooleanJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/base/ByteJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/base/DoubleJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/base/FloatJSONEncoder.java | 3 +-- .../n52/svalbard/encode/json/base/IntegerJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/base/LongJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/base/ShortJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/base/StringJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/base/TimeJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/base/URIJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/base/URLJSONEncoder.java | 3 +-- .../src/main/resources/svalbard-json-common-context.xml | 3 +-- .../svalbard/coding/json/JSONEncoderForExceptionTesting.java | 3 +-- .../org/n52/svalbard/coding/json/JSONEncoderForTesting.java | 3 +-- .../java/org/n52/svalbard/coding/json/JSONEncoderTest.java | 3 +-- .../n52/svalbard/coding/json/JSONSchemaValidationTest.java | 3 +-- .../java/org/n52/svalbard/coding/json/JSONValidatorTest.java | 3 +-- .../java/org/n52/svalbard/coding/json/matchers/Does.java | 3 +-- .../org/n52/svalbard/coding/json/matchers/JSONMatchers.java | 3 +-- .../svalbard/coding/json/matchers/ValidationMatchers.java | 3 +-- svalbard/json/pom.xml | 3 +-- .../org/n52/svalbard/decode/json/AbstractJSONDecoder.java | 3 +-- .../org/n52/svalbard/decode/json/AddressJSONDecoder.java | 3 +-- .../org/n52/svalbard/decode/json/BatchRequestDecoder.java | 3 +-- .../org/n52/svalbard/decode/json/ContactJSONDecoder.java | 3 +-- .../svalbard/decode/json/DeleteObservationJsonDecoder.java | 3 +-- .../n52/svalbard/decode/json/DeleteSensorRequestDecoder.java | 3 +-- .../svalbard/decode/json/DescribeSensorRequestDecoder.java | 3 +-- .../svalbard/decode/json/EReportingChangeJSONDecoder.java | 3 +-- .../svalbard/decode/json/EReportingHeaderJSONDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/json/FeatureDecoder.java | 3 +-- .../main/java/org/n52/svalbard/decode/json/FieldDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/json/GeoJSONDecoder.java | 3 +-- .../svalbard/decode/json/GeographicalNameJSONDecoder.java | 3 +-- .../svalbard/decode/json/GetCapabilitiesRequestDecoder.java | 3 +-- .../svalbard/decode/json/GetDataAvailabilityJsonDecoder.java | 3 +-- .../decode/json/GetFeatureOfInterestRequestDecoder.java | 3 +-- .../decode/json/GetObservationByIdRequestDecoder.java | 3 +-- .../svalbard/decode/json/GetObservationRequestDecoder.java | 3 +-- .../n52/svalbard/decode/json/GetResultRequestDecoder.java | 3 +-- .../decode/json/GetResultTemplateRequestDecoder.java | 3 +-- .../decode/json/InsertObservationRequestDecoder.java | 3 +-- .../n52/svalbard/decode/json/InsertResultRequestDecoder.java | 3 +-- .../decode/json/InsertResultTemplateRequestDecoder.java | 3 +-- .../n52/svalbard/decode/json/InsertSensorRequestDecoder.java | 3 +-- .../org/n52/svalbard/decode/json/InspireIDJSONDecoder.java | 3 +-- .../org/n52/svalbard/decode/json/ObservationDecoder.java | 3 +-- .../n52/svalbard/decode/json/PronunciationJSONDecoder.java | 3 +-- .../n52/svalbard/decode/json/RelatedPartyJSONDecoder.java | 3 +-- .../svalbard/decode/json/ReportObligationJSONDecoder.java | 3 +-- .../org/n52/svalbard/decode/json/SpatialFilterDecoder.java | 3 +-- .../org/n52/svalbard/decode/json/SpellingJSONDecoder.java | 3 +-- .../org/n52/svalbard/decode/json/TemporalFilterDecoder.java | 3 +-- .../n52/svalbard/decode/json/UpdateSensorRequestDecoder.java | 3 +-- .../svalbard/decode/json/wps/ApplicationPackageDecoder.java | 3 +-- .../svalbard/decode/json/wps/DockerExecutionUnitDecoder.java | 3 +-- .../n52/svalbard/decode/json/wps/ExecutionUnitDecoder.java | 3 +-- .../svalbard/decode/json/wps/ProcessDescriptionDecoder.java | 3 +-- .../n52/svalbard/decode/json/wps/ProcessOfferingDecoder.java | 3 +-- .../encode/json/AbstractObservationResponseEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/AddressJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/BatchResponseEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/CodeTypeJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/ContactJSONEncoder.java | 3 +-- .../svalbard/encode/json/DeleteObservationJsonEncoder.java | 3 +-- .../svalbard/encode/json/DeleteSensorResponseEncoder.java | 3 +-- .../svalbard/encode/json/DescribeSensorResponseEncoder.java | 3 +-- .../svalbard/encode/json/EReportingChangeJSONEncoder.java | 3 +-- .../svalbard/encode/json/EReportingHeaderJSONEncoder.java | 3 +-- .../n52/svalbard/encode/json/FeatureOfInterestEncoder.java | 3 +-- .../main/java/org/n52/svalbard/encode/json/FieldEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/json/GeoJSONEncoder.java | 3 +-- .../n52/svalbard/encode/json/GeographicNameJSONEncoder.java | 3 +-- .../svalbard/encode/json/GetCapabilitiesResponseEncoder.java | 3 +-- .../svalbard/encode/json/GetDataAvailabilityJsonEncoder.java | 3 +-- .../encode/json/GetFeatureOfInterestResponseEncoder.java | 3 +-- .../encode/json/GetObservationByIdResponseEncoder.java | 3 +-- .../svalbard/encode/json/GetObservationResponseEncoder.java | 3 +-- .../n52/svalbard/encode/json/GetResultResponseEncoder.java | 3 +-- .../encode/json/GetResultTemplateResponseEncoder.java | 3 +-- .../encode/json/InsertObservationResponseEncoder.java | 3 +-- .../svalbard/encode/json/InsertResultResponseEncoder.java | 3 +-- .../encode/json/InsertResultTemplateResponseEncoder.java | 3 +-- .../svalbard/encode/json/InsertSensorResponseEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/InspireIDJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/IterableJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/NillableJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/ObservationEncoder.java | 3 +-- .../n52/svalbard/encode/json/OwsExceptionReportEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/PTFreeTextJSONEncoder.java | 3 +-- .../n52/svalbard/encode/json/PronunciationJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/ReferenceJSONEncoder.java | 3 +-- .../n52/svalbard/encode/json/ReferenceableJSONEncoder.java | 3 +-- .../n52/svalbard/encode/json/RelatedPartyJSONEncoder.java | 3 +-- .../svalbard/encode/json/ReportObligationJSONEncoder.java | 3 +-- .../org/n52/svalbard/encode/json/SpellingJSONEncoder.java | 3 +-- .../svalbard/encode/json/UpdateSensorResponseEncoder.java | 3 +-- .../svalbard/encode/json/wps/ApplicationPackageEncoder.java | 3 +-- .../svalbard/encode/json/wps/DockerExecutionUnitEncoder.java | 3 +-- .../svalbard/encode/json/wps/ProcessDescriptionEncoder.java | 3 +-- .../n52/svalbard/encode/json/wps/ProcessOfferingEncoder.java | 3 +-- .../json/src/main/resources/examples/sos/BatchRequest.json | 2 +- .../src/main/resources/examples/sos/InsertSensorRequest.json | 2 +- svalbard/json/src/main/resources/svalbard-json-context.xml | 3 +-- .../java/org/n52/svalbard/ConfiguredSettingsManager.java | 3 +-- .../src/test/java/org/n52/svalbard/XmlBeansGenerator.java | 3 +-- .../n52/svalbard/coding/AbstractEReportingHeaderCoding.java | 3 +-- .../src/test/java/org/n52/svalbard/coding/GeoJSONTest.java | 3 +-- .../org/n52/svalbard/coding/ObservationValidationTest.java | 3 +-- .../n52/svalbard/decode/json/BatchRequestDecodingTest.java | 3 +-- .../decode/json/CategoryObservationDecodingTest.java | 3 +-- .../svalbard/decode/json/CountObservationDecodingTest.java | 3 +-- .../decode/json/EReportingHeaderJSONDecoderTest.java | 3 +-- .../java/org/n52/svalbard/decode/json/FieldDecoderTest.java | 3 +-- .../decode/json/GeometryObservationDecodingTest.java | 3 +-- .../decode/json/GetCapabilitiesRequestDecoderTest.java | 3 +-- .../decode/json/GetObservationRequestDecoderTest.java | 3 +-- .../decode/json/InsertObservationRequestDecoderTest.java | 3 +-- .../decode/json/InsertResultTemplateRequestDecoderTest.java | 3 +-- .../svalbard/decode/json/InsertSensorRequestDecoderTest.java | 3 +-- .../n52/svalbard/decode/json/MeasurementDecodingTest.java | 3 +-- .../svalbard/decode/json/TextObservationDecodingTest.java | 3 +-- .../svalbard/decode/json/TruthObservationDecodingTest.java | 3 +-- .../decode/json/wps/ApplicationPackageDecoderTest.java | 3 +-- .../encode/json/EReportingHeaderJSONEncoderTest.java | 3 +-- .../svalbard/encode/json/OwsExceptionReportEncoderTest.java | 3 +-- svalbard/odata/pom.xml | 3 +-- .../src/main/java/org/n52/svalbard/odata/ODataFesParser.java | 3 +-- .../org/n52/svalbard/odata/ObservationCsdlEdmProvider.java | 3 +-- .../org/n52/svalbard/odata/core/QueryOptionsFactory.java | 3 +-- .../org/n52/svalbard/odata/core/STAQueryOptionVisitor.java | 3 +-- .../java/org/n52/svalbard/odata/core/expr/BinaryExpr.java | 3 +-- .../org/n52/svalbard/odata/core/expr/DirectTextExpr.java | 3 +-- .../src/main/java/org/n52/svalbard/odata/core/expr/Expr.java | 3 +-- .../java/org/n52/svalbard/odata/core/expr/ExprVisitor.java | 3 +-- .../java/org/n52/svalbard/odata/core/expr/GeoValueExpr.java | 3 +-- .../java/org/n52/svalbard/odata/core/expr/MemberExpr.java | 3 +-- .../org/n52/svalbard/odata/core/expr/MethodCallExpr.java | 3 +-- .../org/n52/svalbard/odata/core/expr/StringValueExpr.java | 3 +-- .../main/java/org/n52/svalbard/odata/core/expr/TextExpr.java | 3 +-- .../java/org/n52/svalbard/odata/core/expr/UnaryExpr.java | 3 +-- .../svalbard/odata/core/expr/arithmetic/ArithmeticExpr.java | 3 +-- .../odata/core/expr/arithmetic/NumericValueExpr.java | 3 +-- .../odata/core/expr/arithmetic/SimpleArithmeticExpr.java | 3 +-- .../n52/svalbard/odata/core/expr/bool/BooleanBinaryExpr.java | 3 +-- .../org/n52/svalbard/odata/core/expr/bool/BooleanExpr.java | 3 +-- .../n52/svalbard/odata/core/expr/bool/BooleanUnaryExpr.java | 3 +-- .../n52/svalbard/odata/core/expr/bool/ComparisonExpr.java | 3 +-- .../n52/svalbard/odata/core/expr/temporal/TemporalExpr.java | 3 +-- .../n52/svalbard/odata/core/expr/temporal/TimeValueExpr.java | 3 +-- svalbard/odata/src/main/spotbugs/ignore.xml | 3 +-- .../org/n52/svalbard/odata/core/ExampleQueryOptionTest.java | 3 +-- .../org/n52/svalbard/odata/core/ExpandQueryOptionTest.java | 3 +-- .../java/org/n52/svalbard/odata/core/Iso8601ParserTest.java | 3 +-- .../java/org/n52/svalbard/odata/core/ODataFesParserTest.java | 3 +-- .../org/n52/svalbard/odata/core/OrderByQueryOptionTest.java | 3 +-- .../n52/svalbard/odata/core/QueryOptionCombinationTest.java | 3 +-- .../java/org/n52/svalbard/odata/core/QueryOptionTests.java | 3 +-- .../org/n52/svalbard/odata/core/QueryOptionToStringTest.java | 3 +-- .../org/n52/svalbard/odata/core/SelectQueryOptionTest.java | 3 +-- .../org/n52/svalbard/odata/core/SkipQueryOptionTest.java | 3 +-- .../test/java/org/n52/svalbard/odata/core/TestConstants.java | 3 +-- .../java/org/n52/svalbard/odata/core/TopQueryOptionTest.java | 3 +-- svalbard/pom.xml | 3 +-- svalbard/xmlbeans/pom.xml | 3 +-- .../src/main/java/org/n52/svalbard/OwsEncoderSettings.java | 3 +-- .../src/main/java/org/n52/svalbard/XPathConstants.java | 3 +-- .../svalbard/decode/AbstractCapabilitiesBaseTypeDecoder.java | 3 +-- .../decode/AbstractGetDataAvailabilityXmlDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java | 3 +-- .../java/org/n52/svalbard/decode/AbstractOmDecoderv20.java | 3 +-- .../java/org/n52/svalbard/decode/AbstractProcessDecoder.java | 3 +-- .../org/n52/svalbard/decode/AbstractSensorMLDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/AbstractSoapDecoder.java | 3 +-- .../org/n52/svalbard/decode/AbstractSoapStringDecoder.java | 3 +-- .../n52/svalbard/decode/AbstractStringRequestDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java | 3 +-- .../java/org/n52/svalbard/decode/AbstractWmlDecoderv20.java | 3 +-- .../java/org/n52/svalbard/decode/AbstractXmlDecoder.java | 3 +-- .../src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java | 3 +-- .../java/org/n52/svalbard/decode/AqdStringDecoderv10.java | 3 +-- .../org/n52/svalbard/decode/CapabilitiesBaseTypeDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/CapabilitiesDecoder.java | 3 +-- .../org/n52/svalbard/decode/CapabilitiesDocumentDecoder.java | 3 +-- .../org/n52/svalbard/decode/CapabilitiesTypeDecoder.java | 3 +-- .../n52/svalbard/decode/CapabilitiesV1DocumentDecoder.java | 3 +-- .../org/n52/svalbard/decode/DeleteObservationDecoder.java | 3 +-- .../n52/svalbard/decode/DeleteObservationStringDecoder.java | 3 +-- .../org/n52/svalbard/decode/DeleteObservationV20Decoder.java | 3 +-- .../org/n52/svalbard/decode/DeleteResultTemplateDecoder.java | 3 +-- .../svalbard/decode/DeleteResultTemplateStringDecoder.java | 3 +-- .../decode/DescribeSensorResponseSwesDocumentDecoder.java | 3 +-- .../org/n52/svalbard/decode/DocumentCitationTypeDecoder.java | 3 +-- .../org/n52/svalbard/decode/ExtensibleResponseDecoder.java | 3 +-- .../src/main/java/org/n52/svalbard/decode/FesDecoderv20.java | 3 +-- .../svalbard/decode/GetDataAvailabilityResponseDecoder.java | 3 +-- .../svalbard/decode/GetDataAvailabilityStringDecoder.java | 3 +-- .../svalbard/decode/GetDataAvailabilityV20XmlDecoder.java | 3 +-- .../n52/svalbard/decode/GetDataAvailabilityXmlDecoder.java | 3 +-- .../decode/GetFeatureOfInterestResponseDocumentDecoder.java | 3 +-- .../decode/GetObservationByIdResponseDocumentDecoder.java | 3 +-- .../decode/GetObservationResponseDocumentDecoder.java | 3 +-- .../main/java/org/n52/svalbard/decode/GmlDecoderv311.java | 3 +-- .../main/java/org/n52/svalbard/decode/GmlDecoderv321.java | 3 +-- .../java/org/n52/svalbard/decode/InpspireOMSODecoder.java | 3 +-- .../n52/svalbard/decode/InsertFeatureOfInterestDecoder.java | 3 +-- .../decode/InsertFeatureOfInterestStringDecoder.java | 3 +-- .../svalbard/decode/InsertObservationResponseV20Decoder.java | 3 +-- .../org/n52/svalbard/decode/InsertResultResponseDecoder.java | 3 +-- .../svalbard/decode/InsertResultTemplateResponseDecoder.java | 3 +-- .../org/n52/svalbard/decode/InsertSensorResponseDecoder.java | 3 +-- .../main/java/org/n52/svalbard/decode/InspireXmlDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/Iso19139GcoDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/Iso19139GmdDecoder.java | 3 +-- .../main/java/org/n52/svalbard/decode/OgcDecoderv100.java | 3 +-- .../src/main/java/org/n52/svalbard/decode/OmDecoderv20.java | 3 +-- .../org/n52/svalbard/decode/OwsExceptionReportDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/ProcessDocumentDecoder.java | 3 +-- .../org/n52/svalbard/decode/ProcessPropertyTypeDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/ProcessTypeDecoder.java | 3 +-- .../org/n52/svalbard/decode/RelatedOfferingTypeDecoder.java | 3 +-- .../org/n52/svalbard/decode/RelatedPartyTypeDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/ResultFilterDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/ResultFilterDecoderv20.java | 3 +-- .../java/org/n52/svalbard/decode/SamplingDecoderv20.java | 3 +-- .../java/org/n52/svalbard/decode/SensorMLDecoderV101.java | 3 +-- .../java/org/n52/svalbard/decode/SensorMLDecoderV20.java | 3 +-- .../src/main/java/org/n52/svalbard/decode/Soap11Decoder.java | 3 +-- .../java/org/n52/svalbard/decode/Soap11StringDecoder.java | 3 +-- .../src/main/java/org/n52/svalbard/decode/Soap12Decoder.java | 3 +-- .../java/org/n52/svalbard/decode/Soap12StringDecoder.java | 3 +-- .../main/java/org/n52/svalbard/decode/SosDecoderv100.java | 3 +-- .../src/main/java/org/n52/svalbard/decode/SosDecoderv20.java | 3 +-- .../java/org/n52/svalbard/decode/SosResponseDecoder.java | 3 +-- .../org/n52/svalbard/decode/SosSpatialFilterDecoder.java | 3 +-- .../java/org/n52/svalbard/decode/SosStringDecoderv100.java | 3 +-- .../java/org/n52/svalbard/decode/SosStringDecoderv20.java | 3 +-- .../java/org/n52/svalbard/decode/SpecimenDecoderv20.java | 3 +-- .../java/org/n52/svalbard/decode/SweCommonDecoderV101.java | 3 +-- .../java/org/n52/svalbard/decode/SweCommonDecoderV20.java | 3 +-- .../main/java/org/n52/svalbard/decode/SwesDecoderv20.java | 3 +-- .../org/n52/svalbard/decode/SwesExtensionDecoderv20.java | 3 +-- .../java/org/n52/svalbard/decode/SwesStringDecoderv20.java | 3 +-- .../svalbard/decode/TsmlObservationProcessDecoderv10.java | 3 +-- .../n52/svalbard/decode/WmlMonitoringPointDecoderv20.java | 3 +-- .../n52/svalbard/decode/WmlObservationProcessDecoderv20.java | 3 +-- .../src/main/java/org/n52/svalbard/decode/WsaDecoder.java | 3 +-- .../main/java/org/n52/svalbard/decode/XlinkDecoderv1999.java | 3 +-- .../exception/UnsupportedDecoderXmlInputException.java | 3 +-- .../org/n52/svalbard/encode/AbstractAqdResponseEncoder.java | 3 +-- .../encode/AbstractCVDiscretePointCoverageTypeEncoder.java | 3 +-- .../org/n52/svalbard/encode/AbstractCoverageEncoder.java | 3 +-- .../encode/AbstractEnvironmentalFaciltityEncoder.java | 3 +-- .../AbstractEnvironmentalMonitoringFaciltityEncoder.java | 3 +-- .../svalbard/encode/AbstractGWGeologyLogCoverageType.java | 3 +-- .../java/org/n52/svalbard/encode/AbstractGmlEncoderv321.java | 3 +-- .../n52/svalbard/encode/AbstractGroundWaterMLEncoder.java | 3 +-- .../org/n52/svalbard/encode/AbstractIdentifierEncoder.java | 3 +-- .../org/n52/svalbard/encode/AbstractIso19139GcoEncoder.java | 3 +-- .../org/n52/svalbard/encode/AbstractLogValueTypeEncoder.java | 3 +-- .../svalbard/encode/AbstractMonitoringFeatureEncoder.java | 3 +-- .../n52/svalbard/encode/AbstractMonitoringObjectEncoder.java | 3 +-- .../encode/AbstractMultiPointCoverageTypeEncoder.java | 3 +-- .../svalbard/encode/AbstractObservationResponseEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/AbstractOmEncoderv20.java | 3 +-- .../org/n52/svalbard/encode/AbstractOmInspireEncoder.java | 3 +-- .../encode/AbstractOperationalActivityPeriodEncoder.java | 3 +-- .../encode/AbstractRectifiedGridCoverageTypeEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/AbstractRequestEncoder.java | 3 +-- .../org/n52/svalbard/encode/AbstractResponseEncoder.java | 3 +-- .../encode/AbstractReverencableGridCoverageType.java | 3 +-- .../org/n52/svalbard/encode/AbstractSensorMLEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/AbstractSoapEncoder.java | 3 +-- .../org/n52/svalbard/encode/AbstractSosRequestEncoder.java | 3 +-- .../org/n52/svalbard/encode/AbstractSosResponseEncoder.java | 3 +-- .../org/n52/svalbard/encode/AbstractSosV1RequestEncoder.java | 3 +-- .../n52/svalbard/encode/AbstractSosV1ResponseEncoder.java | 3 +-- .../org/n52/svalbard/encode/AbstractSwesRequestEncoder.java | 3 +-- .../org/n52/svalbard/encode/AbstractSwesResponseEncoder.java | 3 +-- .../encode/AbstractTimeLocationValueTripleTypeEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/AbstractTsmlEncoderv10.java | 3 +-- .../svalbard/encode/AbstractVersionedResponseEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/AbstractWmlEncoderv20.java | 3 +-- .../java/org/n52/svalbard/encode/AbstractXmlEncoder.java | 3 +-- .../org/n52/svalbard/encode/AbstractXmlResponseEncoder.java | 3 +-- .../svalbard/encode/AqdDescribeSensorResponseEncoder.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/AqdEncoder.java | 3 +-- .../svalbard/encode/AqdGetCapabilitiesResponseEncoder.java | 3 +-- .../svalbard/encode/AqdGetObservationResponseEncoder.java | 3 +-- .../encode/CVDiscretePointCoveragePropertyTypeEncoder.java | 3 +-- .../encode/CVDiscreteTimeInstantCoverageEncoder.java | 3 +-- .../org/n52/svalbard/encode/DeleteObservationEncoder.java | 3 +-- .../org/n52/svalbard/encode/DeleteObservationV20Encoder.java | 3 +-- .../org/n52/svalbard/encode/DeleteResultTemplateEncoder.java | 3 +-- .../org/n52/svalbard/encode/DeleteSensorResponseEncoder.java | 3 +-- .../n52/svalbard/encode/DescribeSensorResponseEncoder.java | 3 +-- .../n52/svalbard/encode/DescribeSensorV1RequestEncoder.java | 3 +-- .../n52/svalbard/encode/DescribeSensorV2RequestEncoder.java | 3 +-- .../org/n52/svalbard/encode/DocumentCitationTypeEncoder.java | 3 +-- .../EnvironmentalMonitoringFaciltityDocumentEncoder.java | 3 +-- ...lMonitoringFaciltityForGmlFeaturePropertyTypeEncoder.java | 3 +-- .../EnvironmentalMonitoringFaciltityPropertyTypeEncoder.java | 3 +-- .../encode/EnvironmentalMonitoringFaciltityTypeEncoder.java | 3 +-- .../org/n52/svalbard/encode/ExtensibleRequestEncoder.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/FesEncoderv20.java | 3 +-- .../encode/GWGeologyLogCoveragePropertyTypeEncoder.java | 3 +-- .../svalbard/encode/GWGeologyLogObservationTypeEncoder.java | 3 +-- .../n52/svalbard/encode/GetCapabilitiesRequestEncoder.java | 3 +-- .../n52/svalbard/encode/GetCapabilitiesResponseEncoder.java | 3 +-- .../n52/svalbard/encode/GetCapabilitiesV1RequestEncoder.java | 3 +-- .../svalbard/encode/GetDataAvailabilityRequestEncoder.java | 3 +-- .../n52/svalbard/encode/GetDataAvailabilityXmlEncoder.java | 3 +-- .../svalbard/encode/GetFeatureOfInterestRequestEncoder.java | 3 +-- .../svalbard/encode/GetFeatureOfInterestResponseEncoder.java | 3 +-- .../svalbard/encode/GetObservationByIdRequestEncoder.java | 3 +-- .../svalbard/encode/GetObservationByIdResponseEncoder.java | 3 +-- .../n52/svalbard/encode/GetObservationRequestEncoder.java | 3 +-- .../n52/svalbard/encode/GetObservationResponseEncoder.java | 3 +-- .../org/n52/svalbard/encode/GetResultResponseEncoder.java | 3 +-- .../svalbard/encode/GetResultTemplateResponseEncoder.java | 3 +-- .../main/java/org/n52/svalbard/encode/GmlEncoderv311.java | 3 +-- .../main/java/org/n52/svalbard/encode/GmlEncoderv321.java | 3 +-- .../main/java/org/n52/svalbard/encode/GwmlEncoderv22.java | 3 +-- .../n52/svalbard/encode/IdentifierPropertyTypeEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/IdentifierTypeEncoder.java | 3 +-- .../n52/svalbard/encode/InsertFeatureOfInterestEncoder.java | 3 +-- .../n52/svalbard/encode/InsertObservationRequestEncoder.java | 3 +-- .../svalbard/encode/InsertObservationResponseEncoder.java | 3 +-- .../org/n52/svalbard/encode/InsertResultRequestEncoder.java | 3 +-- .../org/n52/svalbard/encode/InsertResultResponseEncoder.java | 3 +-- .../svalbard/encode/InsertResultTemplateRequestEncoder.java | 3 +-- .../svalbard/encode/InsertResultTemplateResponseEncoder.java | 3 +-- .../org/n52/svalbard/encode/InsertSensorRequestEncoder.java | 3 +-- .../org/n52/svalbard/encode/InsertSensorResponseEncoder.java | 3 +-- .../org/n52/svalbard/encode/InspireOmObservationEncoder.java | 3 +-- .../main/java/org/n52/svalbard/encode/InspireXmlEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/Iso19139GcoEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/Iso19139GmdEncoder.java | 3 +-- .../org/n52/svalbard/encode/LogValuePropertyTypeEncoder.java | 3 +-- .../svalbard/encode/MultiPointCoverageDocumentEncoder.java | 3 +-- .../svalbard/encode/MultiPointObservationTypeEncoder.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/OmEncoderv100.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/OmEncoderv20.java | 3 +-- .../encode/OperationalActivityPeriodTypeEncoder.java | 3 +-- .../main/java/org/n52/svalbard/encode/OwsEncoderv110.java | 3 +-- .../org/n52/svalbard/encode/PointObservationTypeEncoder.java | 3 +-- .../org/n52/svalbard/encode/PointPropertyTypeEncoder.java | 3 +-- .../encode/PointTimeSeriesObservationTypeEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/ProcessDocumentEncoder.java | 3 +-- .../org/n52/svalbard/encode/ProcessParameterTypeEncoder.java | 3 +-- .../org/n52/svalbard/encode/ProcessPropertyTypeEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/ProcessTypeEncoder.java | 3 +-- .../n52/svalbard/encode/ProfileObservationTypeEncoder.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/RdfEncoder.java | 3 +-- .../encode/RectifiedGridCoverageDocumentEncoder.java | 3 +-- .../org/n52/svalbard/encode/RelatedOfferingsEncoder.java | 3 +-- .../org/n52/svalbard/encode/RelatedPartyTypeEncoder.java | 3 +-- .../encode/ReverencableGridCoverageDocumentEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/SamplingEncoderv100.java | 3 +-- .../java/org/n52/svalbard/encode/SamplingEncoderv20.java | 3 +-- .../java/org/n52/svalbard/encode/SensorMLEncoderv101.java | 3 +-- .../java/org/n52/svalbard/encode/SensorMLEncoderv20.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/Soap11Encoder.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/Soap12Encoder.java | 3 +-- .../n52/svalbard/encode/SosInsertionMetadataTypeEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/SosRequestEncoderv20.java | 3 +-- .../svalbard/encode/SosV1DescribeSensorResponseEncoder.java | 3 +-- .../svalbard/encode/SosV1GetCapabilitiesResponseEncoder.java | 3 +-- .../encode/SosV1GetFeatureOfInterestResponseEncoder.java | 3 +-- .../encode/SosV1GetObservationByIdResponseEncoder.java | 3 +-- .../svalbard/encode/SosV1GetObservationResponseEncoder.java | 3 +-- .../java/org/n52/svalbard/encode/SpecimenEncoderv20.java | 3 +-- .../java/org/n52/svalbard/encode/SweCommonEncoderv101.java | 3 +-- .../java/org/n52/svalbard/encode/SweCommonEncoderv20.java | 3 +-- .../org/n52/svalbard/encode/SwesExtensionEncoderv20.java | 3 +-- .../svalbard/encode/TimeLocationValueTripleTypeEncoder.java | 3 +-- .../svalbard/encode/TrajectoryObservationTypeEncoder.java | 3 +-- .../main/java/org/n52/svalbard/encode/TsmlTDREncoderv10.java | 3 +-- .../main/java/org/n52/svalbard/encode/TsmlTVPEncoderv10.java | 3 +-- .../org/n52/svalbard/encode/UpdateSensorResponseEncoder.java | 3 +-- .../main/java/org/n52/svalbard/encode/WmlTDREncoderv20.java | 3 +-- .../main/java/org/n52/svalbard/encode/WmlTVPEncoderv20.java | 3 +-- .../src/main/java/org/n52/svalbard/encode/WsaEncoder.java | 3 +-- .../main/java/org/n52/svalbard/encode/WsdlEncoderv11.java | 3 +-- .../main/java/org/n52/svalbard/encode/XlinkEncoderv1999.java | 3 +-- .../exception/UnsupportedEncoderXmlInputException.java | 3 +-- .../src/main/java/org/n52/svalbard/util/OwsHelper.java | 3 +-- .../src/main/java/org/n52/svalbard/util/W3cHelper.java | 3 +-- .../src/main/resources/svalbard-xmlbeans-context.xml | 3 +-- .../src/test/java/org/n52/svalbard/XmlBeansGenerator.java | 3 +-- .../decode/AbstractCapabilitiesBaseTypeDecoderTest.java | 3 +-- .../org/n52/svalbard/decode/AbtractProcessDecodingTest.java | 3 +-- .../test/java/org/n52/svalbard/decode/DeleteDecoderTest.java | 3 +-- .../n52/svalbard/decode/DeleteObservationDecoderTest.java | 3 +-- .../n52/svalbard/decode/DeleteObservationV20DecoderTest.java | 3 +-- .../n52/svalbard/decode/DeleteResultTemplateDecoderTest.java | 3 +-- .../DescribeSensorResponseSwesDocumentDecoderTest.java | 3 +-- .../test/java/org/n52/svalbard/decode/FesDecoderV20Test.java | 3 +-- .../svalbard/decode/GetCapabilitiesResponseDecoderTest.java | 3 +-- .../n52/svalbard/decode/GetDataAvailabilityDecoderTest.java | 3 +-- .../decode/GetDataAvailabilityRequestDecoderTest.java | 3 +-- .../decode/GetDataAvailabilityResponseDecoderTest.java | 3 +-- .../decode/GetFeatureOfInterestResponseDecoderTest.java | 3 +-- .../test/java/org/n52/svalbard/decode/InsertDecoderTest.java | 3 +-- .../decode/InsertObservationResponseV20DecoderTest.java | 3 +-- .../n52/svalbard/decode/InsertResultResponseDecoderTest.java | 3 +-- .../decode/InsertResultTemplateResponseDecoderTest.java | 3 +-- .../n52/svalbard/decode/InsertSensorResponseDecoderTest.java | 3 +-- .../java/org/n52/svalbard/decode/OgcDecoderv100Test.java | 3 +-- .../test/java/org/n52/svalbard/decode/OmDecoderV20Test.java | 3 +-- .../org/n52/svalbard/decode/ProcessDocumentDecoderTest.java | 3 +-- .../org/n52/svalbard/decode/SensorMLDecoderV101Test.java | 3 +-- .../java/org/n52/svalbard/decode/SensorMLDecoderV20Test.java | 3 +-- .../test/java/org/n52/svalbard/decode/SosDecoderv20Test.java | 3 +-- .../org/n52/svalbard/decode/SweCommonDecoderV101Test.java | 3 +-- .../org/n52/svalbard/decode/SweCommonDecoderV20Test.java | 3 +-- .../svalbard/decode/WmlObservationProcessDecoderv20Test.java | 3 +-- .../test/java/org/n52/svalbard/decode/WsaDecoderTest.java | 3 +-- .../AbstractEnvironmentalMonitoringFacilityEncoderTest.java | 3 +-- .../java/org/n52/svalbard/encode/AbstractMetadataTest.java | 3 +-- .../org/n52/svalbard/encode/AbstractSensorMLEncoderTest.java | 3 +-- .../n52/svalbard/encode/AbstractSwesRequestEncoderTest.java | 3 +-- .../org/n52/svalbard/encode/CompositeExceptionMatcher.java | 3 +-- .../n52/svalbard/encode/DeleteObservationEncoderTest.java | 3 +-- .../n52/svalbard/encode/DeleteObservationV20EncoderTest.java | 3 +-- .../n52/svalbard/encode/DeleteResultTemplateEncoderTest.java | 3 +-- .../n52/svalbard/encode/DeleteSensorResponseEncoderTest.java | 3 +-- .../svalbard/encode/DescribeSensorResponseEncoderTest.java | 3 +-- .../svalbard/encode/DescribeSensorV2RequestEncoderTest.java | 3 +-- .../EnvironmentalMonitoringFacilityDocumentEncoderTest.java | 3 +-- .../EnvironmentalMonitoringFacilityTypeEncoderTest.java | 3 +-- .../test/java/org/n52/svalbard/encode/FesEncoderv20Test.java | 3 +-- .../encode/GWGeologyLogCoveragePropertyEncoderTest.java | 3 +-- .../svalbard/encode/GetCapabilitiesResponseEncoderTest.java | 3 +-- .../svalbard/encode/GetDataAvailabilityXmlEncoderTest.java | 3 +-- .../encode/GetFeatureOfInterestXmlStreamWriterTest.java | 3 +-- .../svalbard/encode/GetObservationResponseEncoderTest.java | 3 +-- .../encode/GetObservationResponseXmlStreamWriterTest.java | 3 +-- .../java/org/n52/svalbard/encode/GmlV321EncoderTest.java | 3 +-- .../svalbard/encode/InsertObservationRequestEncoderTest.java | 3 +-- .../n52/svalbard/encode/InsertResultRequestEncoderTest.java | 3 +-- .../encode/InsertResultTemplateRequestEncoderTest.java | 3 +-- .../n52/svalbard/encode/InsertSensorRequestEncoderTest.java | 3 +-- .../n52/svalbard/encode/InsertSensorResponseEncoderTest.java | 3 +-- .../java/org/n52/svalbard/encode/InspireEncoderTest.java | 3 +-- .../java/org/n52/svalbard/encode/Iso19139GmdEncoderTest.java | 3 +-- .../test/java/org/n52/svalbard/encode/OmEncoderv100Test.java | 3 +-- .../test/java/org/n52/svalbard/encode/OmEncoderv20Test.java | 3 +-- .../java/org/n52/svalbard/encode/OwsEncoderv110Test.java | 3 +-- .../org/n52/svalbard/encode/ProcessDocumentEncoderTest.java | 3 +-- .../encode/RectifiedGridCoverageDocumentEncoderTest.java | 3 +-- .../java/org/n52/svalbard/encode/SamplingEncoderv20Test.java | 3 +-- .../org/n52/svalbard/encode/SensorMLEncoderV101Test.java | 3 +-- .../svalbard/encode/SosInsertionMetadataTypeEncoderTest.java | 3 +-- .../org/n52/svalbard/encode/SweCommonEncoderv101Test.java | 3 +-- .../org/n52/svalbard/encode/SweCommonEncoderv20Test.java | 3 +-- .../org/n52/svalbard/encode/SwesExtensionEncoderv20Test.java | 3 +-- .../org/n52/svalbard/encode/TestAbstractSensorMLEncoder.java | 3 +-- .../encode/TimeLocationValueTripleTypeEncoderTest.java | 3 +-- .../encode/TrajectoryObservationTypeEncoderTest.java | 3 +-- .../java/org/n52/svalbard/encode/TsmlTVPEncoderv10Test.java | 3 +-- .../n52/svalbard/encode/UpdateSensorResponseEncoderTest.java | 3 +-- .../java/org/n52/svalbard/encode/WmlTVPEncoderv20Test.java | 3 +-- .../xmlbeans/src/test/resources/AggregateProcess-dwd.xml | 3 +-- .../src/test/resources/DescribeSensorResponseSML101.xml | 3 +-- svalbard/xmlbeans/src/test/resources/FesBeyond.xml | 3 +-- svalbard/xmlbeans/src/test/resources/FesDWithin.xml | 3 +-- svalbard/xmlbeans/src/test/resources/FesDisjoint.xml | 3 +-- svalbard/xmlbeans/src/test/resources/FesOverlaps.xml | 3 +-- svalbard/xmlbeans/src/test/resources/GDAResponseV1.xml | 3 +-- svalbard/xmlbeans/src/test/resources/GDAResponseV2.xml | 3 +-- .../src/test/resources/GetCapabilitiesResponseInspire.xml | 3 +-- .../src/test/resources/GetFeatureOfInterestResponse.xml | 3 +-- svalbard/xmlbeans/src/test/resources/GetFoiIrceline.xml | 3 +-- svalbard/xmlbeans/src/test/resources/GetFoiWml.xml | 3 +-- .../xmlbeans/src/test/resources/GetObsPropertyIsBetween.xml | 3 +-- .../xmlbeans/src/test/resources/GetObsPropertyIsEqualTo.xml | 3 +-- .../src/test/resources/GetObsPropertyIsGreaterThan.xml | 3 +-- .../test/resources/GetObsPropertyIsGreaterThanOrEqualTo.xml | 3 +-- .../xmlbeans/src/test/resources/GetObsPropertyIsLessThan.xml | 3 +-- .../src/test/resources/GetObsPropertyIsLessThanOrEqualTo.xml | 3 +-- .../xmlbeans/src/test/resources/GetObsPropertyIsLike.xml | 3 +-- .../src/test/resources/GetObsPropertyIsNotEqualTo.xml | 3 +-- .../xmlbeans/src/test/resources/GetObsPropertyIsNull.xml | 3 +-- svalbard/xmlbeans/src/test/resources/SoapWsa.xml | 3 +-- svalbard/xmlbeans/src/test/resources/SoapWsa11.xml | 3 +-- svalbard/xmlbeans/src/test/resources/process.xml | 3 +-- svalbard/xmlstream/pom.xml | 3 +-- .../java/org/n52/svalbard/read/AbstractFeatureReader.java | 3 +-- .../main/java/org/n52/svalbard/read/AddressAreaReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/AddressReader.java | 3 +-- .../org/n52/svalbard/read/AddressRepresentationReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/AdminUnitReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/ChoiceReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/CodeTypeReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/ContactReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/FreeTextReader.java | 3 +-- .../java/org/n52/svalbard/read/GeographicalNameReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/InpireIDReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/ListReader.java | 3 +-- .../main/java/org/n52/svalbard/read/LocatorNameReader.java | 3 +-- .../java/org/n52/svalbard/read/NillableCodeTypeReader.java | 3 +-- .../java/org/n52/svalbard/read/NillableContactReader.java | 3 +-- .../java/org/n52/svalbard/read/NillableFreeTextReader.java | 3 +-- .../n52/svalbard/read/NillableGeographicalNameReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/NillableReader.java | 3 +-- .../java/org/n52/svalbard/read/NillableReferenceReader.java | 3 +-- .../java/org/n52/svalbard/read/NillableStringReader.java | 3 +-- .../java/org/n52/svalbard/read/NillableSubtagReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/PostNameReader.java | 3 +-- .../java/org/n52/svalbard/read/PronounciationReader.java | 3 +-- .../org/n52/svalbard/read/PronunciationOfNameReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/ReferenceReader.java | 3 +-- .../org/n52/svalbard/read/ReferenceableFeatureReader.java | 3 +-- .../main/java/org/n52/svalbard/read/ReferenceableReader.java | 3 +-- .../main/java/org/n52/svalbard/read/RelatedPartyReader.java | 3 +-- .../java/org/n52/svalbard/read/ReportingAuthorityReader.java | 3 +-- .../java/org/n52/svalbard/read/ReportingHeaderReader.java | 3 +-- .../java/org/n52/svalbard/read/ReportingPeriodReader.java | 3 +-- .../java/org/n52/svalbard/read/SpellingOfNameReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/SpellingReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/StringReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/SubtagReader.java | 3 +-- .../main/java/org/n52/svalbard/read/ThoroughfareReader.java | 3 +-- .../main/java/org/n52/svalbard/read/TimeInstantReader.java | 3 +-- .../main/java/org/n52/svalbard/read/TimePeriodReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/TimeReader.java | 3 +-- .../src/main/java/org/n52/svalbard/read/XmlReader.java | 3 +-- .../write/AbstractGetDataAvailabilityStreamWriter.java | 3 +-- .../org/n52/svalbard/write/AbstractOmV20XmlStreamWriter.java | 3 +-- .../org/n52/svalbard/write/AbstractSwesXmlStreamWriter.java | 3 +-- .../write/AqdGetObservationResponseXmlStreamWriter.java | 3 +-- .../java/org/n52/svalbard/write/EReportingHeaderEncoder.java | 3 +-- .../n52/svalbard/write/GetDataAvailabilityStreamWriter.java | 3 +-- .../svalbard/write/GetDataAvailabilityV20StreamWriter.java | 3 +-- .../svalbard/write/GetFeatureOfInterestXmlStreamWriter.java | 3 +-- .../write/GetObservationResponseXmlStreamWriter.java | 3 +-- .../java/org/n52/svalbard/write/GwmlV22XmlStreamWriter.java | 3 +-- .../java/org/n52/svalbard/write/InspireXmlStreamWriter.java | 3 +-- .../java/org/n52/svalbard/write/OmV20XmlStreamWriter.java | 3 +-- .../write/PointTimeSeriesObservationXmlStreamWriter.java | 3 +-- .../main/java/org/n52/svalbard/write/RdfStreamWriter.java | 3 +-- .../n52/svalbard/write/RelatedOfferingXmlStreamWriter.java | 3 +-- .../java/org/n52/svalbard/write/Soap12XmlStreamWriter.java | 3 +-- .../n52/svalbard/write/TsmlTDREncoderv10XmlStreamWriter.java | 3 +-- .../n52/svalbard/write/TsmlTVPEncoderv10XmlStreamWriter.java | 3 +-- .../n52/svalbard/write/WmlTDREncoderv20XmlStreamWriter.java | 3 +-- .../n52/svalbard/write/WmlTVPEncoderv20XmlStreamWriter.java | 3 +-- .../java/org/n52/svalbard/write/Wsdlv11XmlStreamWriter.java | 3 +-- .../main/java/org/n52/svalbard/write/XmlStreamWriter.java | 3 +-- .../n52/svalbard/write/util/DelegatingXMLStreamWriter.java | 3 +-- .../org/n52/svalbard/write/util/ExtendedXMLStreamWriter.java | 3 +-- .../n52/svalbard/write/util/IndentingXMLStreamWriter.java | 3 +-- .../src/main/resources/svalbard-xmlstream-context.xml | 3 +-- .../src/test/java/org/n52/svalbard/XmlBeansGenerator.java | 3 +-- .../org/n52/svalbard/read/GeographicalNameReaderTest.java | 3 +-- .../org/n52/svalbard/write/EReportingHeaderEncoderTest.java | 3 +-- .../org/n52/svalbard/write/IndentingXmlStreamWriterTest.java | 3 +-- .../java/org/n52/svalbard/write/RdfStreamWriterTest.java | 3 +-- .../svalbard/write/RelatedOfferingXmlStreamWriterTest.java | 3 +-- .../org/n52/svalbard/write/ReportingHeaderReaderTest.java | 3 +-- .../org/n52/svalbard/write/Wsdlv11XmlStreanWriterTest.java | 3 +-- 1902 files changed, 1903 insertions(+), 3803 deletions(-) diff --git a/NOTICE b/NOTICE index 3c05798ed..88f43af63 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,4 @@ -Copyright (C) 2015-2020 52°North Initiative for Geospatial Open Source -Software GmbH +Copyright (C) 2015-2020 52°North Spatial Information Research GmbH Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/etc/license-header.txt b/etc/license-header.txt index b80bc5588..b5e6df873 100644 --- a/etc/license-header.txt +++ b/etc/license-header.txt @@ -1,5 +1,4 @@ -Copyright ${year} 52°North Initiative for Geospatial Open Source -Software GmbH +Copyright (C) ${year} 52°North Spatial Information Research GmbH Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/etc/notice-template.txt b/etc/notice-template.txt index 4f43919aa..104547bda 100644 --- a/etc/notice-template.txt +++ b/etc/notice-template.txt @@ -1,5 +1,4 @@ -Copyright (C) 2015-2020 52°North Initiative for Geospatial Open Source -Software GmbH +Copyright (C) 2015-2020 52°North Spatial Information Research GmbH Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 6dc9f32ef..df65095b8 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -1,8 +1,7 @@ From ef46e4682e66edc8e6b622c629b126b1b3f4ba26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 04:01:27 +0000 Subject: [PATCH 173/456] Bump joda-time from 2.10.10 to 2.10.12 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.10 to 2.10.12. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.10...v2.10.12) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f764f4ae..c271075f0 100644 --- a/pom.xml +++ b/pom.xml @@ -311,7 +311,7 @@ joda-time joda-time - 2.10.10 + 2.10.12 org.locationtech.jts From 548b749cf80bdd9b83e253925afd101f0dae033d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 04:03:52 +0000 Subject: [PATCH 174/456] Bump spotbugs-annotations from 4.4.0 to 4.4.2 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.4.0 to 4.4.2. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.4.0...4.4.2) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f764f4ae..9c7d9e2e9 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 2.7.0 4.8.0 3.0.2 - 4.4.0 + 4.4.2 1.3.2 3.17.0 2.12.5 From fe8e997ef2f442d35a2615698519a6226eb983a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 04:00:41 +0000 Subject: [PATCH 175/456] Bump lucene-core from 8.9.0 to 8.10.1 Bumps lucene-core from 8.9.0 to 8.10.1. --- updated-dependencies: - dependency-name: org.apache.lucene:lucene-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f764f4ae..af9a434be 100644 --- a/pom.xml +++ b/pom.xml @@ -607,7 +607,7 @@ org.apache.lucene lucene-core - 8.9.0 + 8.10.1 com.maxmind.db From 08c10b466ac64a741d3995efdd4eef376a58dd65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 08:46:06 +0000 Subject: [PATCH 176/456] Bump version.spring from 5.3.9 to 5.3.12 Bumps `version.spring` from 5.3.9 to 5.3.12. Updates `spring-test` from 5.3.9 to 5.3.12 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.9...v5.3.12) Updates `spring-web` from 5.3.9 to 5.3.12 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.9...v5.3.12) Updates `spring-beans` from 5.3.9 to 5.3.12 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.9...v5.3.12) Updates `spring-core` from 5.3.9 to 5.3.12 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.9...v5.3.12) Updates `spring-context` from 5.3.9 to 5.3.12 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.9...v5.3.12) --- updated-dependencies: - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7f764f4ae..8893c6263 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ ${maven.build.timestamp} - 5.3.9 + 5.3.12 1.7.32 3.1.0 1.0.4 @@ -607,7 +607,7 @@ org.apache.lucene lucene-core - 8.9.0 + 8.10.1 com.maxmind.db From a453a416e650f967b7385bccdc28ea386e027ee1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 08:47:33 +0000 Subject: [PATCH 177/456] Bump version.elastic from 7.14.1 to 7.15.1 Bumps `version.elastic` from 7.14.1 to 7.15.1. Updates `elasticsearch` from 7.14.1 to 7.15.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.14.1...v7.15.1) Updates `elasticsearch-rest-client` from 7.14.1 to 7.15.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.14.1...v7.15.1) Updates `elasticsearch-rest-high-level-client` from 7.14.1 to 7.15.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.14.1...v7.15.1) --- updated-dependencies: - dependency-name: org.elasticsearch:elasticsearch dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.elasticsearch.client:elasticsearch-rest-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7f764f4ae..72b825ec0 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ 3.12.4 2.2 4.4.14 - 7.14.1 + 7.15.1 4.9.2 3.3.1 @@ -607,7 +607,7 @@ org.apache.lucene lucene-core - 8.9.0 + 8.10.1 com.maxmind.db From 98fb866ceb52b000aa8a15460e5511b4140bbb0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 08:48:09 +0000 Subject: [PATCH 178/456] Bump reflections from 0.9.12 to 0.10.1 Bumps [reflections](https://github.com/ronmamo/reflections) from 0.9.12 to 0.10.1. - [Release notes](https://github.com/ronmamo/reflections/releases) - [Commits](https://github.com/ronmamo/reflections/compare/0.9.12...0.10.1) --- updated-dependencies: - dependency-name: org.reflections:reflections dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7f764f4ae..6f93ef065 100644 --- a/pom.xml +++ b/pom.xml @@ -411,7 +411,7 @@ org.reflections reflections - 0.9.12 + 0.10.1 test @@ -607,7 +607,7 @@ org.apache.lucene lucene-core - 8.9.0 + 8.10.1 com.maxmind.db From 530844a491a8200a302628e2cefd2bb5436230f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 08:54:11 +0000 Subject: [PATCH 179/456] Bump version.mockito from 3.12.4 to 4.0.0 Bumps `version.mockito` from 3.12.4 to 4.0.0. Updates `mockito-core` from 3.12.4 to 4.0.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.12.4...v4.0.0) Updates `mockito-junit-jupiter` from 3.12.4 to 4.0.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.12.4...v4.0.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac5798634..2fcb206b2 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 3.17.0 2.12.5 5.8.1 - 3.12.4 + 4.0.0 2.2 4.4.14 7.14.1 From 2ae367068252550c0a610f3155f2ec346f675f56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 08:54:13 +0000 Subject: [PATCH 180/456] Bump version.jackson from 2.12.5 to 2.13.0 Bumps `version.jackson` from 2.12.5 to 2.13.0. Updates `jackson-core` from 2.12.5 to 2.13.0 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.12.5...jackson-core-2.13.0) Updates `jackson-annotations` from 2.12.5 to 2.13.0 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-databind` from 2.12.5 to 2.13.0 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-datatype-jdk8` from 2.12.5 to 2.13.0 --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac5798634..edfecc79a 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ 4.4.2 1.3.2 3.17.0 - 2.12.5 + 2.13.0 5.8.1 3.12.4 2.2 From 7e00c8b5bd46900474b9bdfdd1fcef6e1037dde5 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Mon, 25 Oct 2021 11:24:58 +0200 Subject: [PATCH 181/456] Add validTime to copy/clone of AbstractProcess --- pom.xml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 846fd9d90..76a1562f5 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ janmayen faroe + bjornoya shetland svalbard iceland @@ -148,7 +149,7 @@ 3.0.2 4.4.0 1.3.2 - 3.17.0 + 4.2.0 2.12.5 5.7.2 3.12.4 @@ -198,6 +199,11 @@ faroe-utils ${project.version} + + ${project.groupId} + bjornoya + ${project.version} + ${project.groupId} iceland @@ -496,6 +502,23 @@ org.springframework spring-context ${version.spring} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context-support + ${version.spring} + + + commons-logging + commons-logging + + From 4eaab6886b208c7062397f45cae500b2bd794e82 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Mon, 25 Oct 2021 11:27:59 +0200 Subject: [PATCH 182/456] Add validTime to copy/clone of AbstractProcess --- .../java/org/n52/shetland/ogc/sensorML/AbstractProcess.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractProcess.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractProcess.java index f9dfb69e0..359e06473 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractProcess.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractProcess.java @@ -208,7 +208,7 @@ public void copyTo(AbstractProcess copyOf) { copyOf.setInputs(getInputs()); copyOf.setOutputs(getOutputs()); copyOf.setParameters(getParameters()); + copyOf.setValidTime(getValidTime()); } - } From 32beaa35a69bb43d6ff2184f51cc1e621c86c14d Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Mon, 25 Oct 2021 11:33:25 +0200 Subject: [PATCH 183/456] add bjornoya for (quartz) scheduling - conatins scheduler, jo factory and full and temporal job interfaces and an abstract scheduled job --- NOTICE | 6 + bjornoya/pom.xml | 112 +++++++++++ .../AutowiringSpringBeanJobFactory.java | 40 ++++ .../bjornoya/schedule/FullHarvesterJob.java | 26 +++ .../org/n52/bjornoya/schedule/JobFactory.java | 178 ++++++++++++++++++ .../n52/bjornoya/schedule/ScheduledJob.java | 133 +++++++++++++ .../org/n52/bjornoya/schedule/Scheduler.java | 126 +++++++++++++ .../schedule/TemporalHarvesterJob.java | 38 ++++ .../bjornoya/schedule/TriggerJobListener.java | 95 ++++++++++ 9 files changed, 754 insertions(+) create mode 100644 bjornoya/pom.xml create mode 100644 bjornoya/src/main/java/org/n52/bjornoya/schedule/AutowiringSpringBeanJobFactory.java create mode 100644 bjornoya/src/main/java/org/n52/bjornoya/schedule/FullHarvesterJob.java create mode 100644 bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java create mode 100644 bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java create mode 100644 bjornoya/src/main/java/org/n52/bjornoya/schedule/Scheduler.java create mode 100644 bjornoya/src/main/java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java create mode 100644 bjornoya/src/main/java/org/n52/bjornoya/schedule/TriggerJobListener.java diff --git a/NOTICE b/NOTICE index b1d92bc4f..e0fac7be8 100644 --- a/NOTICE +++ b/NOTICE @@ -15,6 +15,7 @@ limitations under the License. This project includes: 52°North Arctic Sea under The Apache Software License, Version 2.0 + 52°North Bjornoya under The Apache Software License, Version 2.0 52°North Faroe under The Apache Software License, Version 2.0 52°North Faroe Annotations under The Apache Software License, Version 2.0 52°North Faroe JSON Backend under The Apache Software License, Version 2.0 @@ -114,6 +115,7 @@ This project includes: JCL 1.2 implemented over SLF4J under Apache License, Version 2.0 Joda-Time under Apache License, Version 2.0 JOpt Simple under The MIT License + JSON-P Default Provider under Eclipse Public License 2.0 or GNU General Public License, version 2 with the GNU Classpath Exception JSONLD Java :: Core under Revised BSD License lang-mustache under Elastic License 2.0 or Server Side Public License, v 1 libphonenumber under The Apache Software License, Version 2.0 @@ -198,10 +200,14 @@ This project includes: SnakeYAML under Apache License, Version 2.0 Spring AOP under Apache License, Version 2.0 Spring Beans under Apache License, Version 2.0 + Spring Commons Logging Bridge under Apache License, Version 2.0 Spring Context under Apache License, Version 2.0 + Spring Context Support under Apache License, Version 2.0 + Spring Core under Apache License, Version 2.0 Spring Expression Language (SpEL) under Apache License, Version 2.0 Spring Web under Apache License, Version 2.0 T-Digest under The Apache Software License, Version 2.0 + Titanium JSON-LD 1.1 under Apache License, Version 2.0 W3C SOAP specification recommondation (v1.1) under The Apache Software License, Version 2.0 W3C SOAP specification recommondation (v1.2 part 1) under The Apache Software License, Version 2.0 W3C WS-Addressing specification schemas (v1.0) under The Apache Software License, Version 2.0 diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml new file mode 100644 index 000000000..54eaca130 --- /dev/null +++ b/bjornoya/pom.xml @@ -0,0 +1,112 @@ + + + + 4.0.0 + + + org.n52.arctic-sea + arctic-sea + 9.2.0-SNAPSHOT + + + bjornoya + 52°North Bjornoya + Scheduling classes + jar + + + + ${project.groupId} + faroe-annotations + + + ${project.groupId} + faroe-utils + + + ${project.groupId} + janmayen + + + ${project.groupId} + shetland + + + javax.servlet + javax.servlet-api + provided + + + javax.inject + javax.inject + + + org.slf4j + slf4j-api + + + com.github.spotbugs + spotbugs-annotations + provided + + + joda-time + joda-time + + + + org.quartz-scheduler + quartz + + + org.springframework + spring-context-support + + + org.springframework + spring-context + + + org.springframework + spring-beans + + + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.hamcrest + hamcrest + test + + + org.slf4j + slf4j-nop + test + + + diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/AutowiringSpringBeanJobFactory.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/AutowiringSpringBeanJobFactory.java new file mode 100644 index 000000000..c0587aa05 --- /dev/null +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/AutowiringSpringBeanJobFactory.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2015-2021 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.bjornoya.schedule; + +import org.quartz.spi.TriggerFiredBundle; +import org.springframework.beans.factory.config.AutowireCapableBeanFactory; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.scheduling.quartz.SpringBeanJobFactory; + +public final class AutowiringSpringBeanJobFactory extends SpringBeanJobFactory implements + ApplicationContextAware { + + private transient AutowireCapableBeanFactory beanFactory; + + @Override + public void setApplicationContext(final ApplicationContext context) { + beanFactory = context.getAutowireCapableBeanFactory(); + } + + @Override + protected Object createJobInstance(final TriggerFiredBundle bundle) throws Exception { + final Object job = super.createJobInstance(bundle); + beanFactory.autowireBean(job); + return job; + } +} diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/FullHarvesterJob.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/FullHarvesterJob.java new file mode 100644 index 000000000..226e28927 --- /dev/null +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/FullHarvesterJob.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2015-2021 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.bjornoya.schedule; + +import org.quartz.DisallowConcurrentExecution; +import org.quartz.Job; +import org.quartz.PersistJobDataAfterExecution; + +@PersistJobDataAfterExecution +@DisallowConcurrentExecution +public interface FullHarvesterJob extends Job { + +} diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java new file mode 100644 index 000000000..898a2c782 --- /dev/null +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java @@ -0,0 +1,178 @@ +/* + * Copyright (C) 2015-2021 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.bjornoya.schedule; + +import java.text.ParseException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; + +import javax.inject.Inject; + +import org.n52.faroe.ConfigurationError; +import org.n52.faroe.Validation; +import org.n52.faroe.annotation.Configurable; +import org.n52.faroe.annotation.Setting; +import org.n52.janmayen.lifecycle.Constructable; +import org.quartz.CronExpression; +import org.quartz.SchedulerException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; + +@Configurable +public class JobFactory implements Constructable { + + public static final String FULL_HARVEST_UPDATE = "harvest.full"; + public static final String TEMPORAL_HARVEST_UPDATE = "harvest.temporal"; + private static final Logger LOGGER = LoggerFactory.getLogger(JobFactory.class); + private String cronFullExpression = "0 0 03 * * ?"; + private String cronTemporalExpression = "0 0/5 * * * ?"; + private Scheduler scheduler; + private Set jobs = new HashSet<>(); + private List scheduledJobs = new ArrayList<>(); + private boolean initialized; + + @Inject + public void setDataSourceHarvesterScheduler(Scheduler scheduler) { + this.scheduler = scheduler; + } + + @Inject + public void setScheduledJobs(Optional> scheduledJobs) { + this.scheduledJobs.clear(); + if (scheduledJobs.isPresent()) { + this.scheduledJobs.addAll(scheduledJobs.get()); + } + } + + public List getScheduledJobs() { + return scheduledJobs; + } + + /** + * @return the updateDefinition + */ + public String getFullCronExpression() { + return cronFullExpression; + } + + /** + * @param updateDefinition + * the updateDefinition to set + */ + @Setting(FULL_HARVEST_UPDATE) + @Value(FULL_HARVEST_UPDATE) + public void setFullCronExpression(String cronExpression) { + Validation.notNullOrEmpty("Cron expression for full update!", cronExpression); + validate(cronExpression); + if (this.cronFullExpression == null) { + this.cronFullExpression = cronExpression; + reschedule(); + } else if (!this.cronFullExpression.equalsIgnoreCase(cronExpression)) { + this.cronFullExpression = cronExpression; + reschedule(); + } + } + + /** + * @return the updateDefinition + */ + public String getTemporalCronExpression() { + return cronTemporalExpression; + } + + /** + * @param updateDefinition + * the updateDefinition to set + */ + @Setting(TEMPORAL_HARVEST_UPDATE) + @Value(TEMPORAL_HARVEST_UPDATE) + public void setTemporalCronExpression(String cronExpression) { + Validation.notNullOrEmpty("Cron expression for temporal update!", cronExpression); + validate(cronExpression); + if (this.cronTemporalExpression == null) { + this.cronTemporalExpression = cronExpression; + reschedule(); + } else if (!this.cronTemporalExpression.equalsIgnoreCase(cronExpression)) { + this.cronTemporalExpression = cronExpression; + reschedule(); + } + } + + private void reschedule() { + reschedule(true); + } + + private void reschedule(boolean update) { + if ((!initialized && !update) || (initialized && update)) { + for (ScheduledJob job : getScheduledJobs()) { + if (jobs.contains(job.getJobName())) { + boolean updateJob = false; + if (job instanceof FullHarvesterJob) { + updateJob = checkCronExpression(job, getFullCronExpression()); + } else if (job instanceof TemporalHarvesterJob) { + updateJob = checkCronExpression(job, getTemporalCronExpression()); + } + if (updateJob) { + try { + scheduler.updateJob(job); + } catch (SchedulerException e) { + LOGGER.error("Error while updating a job!", e); + } + } + } else { + if (job instanceof FullHarvesterJob) { + job.setCronExpression(getFullCronExpression()); + } else if (job instanceof TemporalHarvesterJob) { + job.setCronExpression(getTemporalCronExpression()); + } + scheduler.scheduleJob(job); + } + jobs.add(job.getJobName()); + } + } + } + + private boolean checkCronExpression(ScheduledJob job, String cronExpression) { + if (job.getCronExpression() == null || (job.getCronExpression() != null && !job.getCronExpression() + .isEmpty() && !job.getCronExpression() + .equals(cronExpression))) { + job.setCronExpression(cronExpression); + return true; + } + return false; + } + + private void validate(String cronExpression) { + try { + CronExpression.validateExpression(cronExpression); + } catch (ParseException e) { + throw new ConfigurationError(String.format( + "%s is invalid! Please check http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials" + + "/tutorial-lesson-06.html", + cronExpression)); + } + } + + @Override + public void init() { + reschedule(false); + this.initialized = true; + } +} diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java new file mode 100644 index 000000000..f0f03016d --- /dev/null +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2015-2021 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.bjornoya.schedule; + +import org.joda.time.DateTime; +import org.quartz.CronScheduleBuilder; +import org.quartz.DateBuilder; +import org.quartz.JobDetail; +import org.quartz.JobKey; +import org.quartz.Trigger; +import org.quartz.TriggerBuilder; +import org.springframework.scheduling.quartz.QuartzJobBean; + +public abstract class ScheduledJob extends QuartzJobBean { + private boolean enabled = true; + + private String jobName; + + private String triggerName; + + private String jobDescription; + + private String cronExpression; + + private boolean triggerAtStartup; + + private DateTime startUpDelay; + + private boolean modified; + + // XXX job details create a job instance! snake biting tail + public abstract JobDetail createJobDetails(); + + public String getJobName() { + return jobName == null || jobName.isEmpty() + ? getClass().getSimpleName() + : jobName; + } + + public void setJobName(String jobName) { + this.jobName = jobName; + } + + public String getTriggerName() { + return triggerName == null || triggerName.isEmpty() + ? "trigger_" + getJobName() + : triggerName; + } + + public void setTriggerName(String triggerName) { + this.triggerName = triggerName; + } + + public String getJobDescription() { + return jobDescription; + } + + public void setJobDescription(String jobDescription) { + this.jobDescription = jobDescription; + } + + public String getCronExpression() { + return cronExpression; + } + + public void setCronExpression(String cronExpresssion) { + this.cronExpression = cronExpresssion; + } + + public boolean isTriggerAtStartup() { + return triggerAtStartup || isStartUpDelay(); + } + + public void setTriggerAtStartup(boolean triggerAtStartup) { + this.triggerAtStartup = triggerAtStartup; + } + + public boolean isStartUpDelay() { + return getStartUpDelay() != null && getStartUpDelay().isAfter(DateTime.now()); + } + + public Trigger createTrigger(JobKey jobKey) { + TriggerBuilder tb = TriggerBuilder.newTrigger() + .forJob(jobKey) + .withIdentity(getTriggerName()); + if (getCronExpression() != null) { + tb.withSchedule(CronScheduleBuilder.cronSchedule(getCronExpression())); + } + + if (isTriggerAtStartup()) { + tb.startAt(isStartUpDelay() ? getStartUpDelay().toDate() + : DateBuilder.futureDate(5, DateBuilder.IntervalUnit.SECOND)); + } + return tb.build(); + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public boolean isModified() { + return modified; + } + + public void setModified(boolean modified) { + this.modified = modified; + } + + public DateTime getStartUpDelay() { + return startUpDelay; + } + + public void setStartUpDelay(DateTime startUpDelay) { + this.startUpDelay = startUpDelay; + } +} diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/Scheduler.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/Scheduler.java new file mode 100644 index 000000000..3b329677f --- /dev/null +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/Scheduler.java @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2015-2021 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.bjornoya.schedule; + +import java.util.Date; + +import org.joda.time.DateTime; +import org.n52.janmayen.lifecycle.Destroyable; +import org.quartz.JobDetail; +import org.quartz.SchedulerException; +import org.quartz.Trigger; +import org.quartz.TriggerBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class Scheduler implements Destroyable { + + private static final Logger LOGGER = LoggerFactory.getLogger(Scheduler.class); + + private int startupDelayInSeconds = 5; + + private org.quartz.Scheduler scheduler; + + private boolean enabled = true; + + public void init() { + if (!enabled) { + LOGGER.debug( + "Job schedular disabled. No jobs will be triggered. " + + "This is also true for particularly enabled jobs."); + return; + } + try { + TriggerJobListener triggerJobListener = new TriggerJobListener(); + scheduler.getListenerManager().addJobListener(triggerJobListener); + scheduler.getListenerManager().addTriggerListener(triggerJobListener); + scheduler.startDelayed(startupDelayInSeconds); + LOGGER.debug("Scheduler will start jobs in {}s ...", startupDelayInSeconds); + } catch (SchedulerException e) { + LOGGER.error("Could not start scheduler.", e); + } + } + + public void updateJob(ScheduledJob taskToSchedule) throws SchedulerException { + JobDetail details = taskToSchedule.createJobDetails(); + Trigger trigger = taskToSchedule.createTrigger(details.getKey()); + Date nextExecution = scheduler.rescheduleJob(trigger.getKey(), trigger); + LOGGER.debug("Rescheduled job '{}' will be executed at '{}'!", details.getKey(), new DateTime(nextExecution)); + } + + public void scheduleJob(ScheduledJob taskToSchedule) { + try { + JobDetail details = taskToSchedule.createJobDetails(); + Trigger trigger = taskToSchedule.createTrigger(details.getKey()); + Date nextExecution = scheduler.scheduleJob(details, trigger); + LOGGER.debug("Schedule job '{}' will be executed at '{}'!", details.getKey(), new DateTime(nextExecution)); + if (taskToSchedule.isTriggerAtStartup() || taskToSchedule instanceof FullHarvesterJob) { + LOGGER.debug("Schedule job '{}' to run once at startup.", details.getKey()); + Trigger onceAtStartup = TriggerBuilder.newTrigger() + .withIdentity(details.getKey() + "_onceAtStartup") + .forJob(details.getKey()) + .build(); + Date startupExecution = scheduler.scheduleJob(onceAtStartup); + LOGGER.debug("Schedule job '{}' will be executed on startup at '{}'!", details.getKey(), + new DateTime(startupExecution)); + } + } catch (SchedulerException e) { + LOGGER.warn("Could not schdule Job '{}'.", taskToSchedule.getJobName(), e); + } + } + + /** + * Shuts down the task scheduler without waiting tasks to be finished. + */ + public void shutdown() { + try { + scheduler.shutdown(false); + LOGGER.debug("Shutdown scheduler"); + } catch (SchedulerException e) { + LOGGER.error("Could not scheduler.", e); + } + } + + @Override + public void destroy() { + shutdown(); + } + + public int getStartupDelayInSeconds() { + return startupDelayInSeconds; + } + + public void setStartupDelayInSeconds(int startupDelayInSeconds) { + this.startupDelayInSeconds = startupDelayInSeconds; + } + + public org.quartz.Scheduler getScheduler() { + return scheduler; + } + + public void setScheduler(org.quartz.Scheduler scheduler) { + this.scheduler = scheduler; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + +} \ No newline at end of file diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java new file mode 100644 index 000000000..8df65c3fc --- /dev/null +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2015-2021 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.bjornoya.schedule; + +import org.joda.time.DateTime; +import org.n52.shetland.util.DateTimeHelper; +import org.quartz.DisallowConcurrentExecution; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.PersistJobDataAfterExecution; + +@PersistJobDataAfterExecution +@DisallowConcurrentExecution +public interface TemporalHarvesterJob extends Job { + + default DateTime getLastUpdateTime(JobExecutionContext context) { + if (context.getPreviousFireTime() != null) { + return new DateTime(context.getPreviousFireTime()); + } + return new DateTime(context.getFireTime()) + .minus(DateTimeHelper.getMinutesSince(new DateTime(context.getFireTime()), + new DateTime(context.getNextFireTime()))); + } + +} diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/TriggerJobListener.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/TriggerJobListener.java new file mode 100644 index 000000000..e496cb297 --- /dev/null +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/TriggerJobListener.java @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2015-2021 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.bjornoya.schedule; + +import java.util.LinkedHashSet; +import java.util.Set; + +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.quartz.JobListener; +import org.quartz.Trigger; +import org.quartz.Trigger.CompletedExecutionInstruction; +import org.quartz.TriggerListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class TriggerJobListener implements JobListener, TriggerListener { + private static final Logger LOGGER = LoggerFactory.getLogger(TriggerJobListener.class); + private Set fullHarvestingJobs = new LinkedHashSet<>(); + + @Override + public String getName() { + return this.getClass().getSimpleName(); + } + + @Override + public void jobToBeExecuted(JobExecutionContext context) { + if (checkForFullHarvesterJob(context)) { + fullHarvestingJobs.add(getGroup(context)); + } + } + + @Override + public void jobExecutionVetoed(JobExecutionContext context) { + LOGGER.debug("The job '{}' was vetoed!", getJobName(context)); + } + + @Override + public void jobWasExecuted(JobExecutionContext context, JobExecutionException jobException) { + if (checkForFullHarvesterJob(context)) { + fullHarvestingJobs.remove(getGroup(context)); + } + } + + @Override + public void triggerFired(Trigger trigger, JobExecutionContext context) { + // TODO Auto-generated method stub + } + + @Override + public boolean vetoJobExecution(Trigger trigger, JobExecutionContext context) { + return checkForTemporalHarvesterJob(context) && fullHarvestingJobs.contains(getGroup(context)); + } + + @Override + public void triggerMisfired(Trigger trigger) { + // TODO Auto-generated method stub + } + + @Override + public void triggerComplete(Trigger trigger, JobExecutionContext context, + CompletedExecutionInstruction triggerInstructionCode) { + // TODO Auto-generated method stub + } + + private String getGroup(JobExecutionContext context) { + return context.getJobDetail().getKey().getGroup(); + } + + private String getJobName(JobExecutionContext context) { + return context.getJobDetail().getKey().getName(); + } + + private boolean checkForFullHarvesterJob(JobExecutionContext context) { + return context.getJobInstance() instanceof FullHarvesterJob; + } + + private boolean checkForTemporalHarvesterJob(JobExecutionContext context) { + return context.getJobInstance() instanceof TemporalHarvesterJob; + } + +} From b8ccf413bb339c4ef4abe41abf3410da1a1e26e7 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Mon, 25 Oct 2021 12:16:33 +0200 Subject: [PATCH 184/456] Bump version.jena from 3.17.0 to 4.2.0 --- README.md | 4 +++- pom.xml | 6 ++++++ .../java/org/n52/shetland/ogc/swe/SweEnvelopeTest.java | 8 ++++---- svalbard/xmlstream/pom.xml | 5 +++++ .../main/java/org/n52/svalbard/write/RdfStreamWriter.java | 4 ++-- .../java/org/n52/svalbard/write/RdfStreamWriterTest.java | 6 ++---- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8ff0eaac4..f060d1fbb 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,9 @@ Shetland consists of classes for OGC models like [SensorML](http://www.opengeosp #### Jan Mayen [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/janmayen.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea%20and%20a:janmayen*%20and%20p:jar) -Jan Mayen contains various utility classes shared across Arctic Sea. +#### Bjrnya (Bjornoya) [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/bjornoya.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea%20and%20a:bjornoya*%20and%20p:jar) + +Bjrnya contains various classes for scheduling [![Quartz](http://www.quartz-scheduler.org/)] shared across Arctic Sea. ### Key Technologies diff --git a/pom.xml b/pom.xml index 76a1562f5..76154c79d 100644 --- a/pom.xml +++ b/pom.xml @@ -1065,6 +1065,12 @@ + + org.apache.commons + commons-lang3 + 3.12.0 + test + com.neovisionaries nv-i18n diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/swe/SweEnvelopeTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/swe/SweEnvelopeTest.java index 40f5c663f..461ba038a 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/swe/SweEnvelopeTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/swe/SweEnvelopeTest.java @@ -58,14 +58,14 @@ public void should_create_valid_sosSweEnvelope_from_sosEnvelope() { assertThat(sweEnvelope.getReferenceFrame(), is(Integer.toString(srid))); // x1 final List> lcCoordinates = sweEnvelope.getLowerCorner().getCoordinates(); - assertThat(((BigDecimal) lcCoordinates.get(0).getValue().getValue()), is(bx1)); + assertThat(lcCoordinates.get(0).getValue().getValue(), is(bx1)); // y1 - assertThat(((BigDecimal) lcCoordinates.get(1).getValue().getValue()), is(by1)); + assertThat(lcCoordinates.get(1).getValue().getValue(), is(by1)); // x2 final List> ucCoordinates = sweEnvelope.getUpperCorner().getCoordinates(); - assertThat(((BigDecimal) ucCoordinates.get(0).getValue().getValue()), is(bx2)); + assertThat(ucCoordinates.get(0).getValue().getValue(), is(bx2)); // y2 - assertThat(((BigDecimal) ucCoordinates.get(1).getValue().getValue()), is(by2)); + assertThat(ucCoordinates.get(1).getValue().getValue(), is(by2)); // uom assertThat(((SweQuantity) lcCoordinates.get(0).getValue()).getUom(), is(uom)); assertThat(((SweQuantity) lcCoordinates.get(1).getValue()).getUom(), is(uom)); diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 14b349761..26179a626 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -140,5 +140,10 @@ commons-lang commons-lang + + org.apache.commons + commons-lang3 + test + diff --git a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/RdfStreamWriter.java b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/RdfStreamWriter.java index 4c43ec4f0..b7eb81fdf 100644 --- a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/RdfStreamWriter.java +++ b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/RdfStreamWriter.java @@ -21,7 +21,7 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdf.model.RDFWriter; +import org.apache.jena.rdf.model.RDFWriterI; import org.n52.shetland.rdf.RDF; import org.n52.svalbard.encode.EncodingContext; import org.n52.svalbard.encode.exception.EncodingException; @@ -36,7 +36,7 @@ public RdfStreamWriter(EncodingContext context, OutputStream outputStream, RDF e public void write() throws XMLStreamException, EncodingException { Model model = ModelFactory.createDefaultModel(); getElement().addToModel(model); - RDFWriter w = model.getWriter("RDF/XML-ABBREV"); + RDFWriterI w = model.getWriter("RDF/XML-ABBREV"); w.setProperty("showXMLDeclaration", "true"); w.setProperty("tab", "4"); w.write(model, getOutputStream(), null); diff --git a/svalbard/xmlstream/src/test/java/org/n52/svalbard/write/RdfStreamWriterTest.java b/svalbard/xmlstream/src/test/java/org/n52/svalbard/write/RdfStreamWriterTest.java index cc1588d6b..ee73f3eb0 100644 --- a/svalbard/xmlstream/src/test/java/org/n52/svalbard/write/RdfStreamWriterTest.java +++ b/svalbard/xmlstream/src/test/java/org/n52/svalbard/write/RdfStreamWriterTest.java @@ -23,10 +23,8 @@ import org.apache.jena.datatypes.xsd.XSDDatatype; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdf.model.RDFWriter; +import org.apache.jena.rdf.model.RDFWriterI; import org.junit.jupiter.api.Test; -import org.n52.shetland.rdf.AbstractDatatype; -import org.n52.shetland.rdf.AbstractDatatype.DataType; import org.n52.shetland.rdf.RDF; import org.n52.shetland.rdf.RDFDataTypes; import org.n52.shetland.rdf.dcat.AccessURL; @@ -101,7 +99,7 @@ public void testModelCreation() throws XMLStreamException, IOException { Model model = ModelFactory.createDefaultModel(); rdf.addToModel(model); - RDFWriter w = model.getWriter("RDF/XML-ABBREV"); + RDFWriterI w = model.getWriter("RDF/XML-ABBREV"); w.setProperty("showXMLDeclaration", "true"); w.setProperty("tab", "4"); try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { From f2108af819aa2ab9387759687cf69d50f3136b15 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Mon, 25 Oct 2021 12:54:33 +0200 Subject: [PATCH 185/456] Update notice --- NOTICE | 1 - 1 file changed, 1 deletion(-) diff --git a/NOTICE b/NOTICE index e0fac7be8..003a06886 100644 --- a/NOTICE +++ b/NOTICE @@ -46,7 +46,6 @@ This project includes: Apache Commons Compress under Apache License, Version 2.0 Apache Commons CSV under Apache License, Version 2.0 Apache Commons IO under Apache License, Version 2.0 - Apache Commons Lang under Apache License, Version 2.0 Apache HttpAsyncClient under Apache License, Version 2.0 Apache HttpClient under Apache License, Version 2.0 Apache HttpClient Cache under Apache License, Version 2.0 From d311571b39951c5f4711c1e618e05863a0b687ac Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Mon, 25 Oct 2021 13:06:53 +0200 Subject: [PATCH 186/456] fix enforcer for jena --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index fcbf771d1..9d4d9a881 100644 --- a/pom.xml +++ b/pom.xml @@ -1063,6 +1063,10 @@ org.apache.commons commons-lang3 + + org.jetbrains.kotlin + kotlin-stdlib + @@ -1071,6 +1075,12 @@ 3.12.0 test + + org.jetbrains.kotlin + kotlin-stdlib + 1.4.10 + runtime + com.neovisionaries nv-i18n From d6e2999feee6cf74e73e11a8af4f54ffa490ec0d Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Mon, 25 Oct 2021 13:30:19 +0200 Subject: [PATCH 187/456] add version, caching and java 17 --- .github/workflows/pull.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 1a1ff516d..fb19a31ae 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - java: [ 8, 9, 11, 15 ] + java: [ 8, 11, 17 ] runs-on: ubuntu-latest name: Java ${{ matrix.java }} compile @@ -18,6 +18,8 @@ jobs: - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v1 with: + distribution: 'adopt' java-version: ${{ matrix.java }} + cache: 'maven' - name: Build with Maven - run: mvn -U -B clean install \ No newline at end of file + run: mvn -U -B clean install From 568276547a303c8997bc7e4b66f039a0ed1ea7be Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Mon, 25 Oct 2021 13:32:31 +0200 Subject: [PATCH 188/456] update push wiht java 17, maven cahce and dist adopt --- .github/workflows/push.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index fa3b80c70..0d7a7ead4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -9,16 +9,18 @@ jobs: build: strategy: matrix: - java: [ 8, 9, 11, 15 ] + java: [ 8, 11, 17 ] runs-on: ubuntu-latest name: Java ${{ matrix.java }} compile steps: - uses: actions/checkout@v2 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: ${{ matrix.java }} + cache: 'maven' - name: Build with Maven run: mvn -fae -U -B clean install -P check publish-snapshot: @@ -28,9 +30,11 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up settings.xml for GitHub Packages - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: 8 + cache: 'maven' server-id: sonatype-nexus-snapshots server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD @@ -38,4 +42,4 @@ jobs: run: mvn -B --no-transfer-progress deploy -DskipTests env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} \ No newline at end of file + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} From 360057234222320af6a53502e38ef0ee7273dd91 Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Mon, 25 Oct 2021 13:33:30 +0200 Subject: [PATCH 189/456] upate setup-java version --- .github/workflows/pull.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index fb19a31ae..a8747b728 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: distribution: 'adopt' java-version: ${{ matrix.java }} From 6b7579971fa6317063ea26a824d9177e5ade7f85 Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Mon, 25 Oct 2021 13:34:54 +0200 Subject: [PATCH 190/456] update daily with dist adopt, java 17 and maven cache --- .github/workflows/daily.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 133f7c5c6..a6382cb5d 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -12,9 +12,11 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: 8 + cache: 'maven' - name: Build with Maven run: mvn -U -B clean install publish-snapshot: @@ -24,9 +26,11 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up settings.xml for GitHub Packages - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: 8 + cache: 'maven' server-id: sonatype-nexus-snapshots server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD From 690dd6edd1c04453fa3c5cc5de52eba0c6873eea Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Mon, 25 Oct 2021 13:47:34 +0200 Subject: [PATCH 191/456] update java dist to temurin, successor of adopt --- .github/workflows/daily.yml | 4 ++-- .github/workflows/pull.yml | 2 +- .github/workflows/push.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index a6382cb5d..b432313f1 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -14,7 +14,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 8 cache: 'maven' - name: Build with Maven @@ -28,7 +28,7 @@ jobs: - name: Set up settings.xml for GitHub Packages uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 8 cache: 'maven' server-id: sonatype-nexus-snapshots diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index a8747b728..163262bde 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -18,7 +18,7 @@ jobs: - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: ${{ matrix.java }} cache: 'maven' - name: Build with Maven diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 0d7a7ead4..3d326e468 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -18,7 +18,7 @@ jobs: - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: ${{ matrix.java }} cache: 'maven' - name: Build with Maven @@ -32,7 +32,7 @@ jobs: - name: Set up settings.xml for GitHub Packages uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 8 cache: 'maven' server-id: sonatype-nexus-snapshots From fbbd8838c080d5bbd27007698c9596879ba66f80 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Mon, 25 Oct 2021 14:36:35 +0200 Subject: [PATCH 192/456] downgrade java from 17 to 16 because of spotbug plugin --- .github/workflows/pull.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 163262bde..4b1b05072 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - java: [ 8, 11, 17 ] + java: [ 8, 11, 16 ] runs-on: ubuntu-latest name: Java ${{ matrix.java }} compile diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 3d326e468..6ac3143b2 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - java: [ 8, 11, 17 ] + java: [ 8, 11, 16 ] runs-on: ubuntu-latest name: Java ${{ matrix.java }} compile From 40e20db82f164802a51d7a1531ef26857f012679 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Mon, 25 Oct 2021 15:03:35 +0200 Subject: [PATCH 193/456] redo jena update due to 4 requires java 11 --- NOTICE | 2 -- pom.xml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index 003a06886..d6ca9f000 100644 --- a/NOTICE +++ b/NOTICE @@ -114,7 +114,6 @@ This project includes: JCL 1.2 implemented over SLF4J under Apache License, Version 2.0 Joda-Time under Apache License, Version 2.0 JOpt Simple under The MIT License - JSON-P Default Provider under Eclipse Public License 2.0 or GNU General Public License, version 2 with the GNU Classpath Exception JSONLD Java :: Core under Revised BSD License lang-mustache under Elastic License 2.0 or Server Side Public License, v 1 libphonenumber under The Apache Software License, Version 2.0 @@ -206,7 +205,6 @@ This project includes: Spring Expression Language (SpEL) under Apache License, Version 2.0 Spring Web under Apache License, Version 2.0 T-Digest under The Apache Software License, Version 2.0 - Titanium JSON-LD 1.1 under Apache License, Version 2.0 W3C SOAP specification recommondation (v1.1) under The Apache Software License, Version 2.0 W3C SOAP specification recommondation (v1.2 part 1) under The Apache Software License, Version 2.0 W3C WS-Addressing specification schemas (v1.0) under The Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index 9d4d9a881..789e632cd 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ 3.0.2 4.4.2 1.3.2 - 4.2.0 + 3.17.0 2.13.0 5.8.1 4.0.0 From 38d331004904c98a57754fc77f4839942bf63be7 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Mon, 25 Oct 2021 15:36:35 +0200 Subject: [PATCH 194/456] redo jena update due to 4 requires java 11 --- .../src/main/java/org/n52/svalbard/write/RdfStreamWriter.java | 4 ++-- .../test/java/org/n52/svalbard/write/RdfStreamWriterTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/RdfStreamWriter.java b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/RdfStreamWriter.java index b7eb81fdf..4c43ec4f0 100644 --- a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/RdfStreamWriter.java +++ b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/RdfStreamWriter.java @@ -21,7 +21,7 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdf.model.RDFWriterI; +import org.apache.jena.rdf.model.RDFWriter; import org.n52.shetland.rdf.RDF; import org.n52.svalbard.encode.EncodingContext; import org.n52.svalbard.encode.exception.EncodingException; @@ -36,7 +36,7 @@ public RdfStreamWriter(EncodingContext context, OutputStream outputStream, RDF e public void write() throws XMLStreamException, EncodingException { Model model = ModelFactory.createDefaultModel(); getElement().addToModel(model); - RDFWriterI w = model.getWriter("RDF/XML-ABBREV"); + RDFWriter w = model.getWriter("RDF/XML-ABBREV"); w.setProperty("showXMLDeclaration", "true"); w.setProperty("tab", "4"); w.write(model, getOutputStream(), null); diff --git a/svalbard/xmlstream/src/test/java/org/n52/svalbard/write/RdfStreamWriterTest.java b/svalbard/xmlstream/src/test/java/org/n52/svalbard/write/RdfStreamWriterTest.java index ee73f3eb0..c9ef799ef 100644 --- a/svalbard/xmlstream/src/test/java/org/n52/svalbard/write/RdfStreamWriterTest.java +++ b/svalbard/xmlstream/src/test/java/org/n52/svalbard/write/RdfStreamWriterTest.java @@ -23,7 +23,7 @@ import org.apache.jena.datatypes.xsd.XSDDatatype; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdf.model.RDFWriterI; +import org.apache.jena.rdf.model.RDFWriter; import org.junit.jupiter.api.Test; import org.n52.shetland.rdf.RDF; import org.n52.shetland.rdf.RDFDataTypes; @@ -99,7 +99,7 @@ public void testModelCreation() throws XMLStreamException, IOException { Model model = ModelFactory.createDefaultModel(); rdf.addToModel(model); - RDFWriterI w = model.getWriter("RDF/XML-ABBREV"); + RDFWriter w = model.getWriter("RDF/XML-ABBREV"); w.setProperty("showXMLDeclaration", "true"); w.setProperty("tab", "4"); try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { From 0909537f22bc5f578793849e7fb9ff61d25e5095 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Oct 2021 04:00:42 +0000 Subject: [PATCH 195/456] Bump reflections from 0.10.1 to 0.10.2 Bumps [reflections](https://github.com/ronmamo/reflections) from 0.10.1 to 0.10.2. - [Release notes](https://github.com/ronmamo/reflections/releases) - [Commits](https://github.com/ronmamo/reflections/compare/0.10.1...0.10.2) --- updated-dependencies: - dependency-name: org.reflections:reflections dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 789e632cd..dcde0b600 100644 --- a/pom.xml +++ b/pom.xml @@ -417,7 +417,7 @@ org.reflections reflections - 0.10.1 + 0.10.2 test From ff526a62d3c910074fd6f76c8ab6fe31751231fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Oct 2021 04:01:22 +0000 Subject: [PATCH 196/456] Bump kotlin-stdlib from 1.4.10 to 1.5.31 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.4.10 to 1.5.31. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.31/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.4.10...v1.5.31) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 789e632cd..632d5ace6 100644 --- a/pom.xml +++ b/pom.xml @@ -1078,7 +1078,7 @@ org.jetbrains.kotlin kotlin-stdlib - 1.4.10 + 1.5.31 runtime From 1d1f34b1c5ac089dd9bc640f289c24a12fae84a0 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Tue, 26 Oct 2021 11:02:32 +0200 Subject: [PATCH 197/456] Add DatasourceSettingsHandler to support non file handler properties --- .../service/DatabaseSettingsHandler.java | 2 +- .../service/DatasourceSettingsHandler.java | 31 +++++++++++++++++++ .../org/n52/iceland/binding/TestBinding.java | 1 - 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 iceland/core/src/main/java/org/n52/iceland/service/DatasourceSettingsHandler.java diff --git a/iceland/core/src/main/java/org/n52/iceland/service/DatabaseSettingsHandler.java b/iceland/core/src/main/java/org/n52/iceland/service/DatabaseSettingsHandler.java index b836bfb9a..5d3e9253d 100644 --- a/iceland/core/src/main/java/org/n52/iceland/service/DatabaseSettingsHandler.java +++ b/iceland/core/src/main/java/org/n52/iceland/service/DatabaseSettingsHandler.java @@ -25,7 +25,7 @@ * @since 1.0.0 * */ -public class DatabaseSettingsHandler extends DelegatingPropertyFileHandler { +public class DatabaseSettingsHandler extends DelegatingPropertyFileHandler implements DatasourceSettingsHandler { public static final String INIT_PARAM_DATA_SOURCE_CONFIG_LOCATION = "datasourceConfigLocation"; diff --git a/iceland/core/src/main/java/org/n52/iceland/service/DatasourceSettingsHandler.java b/iceland/core/src/main/java/org/n52/iceland/service/DatasourceSettingsHandler.java new file mode 100644 index 000000000..693522fe6 --- /dev/null +++ b/iceland/core/src/main/java/org/n52/iceland/service/DatasourceSettingsHandler.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2015-2021 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.iceland.service; + +import java.util.Properties; + +import org.n52.faroe.ConfigurationError; + +/** + * @since 9.2.0 + * + */ +public interface DatasourceSettingsHandler { + + Properties getAll() throws ConfigurationError; + + void saveAll(Properties properties) throws ConfigurationError; +} diff --git a/iceland/core/src/test/java/org/n52/iceland/binding/TestBinding.java b/iceland/core/src/test/java/org/n52/iceland/binding/TestBinding.java index 7b87ff20c..47bd70242 100644 --- a/iceland/core/src/test/java/org/n52/iceland/binding/TestBinding.java +++ b/iceland/core/src/test/java/org/n52/iceland/binding/TestBinding.java @@ -15,7 +15,6 @@ */ package org.n52.iceland.binding; -import java.util.Collections; import java.util.Set; import org.n52.janmayen.http.MediaType; From 87403bb1caf83d9c9c6b926fb23a66731bb20e15 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Tue, 26 Oct 2021 15:01:04 +0200 Subject: [PATCH 198/456] fix spring value definitions --- .../main/java/org/n52/bjornoya/schedule/JobFactory.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java index 898a2c782..10b0fe28e 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java @@ -40,6 +40,8 @@ public class JobFactory implements Constructable { public static final String FULL_HARVEST_UPDATE = "harvest.full"; public static final String TEMPORAL_HARVEST_UPDATE = "harvest.temporal"; + private static final String FULL_HARVEST_UPDATE_VALUE = "${" + FULL_HARVEST_UPDATE + "}"; + private static final String TEMPORAL_HARVEST_UPDATE_VALUE = "${" + TEMPORAL_HARVEST_UPDATE + "}"; private static final Logger LOGGER = LoggerFactory.getLogger(JobFactory.class); private String cronFullExpression = "0 0 03 * * ?"; private String cronTemporalExpression = "0 0/5 * * * ?"; @@ -49,7 +51,7 @@ public class JobFactory implements Constructable { private boolean initialized; @Inject - public void setDataSourceHarvesterScheduler(Scheduler scheduler) { + public void setScheduler(Scheduler scheduler) { this.scheduler = scheduler; } @@ -77,7 +79,7 @@ public String getFullCronExpression() { * the updateDefinition to set */ @Setting(FULL_HARVEST_UPDATE) - @Value(FULL_HARVEST_UPDATE) + @Value(FULL_HARVEST_UPDATE_VALUE) public void setFullCronExpression(String cronExpression) { Validation.notNullOrEmpty("Cron expression for full update!", cronExpression); validate(cronExpression); @@ -102,7 +104,7 @@ public String getTemporalCronExpression() { * the updateDefinition to set */ @Setting(TEMPORAL_HARVEST_UPDATE) - @Value(TEMPORAL_HARVEST_UPDATE) + @Value(TEMPORAL_HARVEST_UPDATE_VALUE) public void setTemporalCronExpression(String cronExpression) { Validation.notNullOrEmpty("Cron expression for temporal update!", cronExpression); validate(cronExpression); From ff7a8f3e4d03b0aded5a0f0681d914f4a2787dec Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Wed, 27 Oct 2021 09:11:30 +0200 Subject: [PATCH 199/456] fix checkstyle (build) --- .../java/org/n52/bjornoya/schedule/JobFactory.java | 6 ++++-- .../org/n52/bjornoya/schedule/TriggerJobListener.java | 11 ++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java index 10b0fe28e..139875563 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java @@ -40,8 +40,10 @@ public class JobFactory implements Constructable { public static final String FULL_HARVEST_UPDATE = "harvest.full"; public static final String TEMPORAL_HARVEST_UPDATE = "harvest.temporal"; - private static final String FULL_HARVEST_UPDATE_VALUE = "${" + FULL_HARVEST_UPDATE + "}"; - private static final String TEMPORAL_HARVEST_UPDATE_VALUE = "${" + TEMPORAL_HARVEST_UPDATE + "}"; + private static final String DOLLAR_BRACE = "${"; + private static final String BRACE = "}"; + private static final String FULL_HARVEST_UPDATE_VALUE = DOLLAR_BRACE + FULL_HARVEST_UPDATE + BRACE; + private static final String TEMPORAL_HARVEST_UPDATE_VALUE = DOLLAR_BRACE + TEMPORAL_HARVEST_UPDATE + BRACE; private static final Logger LOGGER = LoggerFactory.getLogger(JobFactory.class); private String cronFullExpression = "0 0 03 * * ?"; private String cronTemporalExpression = "0 0/5 * * * ?"; diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/TriggerJobListener.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/TriggerJobListener.java index e496cb297..172cd8a5b 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/TriggerJobListener.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/TriggerJobListener.java @@ -29,6 +29,7 @@ public class TriggerJobListener implements JobListener, TriggerListener { private static final Logger LOGGER = LoggerFactory.getLogger(TriggerJobListener.class); + private Set fullHarvestingJobs = new LinkedHashSet<>(); @Override @@ -51,7 +52,7 @@ public void jobExecutionVetoed(JobExecutionContext context) { @Override public void jobWasExecuted(JobExecutionContext context, JobExecutionException jobException) { if (checkForFullHarvesterJob(context)) { - fullHarvestingJobs.remove(getGroup(context)); + fullHarvestingJobs.remove(getGroup(context)); } } @@ -77,11 +78,15 @@ public void triggerComplete(Trigger trigger, JobExecutionContext context, } private String getGroup(JobExecutionContext context) { - return context.getJobDetail().getKey().getGroup(); + return context.getJobDetail() + .getKey() + .getGroup(); } private String getJobName(JobExecutionContext context) { - return context.getJobDetail().getKey().getName(); + return context.getJobDetail() + .getKey() + .getName(); } private boolean checkForFullHarvesterJob(JobExecutionContext context) { From 742a36fb3865a3886da869a98f80823cf3056a65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Oct 2021 07:39:45 +0000 Subject: [PATCH 200/456] Bump joda-time from 2.10.12 to 2.10.13 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.12 to 2.10.13. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.12...v2.10.13) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 85ef83b45..40f46571d 100644 --- a/pom.xml +++ b/pom.xml @@ -317,7 +317,7 @@ joda-time joda-time - 2.10.12 + 2.10.13 org.locationtech.jts From e23f32dbf46cada1a494d25fd393b8e073e39c12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Nov 2021 04:01:03 +0000 Subject: [PATCH 201/456] Bump version.elastic from 7.15.1 to 7.15.2 Bumps `version.elastic` from 7.15.1 to 7.15.2. Updates `elasticsearch` from 7.15.1 to 7.15.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.15.1...v7.15.2) Updates `elasticsearch-rest-client` from 7.15.1 to 7.15.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.15.1...v7.15.2) Updates `elasticsearch-rest-high-level-client` from 7.15.1 to 7.15.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.15.1...v7.15.2) --- updated-dependencies: - dependency-name: org.elasticsearch:elasticsearch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40f46571d..a3c9bbf52 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 4.0.0 2.2 4.4.14 - 7.15.1 + 7.15.2 4.9.2 3.3.1 From 9c61fb8c6ca64245f3dc8e8003af135e05caba23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Nov 2021 04:00:53 +0000 Subject: [PATCH 202/456] Bump version.spring from 5.3.12 to 5.3.13 Bumps `version.spring` from 5.3.12 to 5.3.13. Updates `spring-test` from 5.3.12 to 5.3.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.12...v5.3.13) Updates `spring-web` from 5.3.12 to 5.3.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.12...v5.3.13) Updates `spring-beans` from 5.3.12 to 5.3.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.12...v5.3.13) Updates `spring-core` from 5.3.12 to 5.3.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.12...v5.3.13) Updates `spring-context` from 5.3.12 to 5.3.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.12...v5.3.13) Updates `spring-context-support` from 5.3.12 to 5.3.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.12...v5.3.13) --- updated-dependencies: - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40f46571d..aed682dba 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.3.12 + 5.3.13 1.7.32 3.1.0 1.0.4 From f5d09c1f0ac91ad715e82c2b13146c4b9f5623e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Nov 2021 04:01:18 +0000 Subject: [PATCH 203/456] Bump spotbugs-annotations from 4.4.2 to 4.5.0 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.4.2 to 4.5.0. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.4.2...4.5.0) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40f46571d..005707166 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 2.7.0 4.8.0 3.0.2 - 4.4.2 + 4.5.0 1.3.2 3.17.0 2.13.0 From 70065b380c1b86fbb8e4a63eb6b05378646e7efb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Nov 2021 07:15:47 +0000 Subject: [PATCH 204/456] Bump version.antlr4 from 4.9.2 to 4.9.3 Bumps `version.antlr4` from 4.9.2 to 4.9.3. Updates `antlr4` from 4.9.2 to 4.9.3 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.9.2...4.9.3) Updates `antlr4-runtime` from 4.9.2 to 4.9.3 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.9.2...4.9.3) Updates `antlr4-maven-plugin` from 4.9.2 to 4.9.3 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.9.2...4.9.3) --- updated-dependencies: - dependency-name: org.antlr:antlr4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.antlr:antlr4-runtime dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.antlr:antlr4-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0ad05d46..f602fddb6 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ 2.2 4.4.14 7.15.2 - 4.9.2 + 4.9.3 3.3.1 From 88316cdedb974741e406f1392e56a98985cbbae0 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Fri, 12 Nov 2021 09:17:25 +0100 Subject: [PATCH 205/456] [maven-release-plugin] prepare release v9.2.0 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 54eaca130..18bcebbf4 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0-SNAPSHOT + 9.2.0 bjornoya diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 4c6f66b3c..d72f4e22a 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.2.0-SNAPSHOT + 9.2.0 faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index ab76886f9..be4621dff 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.2.0-SNAPSHOT + 9.2.0 faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index eef1414cf..6370b34a9 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.2.0-SNAPSHOT + 9.2.0 faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index f80a181f7..12d8da5b3 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0-SNAPSHOT + 9.2.0 faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 50f0e7b90..71abef806 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.2.0-SNAPSHOT + 9.2.0 faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 494a9ecbe..5c9f1a99f 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.0-SNAPSHOT + 9.2.0 iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index a77a9d7ca..bae7e7c95 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0-SNAPSHOT + 9.2.0 iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 3bcacba61..71229a92a 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.0-SNAPSHOT + 9.2.0 ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 9a68d02d1..5e6cec8a6 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.0-SNAPSHOT + 9.2.0 ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index e5399e853..bd0f2f8f6 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.0-SNAPSHOT + 9.2.0 ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 4ce96811c..cddbcbb0d 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.0-SNAPSHOT + 9.2.0 ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 0168c92bd..5e879ca39 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0-SNAPSHOT + 9.2.0 janmayen diff --git a/pom.xml b/pom.xml index f602fddb6..5e66f8889 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0-SNAPSHOT + 9.2.0 pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - HEAD + v9.2.0 diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index d63fff0d2..6f7f293a1 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 9.2.0-SNAPSHOT + 9.2.0 shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index 50a7fa541..394fccde3 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0-SNAPSHOT + 9.2.0 shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 1e8882090..32b331a4f 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea shetland-parent - 9.2.0-SNAPSHOT + 9.2.0 shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 84cc52b63..9a508f866 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0-SNAPSHOT + 9.2.0 svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 4dd3c3671..3f71ea08e 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0-SNAPSHOT + 9.2.0 svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index fdaaa81b7..5d3f78acf 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0-SNAPSHOT + 9.2.0 svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 15d0075a6..27b2bb49f 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0-SNAPSHOT + 9.2.0 svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index fcaaac925..c13e98eb2 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0-SNAPSHOT + 9.2.0 svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 81aa4ac0a..e688c5b9a 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0-SNAPSHOT + 9.2.0 svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 8b658228e..4c7171956 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0-SNAPSHOT + 9.2.0 svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 26179a626..85f37c9c1 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0-SNAPSHOT + 9.2.0 svalbard-xmlstream 52°North Svalbard XML Stream From 79dde04bcf65aa30aac5e5ebfe0c68233c6b0a93 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Fri, 12 Nov 2021 09:17:32 +0100 Subject: [PATCH 206/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 18bcebbf4..dc4daa577 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0 + 9.3.0-SNAPSHOT bjornoya diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index d72f4e22a..724272578 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.2.0 + 9.3.0-SNAPSHOT faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index be4621dff..306c0177a 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.2.0 + 9.3.0-SNAPSHOT faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 6370b34a9..d45a7cc69 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.2.0 + 9.3.0-SNAPSHOT faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index 12d8da5b3..2a3dcdf00 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0 + 9.3.0-SNAPSHOT faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 71abef806..f28ec7d95 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.2.0 + 9.3.0-SNAPSHOT faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 5c9f1a99f..9eb2a2f1b 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.0 + 9.3.0-SNAPSHOT iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index bae7e7c95..8861a828e 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0 + 9.3.0-SNAPSHOT iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 71229a92a..11c5dad8e 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.0 + 9.3.0-SNAPSHOT ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 5e6cec8a6..218918996 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.0 + 9.3.0-SNAPSHOT ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index bd0f2f8f6..c49c71e6e 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.0 + 9.3.0-SNAPSHOT ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index cddbcbb0d..155b775bf 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.0 + 9.3.0-SNAPSHOT ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 5e879ca39..bca1ff4b3 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0 + 9.3.0-SNAPSHOT janmayen diff --git a/pom.xml b/pom.xml index 5e66f8889..d799e950f 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0 + 9.3.0-SNAPSHOT pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - v9.2.0 + HEAD diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 6f7f293a1..cc44935a8 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 9.2.0 + 9.3.0-SNAPSHOT shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index 394fccde3..3572d7586 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0 + 9.3.0-SNAPSHOT shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 32b331a4f..753ad4e47 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea shetland-parent - 9.2.0 + 9.3.0-SNAPSHOT shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 9a508f866..fa47b71a7 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0 + 9.3.0-SNAPSHOT svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 3f71ea08e..475870c8c 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0 + 9.3.0-SNAPSHOT svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 5d3f78acf..2f7b54dd9 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0 + 9.3.0-SNAPSHOT svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 27b2bb49f..fdf5b80ec 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0 + 9.3.0-SNAPSHOT svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index c13e98eb2..4411f8cf9 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0 + 9.3.0-SNAPSHOT svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index e688c5b9a..c178f2508 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea arctic-sea - 9.2.0 + 9.3.0-SNAPSHOT svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 4c7171956..194b449b4 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0 + 9.3.0-SNAPSHOT svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 85f37c9c1..c6f0b29c7 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.0 + 9.3.0-SNAPSHOT svalbard-xmlstream 52°North Svalbard XML Stream From 370f1edc09c35b7a3ffcf6e8eec1cc1ee19b2b36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 04:00:37 +0000 Subject: [PATCH 207/456] Bump lucene-core from 8.10.1 to 8.11.0 Bumps lucene-core from 8.10.1 to 8.11.0. --- updated-dependencies: - dependency-name: org.apache.lucene:lucene-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d799e950f..9797bd824 100644 --- a/pom.xml +++ b/pom.xml @@ -630,7 +630,7 @@ org.apache.lucene lucene-core - 8.10.1 + 8.11.0 com.maxmind.db From 1769bf41704e8a407f1a89563513de7993085c08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 04:02:13 +0000 Subject: [PATCH 208/456] Bump kotlin-stdlib from 1.5.31 to 1.6.0 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.5.31 to 1.6.0. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d799e950f..49bd35ffd 100644 --- a/pom.xml +++ b/pom.xml @@ -1078,7 +1078,7 @@ org.jetbrains.kotlin kotlin-stdlib - 1.5.31 + 1.6.0 runtime From f9a834eb545ba092a6a27a3b37757e0653629d6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 04:01:13 +0000 Subject: [PATCH 209/456] Bump geoip2 from 2.15.0 to 2.16.1 Bumps [geoip2](https://github.com/maxmind/GeoIP2-java) from 2.15.0 to 2.16.1. - [Release notes](https://github.com/maxmind/GeoIP2-java/releases) - [Changelog](https://github.com/maxmind/GeoIP2-java/blob/v2.16.1/CHANGELOG.md) - [Commits](https://github.com/maxmind/GeoIP2-java/compare/v2.15.0...v2.16.1) --- updated-dependencies: - dependency-name: com.maxmind.geoip2:geoip2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d799e950f..65839da67 100644 --- a/pom.xml +++ b/pom.xml @@ -640,7 +640,7 @@ com.maxmind.geoip2 geoip2 - 2.15.0 + 2.16.1 commons-logging From ffdc5fa6d0b625ebd8f66dec0cc6e14742195d7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 04:00:58 +0000 Subject: [PATCH 210/456] Bump version.mockito from 4.0.0 to 4.1.0 Bumps `version.mockito` from 4.0.0 to 4.1.0. Updates `mockito-core` from 4.0.0 to 4.1.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.0.0...v4.1.0) Updates `mockito-junit-jupiter` from 4.0.0 to 4.1.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.0.0...v4.1.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d01df1890..0a4f2111f 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 3.17.0 2.13.0 5.8.1 - 4.0.0 + 4.1.0 2.2 4.4.14 7.15.2 From b959c241662bc378efc3bfebbc5071b97e7b12a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Nov 2021 04:00:51 +0000 Subject: [PATCH 211/456] Bump version.junit from 5.8.1 to 5.8.2 Bumps `version.junit` from 5.8.1 to 5.8.2. Updates `junit-jupiter-api` from 5.8.1 to 5.8.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.1...r5.8.2) Updates `junit-jupiter-engine` from 5.8.1 to 5.8.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.1...r5.8.2) Updates `junit-jupiter-params` from 5.8.1 to 5.8.2 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.1...r5.8.2) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0a4f2111f..34e8fa75a 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 1.3.2 3.17.0 2.13.0 - 5.8.1 + 5.8.2 4.1.0 2.2 4.4.14 From d961a2684199331809610994a9a9e58f48c07d77 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Tue, 30 Nov 2021 13:51:40 +0100 Subject: [PATCH 212/456] fix @Value constants with default value --- .../java/org/n52/bjornoya/schedule/JobFactory.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java index 139875563..891913399 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java @@ -42,11 +42,16 @@ public class JobFactory implements Constructable { public static final String TEMPORAL_HARVEST_UPDATE = "harvest.temporal"; private static final String DOLLAR_BRACE = "${"; private static final String BRACE = "}"; - private static final String FULL_HARVEST_UPDATE_VALUE = DOLLAR_BRACE + FULL_HARVEST_UPDATE + BRACE; - private static final String TEMPORAL_HARVEST_UPDATE_VALUE = DOLLAR_BRACE + TEMPORAL_HARVEST_UPDATE + BRACE; + private static final String COLON = ":"; + private static final String DEFAULT_FULL = "0 0 03 * * ?"; + private static final String DEFAULT_TEMPORAL = "0 0/5 * * * ?"; + private static final String FULL_HARVEST_UPDATE_VALUE = + DOLLAR_BRACE + FULL_HARVEST_UPDATE + COLON + DEFAULT_FULL + BRACE; + private static final String TEMPORAL_HARVEST_UPDATE_VALUE = + DOLLAR_BRACE + TEMPORAL_HARVEST_UPDATE + COLON + DEFAULT_TEMPORAL + BRACE; private static final Logger LOGGER = LoggerFactory.getLogger(JobFactory.class); - private String cronFullExpression = "0 0 03 * * ?"; - private String cronTemporalExpression = "0 0/5 * * * ?"; + private String cronFullExpression = DEFAULT_FULL; + private String cronTemporalExpression = DEFAULT_TEMPORAL; private Scheduler scheduler; private Set jobs = new HashSet<>(); private List scheduledJobs = new ArrayList<>(); From 9adc5154fdfd925f4a1d0dc268890c7f419f885a Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Tue, 30 Nov 2021 14:22:07 +0100 Subject: [PATCH 213/456] [maven-release-plugin] prepare release v9.2.1 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index dc4daa577..da6004f71 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 9.3.0-SNAPSHOT + 9.2.1 bjornoya diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 724272578..6a02e6ff8 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.3.0-SNAPSHOT + 9.2.1 faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 306c0177a..46ad07589 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.3.0-SNAPSHOT + 9.2.1 faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index d45a7cc69..4bf55f0a2 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.3.0-SNAPSHOT + 9.2.1 faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index 2a3dcdf00..78f98b829 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea arctic-sea - 9.3.0-SNAPSHOT + 9.2.1 faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index f28ec7d95..13740c791 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.3.0-SNAPSHOT + 9.2.1 faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 9eb2a2f1b..3a4c517e3 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.3.0-SNAPSHOT + 9.2.1 iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index 8861a828e..9e128dfd4 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 9.3.0-SNAPSHOT + 9.2.1 iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 11c5dad8e..c40680948 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.3.0-SNAPSHOT + 9.2.1 ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 218918996..8ade3a49c 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.3.0-SNAPSHOT + 9.2.1 ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index c49c71e6e..478b2425e 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.3.0-SNAPSHOT + 9.2.1 ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 155b775bf..0525c174e 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.3.0-SNAPSHOT + 9.2.1 ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index bca1ff4b3..f874d49a9 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 9.3.0-SNAPSHOT + 9.2.1 janmayen diff --git a/pom.xml b/pom.xml index 34e8fa75a..5cbe86763 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.n52.arctic-sea arctic-sea - 9.3.0-SNAPSHOT + 9.2.1 pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - HEAD + v9.2.1 diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index cc44935a8..9d460417d 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 9.3.0-SNAPSHOT + 9.2.1 shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index 3572d7586..6f85e81ab 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea arctic-sea - 9.3.0-SNAPSHOT + 9.2.1 shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 753ad4e47..e2f0cbb42 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea shetland-parent - 9.3.0-SNAPSHOT + 9.2.1 shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index fa47b71a7..8ed0a408d 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.3.0-SNAPSHOT + 9.2.1 svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 475870c8c..3844dfd6f 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.3.0-SNAPSHOT + 9.2.1 svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 2f7b54dd9..377823475 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.3.0-SNAPSHOT + 9.2.1 svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index fdf5b80ec..dc5988516 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.3.0-SNAPSHOT + 9.2.1 svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 4411f8cf9..8eb598d88 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.3.0-SNAPSHOT + 9.2.1 svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index c178f2508..c61651c39 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea arctic-sea - 9.3.0-SNAPSHOT + 9.2.1 svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 194b449b4..8a3812e87 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.3.0-SNAPSHOT + 9.2.1 svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index c6f0b29c7..241e4cd3c 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.3.0-SNAPSHOT + 9.2.1 svalbard-xmlstream 52°North Svalbard XML Stream From ec8d86bf104ea0591d11346920b8bbb9c9f05480 Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Tue, 30 Nov 2021 14:22:11 +0100 Subject: [PATCH 214/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index da6004f71..dc4daa577 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 9.2.1 + 9.3.0-SNAPSHOT bjornoya diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 6a02e6ff8..724272578 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.2.1 + 9.3.0-SNAPSHOT faroe-annotations 52°North Faroe Annotations diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 46ad07589..306c0177a 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.2.1 + 9.3.0-SNAPSHOT faroe 52°North Faroe diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 4bf55f0a2..d45a7cc69 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.2.1 + 9.3.0-SNAPSHOT faroe-json jar diff --git a/faroe/pom.xml b/faroe/pom.xml index 78f98b829..2a3dcdf00 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea arctic-sea - 9.2.1 + 9.3.0-SNAPSHOT faroe-parent pom diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 13740c791..f28ec7d95 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea faroe-parent - 9.2.1 + 9.3.0-SNAPSHOT faroe-utils 52°North Faroe Utilities diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 3a4c517e3..9eb2a2f1b 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.1 + 9.3.0-SNAPSHOT iceland diff --git a/iceland/pom.xml b/iceland/pom.xml index 9e128dfd4..8861a828e 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 9.2.1 + 9.3.0-SNAPSHOT iceland-parent diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index c40680948..11c5dad8e 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.1 + 9.3.0-SNAPSHOT ../.. diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 8ade3a49c..218918996 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.1 + 9.3.0-SNAPSHOT ../.. diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 478b2425e..c49c71e6e 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.1 + 9.3.0-SNAPSHOT ../.. diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 0525c174e..155b775bf 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea iceland-parent - 9.2.1 + 9.3.0-SNAPSHOT ../.. diff --git a/janmayen/pom.xml b/janmayen/pom.xml index f874d49a9..bca1ff4b3 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea arctic-sea - 9.2.1 + 9.3.0-SNAPSHOT janmayen diff --git a/pom.xml b/pom.xml index 5cbe86763..34e8fa75a 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.n52.arctic-sea arctic-sea - 9.2.1 + 9.3.0-SNAPSHOT pom 52°North Arctic Sea @@ -87,7 +87,7 @@ https://github.com/52North/arctic-sea scm:git:https://github.com/52North/arctic-sea.git scm:git:https://github.com/52North/arctic-sea.git - v9.2.1 + HEAD diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 9d460417d..cc44935a8 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ org.n52.arctic-sea shetland-parent - 9.2.1 + 9.3.0-SNAPSHOT shetland diff --git a/shetland/pom.xml b/shetland/pom.xml index 6f85e81ab..3572d7586 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea arctic-sea - 9.2.1 + 9.3.0-SNAPSHOT shetland-parent pom diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index e2f0cbb42..753ad4e47 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea shetland-parent - 9.2.1 + 9.3.0-SNAPSHOT shetland-rdf 52°North Shetland RDF diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 8ed0a408d..fa47b71a7 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.1 + 9.3.0-SNAPSHOT svalbard 52°North Svalbard Core diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 3844dfd6f..475870c8c 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.1 + 9.3.0-SNAPSHOT svalbard-exi 52°North Svalbard Exi diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 377823475..2f7b54dd9 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.1 + 9.3.0-SNAPSHOT svalbard-json-common 52°North Svalbard JSON Common diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index dc5988516..fdf5b80ec 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.1 + 9.3.0-SNAPSHOT svalbard-json 52°North Svalbard JSON encoding diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 8eb598d88..4411f8cf9 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.1 + 9.3.0-SNAPSHOT svalbard-odata 52°North Svalbard OData diff --git a/svalbard/pom.xml b/svalbard/pom.xml index c61651c39..c178f2508 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea arctic-sea - 9.2.1 + 9.3.0-SNAPSHOT svalbard-parent pom diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 8a3812e87..194b449b4 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.1 + 9.3.0-SNAPSHOT svalbard-xmlbeans 52°North Svalbard XmlBeans diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 241e4cd3c..c6f0b29c7 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ org.n52.arctic-sea svalbard-parent - 9.2.1 + 9.3.0-SNAPSHOT svalbard-xmlstream 52°North Svalbard XML Stream From 56f9ccd8089534a37db99df57c6abe4b62ef0174 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 04:00:36 +0000 Subject: [PATCH 215/456] Bump version.elastic from 7.15.2 to 7.16.1 Bumps `version.elastic` from 7.15.2 to 7.16.1. Updates `elasticsearch` from 7.15.2 to 7.16.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.15.2...v7.16.1) Updates `elasticsearch-rest-client` from 7.15.2 to 7.16.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.15.2...v7.16.1) Updates `elasticsearch-rest-high-level-client` from 7.15.2 to 7.16.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.15.2...v7.16.1) --- updated-dependencies: - dependency-name: org.elasticsearch:elasticsearch dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.elasticsearch.client:elasticsearch-rest-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34e8fa75a..bb1b92d75 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 4.1.0 2.2 4.4.14 - 7.15.2 + 7.16.1 4.9.3 3.3.1 From 5b51bb60154744b2b350c050afb11ab6fe668bc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 04:01:28 +0000 Subject: [PATCH 216/456] Bump spotbugs-annotations from 4.5.0 to 4.5.2 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.5.0 to 4.5.2. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.5.0...4.5.2) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34e8fa75a..410a155f1 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 2.7.0 4.8.0 3.0.2 - 4.5.0 + 4.5.2 1.3.2 3.17.0 2.13.0 From 5752bbfdabab5a287e7df8c6ce34b00305565dfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 04:01:18 +0000 Subject: [PATCH 217/456] Bump kotlin-stdlib from 1.6.0 to 1.6.10 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.6.0 to 1.6.10. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.6.10/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.6.0...v1.6.10) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34e8fa75a..4bc0095d7 100644 --- a/pom.xml +++ b/pom.xml @@ -1078,7 +1078,7 @@ org.jetbrains.kotlin kotlin-stdlib - 1.6.0 + 1.6.10 runtime From ae8fcdd1a8a70a50f7d76682488a9c8063d58bc4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 07:20:54 +0000 Subject: [PATCH 218/456] Bump version.httpcore from 4.4.14 to 4.4.15 Bumps `version.httpcore` from 4.4.14 to 4.4.15. Updates `httpcore` from 4.4.14 to 4.4.15 Updates `httpcore-nio` from 4.4.14 to 4.4.15 --- updated-dependencies: - dependency-name: org.apache.httpcomponents:httpcore dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.httpcomponents:httpcore-nio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d2f1a6af..3cd5efa55 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ 5.8.2 4.1.0 2.2 - 4.4.14 + 4.4.15 7.16.1 4.9.3 3.3.1 From d849450d714634b355452b2c0d95ec7048155cc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Dec 2021 04:00:52 +0000 Subject: [PATCH 219/456] Bump version.spring from 5.3.13 to 5.3.14 Bumps `version.spring` from 5.3.13 to 5.3.14. Updates `spring-test` from 5.3.13 to 5.3.14 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.13...v5.3.14) Updates `spring-web` from 5.3.13 to 5.3.14 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.13...v5.3.14) Updates `spring-beans` from 5.3.13 to 5.3.14 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.13...v5.3.14) Updates `spring-core` from 5.3.13 to 5.3.14 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.13...v5.3.14) Updates `spring-context` from 5.3.13 to 5.3.14 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.13...v5.3.14) Updates `spring-context-support` from 5.3.13 to 5.3.14 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.13...v5.3.14) --- updated-dependencies: - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3cd5efa55..a1c67334a 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.3.13 + 5.3.14 1.7.32 3.1.0 1.0.4 From b126d6924ca8d5a8d7b796387c1a3706c7b2b1b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Dec 2021 04:01:51 +0000 Subject: [PATCH 220/456] Bump version.mockito from 4.1.0 to 4.2.0 Bumps `version.mockito` from 4.1.0 to 4.2.0. Updates `mockito-core` from 4.1.0 to 4.2.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.1.0...v4.2.0) Updates `mockito-junit-jupiter` from 4.1.0 to 4.2.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3cd5efa55..fd356007f 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 3.17.0 2.13.0 5.8.2 - 4.1.0 + 4.2.0 2.2 4.4.15 7.16.1 From 78d59dba7a42e4f58ee8f3ebd737042864b66c8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 04:00:35 +0000 Subject: [PATCH 221/456] Bump version.jackson from 2.13.0 to 2.13.1 Bumps `version.jackson` from 2.13.0 to 2.13.1. Updates `jackson-core` from 2.13.0 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.13.0...jackson-core-2.13.1) Updates `jackson-annotations` from 2.13.0 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-databind` from 2.13.0 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-datatype-jdk8` from 2.13.0 to 2.13.1 --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2cff21fca..9c34f286e 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ 4.5.2 1.3.2 3.17.0 - 2.13.0 + 2.13.1 5.8.2 4.2.0 2.2 From dbb730d89856ad810dc677437709690c83fca183 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 04:01:03 +0000 Subject: [PATCH 222/456] Bump version.elastic from 7.16.1 to 7.16.2 Bumps `version.elastic` from 7.16.1 to 7.16.2. Updates `elasticsearch` from 7.16.1 to 7.16.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.16.1...v7.16.2) Updates `elasticsearch-rest-client` from 7.16.1 to 7.16.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.16.1...v7.16.2) Updates `elasticsearch-rest-high-level-client` from 7.16.1 to 7.16.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.16.1...v7.16.2) --- updated-dependencies: - dependency-name: org.elasticsearch:elasticsearch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2cff21fca..1bae7a638 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 4.2.0 2.2 4.4.15 - 7.16.1 + 7.16.2 4.9.3 3.3.1 From 2ef0ffe0aa8159a5516c0e18e2cfa8693f035a6f Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Thu, 23 Dec 2021 09:48:29 +0100 Subject: [PATCH 223/456] Bump lucene-core from 8.11.0 to 8.11.1 --- NOTICE | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index d6ca9f000..25fa4d68d 100644 --- a/NOTICE +++ b/NOTICE @@ -63,10 +63,10 @@ This project includes: Commons Lang under The Apache Software License, Version 2.0 compiler under Apache License 2.0 dexx under MIT License - Elastic JNA Distribution under Apache License, Version 2.0 elasticsearch-cli under Elastic License 2.0 or Server Side Public License, v 1 elasticsearch-core under Elastic License 2.0 or Server Side Public License, v 1 elasticsearch-geo under Elastic License 2.0 or Server Side Public License, v 1 + elasticsearch-lz4 under Elastic License 2.0 or Server Side Public License, v 1 elasticsearch-plugin-classloader under Elastic License 2.0 or Server Side Public License, v 1 elasticsearch-secure-sm under Elastic License 2.0 or Server Side Public License, v 1 elasticsearch-x-content under Elastic License 2.0 or Server Side Public License, v 1 @@ -106,6 +106,7 @@ This project includes: jackson-databind under The Apache Software License, Version 2.0 Jackson-dataformat-YAML under The Apache Software License, Version 2.0 Java archiving library under Apache 2 + Java Native Access under LGPL-2.1-or-later or Apache-2.0 JavaBeans(TM) Activation Framework under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 JavaMail API jar under CDDL or GPLv2+CE javax.annotation API under CDDL + GPLv2 with classpath exception @@ -128,7 +129,6 @@ This project includes: Lucene QueryParsers under Apache License, Version 2.0 Lucene Sandbox under Apache License, Version 2.0 Lucene Spatial 3D under Apache License, Version 2.0 - Lucene Spatial Extras under Apache License, Version 2.0 Lucene Suggest under Apache License, Version 2.0 LZ4 and xxHash under The Apache Software License, Version 2.0 mapper-extras under Elastic License 2.0 or Server Side Public License, v 1 diff --git a/pom.xml b/pom.xml index 057eea342..d2bee91fd 100644 --- a/pom.xml +++ b/pom.xml @@ -630,7 +630,7 @@ org.apache.lucene lucene-core - 8.11.0 + 8.11.1 com.maxmind.db From c4243d91c8b1783cd37d86979fc32ec6beb5fbea Mon Sep 17 00:00:00 2001 From: Carsten Hollmann Date: Wed, 5 Jan 2022 15:47:09 +0100 Subject: [PATCH 224/456] annual license header update --- bjornoya/pom.xml | 2 +- .../n52/bjornoya/schedule/AutowiringSpringBeanJobFactory.java | 2 +- .../main/java/org/n52/bjornoya/schedule/FullHarvesterJob.java | 2 +- .../src/main/java/org/n52/bjornoya/schedule/JobFactory.java | 2 +- .../src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java | 2 +- bjornoya/src/main/java/org/n52/bjornoya/schedule/Scheduler.java | 2 +- .../java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java | 2 +- .../main/java/org/n52/bjornoya/schedule/TriggerJobListener.java | 2 +- faroe/annotations/pom.xml | 2 +- .../src/main/java/org/n52/faroe/annotation/Configurable.java | 2 +- .../src/main/java/org/n52/faroe/annotation/Setting.java | 2 +- faroe/core/pom.xml | 2 +- faroe/core/src/main/java/org/n52/faroe/AbstractOrdered.java | 2 +- .../src/main/java/org/n52/faroe/AbstractSettingDefinition.java | 2 +- .../src/main/java/org/n52/faroe/FileSettingsConfiguration.java | 2 +- .../core/src/main/java/org/n52/faroe/JSONSettingConstants.java | 2 +- faroe/core/src/main/java/org/n52/faroe/Ordered.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingDefinition.java | 2 +- .../src/main/java/org/n52/faroe/SettingDefinitionGroup.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingType.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingValue.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingValueFactory.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingsChangeEvent.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingsDao.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingsFileWatcher.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingsService.java | 2 +- faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java | 2 +- .../java/org/n52/faroe/settings/BooleanSettingDefinition.java | 2 +- .../java/org/n52/faroe/settings/ChoiceSettingDefinition.java | 2 +- .../java/org/n52/faroe/settings/DateTimeSettingDefinition.java | 2 +- .../main/java/org/n52/faroe/settings/FileSettingDefinition.java | 2 +- .../java/org/n52/faroe/settings/IntegerSettingDefinition.java | 2 +- .../n52/faroe/settings/MultilingualStringSettingDefinition.java | 2 +- .../java/org/n52/faroe/settings/NumericSettingDefinition.java | 2 +- .../java/org/n52/faroe/settings/StringSettingDefinition.java | 2 +- .../main/java/org/n52/faroe/settings/UriSettingDefinition.java | 2 +- .../src/test/java/org/n52/faroe/SettingValueFactoryTest.java | 2 +- .../org/n52/faroe/settings/AbstractSettingsDefinitionTest.java | 2 +- .../org/n52/faroe/settings/BooleanSettingValueForTesting.java | 2 +- .../org/n52/faroe/settings/ChoiceSettingValueForTesting.java | 2 +- .../java/org/n52/faroe/settings/FileSettingValueForTesting.java | 2 +- .../org/n52/faroe/settings/IntegerSettingValueForTesting.java | 2 +- .../n52/faroe/settings/MultilingualStringValueForTesting.java | 2 +- .../org/n52/faroe/settings/NumericSettingValueForTesting.java | 2 +- .../org/n52/faroe/settings/StringSettingValueForTesting.java | 2 +- .../n52/faroe/settings/TimeInstantSettingValueForTesting.java | 2 +- .../java/org/n52/faroe/settings/UriSettingValueForTesting.java | 2 +- faroe/json/pom.xml | 2 +- .../json/src/main/java/org/n52/faroe/json/AbstractJsonDao.java | 2 +- .../src/main/java/org/n52/faroe/json/JsonConfiguration.java | 2 +- .../json/src/main/java/org/n52/faroe/json/JsonSettingValue.java | 2 +- .../main/java/org/n52/faroe/json/JsonSettingValueFactory.java | 2 +- .../json/src/main/java/org/n52/faroe/json/JsonSettingsDao.java | 2 +- .../src/main/java/org/n52/faroe/json/JsonSettingsDecoder.java | 2 +- .../src/main/java/org/n52/faroe/json/JsonSettingsEncoder.java | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- faroe/utils/src/main/java/org/n52/faroe/ConfigurationError.java | 2 +- faroe/utils/src/main/java/org/n52/faroe/Validation.java | 2 +- iceland/core/pom.xml | 2 +- .../main/java/org/n52/iceland/binding/AbstractXmlBinding.java | 2 +- iceland/core/src/main/java/org/n52/iceland/binding/Binding.java | 2 +- .../src/main/java/org/n52/iceland/binding/BindingFactory.java | 2 +- .../core/src/main/java/org/n52/iceland/binding/BindingKey.java | 2 +- .../main/java/org/n52/iceland/binding/BindingRepository.java | 2 +- .../java/org/n52/iceland/binding/EncodingExceptionHandler.java | 2 +- .../main/java/org/n52/iceland/binding/MediaTypeBindingKey.java | 2 +- .../src/main/java/org/n52/iceland/binding/PathBindingKey.java | 2 +- .../src/main/java/org/n52/iceland/binding/SimpleBinding.java | 2 +- .../src/main/java/org/n52/iceland/binding/exi/EXIBinding.java | 2 +- .../src/main/java/org/n52/iceland/binding/exi/EXISettings.java | 2 +- .../src/main/java/org/n52/iceland/binding/exi/EXIUtils.java | 2 +- .../src/main/java/org/n52/iceland/binding/json/JSONBinding.java | 2 +- .../java/org/n52/iceland/binding/kvp/AbstractKvpDecoder.java | 2 +- .../src/main/java/org/n52/iceland/binding/kvp/KvpBinding.java | 2 +- .../src/main/java/org/n52/iceland/binding/pox/PoxBinding.java | 2 +- .../src/main/java/org/n52/iceland/binding/soap/SoapBinding.java | 2 +- .../core/src/main/java/org/n52/iceland/cache/ContentCache.java | 2 +- .../main/java/org/n52/iceland/cache/ContentCacheController.java | 2 +- .../org/n52/iceland/cache/ContentCachePersistenceStrategy.java | 2 +- .../src/main/java/org/n52/iceland/cache/ContentCacheUpdate.java | 2 +- .../main/java/org/n52/iceland/cache/WritableContentCache.java | 2 +- .../cache/ctrl/AbstractSchedulingContentCacheController.java | 2 +- .../org/n52/iceland/cache/ctrl/CompleteCacheUpdateFactory.java | 2 +- .../org/n52/iceland/cache/ctrl/ContentCacheControllerImpl.java | 2 +- .../java/org/n52/iceland/cache/ctrl/ContentCacheFactory.java | 2 +- .../cache/ctrl/ScheduledContentCacheControllerSettings.java | 2 +- .../persistence/AbstractPersistingCachePersistenceStrategy.java | 2 +- .../cache/ctrl/persistence/AsyncCachePersistenceStrategy.java | 2 +- .../ctrl/persistence/AsyncCachePersistenceStrategySettings.java | 2 +- .../cache/ctrl/persistence/ImmediatePersistenceStrategy.java | 2 +- .../cache/ctrl/persistence/NoOpCachePersistenceStrategy.java | 2 +- .../java/org/n52/iceland/coding/DocumentBuilderProvider.java | 2 +- .../java/org/n52/iceland/coding/SupportedTypeRepository.java | 2 +- .../n52/iceland/coding/SupportedTypeRepositoryInitializer.java | 2 +- .../org/n52/iceland/coding/decode/OwsDecodingException.java | 2 +- .../org/n52/iceland/coding/encode/AbstractResponseWriter.java | 2 +- .../org/n52/iceland/coding/encode/OwsEncodingException.java | 2 +- .../java/org/n52/iceland/coding/encode/ResponseFormatKey.java | 2 +- .../main/java/org/n52/iceland/coding/encode/ResponseProxy.java | 2 +- .../main/java/org/n52/iceland/coding/encode/ResponseWriter.java | 2 +- .../org/n52/iceland/coding/encode/ResponseWriterFactory.java | 2 +- .../java/org/n52/iceland/coding/encode/ResponseWriterKey.java | 2 +- .../org/n52/iceland/coding/encode/ResponseWriterRepository.java | 2 +- .../src/main/java/org/n52/iceland/config/ActivationDao.java | 2 +- .../src/main/java/org/n52/iceland/config/ActivationService.java | 2 +- .../core/src/main/java/org/n52/iceland/config/AdminUserDao.java | 2 +- .../src/main/java/org/n52/iceland/config/AdminUserService.java | 2 +- .../main/java/org/n52/iceland/config/AdminUserServiceImpl.java | 2 +- .../src/main/java/org/n52/iceland/config/AdministratorUser.java | 2 +- .../org/n52/iceland/config/json/AbstractJsonActivationDao.java | 2 +- .../java/org/n52/iceland/config/json/JsonActivationDao.java | 2 +- .../main/java/org/n52/iceland/config/json/JsonAdminUserDao.java | 2 +- .../java/org/n52/iceland/config/json/JsonAdministratorUser.java | 2 +- .../main/java/org/n52/iceland/config/json/JsonConstants.java | 2 +- .../n52/iceland/config/spring/ConfiguringBeanPostProcessor.java | 2 +- .../n52/iceland/config/spring/LifecycleBeanPostProcessor.java | 2 +- .../iceland/config/spring/ProviderAwareListableBeanFactory.java | 2 +- .../config/spring/ProviderAwareXmlWebApplicationContext.java | 2 +- .../n52/iceland/config/spring/SettingsBeanPostProcessor.java | 2 +- .../n52/iceland/config/spring/converter/DurationConverter.java | 2 +- .../org/n52/iceland/config/spring/converter/PathConverter.java | 2 +- .../core/src/main/java/org/n52/iceland/convert/Converter.java | 2 +- .../main/java/org/n52/iceland/convert/ConverterException.java | 2 +- .../src/main/java/org/n52/iceland/convert/ConverterFactory.java | 2 +- .../src/main/java/org/n52/iceland/convert/ConverterKey.java | 2 +- .../main/java/org/n52/iceland/convert/ConverterRepository.java | 2 +- .../java/org/n52/iceland/convert/RequestResponseModifier.java | 2 +- .../n52/iceland/convert/RequestResponseModifierFacilitator.java | 2 +- .../org/n52/iceland/convert/RequestResponseModifierFactory.java | 2 +- .../org/n52/iceland/convert/RequestResponseModifierKey.java | 2 +- .../n52/iceland/convert/RequestResponseModifierRepository.java | 2 +- .../src/main/java/org/n52/iceland/ds/ConnectionProvider.java | 2 +- .../java/org/n52/iceland/ds/ConnectionProviderException.java | 2 +- .../main/java/org/n52/iceland/ds/DataConnectionProvider.java | 2 +- iceland/core/src/main/java/org/n52/iceland/ds/Datasource.java | 2 +- .../src/main/java/org/n52/iceland/ds/DatasourceCallback.java | 2 +- .../java/org/n52/iceland/ds/UpdateableConnectionProvider.java | 2 +- .../core/src/main/java/org/n52/iceland/eu/InspireConstants.java | 2 +- .../java/org/n52/iceland/event/events/AbstractFlowEvent.java | 2 +- .../org/n52/iceland/event/events/CountingOutputStreamEvent.java | 2 +- .../main/java/org/n52/iceland/event/events/ExceptionEvent.java | 2 +- .../java/org/n52/iceland/event/events/IncomingRequestEvent.java | 2 +- .../org/n52/iceland/event/events/ModificationResponseEvent.java | 2 +- .../org/n52/iceland/event/events/OutgoingResponseEvent.java | 2 +- .../main/java/org/n52/iceland/event/events/RequestEvent.java | 2 +- .../main/java/org/n52/iceland/event/events/ResponseEvent.java | 2 +- .../src/main/java/org/n52/iceland/exception/HTTPException.java | 2 +- .../src/main/java/org/n52/iceland/exception/JSONException.java | 2 +- .../ows/concrete/ContentTypeNotSupportedException.java | 2 +- .../ows/concrete/GenericThrowableWrapperException.java | 2 +- .../ows/concrete/InvalidAcceptVersionsParameterException.java | 2 +- .../ows/concrete/InvalidServiceOrVersionException.java | 2 +- .../ows/concrete/InvalidServiceParameterException.java | 2 +- .../ows/concrete/MissingRequestParameterException.java | 2 +- .../exception/ows/concrete/MissingValueReferenceException.java | 2 +- .../exception/ows/concrete/NoEncoderForResponseException.java | 2 +- .../exception/ows/concrete/NoImplementationFoundException.java | 2 +- .../exception/ows/concrete/NotYetSupportedException.java | 2 +- .../exception/ows/concrete/ParameterNotSupportedException.java | 2 +- .../ows/concrete/ServiceOperatorNotFoundException.java | 2 +- .../exception/ows/concrete/VersionNotSupportedException.java | 2 +- iceland/core/src/main/java/org/n52/iceland/i18n/I18NDAO.java | 2 +- .../core/src/main/java/org/n52/iceland/i18n/I18NDAOFactory.java | 2 +- iceland/core/src/main/java/org/n52/iceland/i18n/I18NDAOKey.java | 2 +- .../src/main/java/org/n52/iceland/i18n/I18NDAORepository.java | 2 +- .../core/src/main/java/org/n52/iceland/i18n/I18NSerializer.java | 2 +- .../core/src/main/java/org/n52/iceland/i18n/I18NSettings.java | 2 +- .../main/java/org/n52/iceland/i18n/json/I18NJsonEncoder.java | 2 +- .../org/n52/iceland/i18n/metadata/AbstractI18NMetadata.java | 2 +- .../java/org/n52/iceland/i18n/metadata/I18NFeatureMetadata.java | 2 +- .../iceland/i18n/metadata/I18NObservablePropertyMetadata.java | 2 +- .../org/n52/iceland/i18n/metadata/I18NOfferingMetadata.java | 2 +- .../org/n52/iceland/i18n/metadata/I18NProcedureMetadata.java | 2 +- .../iceland/ogc/AbstractComparableServiceVersionDomainKey.java | 2 +- .../n52/iceland/ogc/ows/OwsServiceIdentificationFactory.java | 2 +- .../ogc/ows/OwsServiceIdentificationFactorySettings.java | 2 +- .../org/n52/iceland/ogc/ows/OwsServiceMetadataRepository.java | 2 +- .../n52/iceland/ogc/ows/OwsServiceMetadataRepositoryImpl.java | 2 +- .../java/org/n52/iceland/ogc/ows/OwsServiceProviderFactory.java | 2 +- .../n52/iceland/ogc/ows/OwsServiceProviderFactorySettings.java | 2 +- .../iceland/ogc/ows/extension/OwsCapabilitiesExtensionKey.java | 2 +- .../ogc/ows/extension/OwsCapabilitiesExtensionProvider.java | 2 +- .../ows/extension/OwsCapabilitiesExtensionProviderFactory.java | 2 +- .../ogc/ows/extension/OwsCapabilitiesExtensionRepository.java | 2 +- .../ows/extension/OwsOperationMetadataExtensionProvider.java | 2 +- .../extension/OwsOperationMetadataExtensionProviderFactory.java | 2 +- .../ows/extension/OwsOperationMetadataExtensionProviderKey.java | 2 +- .../OwsOperationMetadataExtensionProviderRepository.java | 2 +- .../org/n52/iceland/ogc/ows/extension/StaticCapabilities.java | 2 +- .../iceland/request/handler/AbstractGetCapabilitiesHandler.java | 2 +- .../n52/iceland/request/handler/AbstractOperationHandler.java | 2 +- .../n52/iceland/request/handler/GenericOperationHandler.java | 2 +- .../java/org/n52/iceland/request/handler/OperationHandler.java | 2 +- .../n52/iceland/request/handler/OperationHandlerFactory.java | 2 +- .../org/n52/iceland/request/handler/OperationHandlerKey.java | 2 +- .../n52/iceland/request/handler/OperationHandlerRepository.java | 2 +- .../n52/iceland/request/operator/GenericRequestOperator.java | 2 +- .../org/n52/iceland/request/operator/ParameterValidator.java | 2 +- .../java/org/n52/iceland/request/operator/RequestOperator.java | 2 +- .../n52/iceland/request/operator/RequestOperatorFactory.java | 2 +- .../org/n52/iceland/request/operator/RequestOperatorKey.java | 2 +- .../n52/iceland/request/operator/RequestOperatorRepository.java | 2 +- .../main/java/org/n52/iceland/response/EXIResponseWriter.java | 2 +- .../java/org/n52/iceland/response/EXIResponseWriterFactory.java | 2 +- .../main/java/org/n52/iceland/response/JSONResponseWriter.java | 2 +- .../org/n52/iceland/response/JSONResponseWriterFactory.java | 2 +- .../main/java/org/n52/iceland/response/NoContentResponse.java | 2 +- .../src/main/java/org/n52/iceland/response/ServiceResponse.java | 2 +- .../java/org/n52/iceland/response/SoapChainResponseWriter.java | 2 +- .../n52/iceland/response/SoapChainResponseWriterFactory.java | 2 +- .../main/java/org/n52/iceland/response/XmlResponseWriter.java | 2 +- .../java/org/n52/iceland/response/XmlResponseWriterFactory.java | 2 +- .../n52/iceland/service/CommunicationObjectWithSoapHeader.java | 2 +- .../java/org/n52/iceland/service/DatabaseSettingsHandler.java | 2 +- .../java/org/n52/iceland/service/DatasourceSettingsHandler.java | 2 +- .../src/main/java/org/n52/iceland/service/ExceptionLogger.java | 2 +- .../n52/iceland/service/ImplementationVersionHeaderAdder.java | 2 +- .../src/main/java/org/n52/iceland/service/MiscSettings.java | 2 +- iceland/core/src/main/java/org/n52/iceland/service/Service.java | 2 +- .../src/main/java/org/n52/iceland/service/ServiceSettings.java | 2 +- .../org/n52/iceland/service/ServletConfigLocationProvider.java | 2 +- .../main/java/org/n52/iceland/service/StreamingSettings.java | 2 +- .../n52/iceland/service/operator/GenericServiceOperator.java | 2 +- .../java/org/n52/iceland/service/operator/ServiceOperator.java | 2 +- .../n52/iceland/service/operator/ServiceOperatorFactory.java | 2 +- .../n52/iceland/service/operator/ServiceOperatorRepository.java | 2 +- .../org/n52/iceland/util/AbstractEnumPropertiesFileHandler.java | 2 +- .../org/n52/iceland/util/DelegatingPropertyFileHandler.java | 2 +- .../core/src/main/java/org/n52/iceland/util/FileIOHelper.java | 2 +- .../src/main/java/org/n52/iceland/util/IdentifiedProducer.java | 2 +- .../org/n52/iceland/util/LazyClosingThreadSafeProducer.java | 2 +- .../main/java/org/n52/iceland/util/LazyThreadSafeProducer.java | 2 +- .../org/n52/iceland/util/LocalizedLazyThreadSafeProducer.java | 2 +- .../src/main/java/org/n52/iceland/util/LocalizedProducer.java | 2 +- iceland/core/src/main/java/org/n52/iceland/util/MoreFiles.java | 2 +- .../main/java/org/n52/iceland/util/NonNegativeBigInteger.java | 2 +- .../src/main/java/org/n52/iceland/util/PositiveBigInteger.java | 2 +- .../src/main/java/org/n52/iceland/util/PropertyFileHandler.java | 2 +- .../main/java/org/n52/iceland/util/PropertyFileHandlerImpl.java | 2 +- iceland/core/src/main/java/org/n52/iceland/util/Range.java | 2 +- .../org/n52/iceland/util/ServletContextPropertyFileHandler.java | 2 +- .../core/src/main/java/org/n52/iceland/util/XmlFactories.java | 2 +- .../core/src/main/java/org/n52/iceland/util/action/Action.java | 2 +- .../main/java/org/n52/iceland/util/action/CompositeAction.java | 2 +- .../org/n52/iceland/util/action/CompositeParallelAction.java | 2 +- .../java/org/n52/iceland/util/action/CompositeSerialAction.java | 2 +- .../main/java/org/n52/iceland/util/action/RunnableAction.java | 2 +- .../main/java/org/n52/iceland/util/action/ThreadableAction.java | 2 +- .../main/java/org/n52/iceland/util/activation/Activatable.java | 2 +- .../main/java/org/n52/iceland/util/activation/Activatables.java | 2 +- .../org/n52/iceland/util/activation/ActivationInitializer.java | 2 +- .../org/n52/iceland/util/activation/ActivationListenable.java | 2 +- .../org/n52/iceland/util/activation/ActivationListener.java | 2 +- .../org/n52/iceland/util/activation/ActivationListeners.java | 2 +- .../java/org/n52/iceland/util/activation/ActivationManager.java | 2 +- .../org/n52/iceland/util/activation/ActivationProvider.java | 2 +- .../org/n52/iceland/util/activation/ActivationRegistrator.java | 2 +- .../java/org/n52/iceland/util/activation/ActivationSink.java | 2 +- .../java/org/n52/iceland/util/activation/ActivationSource.java | 2 +- .../iceland/util/activation/DefaultActivationInitializer.java | 2 +- .../java/org/n52/iceland/util/activation/DefaultActive.java | 2 +- .../iceland/util/activation/FunctionalActivationListener.java | 2 +- .../iceland/util/activation/SourceActivationInitializer.java | 2 +- .../core/src/main/java/org/n52/iceland/util/http/HttpUtils.java | 2 +- .../core/src/main/java/org/n52/iceland/util/http/NoContent.java | 2 +- .../java/org/n52/iceland/binding/AbstractXmlBindingTest.java | 2 +- .../test/java/org/n52/iceland/binding/SimpleBindingTest.java | 2 +- .../core/src/test/java/org/n52/iceland/binding/TestBinding.java | 2 +- .../src/test/java/org/n52/iceland/binding/TestXmlBinding.java | 2 +- .../iceland/converter/RequestResponseModifierKeyTypeTest.java | 2 +- .../src/test/java/org/n52/iceland/i18n/I18NSerializerTest.java | 2 +- .../java/org/n52/iceland/ogc/filter/ComparisonFilterTest.java | 2 +- .../iceland/ogc/ows/OwsServiceIdentificationFactoryTest.java | 2 +- .../src/test/java/org/n52/iceland/response/TestResponse.java | 2 +- .../core/src/test/java/org/n52/iceland/util/HasStatusCode.java | 2 +- .../test/java/org/n52/iceland/util/ValidatableBigIntegers.java | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- .../iceland/statistics/api/AbstractElasticSearchDataHolder.java | 2 +- .../org/n52/iceland/statistics/api/ElasticsearchSettings.java | 2 +- .../n52/iceland/statistics/api/ElasticsearchSettingsKeys.java | 2 +- .../statistics/api/StatisticsLocationUtilSettingsKeys.java | 2 +- .../api/interfaces/StatisticsServiceEventHandler.java | 2 +- .../api/interfaces/StatisticsServiceEventResolver.java | 2 +- .../api/interfaces/datahandler/IAdminDataHandler.java | 2 +- .../api/interfaces/datahandler/IStatisticsDataHandler.java | 2 +- .../iceland/statistics/api/mappings/MetadataDataMapping.java | 2 +- .../statistics/api/mappings/ServiceEventDataMapping.java | 2 +- .../iceland/statistics/api/parameters/AbstractEsParameter.java | 2 +- .../org/n52/iceland/statistics/api/parameters/Description.java | 2 +- .../statistics/api/parameters/ElasticsearchTypeRegistry.java | 2 +- .../iceland/statistics/api/parameters/ObjectEsParameter.java | 2 +- .../statistics/api/parameters/ObjectEsParameterFactory.java | 2 +- .../iceland/statistics/api/parameters/SingleEsParameter.java | 2 +- .../n52/iceland/statistics/api/utils/EventHandlerFinder.java | 2 +- .../org/n52/iceland/statistics/api/utils/FileDownloader.java | 2 +- .../n52/iceland/statistics/api/utils/GeoLiteFileDownloader.java | 2 +- .../org/n52/iceland/statistics/api/utils/KibanaImporter.java | 2 +- .../iceland/statistics/api/utils/dto/KibanaConfigEntryDto.java | 2 +- .../iceland/statistics/api/utils/dto/KibanaConfigHolderDto.java | 2 +- .../statistics/impl/AbstractStatisticsServiceEventListener.java | 2 +- .../n52/iceland/statistics/impl/ElasticsearchAdminHandler.java | 2 +- .../n52/iceland/statistics/impl/ElasticsearchDataHandler.java | 2 +- .../n52/iceland/statistics/impl/StatisticsResolverFactory.java | 2 +- .../impl/handlers/CountingOutputStreamEventHandler.java | 2 +- .../statistics/impl/handlers/DefaultServiceEventHandler.java | 2 +- .../statistics/impl/handlers/OutgoingResponseEventHandler.java | 2 +- .../impl/handlers/exceptions/CodedExceptionEventHandler.java | 2 +- .../impl/handlers/exceptions/OwsExceptionEventHandler.java | 2 +- .../impl/resolvers/CountingOutputStreamEventResolver.java | 2 +- .../statistics/impl/resolvers/DefaultServiceEventResolver.java | 2 +- .../statistics/impl/resolvers/ExceptionEventResolver.java | 2 +- .../impl/resolvers/OutgoingResponseEventResolver.java | 2 +- .../impl/schemabuilders/DefaultElasticsearchSchemas.java | 2 +- .../iceland/statistics/impl/server/EmbeddedElasticsearch.java | 2 +- .../main/resources/statistics/countingoutputstream-event.xml | 2 +- .../core/src/main/resources/statistics/default-event.xml | 2 +- .../core/src/main/resources/statistics/exception-event.xml | 2 +- .../src/main/resources/statistics/outgoingresponse-event.xml | 2 +- .../n52/iceland/statistics/api/ElasticsearchSettingsTest.java | 2 +- .../iceland/statistics/api/utils/EventHandlerFinderTest.java | 2 +- .../iceland/statistics/api/utils/GeoLiteFileDownloaderIT.java | 2 +- .../org/n52/iceland/statistics/api/utils/KibanaImporterIT.java | 2 +- .../iceland/statistics/basetests/ElasticsearchAwareTest.java | 2 +- .../org/n52/iceland/statistics/basetests/MockitoBaseTest.java | 2 +- .../org/n52/iceland/statistics/basetests/SpringBaseTest.java | 2 +- .../n52/iceland/statistics/impl/ElasticSearchDataHandlerIT.java | 2 +- .../iceland/statistics/impl/ElasticsearchAdminHandlerIT.java | 2 +- .../java/org/n52/iceland/statistics/impl/EmbeddedServerIT.java | 2 +- .../org/n52/iceland/statistics/mock/MockServletContext.java | 2 +- .../org/n52/iceland/statistics/mock/MockSettingsService.java | 2 +- .../n52/iceland/statistics/mock/TestElasticsearchSchema.java | 2 +- .../core/src/test/resources/statistics-test-context.xml | 2 +- .../resources/statistics-test/countingoutputstream-event.xml | 2 +- .../core/src/test/resources/statistics-test/default-event.xml | 2 +- .../core/src/test/resources/statistics-test/exception-event.xml | 2 +- .../test/resources/statistics-test/outgoingresponse-event.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- .../n52/iceland/statistics/generator/ParameterGenerator.java | 2 +- .../org/n52/iceland/statistics/generator/formats/MdFormat.java | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- .../api/interfaces/geolocation/IAdminStatisticsLocation.java | 2 +- .../api/interfaces/geolocation/IStatisticsLocationUtil.java | 2 +- .../statistics/impl/geolocation/StatisticsLocationUtil.java | 2 +- .../statistics/impl/geolocation/StatisticsLocationUtilIT.java | 2 +- iceland/statistics/kibana/pom.xml | 2 +- .../org/n52/iceland/statistics/api/utils/KibanaExporter.java | 2 +- janmayen/pom.xml | 2 +- janmayen/src/main/java/org/n52/janmayen/AbstractBuildable.java | 2 +- .../main/java/org/n52/janmayen/AbstractThrowingIterator.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Builder.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Chain.java | 2 +- janmayen/src/main/java/org/n52/janmayen/CharacterClass.java | 2 +- janmayen/src/main/java/org/n52/janmayen/CharacterClasses.java | 2 +- janmayen/src/main/java/org/n52/janmayen/ClassHelper.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Classes.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Comparables.java | 2 +- .../src/main/java/org/n52/janmayen/ConfigLocationProvider.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Copyable.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Debouncer.java | 2 +- .../java/org/n52/janmayen/GroupedAndNamedThreadFactory.java | 2 +- janmayen/src/main/java/org/n52/janmayen/IntervalMap.java | 2 +- janmayen/src/main/java/org/n52/janmayen/IntervalTree.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Json.java | 2 +- janmayen/src/main/java/org/n52/janmayen/MoreIterators.java | 2 +- janmayen/src/main/java/org/n52/janmayen/NcName.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Optionals.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Producer.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Producers.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Stopwatch.java | 2 +- janmayen/src/main/java/org/n52/janmayen/ThrowingIterator.java | 2 +- janmayen/src/main/java/org/n52/janmayen/TimeValue.java | 2 +- janmayen/src/main/java/org/n52/janmayen/Times.java | 2 +- .../org/n52/janmayen/component/AbstractComponentRepository.java | 2 +- .../component/AbstractSimilarityKeyComponentRepository.java | 2 +- .../n52/janmayen/component/AbstractSimilarityKeyRepository.java | 2 +- .../java/org/n52/janmayen/component/ClassBasedComponentKey.java | 2 +- .../src/main/java/org/n52/janmayen/component/Component.java | 2 +- .../main/java/org/n52/janmayen/component/ComponentFactory.java | 2 +- .../java/org/n52/janmayen/component/ComponentRepository.java | 2 +- janmayen/src/main/java/org/n52/janmayen/component/Keyed.java | 2 +- .../org/n52/janmayen/component/SingleTypeComponentFactory.java | 2 +- .../java/org/n52/janmayen/event/AbstractAsyncEventListener.java | 2 +- janmayen/src/main/java/org/n52/janmayen/event/Event.java | 2 +- janmayen/src/main/java/org/n52/janmayen/event/EventBus.java | 2 +- .../src/main/java/org/n52/janmayen/event/EventListener.java | 2 +- .../java/org/n52/janmayen/event/EventListenerRegistrator.java | 2 +- .../java/org/n52/janmayen/exception/CompositeException.java | 2 +- .../java/org/n52/janmayen/exception/LocationHintException.java | 2 +- .../n52/janmayen/exception/StringInterpolationException.java | 2 +- janmayen/src/main/java/org/n52/janmayen/function/Consumers.java | 2 +- janmayen/src/main/java/org/n52/janmayen/function/Functions.java | 2 +- .../src/main/java/org/n52/janmayen/function/Predicates.java | 2 +- janmayen/src/main/java/org/n52/janmayen/function/Suppliers.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowableFunction.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingBiConsumer.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingBiFunction.java | 2 +- .../java/org/n52/janmayen/function/ThrowingBiPredicate.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingCallable.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingConsumer.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingFunction.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingPredicate.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingRunnable.java | 2 +- .../main/java/org/n52/janmayen/function/ThrowingSupplier.java | 2 +- .../java/org/n52/janmayen/function/ThrowingTriConsumer.java | 2 +- .../java/org/n52/janmayen/function/ThrowingUnaryOperator.java | 2 +- .../src/main/java/org/n52/janmayen/function/TriConsumer.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/HTTPConstants.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/HTTPHeaders.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/HTTPMethods.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/HTTPStatus.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/MediaType.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/MediaTypes.java | 2 +- janmayen/src/main/java/org/n52/janmayen/http/QueryBuilder.java | 2 +- janmayen/src/main/java/org/n52/janmayen/i18n/ISO6392B.java | 2 +- janmayen/src/main/java/org/n52/janmayen/i18n/LocaleHelper.java | 2 +- .../src/main/java/org/n52/janmayen/i18n/LocalizedString.java | 2 +- .../src/main/java/org/n52/janmayen/i18n/MultilingualString.java | 2 +- .../src/main/java/org/n52/janmayen/lifecycle/Constructable.java | 2 +- .../src/main/java/org/n52/janmayen/lifecycle/Destroyable.java | 2 +- janmayen/src/main/java/org/n52/janmayen/net/IPAddress.java | 2 +- janmayen/src/main/java/org/n52/janmayen/net/IPAddressRange.java | 2 +- janmayen/src/main/java/org/n52/janmayen/net/ProxyChain.java | 2 +- .../main/java/org/n52/janmayen/similar/CompositeSimilar.java | 2 +- .../org/n52/janmayen/similar/ProxySimilarityComparator.java | 2 +- janmayen/src/main/java/org/n52/janmayen/similar/Similar.java | 2 +- .../java/org/n52/janmayen/similar/SimilarityComparator.java | 2 +- .../src/main/java/org/n52/janmayen/stream/MoreCollectors.java | 2 +- janmayen/src/main/java/org/n52/janmayen/stream/Streamable.java | 2 +- .../main/java/org/n52/janmayen/stream/StreamingIterable.java | 2 +- janmayen/src/main/java/org/n52/janmayen/stream/Streams.java | 2 +- janmayen/src/test/java/org/n52/janmayen/CharacterClassTest.java | 2 +- janmayen/src/test/java/org/n52/janmayen/NcNameTest.java | 2 +- .../src/test/java/org/n52/janmayen/i18n/LocaleHelperTest.java | 2 +- .../src/test/java/org/n52/janmayen/net/IPAddressRangeTest.java | 2 +- janmayen/src/test/java/org/n52/janmayen/net/IPAddressTest.java | 2 +- janmayen/src/test/java/org/n52/janmayen/net/ProxyChainTest.java | 2 +- pom.xml | 2 +- shetland/core/pom.xml | 2 +- .../java/org/n52/shetland/aqd/AbstractEReportingHeader.java | 2 +- .../core/src/main/java/org/n52/shetland/aqd/AqdConstants.java | 2 +- .../core/src/main/java/org/n52/shetland/aqd/AqdNetwork.java | 2 +- .../src/main/java/org/n52/shetland/aqd/AqdSamplingPoint.java | 2 +- .../core/src/main/java/org/n52/shetland/aqd/AqdStation.java | 2 +- .../src/main/java/org/n52/shetland/aqd/AqdUomRepository.java | 2 +- .../java/org/n52/shetland/aqd/EReportObligationRepository.java | 2 +- .../src/main/java/org/n52/shetland/aqd/EReportingChange.java | 2 +- .../src/main/java/org/n52/shetland/aqd/EReportingHeader.java | 2 +- .../core/src/main/java/org/n52/shetland/aqd/ElementType.java | 2 +- .../src/main/java/org/n52/shetland/aqd/ReportObligation.java | 2 +- .../main/java/org/n52/shetland/aqd/ReportObligationType.java | 2 +- .../src/main/java/org/n52/shetland/aqd/ReportObligations.java | 2 +- shetland/core/src/main/java/org/n52/shetland/exi/EXIObject.java | 2 +- .../core/src/main/java/org/n52/shetland/filter/CountFilter.java | 2 +- .../src/main/java/org/n52/shetland/filter/ExpandFilter.java | 2 +- .../core/src/main/java/org/n52/shetland/filter/ExpandItem.java | 2 +- .../src/main/java/org/n52/shetland/filter/FilterFilter.java | 2 +- .../src/main/java/org/n52/shetland/filter/OrderByFilter.java | 2 +- .../src/main/java/org/n52/shetland/filter/OrderProperty.java | 2 +- .../src/main/java/org/n52/shetland/filter/SelectFilter.java | 2 +- .../src/main/java/org/n52/shetland/filter/SkipTopFilter.java | 2 +- .../java/org/n52/shetland/inspire/AbstractInspireKeyword.java | 2 +- .../main/java/org/n52/shetland/inspire/GeographicalName.java | 2 +- .../src/main/java/org/n52/shetland/inspire/InspireCitation.java | 2 +- .../main/java/org/n52/shetland/inspire/InspireConformity.java | 2 +- .../org/n52/shetland/inspire/InspireConformityCitation.java | 2 +- .../main/java/org/n52/shetland/inspire/InspireConstants.java | 2 +- .../src/main/java/org/n52/shetland/inspire/InspireDateOf.java | 2 +- .../java/org/n52/shetland/inspire/InspireDateOfCreation.java | 2 +- .../org/n52/shetland/inspire/InspireDateOfLastRevision.java | 2 +- .../java/org/n52/shetland/inspire/InspireDateOfPublication.java | 2 +- .../org/n52/shetland/inspire/InspireEuLanguageISO6392B.java | 2 +- .../src/main/java/org/n52/shetland/inspire/InspireKeyword.java | 2 +- .../java/org/n52/shetland/inspire/InspireLanguageISO6392B.java | 2 +- .../java/org/n52/shetland/inspire/InspireMandatoryKeyword.java | 2 +- .../org/n52/shetland/inspire/InspireMandatoryKeywordValue.java | 2 +- .../org/n52/shetland/inspire/InspireMetadataPointOfContact.java | 2 +- .../src/main/java/org/n52/shetland/inspire/InspireObject.java | 2 +- .../inspire/InspireOriginatingControlledVocabulary.java | 2 +- .../java/org/n52/shetland/inspire/InspireResourceLocator.java | 2 +- .../main/java/org/n52/shetland/inspire/InspireSupportedCRS.java | 2 +- .../org/n52/shetland/inspire/InspireSupportedLanguages.java | 2 +- .../java/org/n52/shetland/inspire/InspireTemporalReference.java | 2 +- .../n52/shetland/inspire/InspireUniqueResourceIdentifier.java | 2 +- .../src/main/java/org/n52/shetland/inspire/Pronunciation.java | 2 +- .../core/src/main/java/org/n52/shetland/inspire/Spelling.java | 2 +- .../java/org/n52/shetland/inspire/ad/AddressRepresentation.java | 2 +- .../src/main/java/org/n52/shetland/inspire/base/Identifier.java | 2 +- .../org/n52/shetland/inspire/base/InspireBaseConstants.java | 2 +- .../src/main/java/org/n52/shetland/inspire/base2/Contact.java | 2 +- .../java/org/n52/shetland/inspire/base2/DocumentCitation.java | 2 +- .../org/n52/shetland/inspire/base2/InspireBase2Constants.java | 2 +- .../org/n52/shetland/inspire/base2/LegislationCitation.java | 2 +- .../main/java/org/n52/shetland/inspire/base2/RelatedParty.java | 2 +- .../shetland/inspire/dls/FullInspireExtendedCapabilities.java | 2 +- .../java/org/n52/shetland/inspire/dls/InspireCapabilities.java | 2 +- .../n52/shetland/inspire/dls/InspireExtendedCapabilities.java | 2 +- .../shetland/inspire/dls/InspireExtendedCapabilitiesDLS.java | 2 +- .../inspire/dls/MinimalInspireExtendedCapabilities.java | 2 +- .../org/n52/shetland/inspire/ef/AbstractMonitoringFeature.java | 2 +- .../org/n52/shetland/inspire/ef/AbstractMonitoringObject.java | 2 +- .../main/java/org/n52/shetland/inspire/ef/AnyDomainLink.java | 2 +- .../n52/shetland/inspire/ef/EfAbstractMonitoringFeature.java | 2 +- .../org/n52/shetland/inspire/ef/EfAbstractMonitoringObject.java | 2 +- .../shetland/inspire/ef/EfEnvironmentalMonitoringFacility.java | 2 +- .../shetland/inspire/ef/EfEnvironmentalMonitoringNetwork.java | 2 +- .../shetland/inspire/ef/EnvironmentalMonitoringActivity.java | 2 +- .../shetland/inspire/ef/EnvironmentalMonitoringFacility.java | 2 +- .../n52/shetland/inspire/ef/EnvironmentalMonitoringNetwork.java | 2 +- .../shetland/inspire/ef/EnvironmentalMonitoringProgramme.java | 2 +- .../src/main/java/org/n52/shetland/inspire/ef/Hierarchy.java | 2 +- .../java/org/n52/shetland/inspire/ef/InspireEfConstants.java | 2 +- .../main/java/org/n52/shetland/inspire/ef/NetworkFacility.java | 2 +- .../java/org/n52/shetland/inspire/ef/ObservingCapability.java | 2 +- .../org/n52/shetland/inspire/ef/OperationalActivityPeriod.java | 2 +- .../main/java/org/n52/shetland/inspire/ef/ReportToLegalAct.java | 2 +- .../org/n52/shetland/inspire/omor/InspireOMORConstants.java | 2 +- .../org/n52/shetland/inspire/ompr/InspireOMPRConstants.java | 2 +- .../src/main/java/org/n52/shetland/inspire/ompr/Process.java | 2 +- .../java/org/n52/shetland/inspire/ompr/ProcessParameter.java | 2 +- .../n52/shetland/inspire/omso/AbstractInspireObservation.java | 2 +- .../org/n52/shetland/inspire/omso/InspireOMSOConstants.java | 2 +- .../org/n52/shetland/inspire/omso/MultiPointObservation.java | 2 +- .../java/org/n52/shetland/inspire/omso/PointObservation.java | 2 +- .../n52/shetland/inspire/omso/PointTimeSeriesObservation.java | 2 +- .../java/org/n52/shetland/inspire/omso/ProfileObservation.java | 2 +- .../org/n52/shetland/inspire/omso/TrajectoryObservation.java | 2 +- shetland/core/src/main/java/org/n52/shetland/iso/CodeList.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/GcoConstants.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/IsoConstants.java | 2 +- .../src/main/java/org/n52/shetland/iso/gco/AbstractRole.java | 2 +- shetland/core/src/main/java/org/n52/shetland/iso/gco/Role.java | 2 +- .../java/org/n52/shetland/iso/gmd/AbstractMDIdentification.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/AbstractObject.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/gmd/AbtractGmd.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/gmd/CiAddress.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/gmd/CiContact.java | 2 +- .../main/java/org/n52/shetland/iso/gmd/CiOnlineResource.java | 2 +- .../main/java/org/n52/shetland/iso/gmd/CiResponsibleParty.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/CiTelephone.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/gmd/EXExtent.java | 2 +- .../main/java/org/n52/shetland/iso/gmd/EXVerticalExtent.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/GmdCitation.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/GmdCitationDate.java | 2 +- .../java/org/n52/shetland/iso/gmd/GmdConformanceResult.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/GmdConstants.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/GmdDateType.java | 2 +- .../java/org/n52/shetland/iso/gmd/GmdDomainConsistency.java | 2 +- .../java/org/n52/shetland/iso/gmd/GmdQuantitativeResult.java | 2 +- .../main/java/org/n52/shetland/iso/gmd/GmdSpecification.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/GmlBaseUnit.java | 2 +- .../java/org/n52/shetland/iso/gmd/LocalisedCharacterString.java | 2 +- .../java/org/n52/shetland/iso/gmd/MDDataIdentification.java | 2 +- .../core/src/main/java/org/n52/shetland/iso/gmd/MDMetadata.java | 2 +- .../src/main/java/org/n52/shetland/iso/gmd/PT_FreeText.java | 2 +- shetland/core/src/main/java/org/n52/shetland/iso/gmd/ScCRS.java | 2 +- .../main/java/org/n52/shetland/oasis/odata/ODataConstants.java | 2 +- .../src/main/java/org/n52/shetland/oasis/odata/ODataExpr.java | 2 +- .../org/n52/shetland/oasis/odata/query/option/QueryOptions.java | 2 +- .../src/main/java/org/n52/shetland/ogc/AbstractCodeType.java | 2 +- .../src/main/java/org/n52/shetland/ogc/AbstractMeasureType.java | 2 +- .../java/org/n52/shetland/ogc/AbstractSupportedStringType.java | 2 +- .../src/main/java/org/n52/shetland/ogc/HasDefaultEncoding.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/OGCConstants.java | 2 +- .../org/n52/shetland/ogc/PhenomenonNameDescriptionProvider.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/SupportedType.java | 2 +- .../org/n52/shetland/ogc/SupportsObservablePropertyNames.java | 2 +- shetland/core/src/main/java/org/n52/shetland/ogc/UoM.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/cv/CvConstants.java | 2 +- .../n52/shetland/ogc/filter/AbstractAdHocQueryExpression.java | 2 +- .../org/n52/shetland/ogc/filter/AbstractProjectionClause.java | 2 +- .../org/n52/shetland/ogc/filter/AbstractQueryExpression.java | 2 +- .../org/n52/shetland/ogc/filter/AbstractSelectionClause.java | 2 +- .../java/org/n52/shetland/ogc/filter/AbstractSortingClause.java | 2 +- .../java/org/n52/shetland/ogc/filter/BinaryLogicFilter.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/ComparisonFilter.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/FesMeasureType.java | 2 +- .../src/main/java/org/n52/shetland/ogc/filter/FesSortBy.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/FesSortProperty.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/filter/Filter.java | 2 +- .../java/org/n52/shetland/ogc/filter/FilterCapabilities.java | 2 +- .../src/main/java/org/n52/shetland/ogc/filter/FilterClause.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/FilterConstants.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/filter/Filters.java | 2 +- .../src/main/java/org/n52/shetland/ogc/filter/IdFilter.java | 2 +- .../src/main/java/org/n52/shetland/ogc/filter/LogicFilter.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/SpatialFilter.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/TemporalFilter.java | 2 +- .../main/java/org/n52/shetland/ogc/filter/UnaryLogicFilter.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/AbstractCRS.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/gml/AbstractCS.java | 2 +- .../java/org/n52/shetland/ogc/gml/AbstractCoordinateSystem.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/AbstractDatum.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/AbstractFeature.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/AbstractGML.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/AbstractGeometry.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/AbstractMetaData.java | 2 +- .../java/org/n52/shetland/ogc/gml/AbstractReferenceType.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/Aggregation.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/gml/CodeType.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/CodeWithAuthority.java | 2 +- .../java/org/n52/shetland/ogc/gml/CoordinateSystemAxis.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/gml/Definition.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/DefinitionBase.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/DomainOfValidity.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/EngineeringCRS.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/FeatureWith.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/GenericMetaData.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/GmlAbstractGeometry.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/GmlConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/GmlMeasureType.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/GmlMetaDataProperty.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/IdentifiedObject.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/ReferenceType.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/gml/SortBy.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/UomIdentifier.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/gml/UomSymbol.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/VerticalCRS.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/gml/VerticalCS.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/VerticalDatum.java | 2 +- .../java/org/n52/shetland/ogc/gml/time/IndeterminateValue.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/gml/time/Time.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/time/TimeInstant.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gml/time/TimePeriod.java | 2 +- .../main/java/org/n52/shetland/ogc/gml/time/TimePosition.java | 2 +- .../java/org/n52/shetland/ogc/gmlcov/GmlCoverageConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/gwml/GWMLConstants.java | 2 +- .../java/org/n52/shetland/ogc/om/AbstractObservationStream.java | 2 +- .../java/org/n52/shetland/ogc/om/AbstractObservationValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/AbstractPhenomenon.java | 2 +- .../java/org/n52/shetland/ogc/om/MultiObservationValues.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/om/NamedValue.java | 2 +- .../java/org/n52/shetland/ogc/om/ObservationMergeIndicator.java | 2 +- .../main/java/org/n52/shetland/ogc/om/ObservationStream.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/ObservationType.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/ObservationValue.java | 2 +- .../java/org/n52/shetland/ogc/om/OmCompositePhenomenon.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java | 2 +- .../main/java/org/n52/shetland/ogc/om/OmObservableProperty.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/OmObservation.java | 2 +- .../org/n52/shetland/ogc/om/OmObservationConstellation.java | 2 +- .../main/java/org/n52/shetland/ogc/om/OmObservationContext.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/PointValuePair.java | 2 +- .../java/org/n52/shetland/ogc/om/SingleObservationValue.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/StreamingValue.java | 2 +- .../java/org/n52/shetland/ogc/om/TimeLocationValueTriple.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/TimeValuePair.java | 2 +- .../org/n52/shetland/ogc/om/features/FeatureCollection.java | 2 +- .../main/java/org/n52/shetland/ogc/om/features/SfConstants.java | 2 +- .../om/features/samplingFeatures/AbstractSamplingFeature.java | 2 +- .../om/features/samplingFeatures/FeatureOfInterestVisitor.java | 2 +- .../ogc/om/features/samplingFeatures/InvalidSridException.java | 2 +- .../ogc/om/features/samplingFeatures/PreparationStep.java | 2 +- .../ogc/om/features/samplingFeatures/SamplingFeature.java | 2 +- .../om/features/samplingFeatures/SamplingFeatureComplex.java | 2 +- .../shetland/ogc/om/features/samplingFeatures/SfProcess.java | 2 +- .../shetland/ogc/om/features/samplingFeatures/SfSpecimen.java | 2 +- .../shetland/ogc/om/features/samplingFeatures/SpecLocation.java | 2 +- .../java/org/n52/shetland/ogc/om/quality/OmResultQuality.java | 2 +- .../ogc/om/series/AbstractDefaultTVPMeasurementMetadata.java | 2 +- .../n52/shetland/ogc/om/series/AbstractInterpolationType.java | 2 +- .../n52/shetland/ogc/om/series/AbstractMonitoringFeature.java | 2 +- .../n52/shetland/ogc/om/series/AbstractObservationProcess.java | 2 +- .../org/n52/shetland/ogc/om/series/DefaultPointMetadata.java | 2 +- .../shetland/ogc/om/series/MeasurementTimeseriesMetadata.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/series/Metadata.java | 2 +- .../java/org/n52/shetland/ogc/om/series/SeriesConstants.java | 2 +- .../java/org/n52/shetland/ogc/om/series/TimeseriesMetadata.java | 2 +- .../n52/shetland/ogc/om/series/tsml/ConformanceClassesTSML.java | 2 +- .../ogc/om/series/tsml/DefaultTVPMeasurementMetadata.java | 2 +- .../org/n52/shetland/ogc/om/series/tsml/ObservationProcess.java | 2 +- .../n52/shetland/ogc/om/series/tsml/TimeseriesMLConstants.java | 2 +- .../n52/shetland/ogc/om/series/tsml/TsmlMonitoringFeature.java | 2 +- .../n52/shetland/ogc/om/series/wml/ConformanceClassesWML2.java | 2 +- .../shetland/ogc/om/series/wml/ConformanceClassesWML2DR.java | 2 +- .../ogc/om/series/wml/DefaultTVPMeasurementMetadata.java | 2 +- .../org/n52/shetland/ogc/om/series/wml/ObservationProcess.java | 2 +- .../org/n52/shetland/ogc/om/series/wml/WaterMLConstants.java | 2 +- .../org/n52/shetland/ogc/om/series/wml/WmlMonitoringPoint.java | 2 +- .../shetland/ogc/om/values/AbstractPofileTrajectoryElement.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/BooleanValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/CategoryValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/ComparableValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/ComplexValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/CountValue.java | 2 +- .../org/n52/shetland/ogc/om/values/CvDiscretePointCoverage.java | 2 +- .../java/org/n52/shetland/ogc/om/values/DiscreteCoverage.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/GeometryValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/HrefAttributeValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/MultiPointCoverage.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/MultiValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/NilTemplateValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/ProfileValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/QuantityRangeValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/QuantityValue.java | 2 +- .../org/n52/shetland/ogc/om/values/RectifiedGridCoverage.java | 2 +- .../n52/shetland/ogc/om/values/ReferencableGridCoverage.java | 2 +- .../java/org/n52/shetland/ogc/om/values/ReferenceValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/SweDataArrayValue.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/values/TLVTValue.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/values/TVPValue.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/values/TextValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/TimeRangeValue.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/values/TimeValue.java | 2 +- .../java/org/n52/shetland/ogc/om/values/TrajectoryElement.java | 2 +- .../java/org/n52/shetland/ogc/om/values/TrajectoryValue.java | 2 +- .../main/java/org/n52/shetland/ogc/om/values/UnknownValue.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/values/Value.java | 2 +- .../src/main/java/org/n52/shetland/ogc/om/values/XmlValue.java | 2 +- .../n52/shetland/ogc/om/values/visitor/ProfileLevelVisitor.java | 2 +- .../ogc/om/values/visitor/TrajectoryElementVisitor.java | 2 +- .../org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java | 2 +- .../n52/shetland/ogc/om/values/visitor/VoidValueVisitor.java | 2 +- shetland/core/src/main/java/org/n52/shetland/ogc/ows/Enums.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/HasExtension.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OWSConstants.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsAcceptVersions.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsAddress.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsAllowedValues.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsAnyValue.java | 2 +- .../java/org/n52/shetland/ogc/ows/OwsBasicIdentification.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsBoundingBox.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsCRS.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsCapabilities.java | 2 +- .../java/org/n52/shetland/ogc/ows/OwsCapabilitiesExtension.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsCode.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsContact.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsDCP.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsDescription.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsDomain.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsDomainMetadata.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsHttp.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsKeyword.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsLanguageString.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsMetadata.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsNoValues.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsOnlineResource.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsOperation.java | 2 +- .../org/n52/shetland/ogc/ows/OwsOperationMetadataExtension.java | 2 +- .../java/org/n52/shetland/ogc/ows/OwsOperationsMetadata.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsPhone.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsPossibleValues.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsRange.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsReferenceSystem.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsRequestMethod.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsResponsibleParty.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsSections.java | 2 +- .../java/org/n52/shetland/ogc/ows/OwsServiceIdentification.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsServiceProvider.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsUOM.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsUnNamedDomain.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/ows/OwsValue.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsValueRestriction.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/OwsValuesReference.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/OwsValuesUnit.java | 2 +- .../java/org/n52/shetland/ogc/ows/exception/CodedException.java | 2 +- .../org/n52/shetland/ogc/ows/exception/CodedOwsException.java | 2 +- .../n52/shetland/ogc/ows/exception/CompositeOwsException.java | 2 +- .../java/org/n52/shetland/ogc/ows/exception/ExceptionCode.java | 2 +- .../ogc/ows/exception/InvalidParameterValueException.java | 2 +- .../ogc/ows/exception/InvalidUpdateSequenceException.java | 2 +- .../ogc/ows/exception/MissingParameterValueException.java | 2 +- .../ogc/ows/exception/MissingServiceParameterException.java | 2 +- .../ogc/ows/exception/MissingVersionParameterException.java | 2 +- .../shetland/ogc/ows/exception/NoApplicableCodeException.java | 2 +- .../ogc/ows/exception/OperationNotSupportedException.java | 2 +- .../shetland/ogc/ows/exception/OptionNotSupportedException.java | 2 +- .../org/n52/shetland/ogc/ows/exception/OwsExceptionCode.java | 2 +- .../org/n52/shetland/ogc/ows/exception/OwsExceptionReport.java | 2 +- .../ogc/ows/exception/VersionNegotiationFailedException.java | 2 +- .../org/n52/shetland/ogc/ows/extension/AbstractExtension.java | 2 +- .../n52/shetland/ogc/ows/extension/CapabilitiesExtension.java | 2 +- .../n52/shetland/ogc/ows/extension/DisableableExtension.java | 2 +- .../main/java/org/n52/shetland/ogc/ows/extension/Extension.java | 2 +- .../java/org/n52/shetland/ogc/ows/extension/Extensions.java | 2 +- .../org/n52/shetland/ogc/ows/extension/MergableExtension.java | 2 +- .../ogc/ows/extension/StringBasedCapabilitiesExtension.java | 2 +- .../n52/shetland/ogc/ows/extension/StringBasedExtension.java | 2 +- .../src/main/java/org/n52/shetland/ogc/ows/extension/Value.java | 2 +- .../n52/shetland/ogc/ows/service/GetCapabilitiesRequest.java | 2 +- .../n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java | 2 +- .../java/org/n52/shetland/ogc/ows/service/OwsOperationKey.java | 2 +- .../shetland/ogc/ows/service/OwsServiceCommunicationObject.java | 2 +- .../java/org/n52/shetland/ogc/ows/service/OwsServiceKey.java | 2 +- .../org/n52/shetland/ogc/ows/service/OwsServiceRequest.java | 2 +- .../n52/shetland/ogc/ows/service/OwsServiceRequestContext.java | 2 +- .../org/n52/shetland/ogc/ows/service/OwsServiceResponse.java | 2 +- .../java/org/n52/shetland/ogc/ows/service/ResponseFormat.java | 2 +- .../org/n52/shetland/ogc/ows/service/VersionedOperationKey.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/AbstractComponent.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/AbstractProcess.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/AbstractSensorML.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sensorML/Component.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/HasComponents.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/HasConnections.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/HasPosition.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/HasProcessMethod.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/ProcessChain.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/ProcessMethod.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/ProcessModel.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/sensorML/Role.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/RulesDefinition.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sensorML/SensorML.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/SensorML20Constants.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/SensorMLConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sensorML/SmlContact.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/SmlContactList.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sensorML/SmlPerson.java | 2 +- .../org/n52/shetland/ogc/sensorML/SmlReferencedContact.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/SmlResponsibleParty.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sensorML/System.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/sensorML/Term.java | 2 +- .../ogc/sensorML/elements/AbstractDataComponentContainer.java | 2 +- .../sensorML/elements/AbstractSmlDataComponentContainer.java | 2 +- .../ogc/sensorML/elements/AbstractSmlDocumentation.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlCapabilities.java | 2 +- .../ogc/sensorML/elements/SmlCapabilitiesPredicates.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlCapability.java | 2 +- .../n52/shetland/ogc/sensorML/elements/SmlCharacteristic.java | 2 +- .../n52/shetland/ogc/sensorML/elements/SmlCharacteristics.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlClassifier.java | 2 +- .../shetland/ogc/sensorML/elements/SmlClassifierPredicates.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlComponent.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlConnection.java | 2 +- .../n52/shetland/ogc/sensorML/elements/SmlDocumentation.java | 2 +- .../shetland/ogc/sensorML/elements/SmlDocumentationList.java | 2 +- .../ogc/sensorML/elements/SmlDocumentationListMember.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlIdentifier.java | 2 +- .../shetland/ogc/sensorML/elements/SmlIdentifierPredicates.java | 2 +- .../main/java/org/n52/shetland/ogc/sensorML/elements/SmlIo.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlIoPredicates.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/elements/SmlLink.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlLocation.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlParameter.java | 2 +- .../org/n52/shetland/ogc/sensorML/elements/SmlPosition.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/AbstractAlgorithm.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/v20/AbstractModes.java | 2 +- .../n52/shetland/ogc/sensorML/v20/AbstractPhysicalProcess.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/AbstractSettings.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/AggregateProcess.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/v20/DescribedObject.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/PhysicalComponent.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/v20/PhysicalSystem.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/v20/SimpleProcess.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/SmlDataInterface.java | 2 +- .../org/n52/shetland/ogc/sensorML/v20/SmlFeatureOfInterest.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/v20/SpatialFrame.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/v20/TemporalFrame.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/BatchConstants.java | 2 +- .../org/n52/shetland/ogc/sos/ExtendedIndeterminateTime.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/FeatureType.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/ObjectWithXmlString.java | 2 +- .../org/n52/shetland/ogc/sos/ProcedureDescriptionFormat.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/ResultFilter.java | 2 +- .../java/org/n52/shetland/ogc/sos/ResultFilterConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/Sos1Constants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/Sos2Constants.java | 2 +- .../java/org/n52/shetland/ogc/sos/Sos2StreamingConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/SosCapabilities.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/SosConstants.java | 2 +- .../java/org/n52/shetland/ogc/sos/SosInsertionCapabilities.java | 2 +- .../java/org/n52/shetland/ogc/sos/SosInsertionMetadata.java | 2 +- .../java/org/n52/shetland/ogc/sos/SosObservationOffering.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sos/SosOffering.java | 2 +- .../java/org/n52/shetland/ogc/sos/SosProcedureDescription.java | 2 +- .../shetland/ogc/sos/SosProcedureDescriptionUnknownType.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/SosResultEncoding.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/SosResultStructure.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/SosResultTemplate.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/SosSoapConstants.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/SosSpatialFilter.java | 2 +- .../org/n52/shetland/ogc/sos/SosSpatialFilterConstants.java | 2 +- .../n52/shetland/ogc/sos/delobs/DeleteObservationConstants.java | 2 +- .../n52/shetland/ogc/sos/delobs/DeleteObservationRequest.java | 2 +- .../n52/shetland/ogc/sos/delobs/DeleteObservationResponse.java | 2 +- .../n52/shetland/ogc/sos/drt/DeleteResultTemplateConstants.java | 2 +- .../n52/shetland/ogc/sos/drt/DeleteResultTemplateRequest.java | 2 +- .../n52/shetland/ogc/sos/drt/DeleteResultTemplateResponse.java | 2 +- .../org/n52/shetland/ogc/sos/exception/CodedSosException.java | 2 +- .../ogc/sos/exception/ResponseExceedsSizeLimitException.java | 2 +- .../org/n52/shetland/ogc/sos/exception/SosExceptionCode.java | 2 +- .../ogc/sos/extension/SosObservationOfferingExtension.java | 2 +- .../n52/shetland/ogc/sos/gda/GetDataAvailabilityConstants.java | 2 +- .../n52/shetland/ogc/sos/gda/GetDataAvailabilityRequest.java | 2 +- .../n52/shetland/ogc/sos/gda/GetDataAvailabilityResponse.java | 2 +- .../shetland/ogc/sos/ifoi/InsertFeatureOfInterestConstants.java | 2 +- .../shetland/ogc/sos/ifoi/InsertFeatureOfInterestRequest.java | 2 +- .../shetland/ogc/sos/ifoi/InsertFeatureOfInterestResponse.java | 2 +- .../shetland/ogc/sos/request/AbstractObservationRequest.java | 2 +- .../java/org/n52/shetland/ogc/sos/request/BatchRequest.java | 2 +- .../org/n52/shetland/ogc/sos/request/DeleteSensorRequest.java | 2 +- .../org/n52/shetland/ogc/sos/request/DescribeSensorRequest.java | 2 +- .../ogc/sos/request/FeatureOfInterestIdentifierRequest.java | 2 +- .../shetland/ogc/sos/request/GetFeatureOfInterestRequest.java | 2 +- .../n52/shetland/ogc/sos/request/GetObservationByIdRequest.java | 2 +- .../org/n52/shetland/ogc/sos/request/GetObservationRequest.java | 2 +- .../java/org/n52/shetland/ogc/sos/request/GetResultRequest.java | 2 +- .../n52/shetland/ogc/sos/request/GetResultTemplateRequest.java | 2 +- .../n52/shetland/ogc/sos/request/InsertObservationRequest.java | 2 +- .../org/n52/shetland/ogc/sos/request/InsertResultRequest.java | 2 +- .../shetland/ogc/sos/request/InsertResultTemplateRequest.java | 2 +- .../org/n52/shetland/ogc/sos/request/InsertSensorRequest.java | 2 +- .../shetland/ogc/sos/request/SosDescribeFeatureTypeRequest.java | 2 +- .../ogc/sos/request/SosDescribeObservationTypeRequest.java | 2 +- .../ogc/sos/request/SosGetFeatureOfInterestTimeRequest.java | 2 +- .../n52/shetland/ogc/sos/request/SosRegisterSensorRequest.java | 2 +- .../shetland/ogc/sos/request/SpatialFeatureQueryRequest.java | 2 +- .../ogc/sos/request/SpatialFilteringProfileRequest.java | 2 +- .../java/org/n52/shetland/ogc/sos/request/SrsNameRequest.java | 2 +- .../org/n52/shetland/ogc/sos/request/UpdateSensorRequest.java | 2 +- .../shetland/ogc/sos/response/AbstractObservationResponse.java | 2 +- .../shetland/ogc/sos/response/AbstractOperationResponse.java | 2 +- .../org/n52/shetland/ogc/sos/response/AbstractStreaming.java | 2 +- .../java/org/n52/shetland/ogc/sos/response/BatchResponse.java | 2 +- .../n52/shetland/ogc/sos/response/BinaryAttachmentResponse.java | 2 +- .../org/n52/shetland/ogc/sos/response/DeleteSensorResponse.java | 2 +- .../n52/shetland/ogc/sos/response/DescribeSensorResponse.java | 2 +- .../shetland/ogc/sos/response/GetFeatureOfInterestResponse.java | 2 +- .../shetland/ogc/sos/response/GetObservationByIdResponse.java | 2 +- .../n52/shetland/ogc/sos/response/GetObservationResponse.java | 2 +- .../org/n52/shetland/ogc/sos/response/GetResultResponse.java | 2 +- .../shetland/ogc/sos/response/GetResultTemplateResponse.java | 2 +- .../ogc/sos/response/GlobalObservationResponseValues.java | 2 +- .../shetland/ogc/sos/response/InsertObservationResponse.java | 2 +- .../org/n52/shetland/ogc/sos/response/InsertResultResponse.java | 2 +- .../shetland/ogc/sos/response/InsertResultTemplateResponse.java | 2 +- .../org/n52/shetland/ogc/sos/response/InsertSensorResponse.java | 2 +- .../org/n52/shetland/ogc/sos/response/UpdateSensorResponse.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/ro/OfferingContext.java | 2 +- .../org/n52/shetland/ogc/sos/ro/RelatedOfferingConstants.java | 2 +- .../main/java/org/n52/shetland/ogc/sos/ro/RelatedOfferings.java | 2 +- .../src/main/java/org/n52/shetland/ogc/sta/StaConstants.java | 2 +- .../org/n52/shetland/ogc/sta/exception/STACRUDException.java | 2 +- .../ogc/sta/exception/STAInvalidFilterExpressionException.java | 2 +- .../n52/shetland/ogc/sta/exception/STAInvalidQueryError.java | 2 +- .../shetland/ogc/sta/exception/STAInvalidQueryException.java | 2 +- .../n52/shetland/ogc/sta/exception/STAInvalidUrlException.java | 2 +- .../n52/shetland/ogc/sta/exception/STANotFoundException.java | 2 +- .../n52/shetland/ogc/sta/model/DatastreamEntityDefinition.java | 2 +- .../ogc/sta/model/FeatureOfInterestEntityDefinition.java | 2 +- .../ogc/sta/model/HistoricalLocationEntityDefinition.java | 2 +- .../n52/shetland/ogc/sta/model/LocationEntityDefinition.java | 2 +- .../n52/shetland/ogc/sta/model/ObservationEntityDefinition.java | 2 +- .../ogc/sta/model/ObservedPropertyEntityDefinition.java | 2 +- .../org/n52/shetland/ogc/sta/model/STAEntityDefinition.java | 2 +- .../org/n52/shetland/ogc/sta/model/SensorEntityDefinition.java | 2 +- .../org/n52/shetland/ogc/sta/model/ThingEntityDefinition.java | 2 +- .../ogc/swe/AbstractOptionalSweDataComponentVisitor.java | 2 +- .../ogc/swe/AbstractThrowingSweDataComponentVisitor.java | 2 +- .../ogc/swe/AbstractThrowingVoidSweDataComponentVisitor.java | 2 +- .../shetland/ogc/swe/AbstractVoidSweDataComponentVisitor.java | 2 +- .../org/n52/shetland/ogc/swe/CoordinateSettingsProvider.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/swe/DataRecord.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/swe/RangeValue.java | 2 +- .../java/org/n52/shetland/ogc/swe/SweAbstractDataComponent.java | 2 +- .../java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/SweConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/SweCoordinate.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java | 2 +- .../java/org/n52/shetland/ogc/swe/SweDataComponentVisitor.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/SweDataRecord.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swe/SweEnvelope.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/swe/SweField.java | 2 +- .../main/java/org/n52/shetland/ogc/swe/SweSimpleDataRecord.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/swe/SweVector.java | 2 +- .../org/n52/shetland/ogc/swe/VoidSweDataComponentVisitor.java | 2 +- .../org/n52/shetland/ogc/swe/encoding/SweAbstractEncoding.java | 2 +- .../java/org/n52/shetland/ogc/swe/encoding/SweTextEncoding.java | 2 +- .../n52/shetland/ogc/swe/simpleType/SweAbstractSimpleType.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweAbstractUomType.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweAllowedTimes.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweAllowedTokens.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweAllowedValues.java | 2 +- .../java/org/n52/shetland/ogc/swe/simpleType/SweBoolean.java | 2 +- .../java/org/n52/shetland/ogc/swe/simpleType/SweCategory.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweCategoryRange.java | 2 +- .../main/java/org/n52/shetland/ogc/swe/simpleType/SweCount.java | 2 +- .../java/org/n52/shetland/ogc/swe/simpleType/SweCountRange.java | 2 +- .../n52/shetland/ogc/swe/simpleType/SweObservableProperty.java | 2 +- .../java/org/n52/shetland/ogc/swe/simpleType/SweQuality.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweQualityHolder.java | 2 +- .../java/org/n52/shetland/ogc/swe/simpleType/SweQuantity.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SweQuantityRange.java | 2 +- .../main/java/org/n52/shetland/ogc/swe/simpleType/SweText.java | 2 +- .../main/java/org/n52/shetland/ogc/swe/simpleType/SweTime.java | 2 +- .../java/org/n52/shetland/ogc/swe/simpleType/SweTimeRange.java | 2 +- .../org/n52/shetland/ogc/swe/stream/StreamingSweDataArray.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swes/AbstractSWES.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swes/SwesConstants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/swes/SwesExtension.java | 2 +- .../java/org/n52/shetland/ogc/swes/SwesFeatureRelationship.java | 2 +- .../java/org/n52/shetland/ogc/swes/SwesStreamingConstants.java | 2 +- .../org/n52/shetland/ogc/swes/exception/SwesExceptionCode.java | 2 +- .../java/org/n52/shetland/ogc/wps/DataTransmissionMode.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/ExecutionMode.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/wps/Format.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/InputOccurence.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/JobControlOption.java | 2 +- shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobId.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/wps/JobStatus.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/OutputDefinition.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/ProcessOffering.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/ProcessOfferings.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/ResponseMode.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/wps/Result.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/wps/StatusInfo.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/WPS100Constants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/WPS200Constants.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/WPSCapabilities.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/WPSConstants.java | 2 +- .../java/org/n52/shetland/ogc/wps/ap/ApplicationPackage.java | 2 +- .../java/org/n52/shetland/ogc/wps/ap/DockerExecutionUnit.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/ap/ExecutionUnit.java | 2 +- .../core/src/main/java/org/n52/shetland/ogc/wps/data/Body.java | 2 +- .../org/n52/shetland/ogc/wps/data/FormattedProcessData.java | 2 +- .../java/org/n52/shetland/ogc/wps/data/GroupProcessData.java | 2 +- .../src/main/java/org/n52/shetland/ogc/wps/data/InlineBody.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/data/ProcessData.java | 2 +- .../org/n52/shetland/ogc/wps/data/ReferenceProcessData.java | 2 +- .../main/java/org/n52/shetland/ogc/wps/data/ReferencedBody.java | 2 +- .../java/org/n52/shetland/ogc/wps/data/ValueProcessData.java | 2 +- .../n52/shetland/ogc/wps/data/impl/FileBasedProcessData.java | 2 +- .../shetland/ogc/wps/data/impl/InMemoryValueProcessData.java | 2 +- .../n52/shetland/ogc/wps/data/impl/StringValueProcessData.java | 2 +- .../shetland/ogc/wps/description/BoundingBoxDescription.java | 2 +- .../ogc/wps/description/BoundingBoxInputDescription.java | 2 +- .../ogc/wps/description/BoundingBoxOutputDescription.java | 2 +- .../n52/shetland/ogc/wps/description/ComplexDescription.java | 2 +- .../shetland/ogc/wps/description/ComplexInputDescription.java | 2 +- .../shetland/ogc/wps/description/ComplexOutputDescription.java | 2 +- .../org/n52/shetland/ogc/wps/description/DataDescription.java | 2 +- .../java/org/n52/shetland/ogc/wps/description/Description.java | 2 +- .../n52/shetland/ogc/wps/description/GroupInputDescription.java | 2 +- .../shetland/ogc/wps/description/GroupOutputDescription.java | 2 +- .../org/n52/shetland/ogc/wps/description/LiteralDataDomain.java | 2 +- .../n52/shetland/ogc/wps/description/LiteralDescription.java | 2 +- .../shetland/ogc/wps/description/LiteralInputDescription.java | 2 +- .../shetland/ogc/wps/description/LiteralOutputDescription.java | 2 +- .../n52/shetland/ogc/wps/description/ProcessDescription.java | 2 +- .../ogc/wps/description/ProcessDescriptionBuilderFactory.java | 2 +- .../shetland/ogc/wps/description/ProcessInputDescription.java | 2 +- .../ogc/wps/description/ProcessInputDescriptionContainer.java | 2 +- .../shetland/ogc/wps/description/ProcessOutputDescription.java | 2 +- .../ogc/wps/description/ProcessOutputDescriptionContainer.java | 2 +- .../ogc/wps/description/impl/AbstractDataDescription.java | 2 +- .../shetland/ogc/wps/description/impl/AbstractDescription.java | 2 +- .../wps/description/impl/AbstractProcessInputDescription.java | 2 +- .../wps/description/impl/AbstractProcessOutputDescription.java | 2 +- .../wps/description/impl/BoundingBoxInputDescriptionImpl.java | 2 +- .../wps/description/impl/BoundingBoxOutputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/ComplexInputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/ComplexOutputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/GroupInputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/GroupOutputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/LiteralDataDomainImpl.java | 2 +- .../ogc/wps/description/impl/LiteralInputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/LiteralOutputDescriptionImpl.java | 2 +- .../ogc/wps/description/impl/ProcessDescriptionFactory.java | 2 +- .../ogc/wps/description/impl/ProcessDescriptionImpl.java | 2 +- .../org/n52/shetland/ogc/wps/exception/CodedWpsException.java | 2 +- .../org/n52/shetland/ogc/wps/exception/NoSuchJobException.java | 2 +- .../n52/shetland/ogc/wps/exception/ResultNotReadyException.java | 2 +- .../org/n52/shetland/ogc/wps/exception/WpsExceptionCode.java | 2 +- .../org/n52/shetland/ogc/wps/request/AbstractJobIdRequest.java | 2 +- .../n52/shetland/ogc/wps/request/DescribeProcessRequest.java | 2 +- .../java/org/n52/shetland/ogc/wps/request/DismissRequest.java | 2 +- .../java/org/n52/shetland/ogc/wps/request/ExecuteRequest.java | 2 +- .../java/org/n52/shetland/ogc/wps/request/GetResultRequest.java | 2 +- .../java/org/n52/shetland/ogc/wps/request/GetStatusRequest.java | 2 +- .../n52/shetland/ogc/wps/response/DescribeProcessResponse.java | 2 +- .../java/org/n52/shetland/ogc/wps/response/DismissResponse.java | 2 +- .../java/org/n52/shetland/ogc/wps/response/ExecuteResponse.java | 2 +- .../org/n52/shetland/ogc/wps/response/GetResultResponse.java | 2 +- .../org/n52/shetland/ogc/wps/response/GetStatusResponse.java | 2 +- .../core/src/main/java/org/n52/shetland/util/AqdHelper.java | 2 +- .../core/src/main/java/org/n52/shetland/util/CRSHelper.java | 2 +- .../src/main/java/org/n52/shetland/util/CollectionHelper.java | 2 +- .../src/main/java/org/n52/shetland/util/DateTimeException.java | 2 +- .../java/org/n52/shetland/util/DateTimeFormatException.java | 2 +- .../src/main/java/org/n52/shetland/util/DateTimeHelper.java | 2 +- .../main/java/org/n52/shetland/util/DateTimeParseException.java | 2 +- .../src/main/java/org/n52/shetland/util/EReportingSetting.java | 2 +- .../src/main/java/org/n52/shetland/util/EnvelopeOrGeometry.java | 2 +- .../main/java/org/n52/shetland/util/GeometryTransformer.java | 2 +- shetland/core/src/main/java/org/n52/shetland/util/HTTP.java | 2 +- .../core/src/main/java/org/n52/shetland/util/IdGenerator.java | 2 +- .../core/src/main/java/org/n52/shetland/util/JTSHelper.java | 2 +- .../core/src/main/java/org/n52/shetland/util/JavaHelper.java | 2 +- shetland/core/src/main/java/org/n52/shetland/util/MinMax.java | 2 +- shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java | 2 +- .../src/main/java/org/n52/shetland/util/OwsQueryBuilder.java | 2 +- .../src/main/java/org/n52/shetland/util/ReferencedEnvelope.java | 2 +- .../src/main/java/org/n52/shetland/util/SosQueryBuilder.java | 2 +- .../core/src/main/java/org/n52/shetland/util/StringHelper.java | 2 +- .../core/src/main/java/org/n52/shetland/uvf/UVFConstants.java | 2 +- .../src/main/java/org/n52/shetland/uvf/UVFSettingsProvider.java | 2 +- shetland/core/src/main/java/org/n52/shetland/w3c/Nillable.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/SchemaLocation.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/W3CConstants.java | 2 +- .../src/main/java/org/n52/shetland/w3c/soap/AbstractSoap.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/soap/SoapChain.java | 2 +- .../src/main/java/org/n52/shetland/w3c/soap/SoapConstants.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/soap/SoapFault.java | 2 +- .../src/main/java/org/n52/shetland/w3c/soap/SoapHeader.java | 2 +- .../src/main/java/org/n52/shetland/w3c/soap/SoapRequest.java | 2 +- .../src/main/java/org/n52/shetland/w3c/soap/SoapResponse.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsa/WsaActionHeader.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsa/WsaConstants.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsa/WsaHeader.java | 2 +- .../main/java/org/n52/shetland/w3c/wsa/WsaMessageIDHeader.java | 2 +- .../main/java/org/n52/shetland/w3c/wsa/WsaRelatesToHeader.java | 2 +- .../main/java/org/n52/shetland/w3c/wsa/WsaReplyToHeader.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsa/WsaToHeader.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/AbstractAddress.java | 2 +- .../java/org/n52/shetland/w3c/wsdl/AbstractDocumentedWsdl.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/AbstractWsdl.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Binding.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/BindingFault.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/BindingInput.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/BindingMessage.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/BindingOperation.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/BindingOutput.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/Definitions.java | 2 +- .../java/org/n52/shetland/w3c/wsdl/ExtensibilityElement.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Fault.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Import.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Include.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Input.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Message.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Operation.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Output.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Param.java | 2 +- shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Part.java | 2 +- shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Port.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/PortType.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Schema.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/SchemaReference.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Service.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/wsdl/Types.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/WSDLConstants.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/http/HttpAddress.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/http/HttpBinding.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/http/HttpOperation.java | 2 +- .../java/org/n52/shetland/w3c/wsdl/http/HttpUrlEncoded.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/mime/MimeXml.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/soap/SoapAddress.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/soap/SoapBinding.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapBody.java | 2 +- .../src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapFault.java | 2 +- .../main/java/org/n52/shetland/w3c/wsdl/soap/SoapOperation.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/xlink/Actuate.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/xlink/Link.java | 2 +- .../src/main/java/org/n52/shetland/w3c/xlink/Reference.java | 2 +- .../src/main/java/org/n52/shetland/w3c/xlink/Referenceable.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/xlink/Show.java | 2 +- .../core/src/main/java/org/n52/shetland/w3c/xlink/Type.java | 2 +- .../main/java/org/n52/shetland/w3c/xlink/W3CHrefAttribute.java | 2 +- .../core/src/test/java/org/n52/shetland/ogc/gml/TimeTest.java | 2 +- .../java/org/n52/shetland/ogc/gml/time/TimeInstantTest.java | 2 +- .../test/java/org/n52/shetland/ogc/gml/time/TimePeriodTest.java | 2 +- .../org/n52/shetland/ogc/om/OmObservationConstellationTest.java | 2 +- .../test/java/org/n52/shetland/ogc/om/OmObservationTest.java | 2 +- .../org/n52/shetland/ogc/om/features/FeatureCollectionTest.java | 2 +- .../features/samplingFeatures/SamplingFeatureComplexTest.java | 2 +- .../ogc/om/features/samplingFeatures/SamplingFeatureTest.java | 2 +- .../java/org/n52/shetland/ogc/om/values/ProfileLevelTest.java | 2 +- .../java/org/n52/shetland/ogc/om/values/ProfileValueTest.java | 2 +- .../org/n52/shetland/ogc/ows/service/RequestContextTest.java | 2 +- .../test/java/org/n52/shetland/ogc/ows/service/TestRequest.java | 2 +- .../org/n52/shetland/ogc/sensorML/AbstractSensorMLTest.java | 2 +- .../n52/shetland/ogc/sensorML/elements/SmlClassifierTest.java | 2 +- .../n52/shetland/ogc/sensorML/elements/SmlIdentifierTest.java | 2 +- .../java/org/n52/shetland/ogc/sensorML/elements/SmlIoTest.java | 2 +- .../test/java/org/n52/shetland/ogc/sos/ObjectWithXmlTest.java | 2 +- .../n52/shetland/ogc/sos/request/GetObservationRequestTest.java | 2 +- .../test/java/org/n52/shetland/ogc/swe/SweDataRecordTest.java | 2 +- .../src/test/java/org/n52/shetland/ogc/swe/SweEnvelopeTest.java | 2 +- .../org/n52/shetland/ogc/swe/simpleType/SosSweCategoryTest.java | 2 +- .../src/test/java/org/n52/shetland/ogc/swes/ExtensionsTest.java | 2 +- .../core/src/test/java/org/n52/shetland/ogc/wps/FormatTest.java | 2 +- .../test/java/org/n52/shetland/util/CollectionHelperTest.java | 2 +- .../src/test/java/org/n52/shetland/util/DateTimeHelperTest.java | 2 +- .../src/test/java/org/n52/shetland/util/IdGeneratorTest.java | 2 +- .../test/java/org/n52/shetland/util/JTSHelperForTesting.java | 2 +- .../core/src/test/java/org/n52/shetland/util/JTSHelperTest.java | 2 +- .../test/java/org/n52/shetland/util/ReferencedEnvelopeTest.java | 2 +- .../core/src/test/java/org/n52/shetland/util/ReverseOf.java | 2 +- .../src/test/java/org/n52/shetland/util/StringHelperTest.java | 2 +- .../src/test/java/org/n52/shetland/util/UnknownGeometry.java | 2 +- .../src/test/java/org/n52/shetland/util/http/MediaTypeTest.java | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- .../src/main/java/org/n52/shetland/rdf/AbstractDatatype.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/AbstractLang.java | 2 +- .../src/main/java/org/n52/shetland/rdf/AbstractProperty.java | 2 +- .../src/main/java/org/n52/shetland/rdf/AbstractResource.java | 2 +- .../java/org/n52/shetland/rdf/AbstractTitleDescription.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/AbstractValue.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/ModelAdder.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/RDF.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/RDFDataTypes.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/RDFElement.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/RDFMediaTypes.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/RdfPrefix.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/ResourceAdder.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/ResourceCreator.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dcat/AccessURL.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dcat/Catalog.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dcat/ContactPoint.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dcat/Dataset.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dcat/DcatRdfPrefix.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dcat/Distribution.java | 2 +- .../java/org/n52/shetland/rdf/dcat/DistributionProperty.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dcat/DownloadURL.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dcat/Keyword.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dcat/LandingPage.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dcat/ThemeTaxonomy.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dct/AccessRights.java | 2 +- .../main/java/org/n52/shetland/rdf/dct/AccrualPeriodicity.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dct/CLDFrequency.java | 2 +- .../src/main/java/org/n52/shetland/rdf/dct/DctRdfPrefix.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Description.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Format.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Identifier.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Issued.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Language.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/License.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Location.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Modified.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Publisher.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/dct/Spatial.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Theme.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Title.java | 2 +- .../src/main/java/org/n52/shetland/rdf/foaf/FoafRdfPrefix.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/foaf/Homepage.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/foaf/MBox.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/foaf/Name.java | 2 +- .../src/main/java/org/n52/shetland/rdf/foaf/Organization.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/locn/Geometry.java | 2 +- .../src/main/java/org/n52/shetland/rdf/locn/LocnRdfPrefix.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/vcard4/Email.java | 2 +- shetland/rdf/src/main/java/org/n52/shetland/rdf/vcard4/FN.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/vcard4/HasEmail.java | 2 +- .../java/org/n52/shetland/rdf/vcard4/VCardOrganization.java | 2 +- .../main/java/org/n52/shetland/rdf/vcard4/Vcard4RdfPrefix.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/vocabulary/LOCN.java | 2 +- .../rdf/src/main/java/org/n52/shetland/rdf/vocabulary/TIME.java | 2 +- svalbard/core/pom.xml | 2 +- .../core/src/main/java/org/n52/svalbard/CodingSettings.java | 2 +- .../core/src/main/java/org/n52/svalbard/ConformanceClass.java | 2 +- .../core/src/main/java/org/n52/svalbard/ConformanceClasses.java | 2 +- .../core/src/main/java/org/n52/svalbard/ProcedureCoder.java | 2 +- .../java/org/n52/svalbard/decode/AbstractDelegatingDecoder.java | 2 +- .../java/org/n52/svalbard/decode/ConformanceClassDecoder.java | 2 +- .../core/src/main/java/org/n52/svalbard/decode/Decoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/DecoderFactory.java | 2 +- .../core/src/main/java/org/n52/svalbard/decode/DecoderKey.java | 2 +- .../main/java/org/n52/svalbard/decode/DecoderRepository.java | 2 +- .../src/main/java/org/n52/svalbard/decode/JsonDecoderKey.java | 2 +- .../main/java/org/n52/svalbard/decode/NamespaceDecoderKey.java | 2 +- .../main/java/org/n52/svalbard/decode/OperationDecoderKey.java | 2 +- .../src/main/java/org/n52/svalbard/decode/ProcedureDecoder.java | 2 +- .../java/org/n52/svalbard/decode/XmlNamespaceDecoderKey.java | 2 +- .../n52/svalbard/decode/XmlNamespaceOperationDecoderKey.java | 2 +- .../org/n52/svalbard/decode/XmlStringOperationDecoderKey.java | 2 +- .../decode/exception/DecoderResponseUnsupportedException.java | 2 +- .../org/n52/svalbard/decode/exception/DecodingException.java | 2 +- .../n52/svalbard/decode/exception/NoDecoderForKeyException.java | 2 +- .../decode/exception/NotYetSupportedDecodingException.java | 2 +- .../decode/exception/UnsupportedDecoderInputException.java | 2 +- .../org/n52/svalbard/decode/exception/XmlDecodingException.java | 2 +- .../java/org/n52/svalbard/encode/AbstractDelegatingEncoder.java | 2 +- .../java/org/n52/svalbard/encode/ClassToClassEncoderKey.java | 2 +- .../java/org/n52/svalbard/encode/ConformanceClassEncoder.java | 2 +- .../core/src/main/java/org/n52/svalbard/encode/Encoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/EncoderFactory.java | 2 +- .../src/main/java/org/n52/svalbard/encode/EncoderFlags.java | 2 +- .../core/src/main/java/org/n52/svalbard/encode/EncoderKey.java | 2 +- .../main/java/org/n52/svalbard/encode/EncoderRepository.java | 2 +- .../src/main/java/org/n52/svalbard/encode/EncodingContext.java | 2 +- .../main/java/org/n52/svalbard/encode/ExceptionEncoderKey.java | 2 +- .../main/java/org/n52/svalbard/encode/ObservationEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/OperationEncoderKey.java | 2 +- .../org/n52/svalbard/encode/OperationRequestEncoderKey.java | 2 +- .../org/n52/svalbard/encode/OperationResponseEncoderKey.java | 2 +- .../src/main/java/org/n52/svalbard/encode/ProcedureEncoder.java | 2 +- .../org/n52/svalbard/encode/ResponseContentTypeEncoderKey.java | 2 +- .../main/java/org/n52/svalbard/encode/SchemaAwareEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/SchemaRepository.java | 2 +- .../src/main/java/org/n52/svalbard/encode/StreamingEncoder.java | 2 +- .../java/org/n52/svalbard/encode/StreamingEncoderFlags.java | 2 +- .../core/src/main/java/org/n52/svalbard/encode/UVFEncoder.java | 2 +- .../org/n52/svalbard/encode/VersionedOperationEncoderKey.java | 2 +- .../src/main/java/org/n52/svalbard/encode/WmlTmlHelper.java | 2 +- .../java/org/n52/svalbard/encode/XmlBeansEncodingFlags.java | 2 +- .../java/org/n52/svalbard/encode/XmlDocumentEncoderKey.java | 2 +- .../src/main/java/org/n52/svalbard/encode/XmlEncoderFlags.java | 2 +- .../src/main/java/org/n52/svalbard/encode/XmlEncoderKey.java | 2 +- .../java/org/n52/svalbard/encode/XmlPropertyTypeEncoderKey.java | 2 +- .../java/org/n52/svalbard/encode/XmlStreamEncoderFlags.java | 2 +- .../encode/exception/EncoderResponseUnsupportedException.java | 2 +- .../org/n52/svalbard/encode/exception/EncodingException.java | 2 +- .../n52/svalbard/encode/exception/NoEncoderForKeyException.java | 2 +- .../encode/exception/NotYetSupportedEncodingException.java | 2 +- .../encode/exception/UnsupportedEncoderInputException.java | 2 +- .../core/src/main/java/org/n52/svalbard/util/CodingHelper.java | 2 +- .../core/src/main/java/org/n52/svalbard/util/GmlHelper.java | 2 +- .../core/src/main/java/org/n52/svalbard/util/N52XmlHelper.java | 2 +- .../java/org/n52/svalbard/util/NamespaceContextBuilder.java | 2 +- .../core/src/main/java/org/n52/svalbard/util/SweHelper.java | 2 +- .../core/src/main/java/org/n52/svalbard/util/XmlHelper.java | 2 +- .../src/main/java/org/n52/svalbard/util/XmlOptionsHelper.java | 2 +- svalbard/core/src/main/resources/svalbard-core-context.xml | 2 +- .../test/java/org/n52/svalbard/AbstractXmlBeansGenerator.java | 2 +- .../src/test/java/org/n52/svalbard/encode/UVFEncoderTest.java | 2 +- svalbard/exi/pom.xml | 2 +- .../exi/src/main/java/org/n52/svalbard/encode/ExiEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/ExiExceptionEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/ExiResponseEncoder.java | 2 +- svalbard/exi/src/main/resources/svalbard-exi-context.xml | 2 +- .../exi/src/test/java/org/n52/svalbard/XmlToExiConverter.java | 2 +- svalbard/exi/src/test/resources/xml/DescribeSensor.xml | 2 +- svalbard/exi/src/test/resources/xml/GetCapabilities.xml | 2 +- svalbard/exi/src/test/resources/xml/GetDataAvailability.xml | 2 +- svalbard/exi/src/test/resources/xml/GetFeatureOfInterest.xml | 2 +- svalbard/exi/src/test/resources/xml/GetObservation.xml | 2 +- svalbard/exi/src/test/resources/xml/GetObservationById.xml | 2 +- svalbard/json-common/pom.xml | 2 +- .../java/org/n52/svalbard/coding/json/AQDJSONConstants.java | 2 +- .../org/n52/svalbard/coding/json/GeoJSONDecodingException.java | 2 +- .../org/n52/svalbard/coding/json/GeoJSONEncodingException.java | 2 +- .../main/java/org/n52/svalbard/coding/json/JSONConstants.java | 2 +- .../main/java/org/n52/svalbard/coding/json/JSONValidator.java | 2 +- .../main/java/org/n52/svalbard/coding/json/SchemaConstants.java | 2 +- .../org/n52/svalbard/decode/json/AbstractSosRequestDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/json/JSONDecoder.java | 2 +- .../org/n52/svalbard/decode/json/JSONDecodingException.java | 2 +- .../n52/svalbard/encode/json/AbstractSosResponseEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/json/JSONEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/json/JSONEncoderKey.java | 2 +- .../org/n52/svalbard/encode/json/JSONEncodingException.java | 2 +- .../n52/svalbard/encode/json/base/BigDecimalJSONEncoder.java | 2 +- .../n52/svalbard/encode/json/base/BigIntegerJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/BooleanJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/base/ByteJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/DoubleJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/FloatJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/IntegerJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/base/LongJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/ShortJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/base/StringJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/base/TimeJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/base/URIJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/base/URLJSONEncoder.java | 2 +- .../src/main/resources/svalbard-json-common-context.xml | 2 +- .../svalbard/coding/json/JSONEncoderForExceptionTesting.java | 2 +- .../org/n52/svalbard/coding/json/JSONEncoderForTesting.java | 2 +- .../test/java/org/n52/svalbard/coding/json/JSONEncoderTest.java | 2 +- .../org/n52/svalbard/coding/json/JSONSchemaValidationTest.java | 2 +- .../java/org/n52/svalbard/coding/json/JSONValidatorTest.java | 2 +- .../test/java/org/n52/svalbard/coding/json/matchers/Does.java | 2 +- .../org/n52/svalbard/coding/json/matchers/JSONMatchers.java | 2 +- .../n52/svalbard/coding/json/matchers/ValidationMatchers.java | 2 +- svalbard/json/pom.xml | 2 +- .../java/org/n52/svalbard/decode/json/AbstractJSONDecoder.java | 2 +- .../java/org/n52/svalbard/decode/json/AddressJSONDecoder.java | 2 +- .../java/org/n52/svalbard/decode/json/BatchRequestDecoder.java | 2 +- .../java/org/n52/svalbard/decode/json/ContactJSONDecoder.java | 2 +- .../n52/svalbard/decode/json/DeleteObservationJsonDecoder.java | 2 +- .../n52/svalbard/decode/json/DeleteSensorRequestDecoder.java | 2 +- .../n52/svalbard/decode/json/DescribeSensorRequestDecoder.java | 2 +- .../n52/svalbard/decode/json/EReportingChangeJSONDecoder.java | 2 +- .../n52/svalbard/decode/json/EReportingHeaderJSONDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/json/FeatureDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/json/FieldDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/json/GeoJSONDecoder.java | 2 +- .../n52/svalbard/decode/json/GeographicalNameJSONDecoder.java | 2 +- .../n52/svalbard/decode/json/GetCapabilitiesRequestDecoder.java | 2 +- .../svalbard/decode/json/GetDataAvailabilityJsonDecoder.java | 2 +- .../decode/json/GetFeatureOfInterestRequestDecoder.java | 2 +- .../svalbard/decode/json/GetObservationByIdRequestDecoder.java | 2 +- .../n52/svalbard/decode/json/GetObservationRequestDecoder.java | 2 +- .../org/n52/svalbard/decode/json/GetResultRequestDecoder.java | 2 +- .../svalbard/decode/json/GetResultTemplateRequestDecoder.java | 2 +- .../svalbard/decode/json/InsertObservationRequestDecoder.java | 2 +- .../n52/svalbard/decode/json/InsertResultRequestDecoder.java | 2 +- .../decode/json/InsertResultTemplateRequestDecoder.java | 2 +- .../n52/svalbard/decode/json/InsertSensorRequestDecoder.java | 2 +- .../java/org/n52/svalbard/decode/json/InspireIDJSONDecoder.java | 2 +- .../java/org/n52/svalbard/decode/json/ObservationDecoder.java | 2 +- .../org/n52/svalbard/decode/json/PronunciationJSONDecoder.java | 2 +- .../org/n52/svalbard/decode/json/RelatedPartyJSONDecoder.java | 2 +- .../n52/svalbard/decode/json/ReportObligationJSONDecoder.java | 2 +- .../java/org/n52/svalbard/decode/json/SpatialFilterDecoder.java | 2 +- .../java/org/n52/svalbard/decode/json/SpellingJSONDecoder.java | 2 +- .../org/n52/svalbard/decode/json/TemporalFilterDecoder.java | 2 +- .../n52/svalbard/decode/json/UpdateSensorRequestDecoder.java | 2 +- .../n52/svalbard/decode/json/wps/ApplicationPackageDecoder.java | 2 +- .../svalbard/decode/json/wps/DockerExecutionUnitDecoder.java | 2 +- .../org/n52/svalbard/decode/json/wps/ExecutionUnitDecoder.java | 2 +- .../n52/svalbard/decode/json/wps/ProcessDescriptionDecoder.java | 2 +- .../n52/svalbard/decode/json/wps/ProcessOfferingDecoder.java | 2 +- .../encode/json/AbstractObservationResponseEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/AddressJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/BatchResponseEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/CodeTypeJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/ContactJSONEncoder.java | 2 +- .../n52/svalbard/encode/json/DeleteObservationJsonEncoder.java | 2 +- .../n52/svalbard/encode/json/DeleteSensorResponseEncoder.java | 2 +- .../n52/svalbard/encode/json/DescribeSensorResponseEncoder.java | 2 +- .../n52/svalbard/encode/json/EReportingChangeJSONEncoder.java | 2 +- .../n52/svalbard/encode/json/EReportingHeaderJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/FeatureOfInterestEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/json/FieldEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/json/GeoJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/GeographicNameJSONEncoder.java | 2 +- .../svalbard/encode/json/GetCapabilitiesResponseEncoder.java | 2 +- .../svalbard/encode/json/GetDataAvailabilityJsonEncoder.java | 2 +- .../encode/json/GetFeatureOfInterestResponseEncoder.java | 2 +- .../svalbard/encode/json/GetObservationByIdResponseEncoder.java | 2 +- .../n52/svalbard/encode/json/GetObservationResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/json/GetResultResponseEncoder.java | 2 +- .../svalbard/encode/json/GetResultTemplateResponseEncoder.java | 2 +- .../svalbard/encode/json/InsertObservationResponseEncoder.java | 2 +- .../n52/svalbard/encode/json/InsertResultResponseEncoder.java | 2 +- .../encode/json/InsertResultTemplateResponseEncoder.java | 2 +- .../n52/svalbard/encode/json/InsertSensorResponseEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/InspireIDJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/IterableJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/NillableJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/ObservationEncoder.java | 2 +- .../org/n52/svalbard/encode/json/OwsExceptionReportEncoder.java | 2 +- .../org/n52/svalbard/encode/json/PTFreeTextJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/PronunciationJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/ReferenceJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/ReferenceableJSONEncoder.java | 2 +- .../org/n52/svalbard/encode/json/RelatedPartyJSONEncoder.java | 2 +- .../n52/svalbard/encode/json/ReportObligationJSONEncoder.java | 2 +- .../java/org/n52/svalbard/encode/json/SpellingJSONEncoder.java | 2 +- .../n52/svalbard/encode/json/UpdateSensorResponseEncoder.java | 2 +- .../n52/svalbard/encode/json/wps/ApplicationPackageEncoder.java | 2 +- .../svalbard/encode/json/wps/DockerExecutionUnitEncoder.java | 2 +- .../n52/svalbard/encode/json/wps/ProcessDescriptionEncoder.java | 2 +- .../n52/svalbard/encode/json/wps/ProcessOfferingEncoder.java | 2 +- svalbard/json/src/main/resources/svalbard-json-context.xml | 2 +- .../test/java/org/n52/svalbard/ConfiguredSettingsManager.java | 2 +- .../json/src/test/java/org/n52/svalbard/XmlBeansGenerator.java | 2 +- .../org/n52/svalbard/coding/AbstractEReportingHeaderCoding.java | 2 +- .../json/src/test/java/org/n52/svalbard/coding/GeoJSONTest.java | 2 +- .../java/org/n52/svalbard/coding/ObservationValidationTest.java | 2 +- .../org/n52/svalbard/decode/json/BatchRequestDecodingTest.java | 2 +- .../svalbard/decode/json/CategoryObservationDecodingTest.java | 2 +- .../n52/svalbard/decode/json/CountObservationDecodingTest.java | 2 +- .../svalbard/decode/json/EReportingHeaderJSONDecoderTest.java | 2 +- .../java/org/n52/svalbard/decode/json/FieldDecoderTest.java | 2 +- .../svalbard/decode/json/GeometryObservationDecodingTest.java | 2 +- .../svalbard/decode/json/GetCapabilitiesRequestDecoderTest.java | 2 +- .../svalbard/decode/json/GetObservationRequestDecoderTest.java | 2 +- .../decode/json/InsertObservationRequestDecoderTest.java | 2 +- .../decode/json/InsertResultTemplateRequestDecoderTest.java | 2 +- .../svalbard/decode/json/InsertSensorRequestDecoderTest.java | 2 +- .../org/n52/svalbard/decode/json/MeasurementDecodingTest.java | 2 +- .../n52/svalbard/decode/json/TextObservationDecodingTest.java | 2 +- .../n52/svalbard/decode/json/TruthObservationDecodingTest.java | 2 +- .../svalbard/decode/json/wps/ApplicationPackageDecoderTest.java | 2 +- .../svalbard/encode/json/EReportingHeaderJSONEncoderTest.java | 2 +- .../n52/svalbard/encode/json/OwsExceptionReportEncoderTest.java | 2 +- svalbard/odata/pom.xml | 2 +- .../src/main/java/org/n52/svalbard/odata/ODataFesParser.java | 2 +- .../java/org/n52/svalbard/odata/ObservationCsdlEdmProvider.java | 2 +- .../java/org/n52/svalbard/odata/core/QueryOptionsFactory.java | 2 +- .../java/org/n52/svalbard/odata/core/STAQueryOptionVisitor.java | 2 +- .../main/java/org/n52/svalbard/odata/core/expr/BinaryExpr.java | 2 +- .../java/org/n52/svalbard/odata/core/expr/DirectTextExpr.java | 2 +- .../src/main/java/org/n52/svalbard/odata/core/expr/Expr.java | 2 +- .../main/java/org/n52/svalbard/odata/core/expr/ExprVisitor.java | 2 +- .../java/org/n52/svalbard/odata/core/expr/GeoValueExpr.java | 2 +- .../main/java/org/n52/svalbard/odata/core/expr/MemberExpr.java | 2 +- .../java/org/n52/svalbard/odata/core/expr/MethodCallExpr.java | 2 +- .../java/org/n52/svalbard/odata/core/expr/StringValueExpr.java | 2 +- .../main/java/org/n52/svalbard/odata/core/expr/TextExpr.java | 2 +- .../main/java/org/n52/svalbard/odata/core/expr/UnaryExpr.java | 2 +- .../n52/svalbard/odata/core/expr/arithmetic/ArithmeticExpr.java | 2 +- .../svalbard/odata/core/expr/arithmetic/NumericValueExpr.java | 2 +- .../odata/core/expr/arithmetic/SimpleArithmeticExpr.java | 2 +- .../n52/svalbard/odata/core/expr/bool/BooleanBinaryExpr.java | 2 +- .../java/org/n52/svalbard/odata/core/expr/bool/BooleanExpr.java | 2 +- .../org/n52/svalbard/odata/core/expr/bool/BooleanUnaryExpr.java | 2 +- .../org/n52/svalbard/odata/core/expr/bool/ComparisonExpr.java | 2 +- .../org/n52/svalbard/odata/core/expr/temporal/TemporalExpr.java | 2 +- .../n52/svalbard/odata/core/expr/temporal/TimeValueExpr.java | 2 +- svalbard/odata/src/main/spotbugs/ignore.xml | 2 +- .../org/n52/svalbard/odata/core/ExampleQueryOptionTest.java | 2 +- .../java/org/n52/svalbard/odata/core/ExpandQueryOptionTest.java | 2 +- .../java/org/n52/svalbard/odata/core/Iso8601ParserTest.java | 2 +- .../java/org/n52/svalbard/odata/core/ODataFesParserTest.java | 2 +- .../org/n52/svalbard/odata/core/OrderByQueryOptionTest.java | 2 +- .../org/n52/svalbard/odata/core/QueryOptionCombinationTest.java | 2 +- .../test/java/org/n52/svalbard/odata/core/QueryOptionTests.java | 2 +- .../org/n52/svalbard/odata/core/QueryOptionToStringTest.java | 2 +- .../java/org/n52/svalbard/odata/core/SelectQueryOptionTest.java | 2 +- .../java/org/n52/svalbard/odata/core/SkipQueryOptionTest.java | 2 +- .../test/java/org/n52/svalbard/odata/core/TestConstants.java | 2 +- .../java/org/n52/svalbard/odata/core/TopQueryOptionTest.java | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- .../src/main/java/org/n52/svalbard/OwsEncoderSettings.java | 2 +- .../xmlbeans/src/main/java/org/n52/svalbard/XPathConstants.java | 2 +- .../svalbard/decode/AbstractCapabilitiesBaseTypeDecoder.java | 2 +- .../svalbard/decode/AbstractGetDataAvailabilityXmlDecoder.java | 2 +- .../java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java | 2 +- .../main/java/org/n52/svalbard/decode/AbstractOmDecoderv20.java | 2 +- .../java/org/n52/svalbard/decode/AbstractProcessDecoder.java | 2 +- .../java/org/n52/svalbard/decode/AbstractSensorMLDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/AbstractSoapDecoder.java | 2 +- .../java/org/n52/svalbard/decode/AbstractSoapStringDecoder.java | 2 +- .../org/n52/svalbard/decode/AbstractStringRequestDecoder.java | 2 +- .../java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java | 2 +- .../java/org/n52/svalbard/decode/AbstractWmlDecoderv20.java | 2 +- .../main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java | 2 +- .../main/java/org/n52/svalbard/decode/AqdStringDecoderv10.java | 2 +- .../org/n52/svalbard/decode/CapabilitiesBaseTypeDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/CapabilitiesDecoder.java | 2 +- .../org/n52/svalbard/decode/CapabilitiesDocumentDecoder.java | 2 +- .../java/org/n52/svalbard/decode/CapabilitiesTypeDecoder.java | 2 +- .../org/n52/svalbard/decode/CapabilitiesV1DocumentDecoder.java | 2 +- .../java/org/n52/svalbard/decode/DeleteObservationDecoder.java | 2 +- .../org/n52/svalbard/decode/DeleteObservationStringDecoder.java | 2 +- .../org/n52/svalbard/decode/DeleteObservationV20Decoder.java | 2 +- .../org/n52/svalbard/decode/DeleteResultTemplateDecoder.java | 2 +- .../n52/svalbard/decode/DeleteResultTemplateStringDecoder.java | 2 +- .../decode/DescribeSensorResponseSwesDocumentDecoder.java | 2 +- .../org/n52/svalbard/decode/DocumentCitationTypeDecoder.java | 2 +- .../java/org/n52/svalbard/decode/ExtensibleResponseDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/FesDecoderv20.java | 2 +- .../n52/svalbard/decode/GetDataAvailabilityResponseDecoder.java | 2 +- .../n52/svalbard/decode/GetDataAvailabilityStringDecoder.java | 2 +- .../n52/svalbard/decode/GetDataAvailabilityV20XmlDecoder.java | 2 +- .../org/n52/svalbard/decode/GetDataAvailabilityXmlDecoder.java | 2 +- .../decode/GetFeatureOfInterestResponseDocumentDecoder.java | 2 +- .../decode/GetObservationByIdResponseDocumentDecoder.java | 2 +- .../svalbard/decode/GetObservationResponseDocumentDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/GmlDecoderv311.java | 2 +- .../src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java | 2 +- .../main/java/org/n52/svalbard/decode/InpspireOMSODecoder.java | 2 +- .../org/n52/svalbard/decode/InsertFeatureOfInterestDecoder.java | 2 +- .../svalbard/decode/InsertFeatureOfInterestStringDecoder.java | 2 +- .../svalbard/decode/InsertObservationResponseV20Decoder.java | 2 +- .../org/n52/svalbard/decode/InsertResultResponseDecoder.java | 2 +- .../svalbard/decode/InsertResultTemplateResponseDecoder.java | 2 +- .../org/n52/svalbard/decode/InsertSensorResponseDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/InspireXmlDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/Iso19139GcoDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/Iso19139GmdDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/OgcDecoderv100.java | 2 +- .../src/main/java/org/n52/svalbard/decode/OmDecoderv20.java | 2 +- .../java/org/n52/svalbard/decode/OwsExceptionReportDecoder.java | 2 +- .../java/org/n52/svalbard/decode/ProcessDocumentDecoder.java | 2 +- .../org/n52/svalbard/decode/ProcessPropertyTypeDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/ProcessTypeDecoder.java | 2 +- .../org/n52/svalbard/decode/RelatedOfferingTypeDecoder.java | 2 +- .../java/org/n52/svalbard/decode/RelatedPartyTypeDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/ResultFilterDecoder.java | 2 +- .../java/org/n52/svalbard/decode/ResultFilterDecoderv20.java | 2 +- .../main/java/org/n52/svalbard/decode/SamplingDecoderv20.java | 2 +- .../main/java/org/n52/svalbard/decode/SensorMLDecoderV101.java | 2 +- .../main/java/org/n52/svalbard/decode/SensorMLDecoderV20.java | 2 +- .../src/main/java/org/n52/svalbard/decode/Soap11Decoder.java | 2 +- .../main/java/org/n52/svalbard/decode/Soap11StringDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/Soap12Decoder.java | 2 +- .../main/java/org/n52/svalbard/decode/Soap12StringDecoder.java | 2 +- .../src/main/java/org/n52/svalbard/decode/SosDecoderv100.java | 2 +- .../src/main/java/org/n52/svalbard/decode/SosDecoderv20.java | 2 +- .../main/java/org/n52/svalbard/decode/SosResponseDecoder.java | 2 +- .../java/org/n52/svalbard/decode/SosSpatialFilterDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/SosStringDecoderv100.java | 2 +- .../main/java/org/n52/svalbard/decode/SosStringDecoderv20.java | 2 +- .../main/java/org/n52/svalbard/decode/SpecimenDecoderv20.java | 2 +- .../main/java/org/n52/svalbard/decode/SweCommonDecoderV101.java | 2 +- .../main/java/org/n52/svalbard/decode/SweCommonDecoderV20.java | 2 +- .../src/main/java/org/n52/svalbard/decode/SwesDecoderv20.java | 2 +- .../java/org/n52/svalbard/decode/SwesExtensionDecoderv20.java | 2 +- .../main/java/org/n52/svalbard/decode/SwesStringDecoderv20.java | 2 +- .../n52/svalbard/decode/TsmlObservationProcessDecoderv10.java | 2 +- .../org/n52/svalbard/decode/WmlMonitoringPointDecoderv20.java | 2 +- .../n52/svalbard/decode/WmlObservationProcessDecoderv20.java | 2 +- .../src/main/java/org/n52/svalbard/decode/WsaDecoder.java | 2 +- .../main/java/org/n52/svalbard/decode/XlinkDecoderv1999.java | 2 +- .../decode/exception/UnsupportedDecoderXmlInputException.java | 2 +- .../org/n52/svalbard/encode/AbstractAqdResponseEncoder.java | 2 +- .../encode/AbstractCVDiscretePointCoverageTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractCoverageEncoder.java | 2 +- .../svalbard/encode/AbstractEnvironmentalFaciltityEncoder.java | 2 +- .../encode/AbstractEnvironmentalMonitoringFaciltityEncoder.java | 2 +- .../n52/svalbard/encode/AbstractGWGeologyLogCoverageType.java | 2 +- .../java/org/n52/svalbard/encode/AbstractGmlEncoderv321.java | 2 +- .../org/n52/svalbard/encode/AbstractGroundWaterMLEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractIdentifierEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractIso19139GcoEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractLogValueTypeEncoder.java | 2 +- .../n52/svalbard/encode/AbstractMonitoringFeatureEncoder.java | 2 +- .../n52/svalbard/encode/AbstractMonitoringObjectEncoder.java | 2 +- .../svalbard/encode/AbstractMultiPointCoverageTypeEncoder.java | 2 +- .../n52/svalbard/encode/AbstractObservationResponseEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java | 2 +- .../java/org/n52/svalbard/encode/AbstractOmInspireEncoder.java | 2 +- .../encode/AbstractOperationalActivityPeriodEncoder.java | 2 +- .../encode/AbstractRectifiedGridCoverageTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractRequestEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractResponseEncoder.java | 2 +- .../svalbard/encode/AbstractReverencableGridCoverageType.java | 2 +- .../java/org/n52/svalbard/encode/AbstractSensorMLEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/AbstractSoapEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractSosRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractSosResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractSosV1RequestEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractSosV1ResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractSwesRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractSwesResponseEncoder.java | 2 +- .../encode/AbstractTimeLocationValueTripleTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractTsmlEncoderv10.java | 2 +- .../n52/svalbard/encode/AbstractVersionedResponseEncoder.java | 2 +- .../java/org/n52/svalbard/encode/AbstractWmlEncoderv20.java | 2 +- .../main/java/org/n52/svalbard/encode/AbstractXmlEncoder.java | 2 +- .../org/n52/svalbard/encode/AbstractXmlResponseEncoder.java | 2 +- .../n52/svalbard/encode/AqdDescribeSensorResponseEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/AqdEncoder.java | 2 +- .../n52/svalbard/encode/AqdGetCapabilitiesResponseEncoder.java | 2 +- .../n52/svalbard/encode/AqdGetObservationResponseEncoder.java | 2 +- .../encode/CVDiscretePointCoveragePropertyTypeEncoder.java | 2 +- .../svalbard/encode/CVDiscreteTimeInstantCoverageEncoder.java | 2 +- .../java/org/n52/svalbard/encode/DeleteObservationEncoder.java | 2 +- .../org/n52/svalbard/encode/DeleteObservationV20Encoder.java | 2 +- .../org/n52/svalbard/encode/DeleteResultTemplateEncoder.java | 2 +- .../org/n52/svalbard/encode/DeleteSensorResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/DescribeSensorResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/DescribeSensorV1RequestEncoder.java | 2 +- .../org/n52/svalbard/encode/DescribeSensorV2RequestEncoder.java | 2 +- .../org/n52/svalbard/encode/DocumentCitationTypeEncoder.java | 2 +- .../encode/EnvironmentalMonitoringFaciltityDocumentEncoder.java | 2 +- ...ntalMonitoringFaciltityForGmlFeaturePropertyTypeEncoder.java | 2 +- .../EnvironmentalMonitoringFaciltityPropertyTypeEncoder.java | 2 +- .../encode/EnvironmentalMonitoringFaciltityTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/ExtensibleRequestEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/FesEncoderv20.java | 2 +- .../encode/GWGeologyLogCoveragePropertyTypeEncoder.java | 2 +- .../n52/svalbard/encode/GWGeologyLogObservationTypeEncoder.java | 2 +- .../org/n52/svalbard/encode/GetCapabilitiesRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/GetCapabilitiesResponseEncoder.java | 2 +- .../n52/svalbard/encode/GetCapabilitiesV1RequestEncoder.java | 2 +- .../n52/svalbard/encode/GetDataAvailabilityRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/GetDataAvailabilityXmlEncoder.java | 2 +- .../n52/svalbard/encode/GetFeatureOfInterestRequestEncoder.java | 2 +- .../svalbard/encode/GetFeatureOfInterestResponseEncoder.java | 2 +- .../n52/svalbard/encode/GetObservationByIdRequestEncoder.java | 2 +- .../n52/svalbard/encode/GetObservationByIdResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/GetObservationRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/GetObservationResponseEncoder.java | 2 +- .../java/org/n52/svalbard/encode/GetResultResponseEncoder.java | 2 +- .../n52/svalbard/encode/GetResultTemplateResponseEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/GmlEncoderv311.java | 2 +- .../src/main/java/org/n52/svalbard/encode/GmlEncoderv321.java | 2 +- .../src/main/java/org/n52/svalbard/encode/GwmlEncoderv22.java | 2 +- .../org/n52/svalbard/encode/IdentifierPropertyTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/IdentifierTypeEncoder.java | 2 +- .../org/n52/svalbard/encode/InsertFeatureOfInterestEncoder.java | 2 +- .../n52/svalbard/encode/InsertObservationRequestEncoder.java | 2 +- .../n52/svalbard/encode/InsertObservationResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/InsertResultRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/InsertResultResponseEncoder.java | 2 +- .../n52/svalbard/encode/InsertResultTemplateRequestEncoder.java | 2 +- .../svalbard/encode/InsertResultTemplateResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/InsertSensorRequestEncoder.java | 2 +- .../org/n52/svalbard/encode/InsertSensorResponseEncoder.java | 2 +- .../org/n52/svalbard/encode/InspireOmObservationEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/InspireXmlEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/Iso19139GcoEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/Iso19139GmdEncoder.java | 2 +- .../org/n52/svalbard/encode/LogValuePropertyTypeEncoder.java | 2 +- .../n52/svalbard/encode/MultiPointCoverageDocumentEncoder.java | 2 +- .../n52/svalbard/encode/MultiPointObservationTypeEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/OmEncoderv100.java | 2 +- .../src/main/java/org/n52/svalbard/encode/OmEncoderv20.java | 2 +- .../svalbard/encode/OperationalActivityPeriodTypeEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/OwsEncoderv110.java | 2 +- .../org/n52/svalbard/encode/PointObservationTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/PointPropertyTypeEncoder.java | 2 +- .../svalbard/encode/PointTimeSeriesObservationTypeEncoder.java | 2 +- .../java/org/n52/svalbard/encode/ProcessDocumentEncoder.java | 2 +- .../org/n52/svalbard/encode/ProcessParameterTypeEncoder.java | 2 +- .../org/n52/svalbard/encode/ProcessPropertyTypeEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/ProcessTypeEncoder.java | 2 +- .../org/n52/svalbard/encode/ProfileObservationTypeEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/RdfEncoder.java | 2 +- .../svalbard/encode/RectifiedGridCoverageDocumentEncoder.java | 2 +- .../java/org/n52/svalbard/encode/RelatedOfferingsEncoder.java | 2 +- .../java/org/n52/svalbard/encode/RelatedPartyTypeEncoder.java | 2 +- .../encode/ReverencableGridCoverageDocumentEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/SamplingEncoderv100.java | 2 +- .../main/java/org/n52/svalbard/encode/SamplingEncoderv20.java | 2 +- .../main/java/org/n52/svalbard/encode/SensorMLEncoderv101.java | 2 +- .../main/java/org/n52/svalbard/encode/SensorMLEncoderv20.java | 2 +- .../src/main/java/org/n52/svalbard/encode/Soap11Encoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/Soap12Encoder.java | 2 +- .../n52/svalbard/encode/SosInsertionMetadataTypeEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/SosRequestEncoderv20.java | 2 +- .../n52/svalbard/encode/SosV1DescribeSensorResponseEncoder.java | 2 +- .../svalbard/encode/SosV1GetCapabilitiesResponseEncoder.java | 2 +- .../encode/SosV1GetFeatureOfInterestResponseEncoder.java | 2 +- .../svalbard/encode/SosV1GetObservationByIdResponseEncoder.java | 2 +- .../n52/svalbard/encode/SosV1GetObservationResponseEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/SpecimenEncoderv20.java | 2 +- .../main/java/org/n52/svalbard/encode/SweCommonEncoderv101.java | 2 +- .../main/java/org/n52/svalbard/encode/SweCommonEncoderv20.java | 2 +- .../java/org/n52/svalbard/encode/SwesExtensionEncoderv20.java | 2 +- .../n52/svalbard/encode/TimeLocationValueTripleTypeEncoder.java | 2 +- .../n52/svalbard/encode/TrajectoryObservationTypeEncoder.java | 2 +- .../main/java/org/n52/svalbard/encode/TsmlTDREncoderv10.java | 2 +- .../main/java/org/n52/svalbard/encode/TsmlTVPEncoderv10.java | 2 +- .../org/n52/svalbard/encode/UpdateSensorResponseEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/WmlTDREncoderv20.java | 2 +- .../src/main/java/org/n52/svalbard/encode/WmlTVPEncoderv20.java | 2 +- .../src/main/java/org/n52/svalbard/encode/WsaEncoder.java | 2 +- .../src/main/java/org/n52/svalbard/encode/WsdlEncoderv11.java | 2 +- .../main/java/org/n52/svalbard/encode/XlinkEncoderv1999.java | 2 +- .../encode/exception/UnsupportedEncoderXmlInputException.java | 2 +- .../xmlbeans/src/main/java/org/n52/svalbard/util/OwsHelper.java | 2 +- .../xmlbeans/src/main/java/org/n52/svalbard/util/W3cHelper.java | 2 +- .../xmlbeans/src/main/resources/svalbard-xmlbeans-context.xml | 2 +- .../src/test/java/org/n52/svalbard/XmlBeansGenerator.java | 2 +- .../decode/AbstractCapabilitiesBaseTypeDecoderTest.java | 2 +- .../org/n52/svalbard/decode/AbtractProcessDecodingTest.java | 2 +- .../test/java/org/n52/svalbard/decode/DeleteDecoderTest.java | 2 +- .../org/n52/svalbard/decode/DeleteObservationDecoderTest.java | 2 +- .../n52/svalbard/decode/DeleteObservationV20DecoderTest.java | 2 +- .../n52/svalbard/decode/DeleteResultTemplateDecoderTest.java | 2 +- .../decode/DescribeSensorResponseSwesDocumentDecoderTest.java | 2 +- .../test/java/org/n52/svalbard/decode/FesDecoderV20Test.java | 2 +- .../n52/svalbard/decode/GetCapabilitiesResponseDecoderTest.java | 2 +- .../org/n52/svalbard/decode/GetDataAvailabilityDecoderTest.java | 2 +- .../svalbard/decode/GetDataAvailabilityRequestDecoderTest.java | 2 +- .../svalbard/decode/GetDataAvailabilityResponseDecoderTest.java | 2 +- .../decode/GetFeatureOfInterestResponseDecoderTest.java | 2 +- .../test/java/org/n52/svalbard/decode/InsertDecoderTest.java | 2 +- .../decode/InsertObservationResponseV20DecoderTest.java | 2 +- .../n52/svalbard/decode/InsertResultResponseDecoderTest.java | 2 +- .../decode/InsertResultTemplateResponseDecoderTest.java | 2 +- .../n52/svalbard/decode/InsertSensorResponseDecoderTest.java | 2 +- .../test/java/org/n52/svalbard/decode/OgcDecoderv100Test.java | 2 +- .../src/test/java/org/n52/svalbard/decode/OmDecoderV20Test.java | 2 +- .../org/n52/svalbard/decode/ProcessDocumentDecoderTest.java | 2 +- .../java/org/n52/svalbard/decode/SensorMLDecoderV101Test.java | 2 +- .../java/org/n52/svalbard/decode/SensorMLDecoderV20Test.java | 2 +- .../test/java/org/n52/svalbard/decode/SosDecoderv20Test.java | 2 +- .../java/org/n52/svalbard/decode/SweCommonDecoderV101Test.java | 2 +- .../java/org/n52/svalbard/decode/SweCommonDecoderV20Test.java | 2 +- .../svalbard/decode/WmlObservationProcessDecoderv20Test.java | 2 +- .../src/test/java/org/n52/svalbard/decode/WsaDecoderTest.java | 2 +- .../AbstractEnvironmentalMonitoringFacilityEncoderTest.java | 2 +- .../test/java/org/n52/svalbard/encode/AbstractMetadataTest.java | 2 +- .../org/n52/svalbard/encode/AbstractSensorMLEncoderTest.java | 2 +- .../org/n52/svalbard/encode/AbstractSwesRequestEncoderTest.java | 2 +- .../java/org/n52/svalbard/encode/CompositeExceptionMatcher.java | 2 +- .../org/n52/svalbard/encode/DeleteObservationEncoderTest.java | 2 +- .../n52/svalbard/encode/DeleteObservationV20EncoderTest.java | 2 +- .../n52/svalbard/encode/DeleteResultTemplateEncoderTest.java | 2 +- .../n52/svalbard/encode/DeleteSensorResponseEncoderTest.java | 2 +- .../n52/svalbard/encode/DescribeSensorResponseEncoderTest.java | 2 +- .../n52/svalbard/encode/DescribeSensorV2RequestEncoderTest.java | 2 +- .../EnvironmentalMonitoringFacilityDocumentEncoderTest.java | 2 +- .../encode/EnvironmentalMonitoringFacilityTypeEncoderTest.java | 2 +- .../test/java/org/n52/svalbard/encode/FesEncoderv20Test.java | 2 +- .../encode/GWGeologyLogCoveragePropertyEncoderTest.java | 2 +- .../n52/svalbard/encode/GetCapabilitiesResponseEncoderTest.java | 2 +- .../n52/svalbard/encode/GetDataAvailabilityXmlEncoderTest.java | 2 +- .../encode/GetFeatureOfInterestXmlStreamWriterTest.java | 2 +- .../n52/svalbard/encode/GetObservationResponseEncoderTest.java | 2 +- .../encode/GetObservationResponseXmlStreamWriterTest.java | 2 +- .../test/java/org/n52/svalbard/encode/GmlV321EncoderTest.java | 2 +- .../svalbard/encode/InsertObservationRequestEncoderTest.java | 2 +- .../org/n52/svalbard/encode/InsertResultRequestEncoderTest.java | 2 +- .../svalbard/encode/InsertResultTemplateRequestEncoderTest.java | 2 +- .../org/n52/svalbard/encode/InsertSensorRequestEncoderTest.java | 2 +- .../n52/svalbard/encode/InsertSensorResponseEncoderTest.java | 2 +- .../test/java/org/n52/svalbard/encode/InspireEncoderTest.java | 2 +- .../java/org/n52/svalbard/encode/Iso19139GmdEncoderTest.java | 2 +- .../test/java/org/n52/svalbard/encode/OmEncoderv100Test.java | 2 +- .../src/test/java/org/n52/svalbard/encode/OmEncoderv20Test.java | 2 +- .../test/java/org/n52/svalbard/encode/OwsEncoderv110Test.java | 2 +- .../org/n52/svalbard/encode/ProcessDocumentEncoderTest.java | 2 +- .../encode/RectifiedGridCoverageDocumentEncoderTest.java | 2 +- .../java/org/n52/svalbard/encode/SamplingEncoderv20Test.java | 2 +- .../java/org/n52/svalbard/encode/SensorMLEncoderV101Test.java | 2 +- .../svalbard/encode/SosInsertionMetadataTypeEncoderTest.java | 2 +- .../java/org/n52/svalbard/encode/SweCommonEncoderv101Test.java | 2 +- .../java/org/n52/svalbard/encode/SweCommonEncoderv20Test.java | 2 +- .../org/n52/svalbard/encode/SwesExtensionEncoderv20Test.java | 2 +- .../org/n52/svalbard/encode/TestAbstractSensorMLEncoder.java | 2 +- .../svalbard/encode/TimeLocationValueTripleTypeEncoderTest.java | 2 +- .../svalbard/encode/TrajectoryObservationTypeEncoderTest.java | 2 +- .../java/org/n52/svalbard/encode/TsmlTVPEncoderv10Test.java | 2 +- .../n52/svalbard/encode/UpdateSensorResponseEncoderTest.java | 2 +- .../test/java/org/n52/svalbard/encode/WmlTVPEncoderv20Test.java | 2 +- svalbard/xmlbeans/src/test/resources/AggregateProcess-dwd.xml | 2 +- .../src/test/resources/DescribeSensorResponseSML101.xml | 2 +- svalbard/xmlbeans/src/test/resources/FesBeyond.xml | 2 +- svalbard/xmlbeans/src/test/resources/FesDWithin.xml | 2 +- svalbard/xmlbeans/src/test/resources/FesDisjoint.xml | 2 +- svalbard/xmlbeans/src/test/resources/FesOverlaps.xml | 2 +- svalbard/xmlbeans/src/test/resources/GDAResponseV1.xml | 2 +- svalbard/xmlbeans/src/test/resources/GDAResponseV2.xml | 2 +- .../src/test/resources/GetCapabilitiesResponseInspire.xml | 2 +- .../src/test/resources/GetFeatureOfInterestResponse.xml | 2 +- svalbard/xmlbeans/src/test/resources/GetFoiIrceline.xml | 2 +- svalbard/xmlbeans/src/test/resources/GetFoiWml.xml | 2 +- .../xmlbeans/src/test/resources/GetObsPropertyIsBetween.xml | 2 +- .../xmlbeans/src/test/resources/GetObsPropertyIsEqualTo.xml | 2 +- .../xmlbeans/src/test/resources/GetObsPropertyIsGreaterThan.xml | 2 +- .../src/test/resources/GetObsPropertyIsGreaterThanOrEqualTo.xml | 2 +- .../xmlbeans/src/test/resources/GetObsPropertyIsLessThan.xml | 2 +- .../src/test/resources/GetObsPropertyIsLessThanOrEqualTo.xml | 2 +- svalbard/xmlbeans/src/test/resources/GetObsPropertyIsLike.xml | 2 +- .../xmlbeans/src/test/resources/GetObsPropertyIsNotEqualTo.xml | 2 +- svalbard/xmlbeans/src/test/resources/GetObsPropertyIsNull.xml | 2 +- svalbard/xmlbeans/src/test/resources/SoapWsa.xml | 2 +- svalbard/xmlbeans/src/test/resources/SoapWsa11.xml | 2 +- svalbard/xmlbeans/src/test/resources/process.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- .../main/java/org/n52/svalbard/read/AbstractFeatureReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/AddressAreaReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/AddressReader.java | 2 +- .../java/org/n52/svalbard/read/AddressRepresentationReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/AdminUnitReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/ChoiceReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/CodeTypeReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/ContactReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/FreeTextReader.java | 2 +- .../main/java/org/n52/svalbard/read/GeographicalNameReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/InpireIDReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/ListReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/LocatorNameReader.java | 2 +- .../main/java/org/n52/svalbard/read/NillableCodeTypeReader.java | 2 +- .../main/java/org/n52/svalbard/read/NillableContactReader.java | 2 +- .../main/java/org/n52/svalbard/read/NillableFreeTextReader.java | 2 +- .../org/n52/svalbard/read/NillableGeographicalNameReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/NillableReader.java | 2 +- .../java/org/n52/svalbard/read/NillableReferenceReader.java | 2 +- .../main/java/org/n52/svalbard/read/NillableStringReader.java | 2 +- .../main/java/org/n52/svalbard/read/NillableSubtagReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/PostNameReader.java | 2 +- .../main/java/org/n52/svalbard/read/PronounciationReader.java | 2 +- .../java/org/n52/svalbard/read/PronunciationOfNameReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/ReferenceReader.java | 2 +- .../java/org/n52/svalbard/read/ReferenceableFeatureReader.java | 2 +- .../main/java/org/n52/svalbard/read/ReferenceableReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/RelatedPartyReader.java | 2 +- .../java/org/n52/svalbard/read/ReportingAuthorityReader.java | 2 +- .../main/java/org/n52/svalbard/read/ReportingHeaderReader.java | 2 +- .../main/java/org/n52/svalbard/read/ReportingPeriodReader.java | 2 +- .../main/java/org/n52/svalbard/read/SpellingOfNameReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/SpellingReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/StringReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/SubtagReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/ThoroughfareReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/TimeInstantReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/TimePeriodReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/TimeReader.java | 2 +- .../src/main/java/org/n52/svalbard/read/XmlReader.java | 2 +- .../svalbard/write/AbstractGetDataAvailabilityStreamWriter.java | 2 +- .../org/n52/svalbard/write/AbstractOmV20XmlStreamWriter.java | 2 +- .../org/n52/svalbard/write/AbstractSwesXmlStreamWriter.java | 2 +- .../write/AqdGetObservationResponseXmlStreamWriter.java | 2 +- .../java/org/n52/svalbard/write/EReportingHeaderEncoder.java | 2 +- .../org/n52/svalbard/write/GetDataAvailabilityStreamWriter.java | 2 +- .../n52/svalbard/write/GetDataAvailabilityV20StreamWriter.java | 2 +- .../n52/svalbard/write/GetFeatureOfInterestXmlStreamWriter.java | 2 +- .../svalbard/write/GetObservationResponseXmlStreamWriter.java | 2 +- .../java/org/n52/svalbard/write/GwmlV22XmlStreamWriter.java | 2 +- .../java/org/n52/svalbard/write/InspireXmlStreamWriter.java | 2 +- .../main/java/org/n52/svalbard/write/OmV20XmlStreamWriter.java | 2 +- .../write/PointTimeSeriesObservationXmlStreamWriter.java | 2 +- .../src/main/java/org/n52/svalbard/write/RdfStreamWriter.java | 2 +- .../org/n52/svalbard/write/RelatedOfferingXmlStreamWriter.java | 2 +- .../main/java/org/n52/svalbard/write/Soap12XmlStreamWriter.java | 2 +- .../n52/svalbard/write/TsmlTDREncoderv10XmlStreamWriter.java | 2 +- .../n52/svalbard/write/TsmlTVPEncoderv10XmlStreamWriter.java | 2 +- .../org/n52/svalbard/write/WmlTDREncoderv20XmlStreamWriter.java | 2 +- .../org/n52/svalbard/write/WmlTVPEncoderv20XmlStreamWriter.java | 2 +- .../java/org/n52/svalbard/write/Wsdlv11XmlStreamWriter.java | 2 +- .../src/main/java/org/n52/svalbard/write/XmlStreamWriter.java | 2 +- .../org/n52/svalbard/write/util/DelegatingXMLStreamWriter.java | 2 +- .../org/n52/svalbard/write/util/ExtendedXMLStreamWriter.java | 2 +- .../org/n52/svalbard/write/util/IndentingXMLStreamWriter.java | 2 +- .../xmlstream/src/main/resources/svalbard-xmlstream-context.xml | 2 +- .../src/test/java/org/n52/svalbard/XmlBeansGenerator.java | 2 +- .../java/org/n52/svalbard/read/GeographicalNameReaderTest.java | 2 +- .../org/n52/svalbard/write/EReportingHeaderEncoderTest.java | 2 +- .../org/n52/svalbard/write/IndentingXmlStreamWriterTest.java | 2 +- .../test/java/org/n52/svalbard/write/RdfStreamWriterTest.java | 2 +- .../n52/svalbard/write/RelatedOfferingXmlStreamWriterTest.java | 2 +- .../java/org/n52/svalbard/write/ReportingHeaderReaderTest.java | 2 +- .../java/org/n52/svalbard/write/Wsdlv11XmlStreanWriterTest.java | 2 +- 1908 files changed, 1908 insertions(+), 1908 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index dc4daa577..05f395554 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -1,7 +1,7 @@ From 7e953b808c2f02ca35de5a69d93e3680f97b59fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 04:01:52 +0000 Subject: [PATCH 252/456] Bump version.elastic from 7.17.0 to 7.17.1 Bumps `version.elastic` from 7.17.0 to 7.17.1. Updates `elasticsearch` from 7.17.0 to 7.17.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.0...v7.17.1) Updates `elasticsearch-rest-client` from 7.17.0 to 7.17.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.0...v7.17.1) Updates `elasticsearch-rest-high-level-client` from 7.17.0 to 7.17.1 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.0...v7.17.1) --- updated-dependencies: - dependency-name: org.elasticsearch:elasticsearch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 956f7bed0..ead9c4ae5 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 4.3.1 2.2 4.4.15 - 7.17.0 + 7.17.1 4.9.3 3.3.2 From 383aad1b35a2d403654fb00d41d1aaaf5c0db326 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 04:00:56 +0000 Subject: [PATCH 253/456] Bump version.jackson from 2.13.1 to 2.13.2 Bumps `version.jackson` from 2.13.1 to 2.13.2. Updates `jackson-core` from 2.13.1 to 2.13.2 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.13.1...jackson-core-2.13.2) Updates `jackson-annotations` from 2.13.1 to 2.13.2 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-databind` from 2.13.1 to 2.13.2 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-datatype-jdk8` from 2.13.1 to 2.13.2 --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f6211d98..e7be0cdca 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ 4.5.3 1.3.2 3.17.0 - 2.13.1 + 2.13.2 5.8.2 4.3.1 2.2 From 50a9e04884eef140f00e27e440ac6978277caa70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Mar 2022 04:00:54 +0000 Subject: [PATCH 254/456] Bump spotbugs-annotations from 4.5.3 to 4.6.0 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.5.3 to 4.6.0. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.5.3...4.6.0) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f6211d98..8175931c7 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 2.7.0 4.8.0 3.0.2 - 4.5.3 + 4.6.0 1.3.2 3.17.0 2.13.1 From 6b20b0f7c91758a665ec9c89901d2c51b4117221 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Mar 2022 04:01:38 +0000 Subject: [PATCH 255/456] Bump version.mockito from 4.3.1 to 4.4.0 Bumps `version.mockito` from 4.3.1 to 4.4.0. Updates `mockito-core` from 4.3.1 to 4.4.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.3.1...v4.4.0) Updates `mockito-junit-jupiter` from 4.3.1 to 4.4.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.3.1...v4.4.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f6211d98..a08bb5d36 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 3.17.0 2.13.1 5.8.2 - 4.3.1 + 4.4.0 2.2 4.4.15 7.17.1 From b6ce609488fc5c5340edbe5544689652fbf0c863 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Mar 2022 04:00:56 +0000 Subject: [PATCH 256/456] Bump version.olingo from 4.8.0 to 4.9.0 Bumps `version.olingo` from 4.8.0 to 4.9.0. Updates `odata-server-core` from 4.8.0 to 4.9.0 Updates `odata-commons-core` from 4.8.0 to 4.9.0 Updates `odata-server-api` from 4.8.0 to 4.9.0 Updates `odata-commons-api` from 4.8.0 to 4.9.0 --- updated-dependencies: - dependency-name: org.apache.olingo:odata-server-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.olingo:odata-commons-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.olingo:odata-server-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.olingo:odata-commons-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f6211d98..f0d833f82 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ 1.0.4 2.3.0 2.7.0 - 4.8.0 + 4.9.0 3.0.2 4.5.3 1.3.2 From 032a3caa3ce56f0e54d81554276e802031b1469f Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Mon, 14 Mar 2022 09:30:19 +0100 Subject: [PATCH 257/456] further spotbug fixes --- faroe/core/pom.xml | 4 ++++ .../java/org/n52/faroe/AbstractSettingDefinition.java | 8 ++++++-- .../src/main/java/org/n52/faroe/SettingsChangeEvent.java | 5 +++++ .../src/main/java/org/n52/faroe/SettingsFileWatcher.java | 3 +++ .../src/main/java/org/n52/faroe/SettingsServiceImpl.java | 3 +++ faroe/json/pom.xml | 4 ++++ .../src/main/java/org/n52/faroe/json/AbstractJsonDao.java | 3 +++ .../main/java/org/n52/faroe/json/JsonConfiguration.java | 4 ++++ pom.xml | 2 +- 9 files changed, 33 insertions(+), 3 deletions(-) diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 5d4d08932..bcc49b7c5 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -58,6 +58,10 @@ javax.inject javax.inject + + com.github.spotbugs + spotbugs-annotations + org.junit.jupiter junit-jupiter-api diff --git a/faroe/core/src/main/java/org/n52/faroe/AbstractSettingDefinition.java b/faroe/core/src/main/java/org/n52/faroe/AbstractSettingDefinition.java index 98d88f339..92fc093b3 100644 --- a/faroe/core/src/main/java/org/n52/faroe/AbstractSettingDefinition.java +++ b/faroe/core/src/main/java/org/n52/faroe/AbstractSettingDefinition.java @@ -17,6 +17,8 @@ import java.io.Serializable; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Generic implementation of SettingDefinition. * @@ -98,11 +100,13 @@ public AbstractSettingDefinition setOptional(boolean o) { } @Override + @SuppressFBWarnings({"EI_EXPOSE_REP"}) public SettingDefinitionGroup getGroup() { return group; } @Override + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public AbstractSettingDefinition setGroup(SettingDefinitionGroup g) { this.group = g; return this; @@ -149,8 +153,8 @@ public boolean equals(Object obj) { (getGroup() == null ? o.getGroup() == null : getGroup().equals(o.getGroup())) && (getDefaultValue() == null ? o.getDefaultValue() == null : getDefaultValue().equals(o .getDefaultValue())) && - (getType() == o.getType()) && - (isOptional() == o.isOptional()); + getType() == o.getType() && + isOptional() == o.isOptional(); } return false; } diff --git a/faroe/core/src/main/java/org/n52/faroe/SettingsChangeEvent.java b/faroe/core/src/main/java/org/n52/faroe/SettingsChangeEvent.java index 7be75e9ed..afdc796ea 100644 --- a/faroe/core/src/main/java/org/n52/faroe/SettingsChangeEvent.java +++ b/faroe/core/src/main/java/org/n52/faroe/SettingsChangeEvent.java @@ -17,6 +17,8 @@ import org.n52.janmayen.event.Event; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * This event is fired if the {@link SettingValue} of a {@link SettingDefinition} has been changed or a * {@link SettingDefinition} was deleted. @@ -32,6 +34,7 @@ public class SettingsChangeEvent implements Event { private final SettingValue oldValue; private final SettingValue newValue; + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public SettingsChangeEvent(SettingDefinition setting, SettingValue oldValue, SettingValue newValue) { this.setting = setting; this.oldValue = oldValue; @@ -42,10 +45,12 @@ public SettingDefinition getSetting() { return setting; } + @SuppressFBWarnings({"EI_EXPOSE_REP"}) public SettingValue getOldValue() { return oldValue; } + @SuppressFBWarnings({"EI_EXPOSE_REP"}) public SettingValue getNewValue() { return newValue; } diff --git a/faroe/core/src/main/java/org/n52/faroe/SettingsFileWatcher.java b/faroe/core/src/main/java/org/n52/faroe/SettingsFileWatcher.java index 6c301c0d2..1b148b478 100644 --- a/faroe/core/src/main/java/org/n52/faroe/SettingsFileWatcher.java +++ b/faroe/core/src/main/java/org/n52/faroe/SettingsFileWatcher.java @@ -37,6 +37,8 @@ import com.google.common.base.MoreObjects; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * http://andreinc.net/2013/12/06/java-7-nio-2-tutorial-writing-a-simple-filefolder-monitor-using-the-watch-service-api/ * https://docs.oracle.com/javase/tutorial/essential/io/notification.html @@ -74,6 +76,7 @@ public SettingsFileWatcher() { } @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setSettingsService(SettingsService settingsService) { this.settingsService = settingsService; } diff --git a/faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java b/faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java index ef3975c1e..7763101cb 100644 --- a/faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java +++ b/faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java @@ -39,6 +39,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.n52.faroe.annotation.Configurable; import org.n52.faroe.annotation.Setting; import org.n52.janmayen.event.EventBus; @@ -80,6 +82,7 @@ public void setSettingValueFactory(SettingValueFactory settingValueFactory) { } @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setSettingsManagerDao(SettingsDao settingsManagerDao) { this.settingsManagerDao = settingsManagerDao; } diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 672479f07..9895f3fa2 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -59,6 +59,10 @@ javax.inject javax.inject + + com.github.spotbugs + spotbugs-annotations + org.junit.jupiter junit-jupiter-api diff --git a/faroe/json/src/main/java/org/n52/faroe/json/AbstractJsonDao.java b/faroe/json/src/main/java/org/n52/faroe/json/AbstractJsonDao.java index 7e69af37b..6199d1e0c 100644 --- a/faroe/json/src/main/java/org/n52/faroe/json/AbstractJsonDao.java +++ b/faroe/json/src/main/java/org/n52/faroe/json/AbstractJsonDao.java @@ -30,6 +30,8 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -41,6 +43,7 @@ public abstract class AbstractJsonDao { private JsonConfiguration configuration; @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setConfiguration(JsonConfiguration configuration) { this.configuration = configuration; } diff --git a/faroe/json/src/main/java/org/n52/faroe/json/JsonConfiguration.java b/faroe/json/src/main/java/org/n52/faroe/json/JsonConfiguration.java index 8c9f644f3..d728f51a3 100644 --- a/faroe/json/src/main/java/org/n52/faroe/json/JsonConfiguration.java +++ b/faroe/json/src/main/java/org/n52/faroe/json/JsonConfiguration.java @@ -43,6 +43,8 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class to encapsulate writes and reads to a JSON file. * @@ -150,6 +152,7 @@ public void delete() { * @return the node (never {@code null}) */ @Override + @SuppressFBWarnings({"EI_EXPOSE_REP"}) public ObjectNode get() { return this.configuration; } @@ -159,6 +162,7 @@ public ObjectNode get() { * * @param configuration the configuration */ + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void set(ObjectNode configuration) { this.configuration = configuration; } diff --git a/pom.xml b/pom.xml index 839543903..c9118d800 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.n52 parent - 22 + 23-SNAPSHOT org.n52.arctic-sea From 143c154da1a504d4de5355ec7b187ef763794388 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Mar 2022 04:00:56 +0000 Subject: [PATCH 258/456] Bump version.spring from 5.3.16 to 5.3.17 Bumps `version.spring` from 5.3.16 to 5.3.17. Updates `spring-test` from 5.3.16 to 5.3.17 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.16...v5.3.17) Updates `spring-web` from 5.3.16 to 5.3.17 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.16...v5.3.17) Updates `spring-beans` from 5.3.16 to 5.3.17 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.16...v5.3.17) Updates `spring-core` from 5.3.16 to 5.3.17 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.16...v5.3.17) Updates `spring-context` from 5.3.16 to 5.3.17 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.16...v5.3.17) Updates `spring-context-support` from 5.3.16 to 5.3.17 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.16...v5.3.17) --- updated-dependencies: - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5fd2e917d..7da1f5a79 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.3.16 + 5.3.17 1.7.36 3.1.0 1.0.4 From 140efc53e536e281c9ef1f94e04b529afdc48295 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Mar 2022 04:01:46 +0000 Subject: [PATCH 259/456] Bump joda-time from 2.10.13 to 2.10.14 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.13 to 2.10.14. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.13...v2.10.14) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5fd2e917d..bf22ac30f 100644 --- a/pom.xml +++ b/pom.xml @@ -317,7 +317,7 @@ joda-time joda-time - 2.10.13 + 2.10.14 org.locationtech.jts From 01092e84eb89f025f9ddf725d59996725d75bd34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 04:02:17 +0000 Subject: [PATCH 260/456] Bump Saxon-HE from 11.2 to 11.3 Bumps Saxon-HE from 11.2 to 11.3. --- updated-dependencies: - dependency-name: net.sf.saxon:Saxon-HE dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5fd2e917d..5557880c4 100644 --- a/pom.xml +++ b/pom.xml @@ -556,7 +556,7 @@ net.sf.saxon Saxon-HE - 11.2 + 11.3 From 33c0fe8042c4eb2ecc4c686031fa52002becefa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 18:42:32 +0000 Subject: [PATCH 261/456] Bump spring-beans from 5.3.16 to 5.3.18 Bumps [spring-beans](https://github.com/spring-projects/spring-framework) from 5.3.16 to 5.3.18. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.16...v5.3.18) --- updated-dependencies: - dependency-name: org.springframework:spring-beans dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5fd2e917d..659705cb1 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.3.16 + 5.3.18 1.7.36 3.1.0 1.0.4 From 9e10c64c428d4b9da22263370e205cbecec9ed54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 20:05:42 +0000 Subject: [PATCH 262/456] Bump spring-core from 5.3.16 to 5.3.18 Bumps [spring-core](https://github.com/spring-projects/spring-framework) from 5.3.16 to 5.3.18. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.16...v5.3.18) --- updated-dependencies: - dependency-name: org.springframework:spring-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5fd2e917d..659705cb1 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.3.16 + 5.3.18 1.7.36 3.1.0 1.0.4 From 458171f63300aa59e0aaa8afc62b6d33f6f51fdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 11:08:16 +0000 Subject: [PATCH 263/456] Bump kotlin-stdlib from 1.6.10 to 1.6.20 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.6.10 to 1.6.20. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.6.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.6.10...v1.6.20) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40b5ea283..d8ecd9238 100644 --- a/pom.xml +++ b/pom.xml @@ -1078,7 +1078,7 @@ org.jetbrains.kotlin kotlin-stdlib - 1.6.10 + 1.6.20 runtime From 6fcf8e3af993c0ad49e3da4f55a2e088e2aaf2b8 Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Fri, 8 Apr 2022 12:25:49 +0200 Subject: [PATCH 264/456] Bump jackson-bom from 2.13.2 to 2.13.2.20220328 and use bom --- pom.xml | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index d8ecd9238..c8132a3ed 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ 4.6.0 1.3.2 3.17.0 - 2.13.2 + 2.13.2.20220328 5.8.2 4.4.0 2.2 @@ -718,24 +718,11 @@ - com.fasterxml.jackson.core - jackson-core - ${version.jackson} - - - com.fasterxml.jackson.core - jackson-annotations - ${version.jackson} - - - com.fasterxml.jackson.core - jackson-databind - ${version.jackson} - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 + com.fasterxml.jackson + jackson-bom ${version.jackson} + import + pom com.github.fge From f1bc96ab9ae8146f34a1aa726bfe28742e5a5ac3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Apr 2022 05:09:12 +0000 Subject: [PATCH 265/456] Bump istack-commons-runtime from 4.0.1 to 4.1.1 Bumps istack-commons-runtime from 4.0.1 to 4.1.1. --- updated-dependencies: - dependency-name: com.sun.istack:istack-commons-runtime dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8132a3ed..7ceb0c17e 100644 --- a/pom.xml +++ b/pom.xml @@ -1178,7 +1178,7 @@ com.sun.istack istack-commons-runtime - 4.0.1 + 4.1.1 runtime From ebc8b63a009827cc11352ca8dd4e4775b30cecb2 Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Tue, 12 Apr 2022 16:13:11 +0200 Subject: [PATCH 266/456] Add insert featureofinterest request encoder --- ...InsertFeatureOfInterestRequestEncoder.java | 108 ++++++++++++++++++ .../resources/svalbard-xmlbeans-context.xml | 1 + 2 files changed, 109 insertions(+) create mode 100644 svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InsertFeatureOfInterestRequestEncoder.java diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InsertFeatureOfInterestRequestEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InsertFeatureOfInterestRequestEncoder.java new file mode 100644 index 000000000..b11762c0b --- /dev/null +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InsertFeatureOfInterestRequestEncoder.java @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2015-2022 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.svalbard.encode; + +import java.util.Set; + +import org.apache.xmlbeans.XmlObject; +import org.n52.shetland.ogc.gml.AbstractFeature; +import org.n52.shetland.ogc.gml.GmlConstants; +import org.n52.shetland.ogc.om.features.FeatureCollection; +import org.n52.shetland.ogc.om.features.samplingFeatures.AbstractSamplingFeature; +import org.n52.shetland.ogc.ows.extension.Extension; +import org.n52.shetland.ogc.ows.extension.Extensions; +import org.n52.shetland.ogc.sos.Sos2Constants; +import org.n52.shetland.ogc.sos.SosConstants; +import org.n52.shetland.ogc.sos.ifoi.InsertFeatureOfInterestConstants; +import org.n52.shetland.ogc.sos.ifoi.InsertFeatureOfInterestRequest; +import org.n52.shetland.ogc.swes.SwesConstants; +import org.n52.shetland.w3c.SchemaLocation; +import org.n52.svalbard.encode.exception.EncodingException; +import org.n52.svalbard.encode.exception.UnsupportedEncoderInputException; +import org.n52.svalbard.util.XmlHelper; + +import com.google.common.collect.Sets; + +import net.opengis.ifoi.x10.InsertFeatureOfInterestDocument; +import net.opengis.ifoi.x10.InsertFeatureOfInterestType; + +/** + * @since 1.0.0 + */ +public class InsertFeatureOfInterestRequestEncoder extends AbstractRequestEncoder { + public static final SchemaLocation SCHEMA_LOCATION = new SchemaLocation(InsertFeatureOfInterestConstants.NS_IFOI, + InsertFeatureOfInterestConstants.SCHEMA_LOCATION_URL_INSERT_FEATURE_OF_INTEREST); + + public InsertFeatureOfInterestRequestEncoder() { + super(SosConstants.SOS, Sos2Constants.SERVICEVERSION, InsertFeatureOfInterestConstants.OPERATION_NAME, + InsertFeatureOfInterestConstants.NS_IFOI, InsertFeatureOfInterestConstants.NS_IFOI_PREFIX, + InsertFeatureOfInterestRequest.class); + } + + @Override + protected XmlObject create(InsertFeatureOfInterestRequest request) throws EncodingException { + if (request == null) { + throw new UnsupportedEncoderInputException(this, InsertFeatureOfInterestRequest.class); + } + InsertFeatureOfInterestDocument doc = InsertFeatureOfInterestDocument.Factory.newInstance(getXmlOptions()); + InsertFeatureOfInterestType insertFeatureOfInterestType = doc.addNewInsertFeatureOfInterest(); + insertFeatureOfInterestType.setService(request.getService()); + insertFeatureOfInterestType.setVersion(request.getVersion()); + addExtensions(request.getExtensions(), insertFeatureOfInterestType); + for (AbstractFeature feature : request.getFeatureMembers()) { + if (feature instanceof FeatureCollection) { + for (AbstractFeature f : (FeatureCollection) feature) { + addFeatureOfInterest(f, insertFeatureOfInterestType); + } + } else if (feature instanceof AbstractSamplingFeature) { + addFeatureOfInterest(feature, insertFeatureOfInterestType); + } + } + XmlHelper.makeGmlIdsUnique(doc.getDomNode()); + return doc; + } + + private void addFeatureOfInterest(AbstractFeature feature, InsertFeatureOfInterestType insertFeatureOfInterestType) + throws EncodingException { + EncodingContext codingContext = EncodingContext.empty(); + XmlObject encodeObjectToXml = encodeGml(codingContext, feature); + insertFeatureOfInterestType.addNewFeatureMember().set(encodeObjectToXml); + } + + private void addExtensions(Extensions extensions, InsertFeatureOfInterestType insertFeatureOfInterestType) + throws EncodingException { + if (extensions == null || extensions.isEmpty()) { + return; + } + for (Extension o : extensions.getExtensions()) { + insertFeatureOfInterestType.addNewExtension().set(encodeObjectToXml(SwesConstants.NS_SWES_20, o)); + } + } + + private XmlObject encodeGml(EncodingContext context, Object o) throws EncodingException { + return encodeObjectToXml(GmlConstants.NS_GML_32, o, context); + } + + @Override + public Set getSchemaLocations() { + return Sets.newHashSet(SCHEMA_LOCATION); + } + + @Override + protected Set getConcreteSchemaLocations() { + return Sets.newHashSet(); + } +} diff --git a/svalbard/xmlbeans/src/main/resources/svalbard-xmlbeans-context.xml b/svalbard/xmlbeans/src/main/resources/svalbard-xmlbeans-context.xml index bf789cb1a..028449910 100644 --- a/svalbard/xmlbeans/src/main/resources/svalbard-xmlbeans-context.xml +++ b/svalbard/xmlbeans/src/main/resources/svalbard-xmlbeans-context.xml @@ -133,6 +133,7 @@ + From 9efbf4b7c405a7ae5b2ffe88864fa9bd65212573 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 04:01:00 +0000 Subject: [PATCH 267/456] Bump version.spring from 5.3.18 to 5.3.19 Bumps `version.spring` from 5.3.18 to 5.3.19. Updates `spring-test` from 5.3.18 to 5.3.19 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.18...v5.3.19) Updates `spring-web` from 5.3.18 to 5.3.19 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.18...v5.3.19) Updates `spring-beans` from 5.3.18 to 5.3.19 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.18...v5.3.19) Updates `spring-core` from 5.3.18 to 5.3.19 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.18...v5.3.19) Updates `spring-context` from 5.3.18 to 5.3.19 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.18...v5.3.19) Updates `spring-context-support` from 5.3.18 to 5.3.19 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.18...v5.3.19) --- updated-dependencies: - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7ceb0c17e..294565391 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ ${maven.build.timestamp} - 5.3.18 + 5.3.19 1.7.36 3.1.0 1.0.4 From 13687316e04a802ef705ac5b6350383ab71fa726 Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Thu, 14 Apr 2022 10:56:41 +0200 Subject: [PATCH 268/456] change log level from debug to trace in createGeometryFormWKT --- .../core/src/main/java/org/n52/shetland/util/JTSHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shetland/core/src/main/java/org/n52/shetland/util/JTSHelper.java b/shetland/core/src/main/java/org/n52/shetland/util/JTSHelper.java index 902678e4b..ef72562ee 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/JTSHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/JTSHelper.java @@ -77,7 +77,7 @@ protected JTSHelper() { */ public static Geometry createGeometryFromWKT(String wkt, int srid) throws ParseException { WKTReader wktReader = getWKTReaderForSRID(srid); - LOGGER.debug("FOI Geometry: {}", wkt); + LOGGER.trace("FOI Geometry: {}", wkt); return wktReader.read(wkt); } From e065612fc0efb08b38a6db12e487b5617dc8cf21 Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Thu, 14 Apr 2022 14:07:37 +0200 Subject: [PATCH 269/456] some further fixes --- NOTICE | 1 + .../org/n52/bjornoya/schedule/JobFactory.java | 15 +- .../n52/bjornoya/schedule/ScheduledJob.java | 4 + .../org/n52/bjornoya/schedule/Scheduler.java | 13 +- .../org/n52/faroe/SettingsServiceImpl.java | 138 +++++----- .../n52/iceland/binding/SimpleBinding.java | 8 + .../n52/iceland/binding/exi/EXIBinding.java | 3 + .../n52/iceland/binding/soap/SoapBinding.java | 51 ++-- .../n52/iceland/cache/ContentCacheUpdate.java | 5 + .../ctrl/ContentCacheControllerImpl.java | 5 + .../coding/SupportedTypeRepository.java | 3 + .../SupportedTypeRepositoryInitializer.java | 3 + .../coding/encode/AbstractResponseWriter.java | 3 + .../iceland/coding/encode/ResponseProxy.java | 3 + .../n52/iceland/config/ActivationService.java | 3 + .../iceland/config/AdminUserServiceImpl.java | 3 + .../spring/ConfiguringBeanPostProcessor.java | 3 + .../spring/SettingsBeanPostProcessor.java | 3 + .../iceland/event/events/ExceptionEvent.java | 4 + .../events/ModificationResponseEvent.java | 4 + .../event/events/OutgoingResponseEvent.java | 4 + .../iceland/event/events/RequestEvent.java | 4 + .../iceland/event/events/ResponseEvent.java | 4 + .../ows/OwsServiceMetadataRepositoryImpl.java | 3 + .../AbstractGetCapabilitiesHandler.java | 3 + .../handler/AbstractOperationHandler.java | 4 + .../operator/GenericRequestOperator.java | 4 + .../response/EXIResponseWriterFactory.java | 3 + .../response/JSONResponseWriterFactory.java | 3 + .../n52/iceland/response/ServiceResponse.java | 3 + .../SoapChainResponseWriterFactory.java | 3 + .../response/XmlResponseWriterFactory.java | 3 + .../operator/GenericServiceOperator.java | 3 + .../iceland/util/PropertyFileHandlerImpl.java | 2 +- .../org/n52/iceland/util/XmlFactories.java | 6 + iceland/statistics/core/pom.xml | 1 + .../statistics/api/ElasticsearchSettings.java | 3 +- .../api/parameters/AbstractEsParameter.java | 5 + .../parameters/ElasticsearchTypeRegistry.java | 4 + .../api/parameters/ObjectEsParameter.java | 3 +- .../statistics/api/utils/KibanaImporter.java | 3 + .../api/utils/dto/KibanaConfigHolderDto.java | 5 +- ...bstractStatisticsServiceEventListener.java | 3 +- .../impl/ElasticsearchAdminHandler.java | 3 + .../CountingOutputStreamEventHandler.java | 4 +- .../handlers/DefaultServiceEventHandler.java | 3 +- .../OutgoingResponseEventHandler.java | 4 +- .../CodedExceptionEventHandler.java | 3 +- .../exceptions/OwsExceptionEventHandler.java | 3 +- .../CountingOutputStreamEventResolver.java | 13 +- .../DefaultServiceEventResolver.java | 11 +- .../resolvers/ExceptionEventResolver.java | 8 +- .../OutgoingResponseEventResolver.java | 8 +- .../DefaultElasticsearchSchemas.java | 6 +- .../generator/formats/MdFormat.java | 10 +- pom.xml | 16 +- .../rdf/AbstractTitleDescription.java | 4 +- .../main/java/org/n52/shetland/rdf/RDF.java | 2 +- .../org/n52/shetland/rdf/dcat/Catalog.java | 18 +- .../n52/shetland/rdf/dcat/ContactPoint.java | 2 +- .../org/n52/shetland/rdf/dcat/Dataset.java | 32 ++- .../n52/shetland/rdf/dcat/Distribution.java | 10 +- .../rdf/dcat/DistributionProperty.java | 4 + .../org/n52/shetland/rdf/dct/Location.java | 2 +- .../org/n52/shetland/rdf/dct/Spatial.java | 2 +- .../n52/shetland/rdf/foaf/Organization.java | 6 + .../rdf/vcard4/VCardOrganization.java | 8 + .../decode/AbstractDelegatingDecoder.java | 4 + .../encode/AbstractDelegatingEncoder.java | 4 + .../n52/svalbard/encode/SchemaRepository.java | 3 + .../org/n52/svalbard/encode/UVFEncoder.java | 3 +- .../java/org/n52/svalbard/util/SweHelper.java | 7 +- .../n52/svalbard/util/XmlOptionsHelper.java | 4 + svalbard/exi/pom.xml | 2 + svalbard/json-common/pom.xml | 1 + svalbard/json/pom.xml | 3 + .../svalbard/encode/json/GeoJSONEncoder.java | 16 +- .../GetResultTemplateResponseEncoder.java | 3 + svalbard/odata/pom.xml | 6 +- .../odata/core/expr/MethodCallExpr.java | 3 + .../svalbard/decode/AbstractSoapDecoder.java | 3 + .../decode/AbstractStringRequestDecoder.java | 3 + .../n52/svalbard/decode/AqdDecoderv10.java | 3 + ...ribeSensorResponseSwesDocumentDecoder.java | 3 +- .../svalbard/decode/SweCommonDecoderV101.java | 10 +- .../encode/AbstractGmlEncoderv321.java | 4 +- .../encode/AbstractXmlResponseEncoder.java | 4 + .../n52/svalbard/encode/OmEncoderv100.java | 4 +- .../org/n52/svalbard/encode/OmEncoderv20.java | 2 + .../svalbard/encode/SweCommonEncoderv20.java | 248 ++++++------------ .../svalbard/encode/TsmlTDREncoderv10.java | 147 +++++------ .../n52/svalbard/encode/WmlTDREncoderv20.java | 116 ++++---- svalbard/xmlstream/pom.xml | 1 + .../org/n52/svalbard/read/ChoiceReader.java | 3 + .../n52/svalbard/write/XmlStreamWriter.java | 3 + .../write/util/DelegatingXMLStreamWriter.java | 7 +- 96 files changed, 673 insertions(+), 483 deletions(-) diff --git a/NOTICE b/NOTICE index 11e9813fc..e70397b48 100644 --- a/NOTICE +++ b/NOTICE @@ -143,6 +143,7 @@ This project includes: Netty/Common under Apache License, Version 2.0 Netty/Handler under Apache License, Version 2.0 Netty/Resolver under Apache License, Version 2.0 + Netty/TomcatNative [OpenSSL - Classes] under The Apache Software License, Version 2.0 Netty/Transport under Apache License, Version 2.0 null under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0 OASIS WS-N specification schemas - including WS-BrokeredNotification (v1.3) under The Apache Software License, Version 2.0 diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java index 1cbf2cc24..adcb60c25 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java @@ -18,6 +18,7 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Optional; import java.util.Set; @@ -35,6 +36,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + @Configurable public class JobFactory implements Constructable { @@ -58,6 +61,7 @@ public class JobFactory implements Constructable { private boolean initialized; @Inject + @SuppressFBWarnings("EI_EXPOSE_REP2") public void setScheduler(Scheduler scheduler) { this.scheduler = scheduler; } @@ -71,7 +75,7 @@ public void setScheduledJobs(Optional> scheduledJobs) { } public List getScheduledJobs() { - return scheduledJobs; + return new LinkedList<>(scheduledJobs); } /** @@ -129,7 +133,7 @@ private void reschedule() { } private void reschedule(boolean update) { - if ((!initialized && !update) || (initialized && update)) { + if (!initialized && !update || initialized && update) { for (ScheduledJob job : getScheduledJobs()) { if (jobs.contains(job.getJobName())) { boolean updateJob = false; @@ -159,9 +163,8 @@ private void reschedule(boolean update) { } private boolean checkCronExpression(ScheduledJob job, String cronExpression) { - if (job.getCronExpression() == null || (job.getCronExpression() != null && !job.getCronExpression() - .isEmpty() && !job.getCronExpression() - .equals(cronExpression))) { + if (job.getCronExpression() == null || job.getCronExpression() != null && !job.getCronExpression().isEmpty() + && !job.getCronExpression().equals(cronExpression)) { job.setCronExpression(cronExpression); return true; } @@ -174,7 +177,7 @@ private void validate(String cronExpression) { } catch (ParseException e) { throw new ConfigurationError(String.format( "%s is invalid! Please check http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials" - + "/tutorial-lesson-06.html", + + "/tutorial-lesson-06.html", cronExpression)); } } diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java index 8c2312b20..82660bfc1 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java @@ -24,6 +24,8 @@ import org.quartz.TriggerBuilder; import org.springframework.scheduling.quartz.QuartzJobBean; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public abstract class ScheduledJob extends QuartzJobBean { private boolean enabled = true; @@ -123,10 +125,12 @@ public void setModified(boolean modified) { this.modified = modified; } + @SuppressFBWarnings("EI_EXPOSE_REP") public DateTime getStartUpDelay() { return startUpDelay; } + @SuppressFBWarnings("EI_EXPOSE_REP2") public void setStartUpDelay(DateTime startUpDelay) { this.startUpDelay = startUpDelay; } diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/Scheduler.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/Scheduler.java index f06114ec9..a2119d62a 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/Scheduler.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/Scheduler.java @@ -26,6 +26,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class Scheduler implements Destroyable { private static final Logger LOGGER = LoggerFactory.getLogger(Scheduler.class); @@ -38,8 +40,7 @@ public class Scheduler implements Destroyable { public void init() { if (!enabled) { - LOGGER.debug( - "Job schedular disabled. No jobs will be triggered. " + LOGGER.debug("Job schedular disabled. No jobs will be triggered. " + "This is also true for particularly enabled jobs."); return; } @@ -69,10 +70,8 @@ public void scheduleJob(ScheduledJob taskToSchedule) { LOGGER.debug("Schedule job '{}' will be executed at '{}'!", details.getKey(), new DateTime(nextExecution)); if (taskToSchedule.isTriggerAtStartup() || taskToSchedule instanceof FullHarvesterJob) { LOGGER.debug("Schedule job '{}' to run once at startup.", details.getKey()); - Trigger onceAtStartup = TriggerBuilder.newTrigger() - .withIdentity(details.getKey() + "_onceAtStartup") - .forJob(details.getKey()) - .build(); + Trigger onceAtStartup = TriggerBuilder.newTrigger().withIdentity(details.getKey() + "_onceAtStartup") + .forJob(details.getKey()).build(); Date startupExecution = scheduler.scheduleJob(onceAtStartup); LOGGER.debug("Schedule job '{}' will be executed on startup at '{}'!", details.getKey(), new DateTime(startupExecution)); @@ -107,10 +106,12 @@ public void setStartupDelayInSeconds(int startupDelayInSeconds) { this.startupDelayInSeconds = startupDelayInSeconds; } + @SuppressFBWarnings("EI_EXPOSE_REP") public org.quartz.Scheduler getScheduler() { return scheduler; } + @SuppressFBWarnings("EI_EXPOSE_REP2") public void setScheduler(org.quartz.Scheduler scheduler) { this.scheduler = scheduler; } diff --git a/faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java b/faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java index 7763101cb..eb4a676fb 100644 --- a/faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java +++ b/faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java @@ -47,11 +47,11 @@ import org.n52.janmayen.function.Functions; /** - * Class to handle the settings and configuration of the service. Allows other classes to change, delete, and declare - * settings and to create, modify and delete administrator users. Classes can subscribe to specific settings using the - * {@code Configurable} and {@code Setting} annotations. To be recognized by the SettingsManager - * {@link #configure(java.lang.Object)} has to be called for every object that wants to receive settings. All other - * classes have to call {@code configure(java.lang.Object)} manually. + * Class to handle the settings and configuration of the service. Allows other classes to change, delete, and + * declare settings and to create, modify and delete administrator users. Classes can subscribe to specific + * settings using the {@code Configurable} and {@code Setting} annotations. To be recognized by the + * SettingsManager {@link #configure(java.lang.Object)} has to be called for every object that wants to + * receive settings. All other classes have to call {@code configure(java.lang.Object)} manually. * * * @see SettingDefinition @@ -72,6 +72,7 @@ public class SettingsServiceImpl implements SettingsService { private EventBus serviceEventBus; @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setServiceEventBus(EventBus serviceEventBus) { this.serviceEventBus = serviceEventBus; } @@ -82,7 +83,7 @@ public void setSettingValueFactory(SettingValueFactory settingValueFactory) { } @Inject - @SuppressFBWarnings({"EI_EXPOSE_REP2"}) + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setSettingsManagerDao(SettingsDao settingsManagerDao) { this.settingsManagerDao = settingsManagerDao; } @@ -125,18 +126,20 @@ public Set> getSettingDefinitions() { return Collections.unmodifiableSet(this.definitions); } - @Override public void configureOnce(Object object) throws ConfigurationError { configure(object, false); } /** - * Configure {@code o} with the required settings. All changes to a setting required by the object will be applied. + * Configure {@code o} with the required settings. All changes to a setting required by the object will be + * applied. * - * @param object the object to configure + * @param object + * the object to configure * - * @throws ConfigurationError if there is a problem configuring the object + * @throws ConfigurationError + * if there is a problem configuring the object * @see Configurable * @see Setting */ @@ -145,7 +148,6 @@ public void configure(Object object) throws ConfigurationError { configure(object, true); } - private void configure(Object object, boolean persist) throws ConfigurationError { Class clazz = object.getClass(); if (clazz.getAnnotation(Configurable.class) == null) { @@ -164,8 +166,8 @@ private void configure(Object object, boolean persist) throws ConfigurationError throw new ConfigurationError(String.format( "Method %s annotated with @Setting in %s has a invalid method signature", method, clazz)); } else if (!Modifier.isPublic(method.getModifiers())) { - throw new ConfigurationError(String.format( - "Non-public method %s annotated with @Setting in %s", method, clazz)); + throw new ConfigurationError( + String.format("Non-public method %s annotated with @Setting in %s", method, clazz)); } else { configure(new ConfigurableObject(method, object, key, s.required()), persist); } @@ -193,7 +195,8 @@ private void configure(ConfigurableObject co, boolean persist) { /** * Get the definition that is defined with the specified key. * - * @param key the key + * @param key + * the key * * @return the definition or {@code null} if there is no definition for the key */ @@ -205,8 +208,10 @@ public SettingDefinition getDefinitionByKey(String key) { /** * Gets the value of the setting defined by {@code key}. * - * @param the type of the setting and value - * @param key the definition of the setting + * @param + * the type of the setting and value + * @param key + * the definition of the setting * * @return the value of the setting */ @@ -219,8 +224,10 @@ public SettingValue getSetting(SettingDefinition key) { /** * Gets the value of the setting defined by {@code key}. * - * @param the type of the setting and value - * @param key the id of the setting + * @param + * the type of the setting and value + * @param key + * the id of the setting * * @return the value of the setting */ @@ -235,7 +242,8 @@ public SettingValue getSetting(String key) { } /** - * Gets all values for all definitions. If there is no value for a definition {@code null} is added to the map. + * Gets all values for all definitions. If there is no value for a definition {@code null} is added to the + * map. * * @return all values by definition */ @@ -260,14 +268,15 @@ public Map, SettingValue> getSettings() { /** * Deletes the setting defined by {@code setting}. * - * @param setting the definition + * @param setting + * the definition * - * @throws ConfigurationError if there is a problem deleting the setting + * @throws ConfigurationError + * if there is a problem deleting the setting */ @Override @SuppressWarnings({ "unchecked", "rawtypes" }) - public void deleteSetting(SettingDefinition setting) - throws ConfigurationError { + public void deleteSetting(SettingDefinition setting) throws ConfigurationError { SettingValue oldValue = this.settingsManagerDao.getSettingValue(setting.getKey()); if (oldValue != null) { applySetting(setting, oldValue, null); @@ -285,13 +294,18 @@ public Set getKeys() { } /** - * Applies the a new setting to all {@code ConfiguredObject}s. If an error occurs the the old value is reapplied. + * Applies the a new setting to all {@code ConfiguredObject}s. If an error occurs the the old value is + * reapplied. * - * @param setting the definition - * @param oldValue the old value (or {@code null} if there is none) - * @param newValue the new value (or {@code null} if there is none) + * @param setting + * the definition + * @param oldValue + * the old value (or {@code null} if there is none) + * @param newValue + * the new value (or {@code null} if there is none) * - * @throws ConfigurationError if there is a error configuring the objects + * @throws ConfigurationError + * if there is a error configuring the objects */ private void applySetting(SettingDefinition setting, SettingValue oldValue, SettingValue newValue) throws ConfigurationError { @@ -358,25 +372,26 @@ private SettingValue getSettingValue(String key, boolean required) { val.setValue(def.getDefaultValue()); this.settingsManagerDao.saveSettingValue(val); } else { - throw new ConfigurationError(String.format( - "No value found for required Setting '%s' with no default value.", key)); + throw new ConfigurationError( + String.format("No value found for required Setting '%s' with no default value.", key)); } return val; } } /** - * Changes a setting. The change is propagated to all Objects that are configured. If the change fails for one of - * these objects, the setting is reverted to the old value of the setting for all objects. + * Changes a setting. The change is propagated to all Objects that are configured. If the change fails for + * one of these objects, the setting is reverted to the old value of the setting for all objects. * - * @param newValue the new value of the setting + * @param newValue + * the new value of the setting * - * @throws ConfigurationError if there is a problem changing the setting. + * @throws ConfigurationError + * if there is a problem changing the setting. */ @Override @SuppressWarnings({ "unchecked", "rawtypes" }) - public void changeSetting(SettingValue newValue) - throws ConfigurationError { + public void changeSetting(SettingValue newValue) throws ConfigurationError { if (newValue == null) { throw new NullPointerException("newValue can not be null"); } @@ -390,9 +405,8 @@ public void changeSetting(SettingValue newValue) } if (def.getType() != newValue.getType()) { - throw new IllegalArgumentException(String - .format("Invalid type for definition (%s vs. %s)", def - .getType(), newValue.getType())); + throw new IllegalArgumentException( + String.format("Invalid type for definition (%s vs. %s)", def.getType(), newValue.getType())); } SettingValue oldValue = this.settingsManagerDao.getSettingValue(newValue.getKey()); @@ -485,10 +499,14 @@ private static class ConfigurableObject { /** * Constructs a new {@code ConfigurableObject}. * - * @param method the method of the target - * @param target the target object - * @param key the settings key - * @param required if the setting is required + * @param method + * the method of the target + * @param target + * the target object + * @param key + * the settings key + * @param required + * if the setting is required */ ConfigurableObject(Method method, Object target, String key, boolean required) { this.method = method; @@ -521,24 +539,27 @@ public String getKey() { /** * Configures this object with the specified value. * - * @param val the value + * @param val + * the value * - * @throws ConfigurationError if an error occurs + * @throws ConfigurationError + * if an error occurs */ - public void configure(SettingValue val) - throws ConfigurationError { + public void configure(SettingValue val) throws ConfigurationError { configure(val.getValue()); } /** - * Configures this object with the specified value. Exceptions are wrapped in a {@code ConfigurationError}. + * Configures this object with the specified value. Exceptions are wrapped in a + * {@code ConfigurationError}. * - * @param val the value + * @param val + * the value * - * @throws ConfigurationError if an error occurs + * @throws ConfigurationError + * if an error occurs */ - public void configure(Object val) - throws ConfigurationError { + public void configure(Object val) throws ConfigurationError { try { if (getTarget().get() != null) { LOG.debug("Setting value '{}' for {}", val, this); @@ -551,20 +572,17 @@ public void configure(Object val) } } - private void logAndThrowError(Object val, Throwable t) - throws ConfigurationError { - String message = String - .format("Error while setting value '%s' (%s) for property '%s' with method '%s'", val, - val == null ? null : val.getClass(), getKey(), getMethod()); + private void logAndThrowError(Object val, Throwable t) throws ConfigurationError { + String message = String.format("Error while setting value '%s' (%s) for property '%s' with method '%s'", + val, val == null ? null : val.getClass(), getKey(), getMethod()); LOG.error(message); throw new ConfigurationError(message, t); } @Override public String toString() { - return String - .format("ConfigurableObject[key=%s, method=%s, target=%s]", getKey(), getMethod(), - getTarget().get()); + return String.format("ConfigurableObject[key=%s, method=%s, target=%s]", getKey(), getMethod(), + getTarget().get()); } @Override diff --git a/iceland/core/src/main/java/org/n52/iceland/binding/SimpleBinding.java b/iceland/core/src/main/java/org/n52/iceland/binding/SimpleBinding.java index 100d1e3d9..ee8fa56f1 100644 --- a/iceland/core/src/main/java/org/n52/iceland/binding/SimpleBinding.java +++ b/iceland/core/src/main/java/org/n52/iceland/binding/SimpleBinding.java @@ -27,6 +27,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.n52.iceland.coding.encode.OwsEncodingException; import org.n52.iceland.event.events.ExceptionEvent; import org.n52.iceland.exception.HTTPException; @@ -81,11 +83,13 @@ public abstract class SimpleBinding implements Binding { private DecoderRepository decoderRepository; private HttpUtils httpUtils; + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public HttpUtils getHttpUtils() { return httpUtils; } @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setHttpUtils(HttpUtils httpUtils) { this.httpUtils = httpUtils; } @@ -109,19 +113,23 @@ public ServiceOperatorRepository getServiceOperatorRepository() { } @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setEncoderRepository(EncoderRepository encoderRepository) { this.encoderRepository = encoderRepository; } + @SuppressFBWarnings({"EI_EXPOSE_REP"}) public EncoderRepository getEncoderRepository() { return encoderRepository; } @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setDecoderRepository(DecoderRepository decoderRepository) { this.decoderRepository = decoderRepository; } + @SuppressFBWarnings({"EI_EXPOSE_REP"}) public DecoderRepository getDecoderRepository() { return decoderRepository; } diff --git a/iceland/core/src/main/java/org/n52/iceland/binding/exi/EXIBinding.java b/iceland/core/src/main/java/org/n52/iceland/binding/exi/EXIBinding.java index f56361a56..1e99e32ec 100644 --- a/iceland/core/src/main/java/org/n52/iceland/binding/exi/EXIBinding.java +++ b/iceland/core/src/main/java/org/n52/iceland/binding/exi/EXIBinding.java @@ -61,6 +61,8 @@ import com.siemens.ct.exi.core.exceptions.EXIException; import com.siemens.ct.exi.main.api.sax.EXISource; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Binding implementation for EXI - Efficient XML Interchange See See @@ -77,6 +79,7 @@ public class EXIBinding extends SimpleBinding { private final EXIUtils exiUtils; @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public EXIBinding(EXIUtils exiUtils) { this.exiUtils = exiUtils; } diff --git a/iceland/core/src/main/java/org/n52/iceland/binding/soap/SoapBinding.java b/iceland/core/src/main/java/org/n52/iceland/binding/soap/SoapBinding.java index ba13562d1..95b7ad723 100644 --- a/iceland/core/src/main/java/org/n52/iceland/binding/soap/SoapBinding.java +++ b/iceland/core/src/main/java/org/n52/iceland/binding/soap/SoapBinding.java @@ -24,7 +24,6 @@ import java.util.Objects; import java.util.Set; -import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -36,7 +35,6 @@ import org.n52.iceland.event.events.ExceptionEvent; import org.n52.iceland.exception.HTTPException; import org.n52.iceland.service.CommunicationObjectWithSoapHeader; -import org.n52.iceland.util.http.HttpUtils; import org.n52.janmayen.http.HTTPHeaders; import org.n52.janmayen.http.HTTPStatus; import org.n52.janmayen.http.MediaType; @@ -70,10 +68,8 @@ */ public class SoapBinding extends AbstractXmlBinding { - private static final Set KEYS = Collections - .singleton(new MediaTypeBindingKey(MediaTypes.APPLICATION_SOAP_XML)); - - private HttpUtils httpUtils; + private static final Set KEYS = + Collections.singleton(new MediaTypeBindingKey(MediaTypes.APPLICATION_SOAP_XML)); @Override public Set getKeys() { @@ -82,8 +78,7 @@ public Set getKeys() { @Override public boolean checkOperationHttpPostSupported(OwsOperationKey k) { - return hasDecoder(k, MediaTypes.TEXT_XML) || - hasDecoder(k, MediaTypes.APPLICATION_XML); + return hasDecoder(k, MediaTypes.TEXT_XML) || hasDecoder(k, MediaTypes.APPLICATION_XML); } @Override @@ -153,8 +148,8 @@ private void createBodyResponse(SoapChain chain) throws OwsExceptionReport { } private Object encodeSoapResponse(SoapChain chain) throws OwsExceptionReport, NoEncoderForKeyException { - EncoderKey key = new XmlEncoderKey(chain.getSoapResponse().getSoapNamespace(), - chain.getSoapResponse().getClass()); + EncoderKey key = + new XmlEncoderKey(chain.getSoapResponse().getSoapNamespace(), chain.getSoapResponse().getClass()); Encoder encoder = getEncoder(key); if (encoder != null) { try { @@ -189,7 +184,7 @@ private void writeFault(SoapChain chain) throws HTTPException, IOException { } checkSoapInjection(chain); try { - httpUtils.writeObject(chain.getHttpRequest(), chain.getHttpResponse(), checkMediaType(chain), + getHttpUtils().writeObject(chain.getHttpRequest(), chain.getHttpResponse(), checkMediaType(chain), encodeSoapResponse(chain), this); } catch (OwsExceptionReport | NoEncoderForKeyException t) { throw new HTTPException(HTTPStatus.INTERNAL_SERVER_ERROR, t); @@ -198,22 +193,23 @@ private void writeFault(SoapChain chain) throws HTTPException, IOException { private void writeResponse(SoapChain chain) throws IOException, HTTPException { MediaType contentType = chooseResponseContentType(chain.getBodyResponse(), - HTTPHeaders.getAcceptHeader(chain.getHttpRequest()), - getDefaultContentType()); + HTTPHeaders.getAcceptHeader(chain.getHttpRequest()), getDefaultContentType()); // TODO allow other bindings to encode response as soap messages if (contentType.isCompatible(getDefaultContentType())) { checkSoapInjection(chain); - httpUtils.writeObject(chain.getHttpRequest(), chain.getHttpResponse(), checkMediaType(chain), chain, this); + getHttpUtils().writeObject(chain.getHttpRequest(), chain.getHttpResponse(), checkMediaType(chain), chain, + this); } else { - httpUtils.writeObject(chain.getHttpRequest(), chain.getHttpResponse(), contentType, - chain.getBodyResponse(), this); + getHttpUtils().writeObject(chain.getHttpRequest(), chain.getHttpResponse(), contentType, + chain.getBodyResponse(), this); } } /** * Check the {@link MediaType} * - * @param chain SoapChain to check + * @param chain + * SoapChain to check * * @return the valid {@link MediaType} */ @@ -231,14 +227,16 @@ private MediaType checkMediaType(SoapChain chain) { * Check if SoapHeader information is contained in the body response and add the header information to the * {@link SoapResponse} * - * @param chain SoapChain to check + * @param chain + * SoapChain to check */ private void checkSoapInjection(SoapChain chain) { if (chain.getBodyResponse() instanceof CommunicationObjectWithSoapHeader) { - CommunicationObjectWithSoapHeader soapHeaderObject = (CommunicationObjectWithSoapHeader) chain - .getBodyResponse(); + CommunicationObjectWithSoapHeader soapHeaderObject = + (CommunicationObjectWithSoapHeader) chain.getBodyResponse(); if (soapHeaderObject.isSetSoapHeader()) { - List headers = ((CommunicationObjectWithSoapHeader) chain.getSoapRequest()).getSoapHeader(); + List headers = + ((CommunicationObjectWithSoapHeader) chain.getSoapRequest()).getSoapHeader(); // TODO do things chain.getSoapResponse().setHeader(checkSoapHeaders(headers)); } @@ -284,15 +282,4 @@ protected String checkSoapHeader(HttpServletRequest request) { return null; } - @Override - public HttpUtils getHttpUtils() { - return httpUtils; - } - - @Inject - @Override - public void setHttpUtils(HttpUtils httpUtils) { - this.httpUtils = httpUtils; - } - } diff --git a/iceland/core/src/main/java/org/n52/iceland/cache/ContentCacheUpdate.java b/iceland/core/src/main/java/org/n52/iceland/cache/ContentCacheUpdate.java index d9c94a8a8..7752059d5 100644 --- a/iceland/core/src/main/java/org/n52/iceland/cache/ContentCacheUpdate.java +++ b/iceland/core/src/main/java/org/n52/iceland/cache/ContentCacheUpdate.java @@ -18,6 +18,8 @@ import org.n52.iceland.util.action.Action; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @author Christian Autermann * @@ -31,6 +33,7 @@ public abstract class ContentCacheUpdate implements Action { /** * @return the cause of failure or {@code null} */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OwsExceptionReport getFailureCause() { return this.exceptionReport; } @@ -58,6 +61,7 @@ public boolean failed() { /** * @return the writable cache of this action */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public WritableContentCache getCache() { return cache; } @@ -68,6 +72,7 @@ public WritableContentCache getCache() { * * @return this */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ContentCacheUpdate setCache(WritableContentCache cache) { this.cache = cache; return this; diff --git a/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/ContentCacheControllerImpl.java b/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/ContentCacheControllerImpl.java index 5db4da8e6..54c47971e 100644 --- a/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/ContentCacheControllerImpl.java +++ b/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/ContentCacheControllerImpl.java @@ -28,6 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.n52.iceland.cache.ContentCachePersistenceStrategy; import org.n52.iceland.cache.ContentCacheUpdate; import org.n52.iceland.cache.WritableContentCache; @@ -56,6 +58,7 @@ public void setCacheFactory(ContentCacheFactory cacheFactory) { } @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setPersistenceStrategy(ContentCachePersistenceStrategy persistenceStrategy) { this.persistenceStrategy = persistenceStrategy; } @@ -87,6 +90,7 @@ private void loadOrCreateCache() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public WritableContentCache getCache() { return this.cache; } @@ -215,6 +219,7 @@ public boolean isUpdateInProgress() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public ContentCachePersistenceStrategy getContentCachePersistenceStrategy() { return this.persistenceStrategy; } diff --git a/iceland/core/src/main/java/org/n52/iceland/coding/SupportedTypeRepository.java b/iceland/core/src/main/java/org/n52/iceland/coding/SupportedTypeRepository.java index 0a4eeb804..5b304f472 100644 --- a/iceland/core/src/main/java/org/n52/iceland/coding/SupportedTypeRepository.java +++ b/iceland/core/src/main/java/org/n52/iceland/coding/SupportedTypeRepository.java @@ -35,6 +35,8 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -51,6 +53,7 @@ public SupportedTypeRepository() { this.cache = CacheBuilder.newBuilder().build(new CacheLoaderImpl()); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void init(DecoderRepository decoderRepository, EncoderRepository encoderRepository) { this.decoderRepository = decoderRepository; this.encoderRepository = encoderRepository; diff --git a/iceland/core/src/main/java/org/n52/iceland/coding/SupportedTypeRepositoryInitializer.java b/iceland/core/src/main/java/org/n52/iceland/coding/SupportedTypeRepositoryInitializer.java index de055d769..1772d74bd 100644 --- a/iceland/core/src/main/java/org/n52/iceland/coding/SupportedTypeRepositoryInitializer.java +++ b/iceland/core/src/main/java/org/n52/iceland/coding/SupportedTypeRepositoryInitializer.java @@ -21,6 +21,8 @@ import org.n52.svalbard.decode.DecoderRepository; import org.n52.svalbard.encode.EncoderRepository; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class SupportedTypeRepositoryInitializer implements Constructable { private final EncoderRepository encoderRepository; @@ -28,6 +30,7 @@ public class SupportedTypeRepositoryInitializer implements Constructable { private final SupportedTypeRepository supportedTypeRepository; @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SupportedTypeRepositoryInitializer(EncoderRepository encoderRepository, DecoderRepository decoderRepository, SupportedTypeRepository responseFormatRepository) { diff --git a/iceland/core/src/main/java/org/n52/iceland/coding/encode/AbstractResponseWriter.java b/iceland/core/src/main/java/org/n52/iceland/coding/encode/AbstractResponseWriter.java index 9e5c53f70..c7b77182c 100644 --- a/iceland/core/src/main/java/org/n52/iceland/coding/encode/AbstractResponseWriter.java +++ b/iceland/core/src/main/java/org/n52/iceland/coding/encode/AbstractResponseWriter.java @@ -18,6 +18,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.n52.janmayen.http.MediaType; import org.n52.janmayen.http.MediaTypes; import org.n52.shetland.ogc.ows.service.ResponseFormat; @@ -38,6 +40,7 @@ public abstract class AbstractResponseWriter implements ResponseWriter { private MediaType contentType; private final EncoderRepository encoderRepository; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractResponseWriter(EncoderRepository encoderRepository) { this.encoderRepository = encoderRepository; } diff --git a/iceland/core/src/main/java/org/n52/iceland/coding/encode/ResponseProxy.java b/iceland/core/src/main/java/org/n52/iceland/coding/encode/ResponseProxy.java index ab81ed841..01e8e73d6 100644 --- a/iceland/core/src/main/java/org/n52/iceland/coding/encode/ResponseProxy.java +++ b/iceland/core/src/main/java/org/n52/iceland/coding/encode/ResponseProxy.java @@ -19,6 +19,8 @@ import javax.servlet.http.HttpServletResponse; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Proxy class for HttpServletResponse to give ResponseWriters access to selected methods, including addHeader and * setContentLength. @@ -30,6 +32,7 @@ public class ResponseProxy { private final HttpServletResponse response; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ResponseProxy(HttpServletResponse response) throws IOException { if (response == null) { throw new NullPointerException("Response cannot be null"); diff --git a/iceland/core/src/main/java/org/n52/iceland/config/ActivationService.java b/iceland/core/src/main/java/org/n52/iceland/config/ActivationService.java index d6b042b31..c4194ad30 100644 --- a/iceland/core/src/main/java/org/n52/iceland/config/ActivationService.java +++ b/iceland/core/src/main/java/org/n52/iceland/config/ActivationService.java @@ -27,6 +27,8 @@ import org.n52.iceland.util.activation.DefaultActivationInitializer; import org.n52.iceland.util.activation.FunctionalActivationListener; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -37,6 +39,7 @@ public class ActivationService { private ActivationDao activationDao; @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setActivationDao(ActivationDao dao) { this.activationDao = dao; } diff --git a/iceland/core/src/main/java/org/n52/iceland/config/AdminUserServiceImpl.java b/iceland/core/src/main/java/org/n52/iceland/config/AdminUserServiceImpl.java index 8387a0cd6..47cfa71f2 100644 --- a/iceland/core/src/main/java/org/n52/iceland/config/AdminUserServiceImpl.java +++ b/iceland/core/src/main/java/org/n52/iceland/config/AdminUserServiceImpl.java @@ -19,11 +19,14 @@ import javax.inject.Inject; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class AdminUserServiceImpl implements AdminUserService { private AdminUserDao adminUserDao; @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setAdminUserDao(AdminUserDao adminUserDao) { this.adminUserDao = adminUserDao; } diff --git a/iceland/core/src/main/java/org/n52/iceland/config/spring/ConfiguringBeanPostProcessor.java b/iceland/core/src/main/java/org/n52/iceland/config/spring/ConfiguringBeanPostProcessor.java index 32218781a..5a372750c 100644 --- a/iceland/core/src/main/java/org/n52/iceland/config/spring/ConfiguringBeanPostProcessor.java +++ b/iceland/core/src/main/java/org/n52/iceland/config/spring/ConfiguringBeanPostProcessor.java @@ -20,6 +20,8 @@ import org.springframework.beans.factory.BeanInitializationException; import org.springframework.beans.factory.config.BeanPostProcessor; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.n52.faroe.ConfigurationError; import org.n52.faroe.SettingsService; import org.n52.faroe.annotation.Configurable; @@ -51,6 +53,7 @@ public class ConfiguringBeanPostProcessor implements BeanPostProcessor { * @param settingsService the settings service */ @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setSettingsService(SettingsService settingsService) { this.settingsService = settingsService; } diff --git a/iceland/core/src/main/java/org/n52/iceland/config/spring/SettingsBeanPostProcessor.java b/iceland/core/src/main/java/org/n52/iceland/config/spring/SettingsBeanPostProcessor.java index 3a61ee3d4..dc48b1429 100644 --- a/iceland/core/src/main/java/org/n52/iceland/config/spring/SettingsBeanPostProcessor.java +++ b/iceland/core/src/main/java/org/n52/iceland/config/spring/SettingsBeanPostProcessor.java @@ -23,6 +23,8 @@ import org.springframework.beans.factory.BeanInitializationException; import org.springframework.beans.factory.config.BeanPostProcessor; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Bean post processor, that * {@linkplain SettingsService#addSetting(org.n52.faroe.SettingDefinition) adds} beans @@ -44,6 +46,7 @@ public class SettingsBeanPostProcessor implements BeanPostProcessor { * @param settingsService the settings service */ @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setSettingsService(SettingsService settingsService) { this.settingsService = settingsService; } diff --git a/iceland/core/src/main/java/org/n52/iceland/event/events/ExceptionEvent.java b/iceland/core/src/main/java/org/n52/iceland/event/events/ExceptionEvent.java index 094be6938..3e0f90e8c 100644 --- a/iceland/core/src/main/java/org/n52/iceland/event/events/ExceptionEvent.java +++ b/iceland/core/src/main/java/org/n52/iceland/event/events/ExceptionEvent.java @@ -19,6 +19,8 @@ import javax.servlet.http.HttpServletResponse; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Event is fired if an occured {@link Exception} is written to the {@link OutputStream} of the * {@link HttpServletResponse} @@ -31,11 +33,13 @@ public class ExceptionEvent extends AbstractFlowEvent { private final Exception exception; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ExceptionEvent(final Exception exception) { super(Thread.currentThread().getId()); this.exception = exception; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Exception getException() { return exception; } diff --git a/iceland/core/src/main/java/org/n52/iceland/event/events/ModificationResponseEvent.java b/iceland/core/src/main/java/org/n52/iceland/event/events/ModificationResponseEvent.java index 22c945020..46ce142bf 100644 --- a/iceland/core/src/main/java/org/n52/iceland/event/events/ModificationResponseEvent.java +++ b/iceland/core/src/main/java/org/n52/iceland/event/events/ModificationResponseEvent.java @@ -20,6 +20,8 @@ import org.n52.shetland.ogc.ows.service.OwsServiceRequest; import org.n52.shetland.ogc.ows.service.OwsServiceResponse; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Abstract event that should be fired if a successful request changed the * contents of this service, e.g in the implemented {@link RequestOperator} @@ -37,11 +39,13 @@ public abstract class ModificationResponseEvent implements RequestOperator { @@ -75,10 +77,12 @@ public GenericRequestOperator(OwsOperationKey operation, boolean defaultActive, } @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setOperationHandlerRepository(OperationHandlerRepository repo) { this.operationHandlerRepository = repo; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OperationHandlerRepository getOperationHandlerRepository() { return operationHandlerRepository; } diff --git a/iceland/core/src/main/java/org/n52/iceland/response/EXIResponseWriterFactory.java b/iceland/core/src/main/java/org/n52/iceland/response/EXIResponseWriterFactory.java index 16a8022e4..f8d966e4b 100644 --- a/iceland/core/src/main/java/org/n52/iceland/response/EXIResponseWriterFactory.java +++ b/iceland/core/src/main/java/org/n52/iceland/response/EXIResponseWriterFactory.java @@ -28,6 +28,8 @@ import com.siemens.ct.exi.core.EXIFactory; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Writer factory class for {@link EXIObject} and {@link EXIResponseWriter} * @@ -45,6 +47,7 @@ public class EXIResponseWriterFactory private EncoderRepository encoderRepository; @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setEncoderRepository(EncoderRepository encoderRepository) { this.encoderRepository = encoderRepository; } diff --git a/iceland/core/src/main/java/org/n52/iceland/response/JSONResponseWriterFactory.java b/iceland/core/src/main/java/org/n52/iceland/response/JSONResponseWriterFactory.java index 644ed323a..dc5427f6e 100644 --- a/iceland/core/src/main/java/org/n52/iceland/response/JSONResponseWriterFactory.java +++ b/iceland/core/src/main/java/org/n52/iceland/response/JSONResponseWriterFactory.java @@ -25,6 +25,8 @@ import com.fasterxml.jackson.databind.JsonNode; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * {@link ResponseWriterFactory} implementation for {@link JsonNode} and * {@link JSONResponseWriter} @@ -40,6 +42,7 @@ public class JSONResponseWriterFactory private EncoderRepository encoderRepository; @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setEncoderRepository(EncoderRepository encoderRepository) { this.encoderRepository = encoderRepository; } diff --git a/iceland/core/src/main/java/org/n52/iceland/response/ServiceResponse.java b/iceland/core/src/main/java/org/n52/iceland/response/ServiceResponse.java index d7f36f283..0852a91ec 100644 --- a/iceland/core/src/main/java/org/n52/iceland/response/ServiceResponse.java +++ b/iceland/core/src/main/java/org/n52/iceland/response/ServiceResponse.java @@ -35,6 +35,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 */ @@ -79,6 +81,7 @@ public class ServiceResponse implements CommunicationObjectWithSoapHeader { * the HTTP response code as specified in * {@link HttpServletResponse} */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ServiceResponse(ByteArrayOutputStream baos, MediaType contentType, HTTPStatus status) { this.byteArrayOutputStream = baos; this.contentType = contentType; diff --git a/iceland/core/src/main/java/org/n52/iceland/response/SoapChainResponseWriterFactory.java b/iceland/core/src/main/java/org/n52/iceland/response/SoapChainResponseWriterFactory.java index c25b2bae2..60a2c5d83 100644 --- a/iceland/core/src/main/java/org/n52/iceland/response/SoapChainResponseWriterFactory.java +++ b/iceland/core/src/main/java/org/n52/iceland/response/SoapChainResponseWriterFactory.java @@ -28,6 +28,8 @@ import org.n52.shetland.w3c.soap.SoapChain; import org.n52.svalbard.encode.EncoderRepository; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * {@link ResponseWriterFactory} implementation for {@link SoapChain} and * {@link SoapChainResponseWriter} @@ -50,6 +52,7 @@ public void setXmlOptions(Producer xmlOptions) { } @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setEncoderRepository(EncoderRepository encoderRepository) { this.encoderRepository = encoderRepository; } diff --git a/iceland/core/src/main/java/org/n52/iceland/response/XmlResponseWriterFactory.java b/iceland/core/src/main/java/org/n52/iceland/response/XmlResponseWriterFactory.java index 4bed45aa7..8a2d5206e 100644 --- a/iceland/core/src/main/java/org/n52/iceland/response/XmlResponseWriterFactory.java +++ b/iceland/core/src/main/java/org/n52/iceland/response/XmlResponseWriterFactory.java @@ -27,6 +27,8 @@ import org.n52.janmayen.component.SingleTypeComponentFactory; import org.n52.svalbard.encode.EncoderRepository; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * {@link ResponseWriterFactory} implementation for {@link XmlObject} and * {@link XmlResponseWriter} @@ -43,6 +45,7 @@ public class XmlResponseWriterFactory private EncoderRepository encoderRepository; @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setEncoderRepository(EncoderRepository encoderRepository) { this.encoderRepository = encoderRepository; } diff --git a/iceland/core/src/main/java/org/n52/iceland/service/operator/GenericServiceOperator.java b/iceland/core/src/main/java/org/n52/iceland/service/operator/GenericServiceOperator.java index 89ddf2758..43bf3309e 100644 --- a/iceland/core/src/main/java/org/n52/iceland/service/operator/GenericServiceOperator.java +++ b/iceland/core/src/main/java/org/n52/iceland/service/operator/GenericServiceOperator.java @@ -31,6 +31,8 @@ import com.google.common.base.MoreObjects; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Generic service operator implementation that just delegates to a matching * {@link RequestOperator}. @@ -67,6 +69,7 @@ public OwsServiceKey getKey() { * @param repo the repository */ @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setRequestOperatorRepository(RequestOperatorRepository repo) { this.requestOperatorRepository = repo; } diff --git a/iceland/core/src/main/java/org/n52/iceland/util/PropertyFileHandlerImpl.java b/iceland/core/src/main/java/org/n52/iceland/util/PropertyFileHandlerImpl.java index d0e6b4b34..25a864809 100644 --- a/iceland/core/src/main/java/org/n52/iceland/util/PropertyFileHandlerImpl.java +++ b/iceland/core/src/main/java/org/n52/iceland/util/PropertyFileHandlerImpl.java @@ -116,7 +116,7 @@ public File getFile(boolean create) throws IOException { } catch (IOException ioe) { throw new RuntimeException(ioe); } - if (propertiesFile.exists() || (create && propertiesFile.createNewFile())) { + if (propertiesFile.exists() || create && propertiesFile.createNewFile()) { return propertiesFile; } return null; diff --git a/iceland/core/src/main/java/org/n52/iceland/util/XmlFactories.java b/iceland/core/src/main/java/org/n52/iceland/util/XmlFactories.java index 4218f4b76..9938bdba6 100644 --- a/iceland/core/src/main/java/org/n52/iceland/util/XmlFactories.java +++ b/iceland/core/src/main/java/org/n52/iceland/util/XmlFactories.java @@ -28,6 +28,8 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -54,6 +56,7 @@ public XmlFactories() { /** * @return the event factory */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public XMLEventFactory eventFactory() { return eventFactory; } @@ -61,6 +64,7 @@ public XMLEventFactory eventFactory() { /** * @return the output factory */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public XMLOutputFactory outputFactory() { return outputFactory; } @@ -68,6 +72,7 @@ public XMLOutputFactory outputFactory() { /** * @return the input factory */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public XMLInputFactory inputFactory() { return inputFactory; } @@ -89,6 +94,7 @@ public String documentVersion() { /** * @return the transformer factory */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public TransformerFactory transformerFactory() { return transformerFactory; } diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 90b21ff7d..2dda3b92c 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -122,6 +122,7 @@ org.apache.lucene lucene-core + provided org.springframework diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/ElasticsearchSettings.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/ElasticsearchSettings.java index 4d4339f92..48106a7d9 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/ElasticsearchSettings.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/ElasticsearchSettings.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedList; import java.util.List; import java.util.UUID; @@ -141,7 +142,7 @@ public void setClusterName(String clusterName) { } public List getClusterNodes() { - return clusterNodes; + return new LinkedList<>(clusterNodes); } /** diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/parameters/AbstractEsParameter.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/parameters/AbstractEsParameter.java index 4fdcadd34..a4793bd81 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/parameters/AbstractEsParameter.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/parameters/AbstractEsParameter.java @@ -20,6 +20,8 @@ import org.n52.iceland.statistics.api.parameters.ElasticsearchTypeRegistry.ElasticsearchType; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Abstract Elasticsearch variables which the user sees on the interface by the name */ @@ -32,15 +34,18 @@ public AbstractEsParameter(String name) { this.name = name; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractEsParameter(String name, Description description) { this.name = name; this.description = description; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public final Description getDescription() { return description; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public final void setDescription(Description description) { this.description = description; } diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/parameters/ElasticsearchTypeRegistry.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/parameters/ElasticsearchTypeRegistry.java index 20950c867..10e30e95a 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/parameters/ElasticsearchTypeRegistry.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/parameters/ElasticsearchTypeRegistry.java @@ -19,6 +19,8 @@ import com.google.common.collect.ImmutableMap; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class ElasticsearchTypeRegistry { private static final String TYPE = "type"; private static final String INDEX = "index"; @@ -47,10 +49,12 @@ public class ElasticsearchTypeRegistry { public static class ElasticsearchType { private final Map type; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ElasticsearchType(Map type) { this.type = type; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Map getType() { return type; } diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/parameters/ObjectEsParameter.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/parameters/ObjectEsParameter.java index d36eb4027..1ccaad54c 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/parameters/ObjectEsParameter.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/parameters/ObjectEsParameter.java @@ -16,6 +16,7 @@ package org.n52.iceland.statistics.api.parameters; import java.util.Arrays; +import java.util.LinkedList; import java.util.List; import java.util.Objects; @@ -34,7 +35,7 @@ public ObjectEsParameter(String name, AbstractEsParameter... abstractEsParameter @Override public List getAllChildren() { - return children; + return new LinkedList<>(children); } public ObjectEsParameter addChild(AbstractEsParameter child) { diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/utils/KibanaImporter.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/utils/KibanaImporter.java index 1839a7d2a..49efa9c09 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/utils/KibanaImporter.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/utils/KibanaImporter.java @@ -33,6 +33,8 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class KibanaImporter { public static final String INDEX_NEEDLE = "##!NO_SPOON!##"; @@ -45,6 +47,7 @@ public class KibanaImporter { private final String statisticsIndexName; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public KibanaImporter(RestHighLevelClient client, String kibanaIndexName, String statisticsIndexName) { Objects.requireNonNull(client); Objects.requireNonNull(kibanaIndexName); diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/utils/dto/KibanaConfigHolderDto.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/utils/dto/KibanaConfigHolderDto.java index 1e92b702a..dfa3147a2 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/utils/dto/KibanaConfigHolderDto.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/api/utils/dto/KibanaConfigHolderDto.java @@ -18,6 +18,8 @@ import java.util.LinkedList; import java.util.List; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class KibanaConfigHolderDto { private List entries = new LinkedList<>(); @@ -26,9 +28,10 @@ public void add(KibanaConfigEntryDto entry) { } public List getEntries() { - return entries; + return new LinkedList<>(entries); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setEntries(List entries) { this.entries = entries; } diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/AbstractStatisticsServiceEventListener.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/AbstractStatisticsServiceEventListener.java index afca2ea00..d12a23727 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/AbstractStatisticsServiceEventListener.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/AbstractStatisticsServiceEventListener.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -72,7 +73,7 @@ public AbstractStatisticsServiceEventListener(int threadPoolSize) { @Override public Set> getTypes() { - return eventTypes; + return new LinkedHashSet<>(eventTypes); } @Override diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/ElasticsearchAdminHandler.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/ElasticsearchAdminHandler.java index 84a5b1b83..429f86e78 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/ElasticsearchAdminHandler.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/ElasticsearchAdminHandler.java @@ -64,6 +64,8 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class ElasticsearchAdminHandler implements IAdminDataHandler { private static final Logger logger = LoggerFactory.getLogger(ElasticsearchAdminHandler.class); @@ -359,6 +361,7 @@ public void destroy() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public ElasticsearchSettings getElasticsearchSettings() { return settings; } diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/CountingOutputStreamEventHandler.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/CountingOutputStreamEventHandler.java index d72953e5b..9e365a215 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/CountingOutputStreamEventHandler.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/CountingOutputStreamEventHandler.java @@ -16,6 +16,7 @@ package org.n52.iceland.statistics.impl.handlers; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import org.apache.commons.io.FileUtils; @@ -36,8 +37,7 @@ public Map resolveAsMap(CountingOutputStreamEvent event) { data.put(ObjectEsParameterFactory.DISPLAY_BYTES.getName(), FileUtils.byteCountToDisplaySize(event.getBytesWritten())); put(ServiceEventDataMapping.ORE_BYTES_WRITTEN, data); - - return dataMap; + return new LinkedHashMap<>(dataMap); } } diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/DefaultServiceEventHandler.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/DefaultServiceEventHandler.java index 0af08246e..6e8134856 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/DefaultServiceEventHandler.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/DefaultServiceEventHandler.java @@ -15,6 +15,7 @@ */ package org.n52.iceland.statistics.impl.handlers; +import java.util.LinkedHashMap; import java.util.Map; import org.n52.iceland.statistics.api.AbstractElasticSearchDataHolder; @@ -28,7 +29,7 @@ public class DefaultServiceEventHandler extends AbstractElasticSearchDataHolder @Override public Map resolveAsMap(Event event) { put(ServiceEventDataMapping.UNHANDLED_SERVICEEVENT_TYPE.getName(), event.getClass()); - return dataMap; + return new LinkedHashMap<>(dataMap); } } diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/OutgoingResponseEventHandler.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/OutgoingResponseEventHandler.java index 5fd28e38b..01bc98b37 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/OutgoingResponseEventHandler.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/OutgoingResponseEventHandler.java @@ -15,6 +15,7 @@ */ package org.n52.iceland.statistics.impl.handlers; +import java.util.LinkedHashMap; import java.util.Map; import org.n52.iceland.event.events.OutgoingResponseEvent; @@ -29,8 +30,7 @@ public class OutgoingResponseEventHandler extends AbstractElasticSearchDataHolde public Map resolveAsMap(OutgoingResponseEvent event) { put(ServiceEventDataMapping.ORE_EXEC_TIME.getName(), event.getElapsedTime()); put(ServiceEventDataMapping.ORE_COUNT.getName(), event.getRequestNumber()); - - return dataMap; + return new LinkedHashMap<>(dataMap); } } diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/exceptions/CodedExceptionEventHandler.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/exceptions/CodedExceptionEventHandler.java index 88258f7f1..5e49c502d 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/exceptions/CodedExceptionEventHandler.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/exceptions/CodedExceptionEventHandler.java @@ -16,6 +16,7 @@ package org.n52.iceland.statistics.impl.handlers.exceptions; import java.util.Collections; +import java.util.LinkedHashMap; import java.util.Map; import org.n52.iceland.statistics.api.AbstractElasticSearchDataHolder; @@ -40,7 +41,7 @@ public Map resolveAsMap(Exception rawException) { put(ServiceEventDataMapping.CEX_SOAP_FAULT, exception.getCode().getSoapFaultReason()); } put(ServiceEventDataMapping.EX_MESSAGE, exception.getMessage()); - return dataMap; + return new LinkedHashMap<>(dataMap); } else { return Collections.emptyMap(); } diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/exceptions/OwsExceptionEventHandler.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/exceptions/OwsExceptionEventHandler.java index e95b86927..4d11fc146 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/exceptions/OwsExceptionEventHandler.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/handlers/exceptions/OwsExceptionEventHandler.java @@ -16,6 +16,7 @@ package org.n52.iceland.statistics.impl.handlers.exceptions; import java.util.Collections; +import java.util.LinkedHashMap; import java.util.Map; import org.n52.iceland.statistics.api.AbstractElasticSearchDataHolder; @@ -37,7 +38,7 @@ public Map resolveAsMap(Exception rawException) { put(ServiceEventDataMapping.EX_VERSION, exception.getVersion()); put(ServiceEventDataMapping.OWSEX_NAMESPACE, exception.getNamespace()); put(ServiceEventDataMapping.EX_MESSAGE, exception.getMessage()); - return dataMap; + return new LinkedHashMap<>(dataMap); } else { return Collections.emptyMap(); } diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/CountingOutputStreamEventResolver.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/CountingOutputStreamEventResolver.java index 4d6287e1f..b63ced245 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/CountingOutputStreamEventResolver.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/CountingOutputStreamEventResolver.java @@ -15,6 +15,7 @@ */ package org.n52.iceland.statistics.impl.resolvers; +import java.util.LinkedHashMap; import java.util.Map; import org.n52.iceland.event.events.CountingOutputStreamEvent; @@ -22,12 +23,15 @@ import org.n52.iceland.statistics.api.interfaces.StatisticsServiceEventResolver; import org.n52.iceland.statistics.api.utils.EventHandlerFinder; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class CountingOutputStreamEventResolver implements StatisticsServiceEventResolver { private CountingOutputStreamEvent event; - private Map> handlers; + private Map> handlers = new LinkedHashMap<>(); @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Map resolve() { if (event == null) { return null; @@ -40,15 +44,20 @@ public Map resolve() { @Override public void setHandlers(Map> handlers) { - this.handlers = handlers; + this.handlers.clear(); + if (handlers != null) { + this.handlers.putAll(handlers); + } } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setEvent(CountingOutputStreamEvent payload) { this.event = payload; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public CountingOutputStreamEvent getEvent() { return event; } diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/DefaultServiceEventResolver.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/DefaultServiceEventResolver.java index 3b776ce69..a6bdb1cac 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/DefaultServiceEventResolver.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/DefaultServiceEventResolver.java @@ -15,6 +15,7 @@ */ package org.n52.iceland.statistics.impl.resolvers; +import java.util.LinkedHashMap; import java.util.Map; import org.n52.iceland.statistics.api.interfaces.StatisticsServiceEventHandler; @@ -22,12 +23,14 @@ import org.n52.iceland.statistics.api.utils.EventHandlerFinder; import org.n52.janmayen.event.Event; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class DefaultServiceEventResolver implements StatisticsServiceEventResolver { // private static final Logger logger = // LoggerFactory.getLogger(DefaultServiceEventResolver.class); private Event event; - private Map> handlers; + private Map> handlers = new LinkedHashMap<>(); @Override public Map resolve() { @@ -50,8 +53,12 @@ public Event getEvent() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setHandlers(Map> handlers) { - this.handlers = handlers; + this.handlers.clear(); + if (handlers != null) { + this.handlers.putAll(handlers); + } } } diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/ExceptionEventResolver.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/ExceptionEventResolver.java index eda6d7d2d..48c922b0b 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/ExceptionEventResolver.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/ExceptionEventResolver.java @@ -15,6 +15,7 @@ */ package org.n52.iceland.statistics.impl.resolvers; +import java.util.LinkedHashMap; import java.util.Map; import org.n52.iceland.event.events.ExceptionEvent; @@ -29,7 +30,7 @@ public class ExceptionEventResolver implements StatisticsServiceEventResolver> handlers; + private Map> handlers = new LinkedHashMap<>(); @Override public Map resolve() { @@ -45,7 +46,10 @@ public Map resolve() { @Override public void setHandlers(Map> handlers) { - this.handlers = handlers; + this.handlers.clear(); + if (handlers != null) { + this.handlers.putAll(handlers); + } } @Override diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/OutgoingResponseEventResolver.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/OutgoingResponseEventResolver.java index 96f3ec774..d2aac6ad7 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/OutgoingResponseEventResolver.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/resolvers/OutgoingResponseEventResolver.java @@ -15,6 +15,7 @@ */ package org.n52.iceland.statistics.impl.resolvers; +import java.util.LinkedHashMap; import java.util.Map; import org.n52.iceland.event.events.OutgoingResponseEvent; @@ -25,7 +26,7 @@ public class OutgoingResponseEventResolver implements StatisticsServiceEventResolver { private OutgoingResponseEvent event; - private Map> handlers; + private Map> handlers = new LinkedHashMap<>(); @Override public Map resolve() { @@ -47,7 +48,10 @@ public void setResponse(OutgoingResponseEvent response) { @Override public void setHandlers(Map> handlers) { - this.handlers = handlers; + this.handlers.clear(); + if (handlers != null) { + this.handlers.putAll(handlers); + } } @Override diff --git a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/schemabuilders/DefaultElasticsearchSchemas.java b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/schemabuilders/DefaultElasticsearchSchemas.java index 14dcd6db7..4c64679ab 100644 --- a/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/schemabuilders/DefaultElasticsearchSchemas.java +++ b/iceland/statistics/core/src/main/java/org/n52/iceland/statistics/impl/schemabuilders/DefaultElasticsearchSchemas.java @@ -18,6 +18,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import org.slf4j.Logger; @@ -48,8 +49,7 @@ public Map getSchema() { processSchemaClass(ServiceEventDataMapping.class); appSpecificSchema(); - - return properties; + return new LinkedHashMap<>(properties); } /** @@ -112,7 +112,7 @@ public final Map getMetadataSchema() { mappings = new HashMap<>(); properties.put(PROPERTIES_KEY, mappings); processSchemaClass(MetadataDataMapping.class); - return properties; + return new LinkedHashMap<>(properties); } public abstract int getSchemaVersion(); diff --git a/iceland/statistics/generator/src/main/java/org/n52/iceland/statistics/generator/formats/MdFormat.java b/iceland/statistics/generator/src/main/java/org/n52/iceland/statistics/generator/formats/MdFormat.java index dd9d75147..68d22f9c0 100644 --- a/iceland/statistics/generator/src/main/java/org/n52/iceland/statistics/generator/formats/MdFormat.java +++ b/iceland/statistics/generator/src/main/java/org/n52/iceland/statistics/generator/formats/MdFormat.java @@ -15,6 +15,7 @@ */ package org.n52.iceland.statistics.generator.formats; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -33,7 +34,7 @@ public class MdFormat { private static final String NO_DESCRIPTION = "No available description"; private static final String TAB = "\t"; private static final String DESCRIPTION_PLACEHOLDER = ""; - private Map>> parameters; + private Map>> parameters = new LinkedHashMap<>(); private StringBuilder output; private String formatLine(AbstractEsParameter parameter, int indent) { @@ -102,11 +103,14 @@ public String create() { } public Map>> getParameters() { - return parameters; + return new LinkedHashMap<>(parameters); } public void setParameters(Map>> parameters) { - this.parameters = parameters; + this.parameters.clear(); + if (parameters != null) { + this.parameters.putAll(parameters); + } } } diff --git a/pom.xml b/pom.xml index 977529eee..d6a375234 100644 --- a/pom.xml +++ b/pom.xml @@ -607,11 +607,17 @@ - - org.elasticsearch - elasticsearch - ${version.elastic} - + + org.elasticsearch + elasticsearch + ${version.elastic} + + + net.java.dev.jna + jna + + + org.elasticsearch.client elasticsearch-rest-client diff --git a/shetland/rdf/src/main/java/org/n52/shetland/rdf/AbstractTitleDescription.java b/shetland/rdf/src/main/java/org/n52/shetland/rdf/AbstractTitleDescription.java index 5a3051135..ff3f83166 100644 --- a/shetland/rdf/src/main/java/org/n52/shetland/rdf/AbstractTitleDescription.java +++ b/shetland/rdf/src/main/java/org/n52/shetland/rdf/AbstractTitleDescription.java @@ -31,7 +31,7 @@ public abstract class AbstractTitleDescription desctiptions = new LinkedList(); public List getTitles() { - return titles; + return new LinkedList<>(titles); } @SuppressWarnings("unchecked") @@ -52,7 +52,7 @@ public T addTitle(Title title) { } public List<Description> getDesctiptions() { - return desctiptions; + return new LinkedList<>(desctiptions); } @SuppressWarnings("unchecked") diff --git a/shetland/rdf/src/main/java/org/n52/shetland/rdf/RDF.java b/shetland/rdf/src/main/java/org/n52/shetland/rdf/RDF.java index 73268ec69..1092ee382 100644 --- a/shetland/rdf/src/main/java/org/n52/shetland/rdf/RDF.java +++ b/shetland/rdf/src/main/java/org/n52/shetland/rdf/RDF.java @@ -25,7 +25,7 @@ public class RDF implements ModelAdder { private List<RDFElement> elements = new LinkedList<RDFElement>(); public List<RDFElement> getElements() { - return elements; + return new LinkedList<>(elements); } public RDF setElements(List<RDFElement> elements) { diff --git a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/Catalog.java b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/Catalog.java index 55ea78c35..8d76c5700 100644 --- a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/Catalog.java +++ b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/Catalog.java @@ -33,6 +33,8 @@ import org.n52.shetland.rdf.dct.Title; import org.n52.shetland.rdf.foaf.Homepage; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class Catalog extends AbstractTitleDescription<Catalog> implements RDFElement, DcatRdfPrefix { /* @@ -93,17 +95,19 @@ public Catalog(Collection<Title> titles, Collection<Description> descriptions, P addDataset(dataset); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Publisher getPublisher() { return publisher; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Catalog setPublisher(Publisher publisher) { this.publisher = publisher; return this; } public List<Dataset> getDatasets() { - return datasets; + return new LinkedList<>(datasets); } public Catalog setDatasets(Collection<Dataset> datasets) { @@ -122,13 +126,15 @@ public Catalog addDataset(Dataset datasets) { } public List<Language> getLanguages() { - return languages; + return new LinkedList<>(languages); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Homepage getHomepage() { return homepage; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Catalog setHomepage(Homepage homepage) { this.homepage = homepage; return this; @@ -149,26 +155,30 @@ public Catalog addLanguage(Language language) { return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Issued getIssued() { return issued; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public License getLicense() { return license; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Catalog setLicense(License license) { this.license = license; return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Catalog setIssued(Issued issued) { this.issued = issued; return this; } public List<ThemeTaxonomy> getThemeTaxonomies() { - return themeTaxonomies; + return new LinkedList<>(themeTaxonomies); } public Catalog setThemeTaxonomies(Collection<ThemeTaxonomy> themeTaxonomies) { @@ -186,10 +196,12 @@ public Catalog addThemeTaxonomy(ThemeTaxonomy themeTaxonomies) { return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Modified getModified() { return modified; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Catalog setModified(Modified modified) { this.modified = modified; return this; diff --git a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/ContactPoint.java b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/ContactPoint.java index 6d3423d94..d6d2fd297 100644 --- a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/ContactPoint.java +++ b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/ContactPoint.java @@ -46,7 +46,7 @@ public ContactPoint(Collection<VCardOrganization> organizations) { } public List<VCardOrganization> getOrganizations() { - return organizations; + return new LinkedList<>(organizations); } private ContactPoint setOrganizations(Collection<VCardOrganization> organizations) { diff --git a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/Dataset.java b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/Dataset.java index 4102399ad..7bfbd7c05 100644 --- a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/Dataset.java +++ b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/Dataset.java @@ -38,6 +38,8 @@ import org.n52.shetland.rdf.dct.Theme; import org.n52.shetland.rdf.dct.Title; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class Dataset extends AbstractTitleDescription<Dataset> implements ResourceAdder, DcatRdfPrefix { /* @@ -131,7 +133,7 @@ public Dataset(Collection<Title> titles, Collection<Description> descriptions) { } public List<Identifier> getIdentifiers() { - return identifiers; + return new LinkedList<>(identifiers); } public Dataset setIdentifiers(Collection<Identifier> identifiers) { @@ -150,7 +152,7 @@ public Dataset addIdentifier(Identifier identifier) { } public List<Keyword> getKeywords() { - return keywords; + return new LinkedList<>(keywords); } public Dataset setKeywords(Collection<Keyword> keywords) { @@ -168,17 +170,19 @@ public Dataset addKeyword(Keyword keyword) { return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AccrualPeriodicity getAccrualPeriodicity() { return accrualPeriodicity; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Dataset setAccrualPeriodicity(AccrualPeriodicity accrualPeriodicity) { this.accrualPeriodicity = accrualPeriodicity; return this; } public List<Theme> getThemes() { - return themes; + return new LinkedList<>(themes); } public Dataset setThemes(Collection<Theme> themes) { @@ -196,17 +200,19 @@ public Dataset addTheme(Theme theme) { return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Publisher getPublisher() { return publisher; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Dataset setPublisher(Publisher publisher) { this.publisher = publisher; return this; } public List<Language> getLanguages() { - return languages; + return new LinkedList<>(languages); } public Dataset setLanguages(Collection<Language> languages) { @@ -224,26 +230,30 @@ public Dataset addLanguage(Language language) { return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Issued getIssued() { return issued; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public License getLicense() { return license; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Dataset setLicense(License license) { this.license = license; return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Dataset setIssued(Issued issued) { this.issued = issued; return this; } public List<ThemeTaxonomy> getThemeTaxonomies() { - return themeTaxonomies; + return new LinkedList<>(themeTaxonomies); } public Dataset setThemeTaxonomies(Collection<ThemeTaxonomy> themeTaxonomies) { @@ -261,17 +271,19 @@ public Dataset addThemeTaxonomy(ThemeTaxonomy themeTaxonomy) { return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Modified getModified() { return modified; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Dataset setModified(Modified modified) { this.modified = modified; return this; } public List<ContactPoint> getContactPoints() { - return contactPoints; + return new LinkedList<>(contactPoints); } public Dataset setContactPoints(Collection<ContactPoint> contactPoints) { @@ -289,17 +301,19 @@ public Dataset addContactPoint(ContactPoint contactPoint) { return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AccessRights getAccessRights() { return accessRights; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Dataset setAccessRights(AccessRights accessRights) { this.accessRights = accessRights; return this; } public List<LandingPage> getLandingPages() { - return landingPages; + return new LinkedList<>(landingPages); } public Dataset setLandingPages(Collection<LandingPage> landingPages) { @@ -311,7 +325,7 @@ public Dataset setLandingPages(Collection<LandingPage> landingPages) { } public List<DistributionProperty> getDistributions() { - return distributions; + return new LinkedList<>(distributions); } public Dataset setDistributions(Collection<DistributionProperty> distributions) { @@ -337,7 +351,7 @@ public Dataset addLandingPage(LandingPage landingPage) { } public List<Spatial> getSpatials() { - return spatials; + return new LinkedList<>(spatials); } public Dataset setSpatials(Collection<Spatial> spatials) { diff --git a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/Distribution.java b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/Distribution.java index 94917d28b..624c065ff 100644 --- a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/Distribution.java +++ b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/Distribution.java @@ -28,6 +28,8 @@ import org.n52.shetland.rdf.dct.Format; import org.n52.shetland.rdf.dct.License; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class Distribution extends AbstractTitleDescription<Distribution> implements RDFElement, DcatRdfPrefix { /* * title -> 0..n description -> 0..n @@ -62,7 +64,7 @@ public Distribution(AccessURL accessURL) { } public List<AccessURL> getAccessURLs() { - return accessURLs; + return new LinkedList<>(accessURLs); } public Distribution setAccessURLs(List<AccessURL> accessURLs) { @@ -81,7 +83,7 @@ public Distribution addAccessURL(AccessURL accessURL) { } public List<DownloadURL> getDownloadURLs() { - return downloadURLs; + return new LinkedList<>(downloadURLs); } public Distribution setDownloadURLs(List<DownloadURL> downloadURLs) { @@ -99,18 +101,22 @@ public Distribution addDownloadURL(DownloadURL downloadURL) { return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Format getFormat() { return format; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setFormat(Format format) { this.format = format; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public License getLicense() { return license; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setLicense(License license) { this.license = license; } diff --git a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/DistributionProperty.java b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/DistributionProperty.java index 2d96e7cb0..f9056e899 100644 --- a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/DistributionProperty.java +++ b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dcat/DistributionProperty.java @@ -22,6 +22,8 @@ import org.apache.jena.vocabulary.DCAT; import org.n52.shetland.rdf.AbstractResource; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class DistributionProperty extends AbstractResource implements DcatRdfPrefix { private Distribution distribution; @@ -30,11 +32,13 @@ public DistributionProperty(String value) { super(value); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public DistributionProperty(Distribution distribution) { super(null); this.distribution = distribution; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Distribution getDistribution() { return distribution; } diff --git a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Location.java b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Location.java index 5145b6a95..9b59e62c3 100644 --- a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Location.java +++ b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Location.java @@ -39,7 +39,7 @@ public Location(Collection<Geometry> geometries) { } public List<Geometry> getGeometries() { - return geometries; + return new LinkedList<>(geometries); } public Location setGeometries(Collection<Geometry> geometries) { diff --git a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Spatial.java b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Spatial.java index f8a2b190d..95f308e0b 100644 --- a/shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Spatial.java +++ b/shetland/rdf/src/main/java/org/n52/shetland/rdf/dct/Spatial.java @@ -45,7 +45,7 @@ public Spatial(Collection<Location> locations) { } public List<Location> getLocations() { - return locations; + return new LinkedList<>(locations); } public Spatial setLocations(Collection<Location> locations) { diff --git a/shetland/rdf/src/main/java/org/n52/shetland/rdf/foaf/Organization.java b/shetland/rdf/src/main/java/org/n52/shetland/rdf/foaf/Organization.java index 67a377215..88a1e5832 100644 --- a/shetland/rdf/src/main/java/org/n52/shetland/rdf/foaf/Organization.java +++ b/shetland/rdf/src/main/java/org/n52/shetland/rdf/foaf/Organization.java @@ -22,24 +22,30 @@ import org.apache.jena.vocabulary.RDF; import org.n52.shetland.rdf.RDFElement; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class Organization implements RDFElement, FoafRdfPrefix { private Name name; private MBox mBox; + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Name getName() { return name; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setName(Name name) { this.name = name; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public MBox getmBox() { return mBox; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setmBox(MBox mBox) { this.mBox = mBox; } diff --git a/shetland/rdf/src/main/java/org/n52/shetland/rdf/vcard4/VCardOrganization.java b/shetland/rdf/src/main/java/org/n52/shetland/rdf/vcard4/VCardOrganization.java index a53e20ee5..17d89c6d5 100644 --- a/shetland/rdf/src/main/java/org/n52/shetland/rdf/vcard4/VCardOrganization.java +++ b/shetland/rdf/src/main/java/org/n52/shetland/rdf/vcard4/VCardOrganization.java @@ -21,6 +21,8 @@ import org.apache.jena.vocabulary.VCARD4; import org.n52.shetland.rdf.ResourceCreator; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class VCardOrganization implements ResourceCreator, Vcard4RdfPrefix { private FN fn; @@ -29,26 +31,32 @@ public class VCardOrganization implements ResourceCreator, Vcard4RdfPrefix { private HasEmail hasEmail; + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public FN getFn() { return fn; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setFn(FN fn) { this.fn = fn; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Email getEmail() { return email; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setEmail(Email email) { this.email = email; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public HasEmail getHasEmail() { return hasEmail; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setHasEmail(HasEmail hasEmail) { this.hasEmail = hasEmail; } diff --git a/svalbard/core/src/main/java/org/n52/svalbard/decode/AbstractDelegatingDecoder.java b/svalbard/core/src/main/java/org/n52/svalbard/decode/AbstractDelegatingDecoder.java index 6e0d6c856..de70e595d 100644 --- a/svalbard/core/src/main/java/org/n52/svalbard/decode/AbstractDelegatingDecoder.java +++ b/svalbard/core/src/main/java/org/n52/svalbard/decode/AbstractDelegatingDecoder.java @@ -17,6 +17,8 @@ import javax.inject.Inject; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -26,11 +28,13 @@ public abstract class AbstractDelegatingDecoder<T, S> implements Decoder<T, S> { private DecoderRepository decoderRepository; + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public DecoderRepository getDecoderRepository() { return decoderRepository; } @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setDecoderRepository(DecoderRepository decoderRepository) { this.decoderRepository = decoderRepository; } diff --git a/svalbard/core/src/main/java/org/n52/svalbard/encode/AbstractDelegatingEncoder.java b/svalbard/core/src/main/java/org/n52/svalbard/encode/AbstractDelegatingEncoder.java index e19602a17..2c6005fc5 100644 --- a/svalbard/core/src/main/java/org/n52/svalbard/encode/AbstractDelegatingEncoder.java +++ b/svalbard/core/src/main/java/org/n52/svalbard/encode/AbstractDelegatingEncoder.java @@ -17,6 +17,8 @@ import javax.inject.Inject; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -29,11 +31,13 @@ public abstract class AbstractDelegatingEncoder<T, S> implements Encoder<T, S> { private EncoderRepository encoderRepository; + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public EncoderRepository getEncoderRepository() { return encoderRepository; } @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setEncoderRepository(EncoderRepository encoderRepository) { this.encoderRepository = encoderRepository; } diff --git a/svalbard/core/src/main/java/org/n52/svalbard/encode/SchemaRepository.java b/svalbard/core/src/main/java/org/n52/svalbard/encode/SchemaRepository.java index 589ae93e4..dbb736a64 100644 --- a/svalbard/core/src/main/java/org/n52/svalbard/encode/SchemaRepository.java +++ b/svalbard/core/src/main/java/org/n52/svalbard/encode/SchemaRepository.java @@ -30,6 +30,8 @@ import com.google.common.collect.Maps; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -42,6 +44,7 @@ public class SchemaRepository implements Constructable { private EncoderRepository encoderRepository; @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setEncoderRepository(EncoderRepository encoderRepository) { this.encoderRepository = encoderRepository; } diff --git a/svalbard/core/src/main/java/org/n52/svalbard/encode/UVFEncoder.java b/svalbard/core/src/main/java/org/n52/svalbard/encode/UVFEncoder.java index c24b9808a..1d8ec1254 100644 --- a/svalbard/core/src/main/java/org/n52/svalbard/encode/UVFEncoder.java +++ b/svalbard/core/src/main/java/org/n52/svalbard/encode/UVFEncoder.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -192,7 +193,7 @@ public UVFEncoder() { @Override public Set<EncoderKey> getKeys() { - return ENCODER_KEYS; + return Collections.unmodifiableSet(ENCODER_KEYS); } @Override diff --git a/svalbard/core/src/main/java/org/n52/svalbard/util/SweHelper.java b/svalbard/core/src/main/java/org/n52/svalbard/util/SweHelper.java index 2d21e02e6..52faa8ad3 100644 --- a/svalbard/core/src/main/java/org/n52/svalbard/util/SweHelper.java +++ b/svalbard/core/src/main/java/org/n52/svalbard/util/SweHelper.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -506,7 +507,7 @@ public SweQuantity createSweQuantity(Object value, String axis, String uom) { * @return the northingNames */ public Set<String> getNorthingNames() { - return northingNames; + return new LinkedHashSet<>(northingNames); } /** @@ -535,7 +536,7 @@ public boolean hasNorthingName(String... names) { * @return the eastingNames */ public Set<String> getEastingNames() { - return eastingNames; + return new LinkedHashSet<>(eastingNames); } /** @@ -564,7 +565,7 @@ public boolean hasEastingName(String... names) { * @return the altitudeNames */ public Set<String> getAltitudeNames() { - return altitudeNames; + return new LinkedHashSet<>(altitudeNames); } /** diff --git a/svalbard/core/src/main/java/org/n52/svalbard/util/XmlOptionsHelper.java b/svalbard/core/src/main/java/org/n52/svalbard/util/XmlOptionsHelper.java index f584ad89b..fe34359be 100644 --- a/svalbard/core/src/main/java/org/n52/svalbard/util/XmlOptionsHelper.java +++ b/svalbard/core/src/main/java/org/n52/svalbard/util/XmlOptionsHelper.java @@ -37,6 +37,8 @@ import org.n52.svalbard.encode.EncoderRepository; import org.n52.svalbard.encode.SchemaAwareEncoder; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * XML utility class * @@ -57,6 +59,7 @@ public final class XmlOptionsHelper implements Destroyable, Producer<XmlOptions> private boolean prettyPrint = true; @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setEncoderRepository(EncoderRepository encoderRepository) { this.encoderRepository = encoderRepository; } @@ -83,6 +86,7 @@ private Map<String, String> getPrefixMap() { * * @return SOS 1.0.0 XML options */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public XmlOptions getXmlOptions() { if (xmlOptions == null) { lock.lock(); diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index a419e4b6b..45e30965a 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -58,6 +58,7 @@ <dependency> <groupId>com.siemens.ct.exi</groupId> <artifactId>exificient</artifactId> + <scope>test</scope> <exclusions> <exclusion> <groupId>javax.xml.bind</groupId> @@ -91,6 +92,7 @@ <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.xmlbeans</groupId> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index ba810eddb..26267f499 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -61,6 +61,7 @@ <dependency> <groupId>com.github.fge</groupId> <artifactId>jackson-coreutils</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 1ed9e1add..d64276d40 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -85,10 +85,12 @@ <dependency> <groupId>com.github.fge</groupId> <artifactId>jackson-coreutils</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -147,6 +149,7 @@ <dependency> <groupId>com.github.fge</groupId> <artifactId>json-schema-core</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/svalbard/json/src/main/java/org/n52/svalbard/encode/json/GeoJSONEncoder.java b/svalbard/json/src/main/java/org/n52/svalbard/encode/json/GeoJSONEncoder.java index d4e80d51a..39b3d26cb 100644 --- a/svalbard/json/src/main/java/org/n52/svalbard/encode/json/GeoJSONEncoder.java +++ b/svalbard/json/src/main/java/org/n52/svalbard/encode/json/GeoJSONEncoder.java @@ -41,8 +41,7 @@ * * @since 1.0.0 */ -public class GeoJSONEncoder - extends JSONEncoder<Geometry> { +public class GeoJSONEncoder extends JSONEncoder<Geometry> { public static final int DEFAULT_SRID = 4326; public static final String SRID_LINK_PREFIX = "http://www.opengis.net/def/crs/EPSG/0/"; @@ -54,8 +53,7 @@ public GeoJSONEncoder() { } @Override - public ObjectNode encodeJSON(Geometry value) - throws JSONEncodingException { + public ObjectNode encodeJSON(Geometry value) throws JSONEncodingException { if (value == null) { return null; } else { @@ -63,8 +61,7 @@ public ObjectNode encodeJSON(Geometry value) } } - protected ObjectNode encodeGeometry(Geometry geometry, int parentSrid) - throws JSONEncodingException { + protected ObjectNode encodeGeometry(Geometry geometry, int parentSrid) throws JSONEncodingException { Preconditions.checkNotNull(geometry); if (geometry.isEmpty()) { return null; @@ -148,8 +145,7 @@ protected ObjectNode encode(MultiPolygon geometry, int parentSrid) { return json; } - public ObjectNode encode(GeometryCollection geometry, int parentSrid) - throws JSONEncodingException { + public ObjectNode encode(GeometryCollection geometry, int parentSrid) throws JSONEncodingException { Preconditions.checkNotNull(geometry); ObjectNode json = jsonFactory.objectNode(); ArrayNode geometries = @@ -192,7 +188,7 @@ protected ArrayNode encodeCoordinates(Polygon geometry) { ArrayNode list = jsonFactory.arrayNode(); Coordinate[] coordinates = JTSHelper.getExteriorRingCoordinatesFromPolygon(geometry); list.add(encodeCoordinates(new CoordinateArraySequence(coordinates))); -// list.add(encodeCoordinates(geometry.getExteriorRing())); + // list.add(encodeCoordinates(geometry.getExteriorRing())); for (int i = 0; i < geometry.getNumInteriorRing(); ++i) { list.add(encodeCoordinates(geometry.getInteriorRingN(i))); } @@ -204,7 +200,7 @@ protected int encodeCRS(ObjectNode json, Geometry geometry, int parentSrid) { } protected int encodeCRS(int srid, int parentSrid, ObjectNode json) { - if (srid == parentSrid || srid == 0 || (parentSrid == DEFAULT_SRID && srid == DEFAULT_SRID)) { + if (srid == parentSrid || srid == 0 || parentSrid == DEFAULT_SRID && srid == DEFAULT_SRID) { return parentSrid; } else { json.putObject(JSONConstants.CRS).put(JSONConstants.TYPE, JSONConstants.LINK) diff --git a/svalbard/json/src/main/java/org/n52/svalbard/encode/json/GetResultTemplateResponseEncoder.java b/svalbard/json/src/main/java/org/n52/svalbard/encode/json/GetResultTemplateResponseEncoder.java index beff51452..27e1e3c18 100644 --- a/svalbard/json/src/main/java/org/n52/svalbard/encode/json/GetResultTemplateResponseEncoder.java +++ b/svalbard/json/src/main/java/org/n52/svalbard/encode/json/GetResultTemplateResponseEncoder.java @@ -42,6 +42,8 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -60,6 +62,7 @@ public GetResultTemplateResponseEncoder() { } @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setDecoderRepository(DecoderRepository decoderRepository) { this.decoderRepository = decoderRepository; } diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index ae4cc10f5..cb4c6a8c6 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -50,7 +50,11 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - + <dependency> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-annotations</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> diff --git a/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/expr/MethodCallExpr.java b/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/expr/MethodCallExpr.java index ef4ab4477..a6fcb3da6 100644 --- a/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/expr/MethodCallExpr.java +++ b/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/expr/MethodCallExpr.java @@ -19,6 +19,8 @@ import org.n52.svalbard.odata.core.expr.bool.BooleanExpr; import org.n52.svalbard.odata.core.expr.temporal.TemporalExpr; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -43,6 +45,7 @@ public class MethodCallExpr implements BooleanExpr, ArithmeticExpr, TemporalExpr * @param name the method name * @param parameters the parameters */ + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public MethodCallExpr(String name, List<Expr> parameters) { this.name = Objects.requireNonNull(name); this.parameters = Objects.requireNonNull(parameters); diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSoapDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSoapDecoder.java index b0b0574d9..e77da27a5 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSoapDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSoapDecoder.java @@ -41,6 +41,8 @@ import com.google.common.base.Joiner; import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> * @since 1.0.0 @@ -57,6 +59,7 @@ public AbstractSoapDecoder(String namespace) { } @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setSchemaRepository(SchemaRepository schemaRepository) { this.schemaRepository = schemaRepository; } diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractStringRequestDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractStringRequestDecoder.java index 906784bf4..7f33b4e3f 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractStringRequestDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractStringRequestDecoder.java @@ -24,11 +24,14 @@ import org.n52.svalbard.decode.exception.NoDecoderForKeyException; import org.n52.svalbard.util.CodingHelper; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public abstract class AbstractStringRequestDecoder implements Decoder<OwsServiceCommunicationObject, String> { private DecoderRepository decoderRepository; @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setDecoderRepository(DecoderRepository decoderRepository) { this.decoderRepository = decoderRepository; } diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java index 63d95079b..edee91171 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java @@ -30,6 +30,8 @@ import org.n52.svalbard.util.CodingHelper; import org.n52.svalbard.util.XmlHelper; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * {@link XmlObject} decoder for AQD e-Reporting requests * @@ -46,6 +48,7 @@ public class AqdDecoderv10 implements Decoder<OwsServiceCommunicationObject, Xml private DecoderRepository decoderRepository; @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setDecoderRepository(DecoderRepository decoderRepository) { this.decoderRepository = Objects.requireNonNull(decoderRepository); } diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/DescribeSensorResponseSwesDocumentDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/DescribeSensorResponseSwesDocumentDecoder.java index 363bbd132..a20dd9196 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/DescribeSensorResponseSwesDocumentDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/DescribeSensorResponseSwesDocumentDecoder.java @@ -15,6 +15,7 @@ */ package org.n52.svalbard.decode; +import java.util.Collections; import java.util.Set; import org.apache.xmlbeans.XmlException; @@ -81,7 +82,7 @@ public DescribeSensorResponse decode(XmlObject objectToDecode) throws DecodingEx @Override public Set<DecoderKey> getKeys() { - return DECODER_KEYS; + return Collections.unmodifiableSet(DECODER_KEYS); } } diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SweCommonDecoderV101.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SweCommonDecoderV101.java index 27d8caa3a..9fcee4581 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SweCommonDecoderV101.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SweCommonDecoderV101.java @@ -467,10 +467,12 @@ private SweQuantityRange parseQuantityRange(QuantityRange xbQuantityRange) throw if (xbQuantityRange.isSetValue()) { try { List<?> value = xbQuantityRange.getValue(); - BigDecimal rangeStart = new BigDecimal(value.get(0).toString()); - BigDecimal rangeEnd = new BigDecimal(value.get(1).toString()); - sosQuantityRange.setValue(new RangeValue<>(rangeStart, rangeEnd)); - } catch (final NumberFormatException | NullPointerException | IndexOutOfBoundsException nfe) { + if (value != null && value.size() == 2 && value.get(0) != null && value.get(1) != null) { + BigDecimal rangeStart = new BigDecimal(value.get(0).toString()); + BigDecimal rangeEnd = new BigDecimal(value.get(1).toString()); + sosQuantityRange.setValue(new RangeValue<>(rangeStart, rangeEnd)); + } + } catch (final NumberFormatException | IndexOutOfBoundsException nfe) { throw createParsingException(nfe); } } diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractGmlEncoderv321.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractGmlEncoderv321.java index 5c3206663..26ff901eb 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractGmlEncoderv321.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractGmlEncoderv321.java @@ -43,8 +43,8 @@ protected XmlObject createFeaturePropertyTypeFrom(final AbstractFeature abstract } else { if (context.has(XmlBeansEncodingFlags.ENCODE) && !context.getBoolean(XmlBeansEncodingFlags.ENCODE) - || (abstractFeature instanceof FeatureWithEncode - && !((FeatureWithEncode) abstractFeature).isEncode())) { + || abstractFeature instanceof FeatureWithEncode + && !((FeatureWithEncode) abstractFeature).isEncode()) { featurePropertyType.setHref(abstractFeature.getIdentifierCodeWithAuthority().getValue()); if (abstractFeature.isSetName()) { featurePropertyType.setTitle(abstractFeature.getFirstName().getValue()); diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractXmlResponseEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractXmlResponseEncoder.java index df687c7f8..905808e13 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractXmlResponseEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractXmlResponseEncoder.java @@ -28,6 +28,8 @@ import org.n52.svalbard.util.N52XmlHelper; import org.n52.svalbard.util.XmlHelper; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import javax.inject.Inject; import java.io.IOException; import java.io.OutputStream; @@ -89,10 +91,12 @@ public AbstractXmlResponseEncoder(String service, String version, String operati } @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setSchemaRepository(SchemaRepository schemaRepository) { this.schemaRepository = schemaRepository; } + @SuppressFBWarnings({"EI_EXPOSE_REP"}) public SchemaRepository getSchemaRepository() { return schemaRepository; } diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv100.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv100.java index d1fd0dee0..299c4f261 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv100.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv100.java @@ -84,6 +84,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import net.opengis.om.x10.CategoryObservationDocument; import net.opengis.om.x10.CategoryObservationType; import net.opengis.om.x10.CountObservationDocument; @@ -148,6 +149,7 @@ public OmEncoderv100() { } @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setSweHelper(SweHelper sweHelper) { this.sweHelper = sweHelper; } @@ -292,7 +294,7 @@ private XmlObject createObservationCollection(AbstractObservationResponse respon for (OmObservation sosObservation : sosObservationCollection) { String observationType = checkObservationType(sosObservation); if (Strings.isNullOrEmpty(resultModel) - || (!Strings.isNullOrEmpty(resultModel) && observationType.equals(resultModel))) { + || !Strings.isNullOrEmpty(resultModel) && observationType.equals(resultModel)) { if (sosObservation.getValue() instanceof StreamingValue) { StreamingValue<?> streamingValue = (StreamingValue<?>) sosObservation.getValue(); while (streamingValue.hasNext()) { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java index 30c11ca91..2d3481c8d 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java @@ -89,6 +89,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import net.opengis.gml.x32.FeaturePropertyType; import net.opengis.gml.x32.TimeInstantPropertyType; import net.opengis.om.x20.OMObservationType; @@ -148,6 +149,7 @@ public OmEncoderv20() { } @Inject + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setSweHelper(SweHelper sweHelper) { this.sweHelper = sweHelper; } diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/SweCommonEncoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/SweCommonEncoderv20.java index d6f1e1f16..c6e387efd 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/SweCommonEncoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/SweCommonEncoderv20.java @@ -183,9 +183,8 @@ public class SweCommonEncoderv20 extends AbstractXmlEncoder<XmlObject, Object> i private static final String DEFAULT_ELEMENT_TYPE_NAME = "Components"; public SweCommonEncoderv20() { - LOGGER.debug("Encoder for the following keys initialized successfully: {}!", ENCODER_KEYS.stream() - .map(EncoderKey::toString) - .collect(joining(", "))); + LOGGER.debug("Encoder for the following keys initialized successfully: {}!", + ENCODER_KEYS.stream().map(EncoderKey::toString).collect(joining(", "))); } @Override @@ -333,8 +332,7 @@ private XmlObject asPropertyType(AbstractDataComponentType type) throws NotYetSu propertyType.setVector((VectorType) type); return propertyType; } else { - throw new NotYetSupportedEncodingException(type.getClass() - .getName(), type); + throw new NotYetSupportedEncodingException(type.getClass().getName(), type); } } @@ -400,8 +398,7 @@ private XmlObject asDocument(AbstractDataComponentType type) throws NotYetSuppor document.setVector((VectorType) type); return document; } else { - throw new NotYetSupportedEncodingException(type.getClass() - .getName(), type); + throw new NotYetSupportedEncodingException(type.getClass().getName(), type); } } @@ -409,8 +406,7 @@ private XmlString createValues(List<List<String>> values, SweAbstractEncoding en // TODO How to deal with the decimal separator - is it an issue here? SweTextEncoding textEncoding = (SweTextEncoding) encoding; - String valueString = values.stream() - .map(block -> String.join(textEncoding.getTokenSeparator(), block)) + String valueString = values.stream().map(block -> String.join(textEncoding.getTokenSeparator(), block)) .collect(joining(textEncoding.getBlockSeparator())); // create XB result object XmlString xmlString = XmlString.Factory.newInstance(getXmlOptions()); @@ -423,8 +419,7 @@ private DataRecordType.Field createField(SweField field) throws EncodingExceptio DataRecordType.Field xmlField = DataRecordType.Field.Factory.newInstance(getXmlOptions()); if (field.isSetName()) { - xmlField.setName(NcName.makeValid(field.getName() - .getValue())); + xmlField.setName(NcName.makeValid(field.getName().getValue())); } if (element != null) { @@ -482,10 +477,7 @@ private TextEncodingType createTextEncoding(SweTextEncoding encoding) { private UnitReference createUnitReference(final UoM uom) { final UnitReference unitReference = UnitReference.Factory.newInstance(getXmlOptions()); - if (!uom.isSetLink() && (uom.getUom() - .startsWith(URN) - || uom.getUom() - .startsWith(HTTP))) { + if (!uom.isSetLink() && (uom.getUom().startsWith(URN) || uom.getUom().startsWith(HTTP))) { unitReference.setHref(uom.getUom()); } else { unitReference.setCode(uom.getUom()); @@ -515,27 +507,13 @@ private AllowedValuesPropertyType createConstraint(AllowedValuesPropertyType avp createAllowedValues(avpt.addNewAllowedValues(), constraint.getInstance()); } else if (constraint.isReference()) { org.n52.shetland.w3c.xlink.Reference reference = constraint.getReference(); - reference.getActuate() - .map(Actuate::toString) - .map(ActuateType.Enum::forString) - .ifPresent(avpt::setActuate); - reference.getArcrole() - .ifPresent(avpt::setArcrole); - reference.getHref() - .map(URI::toString) - .ifPresent(avpt::setHref); - reference.getRole() - .ifPresent(avpt::setRole); - reference.getShow() - .map(Show::toString) - .map(ShowType.Enum::forString) - .ifPresent(avpt::setShow); - reference.getTitle() - .ifPresent(avpt::setTitle); - reference.getType() - .map(Type::toString) - .map(TypeType.Enum::forString) - .ifPresent(avpt::setType); + reference.getActuate().map(Actuate::toString).map(ActuateType.Enum::forString).ifPresent(avpt::setActuate); + reference.getArcrole().ifPresent(avpt::setArcrole); + reference.getHref().map(URI::toString).ifPresent(avpt::setHref); + reference.getRole().ifPresent(avpt::setRole); + reference.getShow().map(Show::toString).map(ShowType.Enum::forString).ifPresent(avpt::setShow); + reference.getTitle().ifPresent(avpt::setTitle); + reference.getType().map(Type::toString).map(TypeType.Enum::forString).ifPresent(avpt::setType); } return avpt; } @@ -546,27 +524,13 @@ private AllowedTimesPropertyType createConstraint(AllowedTimesPropertyType atpt, createAllowedTimes(atpt.addNewAllowedTimes(), constraint.getInstance()); } else if (constraint.isReference()) { org.n52.shetland.w3c.xlink.Reference reference = constraint.getReference(); - reference.getActuate() - .map(Actuate::toString) - .map(ActuateType.Enum::forString) - .ifPresent(atpt::setActuate); - reference.getArcrole() - .ifPresent(atpt::setArcrole); - reference.getHref() - .map(URI::toString) - .ifPresent(atpt::setHref); - reference.getRole() - .ifPresent(atpt::setRole); - reference.getShow() - .map(Show::toString) - .map(ShowType.Enum::forString) - .ifPresent(atpt::setShow); - reference.getTitle() - .ifPresent(atpt::setTitle); - reference.getType() - .map(Type::toString) - .map(TypeType.Enum::forString) - .ifPresent(atpt::setType); + reference.getActuate().map(Actuate::toString).map(ActuateType.Enum::forString).ifPresent(atpt::setActuate); + reference.getArcrole().ifPresent(atpt::setArcrole); + reference.getHref().map(URI::toString).ifPresent(atpt::setHref); + reference.getRole().ifPresent(atpt::setRole); + reference.getShow().map(Show::toString).map(ShowType.Enum::forString).ifPresent(atpt::setShow); + reference.getTitle().ifPresent(atpt::setTitle); + reference.getType().map(Type::toString).map(TypeType.Enum::forString).ifPresent(atpt::setType); } return atpt; } @@ -577,27 +541,13 @@ private AllowedTokensPropertyType createConstraint(AllowedTokensPropertyType atp createAllowedTokens(atpt.addNewAllowedTokens(), constraint.getInstance()); } else if (constraint.isReference()) { org.n52.shetland.w3c.xlink.Reference reference = constraint.getReference(); - reference.getActuate() - .map(Actuate::toString) - .map(ActuateType.Enum::forString) - .ifPresent(atpt::setActuate); - reference.getArcrole() - .ifPresent(atpt::setArcrole); - reference.getHref() - .map(URI::toString) - .ifPresent(atpt::setHref); - reference.getRole() - .ifPresent(atpt::setRole); - reference.getShow() - .map(Show::toString) - .map(ShowType.Enum::forString) - .ifPresent(atpt::setShow); - reference.getTitle() - .ifPresent(atpt::setTitle); - reference.getType() - .map(Type::toString) - .map(TypeType.Enum::forString) - .ifPresent(atpt::setType); + reference.getActuate().map(Actuate::toString).map(ActuateType.Enum::forString).ifPresent(atpt::setActuate); + reference.getArcrole().ifPresent(atpt::setArcrole); + reference.getHref().map(URI::toString).ifPresent(atpt::setHref); + reference.getRole().ifPresent(atpt::setRole); + reference.getShow().map(Show::toString).map(ShowType.Enum::forString).ifPresent(atpt::setShow); + reference.getTitle().ifPresent(atpt::setTitle); + reference.getType().map(Type::toString).map(TypeType.Enum::forString).ifPresent(atpt::setType); } return atpt; @@ -605,30 +555,21 @@ private AllowedTokensPropertyType createConstraint(AllowedTokensPropertyType atp private AllowedValuesType createAllowedValues(AllowedValuesType avt, Nillable<SweAllowedValues> instance) { if (instance.isPresent()) { - if (instance.get() - .isSetGmlID()) { - avt.setId(instance.get() - .getGmlId()); + if (instance.get().isSetGmlID()) { + avt.setId(instance.get().getGmlId()); } - if (instance.get() - .isSetValue()) { - for (Double value : instance.get() - .getValue()) { - avt.addNewValue() - .setDoubleValue(value); + if (instance.get().isSetValue()) { + for (Double value : instance.get().getValue()) { + avt.addNewValue().setDoubleValue(value); } } - if (instance.get() - .isSetInterval()) { - for (RangeValue<Double> interval : instance.get() - .getInterval()) { + if (instance.get().isSetInterval()) { + for (RangeValue<Double> interval : instance.get().getInterval()) { avt.addInterval(interval.getRangeAsList()); } } - if (instance.get() - .isSetSignificantFigures()) { - avt.setSignificantFigures(instance.get() - .getSignificantFigures()); + if (instance.get().isSetSignificantFigures()) { + avt.setSignificantFigures(instance.get().getSignificantFigures()); } } return avt; @@ -636,23 +577,16 @@ private AllowedValuesType createAllowedValues(AllowedValuesType avt, Nillable<Sw private AllowedTokensType createAllowedTokens(AllowedTokensType att, Nillable<SweAllowedTokens> instance) { if (instance.isPresent()) { - if (instance.get() - .isSetGmlID()) { - att.setId(instance.get() - .getGmlId()); + if (instance.get().isSetGmlID()) { + att.setId(instance.get().getGmlId()); } - if (instance.get() - .isSetValue()) { - for (String value : instance.get() - .getValue()) { - att.addNewValue() - .setStringValue(value); + if (instance.get().isSetValue()) { + for (String value : instance.get().getValue()) { + att.addNewValue().setStringValue(value); } } - if (instance.get() - .isSetPattern()) { - att.setPattern(instance.get() - .getPattern()); + if (instance.get().isSetPattern()) { + att.setPattern(instance.get().getPattern()); } } return att; @@ -660,23 +594,16 @@ private AllowedTokensType createAllowedTokens(AllowedTokensType att, Nillable<Sw private AllowedTimesType createAllowedTimes(AllowedTimesType att, Nillable<SweAllowedTimes> instance) { if (instance.isPresent()) { - if (instance.get() - .isSetGmlID()) { - att.setId(instance.get() - .getGmlId()); + if (instance.get().isSetGmlID()) { + att.setId(instance.get().getGmlId()); } - if (instance.get() - .isSetValue()) { - for (DateTime value : instance.get() - .getValue()) { - att.addNewValue() - .setStringValue(DateTimeHelper.formatDateTime2IsoString(value)); + if (instance.get().isSetValue()) { + for (DateTime value : instance.get().getValue()) { + att.addNewValue().setStringValue(DateTimeHelper.formatDateTime2IsoString(value)); } } - if (instance.get() - .isSetInterval()) { - for (RangeValue<DateTime> interval : instance.get() - .getInterval()) { + if (instance.get().isSetInterval()) { + for (RangeValue<DateTime> interval : instance.get().getInterval()) { List<String> list = Lists.newArrayListWithCapacity(2); list.add(DateTimeHelper.formatDateTime2IsoString(interval.getRangeStart())); if (interval.isSetEndValue()) { @@ -685,10 +612,8 @@ private AllowedTimesType createAllowedTimes(AllowedTimesType att, Nillable<SweAl att.addInterval(list); } } - if (instance.get() - .isSetSignificantFigures()) { - att.setSignificantFigures(instance.get() - .getSignificantFigures()); + if (instance.get().isSetSignificantFigures()) { + att.setSignificantFigures(instance.get().getSignificantFigures()); } } return att; @@ -696,13 +621,12 @@ private AllowedTimesType createAllowedTimes(AllowedTimesType att, Nillable<SweAl private QualityPropertyType[] createQuality(final SweQualityHolder quality) throws EncodingException { if (!quality.isEmpty()) { - final ArrayList<QualityPropertyType> xbQualities = Lists.newArrayListWithCapacity(quality.getQuality() - .size()); + final ArrayList<QualityPropertyType> xbQualities = + Lists.newArrayListWithCapacity(quality.getQuality().size()); for (final SweQuality sweQuality : quality.getQuality()) { final QualityPropertyType xbQuality = QualityPropertyType.Factory.newInstance(); if (sweQuality instanceof SweText) { - xbQuality.addNewText() - .set(((SweText) sweQuality).accept(new SweDataComponentVisitorImpl())); + xbQuality.addNewText().set(((SweText) sweQuality).accept(new SweDataComponentVisitorImpl())); } else if (sweQuality instanceof SweCategory) { xbQuality.addNewCategory() .set(((SweCategory) sweQuality).accept(new SweDataComponentVisitorImpl())); @@ -727,6 +651,7 @@ private UnitReference createUnknownUnitReference() { return unitReference; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public class SweDataComponentVisitorImpl implements SweDataComponentVisitor<AbstractDataComponentType, EncodingException> { @Override @@ -774,23 +699,17 @@ public AbstractDataComponentType visit(SweDataArray component) throws EncodingEx DataArrayType xmlDataArray = DataArrayType.Factory.newInstance(getXmlOptions()); if (component.isSetElementCount()) { CountType xbCount = CountType.Factory.newInstance(getXmlOptions()); - if (component.getElementCount() - .isSetValue()) { - xbCount.setValue(new BigInteger(Integer.toString(component.getElementCount() - .getValue()))); + if (component.getElementCount().isSetValue()) { + xbCount.setValue(new BigInteger(Integer.toString(component.getElementCount().getValue()))); } - xmlDataArray.addNewElementCount() - .setCount(xbCount); + xmlDataArray.addNewElementCount().setCount(xbCount); } else { - xmlDataArray.addNewElementCount() - .addNewCount(); + xmlDataArray.addNewElementCount().addNewCount(); } if (component.isSetElementTyp()) { DataArrayType.ElementType elementType = xmlDataArray.addNewElementType(); - if (component.getElementType() - .isSetDefinition()) { - elementType.setName(component.getElementType() - .getDefinition()); + if (component.getElementType().isSetDefinition()) { + elementType.setName(component.getElementType().getDefinition()); } else { elementType.setName(SweCommonEncoderv20.DEFAULT_ELEMENT_TYPE_NAME); } @@ -809,20 +728,18 @@ public AbstractDataComponentType visit(SweDataArray component) throws EncodingEx } xbDataRecord.setFieldArray(xbFields.toArray(new Field[xbFields.size()])); } - elementType.addNewAbstractDataComponent() - .set(xbDataRecord); - elementType.getAbstractDataComponent() - .substitute(SweConstants.QN_DATA_RECORD_SWE_200, DataRecordType.type); + elementType.addNewAbstractDataComponent().set(xbDataRecord); + elementType.getAbstractDataComponent().substitute(SweConstants.QN_DATA_RECORD_SWE_200, + DataRecordType.type); } if (component.isSetEncoding()) { Encoding xbEncoding = xmlDataArray.addNewEncoding(); xbEncoding.setAbstractEncoding(createAbstractEncoding(component.getEncoding())); - xbEncoding.getAbstractEncoding() - .substitute(SweConstants.QN_TEXT_ENCODING_SWE_200, TextEncodingType.type); + xbEncoding.getAbstractEncoding().substitute(SweConstants.QN_TEXT_ENCODING_SWE_200, + TextEncodingType.type); } if (component.isSetValues()) { - xmlDataArray.addNewValues() - .set(createValues(component.getValues(), component.getEncoding())); + xmlDataArray.addNewValues().set(createValues(component.getValues(), component.getEncoding())); } return xmlDataArray; } @@ -843,8 +760,7 @@ public AbstractDataComponentType visit(SweCount component) throws EncodingExcept public AbstractDataComponentType visit(SweCountRange component) throws EncodingException { CountRangeType xml = CountRangeType.Factory.newInstance(getXmlOptions()); if (component.isSetValue()) { - xml.setValue(component.getValue() - .getRangeAsList()); + xml.setValue(component.getValue().getRangeAsList()); } if (component.isSetContstraint()) { createConstraint(xml.addNewConstraint(), component.getConstraint()); @@ -865,8 +781,7 @@ public AbstractDataComponentType visit(SweBoolean component) throws EncodingExce public AbstractDataComponentType visit(SweCategory component) throws EncodingException { CategoryType xml = CategoryType.Factory.newInstance(getXmlOptions()); if (component.getCodeSpace() != null) { - xml.addNewCodeSpace() - .setHref(component.getCodeSpace()); + xml.addNewCodeSpace().setHref(component.getCodeSpace()); } if (component.isSetValue()) { xml.setValue(component.getValue()); @@ -881,12 +796,10 @@ public AbstractDataComponentType visit(SweCategory component) throws EncodingExc public AbstractDataComponentType visit(SweCategoryRange component) throws EncodingException { CategoryRangeType xml = CategoryRangeType.Factory.newInstance(getXmlOptions()); if (component.isSetUom()) { - xml.addNewCodeSpace() - .setHref(component.getUom()); + xml.addNewCodeSpace().setHref(component.getUom()); } if (component.isSetValue()) { - xml.setValue(component.getValue() - .getRangeAsList()); + xml.setValue(component.getValue().getRangeAsList()); } if (component.isSetContstraint()) { createConstraint(xml.addNewConstraint(), component.getConstraint()); @@ -906,8 +819,7 @@ public AbstractDataComponentType visit(SweQuantity component) throws EncodingExc xml.setAxisID(component.getAxisID()); } if (component.isSetValue()) { - xml.setValue(component.getValue() - .doubleValue()); + xml.setValue(component.getValue().doubleValue()); } if (component.isSetUom()) { xml.setUom(createUnitReference(component.getUomObject())); @@ -931,8 +843,7 @@ public AbstractDataComponentType visit(SweQuantityRange component) throws Encodi xml.setAxisID(component.getAxisID()); } if (component.isSetValue()) { - xml.setValue(component.getValue() - .getRangeAsList()); + xml.setValue(component.getValue().getRangeAsList()); } if (component.isSetUom()) { xml.setUom(createUnitReference(component.getUom())); @@ -984,12 +895,10 @@ public AbstractDataComponentType visit(SweTime component) throws EncodingExcepti public AbstractDataComponentType visit(SweTimeRange component) throws EncodingException { TimeRangeType xml = TimeRangeType.Factory.newInstance(getXmlOptions()); if (component.isSetUom()) { - xml.addNewUom() - .setHref(component.getUom()); + xml.addNewUom().setHref(component.getUom()); } if (component.isSetValue()) { - xml.setValue(component.getValue() - .getRangeAsStringList()); + xml.setValue(component.getValue().getRangeAsStringList()); } if (component.isSetQuality()) { xml.setQualityArray(createQuality(component.getQuality())); @@ -1016,8 +925,7 @@ public AbstractDataComponentType visit(SweVector component) throws EncodingExcep } if (component.isSetCoordinates()) { for (SweCoordinate<?> coordinate : component.getCoordinates()) { - xbVector.addNewCoordinate() - .set(createCoordinate(coordinate)); + xbVector.addNewCoordinate().set(createCoordinate(coordinate)); } } return xbVector; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/TsmlTDREncoderv10.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/TsmlTDREncoderv10.java index bdd165f49..afaad434f 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/TsmlTDREncoderv10.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/TsmlTDREncoderv10.java @@ -81,9 +81,7 @@ * @since 1.0.0 * */ -public class TsmlTDREncoderv10 - extends - AbstractTsmlEncoderv10 { +public class TsmlTDREncoderv10 extends AbstractTsmlEncoderv10 { private static final Logger LOGGER = LoggerFactory.getLogger(TsmlTDREncoderv10.class); @@ -92,13 +90,12 @@ public class TsmlTDREncoderv10 private static final Set<EncoderKey> ENCODER_KEYS = createEncoderKeys(); - private static final ImmutableSet<SupportedType> SUPPORTED_TYPES = ImmutableSet.<SupportedType>builder() + private static final ImmutableSet<SupportedType> SUPPORTED_TYPES = ImmutableSet.<SupportedType> builder() .add(new ObservationType(TimeseriesMLConstants.OBSERVATION_TYPE_MEASURMENT_TDR)).build(); - private static final Map<String, Map<String, Set<String>>> SUPPORTED_RESPONSE_FORMATS = Collections - .singletonMap(SosConstants.SOS, Collections.singletonMap( - Sos2Constants.SERVICEVERSION, - Collections.singleton(TimeseriesMLConstants.NS_TSML_10))); + private static final Map<String, Map<String, Set<String>>> SUPPORTED_RESPONSE_FORMATS = + Collections.singletonMap(SosConstants.SOS, Collections.singletonMap(Sos2Constants.SERVICEVERSION, + Collections.singleton(TimeseriesMLConstants.NS_TSML_10))); private static final String TIMESERIES_ID_PREFIX = "timeseries_"; @@ -108,7 +105,7 @@ public class TsmlTDREncoderv10 public TsmlTDREncoderv10() { LOGGER.debug("Encoder for the following keys initialized successfully: {}!", - Joiner.on(", ").join(ENCODER_KEYS)); + Joiner.on(", ").join(ENCODER_KEYS)); } @Override @@ -143,8 +140,8 @@ public void addNamespacePrefixToMap(Map<String, String> nameSpacePrefixMap) { @Override public Set<String> getSupportedResponseFormats(String service, String version) { - if (SUPPORTED_RESPONSE_FORMATS.get(service) != null && - SUPPORTED_RESPONSE_FORMATS.get(service).get(version) != null) { + if (SUPPORTED_RESPONSE_FORMATS.get(service) != null + && SUPPORTED_RESPONSE_FORMATS.get(service).get(version) != null) { return SUPPORTED_RESPONSE_FORMATS.get(service).get(version); } return Collections.emptySet(); @@ -153,8 +150,8 @@ public Set<String> getSupportedResponseFormats(String service, String version) { @Override public Set<SchemaLocation> getSchemaLocations() { return Sets.newHashSet(TimeseriesMLConstants.TSML_10_SCHEMA_LOCATION, - TimeseriesMLConstants.TSML_10_DR_SCHEMA_LOCATION, - GmlCoverageConstants.GML_COVERAGE_10_SCHEMA_LOCATION); + TimeseriesMLConstants.TSML_10_DR_SCHEMA_LOCATION, + GmlCoverageConstants.GML_COVERAGE_10_SCHEMA_LOCATION); } @Override @@ -163,8 +160,7 @@ public boolean supportsResultStreamingForMergedValues() { } @Override - public XmlObject encode(Object element, EncodingContext additionalValues) - throws EncodingException { + public XmlObject encode(Object element, EncodingContext additionalValues) throws EncodingException { if (element instanceof ObservationValue) { return encodeResult((ObservationValue<?>) element); } else { @@ -178,7 +174,7 @@ public void encode(Object objectToEncode, OutputStream outputStream, EncodingCon if (objectToEncode instanceof OmObservation) { try { new TsmlTDREncoderv10XmlStreamWriter(ctx.with(StreamingEncoderFlags.ENCODER, this), outputStream, - (OmObservation) objectToEncode).write(); + (OmObservation) objectToEncode).write(); } catch (XMLStreamException xmlse) { throw new EncodingException("Error while writing element to stream!", xmlse); } @@ -188,25 +184,23 @@ public void encode(Object objectToEncode, OutputStream outputStream, EncodingCon } @Override - protected XmlObject createResult(OmObservation sosObservation) - throws EncodingException { + protected XmlObject createResult(OmObservation sosObservation) throws EncodingException { return createMeasurementDomainRange(sosObservation); } @Override - protected XmlObject encodeResult(ObservationValue<?> observationValue) - throws EncodingException { + protected XmlObject encodeResult(ObservationValue<?> observationValue) throws EncodingException { return createMeasurementDomainRange((AbstractObservationValue<?>) observationValue); } @Override protected void addObservationType(OMObservationType xbObservation, String observationType) { if (!Strings.isNullOrEmpty(observationType)) { - if (observationType.equals(OmConstants.OBS_TYPE_MEASUREMENT) || - observationType.equals(TimeseriesMLConstants.OBSERVATION_TYPE_MEASURMENT_TDR)) { + if (observationType.equals(OmConstants.OBS_TYPE_MEASUREMENT) + || observationType.equals(TimeseriesMLConstants.OBSERVATION_TYPE_MEASURMENT_TDR)) { xbObservation.addNewType().setHref(TimeseriesMLConstants.OBSERVATION_TYPE_MEASURMENT_TDR); - } else if (observationType.equals(OmConstants.OBS_TYPE_CATEGORY_OBSERVATION) || - observationType.equals(TimeseriesMLConstants.OBSERVATION_TYPE_CATEGORICAL_TDR)) { + } else if (observationType.equals(OmConstants.OBS_TYPE_CATEGORY_OBSERVATION) + || observationType.equals(TimeseriesMLConstants.OBSERVATION_TYPE_CATEGORICAL_TDR)) { xbObservation.addNewType().setHref(TimeseriesMLConstants.OBSERVATION_TYPE_CATEGORICAL_TDR); } } @@ -219,25 +213,25 @@ protected OMObservationType createOmObservationType() { /** * Create a XML MeasurementTimeseriesDomainRange object from SOS observation for om:result * - * @param sosObservation SOS observation + * @param sosObservation + * SOS observation * * @return XML MeasurementTimeseriesDomainRange object for om:result * - * @throws EncodingException If an error occurs + * @throws EncodingException + * If an error occurs */ - private XmlObject createMeasurementDomainRange(OmObservation sosObservation) - throws EncodingException { - if (!sosObservation.getObservationConstellation().isSetObservationType() || - (sosObservation.getObservationConstellation().isSetObservationType() && isInvalidObservationType( - sosObservation.getObservationConstellation().getObservationType()))) { + private XmlObject createMeasurementDomainRange(OmObservation sosObservation) throws EncodingException { + if (!sosObservation.getObservationConstellation().isSetObservationType() + || sosObservation.getObservationConstellation().isSetObservationType() && isInvalidObservationType( + sosObservation.getObservationConstellation().getObservationType())) { throw new UnsupportedEncoderInputException(this, - sosObservation.getObservationConstellation() - .isSetObservationType()); + sosObservation.getObservationConstellation().isSetObservationType()); } - MeasurementTimeseriesDomainRangeDocument xbMearuementTimeseriesDomainRangeDoc - = MeasurementTimeseriesDomainRangeDocument.Factory.newInstance(); - MeasurementTimeseriesCoverageType xbMeasurementTimeseriesDomainRange = xbMearuementTimeseriesDomainRangeDoc - .addNewMeasurementTimeseriesDomainRange(); + MeasurementTimeseriesDomainRangeDocument xbMearuementTimeseriesDomainRangeDoc = + MeasurementTimeseriesDomainRangeDocument.Factory.newInstance(); + MeasurementTimeseriesCoverageType xbMeasurementTimeseriesDomainRange = + xbMearuementTimeseriesDomainRangeDoc.addNewMeasurementTimeseriesDomainRange(); xbMeasurementTimeseriesDomainRange.setId(TIMESERIES_ID_PREFIX + sosObservation.getObservationID()); // set time position list @@ -263,8 +257,8 @@ private XmlObject createMeasurementDomainRange(OmObservation sosObservation) } quantityList.setUom(unit); // set unit to SosObservableProperty if not set. - if (observableProperty instanceof OmObservableProperty && - !((OmObservableProperty) observableProperty).isSetUnit()) { + if (observableProperty instanceof OmObservableProperty + && !((OmObservableProperty) observableProperty).isSetUnit()) { ((OmObservableProperty) observableProperty).setUnit(unit); } // set up range set @@ -278,15 +272,15 @@ private XmlObject createMeasurementDomainRange(OmObservation sosObservation) private XmlObject createMeasurementDomainRange(AbstractObservationValue<?> observationValue) throws EncodingException { - if (!observationValue.isSetObservationType() || - isInvalidObservationType(observationValue.getObservationType())) { + if (!observationValue.isSetObservationType() + || isInvalidObservationType(observationValue.getObservationType())) { return null; } - MeasurementTimeseriesDomainRangeDocument xbMearuementTimeseriesDomainRangeDoc - = MeasurementTimeseriesDomainRangeDocument.Factory.newInstance(); - MeasurementTimeseriesCoverageType xbMeasurementTimeseriesDomainRange = xbMearuementTimeseriesDomainRangeDoc - .addNewMeasurementTimeseriesDomainRange(); + MeasurementTimeseriesDomainRangeDocument xbMearuementTimeseriesDomainRangeDoc = + MeasurementTimeseriesDomainRangeDocument.Factory.newInstance(); + MeasurementTimeseriesCoverageType xbMeasurementTimeseriesDomainRange = + xbMearuementTimeseriesDomainRangeDoc.addNewMeasurementTimeseriesDomainRange(); xbMeasurementTimeseriesDomainRange.setId(TIMESERIES_ID_PREFIX + observationValue.getObservationID()); // set time position list @@ -328,20 +322,21 @@ private XmlObject createMeasurementDomainRange(AbstractObservationValue<?> obser /** * Create a SOS DataRecord object from SOS observation and encode to XmlBeans object * - * @param sosObservation SOS observation + * @param sosObservation + * SOS observation * * @return XML DataRecord object * - * @throws EncodingException If an error occurs + * @throws EncodingException + * If an error occurs */ - private XmlObject createDataRecord(OmObservation sosObservation) - throws EncodingException { + private XmlObject createDataRecord(OmObservation sosObservation) throws EncodingException { AbstractPhenomenon observableProperty = sosObservation.getObservationConstellation().getObservableProperty(); SweQuantity quantity = new SweQuantity(); quantity.setDefinition(observableProperty.getIdentifier()); quantity.setDescription(observableProperty.getDescription()); - if (observableProperty instanceof OmObservableProperty && - ((OmObservableProperty) observableProperty).isSetUnit()) { + if (observableProperty instanceof OmObservableProperty + && ((OmObservableProperty) observableProperty).isSetUnit()) { quantity.setUom(((OmObservableProperty) observableProperty).getUnit()); } return createDataRecord(quantity, sosObservation.getObservationID()); @@ -357,27 +352,27 @@ private XmlObject createDataRecord(AbstractObservationValue<?> observationValue, return createDataRecord(quantity, observationValue.getObservationID()); } - private XmlObject createDataRecord(SweQuantity quantity, String observationId) - throws EncodingException { + private XmlObject createDataRecord(SweQuantity quantity, String observationId) throws EncodingException { SweField field = new SweField("observed_value", quantity); SweDataRecord dataRecord = new SweDataRecord(); dataRecord.setIdentifier(DATA_RECORD_ID_PREFIX + observationId); dataRecord.addField(field); return encodeObjectToXml(SweConstants.NS_SWE_20, dataRecord, - EncodingContext.of(XmlBeansEncodingFlags.FOR_OBSERVATION)); + EncodingContext.of(XmlBeansEncodingFlags.FOR_OBSERVATION)); } /** * Create a TimePositionList XML object from time values * - * @param sosObservation SOS observation + * @param sosObservation + * SOS observation * * @return XML TimePositionList object * - * @throws EncodingException If an error occurs + * @throws EncodingException + * If an error occurs */ - private TimePositionListDocument getTimePositionList(OmObservation sosObservation) - throws EncodingException { + private TimePositionListDocument getTimePositionList(OmObservation sosObservation) throws EncodingException { TimePositionListDocument timePositionListDoc = TimePositionListDocument.Factory.newInstance(); TimePositionListType timePositionList = timePositionListDoc.addNewTimePositionList(); timePositionList.setId(TIME_POSITION_LIST_ID_PREFIX + sosObservation.getObservationID()); @@ -402,14 +397,15 @@ private TimePositionListDocument getTimePositionList(AbstractObservationValue<?> /** * Create a array from time values * - * @param sosObservationValues SOS multi value observation object + * @param sosObservationValues + * SOS multi value observation object * * @return List with string representations of time values * - * @throws EncodingException If an error occurs + * @throws EncodingException + * If an error occurs */ - private List<String> getTimeArray(MultiObservationValues<?> sosObservationValues) - throws EncodingException { + private List<String> getTimeArray(MultiObservationValues<?> sosObservationValues) throws EncodingException { return ((TVPValue) sosObservationValues.getValue()).getValue().stream().map(TimeValuePair::getTime) .map(this::getTimeString).collect(toList()); } @@ -417,14 +413,15 @@ private List<String> getTimeArray(MultiObservationValues<?> sosObservationValues /** * Get a value list from SOS TimeValuePair objects * - * @param timeValuePairs SOS TimeValuePair objects + * @param timeValuePairs + * SOS TimeValuePair objects * * @return List with value objects * - * @throws EncodingException If an error occurs + * @throws EncodingException + * If an error occurs */ - private List<Object> getValueList(List<TimeValuePair> timeValuePairs) - throws EncodingException { + private List<Object> getValueList(List<TimeValuePair> timeValuePairs) throws EncodingException { return timeValuePairs.stream().map(TimeValuePair::getValue).map(value -> { if (value != null && (value instanceof CountValue || value instanceof QuantityValue)) { return value.getValue(); @@ -435,19 +432,15 @@ private List<Object> getValueList(List<TimeValuePair> timeValuePairs) } private boolean isInvalidObservationType(String observationType) { - return !(OmConstants.OBS_TYPE_COUNT_OBSERVATION.equals(observationType) || - OmConstants.OBS_TYPE_MEASUREMENT.equals(observationType) || - OmConstants.OBS_TYPE_SWE_ARRAY_OBSERVATION.equals(observationType)); + return !(OmConstants.OBS_TYPE_COUNT_OBSERVATION.equals(observationType) + || OmConstants.OBS_TYPE_MEASUREMENT.equals(observationType) + || OmConstants.OBS_TYPE_SWE_ARRAY_OBSERVATION.equals(observationType)); } private static Set<EncoderKey> createEncoderKeys() { - return CollectionHelper.union( - getDefaultEncoderKeys(), - CodingHelper.encoderKeysForElements(TimeseriesMLConstants.NS_TSML_DR_10, - GetObservationResponse.class, - OmObservation.class, - AbstractFeature.class, - SingleObservationValue.class, - MultiObservationValues.class)); + return CollectionHelper.union(getDefaultEncoderKeys(), + CodingHelper.encoderKeysForElements(TimeseriesMLConstants.NS_TSML_DR_10, GetObservationResponse.class, + OmObservation.class, AbstractFeature.class, SingleObservationValue.class, + MultiObservationValues.class)); } } diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/WmlTDREncoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/WmlTDREncoderv20.java index 3381682bd..fe4b34c9c 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/WmlTDREncoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/WmlTDREncoderv20.java @@ -80,8 +80,7 @@ * @since 1.0.0 * */ -public class WmlTDREncoderv20 - extends AbstractWmlEncoderv20 { +public class WmlTDREncoderv20 extends AbstractWmlEncoderv20 { private static final Logger LOGGER = LoggerFactory.getLogger(WmlTDREncoderv20.class); @@ -90,12 +89,12 @@ public class WmlTDREncoderv20 private static final Set<EncoderKey> ENCODER_KEYS = createEncoderKeys(); - private static final ImmutableSet<SupportedType> SUPPORTED_TYPES = ImmutableSet.<SupportedType>builder() + private static final ImmutableSet<SupportedType> SUPPORTED_TYPES = ImmutableSet.<SupportedType> builder() .add(new ObservationType(WaterMLConstants.OBSERVATION_TYPE_MEASURMENT_TDR)).build(); - private static final Map<String, Map<String, Set<String>>> SUPPORTED_RESPONSE_FORMATS = Collections - .singletonMap(SosConstants.SOS, Collections.singletonMap( - Sos2Constants.SERVICEVERSION, Collections.singleton(WaterMLConstants.NS_WML_20_DR))); + private static final Map<String, Map<String, Set<String>>> SUPPORTED_RESPONSE_FORMATS = + Collections.singletonMap(SosConstants.SOS, Collections.singletonMap(Sos2Constants.SERVICEVERSION, + Collections.singleton(WaterMLConstants.NS_WML_20_DR))); private static final String TIMESERIES_ID_PREFIX = "timeseries_"; @@ -105,7 +104,7 @@ public class WmlTDREncoderv20 public WmlTDREncoderv20() { LOGGER.debug("Encoder for the following keys initialized successfully: {}!", - Joiner.on(", ").join(ENCODER_KEYS)); + Joiner.on(", ").join(ENCODER_KEYS)); } @Override @@ -140,8 +139,8 @@ public void addNamespacePrefixToMap(Map<String, String> nameSpacePrefixMap) { @Override public Set<String> getSupportedResponseFormats(String service, String version) { - if (SUPPORTED_RESPONSE_FORMATS.get(service) != null && - SUPPORTED_RESPONSE_FORMATS.get(service).get(version) != null) { + if (SUPPORTED_RESPONSE_FORMATS.get(service) != null + && SUPPORTED_RESPONSE_FORMATS.get(service).get(version) != null) { return SUPPORTED_RESPONSE_FORMATS.get(service).get(version); } return Collections.emptySet(); @@ -150,7 +149,7 @@ public Set<String> getSupportedResponseFormats(String service, String version) { @Override public Set<SchemaLocation> getSchemaLocations() { return Sets.newHashSet(WaterMLConstants.WML_20_SCHEMA_LOCATION, WaterMLConstants.WML_20_DR_SCHEMA_LOCATION, - GmlCoverageConstants.GML_COVERAGE_10_SCHEMA_LOCATION); + GmlCoverageConstants.GML_COVERAGE_10_SCHEMA_LOCATION); } @Override @@ -173,7 +172,7 @@ public void encode(Object objectToEncode, OutputStream outputStream, EncodingCon if (objectToEncode instanceof OmObservation) { try { new WmlTDREncoderv20XmlStreamWriter(ctx.with(StreamingEncoderFlags.ENCODER, this), outputStream, - (OmObservation) objectToEncode).write(); + (OmObservation) objectToEncode).write(); } catch (XMLStreamException xmlse) { throw new EncodingException("Error while writing element to stream!", xmlse); } @@ -195,11 +194,11 @@ protected XmlObject encodeResult(ObservationValue<?> observationValue) throws En @Override protected void addObservationType(OMObservationType xbObservation, String observationType) { if (observationType != null && !observationType.isEmpty()) { - if (observationType.equals(OmConstants.OBS_TYPE_MEASUREMENT) || - observationType.equals(WaterMLConstants.OBSERVATION_TYPE_MEASURMENT_TDR)) { + if (observationType.equals(OmConstants.OBS_TYPE_MEASUREMENT) + || observationType.equals(WaterMLConstants.OBSERVATION_TYPE_MEASURMENT_TDR)) { xbObservation.addNewType().setHref(WaterMLConstants.OBSERVATION_TYPE_MEASURMENT_TDR); - } else if (observationType.equals(OmConstants.OBS_TYPE_CATEGORY_OBSERVATION) || - observationType.equals(WaterMLConstants.OBSERVATION_TYPE_CATEGORICAL_TDR)) { + } else if (observationType.equals(OmConstants.OBS_TYPE_CATEGORY_OBSERVATION) + || observationType.equals(WaterMLConstants.OBSERVATION_TYPE_CATEGORICAL_TDR)) { xbObservation.addNewType().setHref(WaterMLConstants.OBSERVATION_TYPE_CATEGORICAL_TDR); } } @@ -212,24 +211,25 @@ protected OMObservationType createOmObservationType() { /** * Create a XML MeasurementTimeseriesDomainRange object from SOS observation for om:result * - * @param sosObservation SOS observation + * @param sosObservation + * SOS observation * * @return XML MeasurementTimeseriesDomainRange object for om:result * - * @throws EncodingException If an error occurs + * @throws EncodingException + * If an error occurs */ private XmlObject createMeasurementDomainRange(OmObservation sosObservation) throws EncodingException { - if (!sosObservation.getObservationConstellation().isSetObservationType() || - (sosObservation.getObservationConstellation().isSetObservationType() && isInvalidObservationType( - sosObservation.getObservationConstellation().getObservationType()))) { + if (!sosObservation.getObservationConstellation().isSetObservationType() + || sosObservation.getObservationConstellation().isSetObservationType() && isInvalidObservationType( + sosObservation.getObservationConstellation().getObservationType())) { throw new UnsupportedEncoderInputException(this, - sosObservation.getObservationConstellation() - .isSetObservationType()); + sosObservation.getObservationConstellation().isSetObservationType()); } - MeasurementTimeseriesDomainRangeDocument xbMearuementTimeseriesDomainRangeDoc - = MeasurementTimeseriesDomainRangeDocument.Factory.newInstance(); - MeasurementTimeseriesCoverageType xbMeasurementTimeseriesDomainRange = xbMearuementTimeseriesDomainRangeDoc - .addNewMeasurementTimeseriesDomainRange(); + MeasurementTimeseriesDomainRangeDocument xbMearuementTimeseriesDomainRangeDoc = + MeasurementTimeseriesDomainRangeDocument.Factory.newInstance(); + MeasurementTimeseriesCoverageType xbMeasurementTimeseriesDomainRange = + xbMearuementTimeseriesDomainRangeDoc.addNewMeasurementTimeseriesDomainRange(); xbMeasurementTimeseriesDomainRange.setId(TIMESERIES_ID_PREFIX + sosObservation.getObservationID()); // set time position list @@ -255,8 +255,8 @@ private XmlObject createMeasurementDomainRange(OmObservation sosObservation) thr } quantityList.setUom(unit); // set unit to SosObservableProperty if not set. - if (observableProperty instanceof OmObservableProperty && - !((OmObservableProperty) observableProperty).isSetUnit()) { + if (observableProperty instanceof OmObservableProperty + && !((OmObservableProperty) observableProperty).isSetUnit()) { ((OmObservableProperty) observableProperty).setUnit(unit); } // set up range set @@ -270,15 +270,15 @@ private XmlObject createMeasurementDomainRange(OmObservation sosObservation) thr private XmlObject createMeasurementDomainRange(AbstractObservationValue<?> observationValue) throws EncodingException { - if (!observationValue.isSetObservationType() || - isInvalidObservationType(observationValue.getObservationType())) { + if (!observationValue.isSetObservationType() + || isInvalidObservationType(observationValue.getObservationType())) { return null; } - MeasurementTimeseriesDomainRangeDocument xbMearuementTimeseriesDomainRangeDoc - = MeasurementTimeseriesDomainRangeDocument.Factory.newInstance(); - MeasurementTimeseriesCoverageType xbMeasurementTimeseriesDomainRange = xbMearuementTimeseriesDomainRangeDoc - .addNewMeasurementTimeseriesDomainRange(); + MeasurementTimeseriesDomainRangeDocument xbMearuementTimeseriesDomainRangeDoc = + MeasurementTimeseriesDomainRangeDocument.Factory.newInstance(); + MeasurementTimeseriesCoverageType xbMeasurementTimeseriesDomainRange = + xbMearuementTimeseriesDomainRangeDoc.addNewMeasurementTimeseriesDomainRange(); xbMeasurementTimeseriesDomainRange.setId(TIMESERIES_ID_PREFIX + observationValue.getObservationID()); // set time position list @@ -320,19 +320,21 @@ private XmlObject createMeasurementDomainRange(AbstractObservationValue<?> obser /** * Create a SOS DataRecord object from SOS observation and encode to XmlBeans object * - * @param sosObservation SOS observation + * @param sosObservation + * SOS observation * * @return XML DataRecord object * - * @throws EncodingException If an error occurs + * @throws EncodingException + * If an error occurs */ private XmlObject createDataRecord(OmObservation sosObservation) throws EncodingException { AbstractPhenomenon observableProperty = sosObservation.getObservationConstellation().getObservableProperty(); SweQuantity quantity = new SweQuantity(); quantity.setDefinition(observableProperty.getIdentifier()); quantity.setDescription(observableProperty.getDescription()); - if (observableProperty instanceof OmObservableProperty && - ((OmObservableProperty) observableProperty).isSetUnit()) { + if (observableProperty instanceof OmObservableProperty + && ((OmObservableProperty) observableProperty).isSetUnit()) { quantity.setUom(((OmObservableProperty) observableProperty).getUnit()); } return createDataRecord(quantity, sosObservation.getObservationID()); @@ -354,17 +356,19 @@ private XmlObject createDataRecord(SweQuantity quantity, String observationId) t dataRecord.setIdentifier(DATA_RECORD_ID_PREFIX + observationId); dataRecord.addField(field); return encodeObjectToXml(SweConstants.NS_SWE_20, dataRecord, - EncodingContext.of(XmlBeansEncodingFlags.FOR_OBSERVATION)); + EncodingContext.of(XmlBeansEncodingFlags.FOR_OBSERVATION)); } /** * Create a TimePositionList XML object from time values * - * @param sosObservation SOS observation + * @param sosObservation + * SOS observation * * @return XML TimePositionList object * - * @throws EncodingException If an error occurs + * @throws EncodingException + * If an error occurs */ private TimePositionListDocument getTimePositionList(OmObservation sosObservation) throws EncodingException { TimePositionListDocument timePositionListDoc = TimePositionListDocument.Factory.newInstance(); @@ -391,11 +395,13 @@ private TimePositionListDocument getTimePositionList(AbstractObservationValue<?> /** * Create a array from time values * - * @param sosObservationValues SOS multi value observation object + * @param sosObservationValues + * SOS multi value observation object * * @return List with string representations of time values * - * @throws EncodingException If an error occurs + * @throws EncodingException + * If an error occurs */ private List<String> getTimeArray(MultiObservationValues<?> sosObservationValues) throws EncodingException { return ((TVPValue) sosObservationValues.getValue()).getValue().stream().map(TimeValuePair::getTime) @@ -405,11 +411,13 @@ private List<String> getTimeArray(MultiObservationValues<?> sosObservationValues /** * Get a value list from SOS TimeValuePair objects * - * @param timeValuePairs SOS TimeValuePair objects + * @param timeValuePairs + * SOS TimeValuePair objects * * @return List with value objects * - * @throws EncodingException If an error occurs + * @throws EncodingException + * If an error occurs */ private List<Object> getValueList(List<TimeValuePair> timeValuePairs) throws EncodingException { return timeValuePairs.stream().map(TimeValuePair::getValue).map(value -> { @@ -422,19 +430,15 @@ private List<Object> getValueList(List<TimeValuePair> timeValuePairs) throws Enc } private boolean isInvalidObservationType(String observationType) { - return !(OmConstants.OBS_TYPE_COUNT_OBSERVATION.equals(observationType) || - OmConstants.OBS_TYPE_MEASUREMENT.equals(observationType) || - OmConstants.OBS_TYPE_SWE_ARRAY_OBSERVATION.equals(observationType)); + return !(OmConstants.OBS_TYPE_COUNT_OBSERVATION.equals(observationType) + || OmConstants.OBS_TYPE_MEASUREMENT.equals(observationType) + || OmConstants.OBS_TYPE_SWE_ARRAY_OBSERVATION.equals(observationType)); } private static Set<EncoderKey> createEncoderKeys() { - return CollectionHelper.union( - getDefaultEncoderKeys(), - CodingHelper.encoderKeysForElements(WaterMLConstants.NS_WML_20_DR, - GetObservationResponse.class, - OmObservation.class, - AbstractFeature.class, - SingleObservationValue.class, - MultiObservationValues.class)); + return CollectionHelper.union(getDefaultEncoderKeys(), + CodingHelper.encoderKeysForElements(WaterMLConstants.NS_WML_20_DR, GetObservationResponse.class, + OmObservation.class, AbstractFeature.class, SingleObservationValue.class, + MultiObservationValues.class)); } } diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index e0288ec6b..93acb4237 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -135,6 +135,7 @@ <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>xmlunit</groupId> diff --git a/svalbard/xmlstream/src/main/java/org/n52/svalbard/read/ChoiceReader.java b/svalbard/xmlstream/src/main/java/org/n52/svalbard/read/ChoiceReader.java index c53c18f14..3110c0748 100644 --- a/svalbard/xmlstream/src/main/java/org/n52/svalbard/read/ChoiceReader.java +++ b/svalbard/xmlstream/src/main/java/org/n52/svalbard/read/ChoiceReader.java @@ -22,6 +22,8 @@ import org.n52.svalbard.decode.exception.DecodingException; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -32,6 +34,7 @@ public abstract class ChoiceReader<T> extends XmlReader<T> { private final Map<QName, ? extends XmlReader<? extends T>> delegates; private T t; + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public ChoiceReader(Map<QName, ? extends XmlReader<? extends T>> delegates) { this.delegates = delegates; } diff --git a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/XmlStreamWriter.java b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/XmlStreamWriter.java index 0147c4f93..9e229f1d7 100644 --- a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/XmlStreamWriter.java +++ b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/XmlStreamWriter.java @@ -51,6 +51,8 @@ import com.google.common.base.Strings; import com.google.common.xml.XmlEscapers; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Abstract XML stream writer. * @@ -74,6 +76,7 @@ public abstract class XmlStreamWriter<S> { private final boolean close; private final boolean embedded; + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public XmlStreamWriter(EncodingContext context, OutputStream outputStream, S element) throws XMLStreamException { this.context = Objects.requireNonNull(context); this.outputStream = Objects.requireNonNull(outputStream); diff --git a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/util/DelegatingXMLStreamWriter.java b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/util/DelegatingXMLStreamWriter.java index 726f4b9cd..ce58beb56 100644 --- a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/util/DelegatingXMLStreamWriter.java +++ b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/util/DelegatingXMLStreamWriter.java @@ -19,6 +19,8 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -28,6 +30,7 @@ public abstract class DelegatingXMLStreamWriter implements XMLStreamWriter { private final XMLStreamWriter delegate; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public DelegatingXMLStreamWriter(XMLStreamWriter delegate) { this.delegate = delegate; } @@ -88,8 +91,8 @@ public void writeAttribute(String localName, String value) throws XMLStreamExcep } @Override - public void writeAttribute(String prefix, String namespaceURI, String localName, String value) throws - XMLStreamException { + public void writeAttribute(String prefix, String namespaceURI, String localName, String value) + throws XMLStreamException { this.delegate.writeAttribute(prefix, namespaceURI, localName, value); } From 8958500d7e08caa9eb4f18b685a862c098873075 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 14 Apr 2022 15:16:09 +0200 Subject: [PATCH 270/456] some further fixes --- NOTICE | 8 ------- .../ogc/sos/response/BatchResponse.java | 17 +++++++++----- .../sos/response/DescribeSensorResponse.java | 8 ++++--- .../GetFeatureOfInterestResponse.java | 6 +++++ .../GlobalObservationResponseValues.java | 5 ++++ .../sos/response/InsertResultResponse.java | 3 ++- .../shetland/ogc/sos/ro/RelatedOfferings.java | 3 ++- .../ogc/sta/model/STAEntityDefinition.java | 9 ++++---- .../ogc/swe/SweAbstractDataComponent.java | 21 +++++++++-------- .../ogc/swe/SweAbstractDataRecord.java | 14 ++++++----- .../n52/shetland/ogc/swe/SweCoordinate.java | 5 ++++ .../n52/shetland/ogc/swe/SweDataArray.java | 23 +++++++++++++------ .../n52/shetland/ogc/swe/SweDataStream.java | 16 +++++++++++-- .../org/n52/shetland/ogc/swe/SweEnvelope.java | 12 ++++++++++ .../org/n52/shetland/ogc/swe/SweField.java | 6 +++++ .../org/n52/shetland/ogc/swe/SweVector.java | 10 ++++++-- .../swe/simpleType/SweAbstractSimpleType.java | 4 ++++ .../ogc/swe/simpleType/SweAllowedTimes.java | 13 +++++++---- .../ogc/swe/simpleType/SweAllowedTokens.java | 11 ++++++--- .../ogc/swe/simpleType/SweAllowedValues.java | 13 +++++++---- .../ogc/swe/simpleType/SweCategoryRange.java | 5 ++++ .../ogc/swe/simpleType/SweCountRange.java | 5 ++++ .../ogc/swe/simpleType/SweQualityHolder.java | 5 ++-- .../ogc/swe/simpleType/SweQuantityRange.java | 4 ++++ .../shetland/ogc/swe/simpleType/SweTime.java | 4 ++++ .../ogc/swe/simpleType/SweTimeRange.java | 8 +++++++ .../ogc/swe/stream/StreamingSweDataArray.java | 9 ++++++++ .../n52/shetland/ogc/swes/AbstractSWES.java | 3 +++ .../ogc/swes/SwesFeatureRelationship.java | 5 ++++ .../shetland/ogc/wps/OutputDefinition.java | 4 ++++ .../ogc/wps/ap/DockerExecutionUnit.java | 2 +- .../ogc/wps/data/FormattedProcessData.java | 4 ++++ .../impl/ComplexInputDescriptionImpl.java | 6 +++++ .../impl/ComplexOutputDescriptionImpl.java | 6 +++++ .../ogc/wps/response/DismissResponse.java | 5 ++++ .../ogc/wps/response/GetResultResponse.java | 5 ++++ .../ogc/wps/response/GetStatusResponse.java | 5 ++++ .../java/org/n52/shetland/util/AqdHelper.java | 5 ++-- .../n52/shetland/util/EnvelopeOrGeometry.java | 4 ++++ .../n52/shetland/util/ReferencedEnvelope.java | 5 ++++ .../n52/shetland/w3c/soap/AbstractSoap.java | 20 +++++++++++++--- .../org/n52/shetland/w3c/soap/SoapChain.java | 12 ++++++++++ .../n52/shetland/w3c/soap/SoapResponse.java | 4 ++++ .../n52/shetland/w3c/wsdl/AbstractWsdl.java | 5 ++-- .../org/n52/shetland/w3c/wsdl/Binding.java | 3 ++- .../shetland/w3c/wsdl/BindingOperation.java | 6 +++++ .../n52/shetland/w3c/wsdl/Definitions.java | 15 ++++++------ .../org/n52/shetland/w3c/wsdl/Message.java | 3 ++- .../org/n52/shetland/w3c/wsdl/Operation.java | 6 +++++ .../org/n52/shetland/w3c/wsdl/PortType.java | 3 ++- .../org/n52/shetland/w3c/wsdl/Schema.java | 4 ++++ .../org/n52/shetland/w3c/wsdl/Service.java | 3 ++- 52 files changed, 308 insertions(+), 82 deletions(-) diff --git a/NOTICE b/NOTICE index e70397b48..e99ae3610 100644 --- a/NOTICE +++ b/NOTICE @@ -72,9 +72,6 @@ This project includes: elasticsearch-x-content under Elastic License 2.0 or Server Side Public License, v 1 embedded-elasticsearch under The Apache Software License, Version 2.0 error-prone annotations under Apache 2.0 - EXIficient under MIT License - EXIficient-Core under MIT License - EXIficient-Grammars under MIT License FindBugs-jsr305 under The Apache Software License, Version 2.0 Geographic Common (GCO) schema (version 2012-07-13) under The Apache Software License, Version 2.0 Geographic MetaData (GMD) schema (version 2012-07-13) under The Apache Software License, Version 2.0 @@ -106,7 +103,6 @@ This project includes: jackson-databind under The Apache Software License, Version 2.0 Jackson-dataformat-YAML under The Apache Software License, Version 2.0 Java archiving library under Apache 2 - Java Native Access under LGPL-2.1-or-later or Apache-2.0 JavaBeans(TM) Activation Framework under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 JavaMail API jar under CDDL or GPLv2+CE javax.annotation API under CDDL + GPLv2 with classpath exception @@ -119,7 +115,6 @@ This project includes: lang-mustache under Elastic License 2.0 or Server Side Public License, v 1 libphonenumber under The Apache Software License, Version 2.0 Lucene Common Analyzers under Apache License, Version 2.0 - Lucene Core under Apache License, Version 2.0 Lucene Grouping under Apache License, Version 2.0 Lucene Highlighter under Apache License, Version 2.0 Lucene Join under Apache License, Version 2.0 @@ -135,7 +130,6 @@ This project includes: MaxMind DB Reader under Apache License 2.0 MaxMind GeoIP2 API under Apache License, Version 2.0 mchange-commons-java under GNU Lesser General Public License, Version 2.1 or Eclipse Public License, Version 1.0 - Mozilla Rhino under Mozilla Public License, Version 2.0 Neo Visionaries Internationalization Package under The Apache Software License, Version 2.0 Netty/Buffer under Apache License, Version 2.0 Netty/Codec under Apache License, Version 2.0 @@ -210,9 +204,7 @@ This project includes: W3C SOAP specification recommondation (v1.2 part 1) under The Apache Software License, Version 2.0 W3C WS-Addressing specification schemas (v1.0) under The Apache Software License, Version 2.0 W3C xlink schema (spec. v1.1.0) under The Apache Software License, Version 2.0 - Xerces2-j under The Apache Software License, Version 2.0 XML Commons External Components XML APIs under The Apache Software License, Version 2.0 or The SAX License or The W3C License - XML Pull Parsing API under Public Domain XML Resolver under Apache License version 2.0 XmlBeans under The Apache Software License, Version 2.0 XmlBeansXPath under The Apache Software License, Version 2.0 diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/BatchResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/BatchResponse.java index a7938923a..36e330ce6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/BatchResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/BatchResponse.java @@ -26,6 +26,8 @@ import org.n52.shetland.ogc.sos.BatchConstants; import org.n52.shetland.ogc.sos.response.BatchResponse.ExceptionOrResponse; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -34,25 +36,26 @@ * @since 1.0.0 */ public class BatchResponse extends OwsServiceResponse implements Iterable<ExceptionOrResponse> { - private final List<ExceptionOrResponse> responses; + private final List<ExceptionOrResponse> responses = new LinkedList<ExceptionOrResponse>(); public BatchResponse() { this(new LinkedList<>()); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public BatchResponse(List<ExceptionOrResponse> responses) { - super(null, null, BatchConstants.OPERATION_NAME); - this.responses = responses; + this(null, null, responses); } public BatchResponse(String service, String version, List<ExceptionOrResponse> responses) { - super(service, version, BatchConstants.OPERATION_NAME); - this.responses = responses; + this(service, version, BatchConstants.OPERATION_NAME, responses); } public BatchResponse(String service, String version, String operationName, List<ExceptionOrResponse> responses) { super(service, version, operationName); - this.responses = responses; + if (responses != null) { + this.responses.addAll(responses); + } } public List<ExceptionOrResponse> getResponses() { @@ -102,10 +105,12 @@ public boolean isException() { return exception != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OwsExceptionReport getException() { return exception; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OwsServiceResponse getResponse() { return response; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/DescribeSensorResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/DescribeSensorResponse.java index 47f0c8e38..b90e08ffd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/DescribeSensorResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/DescribeSensorResponse.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.ogc.sos.response; +import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.ows.service.OwsServiceResponse; @@ -30,7 +32,7 @@ public class DescribeSensorResponse extends OwsServiceResponse { private String outputFormat; - private List<SosProcedureDescription<?>> procedureDescriptions; + private List<SosProcedureDescription<?>> procedureDescriptions = new LinkedList<>(); public DescribeSensorResponse() { super(null, null, SosConstants.Operations.DescribeSensor.name()); @@ -57,7 +59,7 @@ public void setSensorDescriptions(List<SosProcedureDescription<?>> procedureDesc this.procedureDescriptions = CollectionHelper .conjunctCollections(getProcedureDescriptions(), procedureDescriptions); } else { - this.procedureDescriptions = procedureDescriptions; + this.procedureDescriptions.addAll(procedureDescriptions); } } @@ -66,7 +68,7 @@ public boolean isSetProcedureDescriptions() { } public List<SosProcedureDescription<?>> getProcedureDescriptions() { - return this.procedureDescriptions; + return Collections.unmodifiableList(procedureDescriptions); } public void addSensorDescription(SosProcedureDescription<?> procedureDescription) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetFeatureOfInterestResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetFeatureOfInterestResponse.java index 9b14b3373..0a95240a9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetFeatureOfInterestResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetFeatureOfInterestResponse.java @@ -19,6 +19,8 @@ import org.n52.shetland.ogc.ows.service.OwsServiceResponse; import org.n52.shetland.ogc.sos.SosConstants; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 * @@ -40,6 +42,7 @@ public GetFeatureOfInterestResponse(String service, String version, String opera super(service, version, operationName); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GetFeatureOfInterestResponse(AbstractFeature abstractFeature) { this.abstractFeature = abstractFeature; } @@ -48,16 +51,19 @@ public GetFeatureOfInterestResponse(String service, String version, AbstractFeat this(service, version, SosConstants.Operations.GetFeatureOfInterest.name(), abstractFeature); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GetFeatureOfInterestResponse( String service, String version, String operationName, AbstractFeature abstractFeature) { super(service, version, operationName); this.abstractFeature = abstractFeature; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AbstractFeature getAbstractFeature() { return abstractFeature; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setAbstractFeature(AbstractFeature abstractFeature) { this.abstractFeature = abstractFeature; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GlobalObservationResponseValues.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GlobalObservationResponseValues.java index dfc66314f..bbe33e964 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GlobalObservationResponseValues.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GlobalObservationResponseValues.java @@ -19,6 +19,8 @@ import org.n52.shetland.ogc.gml.time.TimeInstant; import org.n52.shetland.ogc.gml.time.TimePeriod; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 1.0.0 @@ -28,6 +30,7 @@ public class GlobalObservationResponseValues { private Time phenomenonTime; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GlobalObservationResponseValues addPhenomenonTime(Time phenomenonTime) { if (isSetPhenomenonTime()) { if (phenomenonTime instanceof TimeInstant) { @@ -40,11 +43,13 @@ public GlobalObservationResponseValues addPhenomenonTime(Time phenomenonTime) { return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GlobalObservationResponseValues setPhenomenonTime(Time phenomenonTime) { this.phenomenonTime = phenomenonTime; return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getPhenomenonTime() { return phenomenonTime; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/InsertResultResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/InsertResultResponse.java index 8c02ab62b..15e87ff8d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/InsertResultResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/InsertResultResponse.java @@ -15,6 +15,7 @@ */ package org.n52.shetland.ogc.sos.response; +import java.util.Collections; import java.util.List; import org.n52.shetland.ogc.om.OmObservation; @@ -43,7 +44,7 @@ public InsertResultResponse(String service, String version, String operationName } public List<OmObservation> getObservations() { - return observations; + return Collections.unmodifiableList(observations); } public void setObservation(OmObservation observation) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ro/RelatedOfferings.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ro/RelatedOfferings.java index 8c67aac90..737cba055 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ro/RelatedOfferings.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ro/RelatedOfferings.java @@ -15,6 +15,7 @@ */ package org.n52.shetland.ogc.sos.ro; +import java.util.Collections; import java.util.Set; import org.n52.shetland.ogc.gml.ReferenceType; @@ -83,7 +84,7 @@ public boolean isSetDefinition() { @Override public Set<OfferingContext> getValue() { - return offeringRelations; + return Collections.unmodifiableSet(offeringRelations); } @Override diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/STAEntityDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/STAEntityDefinition.java index aa8b3e100..d06792d78 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/STAEntityDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/STAEntityDefinition.java @@ -17,6 +17,7 @@ import org.n52.shetland.ogc.sta.StaConstants; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -53,19 +54,19 @@ protected STAEntityDefinition(Set<String> navPropOptional, } public Set<String> getNavPropsOptional() { - return navPropsOptional; + return Collections.unmodifiableSet(navPropsOptional); } public Set<String> getNavPropsMandatory() { - return navPropsMandatory; + return Collections.unmodifiableSet(navPropsMandatory); } public Set<String> getEntityPropsOptional() { - return entityPropsOptional; + return Collections.unmodifiableSet(entityPropsOptional); } public Set<String> getEntityPropsMandatory() { - return entityPropsMandatory; + return Collections.unmodifiableSet(entityPropsMandatory); } static Set<String> combineSets(Set<String>... sets) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataComponent.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataComponent.java index 599275e22..c499a597b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataComponent.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataComponent.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.swe; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.n52.janmayen.Copyable; @@ -90,7 +91,7 @@ public CodeType getName() { } public List<CodeType> getNames() { - return names; + return Collections.unmodifiableList(names); } public String getIdentifier() { @@ -113,35 +114,35 @@ public SweAbstractDataComponent setLabel(final String label) { } public SweAbstractDataComponent addName(final String name) { - getNames().add(new CodeType(name)); + this.names.add(new CodeType(name)); return this; } public SweAbstractDataComponent addName(final CodeType name) { - getNames().add(name); + this.names.add(name); return this; } public SweAbstractDataComponent addName(final Collection<CodeType> names) { - getNames().addAll(names); + this.names.addAll(names); return this; } public SweAbstractDataComponent setName(final String name) { - getNames().clear(); - getNames().add(new CodeType(name)); + names.clear(); + this.names.add(new CodeType(name)); return this; } public SweAbstractDataComponent setName(final CodeType name) { - getNames().clear(); - getNames().add(name); + this.names.clear(); + this.names.add(name); return this; } public SweAbstractDataComponent setName(final Collection<CodeType> names) { - getNames().clear(); - getNames().addAll(names); + this.names.clear(); + this.names.addAll(names); return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java index 70135952d..7977eb88a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java @@ -31,7 +31,7 @@ * @since 1.0.0 */ public abstract class SweAbstractDataRecord extends SweAbstractDataComponent implements DataRecord { - private List<SweField> fields; + private List<SweField> fields = new LinkedList<SweField>(); /** * @@ -42,21 +42,23 @@ public SweAbstractDataRecord() { @Override public List<SweField> getFields() { - return fields; + return Collections.unmodifiableList(fields); } @Override public SweAbstractDataRecord setFields(final List<SweField> fields) { - this.fields = fields; + this.fields.clear(); + if (fields != null) { + this.fields.addAll(fields); + } return this; } @Override public SweAbstractDataRecord addField(final SweField field) { - if (fields == null) { - fields = new LinkedList<>(); + if (field != null) { + fields.add(field); } - fields.add(field); return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweCoordinate.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweCoordinate.java index f7a5b3e5a..75ba20fd4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweCoordinate.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweCoordinate.java @@ -19,6 +19,8 @@ import org.n52.shetland.ogc.swe.simpleType.SweAbstractSimpleType; import org.n52.shetland.ogc.swe.simpleType.SweAbstractUomType; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS internal representation of SWE coordinates * @@ -48,6 +50,7 @@ public class SweCoordinate<T extends Number> * @param value * Coordinate value */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweCoordinate(String name, SweAbstractSimpleType<T> value) { super(); this.name = name; @@ -72,6 +75,7 @@ public void setName(String name) { /** * @return the value */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractSimpleType<T> getValue() { return value; } @@ -80,6 +84,7 @@ public SweAbstractSimpleType<T> getValue() { * @param value * the value to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setValue(SweAbstractSimpleType<T> value) { this.value = value; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java index bba642f95..f1278384c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.swe; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; @@ -27,6 +28,8 @@ import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class SweDataArray extends SweAbstractDataComponent { @@ -35,7 +38,7 @@ public class SweDataArray extends SweAbstractDataComponent { * Each list entry represents one block, a list of tokens.<br /> * Atm, this implementation using java.lang.String to represent each token. */ - private List<List<String>> values; + private List<List<String>> values = new LinkedList<>(); /** * swe:elementType @@ -53,7 +56,7 @@ public class SweDataArray extends SweAbstractDataComponent { * @return the values */ public List<List<String>> getValues() { - return values; + return Collections.unmodifiableList(values); } /** @@ -63,7 +66,10 @@ public List<List<String>> getValues() { * @return This SweDataArray */ public SweDataArray setValues(final List<List<String>> values) { - this.values = values; + this.values.clear(); + if (values != null) { + this.values.addAll(values); + } return this; } @@ -84,6 +90,7 @@ public String getValueAsString() { /** * @return the elementType */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractDataComponent getElementType() { return elementType; } @@ -93,11 +100,13 @@ public SweAbstractDataComponent getElementType() { * the elementType to set * @return This SweDataArray */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweDataArray setElementType(final SweAbstractDataComponent elementType) { this.elementType = elementType; return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweCount getElementCount() { if (isSetValues()) { return new SweCount().setValue(values.size()); @@ -107,10 +116,12 @@ public SweCount getElementCount() { return new SweCount().setValue(0); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractEncoding getEncoding() { return encoding; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweDataArray setEncoding(final SweAbstractEncoding encoding) { this.encoding = encoding; return this; @@ -146,10 +157,7 @@ public boolean add(final List<String> blockOfTokensToAddAtTheEnd) { } public boolean addAll(List<List<String>> newValues) { - if (values == null) { - values = newValues; - } - return values.addAll(newValues); + return newValues != null ? values.addAll(newValues) : true; } @Override @@ -194,6 +202,7 @@ public boolean isSetEncoding() { return encoding != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweDataArray setElementCount(final SweCount elementCount) { this.elementCount = elementCount; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java index 29b4b1c43..4b17de14c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.swe; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -26,6 +27,8 @@ import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class SweDataStream implements HasDefaultEncoding<SweDataStream>, @@ -102,7 +105,7 @@ public SweDataStream setIdentifier(final String identifier) { * @return the values */ public List<List<String>> getValues() { - return values; + return Collections.unmodifiableList(values); } /** @@ -112,13 +115,17 @@ public List<List<String>> getValues() { * @return This SweDataStream */ public SweDataStream setValues(final List<List<String>> values) { - this.values = values; + this.values.clear(); + if (values != null) { + this.values.addAll(values); + } return this; } /** * @return the elementType */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractDataComponent getElementType() { return elementType; } @@ -128,11 +135,13 @@ public SweAbstractDataComponent getElementType() { * the elementType to set * @return This SweDataStream */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweDataStream setElementType(final SweAbstractDataComponent elementType) { this.elementType = elementType; return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweCount getElementCount() { if (isSetValues()) { return new SweCount().setValue(values.size()); @@ -142,10 +151,12 @@ public SweCount getElementCount() { return new SweCount().setValue(0); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractEncoding getEncoding() { return encoding; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweDataStream setEncoding(final SweAbstractEncoding encoding) { this.encoding = encoding; return this; @@ -257,6 +268,7 @@ public boolean isSetEncoding() { return encoding != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweDataStream setElementCount(final SweCount elementCount) { this.elementCount = elementCount; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweEnvelope.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweEnvelope.java index 4c383577d..b249b9824 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweEnvelope.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweEnvelope.java @@ -25,6 +25,9 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Objects; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; @@ -44,15 +47,18 @@ public SweEnvelope(boolean northingFirst) { this(null, null, null, null, northingFirst); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweEnvelope(String referenceFrame, SweVector upperCorner, SweVector lowerCorner, boolean northingFirst) { this(referenceFrame, upperCorner, lowerCorner, null, northingFirst); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweEnvelope(ReferencedEnvelope sosEnvelope, String uom, boolean northingFirst) { this(String.valueOf(sosEnvelope.getSrid()), createUpperCorner(sosEnvelope, uom, northingFirst), createLowerCorner(sosEnvelope, uom, northingFirst), northingFirst); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweEnvelope( String referenceFrame, SweVector upperCorner, SweVector lowerCorner, SweTimeRange time, boolean northingFirst) { @@ -76,6 +82,7 @@ public SweEnvelope setReferenceFrame(String referenceFrame) { return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweVector getUpperCorner() { return upperCorner; } @@ -84,11 +91,13 @@ public boolean isUpperCornerSet() { return getUpperCorner() != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweEnvelope setUpperCorner(SweVector upperCorner) { this.upperCorner = upperCorner; return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweVector getLowerCorner() { return lowerCorner; } @@ -97,11 +106,13 @@ public boolean isLowerCornerSet() { return getLowerCorner() != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweEnvelope setLowerCorner(SweVector lowerCorner) { this.lowerCorner = lowerCorner; return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweTimeRange getTime() { return time; } @@ -110,6 +121,7 @@ public boolean isTimeSet() { return getTime() != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweEnvelope setTime(SweTimeRange time) { this.time = time; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweField.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweField.java index 6b74f04c2..2e6d60641 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweField.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweField.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.gml.CodeType; import org.n52.shetland.ogc.swe.SweConstants.SweDataComponentType; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS internal representation of SWE field * @@ -36,6 +38,7 @@ public SweField(final String name) { setName(name); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweField(final CodeType name) { super(); setName(name); @@ -49,6 +52,7 @@ public SweField(final CodeType name) { * @param element * Field element */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweField(final String name, final SweAbstractDataComponent element) { super(); setName(name); @@ -64,6 +68,7 @@ public SweField(final CodeType name, final SweAbstractDataComponent element) { /** * @return the element */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractDataComponent getElement() { return element; } @@ -73,6 +78,7 @@ public SweAbstractDataComponent getElement() { * the element to set * @return This SweField */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweField setElement(final SweAbstractDataComponent element) { this.element = element; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweVector.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweVector.java index 1f66aded1..0b07e4bc0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweVector.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweVector.java @@ -18,23 +18,28 @@ import static java.util.stream.Collectors.toList; import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.swe.SweConstants.SweDataComponentType; import com.google.common.base.Objects; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 * */ public class SweVector extends SweAbstractDataComponent { - private List<? extends SweCoordinate<? extends Number>> coordinates; + private List<? extends SweCoordinate<? extends Number>> coordinates = new LinkedList<>(); private String referenceFrame; private String localFrame; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweVector(List<? extends SweCoordinate<? extends Number>> coordinates) { this.coordinates = coordinates; } @@ -49,9 +54,10 @@ public SweVector() { } public List<? extends SweCoordinate<? extends Number>> getCoordinates() { - return coordinates; + return Collections.unmodifiableList(coordinates); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweVector setCoordinates(final List<? extends SweCoordinate<? extends Number>> coordinates) { this.coordinates = coordinates; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAbstractSimpleType.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAbstractSimpleType.java index feab4e729..00b00b080 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAbstractSimpleType.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAbstractSimpleType.java @@ -20,6 +20,8 @@ import org.n52.shetland.ogc.ows.extension.Value; import org.n52.shetland.ogc.swe.SweAbstractDataComponent; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Interface for the SOS internal representation of SWE simpleTypes * @@ -41,6 +43,7 @@ public abstract class SweAbstractSimpleType<T> * * @return Quality information */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweQualityHolder getQuality() { return quality; } @@ -52,6 +55,7 @@ public SweQualityHolder getQuality() { * * @return This SweAbstractSimpleType */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweAbstractSimpleType<T> setQuality(SweQualityHolder quality) { this.quality = quality; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedTimes.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedTimes.java index ed912f927..38ecb8922 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedTimes.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedTimes.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.swe.simpleType; import java.math.BigInteger; +import java.util.Collections; import java.util.List; import org.joda.time.DateTime; @@ -35,7 +36,7 @@ public class SweAllowedTimes extends AbstractSWES { * @return the value */ public List<DateTime> getValue() { - return value; + return Collections.unmodifiableList(value); } /** @@ -44,7 +45,9 @@ public List<DateTime> getValue() { */ public void setValue(List<DateTime> value) { this.value.clear(); - this.value.addAll(value); + if (value != null) { + this.value.addAll(value); + } } public void addValue(DateTime value) { @@ -59,7 +62,7 @@ public boolean isSetValue() { * @return the interval */ public List<RangeValue<DateTime>> getInterval() { - return interval; + return Collections.unmodifiableList(interval); } /** @@ -68,7 +71,9 @@ public List<RangeValue<DateTime>> getInterval() { */ public void setInterval(List<RangeValue<DateTime>> interval) { this.interval.clear(); - this.interval.addAll(interval); + if (interval != null) { + this.interval.addAll(interval); + } } /** diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedTokens.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedTokens.java index 1f0e2a4dd..89d5e85cd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedTokens.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedTokens.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.ogc.swe.simpleType; +import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.swes.AbstractSWES; @@ -25,14 +27,14 @@ public class SweAllowedTokens extends AbstractSWES { - private List<String> value; + private List<String> value = new LinkedList<>(); private String pattern; /** * @return the value */ public List<String> getValue() { - return value; + return Collections.unmodifiableList(value); } /** @@ -40,7 +42,10 @@ public List<String> getValue() { * the value to set */ public void setValue(List<String> value) { - this.value = value; + this.value.clear(); + if (value != null) { + this.value.addAll(value); + } } public boolean isSetValue() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedValues.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedValues.java index 0aec0734d..2448e8dbc 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedValues.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedValues.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.swe.simpleType; import java.math.BigInteger; +import java.util.Collections; import java.util.List; import org.n52.shetland.ogc.swe.RangeValue; @@ -34,7 +35,7 @@ public class SweAllowedValues extends AbstractSWES { * @return the value */ public List<Double> getValue() { - return value; + return Collections.unmodifiableList(value); } /** @@ -43,7 +44,9 @@ public List<Double> getValue() { */ public void setValue(List<Double> value) { this.value.clear(); - this.value.addAll(value); + if (value != null) { + this.value.addAll(value); + } } public void addValue(Double value) { @@ -62,7 +65,7 @@ public boolean isSetValue() { * @return the interval */ public List<RangeValue<Double>> getInterval() { - return interval; + return Collections.unmodifiableList(interval); } /** @@ -71,7 +74,9 @@ public List<RangeValue<Double>> getInterval() { */ public void setInterval(List<RangeValue<Double>> interval) { this.interval.clear(); - this.interval.addAll(interval); + if (interval != null) { + this.interval.addAll(interval); + } } /** diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCategoryRange.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCategoryRange.java index 9b2f5b80c..85122e66d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCategoryRange.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCategoryRange.java @@ -18,6 +18,9 @@ import org.n52.shetland.ogc.swe.RangeValue; import org.n52.shetland.ogc.swe.SweConstants.SweDataComponentType; import org.n52.shetland.w3c.xlink.Referenceable; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.n52.shetland.ogc.swe.SweDataComponentVisitor; import org.n52.shetland.ogc.swe.VoidSweDataComponentVisitor; @@ -30,6 +33,7 @@ public class SweCategoryRange extends SweAbstractUomType<RangeValue<String>> imp private Referenceable<SweAllowedTokens> constraint; @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public RangeValue<String> getValue() { return value; } @@ -53,6 +57,7 @@ public boolean isSetValue() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweAbstractSimpleType<RangeValue<String>> setValue(RangeValue<String> value) { this.value = value; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCountRange.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCountRange.java index 0a85c4921..41ad4471c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCountRange.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCountRange.java @@ -18,6 +18,9 @@ import org.n52.shetland.ogc.swe.RangeValue; import org.n52.shetland.ogc.swe.SweConstants.SweDataComponentType; import org.n52.shetland.w3c.xlink.Referenceable; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.n52.shetland.ogc.swe.SweDataComponentVisitor; import org.n52.shetland.ogc.swe.VoidSweDataComponentVisitor; @@ -31,11 +34,13 @@ public class SweCountRange extends SweAbstractSimpleType<RangeValue<Integer>> { private Referenceable<SweAllowedValues> constraint; @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public RangeValue<Integer> getValue() { return value; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweCountRange setValue(final RangeValue<Integer> value) { this.value = value; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQualityHolder.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQualityHolder.java index 4fa5d2115..114988146 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQualityHolder.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQualityHolder.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.swe.simpleType; import java.util.Collection; +import java.util.Collections; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -30,7 +31,7 @@ public class SweQualityHolder { private Map<String, ReferenceType> references = new LinkedHashMap<>(); public List<SweQuality> getQuality() { - return quality; + return Collections.unmodifiableList(quality); } public SweQualityHolder addQuality(SweQuality quality) { @@ -66,7 +67,7 @@ public void setReferences(Map<String, ReferenceType> references) { } public Map<String, ReferenceType> getReferences() { - return references; + return Collections.unmodifiableMap(references); } public boolean isSetReferences() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuantityRange.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuantityRange.java index f77c4f280..d82a88d3e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuantityRange.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuantityRange.java @@ -23,6 +23,8 @@ import org.n52.shetland.ogc.swe.VoidSweDataComponentVisitor; import org.n52.shetland.w3c.xlink.Referenceable; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS internal representation of SWE simpleType quantity * @@ -63,11 +65,13 @@ public SweQuantityRange setAxisID(final String axisID) { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public RangeValue<BigDecimal> getValue() { return value; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweQuantityRange setValue(RangeValue<BigDecimal> value) { this.value = value; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTime.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTime.java index 511daac0f..583cde963 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTime.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTime.java @@ -22,6 +22,8 @@ import org.n52.shetland.util.DateTimeHelper; import org.n52.shetland.w3c.xlink.Referenceable; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS internal representation of SWE simpleType time * @@ -36,11 +38,13 @@ public class SweTime extends SweAbstractUomType<DateTime> { private Referenceable<SweAllowedTimes> constraint; @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public DateTime getValue() { return value; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweTime setValue(final DateTime value) { this.value = value; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTimeRange.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTimeRange.java index b26cf8503..490ffba7b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTimeRange.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTimeRange.java @@ -21,6 +21,9 @@ import org.n52.shetland.ogc.swe.SweConstants.SweDataComponentType; import org.n52.shetland.util.DateTimeHelper; import org.n52.shetland.w3c.xlink.Referenceable; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.n52.shetland.ogc.swe.SweDataComponentVisitor; import org.n52.shetland.ogc.swe.VoidSweDataComponentVisitor; @@ -39,21 +42,25 @@ public class SweTimeRange public SweTimeRange() { } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweTimeRange(RangeValue<DateTime> value) { this.value = value; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweTimeRange(RangeValue<DateTime> value, String uom) { this.value = value; setUom(uom); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweTimeRange(RangeValue<DateTime> value, UoM uom) { this.value = value; setUom(uom); } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public RangeValue<DateTime> getValue() { return value; } @@ -78,6 +85,7 @@ public boolean isSetValue() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweTimeRange setValue(final RangeValue<DateTime> value) { this.value = value; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/stream/StreamingSweDataArray.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/stream/StreamingSweDataArray.java index 9c721d327..8d34645b6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/stream/StreamingSweDataArray.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/stream/StreamingSweDataArray.java @@ -23,6 +23,8 @@ import org.n52.shetland.ogc.swe.encoding.SweAbstractEncoding; import org.n52.shetland.ogc.swe.simpleType.SweCount; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class StreamingSweDataArray extends SweAbstractDataComponent { /** @@ -47,6 +49,7 @@ public class StreamingSweDataArray extends SweAbstractDataComponent { /** * @return the values */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public StreamingValue<?> getValues() { return values; } @@ -58,6 +61,7 @@ public StreamingValue<?> getValues() { * * @return This SweDataArray */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public StreamingSweDataArray setValues(final StreamingValue<?> values) { this.values = values; return this; @@ -66,6 +70,7 @@ public StreamingSweDataArray setValues(final StreamingValue<?> values) { /** * @return the elementType */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractDataComponent getElementType() { return elementType; } @@ -76,6 +81,7 @@ public SweAbstractDataComponent getElementType() { * * @return This SweDataArray */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public StreamingSweDataArray setElementType( final SweAbstractDataComponent elementType) { this.elementType = elementType; @@ -86,10 +92,12 @@ public SweCount getElementCount() { return new SweCount(); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractEncoding getEncoding() { return encoding; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public StreamingSweDataArray setEncoding(final SweAbstractEncoding encoding) { this.encoding = encoding; return this; @@ -110,6 +118,7 @@ public boolean isSetEncoding() { return encoding != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public StreamingSweDataArray setElementCount(final SweCount elementCount) { this.elementCount = elementCount; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swes/AbstractSWES.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swes/AbstractSWES.java index 3fc0bb064..d57bf40bd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swes/AbstractSWES.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swes/AbstractSWES.java @@ -21,6 +21,8 @@ import org.n52.shetland.ogc.ows.HasExtension; import org.n52.shetland.ogc.ows.extension.Extensions; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS internal representation of AbstractSWES element * @@ -37,6 +39,7 @@ public AbstractSWES() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Extensions getExtensions() { return extensions; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swes/SwesFeatureRelationship.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swes/SwesFeatureRelationship.java index e8950ee35..459e1d5ec 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swes/SwesFeatureRelationship.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swes/SwesFeatureRelationship.java @@ -17,6 +17,8 @@ import org.n52.shetland.ogc.gml.AbstractFeature; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 * @@ -26,6 +28,7 @@ public class SwesFeatureRelationship { private AbstractFeature feature; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SwesFeatureRelationship(String role, AbstractFeature feature) { this.role = role; this.feature = feature; @@ -43,10 +46,12 @@ public void setRole(String role) { this.role = role; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AbstractFeature getFeature() { return feature; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setFeature(AbstractFeature feature) { this.feature = feature; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/OutputDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/OutputDefinition.java index 7539fefba..4f3df7f42 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/OutputDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/OutputDefinition.java @@ -28,6 +28,8 @@ import com.google.common.base.MoreObjects; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -88,10 +90,12 @@ public void setId(OwsCode identifier) { this.id = identifier; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Format getFormat() { return format; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setFormat(Format format) { this.format = format; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ap/DockerExecutionUnit.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ap/DockerExecutionUnit.java index c5e91ed5d..dd336c772 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ap/DockerExecutionUnit.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ap/DockerExecutionUnit.java @@ -38,7 +38,7 @@ public void setImage(String image) { } public Map<String, String> getEnvironment() { - return environment; + return Collections.unmodifiableMap(environment); } public void setEnvironment(Map<String, String> environment) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/FormattedProcessData.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/FormattedProcessData.java index 854f5f211..bc21ffcd9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/FormattedProcessData.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/FormattedProcessData.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.ows.OwsCode; import org.n52.shetland.ogc.wps.Format; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import java.util.Objects; /** @@ -42,10 +44,12 @@ public FormattedProcessData() { this(null, null); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Format getFormat() { return format; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setFormat(Format format) { this.format = Objects.requireNonNull(format); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexInputDescriptionImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexInputDescriptionImpl.java index 40f842163..9dd4708a4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexInputDescriptionImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexInputDescriptionImpl.java @@ -16,6 +16,9 @@ package org.n52.shetland.ogc.wps.description.impl; import com.google.common.collect.ImmutableSet; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.n52.shetland.ogc.wps.Format; import org.n52.shetland.ogc.wps.description.ComplexInputDescription; import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; @@ -51,6 +54,7 @@ public Set<Format> getSupportedFormats() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Format getDefaultFormat() { return defaultFormat; } @@ -95,6 +99,7 @@ public B withMaximumMegabytes(BigInteger maximumMegabytes) { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public B withDefaultFormat(Format format) { this.defaultFormat = Objects.requireNonNull(format); this.supportedFormats.add(format); @@ -113,6 +118,7 @@ public Set<Format> getSupportedFormats() { return supportedFormats.build(); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Format getDefaultFormat() { return defaultFormat; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexOutputDescriptionImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexOutputDescriptionImpl.java index 0a6346611..d3ff9669a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexOutputDescriptionImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexOutputDescriptionImpl.java @@ -17,6 +17,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.n52.shetland.ogc.wps.Format; import org.n52.shetland.ogc.wps.description.ComplexOutputDescription; import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; @@ -52,6 +55,7 @@ public Set<Format> getSupportedFormats() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Format getDefaultFormat() { return this.defaultFormat; } @@ -95,6 +99,7 @@ public B withMaximumMegabytes(BigInteger maximumMegabytes) { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public B withDefaultFormat(Format format) { this.defaultFormat = Objects.requireNonNull(format); this.supportedFormats.add(format); @@ -113,6 +118,7 @@ public Set<Format> getSupportedFormats() { return supportedFormats.build(); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Format getDefaultFormat() { return defaultFormat; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/DismissResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/DismissResponse.java index f1e02ae6c..a6e82d4de 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/DismissResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/DismissResponse.java @@ -21,12 +21,15 @@ import org.n52.shetland.ogc.wps.StatusInfo; import org.n52.shetland.ogc.wps.WPSConstants; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @author Christian Autermann */ public class DismissResponse extends OwsServiceResponse { private StatusInfo status; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public DismissResponse(String service, String version, StatusInfo status) { super(service, version); this.status = status; @@ -40,10 +43,12 @@ public String getOperationName() { return WPSConstants.Operations.Dismiss.toString(); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public StatusInfo getStatus() { return status; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setStatus(StatusInfo status) { this.status = Objects.requireNonNull(status); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/GetResultResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/GetResultResponse.java index d2b00d0c8..aabd5eedd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/GetResultResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/GetResultResponse.java @@ -21,6 +21,8 @@ import org.n52.shetland.ogc.wps.Result; import org.n52.shetland.ogc.wps.WPSConstants; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @author Christian Autermann */ @@ -32,6 +34,7 @@ public GetResultResponse() { this(null, null, null); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GetResultResponse(String service, String version, Result result) { super(service, version); this.result = result; @@ -42,10 +45,12 @@ public String getOperationName() { return WPSConstants.Operations.GetResult.toString(); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Result getResult() { return this.result; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setResult(Result result) { this.result = Objects.requireNonNull(result); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/GetStatusResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/GetStatusResponse.java index 5b6de2da0..032bd35b5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/GetStatusResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/GetStatusResponse.java @@ -21,6 +21,8 @@ import org.n52.shetland.ogc.wps.StatusInfo; import org.n52.shetland.ogc.wps.WPSConstants; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @author Christian Autermann */ @@ -30,6 +32,7 @@ public class GetStatusResponse extends OwsServiceResponse { public GetStatusResponse() { } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GetStatusResponse(String service, String version, StatusInfo status) { super(service, version); this.status = status; @@ -40,10 +43,12 @@ public String getOperationName() { return WPSConstants.Operations.GetStatus.toString(); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public StatusInfo getStatus() { return status; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setStatusInfo(StatusInfo status) { this.status = Objects.requireNonNull(status); } diff --git a/shetland/core/src/main/java/org/n52/shetland/util/AqdHelper.java b/shetland/core/src/main/java/org/n52/shetland/util/AqdHelper.java index 13f894c73..c6c323864 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/AqdHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/AqdHelper.java @@ -15,6 +15,7 @@ */ package org.n52.shetland.util; +import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; @@ -31,7 +32,7 @@ public class AqdHelper { * @return the validityFlags */ public Set<Integer> getValidityFlags() { - return validityFlags; + return Collections.unmodifiableSet(validityFlags); } /** @@ -53,7 +54,7 @@ public boolean isSetValidityFlags() { * @return the verificationFlags */ public Set<Integer> getVerificationFlags() { - return verificationFlags; + return Collections.unmodifiableSet(validityFlags); } /** diff --git a/shetland/core/src/main/java/org/n52/shetland/util/EnvelopeOrGeometry.java b/shetland/core/src/main/java/org/n52/shetland/util/EnvelopeOrGeometry.java index 5d766312f..06dc422be 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/EnvelopeOrGeometry.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/EnvelopeOrGeometry.java @@ -20,6 +20,8 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -43,6 +45,7 @@ public EnvelopeOrGeometry(Geometry geometry) { this(geometry, null); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Optional<Geometry> getGeometry() { return Optional.ofNullable(this.geometry); } @@ -89,6 +92,7 @@ public Coordinate getCoordinate() { } } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Geometry toGeometry() { if (this.geometry != null) { return this.geometry; diff --git a/shetland/core/src/main/java/org/n52/shetland/util/ReferencedEnvelope.java b/shetland/core/src/main/java/org/n52/shetland/util/ReferencedEnvelope.java index da3f59c25..6f5cfb137 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/ReferencedEnvelope.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/ReferencedEnvelope.java @@ -19,6 +19,9 @@ import java.util.Objects; import com.google.common.base.Joiner; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; @@ -74,6 +77,7 @@ public ReferencedEnvelope(Envelope envelope, int srid) { * * @return the envelope */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Envelope getEnvelope() { return envelope; } @@ -114,6 +118,7 @@ public void expandToInclude(ReferencedEnvelope e) { * * @return {@code this} */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ReferencedEnvelope setEnvelope(Envelope envelope) { this.envelope = envelope; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/soap/AbstractSoap.java b/shetland/core/src/main/java/org/n52/shetland/w3c/soap/AbstractSoap.java index b49a76bf9..6930c0320 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/soap/AbstractSoap.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/soap/AbstractSoap.java @@ -15,15 +15,19 @@ */ package org.n52.shetland.w3c.soap; +import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.ows.service.OwsServiceCommunicationObject; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public abstract class AbstractSoap<T extends OwsServiceCommunicationObject> { private String soapNamespace; private String soapVersion; private String soapAction; - private List<SoapHeader> soapHeader; + private List<SoapHeader> soapHeader = new LinkedList<>(); private T bodyContent; private SoapFault soapFault; @@ -81,7 +85,10 @@ public AbstractSoap<T> setAction(String soapAction) { } public AbstractSoap<T> setSoapHeader(List<SoapHeader> soapHeader) { - this.soapHeader = soapHeader; + this.soapHeader.clear(); + if (soapHeader != null) { + this.soapHeader.addAll(soapHeader); + } return this; } @@ -89,7 +96,7 @@ public AbstractSoap<T> setSoapHeader(List<SoapHeader> soapHeader) { * @return the soapHeader */ public List<SoapHeader> getSoapHeader() { - return soapHeader; + return Collections.unmodifiableList(soapHeader); } public AbstractSoap<T> setHeader(List<SoapHeader> list) { @@ -108,20 +115,24 @@ public String getSoapAction() { return soapAction; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public T getSoapBodyContent() { return bodyContent; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractSoap<T> setSoapBodyContent(T bodyContent) { this.bodyContent = bodyContent; return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractSoap<T> setBodyContent(T response) { this.bodyContent = response; return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public T getBodyContent() { return bodyContent; } @@ -134,15 +145,18 @@ public boolean isSetBodyContent() { return getBodyContent() != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractSoap<T> setSoapFault(SoapFault soapFault) { this.soapFault = soapFault; return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SoapFault getSoapFault() { return soapFault; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public boolean hasSoapFault() { return getSoapFault() != null; } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/soap/SoapChain.java b/shetland/core/src/main/java/org/n52/shetland/w3c/soap/SoapChain.java index 8005abca7..162910639 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/soap/SoapChain.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/soap/SoapChain.java @@ -21,6 +21,8 @@ import org.n52.shetland.ogc.ows.service.OwsServiceRequest; import org.n52.shetland.ogc.ows.service.OwsServiceResponse; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -40,11 +42,13 @@ public class SoapChain { private SoapResponse soapResponse = new SoapResponse(); + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SoapChain(HttpServletRequest httpRequest, HttpServletResponse httpResponse) { this.httpRequest = httpRequest; this.httpResponse = httpResponse; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OwsServiceRequest getBodyRequest() { return bodyRequest; } @@ -53,10 +57,12 @@ public boolean hasBodyRequest() { return getBodyRequest() != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setBodyRequest(OwsServiceRequest bodyRequest) { this.bodyRequest = bodyRequest; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OwsServiceResponse getBodyResponse() { return bodyResponse; } @@ -65,6 +71,7 @@ public boolean hasBodyResponse() { return getBodyResponse() != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setBodyResponse(OwsServiceResponse bodyResponse) { this.bodyResponse = bodyResponse; if (hasSoapResponse()) { @@ -72,6 +79,7 @@ public void setBodyResponse(OwsServiceResponse bodyResponse) { } } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SoapRequest getSoapRequest() { return soapRequest; } @@ -80,10 +88,12 @@ public boolean hasSoapRequest() { return getSoapRequest() != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setSoapRequest(SoapRequest soapRequest) { this.soapRequest = soapRequest; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SoapResponse getSoapResponse() { return soapResponse; } @@ -92,6 +102,7 @@ public boolean hasSoapResponse() { return getSoapResponse() != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setSoapResponse(SoapResponse soapResponse) { this.soapResponse = soapResponse; if (hasBodyResponse() && !soapResponse.isSetBodyContent()) { @@ -107,6 +118,7 @@ public boolean hasHttpRequest() { return getHttpRequest() != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public HttpServletResponse getHttpResponse() { return httpResponse; } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/soap/SoapResponse.java b/shetland/core/src/main/java/org/n52/shetland/w3c/soap/SoapResponse.java index a3074f410..66d4af54f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/soap/SoapResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/soap/SoapResponse.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; import org.n52.shetland.ogc.ows.service.OwsServiceResponse; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Representation of a SOAP response * @@ -35,10 +37,12 @@ public SoapResponse(String soapNamespace, String soapVersion) { super(soapNamespace, soapVersion); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setException(OwsExceptionReport owse) { this.exception = owse; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OwsExceptionReport getException() { return exception; } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/AbstractWsdl.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/AbstractWsdl.java index 26750c375..4db10a0a5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/AbstractWsdl.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/AbstractWsdl.java @@ -16,6 +16,7 @@ package org.n52.shetland.w3c.wsdl; import java.util.Collection; +import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; @@ -101,7 +102,7 @@ public AbstractWsdl setExtensionAttribute(QName key, Object value) { } public Map<QName, Object> getExtensionAttributes() { - return extensionAttributes; + return Collections.unmodifiableMap(extensionAttributes); } public boolean isSetExtensionAttributes() { @@ -130,7 +131,7 @@ public AbstractWsdl setExtensibilityElements(Collection<ExtensibilityElement> ex } public Collection<ExtensibilityElement> getExtensibilityElements() { - return extensibilityElements; + return Collections.unmodifiableCollection(extensibilityElements); } public boolean isSetExtensibilityElements() { diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Binding.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Binding.java index 0eb9fb083..6ccac320e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Binding.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Binding.java @@ -16,6 +16,7 @@ package org.n52.shetland.w3c.wsdl; import java.util.Collection; +import java.util.Collections; import java.util.TreeSet; import javax.xml.namespace.QName; @@ -80,7 +81,7 @@ public Binding setBindingOperations(Collection<BindingOperation> bindingOperatio } public Collection<BindingOperation> getBindingOperations() { - return bindingOperations; + return Collections.unmodifiableCollection(bindingOperations); } public boolean isSetBindingOperations() { diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/BindingOperation.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/BindingOperation.java index 82a44c0dd..599f288ab 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/BindingOperation.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/BindingOperation.java @@ -23,6 +23,8 @@ import org.n52.shetland.w3c.wsdl.WSDLConstants.WSDLQNames; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class BindingOperation extends AbstractWsdl { private BindingInput input; @@ -41,6 +43,7 @@ public QName getQName() { /** * @return the input */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public BindingInput getInput() { return input; } @@ -48,6 +51,7 @@ public BindingInput getInput() { /** * @param input the input to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setInput(BindingInput input) { this.input = input; } @@ -59,6 +63,7 @@ public boolean isSetInput() { /** * @return the output */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public BindingOutput getOutput() { return output; } @@ -66,6 +71,7 @@ public BindingOutput getOutput() { /** * @param output the output to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setOutput(BindingOutput output) { this.output = output; } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Definitions.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Definitions.java index da716da93..b21b39aee 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Definitions.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Definitions.java @@ -16,6 +16,7 @@ package org.n52.shetland.w3c.wsdl; import java.util.Collection; +import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.TreeSet; @@ -73,7 +74,7 @@ public Definitions setNamespaces(Map<String, String> namespaces) { } public Map<String, String> getNamespaces() { - return namespaces; + return Collections.unmodifiableMap(namespaces); } public boolean isSetNamespaces() { @@ -102,7 +103,7 @@ public Definitions setMessages(Collection<Message> messages) { } public Collection<Message> getMessages() { - return messages; + return Collections.unmodifiableCollection(messages); } public boolean isSetMessages() { @@ -131,7 +132,7 @@ public Definitions setServices(Collection<Service> services) { } public Collection<Service> getServices() { - return services; + return Collections.unmodifiableCollection(services); } public boolean isSetServices() { @@ -160,7 +161,7 @@ public Definitions setImports(Collection<Import> imports) { } public Collection<Import> getImports() { - return imports; + return Collections.unmodifiableCollection(imports); } public boolean isSetImports() { @@ -189,7 +190,7 @@ public Definitions setPortTypes(Collection<PortType> portTypes) { } public Collection<PortType> getPortTypes() { - return portTypes; + return Collections.unmodifiableCollection(portTypes); } public boolean isSetPortTypes() { @@ -218,7 +219,7 @@ public Definitions setTypes(Collection<Types> types) { } public Collection<Types> getTypes() { - return types; + return Collections.unmodifiableCollection(types); } public boolean isSetTypes() { @@ -247,7 +248,7 @@ public Definitions setBindings(Collection<Binding> bindings) { } public Collection<Binding> getBindings() { - return bindings; + return Collections.unmodifiableCollection(bindings); } public boolean isSetBindings() { diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Message.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Message.java index df02ccfa0..3ee7693ba 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Message.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Message.java @@ -16,6 +16,7 @@ package org.n52.shetland.w3c.wsdl; import java.util.Collection; +import java.util.Collections; import java.util.TreeSet; import javax.xml.namespace.QName; @@ -57,7 +58,7 @@ public Message setParts(Collection<Part> parts) { } public Collection<Part> getParts() { - return parts; + return Collections.unmodifiableCollection(parts); } public boolean isSetParts() { diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Operation.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Operation.java index 91ffa02e8..dc5f3b820 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Operation.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Operation.java @@ -23,6 +23,8 @@ import org.n52.shetland.w3c.wsdl.WSDLConstants.WSDLQNames; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> * @@ -46,6 +48,7 @@ public QName getQName() { /** * @return the input */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Input getInput() { return input; } @@ -53,6 +56,7 @@ public Input getInput() { /** * @param input the input to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setInput(Input input) { this.input = input; } @@ -64,6 +68,7 @@ public boolean isSetInput() { /** * @return the output */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Output getOutput() { return output; } @@ -71,6 +76,7 @@ public Output getOutput() { /** * @param output the output to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setOutput(Output output) { this.output = output; } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/PortType.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/PortType.java index 226082d96..0ff8e5ed1 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/PortType.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/PortType.java @@ -16,6 +16,7 @@ package org.n52.shetland.w3c.wsdl; import java.util.Collection; +import java.util.Collections; import java.util.TreeSet; import javax.xml.namespace.QName; @@ -57,7 +58,7 @@ public PortType setOperations(Collection<Operation> operations) { } public Collection<Operation> getOperations() { - return operations; + return Collections.unmodifiableCollection(operations); } public boolean isSetOperations() { diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Schema.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Schema.java index 531e1a7b3..201e6707c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Schema.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Schema.java @@ -21,6 +21,8 @@ import com.google.common.collect.ComparisonChain; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class Schema extends ExtensibilityElement { private String elementFormDefault; @@ -31,6 +33,7 @@ public Schema(String targetNamespace, Include include) { this("qualified", targetNamespace, include); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public Schema(String elementFormDefault, String targetNamespace, Include include) { super(WSDLConstants.QN_XSD_SCHEMA); this.elementFormDefault = elementFormDefault; @@ -46,6 +49,7 @@ public String getTargetNamespace() { return targetNamespace; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Include getInclude() { return include; } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Service.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Service.java index 88f481be7..46eb0c48f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Service.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Service.java @@ -16,6 +16,7 @@ package org.n52.shetland.w3c.wsdl; import java.util.Collection; +import java.util.Collections; import java.util.TreeSet; import javax.xml.namespace.QName; @@ -57,7 +58,7 @@ public Service setPorts(Collection<Port> ports) { } public Collection<Port> getPorts() { - return ports; + return Collections.unmodifiableCollection(ports); } public boolean isSetPorts() { From c2628462e3e56ac454ca3d17760d4cbca9ab51f9 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 19 Apr 2022 10:33:43 +0200 Subject: [PATCH 271/456] use concurrent set and map in AbstractSimilarityKeyComponentRepository --- NOTICE | 1 + .../component/AbstractSimilarityKeyComponentRepository.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index 11e9813fc..e70397b48 100644 --- a/NOTICE +++ b/NOTICE @@ -143,6 +143,7 @@ This project includes: Netty/Common under Apache License, Version 2.0 Netty/Handler under Apache License, Version 2.0 Netty/Resolver under Apache License, Version 2.0 + Netty/TomcatNative [OpenSSL - Classes] under The Apache Software License, Version 2.0 Netty/Transport under Apache License, Version 2.0 null under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0 OASIS WS-N specification schemas - including WS-BrokeredNotification (v1.3) under The Apache Software License, Version 2.0 diff --git a/janmayen/src/main/java/org/n52/janmayen/component/AbstractSimilarityKeyComponentRepository.java b/janmayen/src/main/java/org/n52/janmayen/component/AbstractSimilarityKeyComponentRepository.java index 255a2afed..34dba6b94 100644 --- a/janmayen/src/main/java/org/n52/janmayen/component/AbstractSimilarityKeyComponentRepository.java +++ b/janmayen/src/main/java/org/n52/janmayen/component/AbstractSimilarityKeyComponentRepository.java @@ -19,11 +19,11 @@ import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; import org.slf4j.Logger; @@ -55,8 +55,8 @@ public abstract class AbstractSimilarityKeyComponentRepository< extends AbstractComponentRepository<K, C, F> { private static final Logger LOG = LoggerFactory.getLogger(AbstractSimilarityKeyComponentRepository.class); - private final Set<Producer<C>> components = Sets.newHashSet(); - private final Map<K, Set<Producer<C>>> componentsByKey = new HashMap<>(); + private final Set<Producer<C>> components = Sets.newConcurrentHashSet(); + private final Map<K, Set<Producer<C>>> componentsByKey = new ConcurrentHashMap<>(); public Set<Producer<C>> getComponentProviders() { return Collections.unmodifiableSet(this.components); From d832e6f45829964046c05b51178ad138160ba463 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 19 Apr 2022 15:48:56 +0200 Subject: [PATCH 272/456] add platform parameter support --- .../ogc/om/ObservationParameterHelper.java | 145 ++++++++++++++++++ .../org/n52/shetland/ogc/om/OmConstants.java | 2 + .../n52/shetland/ogc/om/OmObservation.java | 85 ++-------- .../ogc/om/OmObservationConstellation.java | 89 ++--------- 4 files changed, 174 insertions(+), 147 deletions(-) create mode 100644 shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationParameterHelper.java diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationParameterHelper.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationParameterHelper.java new file mode 100644 index 000000000..1341f721c --- /dev/null +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationParameterHelper.java @@ -0,0 +1,145 @@ +/* + * Copyright (C) 2015-2022 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.shetland.ogc.om; + +import org.n52.shetland.ogc.gml.AbstractFeature; +import org.n52.shetland.ogc.gml.ReferenceType; +import org.n52.shetland.ogc.om.values.TextValue; + +public interface ObservationParameterHelper<T extends AbstractFeature> { + + ParameterHolder getParameterHolder(); + + /** + * Check whether category parameter is set + * + * @return <code>true</code>, if category parameter is set + */ + default boolean isSetCategoryParameter() { + return getParameterHolder().hasParameter(OmConstants.PARAMETER_NAME_CATEGORY); + } + + /** + * Remove category parameter + */ + default void removeCategoryParameter() { + if (isSetCategoryParameter()) { + removeParameter(getCategoryParameter()); + } + } + + /** + * Add category to observation + * + * @param category + * The category to set + * @return this + */ + default T addCategoryParameter(String category) { + return addCategoryParameter(new TextValue(category)); + } + + default T addCategoryParameter(TextValue category) { + return addCategoryParameter(new NamedValue<String>(new ReferenceType(OmConstants.PARAMETER_NAME_CATEGORY), + category)); + } + + default T addCategoryParameter(NamedValue<String> categoryParameter) { + getParameterHolder().addParameter(categoryParameter); + return (T) this; + } + + /** + * Get category parameter + * + * @return category parameter + */ + default NamedValue<String> getCategoryParameter() { + if (getParameterHolder().isSetParameter()) { + for (NamedValue<?> namedValue : getParameterHolder().getParameter()) { + if (namedValue.getName().getHref().equalsIgnoreCase(OmConstants.PARAMETER_NAME_CATEGORY)) { + return (NamedValue<String>) namedValue; + } + } + } + return null; + } + + /** + * Check whether platform parameter is set + * + * @return <code>true</code>, if platform parameter is set + */ + default boolean isSetPlatformParameter() { + return getParameterHolder().hasParameter(OmConstants.PARAMETER_NAME_PLATFORM); + } + + /** + * Remove platform parameter + */ + default void removePlatformParameter() { + if (isSetPlatformParameter()) { + removeParameter(getPlatformParameter()); + } + } + + /** + * Add platform to observation + * + * @param platform + * The platform to set + * @return this + */ + default T addPlatformParameter(String platform) { + return addPlatformParameter(new TextValue(platform)); + } + + default T addPlatformParameter(TextValue platform) { + return addPlatformParameter(new NamedValue<String>(new ReferenceType(OmConstants.PARAMETER_NAME_PLATFORM), + platform)); + } + + default T addPlatformParameter(NamedValue<String> platformParameter) { + getParameterHolder().addParameter(platformParameter); + return (T) this; + } + + /** + * Get platform parameter + * + * @return platform parameter + */ + default NamedValue<String> getPlatformParameter() { + if (getParameterHolder().isSetParameter()) { + for (NamedValue<?> namedValue : getParameterHolder().getParameter()) { + if (namedValue.getName().getHref().equalsIgnoreCase(OmConstants.PARAMETER_NAME_PLATFORM)) { + return (NamedValue<String>) namedValue; + } + } + } + return null; + } + + /** + * Remove parameter from list + * + * @param parameter + * Parameter to remove + */ + default void removeParameter(NamedValue<?> parameter) { + getParameterHolder().removeParameter(parameter); + } +} diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java index 1490391b0..fba6db650 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java @@ -213,6 +213,8 @@ public interface OmConstants { String PARAMETER_NAME_CATEGORY = "category"; + String PARAMETER_NAME_PLATFORM = "platform"; + String PARAMETER = EN_PARAMETER; String OM_PARAMETER = "om:" + PARAMETER; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java index 0447bfd61..742d2623b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java @@ -25,7 +25,6 @@ import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.gml.CodeWithAuthority; -import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.gml.time.IndeterminateValue; import org.n52.shetland.ogc.gml.time.Time; import org.n52.shetland.ogc.gml.time.TimeInstant; @@ -35,7 +34,6 @@ import org.n52.shetland.ogc.om.values.ProfileValue; import org.n52.shetland.ogc.om.values.SweDataArrayValue; import org.n52.shetland.ogc.om.values.TVPValue; -import org.n52.shetland.ogc.om.values.TextValue; import org.n52.shetland.ogc.om.values.TrajectoryValue; import org.n52.shetland.ogc.swe.SweDataArray; import org.n52.shetland.util.CollectionHelper; @@ -48,12 +46,11 @@ * * @since 1.0.0 */ -public class OmObservation - extends AbstractFeature { +public class OmObservation extends AbstractFeature implements ObservationParameterHelper<OmObservation> { /** - * ID of this observation; in the standard 52n SOS PostgreSQL database, this - * is implemented through a sequence type. + * ID of this observation; in the standard 52n SOS PostgreSQL database, this is implemented through a + * sequence type. */ private String observationID; @@ -68,8 +65,7 @@ public class OmObservation private TimePeriod validTime; /** - * constellation of procedure, obervedProperty, offering and - * observationType. + * constellation of procedure, obervedProperty, offering and observationType. */ private OmObservationConstellation observationConstellation; @@ -89,8 +85,7 @@ public class OmObservation private ObservationValue<?> value; /** - * token separator for the value tuples contained in the result element of - * the generic observation. + * token separator for the value tuples contained in the result element of the generic observation. */ private String tokenSeparator; @@ -167,6 +162,10 @@ public OmObservationConstellation getObservationConstellation() { && !observationConstellation.isSetCategoryParameter()) { observationConstellation.addCategoryParameter(getCategoryParameter()); } + if (isSetPlatformParameter() && observationConstellation != null + && !observationConstellation.isSetPlatformParameter()) { + observationConstellation.addPlatformParameter(getPlatformParameter()); + } return observationConstellation; } @@ -641,16 +640,6 @@ public void removeSpatialFilteringProfileParameter() { } } - /** - * Remove parameter from list - * - * @param parameter - * Parameter to remove - */ - public void removeParameter(NamedValue<?> parameter) { - getParameterHolder().removeParameter(parameter); - } - /** * Add sampling geometry to observation * @@ -716,61 +705,6 @@ public NamedValue<BigDecimal> getHeightDepthParameter() { return parameterHolder.getHeightDepthParameter(); } - /** - * Check whether category parameter is set - * - * @return <code>true</code>, if category parameter is set - */ - public boolean isSetCategoryParameter() { - return parameterHolder.hasParameter(OmConstants.PARAMETER_NAME_CATEGORY); - } - - /** - * Remove category parameter - */ - public void removeCategoryParameter() { - if (isSetCategoryParameter()) { - removeParameter(getCategoryParameter()); - } - } - - /** - * Add category to observation - * - * @param category - * The category to set - * @return this - */ - public OmObservation addCategoryParameter(String category) { - return addCategoryParameter(new TextValue(category)); - } - - public OmObservation addCategoryParameter(TextValue category) { - return addCategoryParameter(new NamedValue<String>(new ReferenceType(OmConstants.PARAMETER_NAME_CATEGORY), - category)); - } - - public OmObservation addCategoryParameter(NamedValue<String> categoryParameter) { - parameterHolder.addParameter(categoryParameter); - return this; - } - - /** - * Get category parameter - * - * @return category parameter - */ - public NamedValue<String> getCategoryParameter() { - if (parameterHolder.isSetParameter()) { - for (NamedValue<?> namedValue : parameterHolder.getParameter()) { - if (namedValue.getName().getHref().equalsIgnoreCase(OmConstants.PARAMETER_NAME_CATEGORY)) { - return (NamedValue<String>) namedValue; - } - } - } - return null; - } - public OmObservation cloneTemplate() { return cloneTemplate(new OmObservation()); } @@ -821,6 +755,7 @@ public OmObservation copyTo(OmObservation copyOf) { copyOf.setResultQuality(getResultQuality()); copyOf.setRelatedObservations(getRelatedObservations()); copyOf.setAdditionalMergeIndicator(getAdditionalMergeIndicator()); + copyOf.setParameter(getParameterHolder().getParameter()); return copyOf; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java index 8023409c0..6d53a8ba6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java @@ -22,10 +22,8 @@ import org.n52.janmayen.Copyable; import org.n52.shetland.ogc.gml.AbstractFeature; -import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.om.series.DefaultPointMetadata; import org.n52.shetland.ogc.om.series.Metadata; -import org.n52.shetland.ogc.om.values.TextValue; import org.n52.shetland.w3c.Nillable; import com.google.common.base.Objects; @@ -33,9 +31,8 @@ /** * @since 1.0.0 */ -public class OmObservationConstellation - extends AbstractFeature - implements Copyable<OmObservationConstellation> { +public class OmObservationConstellation extends AbstractFeature + implements ObservationParameterHelper<OmObservationConstellation>, Copyable<OmObservationConstellation> { /** * Identifier of the procedure by which the observation is made @@ -88,8 +85,8 @@ public OmObservationConstellation() { * @param featureOfInterest * featureOfInterest to which this observation belongs */ - public OmObservationConstellation( - AbstractFeature procedure, AbstractPhenomenon observableProperty, AbstractFeature featureOfInterest) { + public OmObservationConstellation(AbstractFeature procedure, AbstractPhenomenon observableProperty, + AbstractFeature featureOfInterest) { this(procedure, observableProperty, null, featureOfInterest, null); } @@ -105,9 +102,8 @@ public OmObservationConstellation( * @param observationType * the observation type */ - public OmObservationConstellation( - AbstractFeature procedure, AbstractPhenomenon observableProperty, AbstractFeature featureOfInterest, - String observationType) { + public OmObservationConstellation(AbstractFeature procedure, AbstractPhenomenon observableProperty, + AbstractFeature featureOfInterest, String observationType) { this(procedure, observableProperty, null, featureOfInterest, observationType); } @@ -125,9 +121,8 @@ public OmObservationConstellation( * @param observationType * the observation type */ - public OmObservationConstellation( - AbstractFeature procedure, AbstractPhenomenon observableProperty, Set<String> offerings, - AbstractFeature featureOfInterest, String observationType) { + public OmObservationConstellation(AbstractFeature procedure, AbstractPhenomenon observableProperty, + Set<String> offerings, AbstractFeature featureOfInterest, String observationType) { super(""); this.procedure = Nillable.of(procedure); this.observableProperty = observableProperty; @@ -148,9 +143,8 @@ public OmObservationConstellation( * @param offerings * offering to which this observation belongs */ - public OmObservationConstellation( - AbstractFeature procedure, AbstractPhenomenon observableProperty, AbstractFeature featureOfInterest, - Set<String> offerings) { + public OmObservationConstellation(AbstractFeature procedure, AbstractPhenomenon observableProperty, + AbstractFeature featureOfInterest, Set<String> offerings) { this(procedure, observableProperty, featureOfInterest); this.offerings = offerings; } @@ -338,6 +332,11 @@ public OmObservationConstellation setObservationType(String observationType) { return this; } + @Override + public ParameterHolder getParameterHolder() { + return parameterHolder; + } + @Override public boolean equals(Object o) { if (o instanceof OmObservationConstellation) { @@ -391,6 +390,7 @@ public OmObservationConstellation copy() { copy.setIdentifier(this.getIdentifier()); copy.setName(this.getName()); copy.setDescription(this.getDescription()); + copy.setParameter(getParameterHolder().getParameter()); return copy; } @@ -435,62 +435,7 @@ public void setMetadata(Metadata metadata) { } public void setParameter(Collection<NamedValue<?>> parameter) { - this.parameterHolder.addParameter(parameter); - } - - /** - * Check whether category parameter is set - * - * @return <code>true</code>, if category parameter is set - */ - public boolean isSetCategoryParameter() { - return parameterHolder.hasParameter(OmConstants.PARAMETER_NAME_CATEGORY); - } - - /** - * Remove category parameter - */ - public void removeCategoryParameter() { - if (isSetCategoryParameter()) { - parameterHolder.removeParameter(getCategoryParameter()); - } - } - - /** - * Add category to observation - * - * @param category - * The category to set - * @return this - */ - public OmObservationConstellation addCategoryParameter(String category) { - return addCategoryParameter(new TextValue(category)); - } - - public OmObservationConstellation addCategoryParameter(TextValue category) { - return addCategoryParameter(new NamedValue<String>(new ReferenceType(OmConstants.PARAMETER_NAME_CATEGORY), - category)); - } - - public OmObservationConstellation addCategoryParameter(NamedValue<String> categoryParameter) { - parameterHolder.addParameter(categoryParameter); - return this; - } - - /** - * Get category parameter - * - * @return category parameter - */ - public NamedValue<String> getCategoryParameter() { - if (parameterHolder.isSetParameter()) { - for (NamedValue<?> namedValue : parameterHolder.getParameter()) { - if (namedValue.getName().getHref().equalsIgnoreCase(OmConstants.PARAMETER_NAME_CATEGORY)) { - return (NamedValue<String>) namedValue; - } - } - } - return null; + this.getParameterHolder().addParameter(parameter); } @Override From 43a301abe4daff05384f96266feff40ccb2a7ea0 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 19 Apr 2022 15:49:34 +0200 Subject: [PATCH 273/456] add extension encoding for InsertSensor --- .../org/n52/shetland/ogc/swes/SwesExtension.java | 3 +-- .../svalbard/decode/AbstractSwesDecoderv20.java | 2 +- .../encode/AbstractSwesRequestEncoder.java | 14 ++++++++++++++ .../encode/InsertSensorRequestEncoder.java | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swes/SwesExtension.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swes/SwesExtension.java index afec434aa..fd17d46c4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swes/SwesExtension.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swes/SwesExtension.java @@ -17,7 +17,6 @@ import org.n52.shetland.ogc.ows.extension.AbstractExtension; import org.n52.shetland.ogc.swe.SweAbstractDataComponent; -import org.n52.shetland.ogc.swe.SweConstants; /** * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> @@ -38,7 +37,7 @@ public SwesExtension() { @Override public String getNamespace() { - return SweConstants.NS_SWE_20; + return SwesConstants.NS_SWES_20; } @Override diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java index 158f7b120..9dd1c9c81 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java @@ -40,7 +40,6 @@ protected Extensions parseExtensibleRequestExtension(XmlObject[] extensionArray) if (CollectionHelper.isNotNullOrEmpty(extensionArray)) { final Extensions extensions = new Extensions(); for (XmlObject xbExtension : extensionArray) { - Object obj = decodeXmlElement(xbExtension); if (obj instanceof Extension<?>) { extensions.addExtension((Extension<?>) obj); @@ -49,6 +48,7 @@ protected Extensions parseExtensibleRequestExtension(XmlObject[] extensionArray) new SwesExtension<SweAbstractDataComponent>(); swesExtension.setIdentifier(((SweAbstractDataComponent) obj).getIdentifier()); swesExtension.setDefinition(((SweAbstractDataComponent) obj).getDefinition()); + swesExtension.setValue((SweAbstractDataComponent) obj); extensions.addExtension(swesExtension); } } diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSwesRequestEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSwesRequestEncoder.java index 759a263d6..1e92ea8c2 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSwesRequestEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSwesRequestEncoder.java @@ -17,14 +17,19 @@ import java.util.Set; +import org.n52.shetland.ogc.ows.extension.Extension; import org.n52.shetland.ogc.ows.service.OwsServiceRequest; import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; +import org.n52.shetland.ogc.sos.request.InsertSensorRequest; import org.n52.shetland.ogc.swes.SwesConstants; import org.n52.shetland.util.CollectionHelper; import org.n52.shetland.w3c.SchemaLocation; +import org.n52.svalbard.encode.exception.EncodingException; import org.n52.svalbard.encode.exception.UnsupportedEncoderInputException; +import net.opengis.swes.x20.ExtensibleRequestType; + /** * @author <a href="mailto:j.schulte@52north.org">Jan Schulte</a> * @author <a href="mailto:e.h.juerrens@52north.org">J6uuml;rrens, Eike Hinderk</a> @@ -37,6 +42,15 @@ public AbstractSwesRequestEncoder(String operation, Class<T> responseType) { SwesConstants.NS_SWES_PREFIX, responseType); } + protected void addExtension(OwsServiceRequest request, ExtensibleRequestType extensibleRequestType) + throws EncodingException { + if (request.hasExtensions()) { + for (Extension<?> extension : request.getExtensions().getExtensions()) { + extensibleRequestType.addNewExtension().set(encodeObjectToXml(extension.getNamespace(), extension)); + } + } + } + @Override protected Set<SchemaLocation> getConcreteSchemaLocations() { return CollectionHelper.set(SwesConstants.SWES_20_SCHEMA_LOCATION); diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InsertSensorRequestEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InsertSensorRequestEncoder.java index 961e3a0fa..5e79bf57f 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InsertSensorRequestEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InsertSensorRequestEncoder.java @@ -48,6 +48,7 @@ protected XmlObject create(InsertSensorRequest request) throws EncodingException addProcedureDescription(request, insertSensor); addObservableProperties(request, insertSensor); addMetadata(request, insertSensor); + addExtension(request, insertSensor); return doc; } From ecb97d3bd91295faec130377384368fc4ad7d552 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 20 Apr 2022 16:25:34 +0200 Subject: [PATCH 274/456] some further fixes --- .../n52/shetland/aqd/AqdSamplingPoint.java | 6 + .../n52/shetland/aqd/EReportingHeader.java | 48 ++--- .../n52/shetland/aqd/ReportObligation.java | 6 + .../org/n52/shetland/filter/ExpandFilter.java | 35 +-- .../org/n52/shetland/filter/SelectFilter.java | 23 +- .../inspire/AbstractInspireKeyword.java | 3 + .../shetland/inspire/GeographicalName.java | 9 +- .../n52/shetland/inspire/InspireCitation.java | 26 ++- .../shetland/inspire/InspireConformity.java | 3 + .../inspire/InspireResourceLocator.java | 11 +- .../shetland/inspire/InspireSupportedCRS.java | 12 +- .../inspire/InspireSupportedLanguages.java | 16 +- .../inspire/InspireTemporalReference.java | 34 +-- .../inspire/base2/DocumentCitation.java | 25 ++- .../dls/FullInspireExtendedCapabilities.java | 98 +++++---- .../inspire/ef/AbstractMonitoringFeature.java | 50 +++-- .../inspire/ef/AbstractMonitoringObject.java | 110 +++++++--- .../ef/EnvironmentalMonitoringProgramme.java | 17 +- .../inspire/ef/ObservingCapability.java | 9 + .../inspire/ef/OperationalActivityPeriod.java | 4 + .../shetland/inspire/ef/ReportToLegalAct.java | 6 + .../n52/shetland/inspire/ompr/Process.java | 14 +- .../inspire/omso/MultiPointObservation.java | 3 +- .../inspire/omso/PointObservation.java | 3 +- .../inspire/omso/ProfileObservation.java | 3 +- .../inspire/omso/TrajectoryObservation.java | 6 +- .../iso/gmd/AbstractMDIdentification.java | 4 + .../org/n52/shetland/iso/gmd/CiAddress.java | 10 +- .../org/n52/shetland/iso/gmd/CiTelephone.java | 11 +- .../org/n52/shetland/iso/gmd/EXExtent.java | 3 +- .../org/n52/shetland/iso/gmd/GmdCitation.java | 3 + .../iso/gmd/GmdConformanceResult.java | 5 + .../iso/gmd/GmdQuantitativeResult.java | 5 + .../shetland/iso/gmd/GmdSpecification.java | 6 + .../org/n52/shetland/iso/gmd/MDMetadata.java | 41 ++-- .../org/n52/shetland/iso/gmd/PT_FreeText.java | 20 +- .../java/org/n52/shetland/iso/gmd/ScCRS.java | 4 + .../ogc/filter/BinaryLogicFilter.java | 15 +- .../org/n52/shetland/ogc/filter/IdFilter.java | 22 +- .../shetland/ogc/filter/SpatialFilter.java | 5 +- .../shetland/ogc/filter/TemporalFilter.java | 5 + .../org/n52/shetland/ogc/gml/AbstractCRS.java | 24 ++- .../ogc/gml/AbstractCoordinateSystem.java | 33 +-- .../n52/shetland/ogc/gml/AbstractDatum.java | 24 ++- .../org/n52/shetland/ogc/gml/AbstractGML.java | 73 ++++--- .../shetland/ogc/gml/AbstractGeometry.java | 4 + .../shetland/ogc/gml/DomainOfValidity.java | 4 + .../shetland/ogc/gml/GmlAbstractGeometry.java | 4 + .../shetland/ogc/gml/time/TimeInstant.java | 4 + .../n52/shetland/ogc/gml/time/TimePeriod.java | 16 ++ .../ogc/om/MultiObservationValues.java | 6 + .../org/n52/shetland/ogc/om/NamedValue.java | 5 + .../ogc/om/OmCompositePhenomenon.java | 46 ++-- .../n52/shetland/ogc/om/OmObservation.java | 124 ++++++++--- .../ogc/om/OmObservationConstellation.java | 47 +++-- .../n52/shetland/ogc/om/PointValuePair.java | 7 + .../ogc/om/SingleObservationValue.java | 31 ++- .../n52/shetland/ogc/om/StreamingValue.java | 8 + .../ogc/om/TimeLocationValueTriple.java | 5 + .../n52/shetland/ogc/om/TimeValuePair.java | 7 + .../AbstractSamplingFeature.java | 74 ++++--- .../SamplingFeatureComplex.java | 4 + .../features/samplingFeatures/SfSpecimen.java | 61 ++++-- .../om/series/AbstractMonitoringFeature.java | 62 +++--- .../om/series/AbstractObservationProcess.java | 78 ++++--- .../AbstractPofileTrajectoryElement.java | 20 +- .../shetland/ogc/om/values/ComplexValue.java | 5 + .../om/values/CvDiscretePointCoverage.java | 4 + .../ogc/om/values/MultiPointCoverage.java | 29 ++- .../shetland/ogc/om/values/ProfileLevel.java | 7 + .../shetland/ogc/om/values/ProfileValue.java | 27 ++- .../ogc/om/values/SweDataArrayValue.java | 5 + .../n52/shetland/ogc/om/values/TLVTValue.java | 25 ++- .../n52/shetland/ogc/om/values/TVPValue.java | 26 ++- .../ogc/om/values/TrajectoryValue.java | 20 +- .../shetland/ogc/ows/OwsAcceptVersions.java | 25 ++- .../org/n52/shetland/ogc/ows/OwsSections.java | 22 +- .../ogc/ows/exception/CodedException.java | 2 +- .../ows/service/GetCapabilitiesResponse.java | 4 + .../ogc/ows/service/OwsServiceRequest.java | 6 + .../ogc/ows/service/OwsServiceResponse.java | 3 + .../ogc/sensorML/AbstractComponent.java | 6 + .../ogc/sensorML/AbstractProcess.java | 41 ++-- .../ogc/sensorML/AbstractSensorML.java | 125 ++++++----- .../shetland/ogc/sensorML/ProcessChain.java | 7 +- .../shetland/ogc/sensorML/ProcessModel.java | 4 + .../n52/shetland/ogc/sensorML/SensorML.java | 21 +- .../shetland/ogc/sensorML/SmlContactList.java | 27 +-- .../ogc/sensorML/SmlResponsibleParty.java | 94 ++++----- .../org/n52/shetland/ogc/sensorML/System.java | 7 +- .../AbstractDataComponentContainer.java | 5 + .../AbstractSmlDataComponentContainer.java | 39 +++- .../sensorML/elements/SmlCapabilities.java | 54 +++-- .../sensorML/elements/SmlCharacteristics.java | 46 ++-- .../ogc/sensorML/elements/SmlComponent.java | 4 + .../ogc/sensorML/elements/SmlConnection.java | 17 +- .../sensorML/elements/SmlDocumentation.java | 16 +- .../elements/SmlDocumentationList.java | 15 +- .../elements/SmlDocumentationListMember.java | 7 +- .../shetland/ogc/sensorML/elements/SmlIo.java | 5 + .../ogc/sensorML/elements/SmlLocation.java | 10 +- .../ogc/sensorML/elements/SmlParameter.java | 12 +- .../ogc/sensorML/elements/SmlPosition.java | 33 ++- .../sensorML/v20/AbstractPhysicalProcess.java | 4 + .../ogc/sensorML/v20/AbstractProcessV20.java | 4 + .../ogc/sensorML/v20/AggregateProcess.java | 11 +- .../ogc/sensorML/v20/PhysicalComponent.java | 4 + .../ogc/sensorML/v20/PhysicalSystem.java | 11 +- .../ogc/sensorML/v20/SimpleProcess.java | 4 + .../ogc/sensorML/v20/SmlDataInterface.java | 8 +- .../sensorML/v20/SmlFeatureOfInterest.java | 29 ++- .../ogc/sos/SosInsertionMetadata.java | 24 ++- .../ogc/sos/SosObservationOffering.java | 8 + .../ogc/sos/SosProcedureDescription.java | 33 ++- .../shetland/ogc/sos/SosSpatialFilter.java | 4 + .../sos/delobs/DeleteObservationRequest.java | 47 +++-- .../sos/delobs/DeleteObservationResponse.java | 4 + .../sos/drt/DeleteResultTemplateRequest.java | 23 +- .../sos/drt/DeleteResultTemplateResponse.java | 17 +- .../sos/gda/GetDataAvailabilityRequest.java | 96 ++++++--- .../sos/gda/GetDataAvailabilityResponse.java | 199 ++++++++++++------ .../ifoi/InsertFeatureOfInterestRequest.java | 3 +- .../ogc/sos/request/BatchRequest.java | 3 + .../sos/request/DescribeSensorRequest.java | 5 +- .../request/GetFeatureOfInterestRequest.java | 78 ++++--- .../request/GetObservationByIdRequest.java | 19 +- .../sos/request/GetObservationRequest.java | 88 +++++--- .../ogc/sos/request/GetResultRequest.java | 52 +++-- .../sos/request/InsertObservationRequest.java | 23 +- .../request/InsertResultTemplateRequest.java | 4 + .../ogc/sos/request/InsertSensorRequest.java | 44 ++-- .../sos/request/SosRegisterSensorRequest.java | 48 ++--- .../ogc/sos/request/UpdateSensorRequest.java | 22 +- .../ogc/swe/SweAbstractDataRecord.java | 2 +- .../n52/shetland/ogc/swe/SweDataArray.java | 6 +- .../n52/shetland/ogc/swe/SweDataStream.java | 11 +- .../org/n52/shetland/ogc/swe/SweField.java | 1 + .../impl/ComplexInputDescriptionImpl.java | 2 +- .../ogc/om/values/ProfileLevelTest.java | 7 +- 139 files changed, 2210 insertions(+), 1053 deletions(-) diff --git a/shetland/core/src/main/java/org/n52/shetland/aqd/AqdSamplingPoint.java b/shetland/core/src/main/java/org/n52/shetland/aqd/AqdSamplingPoint.java index 7e88c6a8a..35afbb498 100644 --- a/shetland/core/src/main/java/org/n52/shetland/aqd/AqdSamplingPoint.java +++ b/shetland/core/src/main/java/org/n52/shetland/aqd/AqdSamplingPoint.java @@ -18,6 +18,8 @@ import org.n52.shetland.aqd.AqdConstants.AssessmentType; import org.n52.shetland.inspire.ef.EfEnvironmentalMonitoringFacility; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class represents an AQD_SamplingPoint * @@ -54,6 +56,7 @@ public void setAssessmentType(AssessmentType assessmentType) { /** * @return the station */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AqdStation getStation() { return station; } @@ -61,6 +64,7 @@ public AqdStation getStation() { /** * @param station the station to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setStation(AqdStation station) { this.station = station; } @@ -75,6 +79,7 @@ public boolean isSetStation() { /** * @return the network */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AqdNetwork getNetwork() { return network; } @@ -82,6 +87,7 @@ public AqdNetwork getNetwork() { /** * @param network the network to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setNetwork(AqdNetwork network) { this.network = network; } diff --git a/shetland/core/src/main/java/org/n52/shetland/aqd/EReportingHeader.java b/shetland/core/src/main/java/org/n52/shetland/aqd/EReportingHeader.java index e73014c56..d2d2ff77f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/aqd/EReportingHeader.java +++ b/shetland/core/src/main/java/org/n52/shetland/aqd/EReportingHeader.java @@ -33,11 +33,13 @@ import com.google.common.base.Objects; import com.google.common.base.Preconditions; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class EReportingHeader extends AbstractEReportingHeader { private Identifier inspireID; private RelatedParty reportingAuthority; private EReportingChange change; - private Referenceable<Time> reportingPeriod = Referenceable.of(Nillable.<Time>missing()); + private Referenceable<Time> reportingPeriod = Referenceable.of(Nillable.<Time> missing()); private final List<Referenceable<AbstractFeature>> delete = new LinkedList<>(); private final List<Referenceable<AbstractFeature>> content = new LinkedList<>(); @@ -45,10 +47,12 @@ public EReportingHeader() { setDefaultElementEncoding(AqdConstants.NS_AQD); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public EReportingChange getChange() { return change; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public EReportingHeader setChange(EReportingChange change) { this.change = Preconditions.checkNotNull(change); return this; @@ -62,10 +66,12 @@ public AbstractGML setIdentifier(CodeWithAuthority identifier) { return super.setIdentifier(identifier); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Identifier getInspireID() { return inspireID; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public EReportingHeader setInspireID(Identifier inspireID) { this.inspireID = Preconditions.checkNotNull(inspireID); super.setIdentifier(inspireID); @@ -76,18 +82,18 @@ public Referenceable<Time> getReportingPeriod() { return reportingPeriod; } - public EReportingHeader setReportingPeriod( - Referenceable<Time> reportingPeriod) { + public EReportingHeader setReportingPeriod(Referenceable<Time> reportingPeriod) { this.reportingPeriod = Preconditions.checkNotNull(reportingPeriod); return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public RelatedParty getReportingAuthority() { return reportingAuthority; } - public EReportingHeader setReportingAuthority( - RelatedParty reportingAuthority) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public EReportingHeader setReportingAuthority(RelatedParty reportingAuthority) { this.reportingAuthority = Preconditions.checkNotNull(reportingAuthority); return this; } @@ -114,7 +120,9 @@ public boolean isSetContent() { } public EReportingHeader addContent(Referenceable<AbstractFeature> content) { - this.content.add(Preconditions.checkNotNull(content)); + if (content != null) { + this.content.add(Preconditions.checkNotNull(content)); + } return this; } @@ -125,37 +133,29 @@ public EReportingHeader addContent(AbstractFeature content) { @Override public int hashCode() { - return Objects.hashCode(getInspireID(), getReportingAuthority(), - getChange(), getReportingPeriod(), getDelete(), - getContent()); + return Objects.hashCode(getInspireID(), getReportingAuthority(), getChange(), getReportingPeriod(), + getDelete(), getContent()); } @Override public boolean equals(Object obj) { if (obj instanceof EReportingHeader) { EReportingHeader that = (EReportingHeader) obj; - return Objects.equal(getInspireID(), that.getInspireID()) && - Objects.equal(getReportingAuthority(), that.getReportingAuthority()) && - Objects.equal(getChange(), that.getChange()) && - Objects.equal(getReportingPeriod(), that.getReportingPeriod()) && - Objects.equal(getDelete(), that.getDelete()) && - Objects.equal(getContent(), that.getContent()); + return Objects.equal(getInspireID(), that.getInspireID()) + && Objects.equal(getReportingAuthority(), that.getReportingAuthority()) + && Objects.equal(getChange(), that.getChange()) + && Objects.equal(getReportingPeriod(), that.getReportingPeriod()) + && Objects.equal(getDelete(), that.getDelete()) && Objects.equal(getContent(), that.getContent()); } return false; } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("inspireID", getInspireID()) - .add("reportingAuthority", getReportingAuthority()) - .add("change", getChange()) - .add("reportingPeriod", getReportingPeriod()) - .add("delete", getDelete()) - .add("content", getContent()) + return MoreObjects.toStringHelper(this).add("inspireID", getInspireID()) + .add("reportingAuthority", getReportingAuthority()).add("change", getChange()) + .add("reportingPeriod", getReportingPeriod()).add("delete", getDelete()).add("content", getContent()) .toString(); } - - } diff --git a/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligation.java b/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligation.java index 85ab27aed..55f0dd0f2 100644 --- a/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligation.java +++ b/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligation.java @@ -24,6 +24,8 @@ import com.google.common.base.Objects; import com.google.common.base.Preconditions; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -35,10 +37,12 @@ public class ReportObligation { private Referenceable<Time> reportingPeriod = Referenceable.of(Nillable.<Time>missing()); + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public EReportingChange getChange() { return change; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ReportObligation setChange(EReportingChange change) { this.change = Preconditions.checkNotNull(change); return this; @@ -48,10 +52,12 @@ public boolean isSetChange() { return getChange() != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Identifier getInspireID() { return inspireID; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ReportObligation setInspireID(Identifier inspireID) { this.inspireID = Preconditions.checkNotNull(inspireID); return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/filter/ExpandFilter.java b/shetland/core/src/main/java/org/n52/shetland/filter/ExpandFilter.java index 4499ae502..c56aca516 100644 --- a/shetland/core/src/main/java/org/n52/shetland/filter/ExpandFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/filter/ExpandFilter.java @@ -15,35 +15,42 @@ */ package org.n52.shetland.filter; -import org.n52.shetland.ogc.filter.FilterClause; - -import java.util.HashSet; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; +import org.n52.shetland.ogc.filter.FilterClause; + public class ExpandFilter implements FilterClause { - private final Set<ExpandItem> items; + private final Set<ExpandItem> items = new LinkedHashSet<>(); public ExpandFilter(ExpandItem item) { - this.items = new HashSet<>(); - this.items.add(item); + if (item != null) { + this.items.add(item); + } } - public ExpandFilter(Set<ExpandItem> items) { - this.items = items; + public ExpandFilter(Collection<ExpandItem> items) { + if (items != null) { + this.items.addAll(items); + } } public Set<ExpandItem> getItems() { - return items; + return Collections.unmodifiableSet(items); } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(this.items); } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o == this) { return true; } @@ -55,8 +62,8 @@ public Set<ExpandItem> getItems() { return this.items.equals(((ExpandFilter) o).getItems()); } - @Override public String toString() { - return "$expand=" + - this.items.stream().map(ExpandItem::toString).collect(Collectors.joining(", ")); + @Override + public String toString() { + return "$expand=" + this.items.stream().map(ExpandItem::toString).collect(Collectors.joining(", ")); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/filter/SelectFilter.java b/shetland/core/src/main/java/org/n52/shetland/filter/SelectFilter.java index 5025a1ccb..1d24bc1a2 100644 --- a/shetland/core/src/main/java/org/n52/shetland/filter/SelectFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/filter/SelectFilter.java @@ -15,27 +15,32 @@ */ package org.n52.shetland.filter; -import org.n52.shetland.ogc.filter.FilterClause; - -import java.util.HashSet; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; import java.util.Objects; import java.util.Set; +import org.n52.shetland.ogc.filter.FilterClause; + public class SelectFilter implements FilterClause { - private final Set<String> items; + private final Set<String> items = new LinkedHashSet<>(); public SelectFilter(String item) { - this.items = new HashSet<>(); - items.add(item); + if (item != null) { + this.items.add(item); + } } - public SelectFilter(Set<String> items) { - this.items = items; + public SelectFilter(Collection<String> items) { + if (items != null) { + this.items.addAll(items); + } } public Set<String> getItems() { - return this.items; + return Collections.unmodifiableSet(items); } @Override public int hashCode() { diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/AbstractInspireKeyword.java b/shetland/core/src/main/java/org/n52/shetland/inspire/AbstractInspireKeyword.java index f53b3ec07..464f7634b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/AbstractInspireKeyword.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/AbstractInspireKeyword.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.inspire; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Abstract service internal representation of INSPIRE keywords * @@ -47,6 +49,7 @@ public AbstractInspireKeyword(InspireOriginatingControlledVocabulary originating * * @return the originatingControlledVocabulary */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public InspireOriginatingControlledVocabulary getOriginatingControlledVocabulary() { return originatingControlledVocabulary; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/GeographicalName.java b/shetland/core/src/main/java/org/n52/shetland/inspire/GeographicalName.java index b77c1a6ac..43f0cd70f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/GeographicalName.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/GeographicalName.java @@ -15,6 +15,7 @@ */ package org.n52.shetland.inspire; +import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -27,6 +28,8 @@ import com.google.common.base.Objects; import com.google.common.base.Preconditions; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -115,8 +118,10 @@ public List<Spelling> getSpelling() { return Collections.unmodifiableList(spelling); } - public GeographicalName setSpelling(List<Spelling> spelling) { - this.spelling = Preconditions.checkNotNull(spelling); + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public GeographicalName setSpelling(Collection<Spelling> spelling) { + this.spelling.clear(); + this.spelling.addAll(Preconditions.checkNotNull(spelling)); return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireCitation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireCitation.java index 6969c5cc2..91e3ffe31 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireCitation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireCitation.java @@ -16,6 +16,7 @@ package org.n52.shetland.inspire; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Set; @@ -123,7 +124,7 @@ public boolean isSetDateOf() { * @return the URLs */ public Set<String> getUrls() { - return urls; + return Collections.unmodifiableSet(urls); } /** @@ -134,9 +135,9 @@ public Set<String> getUrls() { * @return this */ public InspireCitation setUrls(Collection<String> urls) { + this.urls.clear(); if (CollectionHelper.isNotEmpty(urls)) { - getUrls().clear(); - getUrls().addAll(urls); + this.urls.addAll(urls); } return this; } @@ -149,7 +150,9 @@ public InspireCitation setUrls(Collection<String> urls) { * @return this */ public InspireCitation addUrl(String url) { - getUrls().add(url); + if (!Strings.isNullOrEmpty(url)) { + this.urls.add(url); + } return this; } @@ -164,22 +167,24 @@ public boolean isSetUrls() { @Override public List<InspireResourceLocator> getResourceLocator() { - return resourceLocator; + return Collections.unmodifiableList(resourceLocator); } @Override public InspireExtendedCapabilitiesResourceLocator setResourceLocator( Collection<InspireResourceLocator> resourceLocator) { - getResourceLocator().clear(); + this.resourceLocator.clear(); if (CollectionHelper.isNotEmpty(resourceLocator)) { - getResourceLocator().addAll(resourceLocator); + this.resourceLocator.addAll(resourceLocator); } return this; } @Override public InspireExtendedCapabilitiesResourceLocator addResourceLocator(InspireResourceLocator resourceLocator) { - getResourceLocator().add(resourceLocator); + if (resourceLocator != null) { + this.resourceLocator.add(resourceLocator); + } return this; } @@ -190,8 +195,9 @@ public boolean isSetResourceLocators() { @Override public String toString() { - return String.format("%s %n[%n title=%s,%n dateOf=%s,%n urls=%s,%n resourceLocator=%s%n]", this.getClass() - .getSimpleName(), getTitle(), getDateOf(), CollectionHelper.collectionToString(getUrls()), + return String.format("%s %n[%n title=%s,%n dateOf=%s,%n urls=%s,%n resourceLocator=%s%n]", + this.getClass().getSimpleName(), getTitle(), getDateOf(), + CollectionHelper.collectionToString(getUrls()), CollectionHelper.collectionToString(getResourceLocator())); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireConformity.java b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireConformity.java index 081e7bc95..ac18a0822 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireConformity.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireConformity.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.inspire; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Service internal representation of INSPIRE conformity * @@ -46,6 +48,7 @@ public InspireConformity(InspireConformityCitation citation, InspireDegreeOfConf * * @return the inspireSpecification */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public InspireConformityCitation getInspireSpecification() { return inspireSpecification; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireResourceLocator.java b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireResourceLocator.java index 9b7b28a53..f7ef9ae1e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireResourceLocator.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireResourceLocator.java @@ -16,6 +16,7 @@ package org.n52.shetland.inspire; import java.util.Collection; +import java.util.Collections; import java.util.Set; import org.n52.janmayen.http.MediaType; @@ -77,7 +78,7 @@ public boolean isSetUrl() { * @return the media types */ public Set<MediaType> getMediaTypes() { - return mediaTypes; + return Collections.unmodifiableSet(mediaTypes); } /** @@ -89,9 +90,9 @@ public Set<MediaType> getMediaTypes() { * */ public InspireResourceLocator setMediaTypes(Collection<MediaType> mediaTypes) { - getMediaTypes().clear(); + this.mediaTypes.clear(); if (CollectionHelper.isNotEmpty(mediaTypes)) { - getMediaTypes().addAll(mediaTypes); + this.mediaTypes.addAll(mediaTypes); } return this; } @@ -104,7 +105,9 @@ public InspireResourceLocator setMediaTypes(Collection<MediaType> mediaTypes) { * @return this */ public InspireResourceLocator addMediaType(MediaType mediaType) { - getMediaTypes().add(mediaType); + if (mediaType != null) { + this.mediaTypes.add(mediaType); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireSupportedCRS.java b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireSupportedCRS.java index 53eba0433..29ba89231 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireSupportedCRS.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireSupportedCRS.java @@ -16,10 +16,12 @@ package org.n52.shetland.inspire; import java.util.Collection; +import java.util.Collections; import java.util.Set; import org.n52.shetland.util.CollectionHelper; +import com.google.common.base.Strings; import com.google.common.collect.Sets; /** @@ -72,7 +74,7 @@ private void setDefaultCRS(String defaultCRS) { * @return the other CRS */ public Set<String> getOtherCRS() { - return otherCRS; + return Collections.unmodifiableSet(otherCRS); } /** @@ -83,9 +85,9 @@ public Set<String> getOtherCRS() { * @return this */ public InspireSupportedCRS setOtherCRS(Collection<String> otherCRS) { - getOtherCRS().clear(); + this.otherCRS.clear(); if (CollectionHelper.isNotEmpty(otherCRS)) { - getOtherCRS().addAll(otherCRS); + this.otherCRS.addAll(otherCRS); } return this; } @@ -98,7 +100,9 @@ public InspireSupportedCRS setOtherCRS(Collection<String> otherCRS) { * @return this */ public InspireSupportedCRS addOtherCRS(String otherCRS) { - getOtherCRS().add(otherCRS); + if (!Strings.isNullOrEmpty(otherCRS)) { + this.otherCRS.add(otherCRS); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireSupportedLanguages.java b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireSupportedLanguages.java index 5117c8401..824b352c9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireSupportedLanguages.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireSupportedLanguages.java @@ -16,6 +16,7 @@ package org.n52.shetland.inspire; import java.util.Collection; +import java.util.Collections; import java.util.Set; import org.n52.shetland.util.CollectionHelper; @@ -72,7 +73,7 @@ private void setDefaultLanguage(InspireLanguageISO6392B defaultLanguage) { * @return the supportedLanguages */ public Set<InspireLanguageISO6392B> getSupportedLanguages() { - return supportedLanguages; + return Collections.unmodifiableSet(supportedLanguages); } /** @@ -82,9 +83,9 @@ public Set<InspireLanguageISO6392B> getSupportedLanguages() { * the supportedLanguages to set */ public void setSupportedLanguages(Collection<InspireLanguageISO6392B> supportedLanguages) { - getSupportedLanguages().clear(); + this.supportedLanguages.clear(); if (CollectionHelper.isNotEmpty(supportedLanguages)) { - getSupportedLanguages().addAll(supportedLanguages); + this.supportedLanguages.addAll(supportedLanguages); } } @@ -97,7 +98,9 @@ public void setSupportedLanguages(Collection<InspireLanguageISO6392B> supportedL * @return this */ public InspireSupportedLanguages addSupportedLanguage(InspireLanguageISO6392B supportedLanguage) { - getSupportedLanguages().add(supportedLanguage); + if (supportedLanguage != null) { + this.supportedLanguages.add(supportedLanguage); + } return this; } @@ -112,7 +115,8 @@ public boolean isSetSupportedLanguages() { @Override public String toString() { - return String.format("%s %n[%n defaultLanguage=%s,%n supportedLanguages=%s%n]", this.getClass() - .getSimpleName(), getDefaultLanguage(), CollectionHelper.collectionToString(getSupportedLanguages())); + return String.format("%s %n[%n defaultLanguage=%s,%n supportedLanguages=%s%n]", + this.getClass().getSimpleName(), getDefaultLanguage(), + CollectionHelper.collectionToString(getSupportedLanguages())); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireTemporalReference.java b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireTemporalReference.java index a14464580..be734794d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireTemporalReference.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireTemporalReference.java @@ -16,6 +16,7 @@ package org.n52.shetland.inspire; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.n52.shetland.ogc.gml.time.Time; @@ -23,6 +24,8 @@ import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Service internal representation of INSPIRE temporal reference * @@ -42,9 +45,8 @@ public class InspireTemporalReference { private List<InspireDateOfPublication> datesOfPublication = Lists.newArrayList(); /* - * TemporalExtent 0..*, IndividualDate == {@link - * org.n52.sos.ogc.gml.time.TimeInstant} or IntervalOfDates == {@link - * org.n52.sos.ogc.gml.time.TimePeriod} + * TemporalExtent 0..*, IndividualDate == {@link org.n52.sos.ogc.gml.time.TimeInstant} or IntervalOfDates + * == {@link org.n52.sos.ogc.gml.time.TimePeriod} */ private List<Time> temporalExtents = Lists.newArrayList(); @@ -53,6 +55,7 @@ public class InspireTemporalReference { * * @return the dateOfCreation */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public InspireDateOfCreation getDateOfCreation() { return dateOfCreation; } @@ -63,6 +66,7 @@ public InspireDateOfCreation getDateOfCreation() { * @param dateOfCreation * the dateOfCreation to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setDateOfCreation(InspireDateOfCreation dateOfCreation) { this.dateOfCreation = dateOfCreation; } @@ -81,6 +85,7 @@ public boolean isSetDateOfCreation() { * * @return the dateOfLastRevision */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public InspireDateOfLastRevision getDateOfLastRevision() { return dateOfLastRevision; } @@ -91,6 +96,7 @@ public InspireDateOfLastRevision getDateOfLastRevision() { * @param dateOfLastRevision * the dateOfLastRevision to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setDateOfLastRevision(InspireDateOfLastRevision dateOfLastRevision) { this.dateOfLastRevision = dateOfLastRevision; } @@ -110,7 +116,7 @@ public boolean isSetDateOfLastRevision() { * @return the datesOfPublication */ public List<InspireDateOfPublication> getDatesOfPublication() { - return datesOfPublication; + return Collections.unmodifiableList(datesOfPublication); } /** @@ -120,9 +126,9 @@ public List<InspireDateOfPublication> getDatesOfPublication() { * the datesOfPublication to set */ public void setDatesOfPublication(Collection<InspireDateOfPublication> datesOfPublication) { - getDatesOfPublication().clear(); + this.datesOfPublication.clear(); if (CollectionHelper.isNotEmpty(datesOfPublication)) { - getDatesOfPublication().addAll(datesOfPublication); + this.datesOfPublication.addAll(datesOfPublication); } } @@ -134,7 +140,9 @@ public void setDatesOfPublication(Collection<InspireDateOfPublication> datesOfPu * @return this */ public InspireTemporalReference addDateOfPublication(InspireDateOfPublication dateOfPublication) { - getDatesOfPublication().add(dateOfPublication); + if (dateOfPublication != null) { + this.datesOfPublication.add(dateOfPublication); + } return this; } @@ -153,7 +161,7 @@ public boolean isSetDatesOfPublication() { * @return the temporalExtents */ public List<Time> getTemporalExtents() { - return temporalExtents; + return Collections.unmodifiableList(temporalExtents); } /** @@ -163,9 +171,9 @@ public List<Time> getTemporalExtents() { * the temporalExtents to set */ public void setTemporalExtents(Collection<Time> temporalExtents) { - getTemporalExtents().clear(); + this.temporalExtents.clear(); if (CollectionHelper.isNotEmpty(temporalExtents)) { - getTemporalExtents().addAll(temporalExtents); + this.temporalExtents.addAll(temporalExtents); } } @@ -177,7 +185,9 @@ public void setTemporalExtents(Collection<Time> temporalExtents) { * @return this */ public InspireTemporalReference addTemporalExtent(Time temporalExtent) { - getTemporalExtents().add(temporalExtent); + if (temporalExtent != null) { + this.temporalExtents.add(temporalExtent); + } return this; } @@ -194,7 +204,7 @@ public boolean isSetTemporalExtents() { public String toString() { return String.format( "%s %n[%n dateOfCreation=%s,%n dateOfLastRevision=%s," - + "%n dateOfPublication=%s,%n temporalReferences=%s%n]", + + "%n dateOfPublication=%s,%n temporalReferences=%s%n]", this.getClass().getSimpleName(), getDateOfCreation(), getDateOfLastRevision(), CollectionHelper.collectionToString(getDatesOfPublication()), CollectionHelper.collectionToString(getTemporalExtents())); diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/base2/DocumentCitation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/base2/DocumentCitation.java index a9633ddb4..75df14a6c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/base2/DocumentCitation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/base2/DocumentCitation.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.inspire.base2; +import java.util.Collection; +import java.util.Collections; import java.util.List; import org.joda.time.DateTime; @@ -36,7 +38,8 @@ public Nillable<DateTime> getDate() { } /** - * @param date the date to set + * @param date + * the date to set * @return this {@link DocumentCitation} */ public DocumentCitation setDate(Nillable<DateTime> date) { @@ -45,7 +48,8 @@ public DocumentCitation setDate(Nillable<DateTime> date) { } /** - * @param date the date to set + * @param date + * the date to set * @return this {@link DocumentCitation} */ public DocumentCitation setDate(DateTime date) { @@ -57,16 +61,19 @@ public DocumentCitation setDate(DateTime date) { * @return the links */ public List<Nillable<String>> getLinks() { - return links; + return Collections.unmodifiableList(links); } /** - * @param links the links to set + * @param links + * the links to set * @return this {@link DocumentCitation} */ - public DocumentCitation setLinks(List<Nillable<String>> links) { - getLinks().clear(); - getLinks().addAll(links); + public DocumentCitation setLinks(Collection<Nillable<String>> links) { + this.links.clear(); + if (links != null) { + this.links.addAll(links); + } return this; } @@ -76,7 +83,9 @@ public DocumentCitation addLink(String link) { } public DocumentCitation addLink(Nillable<String> link) { - getLinks().add(link); + if (link != null) { + this.links.add(link); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/dls/FullInspireExtendedCapabilities.java b/shetland/core/src/main/java/org/n52/shetland/inspire/dls/FullInspireExtendedCapabilities.java index d77db992a..f829a5364 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/dls/FullInspireExtendedCapabilities.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/dls/FullInspireExtendedCapabilities.java @@ -16,8 +16,8 @@ package org.n52.shetland.inspire.dls; import java.util.Collection; +import java.util.Collections; import java.util.List; -import java.util.Set; import org.n52.shetland.inspire.InspireConformity; import org.n52.shetland.inspire.InspireKeyword; @@ -45,16 +45,16 @@ import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** - * Service internal object to represent the full INSPIRE DLS - * ExtendedCapabilities + * Service internal object to represent the full INSPIRE DLS ExtendedCapabilities * * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 1.0.0 * */ -public class FullInspireExtendedCapabilities - extends InspireExtendedCapabilitiesDLS +public class FullInspireExtendedCapabilities extends InspireExtendedCapabilitiesDLS implements InspireExtendedCapabilitiesResourceLocator, InspireExtendedCapabilitiesMetadataURL, InspireExtendedCapabilitiesResourceType, InspireExtendedCapabilitiesTemporalReference<FullInspireExtendedCapabilities>, @@ -104,9 +104,9 @@ public class FullInspireExtendedCapabilities * @param spatialDataSetIdentifier * Spatial dataset identifier to set */ - public FullInspireExtendedCapabilities( - InspireResourceLocator resourceLocator, InspireSupportedLanguages supportedLanguages, - InspireLanguageISO6392B responseLanguage, InspireUniqueResourceIdentifier spatialDataSetIdentifier) { + public FullInspireExtendedCapabilities(InspireResourceLocator resourceLocator, + InspireSupportedLanguages supportedLanguages, InspireLanguageISO6392B responseLanguage, + InspireUniqueResourceIdentifier spatialDataSetIdentifier) { super(supportedLanguages, responseLanguage, spatialDataSetIdentifier); addResourceLocator(resourceLocator); } @@ -123,9 +123,9 @@ public FullInspireExtendedCapabilities( * @param spatialDataSetIdentifier * Spatial dataset identifier to set */ - public FullInspireExtendedCapabilities( - List<InspireResourceLocator> resourceLocators, InspireSupportedLanguages supportedLanguages, - InspireLanguageISO6392B responseLanguage, InspireUniqueResourceIdentifier spatialDataSetIdentifier) { + public FullInspireExtendedCapabilities(Collection<InspireResourceLocator> resourceLocators, + InspireSupportedLanguages supportedLanguages, InspireLanguageISO6392B responseLanguage, + InspireUniqueResourceIdentifier spatialDataSetIdentifier) { super(supportedLanguages, responseLanguage, spatialDataSetIdentifier); setResourceLocator(resourceLocators); } @@ -142,9 +142,9 @@ public FullInspireExtendedCapabilities( * @param spatialDataSetIdentifiers * Spatial dataset identifiers to set */ - public FullInspireExtendedCapabilities( - InspireResourceLocator resourceLocator, InspireSupportedLanguages supportedLanguages, - InspireLanguageISO6392B responseLanguage, Set<InspireUniqueResourceIdentifier> spatialDataSetIdentifiers) { + public FullInspireExtendedCapabilities(InspireResourceLocator resourceLocator, + InspireSupportedLanguages supportedLanguages, InspireLanguageISO6392B responseLanguage, + Collection<InspireUniqueResourceIdentifier> spatialDataSetIdentifiers) { super(supportedLanguages, responseLanguage, spatialDataSetIdentifiers); addResourceLocator(resourceLocator); } @@ -161,23 +161,24 @@ public FullInspireExtendedCapabilities( * @param spatialDataSetIdentifiers * Spatial dataset identifiers to set */ - public FullInspireExtendedCapabilities( - List<InspireResourceLocator> resourceLocators, InspireSupportedLanguages supportedLanguages, - InspireLanguageISO6392B responseLanguage, Set<InspireUniqueResourceIdentifier> spatialDataSetIdentifiers) { + public FullInspireExtendedCapabilities(Collection<InspireResourceLocator> resourceLocators, + InspireSupportedLanguages supportedLanguages, InspireLanguageISO6392B responseLanguage, + Collection<InspireUniqueResourceIdentifier> spatialDataSetIdentifiers) { super(supportedLanguages, responseLanguage, spatialDataSetIdentifiers); setResourceLocator(resourceLocators); } @Override public List<InspireResourceLocator> getResourceLocator() { - return resourceLocator; + return Collections.unmodifiableList(resourceLocator); } @Override public InspireExtendedCapabilitiesResourceLocator setResourceLocator( Collection<InspireResourceLocator> resourceLocator) { + this.resourceLocator.clear(); if (CollectionHelper.isNotEmpty(resourceLocator)) { - getResourceLocator().clear(); + this.resourceLocator.addAll(resourceLocator); } return this; @@ -185,7 +186,9 @@ public InspireExtendedCapabilitiesResourceLocator setResourceLocator( @Override public InspireExtendedCapabilitiesResourceLocator addResourceLocator(InspireResourceLocator resourceLocator) { - getResourceLocator().add(resourceLocator); + if (resourceLocator != null) { + this.resourceLocator.add(resourceLocator); + } return this; } @@ -195,6 +198,7 @@ public boolean isSetResourceLocators() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public InspireResourceLocator getMetadataUrl() { return metadataUrl; } @@ -206,6 +210,7 @@ public FullInspireExtendedCapabilities setMetadataUrl(InspireResourceLocator met } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public boolean isSetMetadataUrl() { return getMetadataUrl() != null; } @@ -245,22 +250,24 @@ public boolean isSetResourceType() { @Override public List<InspireTemporalReference> getTemporalReferences() { - return temporalReferences; + return Collections.unmodifiableList(temporalReferences); } @Override public FullInspireExtendedCapabilities setTemporalReferences( Collection<InspireTemporalReference> temporalReferences) { + this.temporalReferences.clear(); if (CollectionHelper.isNotEmpty(temporalReferences)) { - getTemporalReferences().clear(); - getTemporalReferences().addAll(temporalReferences); + this.temporalReferences.addAll(temporalReferences); } return this; } @Override public FullInspireExtendedCapabilities addTemporalReference(InspireTemporalReference temporalReference) { - getTemporalReferences().add(temporalReference); + if (temporalReference != null) { + this.temporalReferences.add(temporalReference); + } return this; } @@ -271,21 +278,21 @@ public boolean isSetTemporalReferences() { @Override public List<InspireConformity> getConformity() { - return conformities; + return Collections.unmodifiableList(conformities); } @Override public FullInspireExtendedCapabilities setConformity(Collection<InspireConformity> conformities) { + this.conformities.clear(); if (CollectionHelper.isNotEmpty(conformities)) { - getConformity().clear(); - getConformity().addAll(conformities); + this.conformities.addAll(conformities); } return this; } @Override public FullInspireExtendedCapabilities addConformity(InspireConformity conformity) { - getConformity().add(conformity); + this.conformities.add(conformity); return this; } @@ -296,15 +303,15 @@ public boolean isSetConformity() { @Override public List<InspireMetadataPointOfContact> getMetadataPointOfContacts() { - return metadataPointOfContacts; + return Collections.unmodifiableList(metadataPointOfContacts); } @Override public FullInspireExtendedCapabilities setMetadataPointOfContacts( Collection<InspireMetadataPointOfContact> metadataPointOfContacts) { + this.metadataPointOfContacts.clear(); if (CollectionHelper.isNotEmpty(metadataPointOfContacts)) { - getMetadataPointOfContacts().clear(); - getMetadataPointOfContacts().addAll(metadataPointOfContacts); + this.metadataPointOfContacts.addAll(metadataPointOfContacts); } return this; } @@ -312,20 +319,24 @@ public FullInspireExtendedCapabilities setMetadataPointOfContacts( @Override public FullInspireExtendedCapabilities addMetadataPointOfContact( InspireMetadataPointOfContact metadataPointOfContact) { - getMetadataPointOfContacts().add(metadataPointOfContact); + if (metadataPointOfContact != null) { + this.metadataPointOfContacts.add(metadataPointOfContact); + } return this; } @Override public boolean isSetMetadataPointOfContact() { - return CollectionHelper.isNotEmpty(getMetadataPointOfContacts()); + return CollectionHelper.isNotEmpty(this.metadataPointOfContacts); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public TimeInstant getMetadataDate() { return metadataDate; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public FullInspireExtendedCapabilities setMetadataDate(TimeInstant metadataDate) { this.metadataDate = metadataDate; return this; @@ -355,22 +366,24 @@ public boolean isSetSpatialDataServiceType() { @Override public List<InspireMandatoryKeyword> getMandatoryKeywords() { - return mandatoryKeywords; + return Collections.unmodifiableList(mandatoryKeywords); } @Override public FullInspireExtendedCapabilities setMandatoryKeywords( Collection<InspireMandatoryKeyword> mandatoryKeywords) { + this.mandatoryKeywords.clear(); if (CollectionHelper.isNotEmpty(mandatoryKeywords)) { - getMandatoryKeywords().clear(); - getMandatoryKeywords().addAll(mandatoryKeywords); + this.mandatoryKeywords.addAll(mandatoryKeywords); } return this; } @Override public FullInspireExtendedCapabilities addMandatoryKeyword(InspireMandatoryKeyword mandatoryKeyword) { - getMandatoryKeywords().add(mandatoryKeyword); + if (mandatoryKeyword != null) { + this.mandatoryKeywords.add(mandatoryKeyword); + } return this; } @@ -381,21 +394,24 @@ public boolean isSetMandatoryKeyword() { @Override public List<InspireKeyword> getKeywords() { - return keywords; + return Collections.unmodifiableList(keywords); } @Override public FullInspireExtendedCapabilities setKeywords(Collection<InspireKeyword> keywords) { + this.keywords.clear(); if (CollectionHelper.isNotEmpty(keywords)) { - getKeywords().clear(); - getKeywords().addAll(keywords); + + this.keywords.addAll(keywords); } return this; } @Override public FullInspireExtendedCapabilities addKeyword(InspireKeyword keyword) { - keywords.add(keyword); + if (keyword != null) { + keywords.add(keyword); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringFeature.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringFeature.java index f609a0eab..853a1ac4d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringFeature.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringFeature.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.inspire.ef; +import java.util.Collection; +import java.util.Collections; import java.util.Set; import org.n52.shetland.inspire.base.Identifier; @@ -46,7 +48,7 @@ public AbstractMonitoringFeature(Identifier inspireId, ReferenceType mediaMonito super(inspireId, mediaMonitored); } - public AbstractMonitoringFeature(Identifier inspireId, Set<ReferenceType> mediaMonitored) { + public AbstractMonitoringFeature(Identifier inspireId, Collection<ReferenceType> mediaMonitored) { super(inspireId, mediaMonitored); } @@ -54,15 +56,20 @@ public AbstractMonitoringFeature(Identifier inspireId, Set<ReferenceType> mediaM * @return the reportedTo */ public Set<ReportToLegalAct> getReportedTo() { - return reportedTo; + return Collections.unmodifiableSet(reportedTo); } /** - * @param reportedTo the reportedTo to set + * @param reportedTo + * the reportedTo to set + * @return */ - public void setReportedTo(Set<ReportToLegalAct> reportedTo) { + public AbstractMonitoringFeature setReportedTo(Collection<ReportToLegalAct> reportedTo) { this.reportedTo.clear(); - this.reportedTo = reportedTo; + if (reportedTo != null) { + this.reportedTo.addAll(reportedTo); + } + return this; } public boolean isSetReportedTo() { @@ -73,26 +80,33 @@ public boolean isSetReportedTo() { * @return the hasObservation */ public Set<Referenceable<OmObservation>> getHasObservation() { - return hasObservation; + return Collections.unmodifiableSet(hasObservation); } /** - * @param hasObservation the hasObservation to set + * @param hasObservationa + * the hasObservation to set + * @return */ - public void setHasObservation(Set<Referenceable<OmObservation>> hasObservation) { + public AbstractMonitoringFeature setHasObservation(Collection<Referenceable<OmObservation>> hasObservation) { this.hasObservation.clear(); - this.hasObservation = hasObservation; + if (hasObservation != null) { + this.hasObservation.addAll(hasObservation); + } + return this; } /** - * @param hasObservation the hasObservation to add + * @param hasObservation + * the hasObservation to add */ public void addHasObservation(OmObservation hasObservation) { this.hasObservation.add(Referenceable.of(hasObservation)); } /** - * @param hasObservation the hasObservation to add + * @param hasObservation + * the hasObservation to add */ public void addHasObservation(Referenceable<OmObservation> hasObservation) { this.hasObservation.add(hasObservation); @@ -106,15 +120,21 @@ public boolean isSetHasObservation() { * @return the involvedIn */ public Set<Referenceable<EnvironmentalMonitoringActivity>> getInvolvedIn() { - return involvedIn; + return Collections.unmodifiableSet(involvedIn); } /** - * @param involvedIn the involvedIn to set + * @param involvedIn + * the involvedIn to set + * @return */ - public void setInvolvedIn(Set<Referenceable<EnvironmentalMonitoringActivity>> involvedIn) { + public AbstractMonitoringFeature setInvolvedIn( + Collection<Referenceable<EnvironmentalMonitoringActivity>> involvedIn) { this.involvedIn.clear(); - this.involvedIn = involvedIn; + if (involvedIn != null) { + this.involvedIn.addAll(involvedIn); + } + return this; } public boolean isSetInvolvedIn() { diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringObject.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringObject.java index c84c02edc..09ce0d7a5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringObject.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringObject.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.inspire.ef; +import java.util.Collection; +import java.util.Collections; import java.util.Set; import org.locationtech.jts.geom.Geometry; @@ -30,8 +32,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Sets; -public abstract class AbstractMonitoringObject - extends AbstractFeature { +public abstract class AbstractMonitoringObject extends AbstractFeature { /** * 1..1 inspireId, super.identifier @@ -104,9 +105,11 @@ public AbstractMonitoringObject(Identifier inspireId, ReferenceType mediaMonitor this(inspireId, Sets.newHashSet(mediaMonitored)); } - public AbstractMonitoringObject(Identifier inspireId, Set<ReferenceType> mediaMonitored) { + public AbstractMonitoringObject(Identifier inspireId, Collection<ReferenceType> mediaMonitored) { super(inspireId); - this.mediaMonitored.addAll(mediaMonitored); + if (mediaMonitored != null) { + this.mediaMonitored.addAll(mediaMonitored); + } } public Identifier getInspireId() { @@ -136,39 +139,53 @@ public boolean isSetAdditionalDescription() { * @return the mediaMonitored */ public Set<ReferenceType> getMediaMonitored() { - return mediaMonitored; + return Collections.unmodifiableSet(mediaMonitored); } /** * @param mediaMonitored * the mediaMonitored to add + * @return */ - public void addMediaMonitored(Set<ReferenceType> mediaMonitored) { - this.mediaMonitored.addAll(mediaMonitored); + public AbstractMonitoringObject addMediaMonitored(Collection<ReferenceType> mediaMonitored) { + this.mediaMonitored.clear(); + if (mediaMonitored != null) { + this.mediaMonitored.addAll(mediaMonitored); + } + return this; } /** * @param mediaMonitored * the mediaMonitored to add + * @return */ - public void addMediaMonitored(ReferenceType mediaMonitored) { - this.mediaMonitored.add(mediaMonitored); + public AbstractMonitoringObject addMediaMonitored(ReferenceType mediaMonitored) { + if (mediaMonitored != null) { + this.mediaMonitored.add(mediaMonitored); + } + return this; } /** * @return the legalBackground */ public Set<Referenceable<LegislationCitation>> getLegalBackground() { - return legalBackground; + return Collections.unmodifiableSet(legalBackground); } /** * @param legalBackground * the legalBackground to set + * @return */ - public void setLegalBackground(Set<Referenceable<LegislationCitation>> legalBackground) { + public AbstractMonitoringObject setLegalBackground( + Collection<Referenceable<LegislationCitation>> legalBackground) { this.legalBackground.clear(); - this.legalBackground = legalBackground; + if (legalBackground != null) { + this.legalBackground.addAll(legalBackground); + } + return this; } public boolean isSetLegalBackground() { @@ -225,16 +242,20 @@ public boolean isSetGeometry() { * @return the onlineResource */ public Set<String> getOnlineResource() { - return onlineResource; + return Collections.unmodifiableSet(onlineResource); } /** * @param onlineResource * the onlineResource to set + * @return */ - public void setOnlineResource(Set<String> onlineResource) { + public AbstractMonitoringObject setOnlineResource(Collection<String> onlineResource) { this.onlineResource.clear(); - this.onlineResource = onlineResource; + if (onlineResource != null) { + this.onlineResource.addAll(onlineResource); + } + return this; } public boolean isSetOnlineResources() { @@ -245,16 +266,20 @@ public boolean isSetOnlineResources() { * @return the purpose */ public Set<ReferenceType> getPurpose() { - return purpose; + return Collections.unmodifiableSet(purpose); } /** * @param purpose * the purpose to set + * @return */ - public void setPurpose(Set<ReferenceType> purpose) { + public AbstractMonitoringObject setPurpose(Collection<ReferenceType> purpose) { this.purpose.clear(); - this.purpose = purpose; + if (purpose != null) { + this.purpose.addAll(purpose); + } + return this; } public boolean isSetPurpose() { @@ -265,24 +290,33 @@ public boolean isSetPurpose() { * @return the observingCapability */ public Set<Referenceable<ObservingCapability>> getObservingCapability() { - return observingCapability; + return Collections.unmodifiableSet(observingCapability); } /** * @param observingCapability * the observingCapability to set + * @return */ - public void setObservingCapability(Set<Referenceable<ObservingCapability>> observingCapability) { + public AbstractMonitoringObject setObservingCapability( + Collection<Referenceable<ObservingCapability>> observingCapability) { this.observingCapability.clear(); - this.observingCapability = observingCapability; + if (observingCapability != null) { + this.observingCapability.addAll(observingCapability); + } + return this; } /** * @param observingCapability * the observingCapability to add + * @return */ - public void addObservingCapability(Referenceable<ObservingCapability> observingCapability) { - this.observingCapability.add(observingCapability); + public AbstractMonitoringObject addObservingCapability(Referenceable<ObservingCapability> observingCapability) { + if (observingCapability != null) { + this.observingCapability.add(observingCapability); + } + return this; } /** @@ -324,16 +358,20 @@ public boolean isSetBroader() { * @return the narrower */ public Set<Referenceable<Hierarchy>> getNarrower() { - return narrower; + return Collections.unmodifiableSet(narrower); } /** * @param narrower * the narrower to set + * @return */ - public void setNarrower(Set<Referenceable<Hierarchy>> narrower) { + public AbstractMonitoringObject setNarrower(Collection<Referenceable<Hierarchy>> narrower) { this.narrower.clear(); - this.narrower = narrower; + if (narrower != null) { + this.narrower.addAll(narrower); + } + return this; } public boolean isSetNarrower() { @@ -344,16 +382,20 @@ public boolean isSetNarrower() { * @return the supersedes */ public Set<Referenceable<AbstractMonitoringObject>> getSupersedes() { - return supersedes; + return Collections.unmodifiableSet(supersedes); } /** * @param supersedes * the supersedes to set + * @return */ - public void setSupersedes(Set<Referenceable<AbstractMonitoringObject>> supersedes) { + public AbstractMonitoringObject setSupersedes(Collection<Referenceable<AbstractMonitoringObject>> supersedes) { this.supersedes.clear(); - this.supersedes = supersedes; + if (supersedes != null) { + this.supersedes.addAll(supersedes); + } + return this; } public boolean isSetSupersedes() { @@ -364,16 +406,20 @@ public boolean isSetSupersedes() { * @return the supersededBy */ public Set<Referenceable<AbstractMonitoringObject>> getSupersededBy() { - return supersededBy; + return Collections.unmodifiableSet(supersededBy); } /** * @param supersededBy * the supersededBy to set + * @return */ - public void setSupersededBy(Set<Referenceable<AbstractMonitoringObject>> supersededBy) { + public AbstractMonitoringObject setSupersededBy(Collection<Referenceable<AbstractMonitoringObject>> supersededBy) { this.supersededBy.clear(); - this.supersededBy = supersededBy; + if (supersededBy != null) { + this.supersededBy.addAll(supersededBy); + } + return this; } public boolean isSetSupersededBy() { diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringProgramme.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringProgramme.java index 23acf3e19..13770f413 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringProgramme.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringProgramme.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.inspire.ef; +import java.util.Collection; +import java.util.Collections; import java.util.Set; import org.n52.shetland.inspire.base.Identifier; @@ -34,7 +36,7 @@ public EnvironmentalMonitoringProgramme(Identifier inspireId, ReferenceType medi super(inspireId, mediaMonitored); } - public EnvironmentalMonitoringProgramme(Identifier inspireId, Set<ReferenceType> mediaMonitored) { + public EnvironmentalMonitoringProgramme(Identifier inspireId, Collection<ReferenceType> mediaMonitored) { super(inspireId, mediaMonitored); } @@ -42,15 +44,20 @@ public EnvironmentalMonitoringProgramme(Identifier inspireId, Set<ReferenceType> * @return the triggers */ public Set<EnvironmentalMonitoringActivity> getTriggers() { - return triggers; + return Collections.unmodifiableSet(triggers); } /** - * @param triggers the triggers to set + * @param triggers + * the triggers to set + * @return */ - public void setTriggers(Set<EnvironmentalMonitoringActivity> triggers) { + public EnvironmentalMonitoringProgramme setTriggers(Collection<EnvironmentalMonitoringActivity> triggers) { this.triggers.clear(); - this.triggers = triggers; + if (triggers != null) { + this.triggers.addAll(triggers); + } + return this; } public boolean isSetTriggers() { diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ObservingCapability.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ObservingCapability.java index 427a37390..98fc373f4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ObservingCapability.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ObservingCapability.java @@ -23,6 +23,8 @@ import org.n52.shetland.ogc.gml.time.Time; import org.n52.shetland.w3c.xlink.Reference; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class ObservingCapability extends Reference { /** @@ -68,6 +70,7 @@ public ObservingCapability(String href) { this(URI.create(href)); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ObservingCapability( Time observingTime, ReferenceType processType, ReferenceType resultNature, AbstractFeature procedure, ReferenceType observedProperty) { @@ -81,6 +84,7 @@ public ObservingCapability( /** * @return the observingTime */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getObservingTime() { return observingTime; } @@ -89,6 +93,7 @@ public Time getObservingTime() { * @param observingTime * the observingTime to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setObservingTime(Time observingTime) { this.observingTime = observingTime; } @@ -141,6 +146,7 @@ public void setOnlineResource(URI onlineResource) { /** * @return the procedure */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AbstractFeature getProcedure() { return procedure; } @@ -149,6 +155,7 @@ public AbstractFeature getProcedure() { * @param procedure * the procedure to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setProcedure(AbstractFeature procedure) { this.procedure = procedure; } @@ -156,6 +163,7 @@ public void setProcedure(AbstractFeature procedure) { /** * @return the featureOfInterest */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AbstractFeature getFeatureOfInterest() { return featureOfInterest; } @@ -164,6 +172,7 @@ public AbstractFeature getFeatureOfInterest() { * @param featureOfInterest * the featureOfInterest to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setFeatureOfInterest(AbstractFeature featureOfInterest) { this.featureOfInterest = featureOfInterest; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/OperationalActivityPeriod.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/OperationalActivityPeriod.java index d6ca13ee5..3dbb765be 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/OperationalActivityPeriod.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/OperationalActivityPeriod.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.gml.time.Time; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class OperationalActivityPeriod extends AbstractFeature { /** @@ -25,6 +27,7 @@ public class OperationalActivityPeriod extends AbstractFeature { */ private Time activityTime; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OperationalActivityPeriod(Time activityTime) { super(""); this.activityTime = activityTime; @@ -33,6 +36,7 @@ public OperationalActivityPeriod(Time activityTime) { /** * @return the activityTime */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getActivityTime() { return activityTime; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ReportToLegalAct.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ReportToLegalAct.java index 8b6cad961..b864c2716 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ReportToLegalAct.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ReportToLegalAct.java @@ -20,6 +20,8 @@ import org.n52.shetland.inspire.base2.LegislationCitation; import org.n52.shetland.ogc.gml.time.TimeInstant; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class ReportToLegalAct { /** @@ -55,6 +57,7 @@ public class ReportToLegalAct { /** * @return the legalAct */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public LegislationCitation getLegalAct() { return legalAct; } @@ -62,6 +65,7 @@ public LegislationCitation getLegalAct() { /** * @param legalAct the legalAct to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setLegalAct(LegislationCitation legalAct) { this.legalAct = legalAct; } @@ -69,6 +73,7 @@ public void setLegalAct(LegislationCitation legalAct) { /** * @return the reportDate */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public TimeInstant getReportDate() { return reportDate; } @@ -76,6 +81,7 @@ public TimeInstant getReportDate() { /** * @param reportDate the reportDate to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setReportDate(TimeInstant reportDate) { this.reportDate = reportDate; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ompr/Process.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ompr/Process.java index cd235b843..bb1b3d6e6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ompr/Process.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ompr/Process.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.inspire.ompr; +import java.util.Collection; +import java.util.Collections; import java.util.List; import org.n52.shetland.inspire.base.Identifier; @@ -93,13 +95,13 @@ public boolean isSetType() { * @return the documentation */ public List<DocumentCitation> getDocumentation() { - return documentation; + return Collections.unmodifiableList(documentation); } /** * @param documentation the documentation to set */ - public Process setDocumentation(List<DocumentCitation> documentation) { + public Process setDocumentation(Collection<DocumentCitation> documentation) { this.documentation.clear(); if (documentation != null) { this.documentation.addAll(documentation); @@ -125,13 +127,13 @@ public boolean isSetDocumentation() { * @return the processParameter */ public List<ProcessParameter> getProcessParameter() { - return processParameter; + return Collections.unmodifiableList(processParameter); } /** * @param processParameter the processParameter to set */ - public Process setProcessParameter(List<ProcessParameter> processParameter) { + public Process setProcessParameter(Collection<ProcessParameter> processParameter) { this.processParameter.clear(); if (processParameter != null) { this.processParameter.addAll(processParameter); @@ -157,13 +159,13 @@ public boolean isSetProcessParameter() { * @return the responsibleParty */ public List<RelatedParty> getResponsibleParty() { - return responsibleParty; + return Collections.unmodifiableList(responsibleParty); } /** * @param responsibleParty the responsibleParty to set */ - public Process setResponsibleParty(List<RelatedParty> responsibleParty) { + public Process setResponsibleParty(Collection<RelatedParty> responsibleParty) { this.responsibleParty.clear(); if (responsibleParty != null) { this.responsibleParty.addAll(responsibleParty); diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/MultiPointObservation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/MultiPointObservation.java index 429b7075f..6b0d440a9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/MultiPointObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/MultiPointObservation.java @@ -84,7 +84,7 @@ public OmObservation cloneTemplate() { } @Override - public void setValue(ObservationValue<?> value) { + public MultiPointObservation setValue(ObservationValue<?> value) { if (value.getValue() instanceof MultiPointCoverage) { super.setValue(value); } else { @@ -93,6 +93,7 @@ public void setValue(ObservationValue<?> value) { multiPointCoverage.addValue(new PointValuePair(getPoint(), value.getValue())); super.setValue(new SingleObservationValue<>(value.getPhenomenonTime(), multiPointCoverage)); } + return this; } protected boolean mergeValues(ObservationValue<?> observationValue) { diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/PointObservation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/PointObservation.java index 7d09c4ebd..0531c1aae 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/PointObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/PointObservation.java @@ -67,7 +67,7 @@ public OmObservation cloneTemplate() { } @Override - public void setValue(ObservationValue<?> value) { + public PointObservation setValue(ObservationValue<?> value) { if (value instanceof StreamingValue<?>) { super.setValue(value); } else if (value.getValue() instanceof CvDiscretePointCoverage) { @@ -100,6 +100,7 @@ && getSpatialFilteringProfileParameter().getValue() instanceof GeometryValue) { } super.setValue(new SingleObservationValue<>(value.getPhenomenonTime(), cvDiscretePointCoverage)); } + return this; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/ProfileObservation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/ProfileObservation.java index 69a731999..93d14351e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/ProfileObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/ProfileObservation.java @@ -68,7 +68,7 @@ public OmObservation cloneTemplate() { } @Override - public void setValue(ObservationValue<?> value) { + public ProfileObservation setValue(ObservationValue<?> value) { if (value instanceof StreamingValue<?>) { super.setValue(value); } else if (value.getValue() instanceof RectifiedGridCoverage @@ -112,6 +112,7 @@ public void setValue(ObservationValue<?> value) { rectifiedGridCoverage.addValue(heightDepth, value.getValue()); super.setValue(new SingleObservationValue<>(value.getPhenomenonTime(), rectifiedGridCoverage)); } + return this; } private void setFeatureGeometry(List<Coordinate> coordinates, int srid) { diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/TrajectoryObservation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/TrajectoryObservation.java index cf032e99f..705f014e1 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/TrajectoryObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/TrajectoryObservation.java @@ -86,7 +86,7 @@ public OmObservation cloneTemplate() { @SuppressWarnings("rawtypes") @Override - public void setValue(ObservationValue<?> value) { + public TrajectoryObservation setValue(ObservationValue<?> value) { if (value instanceof StreamingValue || value.getValue() instanceof TLVTValue) { super.setValue(value); } else { @@ -118,15 +118,17 @@ public void setValue(ObservationValue<?> value) { } super.setValue(multiValue); } + return this; } @Override - public void mergeWithObservation(OmObservation observation) { + public TrajectoryObservation mergeWithObservation(OmObservation observation) { if (observation instanceof TrajectoryObservation) { mergeValues(observation.getValue()); } else { super.mergeWithObservation(observation); } + return this; } protected boolean mergeValues(ObservationValue<?> observationValue) { diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbstractMDIdentification.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbstractMDIdentification.java index f1d535547..7b45cdde3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbstractMDIdentification.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbstractMDIdentification.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.iso.gmd; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public abstract class AbstractMDIdentification extends AbstractObject { @@ -27,6 +29,7 @@ public abstract class AbstractMDIdentification */ private String abstrakt; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractMDIdentification(GmdCitation citation, String abstrakt) { this.citation = citation; this.abstrakt = abstrakt; @@ -35,6 +38,7 @@ public AbstractMDIdentification(GmdCitation citation, String abstrakt) { /** * @return the citation */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public GmdCitation getCitation() { return citation; } diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiAddress.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiAddress.java index 49d6cb32b..ad96f1e82 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiAddress.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiAddress.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import com.google.common.base.Strings; @@ -41,7 +42,7 @@ public class CiAddress extends AbstractObject { * @return the deliveryPoints */ public List<String> getDeliveryPoints() { - return deliveryPoints; + return Collections.unmodifiableList(deliveryPoints); } /** @@ -49,7 +50,8 @@ public List<String> getDeliveryPoints() { * the deliveryPoints to set */ public CiAddress setDeliveryPoints(Collection<String> deliveryPoints) { - if (electronicMailAddresses != null) { + this.deliveryPoints.clear(); + if (deliveryPoints != null) { this.deliveryPoints.addAll(deliveryPoints); } return this; @@ -60,7 +62,7 @@ public CiAddress setDeliveryPoints(Collection<String> deliveryPoints) { * the deliveryPoints to add */ public CiAddress addDeliveryPoints(String deliveryPoints) { - if (electronicMailAddresses != null) { + if (deliveryPoints != null) { this.deliveryPoints.add(deliveryPoints); } return this; @@ -154,7 +156,7 @@ public boolean isSetCountry() { * @return the electronicMailAddresses */ public List<String> getElectronicMailAddresses() { - return electronicMailAddresses; + return Collections.unmodifiableList(electronicMailAddresses); } /** diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiTelephone.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiTelephone.java index 37632cfe8..06676410c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiTelephone.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiTelephone.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.n52.shetland.util.CollectionHelper; @@ -38,12 +39,14 @@ public boolean isSetVoice() { } public List<String> getVoice() { - return voice; + return Collections.unmodifiableList(voice); } public CiTelephone setVoice(final Collection<String> voice) { - voice.clear(); - this.voice.addAll(voice); + this.voice.clear(); + if (voice != null) { + this.voice.addAll(voice); + } return this; } @@ -59,7 +62,7 @@ public boolean isSetFacsimile() { } public List<String> getFacsimile() { - return facsimile; + return Collections.unmodifiableList(facsimile); } public CiTelephone addFacsimile(final String facsimile) { diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/EXExtent.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/EXExtent.java index 8fe4490c0..143e2e863 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/EXExtent.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/EXExtent.java @@ -16,6 +16,7 @@ package org.n52.shetland.iso.gmd; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.n52.shetland.util.CollectionHelper; @@ -113,7 +114,7 @@ public boolean hasDescription() { // } public List<Referenceable<EXVerticalExtent>> getExVerticalExtent() { - return exVerticalExtent; + return Collections.unmodifiableList(exVerticalExtent); } public EXExtent setVerticalExtent(List<Referenceable<EXVerticalExtent>> exVerticalExtent) { diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdCitation.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdCitation.java index 22ae0442f..ba8e89574 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdCitation.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdCitation.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.iso.gmd; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -41,6 +43,7 @@ public GmdCitationDate getDate() { return date; } + @SuppressFBWarnings({ "MS_EXPOSE_REP" }) public static GmdCitation airQualityDirectiveEC502008() { return EC_50_2008; } diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdConformanceResult.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdConformanceResult.java index 5d4f2cbda..6f5d21ae6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdConformanceResult.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdConformanceResult.java @@ -17,6 +17,8 @@ import org.n52.shetland.ogc.gml.GmlConstants.NilReason; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -28,12 +30,14 @@ public class GmdConformanceResult extends GmdDomainConsistency { private final NilReason passNilReason; private final GmdSpecification specification; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GmdConformanceResult(boolean pass, GmdSpecification specification) { this.pass = pass; this.passNilReason = null; this.specification = specification; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GmdConformanceResult(NilReason passNilReason, GmdSpecification specification) { this.pass = false; this.passNilReason = passNilReason; @@ -52,6 +56,7 @@ public boolean isSetPassNilReason() { return getPassNilReason() != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public GmdSpecification getSpecification() { return specification; } diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdQuantitativeResult.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdQuantitativeResult.java index c90c944d9..64468be1c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdQuantitativeResult.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdQuantitativeResult.java @@ -17,6 +17,8 @@ import org.n52.shetland.ogc.gml.GmlConstants.NilReason; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -28,18 +30,21 @@ public class GmdQuantitativeResult extends GmdDomainConsistency { private final String value; private final NilReason valueNilReason; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GmdQuantitativeResult(GmlBaseUnit unit, String value) { this.unit = unit; this.value = value; this.valueNilReason = null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GmdQuantitativeResult(GmlBaseUnit unit, NilReason valueNilReason) { this.unit = unit; this.value = null; this.valueNilReason = valueNilReason; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public GmlBaseUnit getUnit() { return unit; } diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdSpecification.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdSpecification.java index 2a545816f..6e9d43da0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdSpecification.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdSpecification.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.iso.gmd; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -31,6 +33,7 @@ public class GmdSpecification extends AbtractGmd { private final String explanation; private final GmdCitation citation; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GmdSpecification(String explanation, GmdCitation citation) { this.explanation = explanation; this.citation = citation; @@ -40,14 +43,17 @@ public String getExplanation() { return explanation; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public GmdCitation getCitation() { return citation; } + @SuppressFBWarnings({ "MS_EXPOSE_REP" }) public static GmdSpecification dataCapture() { return DATA_CAPTURE_SPECIFICATION; } + @SuppressFBWarnings({ "MS_EXPOSE_REP" }) public static GmdSpecification timeCoverage() { return TIME_COVERAGE_SPECIFICATION; } diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/MDMetadata.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/MDMetadata.java index eb1e64ca9..e9c31d116 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/MDMetadata.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/MDMetadata.java @@ -15,6 +15,9 @@ */ package org.n52.shetland.iso.gmd; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; import java.util.Set; import org.joda.time.DateTime; @@ -22,36 +25,41 @@ import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class MDMetadata extends AbstractObject { - private Set<Referenceable<CiResponsibleParty>> contact; + private Set<Referenceable<CiResponsibleParty>> contact = new LinkedHashSet<>(); private DateTime dateStamp; - private Set<Referenceable<AbstractMDIdentification>> identificationInfo; + private Set<Referenceable<AbstractMDIdentification>> identificationInfo = new LinkedHashSet<>(); + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public MDMetadata(Referenceable<CiResponsibleParty> contact, DateTime dateStamp, Referenceable<AbstractMDIdentification> identificationInfo) { this(Sets.newHashSet(contact), dateStamp, Sets.newHashSet(identificationInfo)); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public MDMetadata(CiResponsibleParty contact, DateTime dateStamp, AbstractMDIdentification identificationInfo) { this(Referenceable.of(contact), dateStamp, Referenceable.of(identificationInfo)); } - public MDMetadata(Set<Referenceable<CiResponsibleParty>> contact, DateTime dateStamp, - Set<Referenceable<AbstractMDIdentification>> identificationInfo) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public MDMetadata(Collection<Referenceable<CiResponsibleParty>> contact, DateTime dateStamp, + Collection<Referenceable<AbstractMDIdentification>> identificationInfo) { super(); - this.contact = contact; + addContacts(contact); this.dateStamp = dateStamp; - this.identificationInfo = identificationInfo; + addIdentificationInfos(identificationInfo); } /** * @return the contact */ public Set<Referenceable<CiResponsibleParty>> getContact() { - return contact; + return Collections.unmodifiableSet(contact); } public MDMetadata addContact(Referenceable<CiResponsibleParty> contact) { @@ -63,14 +71,17 @@ public MDMetadata addContact(CiResponsibleParty contact) { return addContact(Referenceable.of(contact)); } - public MDMetadata addContacts(Set<Referenceable<CiResponsibleParty>> contacts) { - this.contact.addAll(contacts); + public MDMetadata addContacts(Collection<Referenceable<CiResponsibleParty>> contacts) { + if (contacts != null) { + this.contact.addAll(contacts); + } return this; } /** * @return the dateStamp */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public DateTime getDateStamp() { return dateStamp; } @@ -79,7 +90,7 @@ public DateTime getDateStamp() { * @return the identificationInfo */ public Set<Referenceable<AbstractMDIdentification>> getIdentificationInfo() { - return identificationInfo; + return Collections.unmodifiableSet(identificationInfo); } public MDMetadata addIdentificationInfo(AbstractMDIdentification identificationInfo) { @@ -87,12 +98,16 @@ public MDMetadata addIdentificationInfo(AbstractMDIdentification identificationI } public MDMetadata addIdentificationInfo(Referenceable<AbstractMDIdentification> identificationInfo) { - this.identificationInfo.add(identificationInfo); + if (identificationInfo != null) { + this.identificationInfo.add(identificationInfo); + } return this; } - public MDMetadata addIdentificationInfos(Set<Referenceable<AbstractMDIdentification>> identificationInfos) { - this.identificationInfo.addAll(identificationInfos); + public MDMetadata addIdentificationInfos(Collection<Referenceable<AbstractMDIdentification>> identificationInfos) { + if (identificationInfos != null) { + this.identificationInfo.addAll(identificationInfos); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/PT_FreeText.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/PT_FreeText.java index 92eafe601..41b999dda 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/PT_FreeText.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/PT_FreeText.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.iso.gmd; +import java.util.Collection; +import java.util.Collections; import java.util.Set; import org.n52.shetland.util.CollectionHelper; @@ -31,23 +33,29 @@ public class PT_FreeText extends AbtractGmd { * @return the textGroup */ public Set<LocalisedCharacterString> getTextGroup() { - return textGroup; + return Collections.unmodifiableSet(textGroup); } /** - * @param textGroup the textGroup to set + * @param textGroup + * the textGroup to set */ - public PT_FreeText setTextGroup(Set<LocalisedCharacterString> textGroup) { + public PT_FreeText setTextGroup(Collection<LocalisedCharacterString> textGroup) { this.textGroup.clear(); - this.textGroup.addAll(textGroup); + if (textGroup != null) { + this.textGroup.addAll(textGroup); + } return this; } /** - * @param textGroup the textGroup to add + * @param textGroup + * the textGroup to add */ public PT_FreeText addTextGroup(LocalisedCharacterString textGroup) { - this.textGroup.add(textGroup); + if (textGroup != null) { + this.textGroup.add(textGroup); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/ScCRS.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/ScCRS.java index 93d01f708..3a2e9c7a6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/ScCRS.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/ScCRS.java @@ -17,6 +17,8 @@ import org.n52.shetland.ogc.gml.AbstractCRS; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class ScCRS { private AbstractCRS abstractCrs; @@ -24,6 +26,7 @@ public class ScCRS { /** * @return the abstractCrs */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AbstractCRS getAbstractCrs() { return abstractCrs; } @@ -32,6 +35,7 @@ public AbstractCRS getAbstractCrs() { * @param abstractCrs the abstractCrs to set * @return this {@link ScCRS} */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ScCRS setAbstractCrs(AbstractCRS abstractCrs) { this.abstractCrs = abstractCrs; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/BinaryLogicFilter.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/BinaryLogicFilter.java index 015a9b1fb..d062051ff 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/BinaryLogicFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/BinaryLogicFilter.java @@ -17,6 +17,7 @@ import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Set; import org.n52.shetland.ogc.filter.FilterConstants.BinaryLogicOperator; @@ -30,9 +31,7 @@ * @since 1.0.0 * */ -public class BinaryLogicFilter - extends Filter<BinaryLogicOperator> - implements LogicFilter { +public class BinaryLogicFilter extends Filter<BinaryLogicOperator> implements LogicFilter { private BinaryLogicOperator operator; // keep insertion order @@ -79,7 +78,7 @@ public Filter<BinaryLogicOperator> setOperator(BinaryLogicOperator operator) { * @return the filterPredicates */ public Set<Filter<?>> getFilterPredicates() { - return filterPredicates; + return Collections.unmodifiableSet(filterPredicates); } /** @@ -87,7 +86,9 @@ public Set<Filter<?>> getFilterPredicates() { * the filterPredicate to add */ public BinaryLogicFilter addFilterPredicates(Filter<?> filterPredicate) { - this.filterPredicates.add(filterPredicate); + if (filterPredicate != null) { + this.filterPredicates.add(filterPredicate); + } return this; } @@ -96,7 +97,9 @@ public BinaryLogicFilter addFilterPredicates(Filter<?> filterPredicate) { * the filterPredicates to add */ public BinaryLogicFilter addFilterPredicates(Collection<Filter<?>> filterPredicates) { - this.filterPredicates.addAll(filterPredicates); + if (filterPredicates != null) { + this.filterPredicates.addAll(filterPredicates); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/IdFilter.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/IdFilter.java index 09c67ef3e..485452dab 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/IdFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/IdFilter.java @@ -16,14 +16,19 @@ package org.n52.shetland.ogc.filter; import com.google.common.base.MoreObjects; +import com.google.common.base.Strings; import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; import org.n52.shetland.ogc.filter.FilterConstants.Id; - +import org.n52.shetland.util.CollectionHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +45,7 @@ public class IdFilter private Id operator; - private Set<String> ids; + private Set<String> ids = new LinkedHashSet<>(); public IdFilter() { this(Sets.<String> newHashSet()); @@ -50,8 +55,11 @@ public IdFilter(String id) { this(Sets.newHashSet(id)); } - public IdFilter(Set<String> ids) { - this.ids = ids; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public IdFilter(Collection<String> ids) { + if (ids != null) { + this.ids.addAll(ids); + } } @Override @@ -60,11 +68,13 @@ public String toString() { } public Collection<String> getIds() { - return ids; + return Collections.unmodifiableCollection(ids); } public Filter<Id> addId(String id) { - this.ids.add(id); + if (!Strings.isNullOrEmpty(id)) { + this.ids.add(id); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/SpatialFilter.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/SpatialFilter.java index d3de13109..54bb22018 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/SpatialFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/SpatialFilter.java @@ -21,6 +21,8 @@ import org.n52.shetland.util.EnvelopeOrGeometry; import org.n52.shetland.util.ReferencedEnvelope; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Spatial filter class * @@ -155,7 +157,7 @@ public SpatialFilter setGeometry(ReferencedEnvelope geometry) { /** * @return the distance - */ + */ @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public FesMeasureType getDistance() { return distance; } @@ -167,6 +169,7 @@ public FesMeasureType getDistance() { * the distance to set * @return This filter */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SpatialFilter setDistance(FesMeasureType distance) { this.distance = distance; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/TemporalFilter.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/TemporalFilter.java index b307e2f6e..2773b9e8f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/TemporalFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/TemporalFilter.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.filter.FilterConstants.TimeOperator; import org.n52.shetland.ogc.gml.time.Time; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Temporal filter class * @@ -45,6 +47,7 @@ public TemporalFilter() { * @param valueReference * value reference */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TemporalFilter(TimeOperator operator, Time time, String valueReference) { super(valueReference); this.operator = operator; @@ -81,6 +84,7 @@ public TemporalFilter setOperator(TimeOperator operator) { * * @return filter time */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getTime() { return time; } @@ -92,6 +96,7 @@ public Time getTime() { * filter time * @return This filter */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TemporalFilter setTime(Time time) { this.time = time; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractCRS.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractCRS.java index dda8e37f8..77d92911c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractCRS.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractCRS.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.gml; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.n52.shetland.util.CollectionHelper; @@ -30,8 +31,7 @@ * @since 1.0.0 * */ -public abstract class AbstractCRS - extends IdentifiedObject { +public abstract class AbstractCRS extends IdentifiedObject { /* 0..* */ private List<Referenceable<DomainOfValidity>> domainOfValidity = new ArrayList<>(); @@ -48,7 +48,7 @@ public AbstractCRS(CodeWithAuthority identifier, List<String> scope) { } public List<Referenceable<DomainOfValidity>> getDomainOfValidity() { - return domainOfValidity; + return Collections.unmodifiableList(domainOfValidity); } public AbstractCRS setDomainOfValidity(List<Referenceable<DomainOfValidity>> domainOfValidity) { @@ -60,12 +60,16 @@ public AbstractCRS setDomainOfValidity(List<Referenceable<DomainOfValidity>> dom } public AbstractCRS addDomainOfValidity(List<Referenceable<DomainOfValidity>> domainOfValidity) { - this.domainOfValidity.addAll(domainOfValidity); + if (!CollectionHelper.nullEmptyOrContainsOnlyNulls(domainOfValidity)) { + this.domainOfValidity.addAll(domainOfValidity); + } return this; } public AbstractCRS addDomainOfValidity(Referenceable<DomainOfValidity> domainOfValidity) { - this.domainOfValidity.add(domainOfValidity); + if (domainOfValidity != null) { + this.domainOfValidity.add(domainOfValidity); + } return this; } @@ -74,7 +78,7 @@ public boolean hasDomainOfValidity() { } public List<String> getScope() { - return scope; + return Collections.unmodifiableList(scope); } public AbstractCRS setScope(List<String> scope) { @@ -86,12 +90,16 @@ public AbstractCRS setScope(List<String> scope) { } public AbstractCRS addScope(List<String> scope) { - this.scope.addAll(scope); + if (!CollectionHelper.nullEmptyOrContainsOnlyNulls(scope)) { + this.scope.addAll(scope); + } return this; } public AbstractCRS addScope(String scope) { - this.scope.add(scope); + if (scope != null) { + this.scope.add(scope); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractCoordinateSystem.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractCoordinateSystem.java index 2fae751f3..07e4598f3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractCoordinateSystem.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractCoordinateSystem.java @@ -16,6 +16,8 @@ package org.n52.shetland.ogc.gml; import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.List; import org.n52.shetland.w3c.xlink.Referenceable; @@ -27,30 +29,29 @@ * @since 1.0.0 * */ -public abstract class AbstractCoordinateSystem - extends IdentifiedObject { +public abstract class AbstractCoordinateSystem extends IdentifiedObject { private final List<Referenceable<CoordinateSystemAxis>> coordinateSystemAxis = new ArrayList<>(); private Aggregation aggregation; - public AbstractCoordinateSystem( - CodeWithAuthority identifier, Referenceable<CoordinateSystemAxis> coordinateSystemAxis) { + public AbstractCoordinateSystem(CodeWithAuthority identifier, + Referenceable<CoordinateSystemAxis> coordinateSystemAxis) { super(identifier); addCoordinateSystemAxis(coordinateSystemAxis); } - public AbstractCoordinateSystem( - CodeWithAuthority identifier, List<Referenceable<CoordinateSystemAxis>> coordinateSystemAxis) { + public AbstractCoordinateSystem(CodeWithAuthority identifier, + Collection<Referenceable<CoordinateSystemAxis>> coordinateSystemAxis) { super(identifier); - addCoordinateSystemAxis(coordinateSystemAxis); + setCoordinateSystemAxis(coordinateSystemAxis); } /** * @return the coordinateSystemAxis */ public List<Referenceable<CoordinateSystemAxis>> getCoordinateSystemAxis() { - return coordinateSystemAxis; + return Collections.unmodifiableList(coordinateSystemAxis); } /** @@ -60,9 +61,11 @@ public List<Referenceable<CoordinateSystemAxis>> getCoordinateSystemAxis() { * @return {@code this} */ public AbstractCoordinateSystem setCoordinateSystemAxis( - List<Referenceable<CoordinateSystemAxis>> coordinateSystemAxis) { + Collection<Referenceable<CoordinateSystemAxis>> coordinateSystemAxis) { this.coordinateSystemAxis.clear(); - this.coordinateSystemAxis.addAll(coordinateSystemAxis); + if (coordinateSystemAxis != null) { + this.coordinateSystemAxis.addAll(coordinateSystemAxis); + } return this; } @@ -73,8 +76,10 @@ public AbstractCoordinateSystem setCoordinateSystemAxis( * @return {@code this} */ public AbstractCoordinateSystem addCoordinateSystemAxis( - List<Referenceable<CoordinateSystemAxis>> coordinateSystemAxis) { - this.coordinateSystemAxis.addAll(coordinateSystemAxis); + Collection<Referenceable<CoordinateSystemAxis>> coordinateSystemAxis) { + if (coordinateSystemAxis != null) { + this.coordinateSystemAxis.addAll(coordinateSystemAxis); + } return this; } @@ -85,7 +90,9 @@ public AbstractCoordinateSystem addCoordinateSystemAxis( * @return {@code this} */ public AbstractCoordinateSystem addCoordinateSystemAxis(Referenceable<CoordinateSystemAxis> coordinateSystemAxis) { - this.coordinateSystemAxis.add(coordinateSystemAxis); + if (coordinateSystemAxis != null) { + this.coordinateSystemAxis.add(coordinateSystemAxis); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractDatum.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractDatum.java index f4d802b23..1ec1f4508 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractDatum.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractDatum.java @@ -16,6 +16,8 @@ package org.n52.shetland.ogc.gml; import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.List; import org.joda.time.DateTime; @@ -25,6 +27,8 @@ import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Internal representation of the OGC GML AbstractDatum. * @@ -47,7 +51,7 @@ public AbstractDatum(CodeWithAuthority identifier, String scope) { this(identifier, Lists.newArrayList(scope)); } - public AbstractDatum(CodeWithAuthority identifier, List<String> scope) { + public AbstractDatum(CodeWithAuthority identifier, Collection<String> scope) { super(identifier); setScope(scope); } @@ -65,7 +69,7 @@ public AbstractDatum setDomainOfValidity(DomainOfValidity domainOfValidity) { if (domainOfValidity != null) { this.domainOfValidity = Referenceable.of(domainOfValidity); } else { - this.domainOfValidity = Referenceable.of(Nillable.<DomainOfValidity>missing()); + this.domainOfValidity = Referenceable.of(Nillable.<DomainOfValidity> missing()); } return this; } @@ -75,10 +79,10 @@ public boolean hasDomainOfValidity() { } public List<String> getScope() { - return scope; + return Collections.unmodifiableList(scope); } - public AbstractDatum setScope(List<String> scope) { + public AbstractDatum setScope(Collection<String> scope) { this.scope.clear(); if (!CollectionHelper.nullEmptyOrContainsOnlyNulls(scope)) { this.scope.addAll(scope); @@ -86,13 +90,17 @@ public AbstractDatum setScope(List<String> scope) { return this; } - public AbstractDatum addScope(List<String> scope) { - this.scope.addAll(scope); + public AbstractDatum addScope(Collection<String> scope) { + if (!CollectionHelper.nullEmptyOrContainsOnlyNulls(scope)) { + this.scope.addAll(scope); + } return this; } public AbstractDatum addScope(String scope) { - this.scope.add(scope); + if (scope != null) { + this.scope.add(scope); + } return this; } @@ -113,10 +121,12 @@ public boolean hasAnchorDefinition() { return getAnchorDefinition() != null && getAnchorDefinition().isSetValue(); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public DateTime getRealizationEpoch() { return realizationEpoch; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractDatum setRealizationEpoch(DateTime realizationEpoch) { this.realizationEpoch = realizationEpoch; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGML.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGML.java index 823f87bc7..c88a0c639 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGML.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGML.java @@ -17,6 +17,7 @@ import java.net.URI; import java.net.URISyntaxException; +import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -46,8 +47,8 @@ public abstract class AbstractGML { private CodeWithAuthority humanReadableIdentifier; /** - * Original Feature identifier, set if - * {@link AbstractGML#setHumanReadableIdentifierAsIdentifier()} is called. + * Original Feature identifier, set if {@link AbstractGML#setHumanReadableIdentifierAsIdentifier()} is + * called. */ private CodeWithAuthority originalIdentifier; @@ -160,8 +161,7 @@ public AbstractGML setIdentifier(String identifier) { } /** - * @return {@code true}, if identifier is set and value is not an empty - * string, else {@code false} + * @return {@code true}, if identifier is set and value is not an empty string, else {@code false} */ public boolean isSetIdentifier() { return getIdentifierCodeWithAuthority() != null && getIdentifierCodeWithAuthority().isSetValue(); @@ -177,8 +177,7 @@ public String getHumanReadableIdentifier() { } /** - * Get {@link CodeWithAuthority} human readable identifier of this abstract - * feature + * Get {@link CodeWithAuthority} human readable identifier of this abstract feature * * @return Returns the human readable identifier of this abstract feature . */ @@ -213,8 +212,7 @@ public AbstractGML setHumanReadableIdentifier(String humanReadableIdentifier) { } /** - * @return <tt>true</tt>, if human readable identifier is set and value is - * not an empty string,<br> + * @return <tt>true</tt>, if human readable identifier is set and value is not an empty string,<br> * else <tt>false</tt> */ public boolean isSetHumanReadableIdentifier() { @@ -223,8 +221,7 @@ public boolean isSetHumanReadableIdentifier() { } /** - * Set the human readable identifier as identifier and saves the identifier - * as original identifier + * Set the human readable identifier as identifier and saves the identifier as original identifier * * @return this */ @@ -257,8 +254,7 @@ public String getOriginalIdentifier() { } /** - * Get {@link CodeWithAuthority} original identifier of this abstract - * feature + * Get {@link CodeWithAuthority} original identifier of this abstract feature * * @return Returns the original identifier of this abstract feature . */ @@ -283,9 +279,11 @@ public List<CodeType> getName() { * * @return {@code this} */ - public AbstractGML setName(final List<CodeType> name) { + public AbstractGML setName(final Collection<CodeType> name) { this.names.clear(); - this.names = name; + if (name != null) { + this.names.addAll(name); + } return this; } @@ -299,7 +297,9 @@ public AbstractGML setName(final List<CodeType> name) { */ public AbstractGML setName(CodeType name) { this.names.clear(); - this.names.add(name); + if (name != null) { + this.names.add(name); + } return this; } @@ -327,7 +327,9 @@ public AbstractGML addName(final CodeType name) { * @return {@code this} */ public AbstractGML addName(final String name) { - addName(new CodeType(name)); + if (!Strings.isNullOrEmpty(name)) { + addName(new CodeType(name)); + } return this; } @@ -345,7 +347,9 @@ public AbstractGML addName(final String name) { * if the code space is not a valid URI */ public AbstractGML addName(final String name, final URI codespace) throws URISyntaxException { - addName(new CodeType(name, codespace)); + if (!Strings.isNullOrEmpty(name)) { + addName(new CodeType(name, codespace)); + } return this; } @@ -430,8 +434,7 @@ public boolean isSetGmlID() { } /** - * Check whether feature is still contained in XML document by sign - * {@code #}. + * Check whether feature is still contained in XML document by sign {@code #}. * * @return <code>true</code> if feature is still contained in XML document */ @@ -443,45 +446,55 @@ public boolean isReferenced() { * @return the metaDataProperty */ public List<AbstractMetaData> getMetaDataProperty() { - return metaDataProperty; + return Collections.unmodifiableList(metaDataProperty); } /** * @param metaDataProperty * the metaDataProperty to set + * @return */ - public void setMetaDataProperty(List<AbstractMetaData> metaDataProperty) { + public AbstractGML setMetaDataProperty(List<AbstractMetaData> metaDataProperty) { this.metaDataProperty.clear(); - this.metaDataProperty.addAll(metaDataProperty); + if (metaDataProperty != null) { + this.metaDataProperty.addAll(metaDataProperty); + } + return this; } /** * @param metaDataProperty * the metaDataProperty to add + * @return */ - public void addMetaDataProperty(List<AbstractMetaData> metaDataProperty) { - this.metaDataProperty.addAll(metaDataProperty); + public AbstractGML addMetaDataProperty(List<AbstractMetaData> metaDataProperty) { + if (metaDataProperty != null) { + this.metaDataProperty.addAll(metaDataProperty); + } + return this; } /** * @param metaDataProperty * the metaDataProperty to add + * @return */ - public void addMetaDataProperty(AbstractMetaData metaDataProperty) { - this.metaDataProperty.add(metaDataProperty); + public AbstractGML addMetaDataProperty(AbstractMetaData metaDataProperty) { + if (metaDataProperty != null) { + this.metaDataProperty.add(metaDataProperty); + } + return this; } /** - * @return <code>true</code>, if metaData property is set, else - * <code>false</code> + * @return <code>true</code>, if metaData property is set, else <code>false</code> */ public boolean isSetMetaDataProperty() { return CollectionHelper.isNotEmpty(getMetaDataProperty()); } /** - * Copies values of this {@link AbstractGML} to the committed - * {@link AbstractGML} + * Copies values of this {@link AbstractGML} to the committed {@link AbstractGML} * * @param copyOf * {@link AbstractGML} to set values diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGeometry.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGeometry.java index 904f1043a..907ba991b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGeometry.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGeometry.java @@ -17,6 +17,8 @@ import org.locationtech.jts.geom.Geometry; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class AbstractGeometry extends AbstractGML { /** * Geometry @@ -44,6 +46,7 @@ public AbstractGeometry(String id) { * * @return the geometry */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Geometry getGeometry() { return geometry; } @@ -54,6 +57,7 @@ public Geometry getGeometry() { * @param geometry * the geometry to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractGeometry setGeometry(Geometry geometry) { this.geometry = geometry; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/DomainOfValidity.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/DomainOfValidity.java index 903a2bfae..a9df5b192 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/DomainOfValidity.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/DomainOfValidity.java @@ -17,6 +17,8 @@ import org.n52.shetland.iso.gmd.EXExtent; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Internal representation of the OGC GML DomainOfValidity. * @@ -32,6 +34,7 @@ public class DomainOfValidity { /** * @return the exExtent */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public EXExtent getExExtent() { return exExtent; } @@ -39,6 +42,7 @@ public EXExtent getExExtent() { /** * @param exExtent the exExtent to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public DomainOfValidity setExExtent(EXExtent exExtent) { this.exExtent = exExtent; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/GmlAbstractGeometry.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/GmlAbstractGeometry.java index 58fa567ec..c092283a7 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/GmlAbstractGeometry.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/GmlAbstractGeometry.java @@ -17,6 +17,8 @@ import org.locationtech.jts.geom.Geometry; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * A class that represents a gml:AbstractGeometry (PointType, ...). * @@ -53,6 +55,7 @@ public GmlAbstractGeometry(String id) { * * @return the geometry */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Geometry getGeometry() { return geometry; } @@ -63,6 +66,7 @@ public Geometry getGeometry() { * @param geometry * the geometry to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setGeometry(Geometry geometry) { this.geometry = geometry; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimeInstant.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimeInstant.java index a6d977246..6a5b2b7c9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimeInstant.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimeInstant.java @@ -21,6 +21,8 @@ import org.joda.time.DateTimeZone; import org.joda.time.Instant; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class represents a GML conform timeInstant element * @@ -121,6 +123,7 @@ private TimeInstant(DateTime value, int requestedTimeLength, IndeterminateValue * * @return Returns the value. */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public DateTime getValue() { return value; } @@ -131,6 +134,7 @@ public DateTime getValue() { * @param value * The value to set. */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setValue(final DateTime value) { this.value = value; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimePeriod.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimePeriod.java index 38b86525f..a78d5c10f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimePeriod.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimePeriod.java @@ -28,6 +28,8 @@ import org.n52.shetland.util.CollectionHelper; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class represents a GML conform timePeriod element. * @@ -70,6 +72,7 @@ public TimePeriod() { * * @param interval the interval */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TimePeriod(Interval interval) { this(interval.getStart(), interval.getEnd()); } @@ -82,6 +85,7 @@ public TimePeriod(Interval interval) { * @param end * end date of the time period */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TimePeriod(DateTime start, DateTime end) { this.start = start; this.end = end; @@ -97,6 +101,7 @@ public TimePeriod(DateTime start, DateTime end) { * @param id * GML id */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TimePeriod(DateTime start, DateTime end, String id) { super(id); this.start = start; @@ -115,6 +120,7 @@ public TimePeriod(DateTime start, DateTime end, String id) { * @param endIndet * indeterminate time value of end position */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TimePeriod(DateTime start, IndeterminateValue startIndet, DateTime end, IndeterminateValue endIndet) { this.start = start; this.startIndet = startIndet; @@ -141,6 +147,7 @@ public TimePeriod(DateTime start, IndeterminateValue startIndet, DateTime end, I * if parsing the time strings of start or end into * java.util.Date failed */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TimePeriod( DateTime start, IndeterminateValue startIndet, DateTime end, IndeterminateValue endIndet, String duration, String id) throws ParseException { @@ -160,6 +167,7 @@ public TimePeriod( * @param endTime * End TimeInstant */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TimePeriod(TimeInstant startTime, TimeInstant endTime) { if (startTime != null) { this.start = startTime.getValue(); @@ -180,6 +188,7 @@ public TimePeriod(TimeInstant startTime, TimeInstant endTime) { * @param end * end Date */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TimePeriod(Date start, Date end) { if (start != null) { this.start = new DateTime(start, DateTimeZone.UTC); @@ -202,6 +211,7 @@ public TimePeriod(Date start, Date end) { * @param end * end {@link Object} */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TimePeriod(Object start, Object end) { if (start != null) { this.start = new DateTime(start, DateTimeZone.UTC); @@ -220,6 +230,7 @@ public TimePeriod(Object start, Object end) { * * @return Returns the duration. */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Period getDuration() { return duration; } @@ -230,6 +241,7 @@ public Period getDuration() { * @param duration * The duration to set. */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setDuration(Period duration) { this.duration = duration; } @@ -239,6 +251,7 @@ public void setDuration(Period duration) { * * @return Returns the start. */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public DateTime getStart() { return start; } @@ -249,6 +262,7 @@ public DateTime getStart() { * @param start * The start to set. */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setStart(DateTime start) { this.start = start; } @@ -267,6 +281,7 @@ public DateTime resolveStart() { * * @return Returns the end. */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public DateTime getEnd() { return end; } @@ -277,6 +292,7 @@ public DateTime getEnd() { * @param end * The end to set. */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setEnd(DateTime end) { this.end = end; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/MultiObservationValues.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/MultiObservationValues.java index 86fb9f548..1b9f7f13e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/MultiObservationValues.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/MultiObservationValues.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.gml.time.Time; import org.n52.shetland.ogc.om.values.MultiValue; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class representing a multi value observation value * @@ -38,6 +40,7 @@ public class MultiObservationValues<T> extends AbstractObservationValue<MultiVal private Time phenomenonTime; @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getPhenomenonTime() { if (phenomenonTime == null && getValue() != null) { phenomenonTime = getValue().getPhenomenonTime(); @@ -46,16 +49,19 @@ public Time getPhenomenonTime() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public MultiValue<T> getValue() { return values; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setValue(MultiValue<T> value) { this.values = value; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setPhenomenonTime(Time phenomenonTime) { this.phenomenonTime = phenomenonTime; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/NamedValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/NamedValue.java index 06bb5bb7f..04aa6408a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/NamedValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/NamedValue.java @@ -20,6 +20,8 @@ import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.om.values.Value; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class representing a O&M conform NamedValue * @@ -40,6 +42,7 @@ public class NamedValue<T> implements Comparable<NamedValue<T>> { */ private Value<T> value; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public NamedValue(ReferenceType name, Value<T> value) { this.name = name; this.value = value; @@ -77,6 +80,7 @@ public void setName(ReferenceType name) { * * @return Value */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Value<T> getValue() { return value; } @@ -87,6 +91,7 @@ public Value<T> getValue() { * @param value * Value to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setValue(Value<T> value) { this.value = value; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmCompositePhenomenon.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmCompositePhenomenon.java index 72fb8de1b..ebb94346c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmCompositePhenomenon.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmCompositePhenomenon.java @@ -15,42 +15,44 @@ */ package org.n52.shetland.ogc.om; +import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class OmCompositePhenomenon extends AbstractPhenomenon implements Iterable<OmObservableProperty> { /** * the components of the composite phenomenon */ - private List<OmObservableProperty> phenomenonComponents; + private List<OmObservableProperty> phenomenonComponents = new LinkedList<>(); /** * standard constructor * * @param compPhenId - * id of the composite phenomenon + * id of the composite phenomenon * @param compPhenDesc - * description of the composite phenomenon + * description of the composite phenomenon * @param phenomenonComponents - * components of the composite phenomenon + * components of the composite phenomenon */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OmCompositePhenomenon(String compPhenId, String compPhenDesc, - List<OmObservableProperty> phenomenonComponents) { + Collection<OmObservableProperty> phenomenonComponents) { super(compPhenId, compPhenDesc); - this.phenomenonComponents = phenomenonComponents; + setPhenomenonComponents(phenomenonComponents); } public OmCompositePhenomenon(String identifier) { super(identifier); - this.phenomenonComponents = new LinkedList<>(); } public OmCompositePhenomenon(String identifier, String description) { super(identifier, description); - this.phenomenonComponents = new LinkedList<>(); } /** @@ -59,33 +61,35 @@ public OmCompositePhenomenon(String identifier, String description) { * @return Returns the phenomenonComponents. */ public List<OmObservableProperty> getPhenomenonComponents() { - return phenomenonComponents; + return Collections.unmodifiableList(phenomenonComponents); } /** * Set observableProperties * * @param phenomenonComponents - * The phenomenonComponents to set. + * The phenomenonComponents to set. + * @return */ - public void setPhenomenonComponents(List<OmObservableProperty> phenomenonComponents) { - this.phenomenonComponents = phenomenonComponents; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public OmCompositePhenomenon setPhenomenonComponents(Collection<OmObservableProperty> phenomenonComponents) { + this.phenomenonComponents.clear(); + if (phenomenonComponents != null) { + this.phenomenonComponents.addAll(phenomenonComponents); + } + return this; } - public void addPhenomenonComponent(OmObservableProperty observableProperty) { - if (this.phenomenonComponents == null) { - this.phenomenonComponents = new LinkedList<>(); + public OmCompositePhenomenon addPhenomenonComponent(OmObservableProperty observableProperty) { + if (observableProperty != null) { + this.phenomenonComponents.add(observableProperty); } - this.phenomenonComponents.add(observableProperty); + return this; } @Override public Iterator<OmObservableProperty> iterator() { - if (getPhenomenonComponents() == null) { - return Collections.emptyIterator(); - } else { - return getPhenomenonComponents().iterator(); - } + return getPhenomenonComponents().iterator(); } @Override diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java index 742d2623b..28cee612f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java @@ -17,6 +17,7 @@ import java.math.BigDecimal; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Objects; @@ -41,6 +42,8 @@ import com.google.common.base.Strings; import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class represents a SOS/O&M observation * @@ -157,6 +160,7 @@ public OmObservation(CodeWithAuthority identifier, String gmlId) { * * @return the observationConstellation */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OmObservationConstellation getObservationConstellation() { if (isSetCategoryParameter() && observationConstellation != null && !observationConstellation.isSetCategoryParameter()) { @@ -175,6 +179,7 @@ public OmObservationConstellation getObservationConstellation() { * @param observationConstellation * the observationConstellation to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OmObservation setObservationConstellation(OmObservationConstellation observationConstellation) { this.observationConstellation = observationConstellation; return this; @@ -194,9 +199,11 @@ public String getObservationID() { * * @param observationID * the observationID to set + * @return */ - public void setObservationID(final String observationID) { + public OmObservation setObservationID(final String observationID) { this.observationID = observationID; + return this; } /** @@ -217,6 +224,7 @@ public boolean isSetPhenomenonTime() { * * @return the resultTime */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public TimeInstant getResultTime() { return resultTime; } @@ -226,9 +234,12 @@ public TimeInstant getResultTime() { * * @param resultTime * the resultTime to set + * @return */ - public void setResultTime(final TimeInstant resultTime) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public OmObservation setResultTime(final TimeInstant resultTime) { this.resultTime = resultTime; + return this; } /** @@ -236,6 +247,7 @@ public void setResultTime(final TimeInstant resultTime) { * * @return the validTime */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public TimePeriod getValidTime() { return validTime; } @@ -245,9 +257,12 @@ public TimePeriod getValidTime() { * * @param validTime * the validTime to set + * @return */ - public void setValidTime(final TimePeriod validTime) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public OmObservation setValidTime(final TimePeriod validTime) { this.validTime = validTime; + return this; } /** @@ -264,9 +279,11 @@ public String getResultType() { * * @param resultType * the resultType to set + * @return */ - public void setResultType(final String resultType) { + public OmObservation setResultType(final String resultType) { this.resultType = resultType; + return this; } /** @@ -283,9 +300,11 @@ public String getTokenSeparator() { * * @param tokenSeparator * the tokenSeparator to set + * @return */ - public void setTokenSeparator(final String tokenSeparator) { + public OmObservation setTokenSeparator(final String tokenSeparator) { this.tokenSeparator = tokenSeparator; + return this; } /** @@ -302,9 +321,11 @@ public String getNoDataValue() { * * @param noDataValue * the noDataValue to set + * @return */ - public void setNoDataValue(final String noDataValue) { + public OmObservation setNoDataValue(final String noDataValue) { this.noDataValue = noDataValue; + return this; } /** @@ -321,9 +342,11 @@ public String getTupleSeparator() { * * @param tupleSeparator * the tupleSeparator to set + * @return */ - public void setTupleSeparator(final String tupleSeparator) { + public OmObservation setTupleSeparator(final String tupleSeparator) { this.tupleSeparator = tupleSeparator; + return this; } /** @@ -340,9 +363,11 @@ public String getDecimalSeparator() { * * @param decimalSeparator * the decimalSeparator to set + * @return */ - public void setDecimalSeparator(final String decimalSeparator) { + public OmObservation setDecimalSeparator(final String decimalSeparator) { this.decimalSeparator = decimalSeparator; + return this; } /** @@ -350,6 +375,7 @@ public void setDecimalSeparator(final String decimalSeparator) { * * @return the values */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public ObservationValue<?> getValue() { return value; } @@ -359,9 +385,12 @@ public ObservationValue<?> getValue() { * * @param value * the values to set + * @return */ - public void setValue(final ObservationValue<?> value) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public OmObservation setValue(final ObservationValue<?> value) { this.value = value; + return this; } public boolean isSetValue() { @@ -373,10 +402,12 @@ public boolean isSetValue() { * * @param sosObservation * Observation to merge + * @return */ - public void mergeWithObservation(final OmObservation sosObservation) { + public OmObservation mergeWithObservation(final OmObservation sosObservation) { mergeValues(sosObservation.getValue()); mergeResultTimes(sosObservation); + return this; } /** @@ -384,22 +415,26 @@ public void mergeWithObservation(final OmObservation sosObservation) { * * @param observationValue * Observation to merge + * @return */ - public void mergeWithObservation(ObservationValue<?> observationValue) { + public OmObservation mergeWithObservation(ObservationValue<?> observationValue) { mergeValues(observationValue); + return this; } - private void mergeObservationValues(OmObservation merged, OmObservation observation) { + private OmObservation mergeObservationValues(OmObservation merged, OmObservation observation) { mergeValues(merged, observation); mergeResultTimes(merged, observation); + return this; } - private void mergeValues(OmObservation merged, OmObservation observation) { + private OmObservation mergeValues(OmObservation merged, OmObservation observation) { SweDataArray combinedValue = (SweDataArray) merged.getValue().getValue().getValue(); SweDataArray v = (SweDataArray) observation.getValue().getValue().getValue(); if (v.isSetValues()) { combinedValue.addAll(v.getValues()); } + return this; } /** @@ -451,8 +486,9 @@ protected boolean mergeValues(final ObservationValue<?> observationValue) { * Observation to merge * @param merged * the observation to merge into + * @return */ - private void mergeResultTimes(OmObservation merged, OmObservation sosObservation) { + private OmObservation mergeResultTimes(OmObservation merged, OmObservation sosObservation) { if (merged.isSetResultTime() && sosObservation.isSetResultTime()) { if (merged.getResultTime().getValue().isBefore(sosObservation.getResultTime().getValue())) { merged.setResultTime(sosObservation.getResultTime()); @@ -460,6 +496,7 @@ private void mergeResultTimes(OmObservation merged, OmObservation sosObservation } else if (!merged.isSetResultTime() && sosObservation.isSetResultTime()) { merged.setResultTime(sosObservation.getResultTime()); } + return this; } /** @@ -467,8 +504,9 @@ private void mergeResultTimes(OmObservation merged, OmObservation sosObservation * * @param sosObservation * Observation to merge + * @return */ - private void mergeResultTimes(final OmObservation sosObservation) { + private OmObservation mergeResultTimes(final OmObservation sosObservation) { if (isSetResultTime() && sosObservation.isSetResultTime()) { if (getResultTime().getValue().isBefore(sosObservation.getResultTime().getValue())) { resultTime = sosObservation.getResultTime(); @@ -476,6 +514,7 @@ private void mergeResultTimes(final OmObservation sosObservation) { } else if (!isSetResultTime() && sosObservation.isSetResultTime()) { resultTime = sosObservation.getResultTime(); } + return this; } /** @@ -594,9 +633,11 @@ public Collection<NamedValue<?>> getParameter() { * * @param parameter * the parameter to set + * @return */ - public void setParameter(Collection<NamedValue<?>> parameter) { + public OmObservation setParameter(Collection<NamedValue<?>> parameter) { this.parameterHolder.addParameter(parameter); + return this; } /** @@ -604,11 +645,15 @@ public void setParameter(Collection<NamedValue<?>> parameter) { * * @param namedValue * the namedValue to add to parameter + * @return */ - public void addParameter(NamedValue<?> namedValue) { + public OmObservation addParameter(NamedValue<?> namedValue) { parameterHolder.addParameter(namedValue); + return this; } + @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public ParameterHolder getParameterHolder() { return parameterHolder; } @@ -775,18 +820,25 @@ public String getGmlId() { * * @return {@code this} */ - public OmObservation setResultQuality(Set<OmResultQuality> qualityList) { - this.qualityList = qualityList; + public OmObservation setResultQuality(Collection<OmResultQuality> qualityList) { + this.qualityList.clear(); + if (qualityList != null) { + this.qualityList.addAll(qualityList); + } return this; } - public OmObservation addResultQuality(Set<OmResultQuality> qualityList) { - this.qualityList.addAll(qualityList); + public OmObservation addResultQuality(Collection<OmResultQuality> qualityList) { + if (qualityList != null) { + this.qualityList.addAll(qualityList); + } return this; } public OmObservation addResultQuality(OmResultQuality qualityList) { - this.qualityList.add(qualityList); + if (qualityList != null) { + this.qualityList.add(qualityList); + } return this; } @@ -796,7 +848,7 @@ public OmObservation addResultQuality(OmResultQuality qualityList) { * @return Result quality */ public Set<OmResultQuality> getResultQuality() { - return qualityList; + return Collections.unmodifiableSet(qualityList); } public boolean isSetResultQuality() { @@ -809,7 +861,7 @@ public boolean isSetResultQuality() { * @return the relatedObservations */ public Set<OmObservationContext> getRelatedObservations() { - return relatedObservations; + return Collections.unmodifiableSet(relatedObservations); } /** @@ -817,10 +869,14 @@ public Set<OmObservationContext> getRelatedObservations() { * * @param relatedObservations * the relatedObservations to set + * @return */ - public void setRelatedObservations(Set<OmObservationContext> relatedObservations) { + public OmObservation setRelatedObservations(Collection<OmObservationContext> relatedObservations) { this.relatedObservations.clear(); - this.relatedObservations.addAll(relatedObservations); + if (relatedObservations != null) { + this.relatedObservations.addAll(relatedObservations); + } + return this; } /** @@ -828,9 +884,13 @@ public void setRelatedObservations(Set<OmObservationContext> relatedObservations * * @param relatedObservations * the relatedObservations to set + * @return */ - public void addRelatedObservations(Set<OmObservationContext> relatedObservations) { - this.relatedObservations.addAll(relatedObservations); + public OmObservation addRelatedObservations(Collection<OmObservationContext> relatedObservations) { + if (relatedObservations != null) { + this.relatedObservations.addAll(relatedObservations); + } + return this; } /** @@ -838,9 +898,13 @@ public void addRelatedObservations(Set<OmObservationContext> relatedObservations * * @param relatedObservation * the relatedObservation to add + * @return */ - public void addRelatedObservation(OmObservationContext relatedObservation) { - this.relatedObservations.add(relatedObservation); + public OmObservation addRelatedObservation(OmObservationContext relatedObservation) { + if (relatedObservation != null) { + this.relatedObservations.add(relatedObservation); + } + return this; } /** diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java index 6d53a8ba6..7ca893345 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java @@ -16,8 +16,9 @@ package org.n52.shetland.ogc.om; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; -import java.util.List; +import java.util.LinkedHashSet; import java.util.Set; import org.n52.janmayen.Copyable; @@ -28,6 +29,8 @@ import com.google.common.base.Objects; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 */ @@ -47,7 +50,7 @@ public class OmObservationConstellation extends AbstractFeature /** * Identifiers of the offerings to which this observation belongs */ - private Set<String> offerings; + private Set<String> offerings = new LinkedHashSet<>(); /** * Identifier of the featureOfInterest to which this observation belongs @@ -85,6 +88,7 @@ public OmObservationConstellation() { * @param featureOfInterest * featureOfInterest to which this observation belongs */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OmObservationConstellation(AbstractFeature procedure, AbstractPhenomenon observableProperty, AbstractFeature featureOfInterest) { this(procedure, observableProperty, null, featureOfInterest, null); @@ -102,6 +106,7 @@ public OmObservationConstellation(AbstractFeature procedure, AbstractPhenomenon * @param observationType * the observation type */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OmObservationConstellation(AbstractFeature procedure, AbstractPhenomenon observableProperty, AbstractFeature featureOfInterest, String observationType) { this(procedure, observableProperty, null, featureOfInterest, observationType); @@ -121,6 +126,7 @@ public OmObservationConstellation(AbstractFeature procedure, AbstractPhenomenon * @param observationType * the observation type */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OmObservationConstellation(AbstractFeature procedure, AbstractPhenomenon observableProperty, Set<String> offerings, AbstractFeature featureOfInterest, String observationType) { super(""); @@ -143,10 +149,11 @@ public OmObservationConstellation(AbstractFeature procedure, AbstractPhenomenon * @param offerings * offering to which this observation belongs */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OmObservationConstellation(AbstractFeature procedure, AbstractPhenomenon observableProperty, - AbstractFeature featureOfInterest, Set<String> offerings) { + AbstractFeature featureOfInterest, Collection<String> offerings) { this(procedure, observableProperty, featureOfInterest); - this.offerings = offerings; + setOfferings(offerings); } /** @@ -203,6 +210,7 @@ public OmObservationConstellation setProcedure(Nillable<AbstractFeature> procedu * * @return the observableProperty */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AbstractPhenomenon getObservableProperty() { return observableProperty; } @@ -215,6 +223,7 @@ public AbstractPhenomenon getObservableProperty() { * * @return this */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OmObservationConstellation setObservableProperty(AbstractPhenomenon observableProperty) { this.observableProperty = observableProperty; return this; @@ -230,7 +239,7 @@ public String getObservablePropertyIdentifier() { * @return the offering */ public Set<String> getOfferings() { - return offerings; + return Collections.unmodifiableSet(offerings); } /** @@ -241,24 +250,18 @@ public Set<String> getOfferings() { * * @return this */ - public OmObservationConstellation setOfferings(Set<String> offerings) { - this.offerings = offerings; - return this; - } - - public OmObservationConstellation setOfferings(List<String> offerings) { - if (this.offerings == null) { - this.offerings = new HashSet<>(offerings.size()); + public OmObservationConstellation setOfferings(Collection<String> offerings) { + this.offerings.clear(); + if (offerings != null) { + this.offerings.addAll(offerings); } - this.offerings.addAll(offerings); return this; } public OmObservationConstellation addOffering(String offering) { - if (offerings == null) { - offerings = new HashSet<>(1); + if (offering != null) { + this.offerings.add(offering); } - offerings.add(offering); return this; } @@ -333,6 +336,7 @@ public OmObservationConstellation setObservationType(String observationType) { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public ParameterHolder getParameterHolder() { return parameterHolder; } @@ -418,8 +422,9 @@ public DefaultPointMetadata getDefaultPointMetadata() { return defaultPointMetadata; } - public void setDefaultPointMetadata(DefaultPointMetadata defaultPointMetadata) { + public OmObservationConstellation setDefaultPointMetadata(DefaultPointMetadata defaultPointMetadata) { this.defaultPointMetadata = defaultPointMetadata; + return this; } public boolean isSetMetadata() { @@ -430,12 +435,14 @@ public Metadata getMetadata() { return metadata; } - public void setMetadata(Metadata metadata) { + public OmObservationConstellation setMetadata(Metadata metadata) { this.metadata = metadata; + return this; } - public void setParameter(Collection<NamedValue<?>> parameter) { + public OmObservationConstellation setParameter(Collection<NamedValue<?>> parameter) { this.getParameterHolder().addParameter(parameter); + return this; } @Override diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/PointValuePair.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/PointValuePair.java index 22e1630a2..c547da82f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/PointValuePair.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/PointValuePair.java @@ -22,6 +22,8 @@ import org.n52.shetland.ogc.om.values.Value; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.locationtech.jts.geom.Point; public class PointValuePair implements Comparable<PointValuePair> { @@ -43,6 +45,7 @@ public class PointValuePair implements Comparable<PointValuePair> { * @param value * Point value pair value */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public PointValuePair(Point point, Value<?> value) { this.point = point; this.value = value; @@ -53,6 +56,7 @@ public PointValuePair(Point point, Value<?> value) { * * @return Point value pair point */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Point getPoint() { return point; } @@ -62,6 +66,7 @@ public Point getPoint() { * * @return Point value pair value */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Value<?> getValue() { return value; } @@ -72,6 +77,7 @@ public Value<?> getValue() { * @param point * Point value pair point to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setPoint(Point point) { this.point = point; } @@ -82,6 +88,7 @@ public void setPoint(Point point) { * @param value * Point value pair value to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setValue(Value<?> value) { this.value = value; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/SingleObservationValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/SingleObservationValue.java index fc054e5ee..04af791d4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/SingleObservationValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/SingleObservationValue.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.ogc.om; +import java.util.Collection; +import java.util.Collections; import java.util.Set; import org.n52.shetland.ogc.gml.time.Time; @@ -24,6 +26,8 @@ import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class representing a single value observation value * @@ -61,6 +65,7 @@ public SingleObservationValue() { * @param value * Measurement value */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SingleObservationValue(Value<T> value) { this.value = value; } @@ -75,6 +80,7 @@ public SingleObservationValue(Value<T> value) { * @param qualityList * Measurment quality */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SingleObservationValue(Time phenomenonTime, Value<T> value, Set<OmResultQuality> qualityList) { this.phenomenonTime = phenomenonTime; this.value = value; @@ -89,27 +95,32 @@ public SingleObservationValue(Time phenomenonTime, Value<T> value, Set<OmResultQ * @param value * Measurement value */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SingleObservationValue(Time phenomenonTime, Value<T> value) { this.phenomenonTime = phenomenonTime; this.value = value; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getPhenomenonTime() { return phenomenonTime; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setPhenomenonTime(Time phenomenonTime) { this.phenomenonTime = phenomenonTime; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Value<T> getValue() { return value; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setValue(Value<T> value) { this.value = value; } @@ -120,18 +131,26 @@ public void setValue(Value<T> value) { * @param qualityList * Measurement quality to set */ - public SingleObservationValue<T> setQualityList(Set<OmResultQuality> qualityList) { - this.qualityList = qualityList; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SingleObservationValue<T> setQualityList(Collection<OmResultQuality> qualityList) { + this.qualityList.clear(); + if (qualityList != null) { + this.qualityList.addAll(qualityList); + } return this; } - public SingleObservationValue<T> addQualityList(Set<OmResultQuality> qualityList) { - this.qualityList.addAll(qualityList); + public SingleObservationValue<T> addQualityList(Collection<OmResultQuality> qualityList) { + if (qualityList != null) { + this.qualityList.addAll(qualityList); + } return this; } public SingleObservationValue<T> addQuality(OmResultQuality qualityList) { - this.qualityList.add(qualityList); + if (qualityList != null) { + this.qualityList.add(qualityList); + } return this; } @@ -141,7 +160,7 @@ public SingleObservationValue<T> addQuality(OmResultQuality qualityList) { * @return Measurement quality */ public Set<OmResultQuality> getQualityList() { - return qualityList; + return Collections.unmodifiableSet(qualityList); } public boolean isSetQualityList() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/StreamingValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/StreamingValue.java index 2a2e2ff45..613b0f2bc 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/StreamingValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/StreamingValue.java @@ -98,6 +98,7 @@ public void setGeometryTransformer(GeometryTransformer geometryTransformer) { * @param observationTemplate * Observation template to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setObservationTemplate(OmObservation observationTemplate) { this.observationTemplate = observationTemplate; } @@ -105,17 +106,20 @@ public void setObservationTemplate(OmObservation observationTemplate) { /** * @return the observationTemplate */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OmObservation getObservationTemplate() { return observationTemplate; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getPhenomenonTime() { isSetPhenomenonTime(); return phenomenonTime; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setPhenomenonTime(Time phenomenonTime) { this.phenomenonTime = phenomenonTime; } @@ -195,10 +199,12 @@ public boolean isSetUnit() { return unit != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public TimeInstant getResultTime() { return resultTime; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) protected void setResultTime(TimeInstant resultTime) { this.resultTime = resultTime; } @@ -207,10 +213,12 @@ public boolean isSetResultTime() { return getResultTime() != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getValidTime() { return validTime; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) protected void setValidTime(Time validTime) { this.validTime = validTime; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeLocationValueTriple.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeLocationValueTriple.java index 9f0a9cf0e..a002bca24 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeLocationValueTriple.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeLocationValueTriple.java @@ -23,6 +23,8 @@ import org.n52.shetland.ogc.gml.time.Time; import org.n52.shetland.ogc.om.values.Value; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.locationtech.jts.geom.Geometry; /** @@ -39,6 +41,7 @@ public class TimeLocationValueTriple extends TimeValuePair { */ private Geometry location; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TimeLocationValueTriple(Time time, Value<?> value, Geometry location) { super(time, value); this.location = location; @@ -47,6 +50,7 @@ public TimeLocationValueTriple(Time time, Value<?> value, Geometry location) { /** * @return the location */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Geometry getLocation() { return location; } @@ -55,6 +59,7 @@ public Geometry getLocation() { * @param location * the location to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setLocation(Geometry location) { this.location = location; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeValuePair.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeValuePair.java index 8eb022a3f..8863623ec 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeValuePair.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeValuePair.java @@ -20,6 +20,8 @@ import org.n52.shetland.ogc.gml.time.Time; import org.n52.shetland.ogc.om.values.Value; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class representing a time value pair * @@ -46,6 +48,7 @@ public class TimeValuePair implements Comparable<TimeValuePair> { * @param value * Time value pair value */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TimeValuePair(Time time, Value<?> value) { this.time = time; this.value = value; @@ -56,6 +59,7 @@ public TimeValuePair(Time time, Value<?> value) { * * @return Time value pair time */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getTime() { return time; } @@ -65,6 +69,7 @@ public Time getTime() { * * @return Time value pair value */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Value<?> getValue() { return value; } @@ -75,6 +80,7 @@ public Value<?> getValue() { * @param time * Time value pair time to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setTime(Time time) { this.time = time; } @@ -85,6 +91,7 @@ public void setTime(Time time) { * @param value * Time value pair value to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setValue(Value<?> value) { this.value = value; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/AbstractSamplingFeature.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/AbstractSamplingFeature.java index 39f6461de..d6afdbd77 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/AbstractSamplingFeature.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/AbstractSamplingFeature.java @@ -33,10 +33,12 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.locationtech.jts.geom.Geometry; -public abstract class AbstractSamplingFeature - extends AbstractFeature +public abstract class AbstractSamplingFeature extends AbstractFeature implements FeatureWithGeometry, FeatureWithFeatureType, FeatureWithUrl, FeatureWithEncode { /** @@ -72,7 +74,7 @@ public abstract class AbstractSamplingFeature /** * Related sampling features */ - private Collection<SamplingFeatureComplex> relatedSamplingFeatures; + private Collection<SamplingFeatureComplex> relatedSamplingFeatures = new LinkedList<>(); /** * constructor @@ -113,11 +115,13 @@ public String getGmlId() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Geometry getGeometry() { return geometry; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setGeometry(final Geometry geometry) throws InvalidSridException { if (geometry != null && geometry.getSRID() == 0) { throw new InvalidSridException(0); @@ -150,9 +154,14 @@ public void setUrl(final String url) { * * @param sampledFeatures * Sampled fearure list + * @return */ - public void setSampledFeatures(final List<AbstractFeature> sampledFeatures) { - this.sampledFeatures.addAll(sampledFeatures); + public AbstractSamplingFeature setSampledFeatures(final List<AbstractFeature> sampledFeatures) { + this.sampledFeatures.clear(); + if (sampledFeatures != null) { + this.sampledFeatures.addAll(sampledFeatures); + } + return this; } /** @@ -181,9 +190,13 @@ public boolean isSetSampledFeatures() { * * @param namedValue * Parameter ro add + * @return */ - public void addParameter(final NamedValue<?> namedValue) { - parameters.add(namedValue); + public AbstractSamplingFeature addParameter(final NamedValue<?> namedValue) { + if (namedValue != null) { + this.parameters.add(namedValue); + } + return this; } /** @@ -191,9 +204,14 @@ public void addParameter(final NamedValue<?> namedValue) { * * @param parameters * Parameters to add + * @return */ - public void setParameters(final Collection<NamedValue<?>> parameters) { - this.parameters.addAll(parameters); + public AbstractSamplingFeature setParameters(final Collection<NamedValue<?>> parameters) { + this.parameters.clear(); + if (parameters != null) { + this.parameters.addAll(parameters); + } + return this; } /** @@ -202,7 +220,7 @@ public void setParameters(final Collection<NamedValue<?>> parameters) { * @return Parameter list */ public List<NamedValue<?>> getParameters() { - return parameters; + return Collections.unmodifiableList(parameters); } @Override @@ -220,9 +238,11 @@ public boolean isEncode() { * * @param encode * Encoding indicator + * @return */ - public void setEncode(final boolean encode) { + public AbstractSamplingFeature setEncode(final boolean encode) { this.encode = encode; + return this; } /** @@ -230,14 +250,13 @@ public void setEncode(final boolean encode) { * * @param relatedSamplingFeature * Related sampling feature to add + * @return */ - public void addRelatedSamplingFeature(final SamplingFeatureComplex relatedSamplingFeature) { - if (!isSetRelatedSamplingFeatures()) { - relatedSamplingFeatures = Sets.newHashSet(); - } + public AbstractSamplingFeature addRelatedSamplingFeature(final SamplingFeatureComplex relatedSamplingFeature) { if (relatedSamplingFeature != null) { - relatedSamplingFeatures.add(relatedSamplingFeature); + this.relatedSamplingFeatures.add(relatedSamplingFeature); } + return this; } /** @@ -245,13 +264,14 @@ public void addRelatedSamplingFeature(final SamplingFeatureComplex relatedSampli * * @param relatedSamplingFeatures * Related sampling features to add + * @return */ - public void addAllRelatedSamplingFeatures(final Collection<SamplingFeatureComplex> relatedSamplingFeatures) { - if (isSetRelatedSamplingFeatures()) { + public AbstractSamplingFeature addAllRelatedSamplingFeatures( + final Collection<SamplingFeatureComplex> relatedSamplingFeatures) { + if (relatedSamplingFeatures != null) { this.relatedSamplingFeatures.addAll(relatedSamplingFeatures); - } else { - this.relatedSamplingFeatures = relatedSamplingFeatures; } + return this; } /** @@ -259,9 +279,16 @@ public void addAllRelatedSamplingFeatures(final Collection<SamplingFeatureComple * * @param relatedSamplingFeatures * Related sampling features to set + * @return */ - public void setRelatedSamplingFeatures(final Collection<SamplingFeatureComplex> relatedSamplingFeatures) { - this.relatedSamplingFeatures = relatedSamplingFeatures; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractSamplingFeature setRelatedSamplingFeatures( + final Collection<SamplingFeatureComplex> relatedSamplingFeatures) { + this.relatedSamplingFeatures.clear(); + if (relatedSamplingFeatures != null) { + this.relatedSamplingFeatures.addAll(relatedSamplingFeatures); + } + return this; } /** @@ -285,8 +312,7 @@ public boolean isSetRelatedSamplingFeatures() { @Override public String toString() { - return String.format( - "AbstractSamplingFeature [name=%s, description=%s, xmlDescription=%s, geometry=%s, " + return String.format("AbstractSamplingFeature [name=%s, description=%s, xmlDescription=%s, geometry=%s, " + "featureType=%s, url=%s, sampledFeatures=%s, parameters=%s, encode=%b, relatedSamplingFeatures=%s]", getName(), getDescription(), getXml(), getGeometry(), getFeatureType(), getUrl(), getSampledFeatures(), getParameters(), isEncode(), getRelatedSamplingFeatures()); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureComplex.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureComplex.java index 341074eaa..958e9ce28 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureComplex.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureComplex.java @@ -17,6 +17,8 @@ import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Implementation for sam:SamplingFeatureComplex * @@ -48,6 +50,7 @@ public class SamplingFeatureComplex { * If {@link #relatedSamplingFeatureRole} is null or empty * and {@link #relatedSamplingFeature} is null or empty */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SamplingFeatureComplex( final String relatedSamplingFeatureRole, final SamplingFeature relatedSamplingFeature) { if (Strings.isNullOrEmpty(relatedSamplingFeatureRole)) { @@ -75,6 +78,7 @@ public String getRelatedSamplingFeatureRole() { * * @return Related sampling feature */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SamplingFeature getRelatedSamplingFeature() { return relatedSamplingFeature; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SfSpecimen.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SfSpecimen.java index 2b5c3395b..b88f8350d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SfSpecimen.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SfSpecimen.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.ogc.om.features.samplingFeatures; +import java.util.Collection; +import java.util.Collections; import java.util.List; import org.n52.shetland.ogc.gml.CodeWithAuthority; @@ -26,10 +28,12 @@ import org.n52.shetland.w3c.xlink.Referenceable; import com.google.common.collect.Lists; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.locationtech.jts.geom.Geometry; -public class SfSpecimen - extends SamplingFeature { +public class SfSpecimen extends SamplingFeature { /* * 1..1 @@ -88,13 +92,15 @@ public ReferenceType getMaterialClass() { * @param materialClass * the materialClass to set */ - public void setMaterialClass(ReferenceType materialClass) { + public SfSpecimen setMaterialClass(ReferenceType materialClass) { this.materialClass = materialClass; + return this; } /** * @return the samplingTime */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getSamplingTime() { return samplingTime; } @@ -103,8 +109,10 @@ public Time getSamplingTime() { * @param samplingTime * the samplingTime to set */ - public void setSamplingTime(Time samplingTime) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SfSpecimen setSamplingTime(Time samplingTime) { this.samplingTime = samplingTime; + return this; } /** @@ -118,16 +126,18 @@ public Referenceable<SfProcess> getSamplingMethod() { * @param samplingMethod * the samplingMethod to set */ - public void setSamplingMethod(SfProcess samplingMethod) { + public SfSpecimen setSamplingMethod(SfProcess samplingMethod) { this.samplingMethod = Referenceable.of(samplingMethod); + return this; } /** * @param samplingMethod * the samplingMethod to set */ - public void setSamplingMethod(Referenceable<SfProcess> samplingMethod) { + public SfSpecimen setSamplingMethod(Referenceable<SfProcess> samplingMethod) { this.samplingMethod = samplingMethod; + return this; } public boolean isSetSamplingMethod() { @@ -147,8 +157,9 @@ public Geometry getSamplingLocation() { * @throws InvalidSridException * If the SRID is invalid */ - public void setSamplingLocation(Geometry samplingLocation) throws InvalidSridException { + public SfSpecimen setSamplingLocation(Geometry samplingLocation) throws InvalidSridException { setGeometry(samplingLocation); + return this; } public boolean isSetSamplingLocation() { @@ -159,24 +170,34 @@ public boolean isSetSamplingLocation() { * @return the processingDetails */ public List<PreparationStep> getProcessingDetails() { - return processingDetails; + return Collections.unmodifiableList(processingDetails); } /** * @param processingDetails * the processingDetails to set + * @return */ - public void setProcessingDetails(List<PreparationStep> processingDetails) { + public SfSpecimen setProcessingDetails(Collection<PreparationStep> processingDetails) { this.processingDetails.clear(); - this.processingDetails.addAll(processingDetails); + if (processingDetails != null) { + this.processingDetails.addAll(processingDetails); + } + return this; } - public void addProcessingDetails(PreparationStep processingDetails) { - this.processingDetails.add(processingDetails); + public SfSpecimen addProcessingDetails(PreparationStep processingDetails) { + if (processingDetails != null) { + this.processingDetails.add(processingDetails); + } + return this; } - public void addProcessingDetails(List<PreparationStep> processingDetails) { - this.processingDetails.addAll(processingDetails); + public SfSpecimen addProcessingDetails(Collection<PreparationStep> processingDetails) { + if (processingDetails != null) { + this.processingDetails.addAll(processingDetails); + } + return this; } public boolean isSetProcessingDetails() { @@ -186,6 +207,7 @@ public boolean isSetProcessingDetails() { /** * @return the size */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public QuantityValue getSize() { return size; } @@ -194,8 +216,10 @@ public QuantityValue getSize() { * @param size * the size to set */ - public void setSize(QuantityValue size) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SfSpecimen setSize(QuantityValue size) { this.size = size; + return this; } public boolean isSetSize() { @@ -213,8 +237,9 @@ public Referenceable<SpecLocation> getCurrentLocation() { * @param currentLocation * the currentLocation to set */ - public void setCurrentLocation(Referenceable<SpecLocation> currentLocation) { + public SfSpecimen setCurrentLocation(Referenceable<SpecLocation> currentLocation) { this.currentLocation = currentLocation; + return this; } public boolean isSetCurrentLocation() { @@ -231,9 +256,11 @@ public ReferenceType getSpecimenType() { /** * @param specimenType * the specimenType to set + * @return */ - public void setSpecimenType(ReferenceType specimenType) { + public SfSpecimen setSpecimenType(ReferenceType specimenType) { this.specimenType = specimenType; + return this; } public boolean isSetSpecimenType() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/AbstractMonitoringFeature.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/AbstractMonitoringFeature.java index 5ae0c0ea7..1f6afbcdb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/AbstractMonitoringFeature.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/AbstractMonitoringFeature.java @@ -16,6 +16,8 @@ package org.n52.shetland.ogc.om.series; import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.List; import org.n52.shetland.iso.gmd.CiResponsibleParty; @@ -48,13 +50,14 @@ public AbstractMonitoringFeature(CodeWithAuthority identifier, String gmlId) { * @return the relatedParty */ public List<Referenceable<CiResponsibleParty>> getRelatedParty() { - return relatedParty; + return Collections.unmodifiableList(relatedParty); } /** - * @param relatedParty the relatedParty to set + * @param relatedParty + * the relatedParty to set */ - public AbstractMonitoringFeature setRelatedParty(List<Referenceable<CiResponsibleParty>> relatedParty) { + public AbstractMonitoringFeature setRelatedParty(Collection<Referenceable<CiResponsibleParty>> relatedParty) { this.relatedParty.clear(); if (relatedParty != null) { this.relatedParty.addAll(relatedParty); @@ -63,9 +66,10 @@ public AbstractMonitoringFeature setRelatedParty(List<Referenceable<CiResponsibl } /** - * @param relatedParty the relatedParty to add + * @param relatedParty + * the relatedParty to add */ - public AbstractMonitoringFeature addRelatedParty(List<Referenceable<CiResponsibleParty>> relatedParty) { + public AbstractMonitoringFeature addRelatedParty(Collection<Referenceable<CiResponsibleParty>> relatedParty) { if (relatedParty != null) { this.relatedParty.addAll(relatedParty); } @@ -73,7 +77,8 @@ public AbstractMonitoringFeature addRelatedParty(List<Referenceable<CiResponsibl } /** - * @param relatedParty the relatedParty to add + * @param relatedParty + * the relatedParty to add */ public AbstractMonitoringFeature addRelatedParty(Referenceable<CiResponsibleParty> relatedParty) { if (relatedParty != null) { @@ -90,13 +95,14 @@ public boolean hasRelatedParty() { * @return the monitoringType */ public List<ReferenceType> getMonitoringType() { - return monitoringType; + return Collections.unmodifiableList(monitoringType); } /** - * @param monitoringType the monitoringType to set + * @param monitoringType + * the monitoringType to set */ - public AbstractMonitoringFeature setMonitoringType(List<ReferenceType> monitoringType) { + public AbstractMonitoringFeature setMonitoringType(Collection<ReferenceType> monitoringType) { this.monitoringType.clear(); if (monitoringType != null) { this.monitoringType.addAll(monitoringType); @@ -105,9 +111,10 @@ public AbstractMonitoringFeature setMonitoringType(List<ReferenceType> monitorin } /** - * @param monitoringType the monitoringType to add + * @param monitoringType + * the monitoringType to add */ - public AbstractMonitoringFeature addMonitoringType(List<ReferenceType> monitoringType) { + public AbstractMonitoringFeature addMonitoringType(Collection<ReferenceType> monitoringType) { if (monitoringType != null) { this.monitoringType.addAll(monitoringType); } @@ -115,7 +122,8 @@ public AbstractMonitoringFeature addMonitoringType(List<ReferenceType> monitorin } /** - * @param monitoringType the monitoringType to add + * @param monitoringType + * the monitoringType to add */ public AbstractMonitoringFeature addMonitoringType(ReferenceType monitoringType) { if (monitoringType != null) { @@ -132,13 +140,14 @@ public boolean hasMonitoringType() { * @return the descriptionReference */ public List<ReferenceType> getDescriptionReference() { - return descriptionReference; + return Collections.unmodifiableList(descriptionReference); } /** - * @param descriptionReference the descriptionReference to set + * @param descriptionReference + * the descriptionReference to set */ - public AbstractMonitoringFeature setDescriptionReference(List<ReferenceType> descriptionReference) { + public AbstractMonitoringFeature setDescriptionReference(Collection<ReferenceType> descriptionReference) { this.descriptionReference.clear(); if (descriptionReference != null) { this.descriptionReference.addAll(descriptionReference); @@ -147,9 +156,10 @@ public AbstractMonitoringFeature setDescriptionReference(List<ReferenceType> des } /** - * @param descriptionReference the descriptionReference to add + * @param descriptionReference + * the descriptionReference to add */ - public AbstractMonitoringFeature addDescriptionReference(List<ReferenceType> descriptionReference) { + public AbstractMonitoringFeature addDescriptionReference(Collection<ReferenceType> descriptionReference) { this.descriptionReference.clear(); if (descriptionReference != null) { this.descriptionReference.addAll(descriptionReference); @@ -158,7 +168,8 @@ public AbstractMonitoringFeature addDescriptionReference(List<ReferenceType> des } /** - * @param descriptionReference the descriptionReference to add + * @param descriptionReference + * the descriptionReference to add */ public AbstractMonitoringFeature addDescriptionReference(ReferenceType descriptionReference) { if (descriptionReference != null) { @@ -175,13 +186,14 @@ public boolean hasDescriptionReference() { * @return the verticalDatum */ public List<Referenceable<VerticalDatum>> getVerticalDatum() { - return verticalDatum; + return Collections.unmodifiableList(verticalDatum); } /** - * @param verticalDatum the verticalDatum to set + * @param verticalDatum + * the verticalDatum to set */ - public AbstractMonitoringFeature setVerticalDatum(List<Referenceable<VerticalDatum>> verticalDatum) { + public AbstractMonitoringFeature setVerticalDatum(Collection<Referenceable<VerticalDatum>> verticalDatum) { this.verticalDatum.clear(); if (verticalDatum != null) { this.verticalDatum.addAll(verticalDatum); @@ -190,9 +202,10 @@ public AbstractMonitoringFeature setVerticalDatum(List<Referenceable<VerticalDat } /** - * @param verticalDatum the verticalDatum to add + * @param verticalDatum + * the verticalDatum to add */ - public AbstractMonitoringFeature addVerticalDatum(List<Referenceable<VerticalDatum>> verticalDatum) { + public AbstractMonitoringFeature addVerticalDatum(Collection<Referenceable<VerticalDatum>> verticalDatum) { if (verticalDatum != null) { this.verticalDatum.addAll(verticalDatum); } @@ -200,7 +213,8 @@ public AbstractMonitoringFeature addVerticalDatum(List<Referenceable<VerticalDat } /** - * @param verticalDatum the verticalDatum to add + * @param verticalDatum + * the verticalDatum to add */ public AbstractMonitoringFeature addVerticalDatum(Referenceable<VerticalDatum> verticalDatum) { if (verticalDatum != null) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/AbstractObservationProcess.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/AbstractObservationProcess.java index cd2a44aee..5cd1fca18 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/AbstractObservationProcess.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/AbstractObservationProcess.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.n52.shetland.ogc.gml.AbstractFeature; @@ -24,31 +25,30 @@ import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.om.NamedValue; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * */ public abstract class AbstractObservationProcess extends AbstractFeature { /* - * Multiplicity: 1 A defintion of the type of process used in the - * observation. This may be a Sensor, ManualMethod, Algorithm or Simulation - * (including models). + * Multiplicity: 1 A defintion of the type of process used in the observation. This may be a Sensor, + * ManualMethod, Algorithm or Simulation (including models). */ private ReferenceType processType; /* - * Multiplicity: 0..1 A reference to the original source of the data. For - * example, if this is a post-processed time series (and processType is - * algorithm), this link would specify the original process that generated - * the data, e.g. the sensor. This allows the origin of the data to be - * maintained regardless of the processing that has occured to it. + * Multiplicity: 0..1 A reference to the original source of the data. For example, if this is a + * post-processed time series (and processType is algorithm), this link would specify the original process + * that generated the data, e.g. the sensor. This allows the origin of the data to be maintained + * regardless of the processing that has occured to it. */ private ReferenceType originatingProcess; /* - * Multiplicity: 0..1 If the process involves temporal aggregation of a - * result set, the time duration over which data has been aggregated should - * be expressed here. E.g. hourly, daily aggregates. + * Multiplicity: 0..1 If the process involves temporal aggregation of a result set, the time duration over + * which data has been aggregated should be expressed here. E.g. hourly, daily aggregates. */ private String aggregationDuration; @@ -58,29 +58,25 @@ public abstract class AbstractObservationProcess extends AbstractFeature { private ReferenceType processReference; /* - * Multiplicity: 0..1 Specifies the datum that is used as the zero point for - * level measurements. This can be process-specific as opposed the gauge at - * the actual monitoring point. + * Multiplicity: 0..1 Specifies the datum that is used as the zero point for level measurements. This can + * be process-specific as opposed the gauge at the actual monitoring point. */ private ReferenceType verticalDatum; /* - * Multiplicity: 0..* A list of the inputs used in the process. This may be - * a list of references to the data sets used (e.g. model input series) or a - * input array to an algorithm. + * Multiplicity: 0..* A list of the inputs used in the process. This may be a list of references to the + * data sets used (e.g. model input series) or a input array to an algorithm. */ private final List<ReferenceType> inputs = new ArrayList<>(0); /* - * Multiplicity: 0..* Comments specific to the process from the operator or - * system performing the process. + * Multiplicity: 0..* Comments specific to the process from the operator or system performing the process. */ private List<String> comments = new ArrayList<>(0); /* - * Multiplicity: 0..* A defintion of the type of process used in the - * observation. This may be a Sensor, ManualMethod, Algorithm or Simulation - * (including models). + * Multiplicity: 0..* A defintion of the type of process used in the observation. This may be a Sensor, + * ManualMethod, Algorithm or Simulation (including models). */ private final List<NamedValue<?>> parameters = new ArrayList<>(0); @@ -152,44 +148,60 @@ public AbstractObservationProcess setVerticalDatum(final ReferenceType verticalD } public List<ReferenceType> getInputs() { - return inputs; + return Collections.unmodifiableList(inputs); } - public AbstractObservationProcess setInputs(final List<ReferenceType> input) { - inputs.addAll(input); + public AbstractObservationProcess setInputs(final Collection<ReferenceType> input) { + this.inputs.clear(); + if (input != null) { + inputs.addAll(input); + } return this; } public AbstractObservationProcess addInputs(final ReferenceType input) { - inputs.add(input); + if (input != null) { + inputs.add(input); + } return this; } public List<String> getComments() { - return comments; + return Collections.unmodifiableList(comments); } - public AbstractObservationProcess setComments(final List<String> comments) { - this.comments = comments; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractObservationProcess setComments(final Collection<String> comments) { + this.comments.clear(); + if (comments != null) { + this.comments.addAll(comments); + } return this; } public AbstractObservationProcess addComment(final String comment) { - comments.add(comment); + if (comment != null) { + comments.add(comment); + } return this; } public List<NamedValue<?>> getParameters() { - return parameters; + return Collections.unmodifiableList(parameters); } public AbstractObservationProcess setParameters(final Collection<NamedValue<?>> parameters) { - this.parameters.addAll(parameters); + this.parameters.clear(); + if (parameters != null) { + this.parameters.addAll(parameters); + } return this; } public AbstractObservationProcess addParameter(final NamedValue<?> parameter) { - parameters.add(parameter); + if (parameter != null) { + parameters.add(parameter); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/AbstractPofileTrajectoryElement.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/AbstractPofileTrajectoryElement.java index 57a607b59..15bd57056 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/AbstractPofileTrajectoryElement.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/AbstractPofileTrajectoryElement.java @@ -15,40 +15,42 @@ */ package org.n52.shetland.ogc.om.values; +import java.util.Collection; +import java.util.Collections; import java.util.List; import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.gml.time.Time; import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public abstract class AbstractPofileTrajectoryElement<T> { private List<Value<?>> value = Lists.newArrayList(); private Geometry location; private Time phenomenonTime; - public AbstractPofileTrajectoryElement() { this(null, null, null); } - - public AbstractPofileTrajectoryElement(List<Value<?>> value) { + public AbstractPofileTrajectoryElement(Collection<Value<?>> value) { this(null, null, value); } - public AbstractPofileTrajectoryElement(Time phenomenonTime, Geometry location, List<Value<?>> values) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractPofileTrajectoryElement(Time phenomenonTime, Geometry location, Collection<Value<?>> values) { setPhenomenonTime(phenomenonTime); setLocation(location); setValue(values); } - /** * @return the value */ public List<Value<?>> getValue() { - return value; + return Collections.unmodifiableList(value); } /** @@ -56,7 +58,7 @@ public List<Value<?>> getValue() { * the value to set * @return {@code this} */ - public T setValue(List<Value<?>> value) { + public T setValue(Collection<Value<?>> value) { this.value.clear(); if (value != null) { this.value.addAll(value); @@ -90,6 +92,7 @@ public Value<?> getSimpleValue() { /** * @return the location */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Geometry getLocation() { return location; } @@ -99,6 +102,7 @@ public Geometry getLocation() { * the location to set * @return {@code this} */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public T setLocation(Geometry location) { this.location = location; return (T) this; @@ -111,6 +115,7 @@ public boolean isSetLocation() { /** * @return the phenomenonTime */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getPhenomenonTime() { return phenomenonTime; } @@ -119,6 +124,7 @@ public Time getPhenomenonTime() { * @param phenomenonTime * the phenomenonTime to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setPhenomenonTime(Time phenomenonTime) { this.phenomenonTime = phenomenonTime; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ComplexValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ComplexValue.java index fc2af53f3..e3ca2a957 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ComplexValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ComplexValue.java @@ -23,6 +23,8 @@ import com.google.common.base.MoreObjects; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class ComplexValue implements Value<SweAbstractDataRecord> { private SweAbstractDataRecord value; @@ -32,17 +34,20 @@ public ComplexValue() { this(null); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ComplexValue(SweAbstractDataRecord value) { this.value = value; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ComplexValue setValue(SweAbstractDataRecord value) { this.value = value; return this; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractDataRecord getValue() { return this.value; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CvDiscretePointCoverage.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CvDiscretePointCoverage.java index f0de4dead..bbf8cfe6b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CvDiscretePointCoverage.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CvDiscretePointCoverage.java @@ -23,6 +23,8 @@ import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class that represents a CV_DiscretePointCoverage * @@ -89,12 +91,14 @@ public void setRangeType(ReferenceType rangeType) { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public CvDiscretePointCoverage setValue(PointValuePair value) { this.value = value; return this; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public PointValuePair getValue() { return value; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/MultiPointCoverage.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/MultiPointCoverage.java index 960762d32..a70d23c97 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/MultiPointCoverage.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/MultiPointCoverage.java @@ -18,6 +18,7 @@ import static java.util.stream.Collectors.toList; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -42,8 +43,7 @@ * @since 1.0.0 * */ -public class MultiPointCoverage - implements DiscreteCoverage<List<PointValuePair>> { +public class MultiPointCoverage implements DiscreteCoverage<List<PointValuePair>> { private static final String GML_ID_PREFIX = "mpc_"; private final String gmlId; @@ -77,7 +77,7 @@ public String getGmlId() { @Override public List<PointValuePair> getValue() { Collections.sort(value); - return value; + return Collections.unmodifiableList(value); } public PointValueLists getPointValue() { @@ -87,7 +87,9 @@ public PointValueLists getPointValue() { @Override public MultiPointCoverage setValue(List<PointValuePair> value) { this.value.clear(); - this.value.addAll(value); + if (value != null) { + this.value.addAll(value); + } return this; } @@ -96,9 +98,13 @@ public MultiPointCoverage setValue(List<PointValuePair> value) { * * @param value * Time value pair value to add + * @return */ - public void addValue(PointValuePair value) { - this.value.add(value); + public MultiPointCoverage addValue(PointValuePair value) { + if (value != null) { + this.value.add(value); + } + return this; } /** @@ -106,9 +112,13 @@ public void addValue(PointValuePair value) { * * @param values * Time value pair values to add + * @return */ - public void addValues(List<PointValuePair> values) { - this.value.addAll(values); + public MultiPointCoverage addValues(Collection<PointValuePair> values) { + if (value != null) { + this.value.addAll(values); + } + return this; } @Override @@ -188,8 +198,7 @@ public boolean isSetRangeParameters() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) - throws E { + public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java index 24f5d00ec..e99c343d4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java @@ -30,6 +30,8 @@ import org.n52.shetland.ogc.swe.SweDataRecord; import org.n52.shetland.ogc.swe.SweField; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Represents the level of a profile * @@ -60,6 +62,7 @@ public ProfileLevel() { * @param value * the values */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ProfileLevel(QuantityValue levelStart, QuantityValue levelEnd, List<Value<?>> value) { super(value); this.levelStart = levelStart; @@ -69,6 +72,7 @@ public ProfileLevel(QuantityValue levelStart, QuantityValue levelEnd, List<Value /** * @return the levelStart */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public QuantityValue getLevelStart() { return levelStart; } @@ -78,6 +82,7 @@ public QuantityValue getLevelStart() { * the levelStart to set * @return {@code this} */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ProfileLevel setLevelStart(QuantityValue levelStart) { this.levelStart = levelStart; return this; @@ -90,6 +95,7 @@ public boolean isSetLevelStart() { /** * @return the levelEnd */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public QuantityValue getLevelEnd() { return levelEnd; } @@ -99,6 +105,7 @@ public QuantityValue getLevelEnd() { * the levelEnd to set * @return {@code this} */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ProfileLevel setLevelEnd(QuantityValue levelEnd) { this.levelEnd = levelEnd; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileValue.java index ec0b1ce72..4b0911621 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileValue.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.om.values; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.SortedSet; @@ -40,6 +41,8 @@ import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Represents the GroundWaterML 2.0 GW_GeologyLogCoverage * @@ -47,9 +50,7 @@ * @since 1.0.0 * */ -public class ProfileValue - extends AbstractFeature - implements Value<List<ProfileLevel>> { +public class ProfileValue extends AbstractFeature implements Value<List<ProfileLevel>> { private QuantityValue fromLevel; private boolean queriedFromLevel; @@ -72,23 +73,29 @@ public ProfileValue(CodeWithAuthority identifier, String gmlId) { @Override public ProfileValue setValue(List<ProfileLevel> value) { this.values.clear(); - this.values.addAll(value); + if (value != null) { + this.values.addAll(value); + } return this; } public ProfileValue addValue(ProfileLevel value) { - this.values.add(value); + if (value != null) { + this.values.add(value); + } return this; } - public ProfileValue addValues(List<ProfileLevel> value) { - this.values.addAll(value); + public ProfileValue addValues(Collection<ProfileLevel> value) { + if (value != null) { + this.values.addAll(value); + } return this; } @Override public List<ProfileLevel> getValue() { - return values; + return Collections.unmodifiableList(values); } @Override @@ -125,6 +132,7 @@ public boolean isSetValue() { /** * @return the fromLevel */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public QuantityValue getFromLevel() { if (!isFromLevel() && !queriedFromLevel) { if (isSetValue()) { @@ -160,6 +168,7 @@ public QuantityValue getFromLevel() { * @param fromLevel * the fromLevel to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ProfileValue setFromLevel(QuantityValue fromLevel) { this.fromLevel = fromLevel; return this; @@ -176,6 +185,7 @@ public boolean isFromLevel() { /** * @return the toLevel */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public QuantityValue getToLevel() { if (!isToLevel() && !queriedToLevel) { if (isSetValue()) { @@ -212,6 +222,7 @@ public QuantityValue getToLevel() { * @param toLevel * the toLevel to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ProfileValue setToLevel(QuantityValue toLevel) { this.toLevel = toLevel; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/SweDataArrayValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/SweDataArrayValue.java index 78552ab39..0b0982209 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/SweDataArrayValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/SweDataArrayValue.java @@ -37,6 +37,8 @@ import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Multi value representing a SweDataArray for observations * @@ -57,17 +59,20 @@ public SweDataArrayValue() { this(null); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweDataArrayValue(SweDataArray value) { this.value = value; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweDataArrayValue setValue(final SweDataArray value) { this.value = value; return this; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweDataArray getValue() { return value; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TLVTValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TLVTValue.java index 18830b268..1e62aef3b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TLVTValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TLVTValue.java @@ -32,8 +32,7 @@ * @since 1.0.0 * */ -public class TLVTValue - implements MultiValue<List<TimeLocationValueTriple>> { +public class TLVTValue implements MultiValue<List<TimeLocationValueTriple>> { /** * Mesurement values @@ -48,14 +47,16 @@ public class TLVTValue @Override public TLVTValue setValue(List<TimeLocationValueTriple> value) { this.value.clear(); - this.value.addAll(value); + if (value != null) { + this.value.addAll(value); + } return this; } @Override public List<TimeLocationValueTriple> getValue() { Collections.sort(value); - return value; + return Collections.unmodifiableList(value); } /** @@ -63,9 +64,13 @@ public List<TimeLocationValueTriple> getValue() { * * @param value * Time value pair value to add + * @return */ - public void addValue(TimeLocationValueTriple value) { - this.value.add(value); + public TLVTValue addValue(TimeLocationValueTriple value) { + if (value != null) { + this.value.add(value); + } + return this; } /** @@ -73,9 +78,13 @@ public void addValue(TimeLocationValueTriple value) { * * @param values * Time value pair values to add + * @return */ - public void addValues(List<TimeLocationValueTriple> values) { - this.value.addAll(values); + public TLVTValue addValues(List<TimeLocationValueTriple> values) { + if (values != null) { + this.value.addAll(values); + } + return this; } @Override diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TVPValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TVPValue.java index d0e68c4c4..82234b6c1 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TVPValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TVPValue.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.om.values; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -32,8 +33,7 @@ * @since 1.0.0 * */ -public class TVPValue - implements MultiValue<List<TimeValuePair>> { +public class TVPValue implements MultiValue<List<TimeValuePair>> { /** * Mesurement values @@ -48,14 +48,16 @@ public class TVPValue @Override public TVPValue setValue(List<TimeValuePair> value) { this.value.clear(); - this.value.addAll(value); + if (value != null) { + this.value.addAll(value); + } return this; } @Override public List<TimeValuePair> getValue() { Collections.sort(value); - return value; + return Collections.unmodifiableList(value); } /** @@ -63,9 +65,13 @@ public List<TimeValuePair> getValue() { * * @param value * Time value pair value to add + * @return */ - public void addValue(TimeValuePair value) { - this.value.add(value); + public TVPValue addValue(TimeValuePair value) { + if (value != null) { + this.value.add(value); + } + return this; } /** @@ -73,9 +79,13 @@ public void addValue(TimeValuePair value) { * * @param values * Time value pair values to add + * @return */ - public void addValues(List<TimeValuePair> values) { - this.value.addAll(values); + public TVPValue addValues(Collection<TimeValuePair> values) { + if (values != null) { + this.value.addAll(values); + } + return this; } @Override diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryValue.java index 630871dc6..c0dcff09a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryValue.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.ogc.om.values; +import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.TreeMap; @@ -53,23 +55,29 @@ public TrajectoryValue(CodeWithAuthority identifier, String gmlId) { @Override public TrajectoryValue setValue(List<TrajectoryElement> value) { this.values.clear(); - this.values.addAll(value); + if (value != null) { + this.values.addAll(value); + } return null; } public TrajectoryValue addValue(TrajectoryElement value) { - this.values.add(value); + if (value != null) { + this.values.add(value); + } return this; } - public TrajectoryValue addValues(List<TrajectoryElement> value) { - this.values.addAll(value); + public TrajectoryValue addValues(Collection<TrajectoryElement> value) { + if (value != null) { + this.values.addAll(value); + } return this; } @Override public List<TrajectoryElement> getValue() { - return values; + return Collections.unmodifiableList(values); } @Override @@ -139,7 +147,7 @@ public Geometry getGeometry() { return null; } - public SweDataRecord asDataRecord() { + public SweDataRecord asDataRecord() { SweDataRecord dataRecord = new SweDataRecord(); if (isSetIdentifier()) { dataRecord.setIdentifier(getIdentifier()); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsAcceptVersions.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsAcceptVersions.java index 8476bf21d..6d6bc5e0b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsAcceptVersions.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsAcceptVersions.java @@ -16,11 +16,11 @@ package org.n52.shetland.ogc.ows; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Objects; - /** * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 1.0.0 @@ -38,30 +38,37 @@ public List<String> getAcceptVersions() { } /** - * @param acceptVersions the acceptVersions to set + * @param acceptVersions + * the acceptVersions to set * @return this */ - public OwsAcceptVersions setAcceptVersions(List<String> acceptVersions) { + public OwsAcceptVersions setAcceptVersions(Collection<String> acceptVersions) { this.acceptVersions.clear(); - this.acceptVersions = Objects.requireNonNull(acceptVersions); + this.acceptVersions.addAll(Objects.requireNonNull(acceptVersions)); return this; } /** - * @param acceptVersions the acceptVersions to add + * @param acceptVersions + * the acceptVersions to add * @return this */ - public OwsAcceptVersions addAcceptVersions(List<String> acceptVersions) { - this.acceptVersions.addAll(acceptVersions); + public OwsAcceptVersions addAcceptVersions(Collection<String> acceptVersions) { + if (acceptVersions != null) { + this.acceptVersions.addAll(acceptVersions); + } return this; } /** - * @param acceptVersion the acceptVersion to add + * @param acceptVersion + * the acceptVersion to add * @return this */ public OwsAcceptVersions addAcceptVersions(String acceptVersion) { - this.acceptVersions.add(acceptVersion); + if (acceptVersion != null) { + this.acceptVersions.add(acceptVersion); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsSections.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsSections.java index 3033dac27..969ee7951 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsSections.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsSections.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.ows; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -36,28 +37,35 @@ public List<String> getSections() { } /** - * @param sections the sections to set + * @param sections + * the sections to set * * @return this */ - public OwsSections setSections(List<String> sections) { + public OwsSections setSections(Collection<String> sections) { this.sections.clear(); - this.sections = sections; + if (sections != null) { + this.sections.addAll(sections); + } return this; } /** - * @param sections the sections to add + * @param sections + * the sections to add * * @return this */ - public OwsSections addSections(List<String> sections) { - this.sections.addAll(sections); + public OwsSections addSections(Collection<String> sections) { + if (sections != null) { + this.sections.addAll(sections); + } return this; } /** - * @param section the section to add + * @param section + * the section to add * * @return this */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/CodedException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/CodedException.java index 25b5d65e5..2c416b221 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/CodedException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/CodedException.java @@ -55,7 +55,7 @@ public final boolean hasMessage() { @Override public final List<CodedException> getExceptions() { - return this.exceptions; + return Collections.unmodifiableList(exceptions); } public final CodedException at(final String locator) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java index 50f4e4451..6eaac18b4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.ows.OWSConstants; import org.n52.shetland.ogc.ows.OwsCapabilities; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Implementation of {@link OwsServiceResponse} for OWS GetCapabilities * operation @@ -41,6 +43,7 @@ public GetCapabilitiesResponse(String service, String version, String operationN super(service, version, operationName); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OwsCapabilities getCapabilities() { return capabilities; } @@ -54,6 +57,7 @@ public OwsCapabilities getCapabilities() { * * @return this */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GetCapabilitiesResponse setCapabilities(OwsCapabilities capabilities) { this.capabilities = capabilities; capabilities.getService().ifPresent(this::setService); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceRequest.java index f082ff867..14865bf94 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceRequest.java @@ -30,6 +30,8 @@ import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Abstract super class for all service request classes * @@ -75,10 +77,12 @@ private void checkServiceAndVersionParameter() } } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OwsServiceRequestContext getRequestContext() { return requestContext; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OwsServiceRequest setRequestContext(OwsServiceRequestContext requestContext) { this.requestContext = requestContext; return this; @@ -89,11 +93,13 @@ public boolean isSetRequestContext() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Extensions getExtensions() { return this.extensions; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OwsServiceRequest setExtensions(Extensions extensions) { this.extensions = Optional.ofNullable(extensions).orElseGet(Extensions::new); return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceResponse.java index 1f7fc6c75..9f41d0807 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceResponse.java @@ -21,6 +21,8 @@ import org.n52.shetland.ogc.ows.HasExtension; import org.n52.shetland.ogc.ows.extension.Extensions; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * abstract super class for all service request classes * @@ -45,6 +47,7 @@ public OwsServiceResponse(String service, String version, String operationName) } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Extensions getExtensions() { return this.extensions; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractComponent.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractComponent.java index 086cd609c..cbf74c4af 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractComponent.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractComponent.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.sensorML.elements.SmlLocation; import org.n52.shetland.ogc.sensorML.elements.SmlPosition; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 * @@ -26,10 +28,12 @@ public class AbstractComponent extends AbstractProcess { private SmlPosition position; private SmlLocation location; + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SmlPosition getPosition() { return position; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractComponent setPosition(final SmlPosition position) { this.position = position; return this; @@ -39,10 +43,12 @@ public boolean isSetPosition() { return position != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SmlLocation getLocation() { return location; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractComponent setLocation(final SmlLocation location) { this.location = location; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractProcess.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractProcess.java index 8d8ff1efe..f66d44faa 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractProcess.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractProcess.java @@ -17,6 +17,8 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.function.Predicate; @@ -30,6 +32,8 @@ import org.n52.shetland.ogc.sensorML.elements.SmlParameter; import org.n52.shetland.ogc.swe.simpleType.SweAbstractUomType; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 * @@ -41,7 +45,7 @@ public class AbstractProcess extends AbstractSensorML { private List<SmlParameter> parameters = new ArrayList<>(0); private List<Time> validTime = new ArrayList<>(0); - public AbstractProcess setDescriptions(List<String> descriptions) { + public AbstractProcess setDescriptions(Collection<String> descriptions) { if (descriptions != null) { if (descriptions.size() == 1) { setDescription(descriptions.iterator().next()); @@ -73,29 +77,42 @@ public AbstractProcess setNames(final List<CodeType> names) { } public List<SmlIo> getInputs() { - return inputs; + return Collections.unmodifiableList(inputs); } - public AbstractProcess setInputs(final List<SmlIo> inputs) { - this.inputs = inputs; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractProcess setInputs(final Collection<SmlIo> inputs) { + this.inputs.clear(); + if (inputs != null) { + this.inputs.addAll(inputs); + } return this; } public List<SmlIo> getOutputs() { - return outputs; + return Collections.unmodifiableList(outputs); } - public AbstractProcess setOutputs(final List<SmlIo> outputs) { - this.outputs = outputs; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractProcess setOutputs(final Collection<SmlIo> outputs) { + this.outputs.clear(); + if (outputs != null) { + this.outputs.addAll(outputs); + } return this; } public List<SmlParameter> getParameters() { - return parameters; + return Collections.unmodifiableList(parameters); } - public void setParameters(List<SmlParameter> smlParameters) { - this.parameters = smlParameters; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractProcess setParameters(Collection<SmlParameter> smlParameters) { + this.parameters.clear(); + if (smlParameters != null) { + this.parameters.addAll(smlParameters); + } + return this; } public boolean isSetInputs() { @@ -111,7 +128,7 @@ public boolean isSetParameters() { } public List<Time> getValidTime() { - return validTime; + return Collections.unmodifiableList(validTime); } public Time getMergedValidTime() { @@ -130,7 +147,7 @@ public AbstractProcess setValidTime(Time validTime) { return this; } - public AbstractProcess setValidTime(List<Time> validTime) { + public AbstractProcess setValidTime(Collection<Time> validTime) { this.validTime.clear(); if (validTime != null) { this.validTime.addAll(validTime); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractSensorML.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractSensorML.java index 595525f44..5f397d1bc 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractSensorML.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractSensorML.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Optional; @@ -41,13 +40,13 @@ import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 * */ -public abstract class AbstractSensorML - extends AbstractFeature - implements PhenomenonNameDescriptionProvider { +public abstract class AbstractSensorML extends AbstractFeature implements PhenomenonNameDescriptionProvider { private List<String> keywords = new ArrayList<>(0); private List<SmlIdentifier> identifications = new ArrayList<>(0); @@ -142,31 +141,33 @@ public CodeType getFirstName() { } public List<String> getKeywords() { - return keywords; + return Collections.unmodifiableList(keywords); } - public AbstractSensorML setKeywords(List<String> keywords) { - this.keywords = keywords; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractSensorML setKeywords(Collection<String> keywords) { + this.keywords.clear(); + if (keywords != null) { + this.keywords.addAll(keywords); + } return this; } - public AbstractSensorML addKeywords(List<String> keywords) { - if (isSetKeywords()) { + public AbstractSensorML addKeywords(Collection<String> keywords) { + if (keywords != null) { this.keywords.addAll(keywords); - } else { - this.keywords = keywords; } return this; } public List<SmlIdentifier> getIdentifications() { - return identifications; + return Collections.unmodifiableList(identifications); } - public AbstractSensorML setIdentifications(final List<SmlIdentifier> identifications) { - if (this.identifications.isEmpty()) { - this.identifications = identifications; - } else { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractSensorML setIdentifications(final Collection<SmlIdentifier> identifications) { + this.identifications.clear(); + if (identifications != null) { this.identifications.addAll(identifications); } return this; @@ -184,17 +185,23 @@ public boolean isIdentificationSet(Predicate<SmlIdentifier> predicate) { } public List<SmlClassifier> getClassifications() { - return classifications; + return Collections.unmodifiableList(classifications); } - public AbstractSensorML setClassifications(final List<SmlClassifier> classifications) { - this.classifications = classifications; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractSensorML setClassifications(final Collection<SmlClassifier> classifications) { + this.classifications.clear(); + if (classifications != null) { + this.classifications.addAll(classifications); + } return this; } - public AbstractSensorML addClassifications(List<SmlClassifier> classifications) { - if (isSetClassifications()) { - this.classifications.addAll(classifications); + public AbstractSensorML addClassifications(Collection<SmlClassifier> classifications) { + if (classifications != null) { + if (isSetClassifications()) { + this.classifications.addAll(classifications); + } } return this; } @@ -208,19 +215,21 @@ public Optional<SmlClassifier> findClassifier(Predicate<SmlClassifier> predicate } public AbstractSensorML addClassification(final SmlClassifier classifier) { - classifications.add(classifier); + if (classifier != null) { + classifications.add(classifier); + } return this; } public List<SmlCharacteristics> getCharacteristics() { - return characteristics; + return Collections.unmodifiableList(characteristics); } - public AbstractSensorML setCharacteristics(final List<SmlCharacteristics> characteristics) { - if (isSetCharacteristics()) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractSensorML setCharacteristics(final Collection<SmlCharacteristics> characteristics) { + this.characteristics.clear(); + if (characteristics != null) { this.characteristics.addAll(characteristics); - } else { - this.characteristics = characteristics; } return this; } @@ -234,15 +243,17 @@ public Optional<SmlCharacteristics> findCharacteristics(Predicate<SmlCharacteris } public AbstractSensorML addCharacteristic(final SmlCharacteristics characteristic) { - characteristics.add(characteristic); + if (characteristic != null) { + characteristics.add(characteristic); + } return this; } public List<SmlCapabilities> getCapabilities() { - return capabilities; + return Collections.unmodifiableList(capabilities); } - public AbstractSensorML addCapabilities(final List<SmlCapabilities> capabilities) { + public AbstractSensorML addCapabilities(final Collection<SmlCapabilities> capabilities) { if (capabilities != null) { this.capabilities.addAll(capabilities); } @@ -261,14 +272,15 @@ public Optional<SmlCapabilities> findCapabilities(Predicate<SmlCapabilities> pre } } - public void removeCapabilities(SmlCapabilities caps) { + public AbstractSensorML removeCapabilities(SmlCapabilities caps) { if (this.capabilities != null) { this.capabilities.remove(caps); } + return this; } public List<SmlContact> getContact() { - return contacts; + return Collections.unmodifiableList(contacts); } /** @@ -286,49 +298,56 @@ public SmlContact getContact(String contactRole) { return null; } - private SmlContact getContact(List<SmlContact> contacts, String contactRole) { - for (SmlContact contact : contacts) { - if (contact instanceof SmlContactList) { - SmlContact cont = getContact(((SmlContactList) contact).getMembers(), contactRole); - if (cont != null) { - return cont; + private SmlContact getContact(Collection<SmlContact> contacts, String contactRole) { + if (contacts != null) { + for (SmlContact contact : contacts) { + if (contact instanceof SmlContactList) { + SmlContact cont = getContact(((SmlContactList) contact).getMembers(), contactRole); + if (cont != null) { + return cont; + } + } else if (contact.getRole() != null && contact.getRole().equals(contactRole) + && contact instanceof SmlResponsibleParty) { + return (SmlResponsibleParty) contact; } - } else if (contact.getRole() != null && contact.getRole().equals(contactRole) - && contact instanceof SmlResponsibleParty) { - return (SmlResponsibleParty) contact; } } return null; } - public AbstractSensorML setContact(List<SmlContact> contacts) { - if (isSetContact()) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractSensorML setContact(Collection<SmlContact> contacts) { + this.contacts.clear(); + if (contacts != null) { this.contacts.addAll(contacts); - } else { - this.contacts = contacts; } return this; } public AbstractSensorML addContact(final SmlContact contact) { - if (this.contacts == null) { - this.contacts = new LinkedList<>(); + if (contact != null) { + this.contacts.add(contact); } - this.contacts.add(contact); return this; } public List<AbstractSmlDocumentation> getDocumentation() { - return documentations; + return Collections.unmodifiableList(documentations); } - public AbstractSensorML setDocumentation(final List<AbstractSmlDocumentation> documentations) { - this.documentations.addAll(documentations); + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractSensorML setDocumentation(final Collection<AbstractSmlDocumentation> documentations) { + this.documentations.clear(); + if (documentations != null) { + this.documentations.addAll(documentations); + } return this; } public AbstractSensorML addDocumentation(final AbstractSmlDocumentation documentation) { - documentations.add(documentation); + if (documentation != null) { + documentations.add(documentation); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessChain.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessChain.java index 759dd79ea..9fa62356b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessChain.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessChain.java @@ -16,11 +16,14 @@ package org.n52.shetland.ogc.sensorML; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.n52.shetland.ogc.sensorML.elements.SmlComponent; import org.n52.shetland.ogc.sensorML.elements.SmlConnection; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class ProcessChain extends AbstractProcess implements HasComponents<ProcessChain>, HasConnections<ProcessChain> { private final List<SmlComponent> components = new ArrayList<>(0); @@ -28,7 +31,7 @@ public class ProcessChain extends AbstractProcess implements HasComponents<Proce @Override public List<SmlComponent> getComponents() { - return components; + return Collections.unmodifiableList(components); } @Override @@ -47,10 +50,12 @@ public ProcessChain addComponent(final SmlComponent component) { return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SmlConnection getConnections() { return connections; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public ProcessChain setConnections(SmlConnection connections) { this.connections = connections; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessModel.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessModel.java index 6f189b2ad..2fc866dc9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessModel.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessModel.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.ogc.sensorML; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 * @@ -23,10 +25,12 @@ public class ProcessModel extends AbstractProcess implements HasProcessMethod { private ProcessMethod method; + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public ProcessMethod getMethod() { return method; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setMethod(final ProcessMethod method) { this.method = method; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SensorML.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SensorML.java index da6277f1c..e9eefcef3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SensorML.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SensorML.java @@ -15,11 +15,15 @@ */ package org.n52.shetland.ogc.sensorML; +import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.UoM; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS internal representation of a sensor description * @@ -46,12 +50,15 @@ public SensorML setVersion(final String version) { } public List<AbstractProcess> getMembers() { - return members; + return Collections.unmodifiableList(members); } - public SensorML setMembers(final List<AbstractProcess> members) { - for (final AbstractProcess member : members) { - addMember(member); + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SensorML setMembers(final Collection<AbstractProcess> members) { + if (members != null) { + for (final AbstractProcess member : members) { + addMember(member); + } } return this; } @@ -68,14 +75,13 @@ public SensorML addMember(final AbstractProcess member) { * @return <tt>true</tt>, if everything from the super class is not set */ private boolean isEmpty() { - //don't check validTime + // don't check validTime return !isSetKeywords() && !isSetIdentifications() && !isSetClassifications() && !isSetCapabilities() && !isSetCharacteristics() && !isSetContact() && !isSetDocumentation() && !isSetHistory(); } /** - * @return <tt>true</tt>, if this instance contains only members and - * everything else is not set + * @return <tt>true</tt>, if this instance contains only members and everything else is not set */ public boolean isWrapper() { return isEmpty() && isSetMembers(); @@ -85,7 +91,6 @@ public boolean isSetMembers() { return !members.isEmpty(); } - @Override public String getObservablePropertyName(String observableProperty) { if (isWrapper()) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlContactList.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlContactList.java index f4d33622f..c53909646 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlContactList.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlContactList.java @@ -15,11 +15,14 @@ */ package org.n52.shetland.ogc.sensorML; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.util.CollectionHelper; -import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * Implementation for sml:ContactList @@ -29,29 +32,29 @@ * @since 1.0.0 */ public class SmlContactList extends SmlContact { - private List<SmlContact> members; + private List<SmlContact> members = new LinkedList<>(); public boolean isSetMembers() { return !CollectionHelper.nullEmptyOrContainsOnlyNulls(members); } - public List<SmlContact> getMembers() { - return members; + return Collections.unmodifiableList(members); } - public void setMembers(List<SmlContact> members) { - if (isSetMembers()) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlContactList setMembers(Collection<SmlContact> members) { + this.members.clear(); + if (CollectionHelper.isNotEmpty(members)) { this.members.addAll(members); - } else { - this.members = members; } + return this; } - public void addMember(SmlContact member) { - if (!isSetMembers()) { - this.members = Lists.newArrayList(); - } + public SmlContactList addMember(SmlContact member) { + if (member != null) { this.members.add(member); + } + return this; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlResponsibleParty.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlResponsibleParty.java index 42c8899a5..cc9401c0c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlResponsibleParty.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlResponsibleParty.java @@ -15,16 +15,19 @@ */ package org.n52.shetland.ogc.sensorML; -import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.util.CollectionHelper; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Implementation for sml:ResponsibleParty * - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ @@ -36,11 +39,11 @@ public class SmlResponsibleParty extends SmlContact { private String positionName; - private List<String> phoneVoice; + private List<String> phoneVoice = new LinkedList<>(); - private List<String> phoneFax; + private List<String> phoneFax = new LinkedList<>(); - private List<String> deliveryPoints; + private List<String> deliveryPoints = new LinkedList<>(); private String city; @@ -52,7 +55,7 @@ public class SmlResponsibleParty extends SmlContact { private String email; - private List<String> onlineResources; + private List<String> onlineResources = new LinkedList<>(); private String hoursOfService; @@ -61,23 +64,24 @@ public class SmlResponsibleParty extends SmlContact { public SmlResponsibleParty() { } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SmlResponsibleParty(final String individualName, final String organizationName, final String positionName, - final List<String> phoneVoice, final List<String> phoneFax, final List<String> deliveryPoint, - final String city, final String administrativeArea, final String postalCode, final String country, - final String email, final List<String> onlineResource, final String hoursOfService, - final String contactInstructions) { + final Collection<String> phoneVoice, final Collection<String> phoneFax, + final Collection<String> deliveryPoint, final String city, final String administrativeArea, + final String postalCode, final String country, final String email, final Collection<String> onlineResource, + final String hoursOfService, final String contactInstructions) { this.individualName = individualName; this.organizationName = organizationName; this.positionName = positionName; - this.phoneVoice = phoneVoice; - this.phoneFax = phoneFax; - this.deliveryPoints = deliveryPoint; + setPhoneVoice(phoneVoice); + setPhoneFax(phoneFax); + setDeliveryPoint(deliveryPoint); this.city = city; this.administrativeArea = administrativeArea; this.postalCode = postalCode; this.country = country; this.email = email; - this.onlineResources = onlineResource; + setOnlineResource(onlineResource); this.hoursOfService = hoursOfService; this.contactInstructions = contactInstructions; } @@ -126,23 +130,22 @@ public boolean isSetPhoneVoice() { } public List<String> getPhoneVoice() { - return phoneVoice; + return Collections.unmodifiableList(phoneVoice); } - public SmlResponsibleParty setPhoneVoice(final List<String> phoneVoice) { - if (isSetPhoneVoice()) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlResponsibleParty setPhoneVoice(final Collection<String> phoneVoice) { + this.phoneVoice.clear(); + if (CollectionHelper.isNotEmpty(phoneVoice)) { this.phoneVoice.addAll(phoneVoice); - } else { - this.phoneVoice = phoneVoice; } return this; } public SmlResponsibleParty addPhoneVoice(final String phoneVoice) { - if (!isSetPhoneVoice()) { - this.phoneVoice = new ArrayList<String>(); + if (phoneVoice != null) { + this.phoneVoice.add(phoneVoice); } - this.phoneVoice.add(phoneVoice); return this; } @@ -151,22 +154,21 @@ public boolean isSetPhoneFax() { } public List<String> getPhoneFax() { - return phoneFax; + return Collections.unmodifiableList(phoneFax); } public SmlResponsibleParty addPhoneFax(final String phoneFax) { - if (!isSetPhoneFax()) { - this.phoneFax = new ArrayList<String>(); + if (phoneFax != null) { + this.phoneFax.add(phoneFax); } - this.phoneFax.add(phoneFax); return this; } - public SmlResponsibleParty setPhoneFax(final List<String> phoneFax) { - if (isSetPhoneFax()) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlResponsibleParty setPhoneFax(final Collection<String> phoneFax) { + this.phoneFax.clear(); + if (CollectionHelper.isNotEmpty(phoneFax)) { this.phoneFax.addAll(phoneFax); - } else { - this.phoneFax = phoneFax; } return this; } @@ -176,23 +178,22 @@ public boolean isSetDeliveryPoint() { } public List<String> getDeliveryPoint() { - return deliveryPoints; + return Collections.unmodifiableList(deliveryPoints); } - public SmlResponsibleParty setDeliveryPoint(final List<String> deliveryPoints) { - if (isSetDeliveryPoint()) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlResponsibleParty setDeliveryPoint(final Collection<String> deliveryPoints) { + this.deliveryPoints.clear(); + if (CollectionHelper.isNotEmpty(deliveryPoints)) { this.deliveryPoints.addAll(deliveryPoints); - } else { - this.deliveryPoints = deliveryPoints; } return this; } public SmlResponsibleParty addDeliveryPoint(final String deliveryPoint) { - if (!isSetDeliveryPoint()) { - deliveryPoints = new ArrayList<String>(); + if (deliveryPoint != null) { + deliveryPoints.add(deliveryPoint); } - deliveryPoints.add(deliveryPoint); return this; } @@ -266,23 +267,22 @@ public boolean isSetOnlineResources() { } public List<String> getOnlineResources() { - return onlineResources; + return Collections.unmodifiableList(onlineResources); } - public SmlResponsibleParty setOnlineResource(final List<String> onlineResources) { - if (isSetOnlineResources()) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlResponsibleParty setOnlineResource(final Collection<String> onlineResources) { + this.onlineResources.clear(); + if (CollectionHelper.isNotEmpty(onlineResources)) { this.onlineResources.addAll(onlineResources); - } else { - this.onlineResources = onlineResources; } return this; } public SmlResponsibleParty addOnlineResource(final String onlineResource) { - if (!isSetOnlineResources()) { - onlineResources = new ArrayList<String>(); + if (onlineResource != null) { + onlineResources.add(onlineResource); } - onlineResources.add(onlineResource); return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/System.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/System.java index 18be32f1a..29e618e92 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/System.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/System.java @@ -16,11 +16,14 @@ package org.n52.shetland.ogc.sensorML; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.n52.shetland.ogc.sensorML.elements.SmlComponent; import org.n52.shetland.ogc.sensorML.elements.SmlConnection; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 * @@ -36,7 +39,7 @@ public class System @Override public List<SmlComponent> getComponents() { - return components; + return Collections.unmodifiableList(components); } @Override @@ -65,10 +68,12 @@ public String getDefaultElementEncoding() { return SensorMLConstants.NS_SML; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SmlConnection getConnections() { return connections; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public System setConnections(SmlConnection connections) { this.connections = connections; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractDataComponentContainer.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractDataComponentContainer.java index 73c0a20bf..2c9ab7258 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractDataComponentContainer.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractDataComponentContainer.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.gml.AbstractReferenceType; import org.n52.shetland.ogc.swe.SweAbstractDataComponent; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Abstract container class for {@link SweAbstractDataComponent}s * @@ -58,6 +60,7 @@ public AbstractDataComponentContainer(String name) { * @param abstractDataComponent * data component */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractDataComponentContainer(String name, SweAbstractDataComponent abstractDataComponent) { this.name = name; this.abstractDataComponent = abstractDataComponent; @@ -80,6 +83,7 @@ public boolean isSetName() { /** * @return the abstractDataComponent */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractDataComponent getAbstractDataComponent() { return abstractDataComponent; } @@ -88,6 +92,7 @@ public SweAbstractDataComponent getAbstractDataComponent() { * @param abstractDataComponent * the abstractDataComponent to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setAbstractDataComponent(SweAbstractDataComponent abstractDataComponent) { this.abstractDataComponent = abstractDataComponent; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractSmlDataComponentContainer.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractSmlDataComponentContainer.java index 64cc88b5d..3ec045405 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractSmlDataComponentContainer.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractSmlDataComponentContainer.java @@ -15,6 +15,7 @@ */ package org.n52.shetland.ogc.sensorML.elements; +import java.util.Collection; import java.util.Collections; import java.util.Set; @@ -28,13 +29,16 @@ import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Abstract container class for SensorML data components. * * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 1.0.0 * - * @param <T> Implemented class + * @param <T> + * Implemented class */ public class AbstractSmlDataComponentContainer<T> extends AbstractReferenceType { @@ -53,8 +57,12 @@ public AbstractSmlDataComponentContainer(DataRecord dataRecord) { this.dataRecord = dataRecord; } - public AbstractSmlDataComponentContainer(Set<SweAbstractDataComponent> abstractDataComponents) { - this.abstractDataComponents = abstractDataComponents; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public AbstractSmlDataComponentContainer(Collection<SweAbstractDataComponent> abstractDataComponents) { + this.abstractDataComponents.clear(); + if (CollectionHelper.isNotEmpty(abstractDataComponents)) { + this.abstractDataComponents.addAll(abstractDataComponents); + } } public String getName() { @@ -81,9 +89,11 @@ public String getTypeDefinition() { /** * @param typeDefinition * the typeDefinition to set + * @return */ - public void setTypeDefinition(String typeDefinition) { + public T setTypeDefinition(String typeDefinition) { this.typeDefinition = typeDefinition; + return (T) this; } public boolean isSetTypeDefinition() { @@ -136,24 +146,33 @@ public Set<SweAbstractDataComponent> getAbstractDataComponents() { } return components; } - return abstractDataComponents; + return Collections.unmodifiableSet(abstractDataComponents); } @SuppressWarnings("unchecked") - public T setAbstractDataComponents(Set<SweAbstractDataComponent> abstractDataComponents) { - this.abstractDataComponents = abstractDataComponents; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public T setAbstractDataComponents(Collection<SweAbstractDataComponent> abstractDataComponents) { + this.abstractDataComponents.clear(); + if (CollectionHelper.isNotEmpty(abstractDataComponents)) { + this.abstractDataComponents.addAll(abstractDataComponents); + } return (T) this; } @SuppressWarnings("unchecked") - public T addAbstractDataComponents(Set<SweAbstractDataComponent> abstractDataComponents) { - this.abstractDataComponents.addAll(abstractDataComponents); + public T addAbstractDataComponents(Collection<SweAbstractDataComponent> abstractDataComponents) { + this.abstractDataComponents.clear(); + if (CollectionHelper.isNotEmpty(abstractDataComponents)) { + this.abstractDataComponents.addAll(abstractDataComponents); + } return (T) this; } @SuppressWarnings("unchecked") public T addAbstractDataComponents(SweAbstractDataComponent abstractDataComponent) { - this.abstractDataComponents.add(abstractDataComponent); + if (abstractDataComponent != null) { + this.abstractDataComponents.add(abstractDataComponent); + } return (T) this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCapabilities.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCapabilities.java index e7e3e78f0..32217b117 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCapabilities.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCapabilities.java @@ -17,6 +17,8 @@ import static java.util.stream.Collectors.toList; +import java.util.Collection; +import java.util.Collections; import java.util.List; import org.n52.shetland.ogc.swe.DataRecord; @@ -24,6 +26,8 @@ import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS internal representation of SensorML capabilities * @@ -43,7 +47,8 @@ public SmlCapabilities() { /** * constructor * - * @param name Type + * @param name + * Type */ public SmlCapabilities(String name) { setName(name); @@ -52,8 +57,10 @@ public SmlCapabilities(String name) { /** * constructor * - * @param name Type - * @param dataRecord DataRecord + * @param name + * Type + * @param dataRecord + * DataRecord */ public SmlCapabilities(String name, DataRecord dataRecord) { super(dataRecord); @@ -77,38 +84,49 @@ public List<SmlCapability> getCapabilities() { }).collect(toList()); } - return this.capabilities; + return Collections.unmodifiableList(capabilities); } /** - * @param capabilities the capabilities to set + * @param capabilities + * the capabilities to set + * @return */ - public void setCapabilities(List<SmlCapability> capabilities) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlCapabilities setCapabilities(List<SmlCapability> capabilities) { + this.capabilities.clear(); if (CollectionHelper.isNotEmpty(capabilities)) { - this.capabilities = capabilities; - capabilities.stream() - .map(SmlCapability::getAbstractDataComponent) + this.capabilities.addAll(capabilities); + capabilities.stream().map(SmlCapability::getAbstractDataComponent) .forEach(this::addAbstractDataComponents); } + return this; } /** - * @param capabilities the capabilities to add + * @param capabilities + * the capabilities to add */ - public void addCapabilities(List<SmlCapability> capabilities) { - this.capabilities.addAll(capabilities); - capabilities.stream() - .map(SmlCapability::getAbstractDataComponent) + public SmlCapabilities addCapabilities(Collection<SmlCapability> capabilities) { + if (CollectionHelper.isNotEmpty(capabilities)) { + this.capabilities.addAll(capabilities); + capabilities.stream().map(SmlCapability::getAbstractDataComponent) .forEach(this::addAbstractDataComponents); + } + return this; } /** - * @param capability the capability to add + * @param capability + * the capability to add */ - public void addCapability(SmlCapability capability) { - this.capabilities.add(capability); - addAbstractDataComponents(capability.getAbstractDataComponent()); + public SmlCapabilities addCapability(SmlCapability capability) { + if (capability != null) { + this.capabilities.add(capability); + addAbstractDataComponents(capability.getAbstractDataComponent()); + } + return this; } public boolean isSetCapabilities() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCharacteristics.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCharacteristics.java index 12a11e77e..8216ef395 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCharacteristics.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCharacteristics.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.ogc.sensorML.elements; +import java.util.Collection; +import java.util.Collections; import java.util.List; import org.n52.shetland.util.CollectionHelper; @@ -23,6 +25,8 @@ import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS internal representation of SensorML characteristics * @@ -49,7 +53,6 @@ public SmlCharacteristics(DataRecord dataRecord) { super(dataRecord); } - /** * @return the characteristics */ @@ -63,37 +66,52 @@ public List<SmlCharacteristic> getCharacteristic() { } return c; } - return this.characteristics; + return Collections.unmodifiableList(characteristics); } /** - * @param characteristics the characteristics to set + * @param characteristics + * the characteristics to set + * @return */ - public void setCharacteristic(List<SmlCharacteristic> characteristics) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlCharacteristics setCharacteristic(Collection<SmlCharacteristic> characteristics) { + this.characteristics.clear(); if (CollectionHelper.isNotEmpty(characteristics)) { - this.characteristics = characteristics; + this.characteristics.addAll(characteristics); for (SmlCharacteristic smlCharacteristic : characteristics) { addAbstractDataComponents(smlCharacteristic.getAbstractDataComponent()); } } + return this; } /** - * @param characteristics the characteristics to add + * @param characteristics + * the characteristics to add + * @return */ - public void addCharacteristic(List<SmlCharacteristic> characteristics) { - this.characteristics.addAll(characteristics); - for (SmlCharacteristic smlCharacteristic : characteristics) { - addAbstractDataComponents(smlCharacteristic.getAbstractDataComponent()); + public SmlCharacteristics addCharacteristic(Collection<SmlCharacteristic> characteristics) { + if (CollectionHelper.isNotEmpty(characteristics)) { + this.characteristics.addAll(characteristics); + for (SmlCharacteristic smlCharacteristic : characteristics) { + addAbstractDataComponents(smlCharacteristic.getAbstractDataComponent()); + } } + return this; } /** - * @param characteristic the characteristic to add + * @param characteristic + * the characteristic to add + * @return */ - public void addCharacteristic(SmlCharacteristic characteristic) { - this.characteristics.add(characteristic); - addAbstractDataComponents(characteristic.getAbstractDataComponent()); + public SmlCharacteristics addCharacteristic(SmlCharacteristic characteristic) { + if (characteristic != null) { + this.characteristics.add(characteristic); + addAbstractDataComponents(characteristic.getAbstractDataComponent()); + } + return this; } public boolean isSetCharacteristics() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlComponent.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlComponent.java index 865742dca..5ae21a991 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlComponent.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlComponent.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.gml.AbstractReferenceType; import org.n52.shetland.ogc.sensorML.AbstractSensorML; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS internal representation of SensorML component * @@ -59,10 +61,12 @@ public void setName(String name) { this.name = name; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setProcess(AbstractSensorML process) { this.process = process; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AbstractSensorML getProcess() { return process; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlConnection.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlConnection.java index 0551b978e..02a932102 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlConnection.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlConnection.java @@ -15,10 +15,14 @@ */ package org.n52.shetland.ogc.sensorML.elements; +import java.util.Collection; +import java.util.Collections; import java.util.List; import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class SmlConnection { private String name; @@ -86,17 +90,22 @@ public void setRole(String role) { } public List<SmlLink> getConnections() { - return connections; + return Collections.unmodifiableList(connections); } - public SmlConnection setConnections(List<SmlLink> connections) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlConnection setConnections(Collection<SmlLink> connections) { this.connections.clear(); - this.connections.addAll(connections); + if (connections != null) { + this.connections.addAll(connections); + } return this; } public SmlConnection addConnection(SmlLink connection) { - this.connections.add(connection); + if (connection != null) { + this.connections.add(connection); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentation.java index e2a15455c..074379960 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentation.java @@ -17,6 +17,8 @@ import org.n52.shetland.ogc.gml.time.TimeInstant; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 * @@ -37,6 +39,7 @@ public String getVersion() { return version; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public TimeInstant getDate() { return date; } @@ -57,20 +60,25 @@ public void setVersion(String version) { this.version = version; } - public void setDate(TimeInstant date) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlDocumentation setDate(TimeInstant date) { this.date = date; + return this; } - public void setContact(String contact) { + public SmlDocumentation setContact(String contact) { this.contact = contact; + return this; } - public void setFormat(String format) { + public SmlDocumentation setFormat(String format) { this.format = format; + return this; } - public void setOnlineResource(String onlineResource) { + public SmlDocumentation setOnlineResource(String onlineResource) { this.onlineResource = onlineResource; + return this; } public boolean isSetVersion() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentationList.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentationList.java index 94ab1729f..fde251bf6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentationList.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentationList.java @@ -16,6 +16,8 @@ package org.n52.shetland.ogc.sensorML.elements; import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.List; /** @@ -27,15 +29,20 @@ public class SmlDocumentationList extends AbstractSmlDocumentation { private List<SmlDocumentationListMember> members = new ArrayList<SmlDocumentationListMember>(0); public List<SmlDocumentationListMember> getMember() { - return members; + return Collections.unmodifiableList(members); } - public void setMember(List<SmlDocumentationListMember> members) { - this.members = members; + public SmlDocumentationList setMember(Collection<SmlDocumentationListMember> members) { + this.members.clear(); + if (members != null) { + this.members.addAll(members); + } + return this; } - public void addMember(SmlDocumentationListMember member) { + public SmlDocumentationList addMember(SmlDocumentationListMember member) { this.members.add(member); + return this; } public boolean isSetMembers() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentationListMember.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentationListMember.java index 932fe6e00..3da11374e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentationListMember.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentationListMember.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.ogc.sensorML.elements; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 * @@ -29,6 +31,7 @@ public String getName() { return name; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SmlDocumentation getDocumentation() { return documentation; } @@ -37,8 +40,10 @@ public void setName(String name) { this.name = name; } - public void setDocumentation(SmlDocumentation documentation) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlDocumentationListMember setDocumentation(SmlDocumentation documentation) { this.documentation = documentation; + return this; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIo.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIo.java index 945352293..88231a2bd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIo.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIo.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.gml.AbstractReferenceType; import org.n52.shetland.ogc.swe.SweAbstractDataComponent; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS internal representation of SensorML IOs * @@ -42,6 +44,7 @@ public SmlIo() { * @param ioValue * The IO value */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SmlIo(final SweAbstractDataComponent ioValue) { super(); this.ioValue = ioValue; @@ -67,6 +70,7 @@ public SmlIo setIoName(final String inputName) { /** * @return the input */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractDataComponent getIoValue() { return ioValue; } @@ -76,6 +80,7 @@ public SweAbstractDataComponent getIoValue() { * the input to set * @return This object */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SmlIo setIoValue(final SweAbstractDataComponent ioValue) { this.ioValue = ioValue; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlLocation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlLocation.java index 6391de009..deac9c09a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlLocation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlLocation.java @@ -17,6 +17,8 @@ import org.locationtech.jts.geom.Point; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS internal representation of SensorML location * @@ -33,7 +35,7 @@ public class SmlLocation { * * @param point * Point - */ + */@SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SmlLocation(final Point point) { super(); this.point = point; @@ -42,6 +44,7 @@ public SmlLocation(final Point point) { /** * @return the point */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Point getPoint() { return point; } @@ -56,8 +59,11 @@ public boolean isSetPoint() { /** * @param point * Point + * @return */ - public void setPoint(final Point point) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlLocation setPoint(final Point point) { this.point = point; + return this; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlParameter.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlParameter.java index 6a9c9a7d5..1214c321e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlParameter.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlParameter.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.gml.AbstractReferenceType; import org.n52.shetland.ogc.swe.SweAbstractDataComponent; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @author <a href="mailto:m.radtke@52north.org">Maurin Radtke</a> */ @@ -33,15 +35,19 @@ public String getName() { return name; } - public void setName(String name) { + public SmlParameter setName(String name) { this.name = name; + return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractDataComponent getParameter() { return parameter; } - public void setParameter(SweAbstractDataComponent parameters) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlParameter setParameter(SweAbstractDataComponent parameters) { parameter = parameters; + return this; } -} \ No newline at end of file +} diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlPosition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlPosition.java index 538e11c2d..b86794764 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlPosition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlPosition.java @@ -17,6 +17,7 @@ import static java.util.stream.Collectors.toList; +import java.util.Collections; import java.util.List; import org.n52.shetland.ogc.gml.CodeType; @@ -34,13 +35,14 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS internal representation of SensorML position * * @since 1.0.0 */ -public class SmlPosition - extends SweAbstractDataComponent { +public class SmlPosition extends SweAbstractDataComponent { private boolean fixed; @@ -71,8 +73,8 @@ public SmlPosition() { * @param position * Position coordinates */ - public SmlPosition( - final String name, final boolean fixed, final String referenceFrame, + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlPosition(final String name, final boolean fixed, final String referenceFrame, final List<SweCoordinate<? extends Number>> position) { super(); setName(name); @@ -93,8 +95,8 @@ public SmlPosition( * @param position * Position coordinates */ - public SmlPosition( - final CodeType name, final boolean fixed, final String referenceFrame, + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlPosition(final CodeType name, final boolean fixed, final String referenceFrame, final List<SweCoordinate<? extends Number>> position) { super(); setName(name); @@ -170,7 +172,7 @@ public List<? extends SweCoordinate<? extends Number>> getPosition() { } } } - return position; + return Collections.unmodifiableList(position); } /** @@ -179,8 +181,12 @@ public List<? extends SweCoordinate<? extends Number>> getPosition() { * * @return This object */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SmlPosition setPosition(List<? extends SweCoordinate<? extends Number>> position) { - this.position = position; + this.position.clear(); + if (position != null) { + this.position = position; + } return this; } @@ -188,6 +194,7 @@ public boolean isSetPosition() { return CollectionHelper.isNotEmpty(position); } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweVector getVector() { if (!isSetVector() && isSetPosition()) { SweVector v = (SweVector) copyValueTo(new SweVector(getPosition())); @@ -200,14 +207,17 @@ public SweVector getVector() { return this.vector; } - public void setVector(SweVector vector) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlPosition setVector(SweVector vector) { this.vector = vector; + return this; } public boolean isSetVector() { return vector != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweAbstractDataComponent getAbstractDataComponent() { if (!isSetAbstractDataComponent() && isSetVector()) { return vector; @@ -215,11 +225,13 @@ public SweAbstractDataComponent getAbstractDataComponent() { return dataComponent; } - public void setAbstractDataComponent(SweAbstractDataComponent dataComponent) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public SmlPosition setAbstractDataComponent(SweAbstractDataComponent dataComponent) { if (dataComponent instanceof SweVector) { setVector((SweVector) dataComponent); } this.dataComponent = dataComponent; + return this; } public boolean isSetAbstractDataComponent() { @@ -227,6 +239,7 @@ public boolean isSetAbstractDataComponent() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweDataComponentType getDataComponentType() { return SweDataComponentType.Position; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractPhysicalProcess.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractPhysicalProcess.java index db79698b0..730a2ac3d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractPhysicalProcess.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractPhysicalProcess.java @@ -19,6 +19,8 @@ import org.n52.shetland.ogc.sensorML.HasPosition; import org.n52.shetland.ogc.sensorML.elements.SmlPosition; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class that represents SensorML 2.0 PhysicalProcess. * @@ -93,6 +95,7 @@ public void setLocalTimeFrame(TemporalFrame localTimeFrame) { /** * @return the position */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SmlPosition getPosition() { return position; } @@ -101,6 +104,7 @@ public SmlPosition getPosition() { * @param position * the position to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractPhysicalProcess setPosition(SmlPosition position) { this.position = position; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java index 951665531..a46a5ce5f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java @@ -19,6 +19,8 @@ import org.n52.shetland.ogc.sensorML.AbstractProcess; import org.n52.shetland.ogc.sensorML.SensorML20Constants; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class that represents SensorML 2.0 AbstractProcess * @@ -35,11 +37,13 @@ public class AbstractProcessV20 extends AbstractProcess { private ReferenceType typeOf; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractProcessV20 setSmlFeatureOfInterest(SmlFeatureOfInterest featureOfInterest) { this.featureOfInterest = featureOfInterest; return this; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SmlFeatureOfInterest getSmlFeatureOfInterest() { return featureOfInterest; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AggregateProcess.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AggregateProcess.java index 29318665d..a65123b69 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AggregateProcess.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AggregateProcess.java @@ -15,7 +15,8 @@ */ package org.n52.shetland.ogc.sensorML.v20; -import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.sensorML.HasComponents; @@ -24,6 +25,8 @@ import org.n52.shetland.ogc.sensorML.elements.SmlConnection; import org.n52.shetland.util.IdGenerator; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class that represents SensorML 2.0 AggregateProcess * @@ -36,7 +39,7 @@ public class AggregateProcess implements HasComponents<AggregateProcess>, HasConnections<AggregateProcess> { public static final String ID_PREFIX = "ap_"; - private final List<SmlComponent> components = new ArrayList<>(0); + private final List<SmlComponent> components = new LinkedList<>(); private SmlConnection connections; public AggregateProcess() { @@ -45,7 +48,7 @@ public AggregateProcess() { @Override public List<SmlComponent> getComponents() { - return components; + return Collections.unmodifiableList(components); } @Override @@ -69,10 +72,12 @@ public boolean isAggragation() { return true; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SmlConnection getConnections() { return connections; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AggregateProcess setConnections(SmlConnection connections) { this.connections = connections; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalComponent.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalComponent.java index 7aab3569c..545b10c91 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalComponent.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalComponent.java @@ -19,6 +19,8 @@ import org.n52.shetland.ogc.sensorML.ProcessMethod; import org.n52.shetland.util.IdGenerator; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class that represents SensorML 2.0 PhysicalComponent * @@ -38,11 +40,13 @@ public PhysicalComponent() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public ProcessMethod getMethod() { return method; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setMethod(ProcessMethod method) { this.method = method; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalSystem.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalSystem.java index d8d0bbfdf..7481ddedc 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalSystem.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalSystem.java @@ -15,7 +15,8 @@ */ package org.n52.shetland.ogc.sensorML.v20; -import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.sensorML.HasComponents; @@ -24,6 +25,8 @@ import org.n52.shetland.ogc.sensorML.elements.SmlConnection; import org.n52.shetland.util.IdGenerator; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class that represents SensorML 2.0 PhysicalSystem * @@ -37,7 +40,7 @@ public class PhysicalSystem public static final String ID_PREFIX = "ps_"; - private final List<SmlComponent> components = new ArrayList<>(0); + private final List<SmlComponent> components = new LinkedList<>(); private SmlConnection connections; @@ -47,7 +50,7 @@ public PhysicalSystem() { @Override public List<SmlComponent> getComponents() { - return components; + return Collections.unmodifiableList(components); } @Override @@ -71,10 +74,12 @@ public boolean isAggragation() { return true; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SmlConnection getConnections() { return connections; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public PhysicalSystem setConnections(SmlConnection connections) { this.connections = connections; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SimpleProcess.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SimpleProcess.java index 04763660d..205be5f34 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SimpleProcess.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SimpleProcess.java @@ -19,6 +19,8 @@ import org.n52.shetland.ogc.sensorML.ProcessMethod; import org.n52.shetland.util.IdGenerator; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class that represents SensorML 2.0 SimpleProcess * @@ -38,11 +40,13 @@ public SimpleProcess() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public ProcessMethod getMethod() { return method; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setMethod(ProcessMethod method) { this.method = method; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlDataInterface.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlDataInterface.java index 2c1def696..507670e07 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlDataInterface.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlDataInterface.java @@ -17,6 +17,9 @@ import org.n52.shetland.ogc.swe.SweAbstractDataComponent; import org.n52.shetland.ogc.swe.SweConstants.SweDataComponentType; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.n52.shetland.ogc.swe.SweDataComponentVisitor; import org.n52.shetland.ogc.swe.SweDataRecord; import org.n52.shetland.ogc.swe.SweDataStream; @@ -39,10 +42,12 @@ public SweDataComponentType getDataComponentType() { return null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweDataStream getData() { return sweDataStream; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setData(SweDataStream sweDataStream) { this.sweDataStream = sweDataStream; } @@ -51,10 +56,11 @@ public Boolean isSetInterfaceParameters() { return inputParameters != null; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SweDataRecord getInterfaceParameters() { return inputParameters; } - + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setInputParameters(SweDataRecord inputParameters) { this.inputParameters = inputParameters; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlFeatureOfInterest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlFeatureOfInterest.java index f9da0ca62..c83ee3303 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlFeatureOfInterest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlFeatureOfInterest.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.sensorML.v20; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -53,44 +54,50 @@ public SmlFeatureOfInterest addFeaturesOfInterest(Collection<String> features) { } public SmlFeatureOfInterest addFeaturesOfInterest(Map<String, AbstractFeature> featuresOfInterestMap) { - getFeaturesOfInterestMap().putAll(featuresOfInterestMap); + if (featuresOfInterestMap != null) { + this.featuresOfInterestMap.putAll(featuresOfInterestMap); + } return this; } public SmlFeatureOfInterest addFeatureOfInterest(String featureIdentifier) { - getFeaturesOfInterestMap().put(featureIdentifier, - new SamplingFeature(new CodeWithAuthority(featureIdentifier))); + if (featureIdentifier != null && !featureIdentifier.isEmpty()) { + this.featuresOfInterestMap.put(featureIdentifier, + new SamplingFeature(new CodeWithAuthority(featureIdentifier))); + } return this; } public SmlFeatureOfInterest addFeatureOfInterest(AbstractFeature feature) { - getFeaturesOfInterestMap().put(feature.getIdentifier(), feature); + if (feature != null) { + this.featuresOfInterestMap.put(feature.getIdentifier(), feature); + } return this; } public Set<String> getFeaturesOfInterest() { - return getFeaturesOfInterestMap().keySet(); + return featuresOfInterestMap.keySet(); } public boolean isSetFeaturesOfInterest() { return CollectionHelper.isNotEmpty(getFeaturesOfInterest()) - || CollectionHelper.isNotEmpty(getFeaturesOfInterestMap()); + || CollectionHelper.isNotEmpty(featuresOfInterestMap); } public Map<String, AbstractFeature> getFeaturesOfInterestMap() { - return featuresOfInterestMap; + return Collections.unmodifiableMap(featuresOfInterestMap); } public boolean isSetFeaturesOfInterestMap() { - return CollectionHelper.isNotEmpty(getFeaturesOfInterestMap()); + return CollectionHelper.isNotEmpty(featuresOfInterestMap); } public boolean hasAbstractFeatureFor(String identifier) { - return isSetFeaturesOfInterestMap() && getFeaturesOfInterestMap().containsKey(identifier); + return isSetFeaturesOfInterestMap() && featuresOfInterestMap.containsKey(identifier); } public AbstractFeature getAbstractFeatureFor(String identifier) { - return getFeaturesOfInterestMap().get(identifier); + return featuresOfInterestMap.get(identifier); } public boolean isSetFeatures() { @@ -112,7 +119,7 @@ public SmlFeatureOfInterest copy() { SmlFeatureOfInterest clone = new SmlFeatureOfInterest(); copyValueTo(clone); if (isSetFeaturesOfInterestMap()) { - clone.addFeaturesOfInterest(new HashMap<>(getFeaturesOfInterestMap())); + clone.addFeaturesOfInterest(new HashMap<>(featuresOfInterestMap)); } return clone; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosInsertionMetadata.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosInsertionMetadata.java index 5477ff325..6a8e01778 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosInsertionMetadata.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosInsertionMetadata.java @@ -16,9 +16,11 @@ package org.n52.shetland.ogc.sos; import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; import java.util.Set; -import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * SOS internal representation of SOS insertion metadata @@ -30,12 +32,12 @@ public class SosInsertionMetadata { /** * list of valid feature types */ - private Set<String> featureOfInterestTypes; + private Set<String> featureOfInterestTypes = new LinkedHashSet<>(); /** * list of valid observation types */ - private Set<String> observationTypes; + private Set<String> observationTypes = new LinkedHashSet<>(); /** * constructor @@ -48,15 +50,19 @@ public SosInsertionMetadata() { * @return the featureOfInterestTypes */ public Set<String> getFeatureOfInterestTypes() { - return featureOfInterestTypes; + return Collections.unmodifiableSet(featureOfInterestTypes); } /** * @param featureOfInterestTypes * the featureOfInterestTypes to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SosInsertionMetadata setFeatureOfInterestTypes(Collection<String> featureOfInterestTypes) { - this.featureOfInterestTypes = Sets.newHashSet(featureOfInterestTypes); + this.featureOfInterestTypes.clear(); + if (featureOfInterestTypes != null) { + this.featureOfInterestTypes.addAll(featureOfInterestTypes); + } return this; } @@ -64,15 +70,19 @@ public SosInsertionMetadata setFeatureOfInterestTypes(Collection<String> feature * @return the observationTypes */ public Set<String> getObservationTypes() { - return observationTypes; + return Collections.unmodifiableSet(observationTypes); } /** * @param observationTypes * the observationTypes to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SosInsertionMetadata setObservationTypes(Collection<String> observationTypes) { - this.observationTypes = Sets.newHashSet(observationTypes); + this.observationTypes.clear(); + if (observationTypes != null) { + this.observationTypes.addAll(observationTypes); + } return this; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosObservationOffering.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosObservationOffering.java index 4f2010397..bf9053046 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosObservationOffering.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosObservationOffering.java @@ -33,6 +33,8 @@ import org.n52.shetland.util.CollectionHelper; import org.n52.shetland.util.ReferencedEnvelope; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Class which represents a ObservationOffering. Used in the SosCapabilities. * @@ -128,6 +130,7 @@ public class SosObservationOffering extends AbstractSWES implements Comparable<S /** * @return Offering identifier */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SosOffering getOffering() { return offering; } @@ -142,6 +145,7 @@ public void setOffering(String offering) { /** * @param offering Offering identifier */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setOffering(SosOffering offering) { this.offering = offering; if (!isSetIdentifier() && offering.isSetIdentifier()) { @@ -206,6 +210,7 @@ public void setPhens4CompPhens(Map<String, ? extends Collection<String>> phens4C * @param phenomenonTime * the phenomenon time */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setPhenomenonTime(Time phenomenonTime) { this.phenomenonTime = phenomenonTime; } @@ -213,6 +218,7 @@ public void setPhenomenonTime(Time phenomenonTime) { /** * @return the phenomenon time */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getPhenomenonTime() { return phenomenonTime; } @@ -220,6 +226,7 @@ public Time getPhenomenonTime() { /** * @param resultTime the result time */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setResultTime(Time resultTime) { this.resultTime = resultTime; } @@ -227,6 +234,7 @@ public void setResultTime(Time resultTime) { /** * @return the result time */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getResultTime() { return resultTime; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java index 21a01dd1d..7d9fdf907 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.sos; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; @@ -30,6 +31,8 @@ import com.google.common.base.Strings; import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 * @@ -52,19 +55,23 @@ public class SosProcedureDescription<T extends AbstractFeature> extends Abstract private boolean aggregation; private boolean reference; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SosProcedureDescription(T procedureDescription) { super(procedureDescription.getIdentifier()); this.procedureDescription = procedureDescription; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public T getProcedureDescription() { return procedureDescription; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getValidTime() { return validTime; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SosProcedureDescription<T> setValidTime(Time validTime) { this.validTime = validTime; return this; @@ -84,11 +91,13 @@ public SosProcedureDescription<T> setDescriptionFormat(String descriptionFormat) } public Set<SosOffering> getOfferings() { - return offerings; + return Collections.unmodifiableSet(offerings); } public SosProcedureDescription<T> addOfferings(Collection<SosOffering> offerings) { - this.offerings.addAll(offerings); + if (offerings != null) { + this.offerings.addAll(offerings); + } return this; } @@ -124,12 +133,14 @@ public SosProcedureDescription<T> addChildProcedure(AbstractSensorML process) { } public Set<AbstractSensorML> getChildProcedures() { - return childProcedures; + return Collections.unmodifiableSet(childProcedures); } public SosProcedureDescription<T> setChildProcedures(Collection<AbstractSensorML> childProcedures) { this.childProcedures.clear(); - addChildProcedures(childProcedures); + if (childProcedures != null) { + addChildProcedures(childProcedures); + } return this; } @@ -145,12 +156,14 @@ public boolean isSetChildProcedures() { } public Map<String, AbstractFeature> getFeaturesOfInterestMap() { - return featuresOfInterestMap; + return Collections.unmodifiableMap(featuresOfInterestMap); } public SosProcedureDescription<T> setFeaturesOfInterestMap(Map<String, AbstractFeature> featuresOfInterestMap) { this.featuresOfInterestMap.clear(); - addFeaturesOfInterestMap(featuresOfInterestMap); + if (featuresOfInterestMap != null) { + addFeaturesOfInterestMap(featuresOfInterestMap); + } return this; } @@ -165,12 +178,16 @@ public SosProcedureDescription<T> addFeaturesOfInterest(Collection<String> featu } public SosProcedureDescription<T> addFeatureOfInterest(AbstractFeature featureOfInterest) { + if (featureOfInterest != null) { this.featuresOfInterestMap.put(featureOfInterest.getIdentifier(), featureOfInterest); + } return this; } public SosProcedureDescription<T> addFeatureOfInterest(String featureOfInterest) { + if (featureOfInterest != null) { this.featuresOfInterest.add(featureOfInterest); + } return this; } @@ -189,7 +206,7 @@ public SosProcedureDescription<T> setFeaturesOfInterest(Collection<String> featu } public Set<String> getFeaturesOfInterest() { - return featuresOfInterest; + return Collections.unmodifiableSet(featuresOfInterest); } public boolean isSetFeatures() { @@ -213,7 +230,7 @@ public SosProcedureDescription<T> setPhenomenon(Map<String, AbstractPhenomenon> } public Map<String, AbstractPhenomenon> getPhenomenon() { - return phenomenonMap; + return Collections.unmodifiableMap(phenomenonMap); } public boolean isSetPhenomenon() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosSpatialFilter.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosSpatialFilter.java index 98aac6ccc..3cdef1119 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosSpatialFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosSpatialFilter.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.filter.SpatialFilter; import org.n52.shetland.ogc.ows.extension.Extension; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * * @author Carsten Hollmann @@ -78,11 +80,13 @@ public boolean isSetDefinition() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SpatialFilter getValue() { return filter; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SosSpatialFilter setValue(SpatialFilter value) { this.filter = value; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationRequest.java index 522180304..33cdd5889 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationRequest.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.sos.delobs; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; @@ -26,8 +27,7 @@ import org.n52.shetland.util.CollectionHelper; /** - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ @@ -62,18 +62,20 @@ public String getOperationName() { } public Set<String> getObservationIdentifiers() { - return observationIdentifiers; + return Collections.unmodifiableSet(observationIdentifiers); } - public void setObservationIdentifiers(Collection<String> observationIdentifier) { + public DeleteObservationRequest setObservationIdentifiers(Collection<String> observationIdentifier) { this.observationIdentifiers.clear(); if (observationIdentifier != null) { this.observationIdentifiers.addAll(observationIdentifier); } + return this; } - public void addObservationIdentifier(String observationIdentifier) { + public DeleteObservationRequest addObservationIdentifier(String observationIdentifier) { this.observationIdentifiers.add(observationIdentifier); + return this; } public boolean isSetObservationIdentifiers() { @@ -84,22 +86,24 @@ public boolean isSetObservationIdentifiers() { * @return the procedures */ public Set<String> getProcedures() { - return procedures; + return Collections.unmodifiableSet(procedures); } /** * @param procedures * the procedures to set */ - public void setProcedures(Collection<String> procedures) { + public DeleteObservationRequest setProcedures(Collection<String> procedures) { this.procedures.clear(); if (procedures != null) { this.procedures.addAll(procedures); } + return this; } - public void addProcedure(String procedure) { + public DeleteObservationRequest addProcedure(String procedure) { this.procedures.add(procedure); + return this; } public boolean isSetprocedures() { @@ -110,22 +114,24 @@ public boolean isSetprocedures() { * @return the observedProperties */ public Set<String> getObservedProperties() { - return observedProperties; + return Collections.unmodifiableSet(observedProperties); } /** * @param observedProperties * the observedProperties to set */ - public void setObservedProperties(Collection<String> observedProperties) { + public DeleteObservationRequest setObservedProperties(Collection<String> observedProperties) { this.observedProperties.clear(); if (observedProperties != null) { this.observedProperties.addAll(observedProperties); } + return this; } - public void addObservedProperty(String observedProperty) { + public DeleteObservationRequest addObservedProperty(String observedProperty) { this.observedProperties.add(observedProperty); + return this; } public boolean isSetObservedProperty() { @@ -136,22 +142,24 @@ public boolean isSetObservedProperty() { * @return the featureOfInterest */ public Set<String> getFeatureIdentifiers() { - return features; + return Collections.unmodifiableSet(features); } /** * @param featureOfInterest * the featureOfInterest to set */ - public void setFeatureIdentifiers(Collection<String> featureOfInterest) { + public DeleteObservationRequest setFeatureIdentifiers(Collection<String> featureOfInterest) { this.features.clear(); if (featureOfInterest != null) { this.features.addAll(featureOfInterest); } + return this; } - public void addFeatureIdentifier(String featureOfInterest) { + public DeleteObservationRequest addFeatureIdentifier(String featureOfInterest) { this.features.add(featureOfInterest); + return this; } public boolean isSetFeatureIdentifiers() { @@ -162,22 +170,25 @@ public boolean isSetFeatureIdentifiers() { * @return the offerings */ public Set<String> getOfferings() { - return offerings; + return Collections.unmodifiableSet(offerings); } /** * @param offerings * the offerings to set + * @return */ - public void setOfferings(Collection<String> offerings) { + public DeleteObservationRequest setOfferings(Collection<String> offerings) { this.offerings.clear(); if (offerings != null) { this.offerings.addAll(offerings); } + return this; } - public void addOffering(String offering) { + public DeleteObservationRequest addOffering(String offering) { this.offerings.add(offering); + return this; } public boolean isSetOfferings() { @@ -188,7 +199,7 @@ public boolean isSetOfferings() { * @return the temporalFilters */ public Set<TemporalFilter> getTemporalFilters() { - return temporalFilters; + return Collections.unmodifiableSet(temporalFilters); } /** diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationResponse.java index 681f1699c..0358d11a6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationResponse.java @@ -18,6 +18,8 @@ import org.n52.shetland.ogc.om.OmObservation; import org.n52.shetland.ogc.sos.response.AbstractOperationResponse; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public class DeleteObservationResponse extends AbstractOperationResponse { private OmObservation deletedObservation; private String observationIdentifier; @@ -34,10 +36,12 @@ public String getObservationId() { return observationIdentifier; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setDeletedObservation(OmObservation deletedObservation) { this.deletedObservation = deletedObservation; } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OmObservation getDeletedObservation() { return deletedObservation; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateRequest.java index bc984ded0..aac7274d4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateRequest.java @@ -17,6 +17,7 @@ import java.util.AbstractMap; import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.ows.service.OwsServiceRequest; @@ -28,8 +29,8 @@ public class DeleteResultTemplateRequest extends OwsServiceRequest { private static String OPERATION_NAME = "DeleteResultTemplate"; - private List<String> resultTemplates; - private List<AbstractMap.SimpleEntry<String, String>> observedPropertyOfferingPairs; + private List<String> resultTemplates = new LinkedList<>(); + private List<AbstractMap.SimpleEntry<String, String>> observedPropertyOfferingPairs = new LinkedList<>(); public DeleteResultTemplateRequest() { super(null, null, OPERATION_NAME); @@ -49,9 +50,6 @@ public String getOperationName() { } public DeleteResultTemplateRequest addResultTemplate(String resultTemplateId) { - if (!isSetResultTemplates()) { - resultTemplates = Lists.newArrayList(); - } if (!Strings.isNullOrEmpty(resultTemplateId)) { resultTemplates.add(resultTemplateId); } @@ -63,11 +61,7 @@ public boolean isSetResultTemplates() { } public List<String> getResultTemplates() { - if (isSetResultTemplates()) { - return resultTemplates; - } else { - return Collections.emptyList(); - } + return Collections.unmodifiableList(resultTemplates); } public DeleteResultTemplateRequest setObservableProperty(String observedProperty) { @@ -79,9 +73,6 @@ public DeleteResultTemplateRequest setOffering(String offering) { } public DeleteResultTemplateRequest addObservedPropertyOfferingPair(String observedProperty, String offering) { - if (!isSetObservedPropertyOfferingPairs()) { - observedPropertyOfferingPairs = Lists.newArrayList(); - } observedPropertyOfferingPairs.add(new AbstractMap.SimpleEntry<>(observedProperty, offering)); return this; } @@ -91,11 +82,7 @@ public boolean isSetObservedPropertyOfferingPairs() { } public List<AbstractMap.SimpleEntry<String, String>> getObservedPropertyOfferingPairs() { - if (isSetObservedPropertyOfferingPairs()) { - return observedPropertyOfferingPairs; - } else { - return Collections.emptyList(); - } + return Collections.unmodifiableList(observedPropertyOfferingPairs); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateResponse.java index ddeefc7ba..e00d7a73b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateResponse.java @@ -15,7 +15,9 @@ */ package org.n52.shetland.ogc.sos.drt; +import java.util.Collection; import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.ows.service.OwsServiceResponse; @@ -24,7 +26,7 @@ public class DeleteResultTemplateResponse extends OwsServiceResponse { private static String OPERATION_NAME = "DeleteResultTemplate"; - private List<String> resultTemplates; + private List<String> resultTemplates = new LinkedList<>(); public DeleteResultTemplateResponse() { super(null, null, OPERATION_NAME); @@ -44,19 +46,18 @@ public String getOperationName() { } public List<String> getResultTemplates() { - if (isSetResultTemplates()) { - return resultTemplates; - } else { - return Collections.emptyList(); - } + return Collections.unmodifiableList(resultTemplates); } public boolean isSetResultTemplates() { return CollectionHelper.isNotEmpty(resultTemplates); } - public DeleteResultTemplateResponse addDeletedResultTemplates(List<String> deletedResultTemplates) { - resultTemplates = deletedResultTemplates; + public DeleteResultTemplateResponse addDeletedResultTemplates(Collection<String> deletedResultTemplates) { + this.resultTemplates.clear(); + if (deletedResultTemplates != null) { + this.resultTemplates.addAll(deletedResultTemplates); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityRequest.java index 1cfac9b31..8e096be22 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityRequest.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.sos.gda; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -66,100 +67,133 @@ public GetDataAvailabilityRequest(String service, String version, String operati * @return the requested {@code procedures}. */ public List<String> getProcedures() { - return procedures; + return Collections.unmodifiableList(procedures); } /** * @return the requested {@code observedProperties}. */ public List<String> getObservedProperties() { - return observedProperties; + return Collections.unmodifiableList(observedProperties); } /** * @return the requested {@code featuresOfInterest}. */ public List<String> getFeaturesOfInterest() { - return featuresOfInterest; + return Collections.unmodifiableList(featuresOfInterest); } /** * @return the requested {@code offerings}. */ public List<String> getOfferings() { - return offerings; + return Collections.unmodifiableList(offerings); } /** * Add a {@code procedure} to the request. * - * @param procedure the {@code procedure} + * @param procedure + * the {@code procedure} */ public void addProcedure(String procedure) { - this.procedures.add(procedure); + if (procedure != null) { + this.procedures.add(procedure); + } } /** * Add a {@code observedProperty} to the request. * - * @param observedProperty the {@code observedProperty} + * @param observedProperty + * the {@code observedProperty} + * @return */ - public void addObservedProperty(String observedProperty) { - this.observedProperties.add(observedProperty); + public GetDataAvailabilityRequest addObservedProperty(String observedProperty) { + if (observedProperty != null) { + this.observedProperties.add(observedProperty); + } + return this; } /** * Add a {@code featureOfInterest} to the request. * - * @param featureOfInterest the {@code featureOfInterest} + * @param featureOfInterest + * the {@code featureOfInterest} + * @return */ - public void addFeatureOfInterest(String featureOfInterest) { - this.featuresOfInterest.add(featureOfInterest); + public GetDataAvailabilityRequest addFeatureOfInterest(String featureOfInterest) { + if (featuresOfInterest != null) { + this.featuresOfInterest.add(featureOfInterest); + } + return this; } - public void setFeatureOfInterest(Collection<String> featuresOfInterest) { + public GetDataAvailabilityRequest setFeatureOfInterest(Collection<String> featuresOfInterest) { this.featuresOfInterest.clear(); - this.featuresOfInterest.addAll(featuresOfInterest); + if (featuresOfInterest != null) { + this.featuresOfInterest.addAll(featuresOfInterest); + } + return this; } /** * Add a {@code offering} to the request. * - * @param offering the {@code offering} + * @param offering + * the {@code offering} + * @return */ - public void addOffering(String offering) { - this.offerings.add(offering); + public GetDataAvailabilityRequest addOffering(String offering) { + if (offering != null) { + this.offerings.add(offering); + } + return this; } - public void setOfferings(Collection<String> offerings) { + public GetDataAvailabilityRequest setOfferings(Collection<String> offerings) { this.offerings.clear(); - this.offerings.addAll(offerings); + if (offerings != null) { + this.offerings.addAll(offerings); + } + return this; } public boolean isSetProcedures() { return CollectionHelper.isNotEmpty(getProcedures()); } - public void setProcedure(List<String> procedures) { + public GetDataAvailabilityRequest setProcedure(Collection<String> procedures) { this.procedures.clear(); - this.procedures.addAll(procedures); + if (procedures != null) { + this.procedures.addAll(procedures); + } + return this; } public boolean isSetProcedure() { return CollectionHelper.isNotEmpty(getProcedures()); } - public void setProcedures(List<String> procedures) { - this.procedures = procedures; + public GetDataAvailabilityRequest setProcedures(Collection<String> procedures) { + if (procedures != null) { + this.procedures.addAll(procedures); + } + return this; } public boolean isSetObservedProperties() { return CollectionHelper.isNotEmpty(getObservedProperties()); } - public void setObservedProperty(List<String> observedProperties) { + public GetDataAvailabilityRequest setObservedProperty(Collection<String> observedProperties) { this.observedProperties.clear(); - this.observedProperties.addAll(observedProperties); + if (observedProperties != null) { + this.observedProperties.addAll(observedProperties); + } + return this; } public boolean isSetFeaturesOfInterest() { @@ -190,9 +224,9 @@ public GetDataAvailabilityRequest setNamespace(String namespace) { } public boolean hasResultFilter() { - return hasExtension(ResultFilterConstants.RESULT_FILTER) && - getExtension(ResultFilterConstants.RESULT_FILTER).isPresent() && - getExtension(ResultFilterConstants.RESULT_FILTER).get() instanceof ResultFilter; + return hasExtension(ResultFilterConstants.RESULT_FILTER) + && getExtension(ResultFilterConstants.RESULT_FILTER).isPresent() + && getExtension(ResultFilterConstants.RESULT_FILTER).get() instanceof ResultFilter; } public Filter<?> getResultFilter() { @@ -208,9 +242,9 @@ public GetDataAvailabilityRequest setResultFilter(ComparisonFilter filter) { } public boolean hasSpatialFilter() { - return hasExtension(SosSpatialFilterConstants.SPATIAL_FILTER) && - getExtension(SosSpatialFilterConstants.SPATIAL_FILTER).isPresent() && - getExtension(SosSpatialFilterConstants.SPATIAL_FILTER).get() instanceof SosSpatialFilter; + return hasExtension(SosSpatialFilterConstants.SPATIAL_FILTER) + && getExtension(SosSpatialFilterConstants.SPATIAL_FILTER).isPresent() + && getExtension(SosSpatialFilterConstants.SPATIAL_FILTER).get() instanceof SosSpatialFilter; } @Override diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityResponse.java index c0be84c47..097b56201 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityResponse.java @@ -17,6 +17,7 @@ import java.util.Collection; import java.util.Collections; +import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -37,6 +38,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Response of a {@link GetDataAvailabilityRequest}. * @@ -52,9 +55,11 @@ public class GetDataAvailabilityResponse extends OwsServiceResponse implements R private String namespace = GetDataAvailabilityConstants.NS_GDA_20; /** - * Creates a new {@code GetDataAvailabilityResponse} consisting of zero or more {@code DataAvailability} objects. + * Creates a new {@code GetDataAvailabilityResponse} consisting of zero or more {@code DataAvailability} + * objects. * - * @param dataAvailabilities the data availabilities + * @param dataAvailabilities + * the data availabilities */ public GetDataAvailabilityResponse(DataAvailability... dataAvailabilities) { super(null, null, GetDataAvailabilityConstants.OPERATION_NAME); @@ -83,20 +88,29 @@ public List<DataAvailability> getDataAvailabilities() { /** * Sets the {@code DataAvailabilities} of the response. * - * @param dataAvailabilities the {@code DataAvailabilities} + * @param dataAvailabilities + * the {@code DataAvailabilities} + * @return */ - public void setDataAvailabilities(Collection<? extends DataAvailability> dataAvailabilities) { + public GetDataAvailabilityResponse setDataAvailabilities( + Collection<? extends DataAvailability> dataAvailabilities) { this.dataAvailabilities.clear(); - this.dataAvailabilities.addAll(dataAvailabilities); + if (dataAvailabilities != null) { + this.dataAvailabilities.addAll(dataAvailabilities); + } + return this; } /** * Adds a new {@code DataAvailability} to the response. * - * @param dataAvailability the {@code DataAvailability}. + * @param dataAvailability + * the {@code DataAvailability}. + * @return */ - public void addDataAvailability(DataAvailability dataAvailability) { + public GetDataAvailabilityResponse addDataAvailability(DataAvailability dataAvailability) { this.dataAvailabilities.add(dataAvailability); + return this; } @Override @@ -137,14 +151,20 @@ public static class DataAvailability implements Copyable<DataAvailability> { /** * Creates a new {@code DataAvailability}. * - * @param procedure the {@code procedure} - * @param observedProperty the {@code observedProperty} - * @param featureOfInterest the {@code featureOfInterest} - * @param offering the {@code offering} - * @param phenomenonTime the {@code phenomenonTime} for which data is available. + * @param procedure + * the {@code procedure} + * @param observedProperty + * the {@code observedProperty} + * @param featureOfInterest + * the {@code featureOfInterest} + * @param offering + * the {@code offering} + * @param phenomenonTime + * the {@code phenomenonTime} for which data is available. */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public DataAvailability(ReferenceType procedure, ReferenceType observedProperty, - ReferenceType featureOfInterest, ReferenceType offering, TimePeriod phenomenonTime) { + ReferenceType featureOfInterest, ReferenceType offering, TimePeriod phenomenonTime) { this.observedProperty = observedProperty; this.procedure = procedure; this.featureOfInterest = featureOfInterest; @@ -155,16 +175,22 @@ public DataAvailability(ReferenceType procedure, ReferenceType observedProperty, /** * Creates a new {@code DataAvailability}. * - * @param procedure the {@code procedure} - * @param observedProperty the {@code observedProperty} - * @param featureOfInterest the {@code featureOfInterest} - * @param offering the {@code offering} - * @param phenomenonTime the {@code phenomenonTime} for which data is available. - * @param valueCount the {@code valueCount} for this combination. + * @param procedure + * the {@code procedure} + * @param observedProperty + * the {@code observedProperty} + * @param featureOfInterest + * the {@code featureOfInterest} + * @param offering + * the {@code offering} + * @param phenomenonTime + * the {@code phenomenonTime} for which data is available. + * @param valueCount + * the {@code valueCount} for this combination. */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public DataAvailability(ReferenceType procedure, ReferenceType observedProperty, - ReferenceType featureOfInterest, ReferenceType offering, TimePeriod phenomenonTime, - long valueCount) { + ReferenceType featureOfInterest, ReferenceType offering, TimePeriod phenomenonTime, long valueCount) { this.observedProperty = observedProperty; this.procedure = procedure; this.featureOfInterest = featureOfInterest; @@ -197,6 +223,7 @@ public ReferenceType getProcedure() { /** * @return the {@code phenomenonTime} for which data is available. */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public TimePeriod getPhenomenonTime() { return phenomenonTime; } @@ -211,7 +238,8 @@ public long getCount() { /** * Set the {@code count} for this combination * - * @param count the count + * @param count + * the count * * @return this. */ @@ -224,9 +252,10 @@ public boolean isSetCount() { return count >= 0; } - public DataAvailability setResultTimes(List<TimeInstant> resultTimes) { + public DataAvailability setResultTimes(Collection<TimeInstant> resultTimes) { + this.resultTimes.clear(); if (resultTimes != null) { - this.resultTimes = resultTimes; + this.resultTimes.addAll(resultTimes); } return this; } @@ -237,7 +266,7 @@ public DataAvailability addResultTime(TimeInstant resultTime) { } public List<TimeInstant> getResultTimes() { - return this.resultTimes; + return Collections.unmodifiableList(resultTimes); } public boolean isSetResultTime() { @@ -252,7 +281,8 @@ public ReferenceType getOffering() { } /** - * @param offering the offering to set + * @param offering + * the offering to set */ public void setOffering(ReferenceType offering) { this.offering = offering; @@ -272,10 +302,12 @@ public boolean isSetOffering() { /** * @return the observationTypes */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public FormatDescriptor getFormatDescriptor() { return formatDescriptor; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setFormatDescriptor(FormatDescriptor formatDescriptor) { this.formatDescriptor = formatDescriptor; } @@ -288,23 +320,32 @@ public boolean isSetFormatDescriptors() { * @return the metadata */ public Map<String, NamedValue<?>> getMetadata() { - return metadata; + return Collections.unmodifiableMap(metadata); } /** - * @param metadata the metadata to set + * @param metadata + * the metadata to set + * @return */ - public void setMetadata(Map<String, NamedValue<?>> metadata) { + public DataAvailability setMetadata(Map<String, NamedValue<?>> metadata) { this.metadata.clear(); - this.metadata.putAll(metadata); + if (metadata != null) { + this.metadata.putAll(metadata); + } + return this; } /** - * @param key the key of the metadata - * @param metadata the metadata to add + * @param key + * the key of the metadata + * @param metadata + * the metadata to add + * @return */ - public void addMetadata(String key, NamedValue<?> metadata) { + public DataAvailability addMetadata(String key, NamedValue<?> metadata) { this.metadata.put(key, metadata); + return this; } public boolean isSetMetadata() { @@ -322,7 +363,7 @@ public boolean equals(Object o) { @Override public int hashCode() { return Objects.hashCode(this.procedure, 19, this.observedProperty, 43, this.featureOfInterest, 37, - this.offering); + this.offering); } public boolean sameConstellation(Object o) { @@ -338,9 +379,8 @@ public int sameConstellationHashCode() { @Override public DataAvailability copy() { - DataAvailability copy - = new DataAvailability(procedure, observedProperty, featureOfInterest, offering, - new TimePeriod(phenomenonTime.getStart(), phenomenonTime.getEnd())); + DataAvailability copy = new DataAvailability(procedure, observedProperty, featureOfInterest, offering, + new TimePeriod(phenomenonTime.getStart(), phenomenonTime.getEnd())); copy.setOffering(offering); copy.setCount(getCount()); copy.setFormatDescriptor(getFormatDescriptor().copy()); @@ -363,11 +403,10 @@ public boolean merge(DataAvailability toMerge, boolean differentOfferings) { } private void mergeFormatDescriptors(FormatDescriptor fdToMerge) { - getFormatDescriptor().getObservationFormatDescriptors().forEach(fd - -> fdToMerge.getObservationFormatDescriptors().stream() + getFormatDescriptor().getObservationFormatDescriptors() + .forEach(fd -> fdToMerge.getObservationFormatDescriptors().stream() .filter(fd2 -> fd.getResponseFormat().equals(fd2.getResponseFormat())) - .forEachOrdered(fd2 -> fd.getObservationTypes().addAll(fd2.getObservationTypes())) - ); + .forEachOrdered(fd2 -> fd.getObservationTypes().addAll(fd2.getObservationTypes()))); } } @@ -379,29 +418,37 @@ private void mergeFormatDescriptors(FormatDescriptor fdToMerge) { public static class FormatDescriptor implements Copyable<FormatDescriptor> { private ProcedureDescriptionFormatDescriptor procedureDescriptionFormatDescriptor; - private final Set<ObservationFormatDescriptor> observationFormatDescriptors; + private final Set<ObservationFormatDescriptor> observationFormatDescriptors = new LinkedHashSet<>(); /** - * @param procedureDescriptionFormatDescriptor the {@link ProcedureDescriptionFormatDescriptor} - * @param observationFormatDescriptors the {@link ObservationFormatDescriptor}s + * @param procedureDescriptionFormatDescriptor + * the {@link ProcedureDescriptionFormatDescriptor} + * @param observationFormatDescriptors + * the {@link ObservationFormatDescriptor}s */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public FormatDescriptor(ProcedureDescriptionFormatDescriptor procedureDescriptionFormatDescriptor, - Set<ObservationFormatDescriptor> observationFormatDescriptors) { + Set<ObservationFormatDescriptor> observationFormatDescriptors) { super(); this.procedureDescriptionFormatDescriptor = procedureDescriptionFormatDescriptor; - this.observationFormatDescriptors = observationFormatDescriptors; + if (observationFormatDescriptors != null) { + this.observationFormatDescriptors.addAll(observationFormatDescriptors); + } } /** * @return the procedureDescriptionFormatDescriptor */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public ProcedureDescriptionFormatDescriptor getProcedureDescriptionFormatDescriptor() { return procedureDescriptionFormatDescriptor; } /** - * @param procedureDescriptionFormatDescriptor the procedureDescriptionFormatDescriptor to set + * @param procedureDescriptionFormatDescriptor + * the procedureDescriptionFormatDescriptor to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setProcedureDescriptionFormatDescriptor( ProcedureDescriptionFormatDescriptor procedureDescriptionFormatDescriptor) { this.procedureDescriptionFormatDescriptor = procedureDescriptionFormatDescriptor; @@ -411,21 +458,27 @@ public void setProcedureDescriptionFormatDescriptor( * @return the observationFormatDescriptors */ public Set<ObservationFormatDescriptor> getObservationFormatDescriptors() { - return observationFormatDescriptors; + return Collections.unmodifiableSet(observationFormatDescriptors); } /** - * @param observationFormatDescriptors the observationFormatDescriptors to set + * @param observationFormatDescriptors + * the observationFormatDescriptors to set + * @return */ - public void setObservationFormatDescriptors(Set<ObservationFormatDescriptor> observationFormatDescriptors) { + public FormatDescriptor setObservationFormatDescriptors( + Collection<ObservationFormatDescriptor> observationFormatDescriptors) { this.observationFormatDescriptors.clear(); - this.observationFormatDescriptors.addAll(observationFormatDescriptors); + if (observationFormatDescriptors != null) { + this.observationFormatDescriptors.addAll(observationFormatDescriptors); + } + return this; } @Override public FormatDescriptor copy() { return new FormatDescriptor(procedureDescriptionFormatDescriptor, - Sets.newHashSet(observationFormatDescriptors)); + Sets.newHashSet(observationFormatDescriptors)); } } @@ -437,16 +490,21 @@ public FormatDescriptor copy() { public static class ObservationFormatDescriptor implements Copyable<ObservationFormatDescriptor> { private String responseFormat; - private final Set<String> observationTypes; + private final Set<String> observationTypes = new LinkedHashSet<>(); /** - * @param responseFormat the response format - * @param observationTypes the observation types + * @param responseFormat + * the response format + * @param observationTypes + * the observation types */ - public ObservationFormatDescriptor(String responseFormat, Set<String> observationTypes) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public ObservationFormatDescriptor(String responseFormat, Collection<String> observationTypes) { super(); this.responseFormat = responseFormat; - this.observationTypes = observationTypes; + if (observationTypes != null) { + this.observationTypes.addAll(observationTypes); + } } /** @@ -457,7 +515,8 @@ public String getResponseFormat() { } /** - * @param responseFormat the responseFormat to set + * @param responseFormat + * the responseFormat to set */ public void setResponseFormat(String responseFormat) { this.responseFormat = responseFormat; @@ -467,15 +526,20 @@ public void setResponseFormat(String responseFormat) { * @return the observationTypes */ public Set<String> getObservationTypes() { - return observationTypes; + return Collections.unmodifiableSet(observationTypes); } /** - * @param observationTypes the observationTypes to set + * @param observationTypes + * the observationTypes to set + * @return */ - public void setObservationTypes(Set<String> observationTypes) { + public ObservationFormatDescriptor setObservationTypes(Collection<String> observationTypes) { this.observationTypes.clear(); - this.observationTypes.addAll(observationTypes); + if (observationTypes != null) { + this.observationTypes.addAll(observationTypes); + } + return this; } @Override @@ -489,13 +553,15 @@ public ObservationFormatDescriptor copy() { * @since 1.0.0 * */ - //FIXME: replace with org.n52.shetland.ogc.sos.ProcedureDescriptionFormat - public static class ProcedureDescriptionFormatDescriptor implements Copyable<ProcedureDescriptionFormatDescriptor> { + // FIXME: replace with org.n52.shetland.ogc.sos.ProcedureDescriptionFormat + public static class ProcedureDescriptionFormatDescriptor + implements Copyable<ProcedureDescriptionFormatDescriptor> { private String procedureDescriptionFormat; /** - * @param procedureDescriptionFormat the procedure desciption format + * @param procedureDescriptionFormat + * the procedure desciption format */ public ProcedureDescriptionFormatDescriptor(String procedureDescriptionFormat) { super(); @@ -510,7 +576,8 @@ public String getProcedureDescriptionFormat() { } /** - * @param procedureDescriptionFormat the procedureDescriptionFormat to set + * @param procedureDescriptionFormat + * the procedureDescriptionFormat to set */ public void setProcedureDescriptionFormat(String procedureDescriptionFormat) { this.procedureDescriptionFormat = procedureDescriptionFormat; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ifoi/InsertFeatureOfInterestRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ifoi/InsertFeatureOfInterestRequest.java index d9fdcc1e2..01ec07c3c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ifoi/InsertFeatureOfInterestRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ifoi/InsertFeatureOfInterestRequest.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.sos.ifoi; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.n52.shetland.ogc.gml.AbstractFeature; @@ -39,7 +40,7 @@ public InsertFeatureOfInterestRequest(String service, String version, String ope } public List<AbstractFeature> getFeatureMembers() { - return abstractFeatures; + return Collections.unmodifiableList(abstractFeatures); } public InsertFeatureOfInterestRequest setFeatureMembers(List<AbstractFeature> abstractFeatures) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/BatchRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/BatchRequest.java index 2396bdbe5..d0fb55b21 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/BatchRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/BatchRequest.java @@ -24,6 +24,8 @@ import org.n52.shetland.ogc.ows.service.OwsServiceRequest; import org.n52.shetland.ogc.sos.BatchConstants; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -36,6 +38,7 @@ public class BatchRequest extends OwsServiceRequest implements Iterable<OwsServi private boolean stopAtFailure; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public BatchRequest(List<OwsServiceRequest> requests) { super(null, null, BatchConstants.OPERATION_NAME); this.requests = Objects.requireNonNull(requests); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/DescribeSensorRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/DescribeSensorRequest.java index 3d4c338f5..74e18c106 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/DescribeSensorRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/DescribeSensorRequest.java @@ -21,6 +21,8 @@ import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS DescribeSensor request * @@ -107,6 +109,7 @@ public boolean isSetProcedure() { * * @return valid time */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getValidTime() { return validTime; } @@ -116,7 +119,7 @@ public Time getValidTime() { * * @param validTime * valid time - */ + */@SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setValidTime(Time validTime) { this.validTime = validTime; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetFeatureOfInterestRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetFeatureOfInterestRequest.java index d1c55a49e..9cfbb87b1 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetFeatureOfInterestRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetFeatureOfInterestRequest.java @@ -15,8 +15,10 @@ */ package org.n52.shetland.ogc.sos.request; -import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -26,6 +28,8 @@ import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.util.CollectionHelper; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Sos GetFeatureOfInterst request * @@ -36,29 +40,29 @@ public class GetFeatureOfInterestRequest extends OwsServiceRequest { /** * FOI identifiers list */ - private List<String> featureIdentifiers = new ArrayList<>(); + private List<String> featureIdentifiers = new LinkedList<>(); /** * FOI observedProperties list */ - private List<String> observedProperties; + private List<String> observedProperties = new LinkedList<>(); /** * FOI procedures list */ - private List<String> procedures; + private List<String> procedures = new LinkedList<>(); /** * FOI spatial filters list */ - private List<SpatialFilter> spatialFilters; + private List<SpatialFilter> spatialFilters = new LinkedList<>(); /** * FOI temporal filters list */ - private List<TemporalFilter> temporalFilters; + private List<TemporalFilter> temporalFilters = new LinkedList<>(); - private Map<String, String> namespaces; + private Map<String, String> namespaces = new LinkedHashMap<>(); public GetFeatureOfInterestRequest() { super(null, null, SosConstants.Operations.GetFeatureOfInterest.name()); @@ -78,7 +82,7 @@ public GetFeatureOfInterestRequest(String service, String version, String operat * @return temporal filters */ public List<TemporalFilter> getTemporalFilters() { - return temporalFilters; + return Collections.unmodifiableList(temporalFilters); } /** @@ -87,8 +91,13 @@ public List<TemporalFilter> getTemporalFilters() { * @param temporalFilters * temporal filters */ - public void setTemporalFilters(List<TemporalFilter> temporalFilters) { - this.temporalFilters = temporalFilters; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public GetFeatureOfInterestRequest setTemporalFilters(List<TemporalFilter> temporalFilters) { + this.temporalFilters.clear(); + if (temporalFilters != null) { + this.temporalFilters.addAll(temporalFilters); + } + return this; } /** @@ -97,7 +106,7 @@ public void setTemporalFilters(List<TemporalFilter> temporalFilters) { * @return FOI identifiers */ public List<String> getFeatureIdentifiers() { - return featureIdentifiers; + return Collections.unmodifiableList(featureIdentifiers); } /** @@ -106,11 +115,12 @@ public List<String> getFeatureIdentifiers() { * @param featureIDs * FOI identifiers */ - public void setFeatureIdentifiers(Collection<String> featureIDs) { + public GetFeatureOfInterestRequest setFeatureIdentifiers(Collection<String> featureIDs) { this.featureIdentifiers.clear(); if (featureIDs != null) { this.featureIdentifiers.addAll(featureIDs); } + return this; } /** @@ -119,7 +129,7 @@ public void setFeatureIdentifiers(Collection<String> featureIDs) { * @return FOI observedProperties */ public List<String> getObservedProperties() { - return observedProperties; + return Collections.unmodifiableList(observedProperties); } /** @@ -128,8 +138,13 @@ public List<String> getObservedProperties() { * @param observedProperties * FOI observedProperties */ - public void setObservedProperties(List<String> observedProperties) { - this.observedProperties = observedProperties; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public GetFeatureOfInterestRequest setObservedProperties(List<String> observedProperties) { + this.observedProperties.clear(); + if (observedProperties != null) { + this.observedProperties.addAll(observedProperties); + } + return this; } /** @@ -138,7 +153,7 @@ public void setObservedProperties(List<String> observedProperties) { * @return FOI procedures */ public List<String> getProcedures() { - return procedures; + return Collections.unmodifiableList(procedures); } /** @@ -147,8 +162,13 @@ public List<String> getProcedures() { * @param procedures * FOI procedures */ - public void setProcedures(List<String> procedures) { - this.procedures = procedures; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public GetFeatureOfInterestRequest setProcedures(List<String> procedures) { + this.procedures.clear(); + if (procedures != null) { + this.procedures.addAll(procedures); + } + return this; } /** @@ -157,7 +177,7 @@ public void setProcedures(List<String> procedures) { * @return spatial filters */ public List<SpatialFilter> getSpatialFilters() { - return spatialFilters; + return Collections.unmodifiableList(spatialFilters); } /** @@ -166,16 +186,26 @@ public List<SpatialFilter> getSpatialFilters() { * @param spatialFilters * spatial filters */ - public void setSpatialFilters(List<SpatialFilter> spatialFilters) { - this.spatialFilters = spatialFilters; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public GetFeatureOfInterestRequest setSpatialFilters(List<SpatialFilter> spatialFilters) { + this.spatialFilters.clear(); + if (spatialFilters != null) { + this.spatialFilters.addAll(spatialFilters); + } + return this; } - public void setNamespaces(Map<String, String> namespaces) { - this.namespaces = namespaces; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public GetFeatureOfInterestRequest setNamespaces(Map<String, String> namespaces) { + this.namespaces.clear(); + if (namespaces != null) { + this.namespaces.putAll(namespaces); + } + return this; } public Map<String, String> getNamespaces() { - return namespaces; + return Collections.unmodifiableMap(namespaces); } public boolean isSetFeatureOfInterestIdentifiers() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationByIdRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationByIdRequest.java index f7176b934..d2ad70586 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationByIdRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationByIdRequest.java @@ -15,10 +15,15 @@ */ package org.n52.shetland.ogc.sos.request; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.sos.SosConstants; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS GetObservationById request * @@ -29,7 +34,7 @@ public class GetObservationByIdRequest extends AbstractObservationRequest { /** * Observation identifier */ - private List<String> observationIdentifier; + private List<String> observationIdentifier = new LinkedList<>(); public GetObservationByIdRequest() { super(null, null, SosConstants.Operations.GetObservationById.name()); @@ -49,7 +54,7 @@ public GetObservationByIdRequest(String service, String version, String operatio * @return observation identifier */ public List<String> getObservationIdentifier() { - return observationIdentifier; + return Collections.unmodifiableList(observationIdentifier); } public boolean isSetObservationIdentifier() { @@ -61,9 +66,15 @@ public boolean isSetObservationIdentifier() { * * @param observationIdentifier * observation identifier + * @return */ - public void setObservationIdentifier(List<String> observationIdentifier) { - this.observationIdentifier = observationIdentifier; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public GetObservationByIdRequest setObservationIdentifier(Collection<String> observationIdentifier) { + this.observationIdentifier.clear(); + if (observationIdentifier != null) { + this.observationIdentifier.addAll(observationIdentifier); + } + return this; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationRequest.java index 9b1960d94..fdc7aa61c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationRequest.java @@ -18,7 +18,7 @@ import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; -import java.util.LinkedList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; @@ -49,6 +49,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS GetObservation request. * @@ -115,7 +117,7 @@ public GetObservationRequest(String service, String version, String operationNam * @return temporal filters */ public List<TemporalFilter> getTemporalFilters() { - return temporalFilters; + return Collections.unmodifiableList(temporalFilters); } /** @@ -124,12 +126,17 @@ public List<TemporalFilter> getTemporalFilters() { * @param temporalFilters * temporal filters */ - public void setTemporalFilters(List<TemporalFilter> temporalFilters) { - this.temporalFilters = Optional.ofNullable(temporalFilters).orElseGet(LinkedList::new); + public GetObservationRequest setTemporalFilters(List<TemporalFilter> temporalFilters) { + this.temporalFilters.clear(); + if (temporalFilters != null) { + this.temporalFilters.addAll(temporalFilters); + } + return this; } - public void addTemporalFilter(TemporalFilter filter) { + public GetObservationRequest addTemporalFilter(TemporalFilter filter) { this.temporalFilters.add(filter); + return this; } /** @@ -139,7 +146,7 @@ public void addTemporalFilter(TemporalFilter filter) { */ @Override public List<String> getFeatureIdentifiers() { - return featureIdentifiers; + return Collections.unmodifiableList(featureIdentifiers); } /** @@ -150,11 +157,15 @@ public List<String> getFeatureIdentifiers() { */ @Override public void setFeatureIdentifiers(List<String> featureIdentifiers) { - this.featureIdentifiers = Optional.ofNullable(featureIdentifiers).orElseGet(LinkedList::new); + this.featureIdentifiers.clear(); + if (featureIdentifiers != null) { + this.featureIdentifiers.addAll(featureIdentifiers); + } } - public void addFeatureIdentifier(String featureIdentifier) { + public GetObservationRequest addFeatureIdentifier(String featureIdentifier) { this.featureIdentifiers.add(featureIdentifier); + return this; } /** @@ -163,7 +174,7 @@ public void addFeatureIdentifier(String featureIdentifier) { * @return observableProperties */ public List<String> getObservedProperties() { - return observedProperties; + return Collections.unmodifiableList(observedProperties); } /** @@ -172,12 +183,17 @@ public List<String> getObservedProperties() { * @param observedProperties * observedProperties */ - public void setObservedProperties(List<String> observedProperties) { - this.observedProperties = Optional.ofNullable(observedProperties).orElseGet(LinkedList::new); + public GetObservationRequest setObservedProperties(List<String> observedProperties) { + this.observedProperties.clear(); + if (observedProperties != null) { + this.observedProperties.addAll(observedProperties); + } + return this; } - public void addObservedProperty(String observedProperty) { + public GetObservationRequest addObservedProperty(String observedProperty) { this.observedProperties.add(observedProperty); + return this; } /** @@ -186,7 +202,7 @@ public void addObservedProperty(String observedProperty) { * @return offerings */ public List<String> getOfferings() { - return offerings; + return Collections.unmodifiableList(offerings); } /** @@ -195,12 +211,17 @@ public List<String> getOfferings() { * @param offerings * offerings */ - public void setOfferings(List<String> offerings) { - this.offerings = Optional.ofNullable(offerings).orElseGet(LinkedList::new); + public GetObservationRequest setOfferings(List<String> offerings) { + this.offerings.clear(); + if (offerings != null) { + this.offerings.addAll(offerings); + } + return this; } - public void addOffering(String offering) { + public GetObservationRequest addOffering(String offering) { this.offerings.add(offering); + return this; } /** @@ -209,7 +230,7 @@ public void addOffering(String offering) { * @return procedures */ public List<String> getProcedures() { - return procedures; + return Collections.unmodifiableList(procedures); } /** @@ -218,12 +239,17 @@ public List<String> getProcedures() { * @param procedures * procedures */ - public void setProcedures(List<String> procedures) { - this.procedures = Optional.ofNullable(procedures).orElseGet(LinkedList::new); + public GetObservationRequest setProcedures(List<String> procedures) { + this.procedures.clear(); + if (procedures != null) { + this.procedures.addAll(procedures); + } + return this; } - public void addProcedure(String procedure) { + public GetObservationRequest addProcedure(String procedure) { this.procedures.add(procedure); + return this; } /** @@ -253,11 +279,13 @@ public GetObservationRequest setResultFilter(ComparisonFilter filter) { * result filter(s) */ @SuppressWarnings("rawtypes") - public void setResultFilter(Filter resultFilter) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public GetObservationRequest setResultFilter(Filter resultFilter) { this.resultFilter = resultFilter; if (resultFilter instanceof ComparisonFilter) { addExtension(new ResultFilter((ComparisonFilter) resultFilter)); } + return this; } /** @@ -289,8 +317,9 @@ public String getRequestString() { * @param requestString * request as String */ - public void setRequestString(String requestString) { + public GetObservationRequest setRequestString(String requestString) { this.requestString = requestString; + return this; } /** @@ -299,6 +328,7 @@ public void setRequestString(String requestString) { * @return spatial filter */ @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SpatialFilter getSpatialFilter() { if (hasExtension(SosSpatialFilterConstants.SPATIAL_FILTER)) { return ((SosSpatialFilter) getExtension(SosSpatialFilterConstants.SPATIAL_FILTER).get()).getValue(); @@ -313,6 +343,7 @@ public SpatialFilter getSpatialFilter() { * spatial filter */ @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setSpatialFilter(SpatialFilter resultSpatialFilter) { this.spatialFilter = resultSpatialFilter; } @@ -343,12 +374,16 @@ public GetObservationRequest copyOf(List<String> obsProps) { } - public void setNamespaces(Map<String, String> namespaces) { - this.namespaces = namespaces; + public GetObservationRequest setNamespaces(Map<String, String> namespaces) { + this.namespaces.clear(); + if (namespaces != null) { + this.namespaces.putAll(namespaces); + } + return this; } public Map<String, String> getNamespaces() { - return namespaces; + return Collections.unmodifiableMap(namespaces); } public boolean isSetOffering() { @@ -419,8 +454,9 @@ public boolean isSetNamespaces() { return CollectionHelper.isNotEmpty(getNamespaces()); } - public void setMergeObservationValues(boolean mergeObservationValues) { + public GetObservationRequest setMergeObservationValues(boolean mergeObservationValues) { this.mergeObservationValues = mergeObservationValues; + return this; } public boolean isSetMergeObservationValues() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetResultRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetResultRequest.java index 9c07402e8..35e45841a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetResultRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetResultRequest.java @@ -15,6 +15,10 @@ */ package org.n52.shetland.ogc.sos.request; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -26,6 +30,8 @@ import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 * @@ -43,13 +49,13 @@ public class GetResultRequest private String observedProperty; - private List<String> featureIdentifiers; + private List<String> featureIdentifiers = new LinkedList<>(); - private List<TemporalFilter> temporalFilter; + private List<TemporalFilter> temporalFilter = new LinkedList<>(); private SpatialFilter spatialFilter; - private Map<String, String> namespaces; + private Map<String, String> namespaces = new LinkedHashMap<>(); public GetResultRequest() { super(null, null, SosConstants.Operations.GetResult.name()); @@ -77,9 +83,11 @@ public String getObservationTemplateIdentifier() { * * @param observationTemplateIdentifier * observation template identifier + * @return */ - public void setObservationTemplateIdentifier(String observationTemplateIdentifier) { + public GetResultRequest setObservationTemplateIdentifier(String observationTemplateIdentifier) { this.observationTemplateIdentifier = observationTemplateIdentifier; + return this; } public boolean isSetObservationTemplateIdentifier() { @@ -90,8 +98,9 @@ public String getOffering() { return offering; } - public void setOffering(String offering) { + public GetResultRequest setOffering(String offering) { this.offering = offering; + return this; } public boolean isSetOffering() { @@ -102,8 +111,9 @@ public String getObservedProperty() { return observedProperty; } - public void setObservedProperty(String observedProperty) { + public GetResultRequest setObservedProperty(String observedProperty) { this.observedProperty = observedProperty; + return this; } public boolean isSetObservedProperty() { @@ -117,7 +127,7 @@ public boolean isSetObservedProperty() { */ @Override public List<String> getFeatureIdentifiers() { - return featureIdentifiers; + return Collections.unmodifiableList(featureIdentifiers); } /** @@ -125,18 +135,26 @@ public List<String> getFeatureIdentifiers() { * * @param featureIdentifiers * FOI identifiers + * @return */ @Override public void setFeatureIdentifiers(List<String> featureIdentifiers) { - this.featureIdentifiers = featureIdentifiers; + this.featureIdentifiers.clear(); + if (featureIdentifiers != null) { + this.featureIdentifiers.addAll(featureIdentifiers); + } } public List<TemporalFilter> getTemporalFilter() { - return temporalFilter; + return Collections.unmodifiableList(temporalFilter); } - public void setTemporalFilter(List<TemporalFilter> temporalFilters) { - this.temporalFilter = temporalFilters; + public GetResultRequest setTemporalFilter(Collection<TemporalFilter> temporalFilters) { + this.temporalFilter.clear(); + if (temporalFilters != null) { + this.temporalFilter.addAll(temporalFilters); + } + return this; } public boolean hasTemporalFilter() { @@ -144,21 +162,27 @@ public boolean hasTemporalFilter() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SpatialFilter getSpatialFilter() { return spatialFilter; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setSpatialFilter(SpatialFilter spatialFilter) { this.spatialFilter = spatialFilter; } public Map<String, String> getNamespaces() { - return namespaces; + return Collections.unmodifiableMap(namespaces); } - public void setNamespaces(Map<String, String> namespaces) { - this.namespaces = namespaces; + public GetResultRequest setNamespaces(Map<String, String> namespaces) { + this.namespaces.clear(); + if (namespaces != null) { + this.namespaces.putAll(namespaces); + } + return this; } public boolean isSetNamespaces() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertObservationRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertObservationRequest.java index 46f5ddf71..54c2426f4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertObservationRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertObservationRequest.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.ogc.sos.request; +import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -33,6 +35,8 @@ import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS InsertObservation request * @@ -45,11 +49,11 @@ public class InsertObservationRequest * Assigned sensor id */ private String assignedSensorId; - private List<String> offerings; + private List<String> offerings = new LinkedList<>(); /** * SOS observation collection with observations to insert */ - private List<OmObservation> observations; + private List<OmObservation> observations = new LinkedList<>(); private ReferenceChecker referenceChecker = new ReferenceChecker(); public InsertObservationRequest() { @@ -94,7 +98,7 @@ public boolean isSetAssignedSensorId() { * @return observations to insert */ public List<OmObservation> getObservations() { - return observations; + return Collections.unmodifiableList(observations); } /** @@ -109,9 +113,6 @@ public InsertObservationRequest setObservation(List<OmObservation> observation) } public InsertObservationRequest addObservation(OmObservation observation) { - if (observations == null) { - observations = new LinkedList<OmObservation>(); - } observations.add(referenceChecker.checkObservationForReferences(observation)); return this; } @@ -120,13 +121,17 @@ public boolean isSetObservation() { return CollectionHelper.isNotEmpty(getObservations()); } - public InsertObservationRequest setOfferings(List<String> offerings) { - this.offerings = offerings; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public InsertObservationRequest setOfferings(Collection<String> offerings) { + this.offerings.clear(); + if (offerings != null) { + this.offerings.addAll(offerings); + } return this; } public List<String> getOfferings() { - return offerings; + return Collections.unmodifiableList(offerings); } public boolean isSetOfferings() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertResultTemplateRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertResultTemplateRequest.java index 98e591830..f2cda1c9c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertResultTemplateRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertResultTemplateRequest.java @@ -26,6 +26,8 @@ import org.n52.shetland.ogc.sos.SosResultTemplate; import org.n52.shetland.util.IdGenerator; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @since 1.0.0 */ @@ -66,10 +68,12 @@ public void setIdentifier(String identifier) { } + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public OmObservationConstellation getObservationTemplate() { return observationTemplate; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setObservationTemplate(OmObservationConstellation observationConstellation) { this.observationTemplate = observationConstellation; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertSensorRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertSensorRequest.java index 3c1470215..62ab78148 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertSensorRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertSensorRequest.java @@ -16,6 +16,8 @@ package org.n52.shetland.ogc.sos.request; import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.ows.service.OwsServiceRequest; @@ -27,7 +29,8 @@ import org.n52.shetland.util.CollectionHelper; import com.google.common.base.Strings; -import com.google.common.collect.Lists; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * @since 1.0.0 @@ -41,15 +44,15 @@ public class InsertSensorRequest extends OwsServiceRequest { /** * observableProperty parameter */ - private List<String> observableProperty; - private List<SwesFeatureRelationship> relatedFeatures; + private List<String> observableProperty = new LinkedList<>(); + private List<SwesFeatureRelationship> relatedFeatures = new LinkedList<>(); /** * SOS SensorML description */ private SosProcedureDescription<?> procedureDescription; private String assignedProcedureIdentifier; - private List<SosOffering> assignedOfferings = Lists.newLinkedList(); + private List<SosOffering> assignedOfferings = new LinkedList<>(); /** * metadata parameter @@ -75,6 +78,7 @@ public String getProcedureDescriptionFormat() { return procedureDescriptionFormat; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public InsertSensorRequest setProcedureDescriptionFormat(String procedureDescriptionFormat) { this.procedureDescriptionFormat = procedureDescriptionFormat; return this; @@ -90,7 +94,7 @@ public boolean isSetProcedureDescriptionFormat() { * @return the observableProperty */ public List<String> getObservableProperty() { - return observableProperty; + return Collections.unmodifiableList(observableProperty); } /** @@ -99,8 +103,12 @@ public List<String> getObservableProperty() { * @param observableProperty * the observableProperty to set */ - public InsertSensorRequest setObservableProperty(List<String> observableProperty) { - this.observableProperty = observableProperty; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public InsertSensorRequest setObservableProperty(Collection<String> observableProperty) { + this.observableProperty.clear(); + if (observableProperty != null) { + this.observableProperty.addAll(observableProperty); + } return this; } @@ -113,6 +121,7 @@ public boolean isSetObservableProperty() { * * @return the sosSensorML */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public SosProcedureDescription<?> getProcedureDescription() { return procedureDescription; } @@ -123,6 +132,7 @@ public SosProcedureDescription<?> getProcedureDescription() { * @param procedureDescription * the procedureDescription to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public InsertSensorRequest setProcedureDescription(SosProcedureDescription<?> procedureDescription) { this.procedureDescription = procedureDescription; return this; @@ -147,6 +157,7 @@ public SosInsertionMetadata getMetadata() { * @param metadata * the metadata to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public InsertSensorRequest setMetadata(SosInsertionMetadata metadata) { this.metadata = metadata; return this; @@ -157,11 +168,15 @@ public boolean isSetMetadata() { } public List<SwesFeatureRelationship> getRelatedFeatures() { - return relatedFeatures; + return Collections.unmodifiableList(relatedFeatures); } - public InsertSensorRequest setRelatedFeature(List<SwesFeatureRelationship> relatedFeatures) { - this.relatedFeatures = relatedFeatures; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public InsertSensorRequest setRelatedFeature(Collection<SwesFeatureRelationship> relatedFeatures) { + this.relatedFeatures.clear(); + if (relatedFeatures != null) { + this.relatedFeatures.addAll(relatedFeatures); + } return this; } @@ -173,6 +188,7 @@ public String getAssignedProcedureIdentifier() { return assignedProcedureIdentifier; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public InsertSensorRequest setAssignedProcedureIdentifier(String assignedProcedureID) { this.assignedProcedureIdentifier = assignedProcedureID; return this; @@ -183,11 +199,15 @@ public boolean isSetAssignedProcedureIdentifier() { } public List<SosOffering> getAssignedOfferings() { - return assignedOfferings; + return Collections.unmodifiableList(assignedOfferings); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public InsertSensorRequest setAssignedOfferings(Collection<SosOffering> assignedOfferings) { - this.assignedOfferings.addAll(assignedOfferings); + this.assignedOfferings.clear(); + if (assignedOfferings != null) { + this.assignedOfferings.addAll(assignedOfferings); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosRegisterSensorRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosRegisterSensorRequest.java index 722a5506d..feb3ed1ff 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosRegisterSensorRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosRegisterSensorRequest.java @@ -16,12 +16,16 @@ package org.n52.shetland.ogc.sos.request; import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.om.AbstractPhenomenon; import org.n52.shetland.ogc.ows.service.OwsServiceRequest; import org.n52.shetland.ogc.sos.Sos1Constants; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * SOS RegisterSensor request * @@ -38,12 +42,12 @@ public class SosRegisterSensorRequest /** * observableProperties collection */ - private Collection<AbstractPhenomenon> observableProperties; + private Collection<AbstractPhenomenon> observableProperties = new LinkedHashSet<>(); /** * featureOfInterest collection */ - private Collection<AbstractFeature> featuresOfInterest; + private Collection<AbstractFeature> featuresOfInterest = new LinkedHashSet<>(); /** * Sensor description @@ -60,14 +64,15 @@ public class SosRegisterSensorRequest * @param featuresOfInterest * FeatureOfInterest */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SosRegisterSensorRequest( Collection<AbstractPhenomenon> observableProperties, String sensorDescription, Collection<AbstractFeature> featuresOfInterest) { super(null, null, Sos1Constants.Operations.RegisterSensor.name()); // this.system = system; - this.observableProperties = observableProperties; + this.observableProperties.addAll(observableProperties); this.sensorDescription = sensorDescription; - this.featuresOfInterest = featuresOfInterest; + this.featuresOfInterest.addAll(featuresOfInterest); } /** @@ -76,7 +81,7 @@ public SosRegisterSensorRequest( * @return observableProperties */ public Collection<AbstractPhenomenon> getObservableProperties() { - return observableProperties; + return Collections.unmodifiableCollection(observableProperties); } /** @@ -85,8 +90,12 @@ public Collection<AbstractPhenomenon> getObservableProperties() { * @param observableProperties * observableProperties */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setObservableProperties(Collection<AbstractPhenomenon> observableProperties) { - this.observableProperties = observableProperties; + this.observableProperties.clear(); + if (observableProperties != null) { + this.observableProperties.addAll(observableProperties); + } } /** @@ -108,32 +117,13 @@ public void setSensorDescription(String sensorDescription) { this.sensorDescription = sensorDescription; } - // /** - // * Get SOS sensor system - // * - // * @return SOS sensor system - // */ - // public SensorSystem getSystem() { - // return system; - // } - // - // /** - // * Set SOS sensor system - // * - // * @param system - // * SOS sensor system - // */ - // public void setSystem(SensorSystem system) { - // this.system = system; - // } - /** * Get featuresOfInterst * * @return featuresOfInterst */ public Collection<AbstractFeature> getFeaturesOfInterest() { - return featuresOfInterest; + return Collections.unmodifiableCollection(featuresOfInterest); } /** @@ -142,8 +132,12 @@ public Collection<AbstractFeature> getFeaturesOfInterest() { * @param featuresOfInterest * featuresOfInterst */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setFeaturesOfInterest(Collection<AbstractFeature> featuresOfInterest) { - this.featuresOfInterest = featuresOfInterest; + this.featuresOfInterest.clear(); + if (featuresOfInterest != null) { + this.featuresOfInterest.addAll(featuresOfInterest); + } } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/UpdateSensorRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/UpdateSensorRequest.java index 666cf3d08..37016502c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/UpdateSensorRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/UpdateSensorRequest.java @@ -16,6 +16,9 @@ package org.n52.shetland.ogc.sos.request; import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.ows.service.OwsServiceRequest; @@ -25,6 +28,8 @@ import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * class represents a updateSensor request * @@ -38,7 +43,7 @@ public class UpdateSensorRequest extends OwsServiceRequest { /** * SOS SensorML description */ - private List<SosProcedureDescription<?>> procedureDescriptions; + private List<SosProcedureDescription<?>> procedureDescriptions = new LinkedList<>(); /** * default constructor @@ -87,18 +92,21 @@ public boolean isSetProcedureDescriptionFormat() { } public List<SosProcedureDescription<?>> getProcedureDescriptions() { - return procedureDescriptions; + return Collections.unmodifiableList(procedureDescriptions); } - public void setProcedureDescriptions(List<SosProcedureDescription<?>> procedureDescriptions) { - this.procedureDescriptions = procedureDescriptions; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public void setProcedureDescriptions(Collection<SosProcedureDescription<?>> procedureDescriptions) { + this.procedureDescriptions.clear(); + if (procedureDescriptions != null) { + this.procedureDescriptions.addAll(procedureDescriptions); + } } public void addProcedureDescriptionString(SosProcedureDescription<?> procedureDescription) { - if (procedureDescriptions == null) { - procedureDescriptions = new ArrayList<>(); + if (procedureDescription != null) { + procedureDescriptions.add(procedureDescription); } - procedureDescriptions.add(procedureDescription); } public boolean isSetProcedureDescriptions() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java index 7977eb88a..0e3862c95 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java @@ -127,7 +127,7 @@ public int hashCode() { final int prime = 42; int hash = 7; hash = prime * hash + super.hashCode(); - hash = prime * hash + (getFields() != null ? getFields().hashCode() : 0); + hash = prime * hash + getFields().hashCode(); return hash; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java index f1278384c..fce2eea3c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java @@ -150,12 +150,10 @@ public boolean isSetValues() { * <tt>false</tt> if block could not be added */ public boolean add(final List<String> blockOfTokensToAddAtTheEnd) { - if (values == null) { - values = new LinkedList<>(); - } return values.add(blockOfTokensToAddAtTheEnd); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public boolean addAll(List<List<String>> newValues) { return newValues != null ? values.addAll(newValues) : true; } @@ -165,7 +163,7 @@ public int hashCode() { final int prime = 23; int hash = 7; hash = prime * hash + super.hashCode(); - hash = prime * hash + (getValues() != null ? getValues().hashCode() : 0); + hash = prime * hash + getValues().hashCode(); hash = prime * hash + (getElementType() != null ? getElementType().hashCode() : 0); hash = prime * hash + (getEncoding() != null ? getEncoding().hashCode() : 0); return hash; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java index 4b17de14c..f052bdc3d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java @@ -53,7 +53,7 @@ public class SweDataStream * Each list entry represents one block, a list of tokens.<br /> * Atm, this implementation using java.lang.String to represent each token. */ - private List<List<String>> values; + private List<List<String>> values = new LinkedList<>(); /** * swe:elementType @@ -186,16 +186,11 @@ public boolean isSetValues() { * <tt>false</tt> if block could not be added */ public boolean add(final List<String> blockOfTokensToAddAtTheEnd) { - if (values == null) { - values = new LinkedList<>(); - } return values.add(blockOfTokensToAddAtTheEnd); } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public boolean addAll(List<List<String>> newValues) { - if (values == null) { - values = newValues; - } return values.addAll(newValues); } @@ -217,7 +212,7 @@ public int hashCode() { final int prime = 23; int hash = 7; hash = prime * hash + super.hashCode(); - hash = prime * hash + (getValues() != null ? getValues().hashCode() : 0); + hash = prime * hash + getValues().hashCode(); hash = prime * hash + (getElementType() != null ? getElementType().hashCode() : 0); hash = prime * hash + (getEncoding() != null ? getEncoding().hashCode() : 0); hash = prime * hash + (getDescription() != null ? getDescription().hashCode() : 0); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweField.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweField.java index 2e6d60641..789a877b9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweField.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweField.java @@ -59,6 +59,7 @@ public SweField(final String name, final SweAbstractDataComponent element) { this.element = element; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SweField(final CodeType name, final SweAbstractDataComponent element) { super(); setName(name); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexInputDescriptionImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexInputDescriptionImpl.java index 9dd4708a4..f3e36470e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexInputDescriptionImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexInputDescriptionImpl.java @@ -118,7 +118,7 @@ public Set<Format> getSupportedFormats() { return supportedFormats.build(); } - @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Format getDefaultFormat() { return defaultFormat; } diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/om/values/ProfileLevelTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/om/values/ProfileLevelTest.java index 7170fe981..ec3edbf40 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/om/values/ProfileLevelTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/om/values/ProfileLevelTest.java @@ -17,6 +17,9 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; + +import java.util.LinkedList; + import static org.hamcrest.Matchers.equalTo; import org.junit.jupiter.api.BeforeEach; @@ -52,7 +55,9 @@ public void test_relabel_field_names() { @Test public void test_field_name() { - level.getValue().remove(1); + LinkedList<Value<?>> levels = new LinkedList<>(level.getValue()); + levels.remove(1); + level.setValue(levels); SweDataRecord dataRecord = level.valueAsDataRecord(); assertThat(dataRecord.getFields().size(), is(1)); assertThat(dataRecord.getFields().get(0).getName().getValue(), equalTo("label")); From b33d9977a7a21dbd1370c84a2edcbeab33b50dcd Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 21 Apr 2022 10:02:52 +0200 Subject: [PATCH 275/456] some further fixes --- pom.xml | 2 +- .../aqd/AbstractEReportingHeader.java | 3 +- .../org/n52/shetland/aqd/AqdConstants.java | 28 +- .../java/org/n52/shetland/aqd/AqdNetwork.java | 1 - .../n52/shetland/aqd/AqdSamplingPoint.java | 9 +- .../n52/shetland/aqd/EReportingChange.java | 8 +- .../n52/shetland/aqd/EReportingHeader.java | 3 +- .../n52/shetland/aqd/ReportObligation.java | 22 +- .../shetland/aqd/ReportObligationType.java | 7 +- .../n52/shetland/aqd/ReportObligations.java | 10 +- .../java/org/n52/shetland/exi/EXIObject.java | 9 +- .../org/n52/shetland/filter/CountFilter.java | 13 +- .../org/n52/shetland/filter/ExpandItem.java | 17 +- .../org/n52/shetland/filter/FilterFilter.java | 13 +- .../n52/shetland/filter/OrderByFilter.java | 17 +- .../n52/shetland/filter/OrderProperty.java | 20 +- .../org/n52/shetland/filter/SelectFilter.java | 9 +- .../n52/shetland/filter/SkipTopFilter.java | 13 +- .../inspire/AbstractInspireKeyword.java | 7 +- .../shetland/inspire/InspireConformity.java | 4 +- .../shetland/inspire/InspireConstants.java | 20 +- .../inspire/InspireEuLanguageISO6392B.java | 9 +- .../n52/shetland/inspire/InspireKeyword.java | 3 +- .../inspire/InspireLanguageISO6392B.java | 6 +- ...nspireOriginatingControlledVocabulary.java | 7 +- .../n52/shetland/inspire/Pronunciation.java | 9 +- .../org/n52/shetland/inspire/Spelling.java | 18 +- .../n52/shetland/inspire/base/Identifier.java | 3 +- .../n52/shetland/inspire/base2/Contact.java | 6 +- .../dls/FullInspireExtendedCapabilities.java | 1 + .../inspire/dls/InspireCapabilities.java | 3 +- .../dls/InspireExtendedCapabilities.java | 6 +- .../dls/InspireExtendedCapabilitiesDLS.java | 28 +- .../MinimalInspireExtendedCapabilities.java | 14 +- .../inspire/ef/AbstractMonitoringFeature.java | 6 +- .../inspire/ef/AbstractMonitoringObject.java | 26 +- .../shetland/inspire/ef/AnyDomainLink.java | 7 +- .../ef/EnvironmentalMonitoringActivity.java | 48 ++- .../ef/EnvironmentalMonitoringFacility.java | 70 +++-- .../ef/EnvironmentalMonitoringProgramme.java | 2 +- .../n52/shetland/inspire/ef/Hierarchy.java | 11 +- .../shetland/inspire/ef/NetworkFacility.java | 16 +- .../inspire/ef/ObservingCapability.java | 8 +- .../shetland/inspire/ef/ReportToLegalAct.java | 18 +- .../n52/shetland/inspire/ompr/Process.java | 25 +- .../omso/AbstractInspireObservation.java | 15 +- .../inspire/omso/InspireOMSOConstants.java | 3 +- .../inspire/omso/MultiPointObservation.java | 6 +- .../inspire/omso/PointObservation.java | 3 +- .../omso/PointTimeSeriesObservation.java | 6 +- .../inspire/omso/ProfileObservation.java | 3 +- .../inspire/omso/TrajectoryObservation.java | 12 +- .../java/org/n52/shetland/iso/CodeList.java | 1 - .../org/n52/shetland/iso/GcoConstants.java | 2 - .../iso/gmd/AbstractMDIdentification.java | 3 +- .../n52/shetland/iso/gmd/AbstractObject.java | 9 +- .../org/n52/shetland/iso/gmd/AbtractGmd.java | 4 +- .../org/n52/shetland/iso/gmd/CiContact.java | 39 ++- .../shetland/iso/gmd/CiOnlineResource.java | 3 +- .../shetland/iso/gmd/CiResponsibleParty.java | 12 +- .../org/n52/shetland/iso/gmd/EXExtent.java | 3 +- .../shetland/iso/gmd/EXVerticalExtent.java | 3 +- .../org/n52/shetland/iso/gmd/GmdCitation.java | 3 +- .../n52/shetland/iso/gmd/GmdConstants.java | 8 +- .../org/n52/shetland/iso/gmd/GmdDateType.java | 6 +- .../iso/gmd/GmdDomainConsistency.java | 4 +- .../shetland/iso/gmd/GmdSpecification.java | 10 +- .../iso/gmd/LocalisedCharacterString.java | 12 +- .../java/org/n52/shetland/iso/gmd/ScCRS.java | 3 +- .../n52/shetland/oasis/odata/ODataExpr.java | 4 +- .../odata/query/option/QueryOptions.java | 44 ++- .../n52/shetland/ogc/AbstractCodeType.java | 3 +- .../n52/shetland/ogc/AbstractMeasureType.java | 10 +- .../n52/shetland/ogc/HasDefaultEncoding.java | 3 +- .../main/java/org/n52/shetland/ogc/UoM.java | 11 +- .../filter/AbstractAdHocQueryExpression.java | 21 +- .../ogc/filter/AbstractQueryExpression.java | 3 +- .../shetland/ogc/filter/ComparisonFilter.java | 59 ++-- .../org/n52/shetland/ogc/filter/Filter.java | 4 +- .../ogc/filter/FilterCapabilities.java | 15 +- .../shetland/ogc/filter/FilterConstants.java | 16 +- .../org/n52/shetland/ogc/filter/Filters.java | 72 +++-- .../org/n52/shetland/ogc/filter/IdFilter.java | 25 +- .../shetland/ogc/filter/SpatialFilter.java | 30 +- .../shetland/ogc/filter/TemporalFilter.java | 3 +- .../shetland/ogc/filter/UnaryLogicFilter.java | 4 +- .../n52/shetland/ogc/gml/AbstractDatum.java | 3 +- .../n52/shetland/ogc/gml/AbstractFeature.java | 18 +- .../org/n52/shetland/ogc/gml/AbstractGML.java | 6 +- .../shetland/ogc/gml/AbstractGeometry.java | 4 +- .../ogc/gml/AbstractReferenceType.java | 3 +- .../org/n52/shetland/ogc/gml/Aggregation.java | 7 +- .../org/n52/shetland/ogc/gml/CodeType.java | 9 +- .../shetland/ogc/gml/CodeWithAuthority.java | 15 +- .../ogc/gml/CoordinateSystemAxis.java | 7 +- .../org/n52/shetland/ogc/gml/Definition.java | 3 +- .../shetland/ogc/gml/DomainOfValidity.java | 3 +- .../org/n52/shetland/ogc/gml/FeatureWith.java | 3 +- .../n52/shetland/ogc/gml/GmlConstants.java | 30 +- .../shetland/ogc/gml/GmlMetaDataProperty.java | 16 +- .../n52/shetland/ogc/gml/ReferenceType.java | 1 - .../java/org/n52/shetland/ogc/gml/SortBy.java | 3 +- .../n52/shetland/ogc/gml/UomIdentifier.java | 3 +- .../org/n52/shetland/ogc/gml/VerticalCRS.java | 15 +- .../org/n52/shetland/ogc/gml/VerticalCS.java | 1 - .../ogc/gml/time/IndeterminateValue.java | 10 +- .../org/n52/shetland/ogc/gml/time/Time.java | 9 +- .../shetland/ogc/gml/time/TimeInstant.java | 12 +- .../n52/shetland/ogc/gml/time/TimePeriod.java | 28 +- .../shetland/ogc/gml/time/TimePosition.java | 11 +- .../ogc/gmlcov/GmlCoverageConstants.java | 5 +- .../ogc/om/AbstractObservationStream.java | 4 +- .../ogc/om/AbstractObservationValue.java | 4 +- .../shetland/ogc/om/AbstractPhenomenon.java | 12 +- .../ogc/om/MultiObservationValues.java | 3 +- .../org/n52/shetland/ogc/om/NamedValue.java | 3 +- .../ogc/om/ObservationMergeIndicator.java | 44 ++- .../ogc/om/ObservationParameterHelper.java | 11 +- .../shetland/ogc/om/ObservationStream.java | 40 ++- .../n52/shetland/ogc/om/ObservationValue.java | 3 +- .../ogc/om/OmCompositePhenomenon.java | 2 +- .../org/n52/shetland/ogc/om/OmConstants.java | 19 +- .../shetland/ogc/om/OmObservableProperty.java | 16 +- .../n52/shetland/ogc/om/OmObservation.java | 40 +-- .../ogc/om/OmObservationConstellation.java | 12 +- .../shetland/ogc/om/OmObservationContext.java | 1 - .../n52/shetland/ogc/om/ParameterHolder.java | 79 +++-- .../n52/shetland/ogc/om/PointValuePair.java | 5 +- .../ogc/om/SingleObservationValue.java | 3 +- .../n52/shetland/ogc/om/StreamingValue.java | 13 +- .../ogc/om/TimeLocationValueTriple.java | 5 +- .../n52/shetland/ogc/om/TimeValuePair.java | 3 +- .../ogc/om/features/FeatureCollection.java | 8 +- .../AbstractSamplingFeature.java | 21 +- .../FeatureOfInterestVisitor.java | 15 +- .../InvalidSridException.java | 3 +- .../samplingFeatures/SamplingFeature.java | 10 +- .../SamplingFeatureComplex.java | 11 +- .../features/samplingFeatures/SfSpecimen.java | 10 +- ...AbstractDefaultTVPMeasurementMetadata.java | 9 +- .../ogc/om/series/DefaultPointMetadata.java | 6 +- .../series/MeasurementTimeseriesMetadata.java | 19 +- .../n52/shetland/ogc/om/series/Metadata.java | 4 +- .../om/series/tsml/TimeseriesMLConstants.java | 39 +-- .../om/series/tsml/TsmlMonitoringFeature.java | 9 +- .../wml/DefaultTVPMeasurementMetadata.java | 6 +- .../ogc/om/series/wml/WaterMLConstants.java | 48 ++- .../ogc/om/series/wml/WmlMonitoringPoint.java | 9 +- .../AbstractPofileTrajectoryElement.java | 4 +- .../shetland/ogc/om/values/BooleanValue.java | 10 +- .../shetland/ogc/om/values/CategoryValue.java | 8 +- .../ogc/om/values/ComparableValue.java | 4 +- .../shetland/ogc/om/values/ComplexValue.java | 15 +- .../shetland/ogc/om/values/CountValue.java | 8 +- .../om/values/CvDiscretePointCoverage.java | 7 +- .../ogc/om/values/DiscreteCoverage.java | 7 +- .../shetland/ogc/om/values/GeometryValue.java | 8 +- .../ogc/om/values/HrefAttributeValue.java | 7 +- .../ogc/om/values/MultiPointCoverage.java | 8 +- .../shetland/ogc/om/values/MultiValue.java | 3 +- .../ogc/om/values/NilTemplateValue.java | 7 +- .../shetland/ogc/om/values/ProfileLevel.java | 7 +- .../shetland/ogc/om/values/ProfileValue.java | 4 +- .../ogc/om/values/QuantityRangeValue.java | 19 +- .../shetland/ogc/om/values/QuantityValue.java | 8 +- .../ogc/om/values/RectifiedGridCoverage.java | 8 +- .../ogc/om/values/ReferenceValue.java | 7 +- .../ogc/om/values/SweDataArrayValue.java | 10 +- .../n52/shetland/ogc/om/values/TLVTValue.java | 8 +- .../n52/shetland/ogc/om/values/TVPValue.java | 8 +- .../n52/shetland/ogc/om/values/TextValue.java | 8 +- .../ogc/om/values/TimeRangeValue.java | 8 +- .../n52/shetland/ogc/om/values/TimeValue.java | 4 +- .../ogc/om/values/TrajectoryElement.java | 24 +- .../ogc/om/values/TrajectoryValue.java | 4 +- .../shetland/ogc/om/values/UnknownValue.java | 7 +- .../org/n52/shetland/ogc/om/values/Value.java | 10 +- .../n52/shetland/ogc/om/values/XmlValue.java | 4 +- .../values/visitor/ProfileLevelVisitor.java | 6 +- .../visitor/TrajectoryElementVisitor.java | 6 +- .../ogc/om/values/visitor/ValueVisitor.java | 79 ++--- .../om/values/visitor/VoidValueVisitor.java | 94 ++---- .../java/org/n52/shetland/ogc/ows/Enums.java | 11 +- .../n52/shetland/ogc/ows/HasExtension.java | 40 ++- .../n52/shetland/ogc/ows/OWSConstants.java | 33 +- .../org/n52/shetland/ogc/ows/OwsAddress.java | 34 +-- .../shetland/ogc/ows/OwsAllowedValues.java | 3 +- .../ogc/ows/OwsBasicIdentification.java | 5 +- .../n52/shetland/ogc/ows/OwsCapabilities.java | 35 +-- .../ogc/ows/OwsCapabilitiesExtension.java | 8 +- .../org/n52/shetland/ogc/ows/OwsCode.java | 28 +- .../org/n52/shetland/ogc/ows/OwsContact.java | 13 +- .../n52/shetland/ogc/ows/OwsDescription.java | 10 +- .../org/n52/shetland/ogc/ows/OwsDomain.java | 29 +- .../shetland/ogc/ows/OwsDomainMetadata.java | 10 +- .../org/n52/shetland/ogc/ows/OwsHttp.java | 3 +- .../org/n52/shetland/ogc/ows/OwsKeyword.java | 10 +- .../shetland/ogc/ows/OwsLanguageString.java | 37 ++- .../org/n52/shetland/ogc/ows/OwsMetadata.java | 35 ++- .../org/n52/shetland/ogc/ows/OwsNoValues.java | 3 +- .../shetland/ogc/ows/OwsOnlineResource.java | 3 +- .../n52/shetland/ogc/ows/OwsOperation.java | 22 +- .../ogc/ows/OwsOperationsMetadata.java | 11 +- .../org/n52/shetland/ogc/ows/OwsPhone.java | 5 +- .../org/n52/shetland/ogc/ows/OwsRange.java | 18 +- .../shetland/ogc/ows/OwsRequestMethod.java | 34 +-- .../shetland/ogc/ows/OwsResponsibleParty.java | 12 +- .../ogc/ows/OwsServiceIdentification.java | 19 +- .../shetland/ogc/ows/OwsServiceProvider.java | 17 +- .../shetland/ogc/ows/OwsUnNamedDomain.java | 16 +- .../org/n52/shetland/ogc/ows/OwsValue.java | 10 +- .../shetland/ogc/ows/OwsValueRestriction.java | 3 +- .../shetland/ogc/ows/OwsValuesReference.java | 13 +- .../n52/shetland/ogc/ows/OwsValuesUnit.java | 1 - .../ogc/ows/exception/CodedException.java | 3 +- .../ows/exception/CompositeOwsException.java | 25 +- .../InvalidParameterValueException.java | 13 +- .../InvalidUpdateSequenceException.java | 15 +- .../MissingParameterValueException.java | 12 +- .../exception/NoApplicableCodeException.java | 11 +- .../OperationNotSupportedException.java | 13 +- .../OptionNotSupportedException.java | 13 +- .../ogc/ows/exception/OwsExceptionCode.java | 4 +- .../ogc/ows/exception/OwsExceptionReport.java | 14 +- .../VersionNegotiationFailedException.java | 15 +- .../ogc/ows/extension/AbstractExtension.java | 4 +- .../ows/extension/CapabilitiesExtension.java | 5 +- .../shetland/ogc/ows/extension/Extension.java | 3 +- .../ogc/ows/extension/Extensions.java | 22 +- .../ogc/ows/extension/MergableExtension.java | 6 +- .../StringBasedCapabilitiesExtension.java | 5 +- .../ows/extension/StringBasedExtension.java | 3 +- .../n52/shetland/ogc/ows/extension/Value.java | 4 +- .../ows/service/GetCapabilitiesRequest.java | 3 +- .../ows/service/GetCapabilitiesResponse.java | 9 +- .../ogc/ows/service/OwsOperationKey.java | 10 +- .../OwsServiceCommunicationObject.java | 6 +- .../ogc/ows/service/OwsServiceKey.java | 15 +- .../ogc/ows/service/OwsServiceRequest.java | 9 +- .../ows/service/OwsServiceRequestContext.java | 9 +- .../ogc/ows/service/OwsServiceResponse.java | 3 +- .../ogc/ows/service/ResponseFormat.java | 2 +- .../ows/service/VersionedOperationKey.java | 4 +- .../ogc/sensorML/AbstractProcess.java | 3 +- .../ogc/sensorML/AbstractSensorML.java | 5 +- .../shetland/ogc/sensorML/HasComponents.java | 3 +- .../shetland/ogc/sensorML/HasConnections.java | 3 +- .../shetland/ogc/sensorML/HasPosition.java | 3 +- .../shetland/ogc/sensorML/ProcessChain.java | 3 +- .../shetland/ogc/sensorML/ProcessMethod.java | 7 +- .../ogc/sensorML/RulesDefinition.java | 6 +- .../ogc/sensorML/SensorMLConstants.java | 7 +- .../n52/shetland/ogc/sensorML/SmlContact.java | 3 +- .../shetland/ogc/sensorML/SmlContactList.java | 2 +- .../n52/shetland/ogc/sensorML/SmlPerson.java | 3 +- .../org/n52/shetland/ogc/sensorML/System.java | 4 +- .../org/n52/shetland/ogc/sensorML/Term.java | 15 +- .../AbstractDataComponentContainer.java | 3 +- .../AbstractSmlDataComponentContainer.java | 7 +- .../sensorML/elements/SmlCapabilities.java | 2 +- .../elements/SmlCapabilitiesPredicates.java | 1 - .../sensorML/elements/SmlCharacteristics.java | 8 +- .../ogc/sensorML/elements/SmlClassifier.java | 6 +- .../elements/SmlClassifierPredicates.java | 1 - .../elements/SmlDocumentationList.java | 2 +- .../ogc/sensorML/elements/SmlIdentifier.java | 3 +- .../elements/SmlIdentifierPredicates.java | 13 +- .../sensorML/elements/SmlIoPredicates.java | 18 +- .../ogc/sensorML/elements/SmlLocation.java | 7 +- .../ogc/sensorML/elements/SmlPosition.java | 10 +- .../sensorML/v20/AbstractPhysicalProcess.java | 8 +- .../ogc/sensorML/v20/AbstractProcessV20.java | 12 +- .../ogc/sensorML/v20/AggregateProcess.java | 3 +- .../ogc/sensorML/v20/DescribedObject.java | 5 +- .../ogc/sensorML/v20/PhysicalComponent.java | 4 +- .../ogc/sensorML/v20/PhysicalSystem.java | 3 +- .../ogc/sensorML/v20/SimpleProcess.java | 4 +- .../ogc/sensorML/v20/SmlDataInterface.java | 16 +- .../sensorML/v20/SmlFeatureOfInterest.java | 7 +- .../ogc/sos/ExtendedIndeterminateTime.java | 1 + .../shetland/ogc/sos/ObjectWithXmlString.java | 5 +- .../n52/shetland/ogc/sos/Sos1Constants.java | 62 ++-- .../n52/shetland/ogc/sos/Sos2Constants.java | 24 +- .../n52/shetland/ogc/sos/SosCapabilities.java | 13 +- .../n52/shetland/ogc/sos/SosConstants.java | 42 ++- .../ogc/sos/SosInsertionCapabilities.java | 11 +- .../ogc/sos/SosObservationOffering.java | 174 ++++++----- .../org/n52/shetland/ogc/sos/SosOffering.java | 13 +- .../ogc/sos/SosProcedureDescription.java | 11 +- .../SosProcedureDescriptionUnknownType.java | 10 +- .../shetland/ogc/sos/SosSoapConstants.java | 2 +- .../delobs/DeleteObservationConstants.java | 3 +- .../sos/delobs/DeleteObservationRequest.java | 2 +- .../drt/DeleteResultTemplateConstants.java | 2 +- .../sos/drt/DeleteResultTemplateRequest.java | 1 - .../ogc/sos/exception/SosExceptionCode.java | 1 + .../sos/gda/GetDataAvailabilityConstants.java | 14 +- .../sos/gda/GetDataAvailabilityRequest.java | 6 +- .../sos/gda/GetDataAvailabilityResponse.java | 12 +- .../InsertFeatureOfInterestConstants.java | 2 +- .../request/AbstractObservationRequest.java | 4 +- .../ogc/sos/request/DeleteSensorRequest.java | 3 +- .../sos/request/DescribeSensorRequest.java | 4 +- .../FeatureOfInterestIdentifierRequest.java | 3 +- .../request/GetFeatureOfInterestRequest.java | 14 +- .../request/GetObservationByIdRequest.java | 4 +- .../sos/request/GetObservationRequest.java | 18 +- .../ogc/sos/request/GetResultRequest.java | 8 +- .../sos/request/GetResultTemplateRequest.java | 3 +- .../sos/request/InsertObservationRequest.java | 7 +- .../ogc/sos/request/InsertResultRequest.java | 3 +- .../request/InsertResultTemplateRequest.java | 4 +- .../ogc/sos/request/InsertSensorRequest.java | 8 +- .../SosDescribeFeatureTypeRequest.java | 3 +- .../SosDescribeObservationTypeRequest.java | 3 +- .../SosGetFeatureOfInterestTimeRequest.java | 3 +- .../sos/request/SosRegisterSensorRequest.java | 6 +- .../request/SpatialFeatureQueryRequest.java | 9 +- .../SpatialFilteringProfileRequest.java | 8 +- .../ogc/sos/request/UpdateSensorRequest.java | 3 +- .../response/AbstractObservationResponse.java | 4 +- .../ogc/sos/response/AbstractStreaming.java | 18 +- .../response/BinaryAttachmentResponse.java | 8 +- .../sos/response/DescribeSensorResponse.java | 4 +- .../GetFeatureOfInterestResponse.java | 7 +- .../sos/response/GetObservationResponse.java | 1 - .../ogc/sos/response/GetResultResponse.java | 2 +- .../shetland/ogc/sos/ro/RelatedOfferings.java | 1 - .../sta/model/DatastreamEntityDefinition.java | 34 +-- .../FeatureOfInterestEntityDefinition.java | 29 +- .../HistoricalLocationEntityDefinition.java | 24 +- .../sta/model/LocationEntityDefinition.java | 30 +- .../model/ObservationEntityDefinition.java | 32 +- .../ObservedPropertyEntityDefinition.java | 29 +- .../ogc/sta/model/STAEntityDefinition.java | 20 +- .../ogc/sta/model/SensorEntityDefinition.java | 29 +- .../ogc/sta/model/ThingEntityDefinition.java | 30 +- ...stractOptionalSweDataComponentVisitor.java | 5 +- ...stractThrowingSweDataComponentVisitor.java | 5 +- ...ctThrowingVoidSweDataComponentVisitor.java | 4 +- .../AbstractVoidSweDataComponentVisitor.java | 4 +- .../org/n52/shetland/ogc/swe/DataRecord.java | 10 +- .../org/n52/shetland/ogc/swe/RangeValue.java | 10 +- .../ogc/swe/SweAbstractDataComponent.java | 10 +- .../ogc/swe/SweAbstractDataRecord.java | 9 +- .../n52/shetland/ogc/swe/SweConstants.java | 4 +- .../n52/shetland/ogc/swe/SweCoordinate.java | 7 +- .../n52/shetland/ogc/swe/SweDataArray.java | 14 +- .../ogc/swe/SweDataComponentVisitor.java | 4 +- .../n52/shetland/ogc/swe/SweDataRecord.java | 12 +- .../n52/shetland/ogc/swe/SweDataStream.java | 8 +- .../org/n52/shetland/ogc/swe/SweEnvelope.java | 18 +- .../org/n52/shetland/ogc/swe/SweField.java | 9 +- .../shetland/ogc/swe/SweSimpleDataRecord.java | 10 +- .../org/n52/shetland/ogc/swe/SweVector.java | 7 +- .../ogc/swe/VoidSweDataComponentVisitor.java | 3 +- .../ogc/swe/encoding/SweTextEncoding.java | 12 +- .../swe/simpleType/SweAbstractSimpleType.java | 18 +- .../swe/simpleType/SweAbstractUomType.java | 6 +- .../ogc/swe/simpleType/SweAllowedTokens.java | 3 +- .../ogc/swe/simpleType/SweBoolean.java | 7 +- .../ogc/swe/simpleType/SweCategory.java | 22 +- .../ogc/swe/simpleType/SweCategoryRange.java | 19 +- .../shetland/ogc/swe/simpleType/SweCount.java | 13 +- .../ogc/swe/simpleType/SweCountRange.java | 18 +- .../swe/simpleType/SweObservableProperty.java | 7 +- .../ogc/swe/simpleType/SweQuality.java | 3 +- .../ogc/swe/simpleType/SweQuantity.java | 13 +- .../ogc/swe/simpleType/SweQuantityRange.java | 13 +- .../shetland/ogc/swe/simpleType/SweText.java | 13 +- .../shetland/ogc/swe/simpleType/SweTime.java | 13 +- .../ogc/swe/simpleType/SweTimeRange.java | 24 +- .../ogc/swe/stream/StreamingSweDataArray.java | 14 +- .../n52/shetland/ogc/swes/SwesExtension.java | 7 +- .../ogc/wps/DataTransmissionMode.java | 4 +- .../n52/shetland/ogc/wps/ExecutionMode.java | 4 +- .../java/org/n52/shetland/ogc/wps/Format.java | 33 +- .../n52/shetland/ogc/wps/InputOccurence.java | 11 +- .../shetland/ogc/wps/JobControlOption.java | 17 +- .../java/org/n52/shetland/ogc/wps/JobId.java | 7 +- .../org/n52/shetland/ogc/wps/JobStatus.java | 8 +- .../shetland/ogc/wps/OutputDefinition.java | 32 +- .../n52/shetland/ogc/wps/ProcessOffering.java | 33 +- .../shetland/ogc/wps/ProcessOfferings.java | 4 +- .../n52/shetland/ogc/wps/ResponseMode.java | 4 +- .../java/org/n52/shetland/ogc/wps/Result.java | 4 +- .../n52/shetland/ogc/wps/WPS100Constants.java | 7 +- .../n52/shetland/ogc/wps/WPS200Constants.java | 6 +- .../n52/shetland/ogc/wps/WPSCapabilities.java | 19 +- .../n52/shetland/ogc/wps/WPSConstants.java | 24 +- .../ogc/wps/ap/ApplicationPackage.java | 4 +- .../ogc/wps/data/FormattedProcessData.java | 4 +- .../ogc/wps/data/GroupProcessData.java | 9 +- .../n52/shetland/ogc/wps/data/InlineBody.java | 1 - .../ogc/wps/data/ReferenceProcessData.java | 15 +- .../shetland/ogc/wps/data/ReferencedBody.java | 11 +- .../ogc/wps/data/ValueProcessData.java | 6 +- .../data/impl/InMemoryValueProcessData.java | 12 +- .../wps/data/impl/StringValueProcessData.java | 3 +- .../description/BoundingBoxDescription.java | 11 +- .../BoundingBoxInputDescription.java | 11 +- .../BoundingBoxOutputDescription.java | 11 +- .../wps/description/ComplexDescription.java | 10 +- .../description/ComplexInputDescription.java | 15 +- .../description/ComplexOutputDescription.java | 12 +- .../ogc/wps/description/DataDescription.java | 5 +- .../ogc/wps/description/Description.java | 24 +- .../description/GroupInputDescription.java | 10 +- .../description/GroupOutputDescription.java | 10 +- .../wps/description/LiteralDataDomain.java | 23 +- .../wps/description/LiteralDescription.java | 8 +- .../description/LiteralInputDescription.java | 12 +- .../description/LiteralOutputDescription.java | 12 +- .../wps/description/ProcessDescription.java | 30 +- .../ProcessDescriptionBuilderFactory.java | 20 +- .../description/ProcessInputDescription.java | 29 +- .../ProcessInputDescriptionContainer.java | 12 +- .../description/ProcessOutputDescription.java | 25 +- .../ProcessOutputDescriptionContainer.java | 11 +- .../impl/AbstractDataDescription.java | 7 +- .../description/impl/AbstractDescription.java | 23 +- .../impl/AbstractProcessInputDescription.java | 12 +- .../AbstractProcessOutputDescription.java | 7 +- .../impl/BoundingBoxInputDescriptionImpl.java | 18 +- .../BoundingBoxOutputDescriptionImpl.java | 19 +- .../impl/ComplexInputDescriptionImpl.java | 31 +- .../impl/ComplexOutputDescriptionImpl.java | 30 +- .../impl/GroupInputDescriptionImpl.java | 31 +- .../impl/GroupOutputDescriptionImpl.java | 33 +- .../impl/LiteralDataDomainImpl.java | 15 +- .../impl/LiteralInputDescriptionImpl.java | 26 +- .../impl/LiteralOutputDescriptionImpl.java | 29 +- .../impl/ProcessDescriptionFactory.java | 17 +- .../impl/ProcessDescriptionImpl.java | 38 +-- .../ogc/wps/exception/NoSuchJobException.java | 8 +- .../exception/ResultNotReadyException.java | 5 +- .../ogc/wps/request/GetResultRequest.java | 1 - .../wps/response/DescribeProcessResponse.java | 3 +- .../ogc/wps/response/ExecuteResponse.java | 3 +- .../java/org/n52/shetland/util/AqdHelper.java | 6 +- .../java/org/n52/shetland/util/CRSHelper.java | 2 +- .../n52/shetland/util/CollectionHelper.java | 287 +++++++++++------- .../util/DateTimeFormatException.java | 1 - .../org/n52/shetland/util/DateTimeHelper.java | 10 +- .../shetland/util/DateTimeParseException.java | 3 +- .../shetland/util/GeometryTransformer.java | 3 +- .../main/java/org/n52/shetland/util/HTTP.java | 34 +-- .../org/n52/shetland/util/IdGenerator.java | 4 +- .../java/org/n52/shetland/util/JTSHelper.java | 26 +- .../org/n52/shetland/util/JavaHelper.java | 10 +- .../java/org/n52/shetland/util/MinMax.java | 33 +- .../java/org/n52/shetland/util/OMHelper.java | 10 +- .../n52/shetland/util/OwsQueryBuilder.java | 2 - .../n52/shetland/util/ReferencedEnvelope.java | 20 +- .../org/n52/shetland/util/StringHelper.java | 20 +- .../org/n52/shetland/uvf/UVFConstants.java | 21 +- .../java/org/n52/shetland/w3c/Nillable.java | 129 +++++--- .../org/n52/shetland/w3c/SchemaLocation.java | 15 +- .../org/n52/shetland/w3c/W3CConstants.java | 1 - .../n52/shetland/w3c/soap/AbstractSoap.java | 3 +- .../shetland/w3c/wsa/WsaRelatesToHeader.java | 1 - .../n52/shetland/w3c/wsdl/AbstractWsdl.java | 6 +- .../shetland/w3c/wsdl/BindingOperation.java | 6 +- .../java/org/n52/shetland/w3c/wsdl/Fault.java | 35 ++- .../org/n52/shetland/w3c/wsdl/Operation.java | 6 +- .../java/org/n52/shetland/w3c/wsdl/Param.java | 6 +- .../java/org/n52/shetland/w3c/wsdl/Part.java | 3 +- .../java/org/n52/shetland/w3c/wsdl/Port.java | 3 +- .../org/n52/shetland/w3c/wsdl/PortType.java | 12 +- .../org/n52/shetland/w3c/wsdl/Schema.java | 9 +- .../n52/shetland/w3c/wsdl/WSDLConstants.java | 2 +- .../shetland/w3c/wsdl/http/HttpBinding.java | 3 +- .../shetland/w3c/wsdl/http/HttpOperation.java | 3 +- .../shetland/w3c/wsdl/soap/SoapBinding.java | 15 +- .../n52/shetland/w3c/wsdl/soap/SoapBody.java | 4 +- .../n52/shetland/w3c/wsdl/soap/SoapFault.java | 13 +- .../shetland/w3c/wsdl/soap/SoapOperation.java | 19 +- .../org/n52/shetland/w3c/xlink/Actuate.java | 4 +- .../java/org/n52/shetland/w3c/xlink/Link.java | 34 +-- .../org/n52/shetland/w3c/xlink/Reference.java | 33 +- .../n52/shetland/w3c/xlink/Referenceable.java | 36 ++- .../java/org/n52/shetland/w3c/xlink/Show.java | 8 +- .../java/org/n52/shetland/w3c/xlink/Type.java | 4 +- .../shetland/w3c/xlink/W3CHrefAttribute.java | 4 +- .../org/n52/shetland/ogc/gml/TimeTest.java | 2 +- .../ogc/gml/time/TimeInstantTest.java | 3 +- .../shetland/ogc/gml/time/TimePeriodTest.java | 4 +- .../om/OmObservationConstellationTest.java | 3 +- .../shetland/ogc/om/OmObservationTest.java | 14 +- .../om/features/FeatureCollectionTest.java | 3 +- .../SamplingFeatureComplexTest.java | 4 +- .../samplingFeatures/SamplingFeatureTest.java | 8 +- .../ogc/om/values/ProfileLevelTest.java | 3 +- .../ogc/om/values/ProfileValueTest.java | 7 +- .../ogc/ows/service/RequestContextTest.java | 1 + .../ogc/sensorML/AbstractSensorMLTest.java | 3 +- .../sensorML/elements/SmlClassifierTest.java | 2 - .../sensorML/elements/SmlIdentifierTest.java | 2 +- .../ogc/sensorML/elements/SmlIoTest.java | 3 +- .../shetland/ogc/sos/ObjectWithXmlTest.java | 1 - .../request/GetObservationRequestTest.java | 3 +- .../shetland/ogc/swe/SweDataRecordTest.java | 3 +- .../n52/shetland/ogc/swe/SweEnvelopeTest.java | 6 +- .../swe/simpleType/SosSweCategoryTest.java | 2 +- .../n52/shetland/ogc/swes/ExtensionsTest.java | 3 +- .../org/n52/shetland/ogc/wps/FormatTest.java | 4 +- .../shetland/util/CollectionHelperTest.java | 4 +- .../n52/shetland/util/DateTimeHelperTest.java | 4 +- .../n52/shetland/util/IdGeneratorTest.java | 2 +- .../org/n52/shetland/util/JTSHelperTest.java | 24 +- .../shetland/util/ReferencedEnvelopeTest.java | 5 +- .../n52/shetland/util/StringHelperTest.java | 2 +- .../n52/shetland/util/http/MediaTypeTest.java | 4 +- .../org/n52/svalbard/encode/UVFEncoder.java | 1 - svalbard/json-common/pom.xml | 6 + .../n52/svalbard/decode/json/JSONDecoder.java | 34 ++- .../n52/svalbard/encode/json/JSONEncoder.java | 41 +-- .../json/InsertSensorRequestDecoderTest.java | 5 +- .../AbstractCapabilitiesBaseTypeDecoder.java | 53 ++-- ...AbstractGetDataAvailabilityXmlDecoder.java | 1 - .../decode/AbstractGmlDecoderv321.java | 2 +- .../decode/AbstractProcessDecoder.java | 2 +- .../decode/AbstractSoapStringDecoder.java | 1 - .../decode/AbstractStringRequestDecoder.java | 1 - .../decode/AbstractSwesDecoderv20.java | 4 +- .../svalbard/decode/AbstractXmlDecoder.java | 4 +- .../n52/svalbard/decode/AqdDecoderv10.java | 1 - .../decode/CapabilitiesBaseTypeDecoder.java | 9 +- .../svalbard/decode/CapabilitiesDecoder.java | 18 +- .../decode/CapabilitiesDocumentDecoder.java | 2 - .../decode/CapabilitiesTypeDecoder.java | 26 +- .../decode/CapabilitiesV1DocumentDecoder.java | 9 +- .../decode/DeleteObservationV20Decoder.java | 11 +- .../GetDataAvailabilityResponseDecoder.java | 19 +- .../GetDataAvailabilityStringDecoder.java | 5 +- .../decode/GetDataAvailabilityXmlDecoder.java | 11 +- ...tureOfInterestResponseDocumentDecoder.java | 12 +- ...bservationByIdResponseDocumentDecoder.java | 10 +- ...GetObservationResponseDocumentDecoder.java | 15 +- .../n52/svalbard/decode/GmlDecoderv311.java | 29 +- .../n52/svalbard/decode/GmlDecoderv321.java | 70 ++--- .../decode/InsertSensorResponseDecoder.java | 11 +- .../svalbard/decode/Iso19139GcoDecoder.java | 2 - .../svalbard/decode/Iso19139GmdDecoder.java | 1 - .../org/n52/svalbard/decode/OmDecoderv20.java | 17 +- .../decode/OwsExceptionReportDecoder.java | 8 +- .../decode/RelatedOfferingTypeDecoder.java | 11 +- .../svalbard/decode/SamplingDecoderv20.java | 31 +- .../svalbard/decode/SosStringDecoderv100.java | 1 - .../svalbard/decode/SosStringDecoderv20.java | 1 - .../svalbard/decode/SpecimenDecoderv20.java | 2 +- .../decode/SwesExtensionDecoderv20.java | 1 - .../svalbard/decode/SwesStringDecoderv20.java | 1 - .../TsmlObservationProcessDecoderv10.java | 14 +- .../WmlObservationProcessDecoderv20.java | 14 +- .../svalbard/decode/XlinkDecoderv1999.java | 2 - .../UnsupportedDecoderXmlInputException.java | 3 +- ...actCVDiscretePointCoverageTypeEncoder.java | 2 +- .../svalbard/encode/AbstractOmEncoderv20.java | 2 +- .../svalbard/encode/AbstractSoapEncoder.java | 7 +- .../encode/AbstractSwesRequestEncoder.java | 1 - .../encode/AbstractXmlResponseEncoder.java | 23 +- .../org/n52/svalbard/encode/OmEncoderv20.java | 2 +- .../UnsupportedEncoderXmlInputException.java | 2 - 564 files changed, 3495 insertions(+), 3541 deletions(-) diff --git a/pom.xml b/pom.xml index 7c4855aa9..4690e0c14 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52</groupId> <artifactId>parent</artifactId> - <version>23-SNAPSHOT</version> + <version>23</version> </parent> <groupId>org.n52.arctic-sea</groupId> diff --git a/shetland/core/src/main/java/org/n52/shetland/aqd/AbstractEReportingHeader.java b/shetland/core/src/main/java/org/n52/shetland/aqd/AbstractEReportingHeader.java index be568a5da..de998a070 100644 --- a/shetland/core/src/main/java/org/n52/shetland/aqd/AbstractEReportingHeader.java +++ b/shetland/core/src/main/java/org/n52/shetland/aqd/AbstractEReportingHeader.java @@ -18,8 +18,7 @@ import org.n52.shetland.ogc.gml.AbstractFeature; /** - * Abstract class for AQD e-Reporting header. Required to use defined method in - * AQD API module. + * Abstract class for AQD e-Reporting header. Required to use defined method in AQD API module. * * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 1.0.0 diff --git a/shetland/core/src/main/java/org/n52/shetland/aqd/AqdConstants.java b/shetland/core/src/main/java/org/n52/shetland/aqd/AqdConstants.java index c6b8796da..382e7e8bd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/aqd/AqdConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/aqd/AqdConstants.java @@ -89,11 +89,13 @@ public interface AqdConstants { String NS_OMPR_PREFIX = "ompr"; - Map<String, String> NAMESPACE_PREFIX_MAP = ImmutableMap.<String, String> builder().put(NS_AQD, NS_AQD_PREFIX) - .put(NS_AD, NS_AD_PREFIX).put(NS_AM, NS_AM_PREFIX).put(NS_AU, NS_AU_PREFIX).put(NS_BASE, NS_BASE_PREFIX) - .put(NS_BASE2, NS_BASE2_PREFIX).put(NS_EF, NS_EF_PREFIX).put(NS_GN, NS_GN_PREFIX) - .put(NS_OMPR, NS_OMPR_PREFIX).put(GcoConstants.NS_GCO, GcoConstants.NS_GCO_PREFIX) - .put(GmdConstants.NS_GMD, GmdConstants.NS_GMD_PREFIX).build(); + Map<String, String> NAMESPACE_PREFIX_MAP = ImmutableMap.< + String, + String> builder().put(NS_AQD, NS_AQD_PREFIX).put(NS_AD, NS_AD_PREFIX).put(NS_AM, NS_AM_PREFIX) + .put(NS_AU, NS_AU_PREFIX).put(NS_BASE, NS_BASE_PREFIX).put(NS_BASE2, NS_BASE2_PREFIX) + .put(NS_EF, NS_EF_PREFIX).put(NS_GN, NS_GN_PREFIX).put(NS_OMPR, NS_OMPR_PREFIX) + .put(GcoConstants.NS_GCO, GcoConstants.NS_GCO_PREFIX).put(GmdConstants.NS_GMD, GmdConstants.NS_GMD_PREFIX) + .build(); String AN_CODE_SPACE = "codeSpace"; @@ -324,16 +326,22 @@ public interface AqdConstants { String MODEL = "model"; /** - * the names of the operations supported by all versions of the SOS - * specification + * the names of the operations supported by all versions of the SOS specification */ enum Operations { - GetCapabilities, GetObservation, DescribeSensor + GetCapabilities, + GetObservation, + DescribeSensor } enum PrimaryObservation { - Hourly(HOUR), Daily(DAY), Weekly(WEEK), Fortnightly(FORTNIGHT), Monthly(MONTH), Quarterly(QUARTER), Variable( - VAR); + Hourly(HOUR), + Daily(DAY), + Weekly(WEEK), + Fortnightly(FORTNIGHT), + Monthly(MONTH), + Quarterly(QUARTER), + Variable(VAR); private static final String BASE_URI = "http://dd.eionet.europa.eu/vocabulary/aq/primaryObservation/"; diff --git a/shetland/core/src/main/java/org/n52/shetland/aqd/AqdNetwork.java b/shetland/core/src/main/java/org/n52/shetland/aqd/AqdNetwork.java index 46b232585..6b1c50ca9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/aqd/AqdNetwork.java +++ b/shetland/core/src/main/java/org/n52/shetland/aqd/AqdNetwork.java @@ -26,5 +26,4 @@ */ public class AqdNetwork extends EfEnvironmentalMonitoringNetwork { - } diff --git a/shetland/core/src/main/java/org/n52/shetland/aqd/AqdSamplingPoint.java b/shetland/core/src/main/java/org/n52/shetland/aqd/AqdSamplingPoint.java index 35afbb498..beb35bc21 100644 --- a/shetland/core/src/main/java/org/n52/shetland/aqd/AqdSamplingPoint.java +++ b/shetland/core/src/main/java/org/n52/shetland/aqd/AqdSamplingPoint.java @@ -47,7 +47,8 @@ public AssessmentType getAssessmentType() { } /** - * @param assessmentType the assessmentType to set + * @param assessmentType + * the assessmentType to set */ public void setAssessmentType(AssessmentType assessmentType) { this.assessmentType = assessmentType; @@ -62,7 +63,8 @@ public AqdStation getStation() { } /** - * @param station the station to set + * @param station + * the station to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setStation(AqdStation station) { @@ -85,7 +87,8 @@ public AqdNetwork getNetwork() { } /** - * @param network the network to set + * @param network + * the network to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setNetwork(AqdNetwork network) { diff --git a/shetland/core/src/main/java/org/n52/shetland/aqd/EReportingChange.java b/shetland/core/src/main/java/org/n52/shetland/aqd/EReportingChange.java index 021a9df00..735cc9030 100644 --- a/shetland/core/src/main/java/org/n52/shetland/aqd/EReportingChange.java +++ b/shetland/core/src/main/java/org/n52/shetland/aqd/EReportingChange.java @@ -66,15 +66,13 @@ public int hashCode() { @Override public boolean equals(Object obj) { - return obj instanceof EReportingChange && - java.util.Objects.equals(getDescription(), ((EReportingChange) obj).getDescription()); + return obj instanceof EReportingChange + && java.util.Objects.equals(getDescription(), ((EReportingChange) obj).getDescription()); } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("change", isChange()) - .add("description", getDescription()) + return MoreObjects.toStringHelper(this).add("change", isChange()).add("description", getDescription()) .toString(); } diff --git a/shetland/core/src/main/java/org/n52/shetland/aqd/EReportingHeader.java b/shetland/core/src/main/java/org/n52/shetland/aqd/EReportingHeader.java index d2d2ff77f..159d0f0e6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/aqd/EReportingHeader.java +++ b/shetland/core/src/main/java/org/n52/shetland/aqd/EReportingHeader.java @@ -39,7 +39,8 @@ public class EReportingHeader extends AbstractEReportingHeader { private Identifier inspireID; private RelatedParty reportingAuthority; private EReportingChange change; - private Referenceable<Time> reportingPeriod = Referenceable.of(Nillable.<Time> missing()); + private Referenceable<Time> reportingPeriod = Referenceable.of(Nillable.< + Time> missing()); private final List<Referenceable<AbstractFeature>> delete = new LinkedList<>(); private final List<Referenceable<AbstractFeature>> content = new LinkedList<>(); diff --git a/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligation.java b/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligation.java index 55f0dd0f2..f8be856f9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligation.java +++ b/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligation.java @@ -34,8 +34,8 @@ public class ReportObligation { private Identifier inspireID; private EReportingChange change; - private Referenceable<Time> reportingPeriod - = Referenceable.of(Nillable.<Time>missing()); + private Referenceable<Time> reportingPeriod = Referenceable.of(Nillable.< + Time> missing()); @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public EReportingChange getChange() { @@ -71,8 +71,7 @@ public Referenceable<Time> getReportingPeriod() { return reportingPeriod; } - public ReportObligation setReportingPeriod( - Referenceable<Time> reportingPeriod) { + public ReportObligation setReportingPeriod(Referenceable<Time> reportingPeriod) { this.reportingPeriod = Preconditions.checkNotNull(reportingPeriod); return this; } @@ -83,27 +82,22 @@ public boolean isValid() { @Override public int hashCode() { - return Objects - .hashCode(getInspireID(), getChange(), getReportingPeriod()); + return Objects.hashCode(getInspireID(), getChange(), getReportingPeriod()); } @Override public boolean equals(Object obj) { if (obj instanceof ReportObligation) { ReportObligation that = (ReportObligation) obj; - return Objects.equal(getInspireID(), that.getInspireID()) && - Objects.equal(getChange(), that.getChange()) && - Objects.equal(getReportingPeriod(), that.getReportingPeriod()); + return Objects.equal(getInspireID(), that.getInspireID()) && Objects.equal(getChange(), that.getChange()) + && Objects.equal(getReportingPeriod(), that.getReportingPeriod()); } return false; } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("inspireID", getInspireID()) - .add("change", getChange()) - .add("reportingPeriod", getReportingPeriod()) - .toString(); + return MoreObjects.toStringHelper(this).add("inspireID", getInspireID()).add("change", getChange()) + .add("reportingPeriod", getReportingPeriod()).toString(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligationType.java b/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligationType.java index 1b933ef51..da793cd69 100644 --- a/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligationType.java +++ b/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligationType.java @@ -24,9 +24,10 @@ public enum ReportObligationType { // B("B", "Information on zones and agglomerations"), // C("C", "Information on the assessment regime"), // D("D", "Information on the assessment methods"), - E1A("E1a", "Primary validated assessment data - measurements"), E1B("E1b", - "Primary validated assessment data - modelled"), E2A("E2a", - "Primary up-to-date assessment data - measurements"); + E1A("E1a", "Primary validated assessment data - measurements"), + E1B("E1b", "Primary validated assessment data - modelled"), + E2A("E2a", "Primary up-to-date assessment data - measurements"); + private final String title; private final String description; diff --git a/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligations.java b/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligations.java index 2bc73ed32..d8175a73e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligations.java +++ b/shetland/core/src/main/java/org/n52/shetland/aqd/ReportObligations.java @@ -15,7 +15,6 @@ */ package org.n52.shetland.aqd; - import org.n52.janmayen.function.Functions; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; import org.n52.shetland.ogc.ows.extension.Extensions; @@ -35,11 +34,8 @@ public static boolean hasFlow(Extensions extensions) { } public static ReportObligationType getFlow(Extensions extensions) throws OwsExceptionReport { - return extensions.getExtension(AqdConstants.EXTENSION_FLOW) - .map(x -> x.getValue()) - .flatMap(Functions.castIfInstanceOf(SweText.class)) - .map(SweText::getValue) - .map(ReportObligationType::from) - .orElse(ReportObligationType.E2A); + return extensions.getExtension(AqdConstants.EXTENSION_FLOW).map(x -> x.getValue()) + .flatMap(Functions.castIfInstanceOf(SweText.class)).map(SweText::getValue) + .map(ReportObligationType::from).orElse(ReportObligationType.E2A); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/exi/EXIObject.java b/shetland/core/src/main/java/org/n52/shetland/exi/EXIObject.java index 368385db4..dbcdb3da3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/exi/EXIObject.java +++ b/shetland/core/src/main/java/org/n52/shetland/exi/EXIObject.java @@ -20,19 +20,22 @@ /** * Class to hold the XML object which should be encoded and written to the {@link OutputStream}. * - * @param <T> the type of the xml object + * @param <T> + * the type of the xml object * * @since 1.0.0 * * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * */ -public class EXIObject<T> { +public class EXIObject< + T> { private final T doc; /** - * @param doc the XML object to encode + * @param doc + * the XML object to encode */ public EXIObject(T doc) { this.doc = doc; diff --git a/shetland/core/src/main/java/org/n52/shetland/filter/CountFilter.java b/shetland/core/src/main/java/org/n52/shetland/filter/CountFilter.java index b0260129e..314b50fc7 100644 --- a/shetland/core/src/main/java/org/n52/shetland/filter/CountFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/filter/CountFilter.java @@ -15,10 +15,10 @@ */ package org.n52.shetland.filter; -import org.n52.shetland.ogc.filter.FilterClause; - import java.util.Objects; +import org.n52.shetland.ogc.filter.FilterClause; + public class CountFilter implements FilterClause { private final Boolean value; @@ -35,11 +35,13 @@ public Boolean getValue() { return value; } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(value); } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o == this) { return true; } @@ -51,7 +53,8 @@ public Boolean getValue() { return this.value.equals(((CountFilter) o).getValue()); } - @Override public String toString() { + @Override + public String toString() { return "$count=" + getValue().toString(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/filter/ExpandItem.java b/shetland/core/src/main/java/org/n52/shetland/filter/ExpandItem.java index 99b53ef9f..05989efdb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/filter/ExpandItem.java +++ b/shetland/core/src/main/java/org/n52/shetland/filter/ExpandItem.java @@ -15,10 +15,10 @@ */ package org.n52.shetland.filter; -import org.n52.shetland.oasis.odata.query.option.QueryOptions; - import java.util.Objects; +import org.n52.shetland.oasis.odata.query.option.QueryOptions; + public class ExpandItem { private final String path; @@ -44,11 +44,13 @@ public QueryOptions getQueryOptions() { return queryOptions; } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(path, Objects.hashCode(queryOptions)); } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o == this) { return true; } @@ -57,11 +59,12 @@ public QueryOptions getQueryOptions() { return false; } - return Objects.equals(this.path, ((ExpandItem) o).getPath()) && - Objects.equals(this.queryOptions, ((ExpandItem) o).getQueryOptions()); + return Objects.equals(this.path, ((ExpandItem) o).getPath()) + && Objects.equals(this.queryOptions, ((ExpandItem) o).getQueryOptions()); } - @Override public String toString() { + @Override + public String toString() { return path + "(" + getQueryOptions().toString() + ")"; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/filter/FilterFilter.java b/shetland/core/src/main/java/org/n52/shetland/filter/FilterFilter.java index 02508ebe2..3e2607d52 100644 --- a/shetland/core/src/main/java/org/n52/shetland/filter/FilterFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/filter/FilterFilter.java @@ -15,11 +15,11 @@ */ package org.n52.shetland.filter; +import java.util.Objects; + import org.n52.shetland.oasis.odata.ODataExpr; import org.n52.shetland.ogc.filter.FilterClause; -import java.util.Objects; - /** * @author <a href="mailto:j.speckamp@52north.org">Jan Speckamp</a> */ @@ -38,11 +38,13 @@ public Object getFilter() { return filter; } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(this.filter); } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o == this) { return true; } @@ -54,7 +56,8 @@ public Object getFilter() { return Objects.equals(((FilterFilter) o).getFilter(), this.getFilter()); } - @Override public String toString() { + @Override + public String toString() { return "$filter=" + filter.toODataString(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/filter/OrderByFilter.java b/shetland/core/src/main/java/org/n52/shetland/filter/OrderByFilter.java index 1473e5ad2..fdac8c100 100644 --- a/shetland/core/src/main/java/org/n52/shetland/filter/OrderByFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/filter/OrderByFilter.java @@ -15,14 +15,14 @@ */ package org.n52.shetland.filter; -import org.n52.shetland.ogc.filter.AbstractSortingClause; - import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +import org.n52.shetland.ogc.filter.AbstractSortingClause; + /** * class for OrderBy element * @@ -54,11 +54,13 @@ public List<OrderProperty> getSortProperties() { return Collections.unmodifiableList(sortProperties); } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(sortProperties); } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o == this) { return true; } @@ -70,8 +72,9 @@ public List<OrderProperty> getSortProperties() { return this.sortProperties.equals(((OrderByFilter) o).getSortProperties()); } - @Override public String toString() { - return "$orderby=" + - this.sortProperties.stream().map(OrderProperty::toString).collect(Collectors.joining(", ")); + @Override + public String toString() { + return "$orderby=" + + this.sortProperties.stream().map(OrderProperty::toString).collect(Collectors.joining(", ")); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/filter/OrderProperty.java b/shetland/core/src/main/java/org/n52/shetland/filter/OrderProperty.java index e40f3b791..0ffe1c431 100644 --- a/shetland/core/src/main/java/org/n52/shetland/filter/OrderProperty.java +++ b/shetland/core/src/main/java/org/n52/shetland/filter/OrderProperty.java @@ -15,10 +15,10 @@ */ package org.n52.shetland.filter; -import org.n52.shetland.ogc.filter.FilterConstants.SortOrder; - import java.util.Objects; +import org.n52.shetland.ogc.filter.FilterConstants.SortOrder; + public class OrderProperty { private final String valueReference; @@ -53,11 +53,13 @@ public boolean isSetSortOrder() { return getSortOrder() != null; } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(valueReference, sortOrder); } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o == this) { return true; } @@ -66,12 +68,12 @@ public boolean isSetSortOrder() { return false; } - return Objects.equals(this.valueReference, ((OrderProperty) o).getValueReference()) && - Objects.equals(this.sortOrder, ((OrderProperty) o).getSortOrder()); + return Objects.equals(this.valueReference, ((OrderProperty) o).getValueReference()) + && Objects.equals(this.sortOrder, ((OrderProperty) o).getSortOrder()); } - @Override public String toString() { - return valueReference + - ((getSortOrder() != null) ? " " + getSortOrder().toString().toLowerCase() : ""); + @Override + public String toString() { + return valueReference + ((getSortOrder() != null) ? " " + getSortOrder().toString().toLowerCase() : ""); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/filter/SelectFilter.java b/shetland/core/src/main/java/org/n52/shetland/filter/SelectFilter.java index 1d24bc1a2..e8a46a56f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/filter/SelectFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/filter/SelectFilter.java @@ -43,11 +43,13 @@ public Set<String> getItems() { return Collections.unmodifiableSet(items); } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(items); } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o == this) { return true; } @@ -59,7 +61,8 @@ public Set<String> getItems() { return Objects.equals(this.getItems(), ((SelectFilter) o).getItems()); } - @Override public String toString() { + @Override + public String toString() { return "$select=" + String.join(",", this.items); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/filter/SkipTopFilter.java b/shetland/core/src/main/java/org/n52/shetland/filter/SkipTopFilter.java index 84237a0d7..50dcce101 100644 --- a/shetland/core/src/main/java/org/n52/shetland/filter/SkipTopFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/filter/SkipTopFilter.java @@ -15,11 +15,11 @@ */ package org.n52.shetland.filter; +import java.util.Objects; + import org.n52.shetland.ogc.filter.FilterClause; import org.n52.shetland.ogc.filter.FilterConstants.SkipTopOperator; -import java.util.Objects; - public class SkipTopFilter implements FilterClause { private final SkipTopOperator operator; @@ -41,11 +41,13 @@ public Long getValue() { return value; } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(operator, value); } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o == this) { return true; } @@ -58,7 +60,8 @@ public Long getValue() { && Objects.equals(this.value, ((SkipTopFilter) o).getValue()); } - @Override public String toString() { + @Override + public String toString() { return ((getOperator().equals(SkipTopOperator.Top)) ? "$top" : "$skip") + "=" + getValue().toString(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/AbstractInspireKeyword.java b/shetland/core/src/main/java/org/n52/shetland/inspire/AbstractInspireKeyword.java index 464f7634b..0445960ee 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/AbstractInspireKeyword.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/AbstractInspireKeyword.java @@ -24,7 +24,8 @@ * @since 1.0.0 * */ -public abstract class AbstractInspireKeyword<T> { +public abstract class AbstractInspireKeyword< + T> { private InspireOriginatingControlledVocabulary originatingControlledVocabulary; @@ -91,8 +92,8 @@ public boolean isSetOriginatingControlledVocabulary() { @Override public String toString() { - return String.format("%s %n[%n originatingControlledVocabulary=%s,%n keywordValue=%s%n]", this.getClass() - .getSimpleName(), getOriginatingControlledVocabulary(), getKeywordValue()); + return String.format("%s %n[%n originatingControlledVocabulary=%s,%n keywordValue=%s%n]", + this.getClass().getSimpleName(), getOriginatingControlledVocabulary(), getKeywordValue()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireConformity.java b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireConformity.java index ac18a0822..0332e90b5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireConformity.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireConformity.java @@ -99,7 +99,9 @@ public InspireDegreeOfConformity getInspireDegreeOfConformity() { * */ public enum InspireDegreeOfConformity { - conformant, notConformant, notEvaluated; + conformant, + notConformant, + notEvaluated; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireConstants.java b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireConstants.java index 7cebfab2a..73bfbaba4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireConstants.java @@ -20,8 +20,8 @@ import org.n52.shetland.w3c.SchemaLocation; /** - * Constants interface for INSPIRE. Provides element names, prefixes, - * namespaces, {@link SchemaLocation}, {@link QName} + * Constants interface for INSPIRE. Provides element names, prefixes, namespaces, {@link SchemaLocation}, + * {@link QName} * * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 1.0.0 @@ -37,8 +37,8 @@ public interface InspireConstants { String SCHEMA_LOCATION_URL_INSPIRE_COMMON = "http://inspire.ec.europa.eu/schemas/common/1.0/common.xsd"; - SchemaLocation INSPIRE_COMMON_10_SCHEMA_LOCATION = new SchemaLocation(NS_INSPIRE_COMMON, - SCHEMA_LOCATION_URL_INSPIRE_COMMON); + SchemaLocation INSPIRE_COMMON_10_SCHEMA_LOCATION = + new SchemaLocation(NS_INSPIRE_COMMON, SCHEMA_LOCATION_URL_INSPIRE_COMMON); String NS_INSPIRE_DLS = "http://inspire.ec.europa.eu/schemas/inspire_dls/1.0"; @@ -164,8 +164,8 @@ public interface InspireConstants { QName QN_CRS = new QName(NS_INSPIRE_DLS, EN_CRS, NS_INSPIRE_DLS_PREFIX); - QName QN_SPATIAL_DATASET_IDENTIFIER = new QName(NS_INSPIRE_DLS, EN_SPATIAL_DATASET_IDENTIFIER, - NS_INSPIRE_DLS_PREFIX); + QName QN_SPATIAL_DATASET_IDENTIFIER = + new QName(NS_INSPIRE_DLS, EN_SPATIAL_DATASET_IDENTIFIER, NS_INSPIRE_DLS_PREFIX); QName QN_CODE = new QName(NS_INSPIRE_COMMON, EN_CODE, NS_INSPIRE_COMMON_PREFIX); @@ -175,8 +175,8 @@ public interface InspireConstants { QName QN_RESOURCE_TYPE = new QName(NS_INSPIRE_COMMON, EN_RESOURCE_TYPE, NS_INSPIRE_COMMON_PREFIX); - QName QN_SPATIAL_DATA_SERVICE_TYPE = new QName(NS_INSPIRE_COMMON, EN_SPATIAL_DATA_SERVICE_TYPE, - NS_INSPIRE_COMMON_PREFIX); + QName QN_SPATIAL_DATA_SERVICE_TYPE = + new QName(NS_INSPIRE_COMMON, EN_SPATIAL_DATA_SERVICE_TYPE, NS_INSPIRE_COMMON_PREFIX); QName QN_TEMPORAL_REFERENCE = new QName(NS_INSPIRE_COMMON, EN_TEMPORAL_REFERENCE, NS_INSPIRE_COMMON_PREFIX); @@ -192,8 +192,8 @@ public interface InspireConstants { QName QN_DEGREE = new QName(NS_INSPIRE_COMMON, EN_DEGREE, NS_INSPIRE_COMMON_PREFIX); - QName QN_METADATA_POINT_OF_CONTACT = new QName(NS_INSPIRE_COMMON, EN_METADATA_POINT_OF_CONTACT, - NS_INSPIRE_COMMON_PREFIX); + QName QN_METADATA_POINT_OF_CONTACT = + new QName(NS_INSPIRE_COMMON, EN_METADATA_POINT_OF_CONTACT, NS_INSPIRE_COMMON_PREFIX); QName QN_METADATA_DATE = new QName(NS_INSPIRE_COMMON, EN_METADATA_DATE, NS_INSPIRE_COMMON_PREFIX); diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireEuLanguageISO6392B.java b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireEuLanguageISO6392B.java index b03a56f16..b2f52f0c3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireEuLanguageISO6392B.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireEuLanguageISO6392B.java @@ -54,7 +54,8 @@ public enum InspireEuLanguageISO6392B { /** * constructor * - * @param v the three character language string + * @param v + * the three character language string */ InspireEuLanguageISO6392B(String v) { value = v; @@ -91,10 +92,8 @@ public static InspireEuLanguageISO6392B fromValue(String v) { * Get {@link InspireEuLanguageISO6392B} for {@link InspireLanguageISO6392B} * * @param v - * {@link InspireLanguageISO6392B} to get - * {@link InspireEuLanguageISO6392B} for - * @return {@link InspireEuLanguageISO6392B} of - * {@link InspireLanguageISO6392B} + * {@link InspireLanguageISO6392B} to get {@link InspireEuLanguageISO6392B} for + * @return {@link InspireEuLanguageISO6392B} of {@link InspireLanguageISO6392B} * @throws IllegalArgumentException * if the {@link InspireLanguageISO6392B} is invalid */ diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireKeyword.java b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireKeyword.java index 59c9d6bc7..6fba38631 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireKeyword.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireKeyword.java @@ -46,7 +46,8 @@ public InspireKeyword(String keywordValue) { * @param originatingControlledVocabulary * the originating controlled vocabulary */ - public InspireKeyword(String keywordValue, InspireOriginatingControlledVocabulary originatingControlledVocabulary) { + public InspireKeyword(String keywordValue, + InspireOriginatingControlledVocabulary originatingControlledVocabulary) { super(originatingControlledVocabulary); setKeywordValue(keywordValue); } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireLanguageISO6392B.java b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireLanguageISO6392B.java index dfe8e1738..63f8d08a8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireLanguageISO6392B.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireLanguageISO6392B.java @@ -554,10 +554,8 @@ public static InspireLanguageISO6392B fromValue(String v) { * Get {@link InspireLanguageISO6392B} for {@link InspireLanguageISO6392B} * * @param v - * {@link InspireEuLanguageISO6392B} to get - * {@link InspireLanguageISO6392B} for - * @return {@link InspireLanguageISO6392B} of - * {@link InspireEuLanguageISO6392B} + * {@link InspireEuLanguageISO6392B} to get {@link InspireLanguageISO6392B} for + * @return {@link InspireLanguageISO6392B} of {@link InspireEuLanguageISO6392B} * @throws IllegalArgumentException * if the {@link InspireEuLanguageISO6392B} is invalid */ diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireOriginatingControlledVocabulary.java b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireOriginatingControlledVocabulary.java index d352430ae..31e33bb38 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/InspireOriginatingControlledVocabulary.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/InspireOriginatingControlledVocabulary.java @@ -26,8 +26,11 @@ public class InspireOriginatingControlledVocabulary extends InspireCitation { /** * cosntructor - * @param title the title - * @param dateOf the {@link InspireDateOf} implementation + * + * @param title + * the title + * @param dateOf + * the {@link InspireDateOf} implementation */ public InspireOriginatingControlledVocabulary(String title, InspireDateOf dateOf) { super(title, dateOf); diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/Pronunciation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/Pronunciation.java index 73b0c1944..b09313af3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/Pronunciation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/Pronunciation.java @@ -66,18 +66,15 @@ public int hashCode() { @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("ipa", getIPA()) - .add("soundLink", getSoundLink()) - .toString(); + return MoreObjects.toStringHelper(this).add("ipa", getIPA()).add("soundLink", getSoundLink()).toString(); } @Override public boolean equals(Object obj) { if (obj instanceof Pronunciation) { Pronunciation that = (Pronunciation) obj; - return Objects.equal(this.getIPA(), that.getIPA()) && - Objects.equal(this.getSoundLink(), that.getSoundLink()); + return Objects.equal(this.getIPA(), that.getIPA()) + && Objects.equal(this.getSoundLink(), that.getSoundLink()); } return false; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/Spelling.java b/shetland/core/src/main/java/org/n52/shetland/inspire/Spelling.java index 45041d256..861d2ef65 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/Spelling.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/Spelling.java @@ -15,7 +15,6 @@ */ package org.n52.shetland.inspire; - import org.n52.shetland.w3c.Nillable; import com.google.common.base.MoreObjects; @@ -25,6 +24,7 @@ /** * TODO JavaDoc + * * @author Christian Autermann */ public class Spelling { @@ -78,26 +78,18 @@ public int hashCode() { @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("text", getText()) - .add("script", getScript()) - .add("transliterationScheme", getTransliterationScheme()) - .toString(); + return MoreObjects.toStringHelper(this).add("text", getText()).add("script", getScript()) + .add("transliterationScheme", getTransliterationScheme()).toString(); } @Override public boolean equals(Object obj) { if (obj instanceof Spelling) { Spelling that = (Spelling) obj; - return Objects.equal(this.getText(), that.getText()) && - Objects.equal(this.getScript(), that.getScript()) && - Objects.equal(this.getTransliterationScheme(), that.getTransliterationScheme()); + return Objects.equal(this.getText(), that.getText()) && Objects.equal(this.getScript(), that.getScript()) + && Objects.equal(this.getTransliterationScheme(), that.getTransliterationScheme()); } return false; } - - - - } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/base/Identifier.java b/shetland/core/src/main/java/org/n52/shetland/inspire/base/Identifier.java index 83510cea9..877a98b0f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/base/Identifier.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/base/Identifier.java @@ -24,8 +24,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -public class Identifier - extends CodeWithAuthority { +public class Identifier extends CodeWithAuthority { private Nillable<String> versionId = Nillable.absent(); diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/base2/Contact.java b/shetland/core/src/main/java/org/n52/shetland/inspire/base2/Contact.java index 59faf1800..0bd34a3f0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/base2/Contact.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/base2/Contact.java @@ -195,7 +195,8 @@ public Contact addTelephoneFacsimile(String telephoneFacsimile) { public Contact addTelephoneFacsimile(Nillable<String> telephoneFacsimile) { if (this.telephoneFacsimile.isAbsent() || this.telephoneFacsimile.isNil()) { - this.telephoneFacsimile = Nillable.of((List<Nillable<String>>) Lists.<Nillable<String>> newArrayList()); + this.telephoneFacsimile = Nillable.of((List<Nillable<String>>) Lists.< + Nillable<String>> newArrayList()); } if (this.telephoneFacsimile.isPresent()) { this.telephoneFacsimile.get().add(telephoneFacsimile); @@ -237,7 +238,8 @@ public Contact addTelephoneVoice(String telephoneVoice) { public Contact addTelephoneVoice(Nillable<String> telephoneVoice) { if (this.telephoneVoice.isAbsent() || this.telephoneVoice.isNil()) { - this.telephoneVoice = Nillable.of((List<Nillable<String>>) Lists.<Nillable<String>> newArrayList()); + this.telephoneVoice = Nillable.of((List<Nillable<String>>) Lists.< + Nillable<String>> newArrayList()); } if (telephoneVoice.isPresent()) { this.telephoneVoice.get().add(telephoneVoice); diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/dls/FullInspireExtendedCapabilities.java b/shetland/core/src/main/java/org/n52/shetland/inspire/dls/FullInspireExtendedCapabilities.java index f829a5364..94d1603a0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/dls/FullInspireExtendedCapabilities.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/dls/FullInspireExtendedCapabilities.java @@ -204,6 +204,7 @@ public InspireResourceLocator getMetadataUrl() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public FullInspireExtendedCapabilities setMetadataUrl(InspireResourceLocator metadataUrl) { this.metadataUrl = metadataUrl; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/dls/InspireCapabilities.java b/shetland/core/src/main/java/org/n52/shetland/inspire/dls/InspireCapabilities.java index a2b0e70e4..4f54ceb5f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/dls/InspireCapabilities.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/dls/InspireCapabilities.java @@ -262,7 +262,8 @@ interface InspireExtendedCapabilitiesResourceType { * @since 1.0.0 * */ - interface InspireExtendedCapabilitiesTemporalReference<T> { + interface InspireExtendedCapabilitiesTemporalReference< + T> { /** * Get the temporal references * diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/dls/InspireExtendedCapabilities.java b/shetland/core/src/main/java/org/n52/shetland/inspire/dls/InspireExtendedCapabilities.java index 43888c8de..3f776b294 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/dls/InspireExtendedCapabilities.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/dls/InspireExtendedCapabilities.java @@ -24,8 +24,10 @@ import org.n52.shetland.ogc.ows.OwsOperationMetadataExtension; import org.n52.shetland.ogc.sos.SosConstants; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** - * Abstract service internal representation of INSPIRE ExtendedCapabilities. + * Abstract service internal representation of INSPIRE ExtendedCapabilities. * * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 1.0.0 @@ -67,11 +69,13 @@ public String getNamespace() { } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public InspireSupportedLanguages getSupportedLanguages() { return supportedLanguages; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public InspireExtendedCapabilities setSupportedLanguages(InspireSupportedLanguages supportedLanguages) { this.supportedLanguages = supportedLanguages; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/dls/InspireExtendedCapabilitiesDLS.java b/shetland/core/src/main/java/org/n52/shetland/inspire/dls/InspireExtendedCapabilitiesDLS.java index 80fe2ea79..c79cac25e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/dls/InspireExtendedCapabilitiesDLS.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/dls/InspireExtendedCapabilitiesDLS.java @@ -16,6 +16,7 @@ package org.n52.shetland.inspire.dls; import java.util.Collection; +import java.util.Collections; import java.util.Set; import org.n52.shetland.inspire.InspireConstants; @@ -28,15 +29,14 @@ import com.google.common.collect.Sets; /** - * Abstract service internal representation of INSPIRE DLS ExtendedCapabilities. - * Extends the {@link InspireExtendedCapabilities} with the DLS specific data + * Abstract service internal representation of INSPIRE DLS ExtendedCapabilities. Extends the + * {@link InspireExtendedCapabilities} with the DLS specific data * * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 1.0.0 * */ -public abstract class InspireExtendedCapabilitiesDLS - extends InspireExtendedCapabilities +public abstract class InspireExtendedCapabilitiesDLS extends InspireExtendedCapabilities implements InspireExtendedCapabilitiesSpatialDataSetIdentifier { /* SpatialDataSetIdentifier 1..* */ @@ -52,9 +52,8 @@ public abstract class InspireExtendedCapabilitiesDLS * @param spatialDataSetIdentifier * Spatial dataset identifier to set */ - public InspireExtendedCapabilitiesDLS( - InspireSupportedLanguages supportedLanguages, InspireLanguageISO6392B responseLanguage, - InspireUniqueResourceIdentifier spatialDataSetIdentifier) { + public InspireExtendedCapabilitiesDLS(InspireSupportedLanguages supportedLanguages, + InspireLanguageISO6392B responseLanguage, InspireUniqueResourceIdentifier spatialDataSetIdentifier) { super(supportedLanguages, responseLanguage); addSpatialDataSetIdentifier(spatialDataSetIdentifier); } @@ -69,8 +68,8 @@ public InspireExtendedCapabilitiesDLS( * @param spatialDataSetIdentifiers * Spatial dataset identifiers to set */ - public InspireExtendedCapabilitiesDLS( - InspireSupportedLanguages supportedLanguages, InspireLanguageISO6392B responseLanguage, + public InspireExtendedCapabilitiesDLS(InspireSupportedLanguages supportedLanguages, + InspireLanguageISO6392B responseLanguage, Collection<InspireUniqueResourceIdentifier> spatialDataSetIdentifiers) { super(supportedLanguages, responseLanguage); setSpatialDataSetIdentifier(spatialDataSetIdentifiers); @@ -83,15 +82,16 @@ public String getNamespace() { @Override public Set<InspireUniqueResourceIdentifier> getSpatialDataSetIdentifier() { - return spatialDataSetIdentifier; + return Collections.unmodifiableSet(spatialDataSetIdentifier); } @Override public InspireExtendedCapabilitiesDLS setSpatialDataSetIdentifier( Collection<InspireUniqueResourceIdentifier> spatialDataSetIdentifier) { + this.spatialDataSetIdentifier.clear(); if (CollectionHelper.isNotEmpty(spatialDataSetIdentifier)) { - getSpatialDataSetIdentifier().clear(); - getSpatialDataSetIdentifier().addAll(spatialDataSetIdentifier); + this.spatialDataSetIdentifier.clear(); + this.spatialDataSetIdentifier.addAll(spatialDataSetIdentifier); } return this; } @@ -99,7 +99,9 @@ public InspireExtendedCapabilitiesDLS setSpatialDataSetIdentifier( @Override public InspireExtendedCapabilitiesDLS addSpatialDataSetIdentifier( InspireUniqueResourceIdentifier spatialDataSetIdentifier) { - getSpatialDataSetIdentifier().add(spatialDataSetIdentifier); + if (spatialDataSetIdentifier != null) { + this.spatialDataSetIdentifier.add(spatialDataSetIdentifier); + } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/dls/MinimalInspireExtendedCapabilities.java b/shetland/core/src/main/java/org/n52/shetland/inspire/dls/MinimalInspireExtendedCapabilities.java index b602bae67..147d21b89 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/dls/MinimalInspireExtendedCapabilities.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/dls/MinimalInspireExtendedCapabilities.java @@ -23,6 +23,8 @@ import org.n52.shetland.inspire.InspireUniqueResourceIdentifier; import org.n52.shetland.inspire.dls.InspireCapabilities.InspireExtendedCapabilitiesMetadataURL; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Service internal object to represent the minimal INSPIRE DLS ExtendedCapabilities * @@ -30,8 +32,8 @@ * @since 1.0.0 * */ -public class MinimalInspireExtendedCapabilities extends InspireExtendedCapabilitiesDLS implements - InspireExtendedCapabilitiesMetadataURL { +public class MinimalInspireExtendedCapabilities extends InspireExtendedCapabilitiesDLS + implements InspireExtendedCapabilitiesMetadataURL { /* MetadataUrl 1..1 */ private InspireResourceLocator metadataUrl; @@ -56,11 +58,13 @@ public MinimalInspireExtendedCapabilities(InspireResourceLocator metadataUrl, } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public InspireResourceLocator getMetadataUrl() { return metadataUrl; } @Override + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public MinimalInspireExtendedCapabilities setMetadataUrl(InspireResourceLocator metadataUrl) { this.metadataUrl = metadataUrl; return this; @@ -73,8 +77,8 @@ public boolean isSetMetadataUrl() { @Override public String toString() { - return String.format("%s %n[%n \tn supportedLanguages=%s," + "%n responseLanguage=%s," - + "%n metadataUrl=%s%n]", this.getClass().getSimpleName(), getSupportedLanguages(), - getResponseLanguage(), getMetadataUrl()); + return String.format( + "%s %n[%n \tn supportedLanguages=%s," + "%n responseLanguage=%s," + "%n metadataUrl=%s%n]", + this.getClass().getSimpleName(), getSupportedLanguages(), getResponseLanguage(), getMetadataUrl()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringFeature.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringFeature.java index 853a1ac4d..2d453e1de 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringFeature.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringFeature.java @@ -62,7 +62,7 @@ public Set<ReportToLegalAct> getReportedTo() { /** * @param reportedTo * the reportedTo to set - * @return + * @return this */ public AbstractMonitoringFeature setReportedTo(Collection<ReportToLegalAct> reportedTo) { this.reportedTo.clear(); @@ -86,7 +86,7 @@ public Set<Referenceable<OmObservation>> getHasObservation() { /** * @param hasObservationa * the hasObservation to set - * @return + * @return this */ public AbstractMonitoringFeature setHasObservation(Collection<Referenceable<OmObservation>> hasObservation) { this.hasObservation.clear(); @@ -126,7 +126,7 @@ public Set<Referenceable<EnvironmentalMonitoringActivity>> getInvolvedIn() { /** * @param involvedIn * the involvedIn to set - * @return + * @return this */ public AbstractMonitoringFeature setInvolvedIn( Collection<Referenceable<EnvironmentalMonitoringActivity>> involvedIn) { diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringObject.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringObject.java index 09ce0d7a5..8262b83cc 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringObject.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AbstractMonitoringObject.java @@ -32,6 +32,8 @@ import com.google.common.base.Strings; import com.google.common.collect.Sets; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + public abstract class AbstractMonitoringObject extends AbstractFeature { /** @@ -145,7 +147,7 @@ public Set<ReferenceType> getMediaMonitored() { /** * @param mediaMonitored * the mediaMonitored to add - * @return + * @return this */ public AbstractMonitoringObject addMediaMonitored(Collection<ReferenceType> mediaMonitored) { this.mediaMonitored.clear(); @@ -158,7 +160,7 @@ public AbstractMonitoringObject addMediaMonitored(Collection<ReferenceType> medi /** * @param mediaMonitored * the mediaMonitored to add - * @return + * @return this */ public AbstractMonitoringObject addMediaMonitored(ReferenceType mediaMonitored) { if (mediaMonitored != null) { @@ -177,7 +179,7 @@ public Set<Referenceable<LegislationCitation>> getLegalBackground() { /** * @param legalBackground * the legalBackground to set - * @return + * @return this */ public AbstractMonitoringObject setLegalBackground( Collection<Referenceable<LegislationCitation>> legalBackground) { @@ -195,6 +197,7 @@ public boolean isSetLegalBackground() { /** * @return the responsibleParty */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public RelatedParty getResponsibleParty() { return responsibleParty; } @@ -203,6 +206,7 @@ public RelatedParty getResponsibleParty() { * @param responsibleParty * the responsibleParty to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setResponsibleParty(RelatedParty responsibleParty) { this.responsibleParty = responsibleParty; } @@ -214,6 +218,7 @@ public boolean isSetResponsibleParty() { /** * @return the geometry */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AbstractGeometry getGeometry() { return geometry; } @@ -222,6 +227,7 @@ public AbstractGeometry getGeometry() { * @param geometry * the geometry to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setGeometry(AbstractGeometry geometry) { this.geometry = geometry; } @@ -248,7 +254,7 @@ public Set<String> getOnlineResource() { /** * @param onlineResource * the onlineResource to set - * @return + * @return this */ public AbstractMonitoringObject setOnlineResource(Collection<String> onlineResource) { this.onlineResource.clear(); @@ -272,7 +278,7 @@ public Set<ReferenceType> getPurpose() { /** * @param purpose * the purpose to set - * @return + * @return this */ public AbstractMonitoringObject setPurpose(Collection<ReferenceType> purpose) { this.purpose.clear(); @@ -296,7 +302,7 @@ public Set<Referenceable<ObservingCapability>> getObservingCapability() { /** * @param observingCapability * the observingCapability to set - * @return + * @return this */ public AbstractMonitoringObject setObservingCapability( Collection<Referenceable<ObservingCapability>> observingCapability) { @@ -310,7 +316,7 @@ public AbstractMonitoringObject setObservingCapability( /** * @param observingCapability * the observingCapability to add - * @return + * @return this */ public AbstractMonitoringObject addObservingCapability(Referenceable<ObservingCapability> observingCapability) { if (observingCapability != null) { @@ -364,7 +370,7 @@ public Set<Referenceable<Hierarchy>> getNarrower() { /** * @param narrower * the narrower to set - * @return + * @return this */ public AbstractMonitoringObject setNarrower(Collection<Referenceable<Hierarchy>> narrower) { this.narrower.clear(); @@ -388,7 +394,7 @@ public Set<Referenceable<AbstractMonitoringObject>> getSupersedes() { /** * @param supersedes * the supersedes to set - * @return + * @return this */ public AbstractMonitoringObject setSupersedes(Collection<Referenceable<AbstractMonitoringObject>> supersedes) { this.supersedes.clear(); @@ -412,7 +418,7 @@ public Set<Referenceable<AbstractMonitoringObject>> getSupersededBy() { /** * @param supersededBy * the supersededBy to set - * @return + * @return this */ public AbstractMonitoringObject setSupersededBy(Collection<Referenceable<AbstractMonitoringObject>> supersededBy) { this.supersededBy.clear(); diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AnyDomainLink.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AnyDomainLink.java index 732653d40..293783855 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AnyDomainLink.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/AnyDomainLink.java @@ -17,8 +17,9 @@ import org.n52.shetland.ogc.gml.AbstractGML; -public class AnyDomainLink - extends AbstractGML { +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + +public class AnyDomainLink extends AbstractGML { /** * 1..1 @@ -30,6 +31,7 @@ public class AnyDomainLink */ private EnvironmentalMonitoringFacility relatedTo; + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AnyDomainLink(String comment, EnvironmentalMonitoringFacility relatedTo) { this.comment = comment; this.relatedTo = relatedTo; @@ -45,6 +47,7 @@ public String getComment() { /** * @return the relatedTo */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public EnvironmentalMonitoringFacility getRelatedTo() { return relatedTo; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringActivity.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringActivity.java index a3e11faa0..f49f007b0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringActivity.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringActivity.java @@ -16,6 +16,8 @@ package org.n52.shetland.inspire.ef; import java.net.URI; +import java.util.Collection; +import java.util.Collections; import java.util.Set; import org.n52.shetland.inspire.base.Identifier; @@ -26,8 +28,9 @@ import com.google.common.collect.Sets; -public class EnvironmentalMonitoringActivity - extends AbstractFeature { +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + +public class EnvironmentalMonitoringActivity extends AbstractFeature { /** * 1..1 @@ -69,8 +72,9 @@ public class EnvironmentalMonitoringActivity */ private Set<AbstractMonitoringFeature> uses = Sets.newHashSet(); - public EnvironmentalMonitoringActivity( - Time activityTime, String activityConditions, RelatedParty responsibleParty, Identifier inspireId) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public EnvironmentalMonitoringActivity(Time activityTime, String activityConditions, RelatedParty responsibleParty, + Identifier inspireId) { super(inspireId); this.activityTime = activityTime; this.activityConditions = activityConditions; @@ -81,6 +85,7 @@ public EnvironmentalMonitoringActivity( /** * @return the activityTime */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getActivityTime() { return activityTime; } @@ -114,6 +119,7 @@ public boolean isSetBoundingBox() { /** * @return the responsibleParty */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public RelatedParty getResponsibleParty() { return responsibleParty; } @@ -121,6 +127,7 @@ public RelatedParty getResponsibleParty() { /** * @return the inspireId */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Identifier getInspireId() { return inspireId; } @@ -129,16 +136,21 @@ public Identifier getInspireId() { * @return the onlineResource */ public Set<URI> getOnlineResource() { - return onlineResource; + return Collections.unmodifiableSet(onlineResource); } /** * @param onlineResource * the onlineResource to set + * @return this */ - public void setOnlineResource(Set<URI> onlineResource) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public EnvironmentalMonitoringActivity setOnlineResource(Collection<URI> onlineResource) { this.onlineResource.clear(); - this.onlineResource = onlineResource; + if (onlineResource != null) { + this.onlineResource.addAll(onlineResource); + } + return this; } public boolean isSetOnlineResource() { @@ -149,16 +161,21 @@ public boolean isSetOnlineResource() { * @return the setUpFor */ public Set<EnvironmentalMonitoringProgramme> getSetUpFor() { - return setUpFor; + return Collections.unmodifiableSet(setUpFor); } /** * @param setUpFor * the setUpFor to set + * @return this */ - public void setSetUpFor(Set<EnvironmentalMonitoringProgramme> setUpFor) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public EnvironmentalMonitoringActivity setSetUpFor(Collection<EnvironmentalMonitoringProgramme> setUpFor) { this.setUpFor.clear(); - this.setUpFor = setUpFor; + if (setUpFor != null) { + this.setUpFor.addAll(setUpFor); + } + return this; } public boolean isSetUpFor() { @@ -169,16 +186,21 @@ public boolean isSetUpFor() { * @return the uses */ public Set<AbstractMonitoringFeature> getUses() { - return uses; + return Collections.unmodifiableSet(uses); } /** * @param uses * the uses to set + * @return this */ - public void setUses(Set<AbstractMonitoringFeature> uses) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public EnvironmentalMonitoringActivity setUses(Collection<AbstractMonitoringFeature> uses) { this.uses.clear(); - this.uses = uses; + if (uses != null) { + this.uses.addAll(uses); + } + return this; } public boolean isSetUses() { diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringFacility.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringFacility.java index f494883e5..35deb2f0d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringFacility.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringFacility.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.inspire.ef; +import java.util.Collection; +import java.util.Collections; import java.util.Set; import org.locationtech.jts.geom.Point; @@ -26,8 +28,9 @@ import com.google.common.collect.Sets; -public class EnvironmentalMonitoringFacility - extends AbstractMonitoringFeature { +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + +public class EnvironmentalMonitoringFacility extends AbstractMonitoringFeature { /** * 0..1 @@ -79,8 +82,8 @@ public EnvironmentalMonitoringFacility(Identifier inspireId, Set<ReferenceType> super(inspireId, mediaMonitored); } - public EnvironmentalMonitoringFacility( - Identifier inspireId, ReferenceType mediaMonitored, ReferenceType measurementRegime, boolean mobile, + public EnvironmentalMonitoringFacility(Identifier inspireId, ReferenceType mediaMonitored, + ReferenceType measurementRegime, boolean mobile, Referenceable<OperationalActivityPeriod> operationalActivityPeriod) { super(inspireId, mediaMonitored); this.measurementRegime = measurementRegime; @@ -89,8 +92,8 @@ public EnvironmentalMonitoringFacility( setDefaultElementEncoding(InspireEfConstants.NS_EF); } - public EnvironmentalMonitoringFacility( - Identifier inspireId, Set<ReferenceType> mediaMonitored, ReferenceType measurementRegime, boolean mobile, + public EnvironmentalMonitoringFacility(Identifier inspireId, Set<ReferenceType> mediaMonitored, + ReferenceType measurementRegime, boolean mobile, Set<Referenceable<OperationalActivityPeriod>> operationalActivityPeriod) { super(inspireId, mediaMonitored); this.measurementRegime = measurementRegime; @@ -118,6 +121,7 @@ public String getGmlId() { /** * @return the representativePoint */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Point getRepresentativePoint() { return representativePoint; } @@ -125,9 +129,12 @@ public Point getRepresentativePoint() { /** * @param representativePoint * the representativePoint to set + * @return this */ - public void setRepresentativePoint(Point representativePoint) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public EnvironmentalMonitoringFacility setRepresentativePoint(Point representativePoint) { this.representativePoint = representativePoint; + return this; } public boolean isSetRepresentativePoint() { @@ -144,9 +151,11 @@ public ReferenceType getMeasurementRegime() { /** * @param measurementRegime * the measurementRegime to set + * @return this */ - public void setMeasurementRegime(ReferenceType measurementRegime) { + public EnvironmentalMonitoringFacility setMeasurementRegime(ReferenceType measurementRegime) { this.measurementRegime = measurementRegime; + return this; } public boolean isSetMeasurementRegime() { @@ -176,16 +185,20 @@ public boolean isSetMobile() { * @return the resultAcquisitionSource */ public Set<ReferenceType> getResultAcquisitionSource() { - return resultAcquisitionSource; + return Collections.unmodifiableSet(resultAcquisitionSource); } /** * @param resultAcquisitionSource * the resultAcquisitionSource to set */ - public void setResultAcquisitionSource(Set<ReferenceType> resultAcquisitionSource) { + public EnvironmentalMonitoringFacility setResultAcquisitionSource( + Collection<ReferenceType> resultAcquisitionSource) { this.resultAcquisitionSource.clear(); - this.resultAcquisitionSource = resultAcquisitionSource; + if (resultAcquisitionSource != null) { + this.resultAcquisitionSource.addAll(resultAcquisitionSource); + } + return this; } public boolean isSetResultAcquisitionSource() { @@ -203,8 +216,9 @@ public ReferenceType getSpecialisedEMFType() { * @param specialisedEMFType * the specialisedEMFType to set */ - public void setSpecialisedEMFType(ReferenceType specialisedEMFType) { + public EnvironmentalMonitoringFacility setSpecialisedEMFType(ReferenceType specialisedEMFType) { this.specialisedEMFType = specialisedEMFType; + return this; } public boolean isSetSpecialisedEMFType() { @@ -215,15 +229,21 @@ public boolean isSetSpecialisedEMFType() { * @return the operationalActivityPeriod */ public Set<Referenceable<OperationalActivityPeriod>> getOperationalActivityPeriod() { - return operationalActivityPeriod; + return Collections.unmodifiableSet(operationalActivityPeriod); } /** * @param operationalActivityPeriod * the operationalActivityPeriod to set + * @return this */ - public void setOperationalActivityPeriod(Set<Referenceable<OperationalActivityPeriod>> operationalActivityPeriod) { - this.operationalActivityPeriod = operationalActivityPeriod; + public EnvironmentalMonitoringFacility setOperationalActivityPeriod( + Collection<Referenceable<OperationalActivityPeriod>> operationalActivityPeriod) { + this.operationalActivityPeriod.clear(); + if (operationalActivityPeriod != null) { + this.operationalActivityPeriod.addAll(operationalActivityPeriod); + } + return this; } public boolean isSetOperationalActivityPeriod() { @@ -234,16 +254,20 @@ public boolean isSetOperationalActivityPeriod() { * @return the relatedTo */ public Set<Referenceable<AnyDomainLink>> getRelatedTo() { - return relatedTo; + return Collections.unmodifiableSet(relatedTo); } /** * @param relatedTo * the relatedTo to set + * @return this */ - public void setRelatedTo(Set<Referenceable<AnyDomainLink>> relatedTo) { + public EnvironmentalMonitoringFacility setRelatedTo(Collection<Referenceable<AnyDomainLink>> relatedTo) { this.relatedTo.clear(); - this.relatedTo = relatedTo; + if (relatedTo != null) { + this.relatedTo.addAll(relatedTo); + } + return this; } public boolean isSetRelatedTo() { @@ -254,16 +278,20 @@ public boolean isSetRelatedTo() { * @return the belongsTo */ public Set<Referenceable<NetworkFacility>> getBelongsTo() { - return belongsTo; + return Collections.unmodifiableSet(belongsTo); } /** * @param belongsTo * the belongsTo to set + * @return this */ - public void setBelongsTo(Set<Referenceable<NetworkFacility>> belongsTo) { + public EnvironmentalMonitoringFacility setBelongsTo(Collection<Referenceable<NetworkFacility>> belongsTo) { this.belongsTo.clear(); - this.belongsTo = belongsTo; + if (relatedTo != null) { + this.belongsTo.addAll(belongsTo); + } + return this; } public boolean isSetBelongsTo() { diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringProgramme.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringProgramme.java index 13770f413..24f52bfa1 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringProgramme.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/EnvironmentalMonitoringProgramme.java @@ -50,7 +50,7 @@ public Set<EnvironmentalMonitoringActivity> getTriggers() { /** * @param triggers * the triggers to set - * @return + * @return this */ public EnvironmentalMonitoringProgramme setTriggers(Collection<EnvironmentalMonitoringActivity> triggers) { this.triggers.clear(); diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/Hierarchy.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/Hierarchy.java index 06e193c25..0646a61d4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/Hierarchy.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/Hierarchy.java @@ -18,8 +18,9 @@ import org.n52.shetland.ogc.gml.AbstractGML; import org.n52.shetland.ogc.gml.time.Time; -public class Hierarchy - extends AbstractGML { +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + +public class Hierarchy extends AbstractGML { /** * 0..1 @@ -39,6 +40,7 @@ public class Hierarchy /** * @return the linkingTime */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getLinkingTime() { return linkingTime; } @@ -47,6 +49,7 @@ public Time getLinkingTime() { * @param linkingTime * the linkingTime to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setLinkingTime(Time linkingTime) { this.linkingTime = linkingTime; } @@ -54,6 +57,7 @@ public void setLinkingTime(Time linkingTime) { /** * @return the broader */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AbstractMonitoringObject getBroader() { return broader; } @@ -62,6 +66,7 @@ public AbstractMonitoringObject getBroader() { * @param broader * the broader to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setBroader(AbstractMonitoringObject broader) { this.broader = broader; } @@ -69,6 +74,7 @@ public void setBroader(AbstractMonitoringObject broader) { /** * @return the narrower */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public AbstractMonitoringObject getNarrower() { return narrower; } @@ -77,6 +83,7 @@ public AbstractMonitoringObject getNarrower() { * @param narrower * the narrower to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setNarrower(AbstractMonitoringObject narrower) { this.narrower = narrower; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/NetworkFacility.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/NetworkFacility.java index 4ec3a4419..a0dccaf47 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/NetworkFacility.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/NetworkFacility.java @@ -18,8 +18,9 @@ import org.n52.shetland.ogc.gml.AbstractGML; import org.n52.shetland.ogc.gml.time.Time; -public class NetworkFacility - extends AbstractGML { +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + +public class NetworkFacility extends AbstractGML { /** * 1..1 @@ -36,8 +37,9 @@ public class NetworkFacility */ private EnvironmentalMonitoringFacility contains; - public NetworkFacility( - Time linkingTime, EnvironmentalMonitoringNetwork belongsTo, EnvironmentalMonitoringFacility contains) { + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public NetworkFacility(Time linkingTime, EnvironmentalMonitoringNetwork belongsTo, + EnvironmentalMonitoringFacility contains) { this.linkingTime = linkingTime; this.belongsTo = belongsTo; this.contains = contains; @@ -46,6 +48,7 @@ public NetworkFacility( /** * @return the linkingTime */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Time getLinkingTime() { return linkingTime; } @@ -54,6 +57,7 @@ public Time getLinkingTime() { * @param linkingTime * the linkingTime to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setLinkingTime(Time linkingTime) { this.linkingTime = linkingTime; } @@ -61,6 +65,7 @@ public void setLinkingTime(Time linkingTime) { /** * @return the belongsTo */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public EnvironmentalMonitoringNetwork getBelongsTo() { return belongsTo; } @@ -69,6 +74,7 @@ public EnvironmentalMonitoringNetwork getBelongsTo() { * @param belongsTo * the belongsTo to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setBelongsTo(EnvironmentalMonitoringNetwork belongsTo) { this.belongsTo = belongsTo; } @@ -76,6 +82,7 @@ public void setBelongsTo(EnvironmentalMonitoringNetwork belongsTo) { /** * @return the contains */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public EnvironmentalMonitoringFacility getContains() { return contains; } @@ -84,6 +91,7 @@ public EnvironmentalMonitoringFacility getContains() { * @param contains * the contains to set */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setContains(EnvironmentalMonitoringFacility contains) { this.contains = contains; } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ObservingCapability.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ObservingCapability.java index 98fc373f4..9fd273a3e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ObservingCapability.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ObservingCapability.java @@ -71,9 +71,8 @@ public ObservingCapability(String href) { } @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) - public ObservingCapability( - Time observingTime, ReferenceType processType, ReferenceType resultNature, AbstractFeature procedure, - ReferenceType observedProperty) { + public ObservingCapability(Time observingTime, ReferenceType processType, ReferenceType resultNature, + AbstractFeature procedure, ReferenceType observedProperty) { this.observingTime = observingTime; this.processType = processType; this.resultNature = resultNature; @@ -196,8 +195,7 @@ public void setObservedProperty(ReferenceType observedProperty) { public boolean equals(Object obj) { if (obj instanceof ObservingCapability) { ObservingCapability that = (ObservingCapability) obj; - return super.equals(obj) - && Objects.equals(getObservingTime(), that.getObservingTime()) + return super.equals(obj) && Objects.equals(getObservingTime(), that.getObservingTime()) && Objects.equals(getProcessType(), that.getProcessType()) && Objects.equals(getResultNature(), that.getResultNature()) && Objects.equals(getOnlineResource(), that.getOnlineResource()) diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ReportToLegalAct.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ReportToLegalAct.java index b864c2716..518919b26 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ReportToLegalAct.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ef/ReportToLegalAct.java @@ -63,7 +63,8 @@ public LegislationCitation getLegalAct() { } /** - * @param legalAct the legalAct to set + * @param legalAct + * the legalAct to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setLegalAct(LegislationCitation legalAct) { @@ -79,7 +80,8 @@ public TimeInstant getReportDate() { } /** - * @param reportDate the reportDate to set + * @param reportDate + * the reportDate to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setReportDate(TimeInstant reportDate) { @@ -94,7 +96,8 @@ public URI getReportedEnvelope() { } /** - * @param reportedEnvelope the reportedEnvelope to set + * @param reportedEnvelope + * the reportedEnvelope to set */ public void setReportedEnvelope(URI reportedEnvelope) { this.reportedEnvelope = reportedEnvelope; @@ -108,7 +111,8 @@ public boolean isObservationRequired() { } /** - * @param observationRequired the observationRequired to set + * @param observationRequired + * the observationRequired to set */ public void setObservationRequired(boolean observationRequired) { this.observationRequired = observationRequired; @@ -122,7 +126,8 @@ public boolean isObservingCapabilityRequired() { } /** - * @param observingCapabilityRequired the observingCapabilityRequired to set + * @param observingCapabilityRequired + * the observingCapabilityRequired to set */ public void setObservingCapabilityRequired(boolean observingCapabilityRequired) { this.observingCapabilityRequired = observingCapabilityRequired; @@ -136,7 +141,8 @@ public String getDescription() { } /** - * @param description the description to set + * @param description + * the description to set */ public void setDescription(String description) { this.description = description; diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/ompr/Process.java b/shetland/core/src/main/java/org/n52/shetland/inspire/ompr/Process.java index bb1b3d6e6..8f216c8ba 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/ompr/Process.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/ompr/Process.java @@ -65,7 +65,8 @@ public Identifier getInspireId() { } /** - * @param name the name to set + * @param name + * the name to set */ public Process setName(String name) { super.setName(new CodeType(name)); @@ -80,7 +81,8 @@ public String getType() { } /** - * @param type the type to set + * @param type + * the type to set */ public Process setType(String type) { this.type = type; @@ -99,7 +101,8 @@ public List<DocumentCitation> getDocumentation() { } /** - * @param documentation the documentation to set + * @param documentation + * the documentation to set */ public Process setDocumentation(Collection<DocumentCitation> documentation) { this.documentation.clear(); @@ -110,7 +113,8 @@ public Process setDocumentation(Collection<DocumentCitation> documentation) { } /** - * @param documentation the documentation to add + * @param documentation + * the documentation to add */ public Process addDocumentation(DocumentCitation documentation) { if (documentation != null) { @@ -131,7 +135,8 @@ public List<ProcessParameter> getProcessParameter() { } /** - * @param processParameter the processParameter to set + * @param processParameter + * the processParameter to set */ public Process setProcessParameter(Collection<ProcessParameter> processParameter) { this.processParameter.clear(); @@ -142,7 +147,8 @@ public Process setProcessParameter(Collection<ProcessParameter> processParameter } /** - * @param processParameter the processParameter to add + * @param processParameter + * the processParameter to add */ public Process addProcessParameter(ProcessParameter processParameter) { if (processParameter != null) { @@ -163,7 +169,8 @@ public List<RelatedParty> getResponsibleParty() { } /** - * @param responsibleParty the responsibleParty to set + * @param responsibleParty + * the responsibleParty to set */ public Process setResponsibleParty(Collection<RelatedParty> responsibleParty) { this.responsibleParty.clear(); @@ -174,7 +181,8 @@ public Process setResponsibleParty(Collection<RelatedParty> responsibleParty) { } /** - * @param responsibleParty the responsibleParty to add + * @param responsibleParty + * the responsibleParty to add */ public Process addResponsibleParty(RelatedParty responsibleParty) { if (responsibleParty != null) { @@ -183,7 +191,6 @@ public Process addResponsibleParty(RelatedParty responsibleParty) { return this; } - public boolean isSetResponsibleParty() { return CollectionHelper.isNotEmpty(getResponsibleParty()); } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/AbstractInspireObservation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/AbstractInspireObservation.java index d8a80ed07..6f8e323fb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/AbstractInspireObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/AbstractInspireObservation.java @@ -27,8 +27,7 @@ * @since 1.0.0 * */ -public abstract class AbstractInspireObservation - extends OmObservation { +public abstract class AbstractInspireObservation extends OmObservation { /** * constructor @@ -53,13 +52,11 @@ public AbstractInspireObservation(OmObservation observation) { } /** - * Check if the {@link OmObservation} has a featureOfInterest with geometry - * value + * Check if the {@link OmObservation} has a featureOfInterest with geometry value * * @param observation * {@link OmObservation} to check - * @return <code>true</code>, if the {@link OmObservation} has a - * featureOfInterest with geometry value + * @return <code>true</code>, if the {@link OmObservation} has a featureOfInterest with geometry value */ protected boolean checkForFeatureGeometry(OmObservation observation) { if (observation.getObservationConstellation().isSetFeatureOfInterest() && observation @@ -71,8 +68,7 @@ protected boolean checkForFeatureGeometry(OmObservation observation) { } /** - * Get the geometry value from the featureOfInterest of the - * {@link OmObservation} + * Get the geometry value from the featureOfInterest of the {@link OmObservation} * * @param observation * The {@link OmObservation} to get the geometry from @@ -84,8 +80,7 @@ protected Geometry getGeometryFromFeature(OmObservation observation) { } /** - * Get the geometry value from the samplingGeometry (om:parameter) of the - * {@link OmObservation} + * Get the geometry value from the samplingGeometry (om:parameter) of the {@link OmObservation} * * @param observation * The {@link OmObservation} to get the geometry from diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/InspireOMSOConstants.java b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/InspireOMSOConstants.java index fc88ee3c2..8f2a261c3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/InspireOMSOConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/InspireOMSOConstants.java @@ -32,7 +32,8 @@ public interface InspireOMSOConstants { String NS_OMSO_PREFIX = "omso"; - //String SCHEMA_LOCATION_URL_OMSO = "http://inspire.ec.europa.eu/schemas/omso/3.0/SpecialisedObservations.xsd"; + // String SCHEMA_LOCATION_URL_OMSO = + // "http://inspire.ec.europa.eu/schemas/omso/3.0/SpecialisedObservations.xsd"; // Fixed schema String SCHEMA_LOCATION_URL_OMSO = "https://52north.org/schema/inspire/omso/3.0.1/SpecialisedObservations.xsd"; diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/MultiPointObservation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/MultiPointObservation.java index 6b0d440a9..8f687de48 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/MultiPointObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/MultiPointObservation.java @@ -42,8 +42,7 @@ * @since * */ -public class MultiPointObservation - extends AbstractInspireObservation { +public class MultiPointObservation extends AbstractInspireObservation { /** * consturctor @@ -57,7 +56,8 @@ public MultiPointObservation() { * * @param observation * {@link OmObservation} to convert - * @throws CodedException If an error occurs + * @throws CodedException + * If an error occurs */ public MultiPointObservation(OmObservation observation) throws CodedException { super(observation); diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/PointObservation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/PointObservation.java index 0531c1aae..84025ce35 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/PointObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/PointObservation.java @@ -29,8 +29,7 @@ import org.n52.shetland.ogc.om.values.CvDiscretePointCoverage; import org.n52.shetland.ogc.om.values.GeometryValue; -public class PointObservation - extends AbstractInspireObservation { +public class PointObservation extends AbstractInspireObservation { /** * constructor diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/PointTimeSeriesObservation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/PointTimeSeriesObservation.java index 20ba0be18..9dadf896a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/PointTimeSeriesObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/PointTimeSeriesObservation.java @@ -22,8 +22,7 @@ import com.google.common.collect.Sets; -public class PointTimeSeriesObservation - extends AbstractInspireObservation { +public class PointTimeSeriesObservation extends AbstractInspireObservation { /** * constructor @@ -48,7 +47,8 @@ public PointTimeSeriesObservation(OmObservation observation) { // TODO } } - observation.setParameter(Sets.<NamedValue<?>> newHashSet()); + observation.setParameter(Sets.< + NamedValue<?>> newHashSet()); getObservationConstellation().setObservationType(InspireOMSOConstants.OBS_TYPE_POINT_TIME_SERIES_OBSERVATION); } diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/ProfileObservation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/ProfileObservation.java index 93d14351e..5ccecb898 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/ProfileObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/ProfileObservation.java @@ -38,8 +38,7 @@ import com.google.common.collect.Lists; -public class ProfileObservation - extends AbstractInspireObservation { +public class ProfileObservation extends AbstractInspireObservation { /** * constructor diff --git a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/TrajectoryObservation.java b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/TrajectoryObservation.java index 705f014e1..36dcbed1f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/inspire/omso/TrajectoryObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/inspire/omso/TrajectoryObservation.java @@ -42,8 +42,7 @@ import com.google.common.collect.Lists; -public class TrajectoryObservation - extends AbstractInspireObservation { +public class TrajectoryObservation extends AbstractInspireObservation { /** * constructor @@ -147,12 +146,10 @@ protected boolean mergeValues(ObservationValue<?> observationValue) { } /** - * Create geometry for featureOfInterest from - * {@link TimeLocationValueTriple}s + * Create geometry for featureOfInterest from {@link TimeLocationValueTriple}s * * @param values - * The {@link TimeLocationValueTriple}s to check for - * featureOfInterest + * The {@link TimeLocationValueTriple}s to check for featureOfInterest */ private void checkForFeature(List<TimeLocationValueTriple> values) { AbstractFeature featureOfInterest = getObservationConstellation().getFeatureOfInterest(); @@ -189,8 +186,7 @@ private void checkForFeature(List<TimeLocationValueTriple> values) { * Get {@link Coordinate}s from the {@link TimeLocationValueTriple}s * * @param values - * The {@link TimeLocationValueTriple}s to get {@link Coordinate} - * s from + * The {@link TimeLocationValueTriple}s to get {@link Coordinate} s from * @return The coordinates */ private Coordinate[] getCoordinates(List<TimeLocationValueTriple> values) { diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/CodeList.java b/shetland/core/src/main/java/org/n52/shetland/iso/CodeList.java index 058a7df47..c7b114fab 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/CodeList.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/CodeList.java @@ -45,5 +45,4 @@ public String getIdentifier() { } } - } diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/GcoConstants.java b/shetland/core/src/main/java/org/n52/shetland/iso/GcoConstants.java index 9f91b5638..2d70a7c4e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/GcoConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/GcoConstants.java @@ -38,6 +38,4 @@ public interface GcoConstants { QName QN_GCO_NIL_REASON = new QName(NS_GCO, AN_NIL_REASON, NS_GCO_PREFIX); - - } diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbstractMDIdentification.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbstractMDIdentification.java index 7b45cdde3..ad04079b5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbstractMDIdentification.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbstractMDIdentification.java @@ -17,8 +17,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -public abstract class AbstractMDIdentification - extends AbstractObject { +public abstract class AbstractMDIdentification extends AbstractObject { /** * 1..1 diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbstractObject.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbstractObject.java index 9533482a7..7cb9280c3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbstractObject.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbstractObject.java @@ -38,14 +38,16 @@ public String getId() { } /** - * @param id the id to set + * @param id + * the id to set */ public void setId(String id) { this.id = id; } /** - * @param id the id to set + * @param id + * the id to set */ public void setId(Long id) { this.id = id.toString(); @@ -63,7 +65,8 @@ public String getUuid() { } /** - * @param uuid the uuid to set + * @param uuid + * the uuid to set */ public void setUuid(String uuid) { this.uuid = uuid; diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbtractGmd.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbtractGmd.java index ac7b4ec12..616d6d8f3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbtractGmd.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/AbtractGmd.java @@ -15,12 +15,10 @@ */ package org.n52.shetland.iso.gmd; - +import org.n52.shetland.ogc.HasDefaultEncoding; import com.google.common.base.Strings; -import org.n52.shetland.ogc.HasDefaultEncoding; - public abstract class AbtractGmd implements HasDefaultEncoding<AbtractGmd> { private String defaultEncoding = GmdConstants.NS_GMD; diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiContact.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiContact.java index 46f51f212..47a3fe2be 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiContact.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiContact.java @@ -48,7 +48,8 @@ public Referenceable<CiTelephone> getPhone() { } /** - * @param phone the phone to set + * @param phone + * the phone to set */ public void setPhone(Referenceable<CiTelephone> phone) { this.phone = phone; @@ -59,9 +60,7 @@ public boolean isSetPhone() { } private boolean isSetPhoneInstance() { - return getPhone() != null - && getPhone().isInstance() - && getPhone().getInstance().isPresent(); + return getPhone() != null && getPhone().isInstance() && getPhone().getInstance().isPresent(); } private CiTelephone getPhoneInstance() { @@ -69,8 +68,7 @@ private CiTelephone getPhoneInstance() { } public boolean isSetPhoneVoice() { - return isSetPhoneInstance() - && getPhoneInstance().isSetVoice(); + return isSetPhoneInstance() && getPhoneInstance().isSetVoice(); } public List<String> getPhoneVoice() { @@ -99,8 +97,7 @@ public CiContact addPhoneVoice(final String phoneVoice) { } public boolean isSetPhoneFax() { - return isSetPhoneInstance() - && getPhoneInstance().isSetFacsimile(); + return isSetPhoneInstance() && getPhoneInstance().isSetFacsimile(); } public List<String> getPhoneFax() { @@ -136,7 +133,8 @@ public Referenceable<CiAddress> getAddress() { } /** - * @param address the address to set + * @param address + * the address to set */ public void setAddress(Referenceable<CiAddress> address) { this.address = address; @@ -147,9 +145,7 @@ public boolean isSetAddress() { } private boolean isSetAddressInstance() { - return getAddress() != null - && getAddress().isInstance() - && getAddress().getInstance().isPresent(); + return getAddress() != null && getAddress().isInstance() && getAddress().getInstance().isPresent(); } private CiAddress getAddressInstance() { @@ -157,8 +153,7 @@ private CiAddress getAddressInstance() { } public boolean isSetDeliveryPoint() { - return isSetAddressInstance() - && getAddressInstance().hasDeliveryPoints(); + return isSetAddressInstance() && getAddressInstance().hasDeliveryPoints(); } public List<String> getDeliveryPoint() { @@ -288,20 +283,22 @@ public CiContact setEmail(final String email) { public boolean isSetOnlineResource() { return onlineResource != null - && ((onlineResource.isReference() && onlineResource.getReference().getHref().isPresent()) + && (onlineResource.isReference() && onlineResource.getReference().getHref().isPresent() || onlineResource.isInstance()); } - public Referenceable<CiOnlineResource> getOnlineResourceReferenceable() { + public Referenceable<CiOnlineResource> getOnlineResourceReferenceable() { return onlineResource; } public String getOnlineResource() { - if (onlineResource.isReference() && onlineResource.getReference().getHref().isPresent()) { - return onlineResource.getReference().getHref().get().toString(); - } else if (onlineResource.isInstance() && onlineResource.getInstance().isPresent() - && onlineResource.getInstance().get().getLinkage().isPresent()) { - return onlineResource.getInstance().get().getLinkage().get().toString(); + if (onlineResource != null) { + if (onlineResource.isReference() && onlineResource.getReference().getHref().isPresent()) { + return onlineResource.getReference().getHref().get().toString(); + } else if (onlineResource.isInstance() && onlineResource.getInstance().isPresent() + && onlineResource.getInstance().get().getLinkage().isPresent()) { + return onlineResource.getInstance().get().getLinkage().get().toString(); + } } return null; } diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiOnlineResource.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiOnlineResource.java index e9a2a916e..393d0fd92 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiOnlineResource.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiOnlineResource.java @@ -28,8 +28,7 @@ * @since 1.0.0 * */ -public class CiOnlineResource - extends AbstractObject { +public class CiOnlineResource extends AbstractObject { /* 1..1 */ private Nillable<URI> linkage; diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiResponsibleParty.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiResponsibleParty.java index 02e89bb94..50d12539d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiResponsibleParty.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/CiResponsibleParty.java @@ -39,11 +39,13 @@ public class CiResponsibleParty extends AbstractObject { private Nillable<Role> role; public CiResponsibleParty() { - this.role = Nillable.<Role>missing(); + this.role = Nillable.< + Role> missing(); } public CiResponsibleParty(Role role) { - this.role = Nillable.<Role>of(role); + this.role = Nillable.< + Role> of(role); } public CiResponsibleParty(Nillable<Role> role) { @@ -97,7 +99,8 @@ public Referenceable<CiContact> getContactInfo() { } /** - * @param contactInfo the contactInfo to set + * @param contactInfo + * the contactInfo to set * * @return {@code this} */ @@ -109,7 +112,8 @@ public CiResponsibleParty setContactInfo(CiContact contactInfo) { } /** - * @param contactInfo the contactInfo to set + * @param contactInfo + * the contactInfo to set * * @return {@code this} */ diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/EXExtent.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/EXExtent.java index 143e2e863..4d4e4aea5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/EXExtent.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/EXExtent.java @@ -31,8 +31,7 @@ * @since 1.0.0 * */ -public class EXExtent - extends AbstractObject { +public class EXExtent extends AbstractObject { private String description; // private List<Object> exGeographicalExtent = new ArrayList<>(); diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/EXVerticalExtent.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/EXVerticalExtent.java index de5f66252..5f5276a42 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/EXVerticalExtent.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/EXVerticalExtent.java @@ -25,8 +25,7 @@ * @since 1.0.0 * */ -public class EXVerticalExtent - extends AbstractObject { +public class EXVerticalExtent extends AbstractObject { /* 1..1 */ private Nillable<Double> minimumValue; diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdCitation.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdCitation.java index ba8e89574..ef0b97385 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdCitation.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdCitation.java @@ -22,8 +22,7 @@ * * @author Christian Autermann */ -public class GmdCitation - extends AbtractGmd { +public class GmdCitation extends AbtractGmd { private static final GmdCitation EC_50_2008 = new GmdCitation("EC/50/2008", new GmdCitationDate(GmdDateType.publication(), "2008")); diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdConstants.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdConstants.java index 5d684afaa..7ffc1bd1a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdConstants.java @@ -30,11 +30,11 @@ public interface GmdConstants { SchemaLocation GMD_SCHEMA_LOCATION = new SchemaLocation(NS_GMD, SCHEMA_LOCATION_URL_GMD); - QName QN_GMD_CONFORMANCE_RESULT = new QName(GmdConstants.NS_GMD, "DQ_ConformanceResult", - GmdConstants.NS_GMD_PREFIX); + QName QN_GMD_CONFORMANCE_RESULT = + new QName(GmdConstants.NS_GMD, "DQ_ConformanceResult", GmdConstants.NS_GMD_PREFIX); - QName QN_GMD_QUANTITATIVE_RESULT = new QName(GmdConstants.NS_GMD, "DQ_QuantitativeResult", - GmdConstants.NS_GMD_PREFIX); + QName QN_GMD_QUANTITATIVE_RESULT = + new QName(GmdConstants.NS_GMD, "DQ_QuantitativeResult", GmdConstants.NS_GMD_PREFIX); QName QN_GML_BASE_UNIT = new QName(GmlConstants.NS_GML_32, "BaseUnit", GmlConstants.NS_GML_PREFIX); } diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdDateType.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdDateType.java index 094a8f075..b912ad6bb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdDateType.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdDateType.java @@ -23,15 +23,13 @@ public class GmdDateType { private static final String EN_PUBLICATION = "publication"; - private static final GmdDateType PUBLICATION - = new GmdDateType("eng", EN_PUBLICATION, EN_PUBLICATION); + private static final GmdDateType PUBLICATION = new GmdDateType("eng", EN_PUBLICATION, EN_PUBLICATION); private final String codeList; private final String codeListValue; private final String codeSpace; private final String value; - public GmdDateType(String codeList, String codeListValue, String codeSpace, - String value) { + public GmdDateType(String codeList, String codeListValue, String codeSpace, String value) { this.codeList = codeList; this.codeListValue = codeListValue; this.codeSpace = codeSpace; diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdDomainConsistency.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdDomainConsistency.java index d8fd307dd..139b4654d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdDomainConsistency.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdDomainConsistency.java @@ -18,9 +18,7 @@ import org.n52.shetland.ogc.gml.GmlConstants; import org.n52.shetland.ogc.om.quality.OmResultQuality; -public abstract class GmdDomainConsistency - extends AbtractGmd - implements OmResultQuality { +public abstract class GmdDomainConsistency extends AbtractGmd implements OmResultQuality { public static GmdConformanceResult dataCapture(boolean pass) { return new GmdConformanceResult(pass, GmdSpecification.dataCapture()); diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdSpecification.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdSpecification.java index 6e9d43da0..5822d9fe5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdSpecification.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/GmdSpecification.java @@ -24,12 +24,10 @@ */ public class GmdSpecification extends AbtractGmd { - private static final GmdSpecification DATA_CAPTURE_SPECIFICATION - = new GmdSpecification("Data Capture", GmdCitation - .airQualityDirectiveEC502008()); - private static final GmdSpecification TIME_COVERAGE_SPECIFICATION - = new GmdSpecification("Time Coverage", GmdCitation - .airQualityDirectiveEC502008()); + private static final GmdSpecification DATA_CAPTURE_SPECIFICATION = + new GmdSpecification("Data Capture", GmdCitation.airQualityDirectiveEC502008()); + private static final GmdSpecification TIME_COVERAGE_SPECIFICATION = + new GmdSpecification("Time Coverage", GmdCitation.airQualityDirectiveEC502008()); private final String explanation; private final GmdCitation citation; diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/LocalisedCharacterString.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/LocalisedCharacterString.java index 28a988caa..3c32c6e4d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/LocalisedCharacterString.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/LocalisedCharacterString.java @@ -37,7 +37,8 @@ public String getValue() { } /** - * @param value the value to set + * @param value + * the value to set */ public LocalisedCharacterString setValue(String value) { this.value = value; @@ -52,7 +53,8 @@ public String getLocale() { } /** - * @param locale the locale to set + * @param locale + * the locale to set */ public LocalisedCharacterString setLocale(String locale) { this.locale = locale; @@ -72,16 +74,14 @@ public int hashCode() { public boolean equals(Object obj) { if (obj instanceof LocalisedCharacterString) { LocalisedCharacterString that = (LocalisedCharacterString) obj; - return Objects.equal(getValue(), that.getValue()) - && Objects.equal(getLocale(), that.getLocale()); + return Objects.equal(getValue(), that.getValue()) && Objects.equal(getLocale(), that.getLocale()); } return false; } @Override public String toString() { - return MoreObjects.toStringHelper(this).add("Value", getValue()) - .add("Locale", getLocale()).toString(); + return MoreObjects.toStringHelper(this).add("Value", getValue()).add("Locale", getLocale()).toString(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/ScCRS.java b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/ScCRS.java index 3a2e9c7a6..87068ffdb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/iso/gmd/ScCRS.java +++ b/shetland/core/src/main/java/org/n52/shetland/iso/gmd/ScCRS.java @@ -32,7 +32,8 @@ public AbstractCRS getAbstractCrs() { } /** - * @param abstractCrs the abstractCrs to set + * @param abstractCrs + * the abstractCrs to set * @return this {@link ScCRS} */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) diff --git a/shetland/core/src/main/java/org/n52/shetland/oasis/odata/ODataExpr.java b/shetland/core/src/main/java/org/n52/shetland/oasis/odata/ODataExpr.java index be69db121..933326013 100644 --- a/shetland/core/src/main/java/org/n52/shetland/oasis/odata/ODataExpr.java +++ b/shetland/core/src/main/java/org/n52/shetland/oasis/odata/ODataExpr.java @@ -21,8 +21,8 @@ public interface ODataExpr { /** - * Returns a String representation of the Expr that can be used directly in an OData Query String. - * This might differ from the default toString() Method + * Returns a String representation of the Expr that can be used directly in an OData Query String. This + * might differ from the default toString() Method * * @return String representation of this Expr */ diff --git a/shetland/core/src/main/java/org/n52/shetland/oasis/odata/query/option/QueryOptions.java b/shetland/core/src/main/java/org/n52/shetland/oasis/odata/query/option/QueryOptions.java index 1f6b3e439..9b874b3cc 100644 --- a/shetland/core/src/main/java/org/n52/shetland/oasis/odata/query/option/QueryOptions.java +++ b/shetland/core/src/main/java/org/n52/shetland/oasis/odata/query/option/QueryOptions.java @@ -15,6 +15,11 @@ */ package org.n52.shetland.oasis.odata.query.option; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + import org.n52.shetland.filter.CountFilter; import org.n52.shetland.filter.ExpandFilter; import org.n52.shetland.filter.FilterFilter; @@ -25,11 +30,6 @@ import org.n52.shetland.ogc.filter.FilterConstants; import org.n52.shetland.ogc.filter.FilterConstants.SkipTopOperator; -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; - /** * Class to hold Query Parameters * @@ -62,11 +62,11 @@ public QueryOptions(String baseURL, Set<FilterClause> queryFilters) { selectFilter = (SelectFilter) input; } else if (input instanceof ExpandFilter) { expandFilter = (ExpandFilter) input; - } else if (input instanceof SkipTopFilter && - ((SkipTopFilter) input).getOperator().equals(FilterConstants.SkipTopOperator.Skip)) { + } else if (input instanceof SkipTopFilter + && ((SkipTopFilter) input).getOperator().equals(FilterConstants.SkipTopOperator.Skip)) { skipFilter = (SkipTopFilter) input; - } else if (input instanceof SkipTopFilter && - ((SkipTopFilter) input).getOperator().equals(FilterConstants.SkipTopOperator.Top)) { + } else if (input instanceof SkipTopFilter + && ((SkipTopFilter) input).getOperator().equals(FilterConstants.SkipTopOperator.Top)) { topFilter = (SkipTopFilter) input; } else if (input instanceof FilterFilter) { filterFilter = (FilterFilter) input; @@ -164,15 +164,10 @@ public Set<FilterClause> getAllFilters() { return result; } - @Override public int hashCode() { - return Objects.hash(baseURL, - countFilter, - topFilter, - skipFilter, - orderByFilter, - selectFilter, - expandFilter, - filterFilter); + @Override + public int hashCode() { + return Objects.hash(baseURL, countFilter, topFilter, skipFilter, orderByFilter, selectFilter, expandFilter, + filterFilter); } // BaseURI is not always set -> we need to compare each Filter individually @@ -182,12 +177,9 @@ public boolean equals(Object o) { return false; } QueryOptions obj = (QueryOptions) o; - return obj.hasCountFilter() == this.hasCountFilter() - && obj.hasOrderByFilter() == this.hasOrderByFilter() - && obj.hasSelectFilter() == this.hasSelectFilter() - && obj.hasExpandFilter() == this.hasExpandFilter() - && obj.hasSkipFilter() == this.hasSkipFilter() - && obj.hasTopFilter() == this.hasTopFilter() + return obj.hasCountFilter() == this.hasCountFilter() && obj.hasOrderByFilter() == this.hasOrderByFilter() + && obj.hasSelectFilter() == this.hasSelectFilter() && obj.hasExpandFilter() == this.hasExpandFilter() + && obj.hasSkipFilter() == this.hasSkipFilter() && obj.hasTopFilter() == this.hasTopFilter() && obj.hasFilterFilter() == this.hasFilterFilter() && Objects.equals(obj.getCountFilter(), this.getCountFilter()) && Objects.equals(obj.getOrderByFilter(), this.getOrderByFilter()) @@ -200,8 +192,6 @@ public boolean equals(Object o) { @Override public String toString() { - return getAllFilters().stream() - .map(FilterClause::toString) - .collect(Collectors.joining("&")); + return getAllFilters().stream().map(FilterClause::toString).collect(Collectors.joining("&")); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/AbstractCodeType.java b/shetland/core/src/main/java/org/n52/shetland/ogc/AbstractCodeType.java index 11d52159c..2de3b569b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/AbstractCodeType.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/AbstractCodeType.java @@ -105,8 +105,7 @@ public boolean isSetCodeSpace() { public boolean equals(Object obj) { if (obj instanceof AbstractCodeType) { AbstractCodeType that = (AbstractCodeType) obj; - return Objects.equal(getClass(), that.getClass()) - && Objects.equal(getValue(), that.getValue()) + return Objects.equal(getClass(), that.getClass()) && Objects.equal(getValue(), that.getValue()) && Objects.equal(getCodeSpace(), that.getCodeSpace()); } return false; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/AbstractMeasureType.java b/shetland/core/src/main/java/org/n52/shetland/ogc/AbstractMeasureType.java index 1eb3cde75..5044c3ecb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/AbstractMeasureType.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/AbstractMeasureType.java @@ -36,7 +36,7 @@ public abstract class AbstractMeasureType { * constructor * * @param value - * Measured value + * Measured value */ public AbstractMeasureType(Double value) { this(value, null); @@ -46,9 +46,9 @@ public AbstractMeasureType(Double value) { * constructor * * @param value - * Measured value + * Measured value * @param unit - * Unit of measure + * Unit of measure */ public AbstractMeasureType(Double value, String unit) { this.value = value; @@ -57,7 +57,7 @@ public AbstractMeasureType(Double value, String unit) { /** * @param value - * Measured value to set + * Measured value to set */ public void setValue(Double value) { this.value = value; @@ -74,7 +74,7 @@ public Double getValue() { * Set unit of measure * * @param unit - * Unit of measure to set + * Unit of measure to set */ public void setUnit(String unit) { this.unit = unit; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/HasDefaultEncoding.java b/shetland/core/src/main/java/org/n52/shetland/ogc/HasDefaultEncoding.java index 38e95c11f..5a14b3428 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/HasDefaultEncoding.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/HasDefaultEncoding.java @@ -17,7 +17,8 @@ import com.google.common.base.Strings; -public interface HasDefaultEncoding<T extends HasDefaultEncoding<T>> { +public interface HasDefaultEncoding< + T extends HasDefaultEncoding<T>> { T setDefaultElementEncoding(String defaultEncoding); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/UoM.java b/shetland/core/src/main/java/org/n52/shetland/ogc/UoM.java index 708826ead..80f90c295 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/UoM.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/UoM.java @@ -37,7 +37,8 @@ public String getUom() { } /** - * @param uom the uom to set + * @param uom + * the uom to set * * @return {@code this} */ @@ -54,7 +55,8 @@ public String getName() { } /** - * @param name the name to set + * @param name + * the name to set * * @return {@code this} */ @@ -75,7 +77,8 @@ public String getLink() { } /** - * @param link the link to set + * @param link + * the link to set * * @return {@code this} */ @@ -89,7 +92,7 @@ public boolean isSetLink() { } public boolean isEmpty() { - return getUom() == null || (getUom() != null && getUom().isEmpty()); + return getUom() == null || getUom() != null && getUom().isEmpty(); } @Override diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/AbstractAdHocQueryExpression.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/AbstractAdHocQueryExpression.java index e214f3302..ba4bd1906 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/AbstractAdHocQueryExpression.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/AbstractAdHocQueryExpression.java @@ -51,7 +51,8 @@ public Set<AbstractProjectionClause> getProjectionClauses() { } /** - * @param projectionClause the projectionClause to add + * @param projectionClause + * the projectionClause to add * * @return this */ @@ -61,7 +62,8 @@ public AbstractAdHocQueryExpression addProjectionClause(AbstractProjectionClause } /** - * @param projectionClauses the projectionClauses to add + * @param projectionClauses + * the projectionClauses to add * * @return this */ @@ -71,7 +73,8 @@ public AbstractAdHocQueryExpression addProjectionClauses(Set<AbstractProjectionC } /** - * @param projectionClauses the projectionClauses to set + * @param projectionClauses + * the projectionClauses to set * * @return this */ @@ -92,7 +95,8 @@ public AbstractSelectionClause getSelectionClause() { } /** - * @param selectionClause the selectionClause to set + * @param selectionClause + * the selectionClause to set * * @return this */ @@ -113,7 +117,8 @@ public AbstractSortingClause getSortingClause() { } /** - * @param sortingClause the sortingClause to set + * @param sortingClause + * the sortingClause to set * * @return this */ @@ -134,7 +139,8 @@ public Set<QName> getTypeNames() { } /** - * @param typeNames the typeNames to set + * @param typeNames + * the typeNames to set */ private void setTypeNames(Collection<QName> typeNames) { this.typeNames = Optional.ofNullable(typeNames).map(HashSet::new).orElseGet(HashSet::new); @@ -148,7 +154,8 @@ public Set<String> getAliases() { } /** - * @param aliases the aliases to set + * @param aliases + * the aliases to set * * @return this */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/AbstractQueryExpression.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/AbstractQueryExpression.java index ce4d634e4..8b34f3903 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/AbstractQueryExpression.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/AbstractQueryExpression.java @@ -35,7 +35,8 @@ public String getHandle() { } /** - * @param handle the handle to set + * @param handle + * the handle to set */ public AbstractQueryExpression setHandle(String handle) { this.handle = handle; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/ComparisonFilter.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/ComparisonFilter.java index 4ffd380c5..b0f4fcffe 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/ComparisonFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/ComparisonFilter.java @@ -15,9 +15,9 @@ */ package org.n52.shetland.ogc.filter; +import org.n52.shetland.ogc.filter.FilterConstants.ComparisonOperator; import org.n52.shetland.ogc.ows.exception.NoApplicableCodeException; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; -import org.n52.shetland.ogc.filter.FilterConstants.ComparisonOperator; /** * OGC Filter class for comparison filter @@ -71,11 +71,11 @@ public ComparisonFilter() { * constructor * * @param operator - * Filter operator + * Filter operator * @param valueReference - * valueReference + * valueReference * @param value - * value + * value */ public ComparisonFilter(ComparisonOperator operator, String valueReference, String value) { super(valueReference); @@ -87,17 +87,16 @@ public ComparisonFilter(ComparisonOperator operator, String valueReference, Stri * constructor for {@link ComparisonOperator#PropertyIsBetween} filter * * @param operator - * Filter operator + * Filter operator * @param valueReference - * valueReference + * valueReference * @param value - * value + * value * @param valueUpper - * upper value + * upper value * * @throws OwsExceptionReport - * If operator is not - * {@link ComparisonOperator#PropertyIsBetween} + * If operator is not {@link ComparisonOperator#PropertyIsBetween} */ public ComparisonFilter(ComparisonOperator operator, String valueReference, String value, String valueUpper) throws OwsExceptionReport { @@ -108,8 +107,8 @@ public ComparisonFilter(ComparisonOperator operator, String valueReference, Stri this.valueUpper = valueUpper; } else { throw new NoApplicableCodeException() - .withMessage("Use other constructor for ComparisonFilter! This constructor can only " + - "be used for operator 'PropertyIsBetween'"); + .withMessage("Use other constructor for ComparisonFilter! This constructor can only " + + "be used for operator 'PropertyIsBetween'"); } } @@ -117,21 +116,21 @@ public ComparisonFilter(ComparisonOperator operator, String valueReference, Stri * constructor for {@link ComparisonOperator#PropertyIsLike} filter * * @param operator - * Filter operator + * Filter operator * @param valueReference - * valueReference + * valueReference * @param value - * value + * value * @param valueUpper - * upper value for between filter + * upper value for between filter * @param escapeString - * Escape characters + * Escape characters * * @throws OwsExceptionReport - * If operator is not {@link ComparisonOperator#PropertyIsLike} + * If operator is not {@link ComparisonOperator#PropertyIsLike} */ public ComparisonFilter(ComparisonOperator operator, String valueReference, String value, String valueUpper, - String escapeString) throws OwsExceptionReport { + String escapeString) throws OwsExceptionReport { super(valueReference); if (operator == ComparisonOperator.PropertyIsLike) { this.operator = operator; @@ -139,9 +138,8 @@ public ComparisonFilter(ComparisonOperator operator, String valueReference, Stri this.valueUpper = valueUpper; this.escapeString = escapeString; } else { - throw new NoApplicableCodeException() - .withMessage("Use other constructor for ComparisonFilter! " + - "This constructor can only be used for operator 'PropertyIsLike'"); + throw new NoApplicableCodeException().withMessage("Use other constructor for ComparisonFilter! " + + "This constructor can only be used for operator 'PropertyIsLike'"); } } @@ -178,7 +176,7 @@ public String getValueUpper() { * Set filter value * * @param value - * filter value + * filter value */ public void setValue(String value) { this.value = value; @@ -188,7 +186,7 @@ public void setValue(String value) { * Set upper filter value * * @param valueUpper - * upper filter value + * upper filter value */ public void setValueUpper(String valueUpper) { this.valueUpper = valueUpper; @@ -207,7 +205,7 @@ public String getEscapeString() { * Set escape characters * * @param escapeString - * escape characters + * escape characters */ public void setEscapeString(String escapeString) { this.escapeString = escapeString; @@ -226,7 +224,7 @@ public String getWildCard() { * Set wild card character * * @param wildCard - * wild card character + * wild card character */ public void setWildCard(String wildCard) { this.wildCard = wildCard; @@ -245,7 +243,7 @@ public String getSingleChar() { * Set single char character * * @param singleChar - * single char character + * single char character */ public void setSingleChar(String singleChar) { this.singleChar = singleChar; @@ -304,7 +302,8 @@ public boolean isMatchCase() { } /** - * @param matchCase the matchCase to set + * @param matchCase + * the matchCase to set */ public void setMatchCase(boolean matchCase) { this.matchCase = matchCase; @@ -340,8 +339,8 @@ public ComparisonFilter copy() { public String toString() { String result = "ComparisonFilter: "; if (isSetValueUpper()) { - return result + getValueReference() + " " + getValue() + " " + getOperator().name() + " " + - getValueUpper(); + return result + getValueReference() + " " + getValue() + " " + getOperator().name() + " " + + getValueUpper(); } else { return result + getValueReference() + " " + getOperator().name() + " " + getValue(); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/Filter.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/Filter.java index 4375c501a..a58db1c9a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/Filter.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/Filter.java @@ -27,8 +27,8 @@ * @param <T> * operator type, e.g. {@link TimeOperator},{@link SpatialOperator} */ -public abstract class Filter<T> - implements AbstractSelectionClause { +public abstract class Filter< + T> implements AbstractSelectionClause { /** * Value reference. diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/FilterCapabilities.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/FilterCapabilities.java index cd19a43db..06ec8ac5e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/FilterCapabilities.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/FilterCapabilities.java @@ -60,7 +60,7 @@ public SortedSet<QName> getSpatialOperands() { * Set spatial operands * * @param spatialOperands - * spatial operands + * spatial operands */ public void setSpatialOperands(Collection<QName> spatialOperands) { this.spatialOperands.clear(); @@ -80,7 +80,7 @@ public SortedMap<SpatialOperator, SortedSet<QName>> getSpatialOperators() { * Set spatial operators * * @param spatialOperators - * spatial operators + * spatial operators */ public void setSpatialOperators(Map<SpatialOperator, ? extends Collection<QName>> spatialOperators) { setOperators(this.spatialOperators, spatialOperators); @@ -99,7 +99,7 @@ public SortedSet<QName> getTemporalOperands() { * Set temporal operands * * @param temporalOperands - * temporal operands + * temporal operands */ public void setTemporalOperands(Collection<QName> temporalOperands) { this.temporalOperands.clear(); @@ -119,14 +119,15 @@ public SortedMap<TimeOperator, SortedSet<QName>> getTemporalOperators() { * Set temporal operators * * @param temporalOperators - * temporal operators + * temporal operators */ public void setTemporalOperators(Map<TimeOperator, ? extends Collection<QName>> temporalOperators) { setOperators(this.temporalOperators, temporalOperators); } - private <T> void setOperators(SortedMap<T, SortedSet<QName>> operators, - Map<T, ? extends Collection<QName>> newOperators) { + private < + T> void setOperators(SortedMap<T, SortedSet<QName>> operators, + Map<T, ? extends Collection<QName>> newOperators) { operators.clear(); Optional.ofNullable(newOperators).ifPresent(so -> { so.forEach((operator, qnames) -> { @@ -151,7 +152,7 @@ public SortedSet<ComparisonOperator> getComparisonOperators() { * Set comparison operators * * @param comparisonOperators - * comparison operators + * comparison operators */ public void setComparisonOperators(Collection<ComparisonOperator> comparisonOperators) { this.comparisonOperators.clear(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/FilterConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/FilterConstants.java index c867d3ed9..49bd954cb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/FilterConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/FilterConstants.java @@ -27,8 +27,7 @@ import com.google.common.collect.Sets; /** - * Constants interface for <a - * href="http://www.opengeospatial.org/standards/filter">OGC Filter Encoding</a> + * Constants interface for <a href="http://www.opengeospatial.org/standards/filter">OGC Filter Encoding</a> * * @since 1.0.0 */ @@ -100,8 +99,8 @@ enum ConformanceClassConstraintNames { class TimeOperatorMapping { - private static final BiMap<TimeOperator, TimeOperator2> BIMAP - = EnumBiMap.create(TimeOperator.class, TimeOperator2.class); + private static final BiMap<TimeOperator, TimeOperator2> BIMAP = + EnumBiMap.create(TimeOperator.class, TimeOperator2.class); static { BIMAP.put(TimeOperator.TM_Before, TimeOperator2.Before); @@ -338,11 +337,10 @@ enum AdHocQueryParams { BBox, SortBy /* - * TypeNames is mandatory but "Standards that reference this - * International Standard may change the requirement for the TYPENAME - * parameter. In such cases, the referencing standard shall document - * whether the TYPENAME parameter is mandatory, optional or mandatory in - * some cases and optional in others." + * TypeNames is mandatory but "Standards that reference this International Standard may change the + * requirement for the TYPENAME parameter. In such cases, the referencing standard shall document + * whether the TYPENAME parameter is mandatory, optional or mandatory in some cases and optional in + * others." */ } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/Filters.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/Filters.java index 52a269ad7..40cda83da 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/Filters.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/Filters.java @@ -35,8 +35,10 @@ private Filters() { /** * Creates a new {@code PropertyIsGreaterThanOrEqualTo} filter. * - * @param property the property - * @param value the value + * @param property + * the property + * @param value + * the value * * @return the filter */ @@ -47,8 +49,10 @@ public static ComparisonFilter ge(String property, String value) { /** * Creates a new {@code PropertyIsLessThanOrEqualTo} filter. * - * @param property the property - * @param value the value + * @param property + * the property + * @param value + * the value * * @return the filter */ @@ -59,8 +63,10 @@ public static ComparisonFilter le(String property, String value) { /** * Creates a new {@code PropertyIsEqualTo} filter. * - * @param property the property - * @param value the value + * @param property + * the property + * @param value + * the value * * @return the filter */ @@ -71,8 +77,10 @@ public static ComparisonFilter eq(String property, String value) { /** * Creates a new {@code PropertyIsGreaterThan} filter. * - * @param property the property - * @param value the value + * @param property + * the property + * @param value + * the value * * @return the filter */ @@ -83,8 +91,10 @@ public static ComparisonFilter gt(String property, String value) { /** * Creates a new {@code PropertyIsLessThan} filter. * - * @param property the property - * @param value the value + * @param property + * the property + * @param value + * the value * * @return the filter */ @@ -95,8 +105,10 @@ public static ComparisonFilter lt(String property, String value) { /** * Creates a new {@code PropertyIsLike} filter. * - * @param property the property - * @param value the value + * @param property + * the property + * @param value + * the value * * @return the filter */ @@ -107,7 +119,8 @@ public static ComparisonFilter like(String property, String value) { /** * Creates a new {@code PropertyIsNil} filter. * - * @param property the property + * @param property + * the property * * @return the filter */ @@ -118,7 +131,8 @@ public static ComparisonFilter isNil(String property) { /** * Creates a new {@code PropertyIsNull} filter. * - * @param property the property + * @param property + * the property * * @return the filter */ @@ -129,8 +143,10 @@ public static ComparisonFilter isNull(String property) { /** * Creates a new {@code PropertyIsNotEqualTo} filter. * - * @param property the property - * @param value the value + * @param property + * the property + * @param value + * the value * * @return the filter */ @@ -141,9 +157,12 @@ public static ComparisonFilter ne(String property, String value) { /** * Creates a new {@code PropertyIsBetween} filter. * - * @param property the property - * @param lower the lower boundary - * @param upper the upper boundary + * @param property + * the property + * @param lower + * the lower boundary + * @param upper + * the upper boundary * * @return the filter */ @@ -159,8 +178,10 @@ public static ComparisonFilter between(String property, String lower, String upp /** * Creates a new {@code BinaryLogicFilter}. * - * @param left the left operand - * @param right the right operand + * @param left + * the left operand + * @param right + * the right operand * * @return the filter */ @@ -171,8 +192,10 @@ public static BinaryLogicFilter and(Filter<?> left, Filter<?> right) { /** * Creates a new {@code BinaryLogicFilter}. * - * @param left the left operand - * @param right the right operand + * @param left + * the left operand + * @param right + * the right operand * * @return the filter */ @@ -183,7 +206,8 @@ public static BinaryLogicFilter or(Filter<?> left, Filter<?> right) { /** * Creates a new {@code BinaryLogicFilter}. * - * @param filter the negated filter + * @param filter + * the negated filter * * @return the filter */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/IdFilter.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/IdFilter.java index 485452dab..644a77277 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/IdFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/IdFilter.java @@ -15,12 +15,6 @@ */ package org.n52.shetland.ogc.filter; -import com.google.common.base.MoreObjects; -import com.google.common.base.Strings; -import com.google.common.collect.Sets; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import java.util.Collection; import java.util.Collections; import java.util.LinkedHashSet; @@ -28,18 +22,22 @@ import java.util.Set; import org.n52.shetland.ogc.filter.FilterConstants.Id; -import org.n52.shetland.util.CollectionHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.MoreObjects; +import com.google.common.base.Strings; +import com.google.common.collect.Sets; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * ID filter class * * @since 1.0.0 * */ -public class IdFilter - extends Filter<Id> { +public class IdFilter extends Filter<Id> { private static final Logger log = LoggerFactory.getLogger(IdFilter.class); @@ -48,7 +46,8 @@ public class IdFilter private Set<String> ids = new LinkedHashSet<>(); public IdFilter() { - this(Sets.<String> newHashSet()); + this(Sets.< + String> newHashSet()); } public IdFilter(String id) { @@ -86,10 +85,8 @@ public Id getOperator() { @Override public Filter<Id> setOperator(Id operator) throws RuntimeException { if (Optional.ofNullable(this.operator).isPresent() && !this.operator.equals(operator)) { - log.warn( - "Combination of different ID filters not supported, " - + "ignoring new operator '{}' in favour of already set '{}'", - operator, this.operator); + log.warn("Combination of different ID filters not supported, " + + "ignoring new operator '{}' in favour of already set '{}'", operator, this.operator); } this.operator = operator; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/SpatialFilter.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/SpatialFilter.java index 54bb22018..80c627de6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/SpatialFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/SpatialFilter.java @@ -16,7 +16,6 @@ package org.n52.shetland.ogc.filter; import org.locationtech.jts.geom.Geometry; - import org.n52.shetland.ogc.filter.FilterConstants.SpatialOperator; import org.n52.shetland.util.EnvelopeOrGeometry; import org.n52.shetland.util.ReferencedEnvelope; @@ -44,9 +43,12 @@ public SpatialFilter() { /** * constructor * - * @param operator Spatial operator - * @param geometry Filter geometry - * @param valueReference Filter valueReference + * @param operator + * Spatial operator + * @param geometry + * Filter geometry + * @param valueReference + * Filter valueReference */ public SpatialFilter(SpatialOperator operator, Geometry geometry, String valueReference) { super(valueReference); @@ -57,9 +59,12 @@ public SpatialFilter(SpatialOperator operator, Geometry geometry, String valueRe /** * constructor * - * @param operator Spatial operator - * @param geometry Filter geometry - * @param valueReference Filter valueReference + * @param operator + * Spatial operator + * @param geometry + * Filter geometry + * @param valueReference + * Filter valueReference */ public SpatialFilter(SpatialOperator operator, ReferencedEnvelope geometry, String valueReference) { super(valueReference); @@ -134,7 +139,8 @@ public EnvelopeOrGeometry getGeometry() { /** * Set filter geometry * - * @param geometry filter geometry + * @param geometry + * filter geometry * * @return This filter */ @@ -146,7 +152,8 @@ public SpatialFilter setGeometry(Geometry geometry) { /** * Set filter geometry * - * @param geometry filter geometry + * @param geometry + * filter geometry * * @return This filter */ @@ -157,7 +164,8 @@ public SpatialFilter setGeometry(ReferencedEnvelope geometry) { /** * @return the distance - */ @SuppressFBWarnings({ "EI_EXPOSE_REP" }) + */ + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public FesMeasureType getDistance() { return distance; } @@ -169,7 +177,7 @@ public FesMeasureType getDistance() { * the distance to set * @return This filter */ - @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SpatialFilter setDistance(FesMeasureType distance) { this.distance = distance; return this; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/TemporalFilter.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/TemporalFilter.java index 2773b9e8f..7b7ef1cb3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/TemporalFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/TemporalFilter.java @@ -26,8 +26,7 @@ * @since 1.0.0 * */ -public class TemporalFilter - extends Filter<TimeOperator> { +public class TemporalFilter extends Filter<TimeOperator> { private TimeOperator operator; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/UnaryLogicFilter.java b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/UnaryLogicFilter.java index e82681870..5a9e5e03a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/filter/UnaryLogicFilter.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/filter/UnaryLogicFilter.java @@ -23,9 +23,7 @@ * @since 1.0.0 * */ -public class UnaryLogicFilter - extends Filter<UnaryLogicOperator> - implements LogicFilter { +public class UnaryLogicFilter extends Filter<UnaryLogicOperator> implements LogicFilter { private UnaryLogicOperator operator = UnaryLogicOperator.Not; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractDatum.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractDatum.java index 1ec1f4508..4006503be 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractDatum.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractDatum.java @@ -69,7 +69,8 @@ public AbstractDatum setDomainOfValidity(DomainOfValidity domainOfValidity) { if (domainOfValidity != null) { this.domainOfValidity = Referenceable.of(domainOfValidity); } else { - this.domainOfValidity = Referenceable.of(Nillable.<DomainOfValidity> missing()); + this.domainOfValidity = Referenceable.of(Nillable.< + DomainOfValidity> missing()); } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractFeature.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractFeature.java index d61d89600..119577f67 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractFeature.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractFeature.java @@ -15,18 +15,16 @@ */ package org.n52.shetland.ogc.gml; +import org.n52.shetland.ogc.HasDefaultEncoding; import org.n52.shetland.ogc.om.features.samplingFeatures.FeatureOfInterestVisitor; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; import com.google.common.base.Strings; -import org.n52.shetland.ogc.HasDefaultEncoding; - /** - * Abstract class for encoding the feature of interest. Necessary because - * different feature types should be supported. The database or another - * feature source (e.g. WFS) should provide information about the application - * schema. + * Abstract class for encoding the feature of interest. Necessary because different feature types should be + * supported. The database or another feature source (e.g. WFS) should provide information about the + * application schema. * * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 1.0.0 @@ -89,7 +87,8 @@ public String getXml() { } /** - * @param xml the xml to set + * @param xml + * the xml to set */ public AbstractFeature setXml(String xml) { this.xml = xml; @@ -105,10 +104,11 @@ public boolean isEncoded() { } public void wasEncoded() { - this.wasEncoded = true; + this.wasEncoded = true; } - public <X> X accept(FeatureOfInterestVisitor<X> visitor) throws OwsExceptionReport { + public < + X> X accept(FeatureOfInterestVisitor<X> visitor) throws OwsExceptionReport { return null; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGML.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGML.java index c88a0c639..e20a40099 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGML.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGML.java @@ -452,7 +452,7 @@ public List<AbstractMetaData> getMetaDataProperty() { /** * @param metaDataProperty * the metaDataProperty to set - * @return + * @return this */ public AbstractGML setMetaDataProperty(List<AbstractMetaData> metaDataProperty) { this.metaDataProperty.clear(); @@ -465,7 +465,7 @@ public AbstractGML setMetaDataProperty(List<AbstractMetaData> metaDataProperty) /** * @param metaDataProperty * the metaDataProperty to add - * @return + * @return this */ public AbstractGML addMetaDataProperty(List<AbstractMetaData> metaDataProperty) { if (metaDataProperty != null) { @@ -477,7 +477,7 @@ public AbstractGML addMetaDataProperty(List<AbstractMetaData> metaDataProperty) /** * @param metaDataProperty * the metaDataProperty to add - * @return + * @return this */ public AbstractGML addMetaDataProperty(AbstractMetaData metaDataProperty) { if (metaDataProperty != null) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGeometry.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGeometry.java index 907ba991b..3a6a4aacd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGeometry.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractGeometry.java @@ -35,7 +35,7 @@ public AbstractGeometry() { * constructor * * @param id - * GML id + * GML id */ public AbstractGeometry(String id) { setGmlId(id); @@ -55,7 +55,7 @@ public Geometry getGeometry() { * set geometry * * @param geometry - * the geometry to set + * the geometry to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractGeometry setGeometry(Geometry geometry) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractReferenceType.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractReferenceType.java index 57957ee47..66ef782e0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractReferenceType.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/AbstractReferenceType.java @@ -20,8 +20,7 @@ import org.n52.janmayen.Comparables; import org.n52.shetland.w3c.xlink.W3CHrefAttribute; -public class AbstractReferenceType - implements Comparable<AbstractReferenceType> { +public class AbstractReferenceType implements Comparable<AbstractReferenceType> { /** * Href diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/Aggregation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/Aggregation.java index 06274e1e5..118af9e9c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/Aggregation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/Aggregation.java @@ -24,6 +24,11 @@ */ public enum Aggregation { - set, bag, sequence, array, record, table; + set, + bag, + sequence, + array, + record, + table; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/CodeType.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/CodeType.java index b366af3d9..f378eea32 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/CodeType.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/CodeType.java @@ -49,21 +49,16 @@ public CodeType copy() { return new CodeType(getValue(), getCodeSpace()); } - @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("value", getValue()) - .add("codeSpace", getCodeSpace()) - .toString(); + return MoreObjects.toStringHelper(this).add("value", getValue()).add("codeSpace", getCodeSpace()).toString(); } @Override public boolean equals(Object obj) { if (obj instanceof CodeType) { CodeType that = (CodeType) obj; - return Objects.equal(getValue(), that.getValue()) && - Objects.equal(getCodeSpace(), that.getCodeSpace()); + return Objects.equal(getValue(), that.getValue()) && Objects.equal(getCodeSpace(), that.getCodeSpace()); } return false; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/CodeWithAuthority.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/CodeWithAuthority.java index 936623930..1d33cc326 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/CodeWithAuthority.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/CodeWithAuthority.java @@ -37,7 +37,8 @@ public class CodeWithAuthority implements Comparable<CodeWithAuthority> { /** * constructor * - * @param value Value/identifier + * @param value + * Value/identifier */ public CodeWithAuthority(String value) { setValue(value); @@ -46,8 +47,10 @@ public CodeWithAuthority(String value) { /** * constructor * - * @param value Value/identifier - * @param codeSpace Code space + * @param value + * Value/identifier + * @param codeSpace + * Code space */ public CodeWithAuthority(String value, String codeSpace) { setValue(value); @@ -78,7 +81,8 @@ public String getCodeSpace() { /** * Set value and return this CodeWithAuthority object * - * @param value Value to set + * @param value + * Value to set * @return This CodeWithAuthority object */ public CodeWithAuthority setValue(String value) { @@ -89,7 +93,8 @@ public CodeWithAuthority setValue(String value) { /** * Set code space and return this CodeWithAuthority object * - * @param codeSpace Code space to set + * @param codeSpace + * Code space to set * @return This CodeWithAuthority object */ public CodeWithAuthority setCodeSpace(String codeSpace) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/CoordinateSystemAxis.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/CoordinateSystemAxis.java index 3b6be547b..6bb874ac6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/CoordinateSystemAxis.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/CoordinateSystemAxis.java @@ -22,8 +22,7 @@ * @since 1.0.0 * */ -public class CoordinateSystemAxis - extends IdentifiedObject { +public class CoordinateSystemAxis extends IdentifiedObject { /* 1..1 */ private CodeType axisAbbrev; @@ -38,8 +37,8 @@ public class CoordinateSystemAxis /* 1..1 */ private String uom; - public CoordinateSystemAxis( - CodeWithAuthority identifier, CodeType axisAbbrev, CodeWithAuthority axisDirection, String uom) { + public CoordinateSystemAxis(CodeWithAuthority identifier, CodeType axisAbbrev, CodeWithAuthority axisDirection, + String uom) { super(identifier); this.axisAbbrev = axisAbbrev; this.axisDirection = axisDirection; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/Definition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/Definition.java index 3612b0238..5087771a0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/Definition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/Definition.java @@ -40,7 +40,8 @@ public String getRemarks() { } /** - * @param remarks the remarks to set + * @param remarks + * the remarks to set */ public void setRemarks(String remarks) { this.remarks = remarks; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/DomainOfValidity.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/DomainOfValidity.java index a9df5b192..ae6a0d6e6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/DomainOfValidity.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/DomainOfValidity.java @@ -40,7 +40,8 @@ public EXExtent getExExtent() { } /** - * @param exExtent the exExtent to set + * @param exExtent + * the exExtent to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public DomainOfValidity setExExtent(EXExtent exExtent) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/FeatureWith.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/FeatureWith.java index db369976b..ce38a757c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/FeatureWith.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/FeatureWith.java @@ -15,9 +15,10 @@ */ package org.n52.shetland.ogc.gml; -import com.google.common.base.Strings; import org.locationtech.jts.geom.Geometry; +import com.google.common.base.Strings; + public interface FeatureWith { interface FeatureWithGeometry { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/GmlConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/GmlConstants.java index 327f82dba..293434455 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/GmlConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/GmlConstants.java @@ -256,14 +256,17 @@ public interface GmlConstants { String VALUE_REF_GML_DESCRIPTION = "gml:description"; /** - * Enumeration of the possible values for indeterminate Time attribute of - * eventtime in GetObservation request + * Enumeration of the possible values for indeterminate Time attribute of eventtime in GetObservation + * request * * @since 1.0.0 * */ enum IndetTimeValues { - after, before, now, unknown + after, + before, + now, + unknown } /** @@ -272,17 +275,16 @@ enum IndetTimeValues { * @since 1.0.0 */ enum SortingOrder { - ASC, DESC + ASC, + DESC } /** - * inapplicable there is no value missing the correct value is not readily - * available to the sender of this data. Furthermore, a correct value may - * not exist template the value will be available later unknown the correct - * value is not known to, and not computable by, the sender of this data. - * However, a correct value probably exists withheld the value is not - * divulged Not supported: other:text other brief explanation, where text is - * a string of two or more characters with no included spaces + * inapplicable there is no value missing the correct value is not readily available to the sender of this + * data. Furthermore, a correct value may not exist template the value will be available later unknown the + * correct value is not known to, and not computable by, the sender of this data. However, a correct value + * probably exists withheld the value is not divulged Not supported: other:text other brief explanation, + * where text is a string of two or more characters with no included spaces * * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @@ -290,7 +292,11 @@ enum SortingOrder { * */ enum NilReason { - inapplicable, missing, template, unknown, withheld; + inapplicable, + missing, + template, + unknown, + withheld; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/GmlMetaDataProperty.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/GmlMetaDataProperty.java index 01b6e89f9..a92253e9b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/GmlMetaDataProperty.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/GmlMetaDataProperty.java @@ -17,6 +17,7 @@ /** * Class represents a GML conform MetaDataProperty element + * * @since 1.0.0 * */ @@ -39,7 +40,9 @@ public class GmlMetaDataProperty { /** * Set title - * @param title Title to set + * + * @param title + * Title to set */ public void setTitle(String title) { this.title = title; @@ -47,7 +50,9 @@ public void setTitle(String title) { /** * Set role - * @param role Role to set + * + * @param role + * Role to set */ public void setRole(String role) { this.role = role; @@ -55,7 +60,9 @@ public void setRole(String role) { /** * Set href - * @param href Href to set + * + * @param href + * Href to set */ public void setHref(String href) { this.href = href; @@ -63,6 +70,7 @@ public void setHref(String href) { /** * Get title + * * @return Title */ public String getTitle() { @@ -71,6 +79,7 @@ public String getTitle() { /** * Get role + * * @return Role */ public String getRole() { @@ -79,6 +88,7 @@ public String getRole() { /** * Get href + * * @return Href */ public String getHref() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/ReferenceType.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/ReferenceType.java index 57bda35be..5a9f9a525 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/ReferenceType.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/ReferenceType.java @@ -15,7 +15,6 @@ */ package org.n52.shetland.ogc.gml; - /** * Class represents a GML conform ReferenceType element * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/SortBy.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/SortBy.java index 5b3d66522..8886004f0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/SortBy.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/SortBy.java @@ -38,8 +38,7 @@ public class SortBy { * @param propertyp * name of property, by which should be sorted * @param orderp - * sorting order (currently only ascending ('ASC') or descending - * ('DESC') + * sorting order (currently only ascending ('ASC') or descending ('DESC') */ public SortBy(String propertyp, SortingOrder orderp) { this.property = propertyp; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/UomIdentifier.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/UomIdentifier.java index 016bb90aa..06db76b38 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/UomIdentifier.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/UomIdentifier.java @@ -15,7 +15,8 @@ */ package org.n52.shetland.ogc.gml; -public interface UomIdentifier<T> { +public interface UomIdentifier< + T> { T getValue(); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/VerticalCRS.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/VerticalCRS.java index 19c644d31..4233c5b43 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/VerticalCRS.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/VerticalCRS.java @@ -29,21 +29,20 @@ * @since 1.0.0 * */ -public class VerticalCRS - extends AbstractCRS { +public class VerticalCRS extends AbstractCRS { - private Referenceable<VerticalCS> verticalCS = Referenceable.of(Nillable.<VerticalCS> missing()); + private Referenceable<VerticalCS> verticalCS = Referenceable.of(Nillable.< + VerticalCS> missing()); - private Referenceable<VerticalDatum> verticalDatum = Referenceable.of(Nillable.<VerticalDatum> missing()); + private Referenceable<VerticalDatum> verticalDatum = Referenceable.of(Nillable.< + VerticalDatum> missing()); - public VerticalCRS( - CodeWithAuthority identifier, String scope, Referenceable<VerticalCS> verticalCS, + public VerticalCRS(CodeWithAuthority identifier, String scope, Referenceable<VerticalCS> verticalCS, Referenceable<VerticalDatum> verticalDatum) { this(identifier, Lists.newArrayList(scope), verticalCS, verticalDatum); } - public VerticalCRS( - CodeWithAuthority identifier, List<String> scope, Referenceable<VerticalCS> verticalCS, + public VerticalCRS(CodeWithAuthority identifier, List<String> scope, Referenceable<VerticalCS> verticalCS, Referenceable<VerticalDatum> verticalDatum) { super(identifier, scope); setVerticalCS(verticalCS); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/VerticalCS.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/VerticalCS.java index f3e30e25c..cd0e01e78 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/VerticalCS.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/VerticalCS.java @@ -19,7 +19,6 @@ import org.n52.shetland.w3c.xlink.Referenceable; - /** * Internal representation of the OGC GML VerticalCS. * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/IndeterminateValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/IndeterminateValue.java index 030218442..c0db06212 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/IndeterminateValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/IndeterminateValue.java @@ -15,9 +15,6 @@ */ package org.n52.shetland.ogc.gml.time; -import com.google.common.base.Strings; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import java.io.Serializable; import java.util.Arrays; import java.util.Collections; @@ -25,6 +22,10 @@ import java.util.Set; import java.util.TreeSet; +import com.google.common.base.Strings; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @author Christian Autermann */ @@ -91,8 +92,7 @@ public boolean equals(Object obj) { return false; } IndeterminateValue other = (IndeterminateValue) obj; - return getAlias().contains(other.getValue()) || - other.getAlias().contains(getValue()); + return getAlias().contains(other.getValue()) || other.getAlias().contains(getValue()); } @Override diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/Time.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/Time.java index c34bcd5f8..8619af04c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/Time.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/Time.java @@ -81,8 +81,7 @@ public void setGmlId(String gmlId) { } /** - * Get GML id. If not null, first {@code #} - * (document reference indicator) is removed + * Get GML id. If not null, first {@code #} (document reference indicator) is removed * * @return GML id */ @@ -105,8 +104,7 @@ public boolean isSetGmlId() { /** * Check whether GML id contains document reference indicator * - * @return <code>true</code>, if GML id contains document reference - * indicator + * @return <code>true</code>, if GML id contains document reference indicator */ public boolean isReferenced() { return isSetGmlId() && this.gmlId.startsWith("#"); @@ -215,8 +213,7 @@ public boolean isNilReasonEqualTo(Enum value) { * DateTime to check * @param indeterminateValue * IndeterminateValue to check - * @return Passed DateTime or current time - * {@link IndeterminateValue#NOW} + * @return Passed DateTime or current time {@link IndeterminateValue#NOW} */ protected DateTime resolveDateTime(DateTime dateTime, IndeterminateValue indeterminateValue) { if (dateTime != null) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimeInstant.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimeInstant.java index 6a5b2b7c9..0965cd508 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimeInstant.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimeInstant.java @@ -28,8 +28,7 @@ * * @since 1.0.0 */ -public class TimeInstant - extends Time { +public class TimeInstant extends Time { /** * serial number */ @@ -65,7 +64,8 @@ public TimeInstant(DateTime dateTime) { /** * Creates a new {@code TimeInstant}. * - * @param instant the instant + * @param instant + * the instant */ public TimeInstant(Instant instant) { this(instant != null ? instant.toDateTime() : null, 0, null); @@ -94,8 +94,7 @@ public TimeInstant(DateTime dateValue, IndeterminateValue indeterminateValue) { } /** - * Constructor using Java Dates, setting unknown indeterminate values if - * null + * Constructor using Java Dates, setting unknown indeterminate values if null * * @param date * Value date @@ -307,8 +306,7 @@ public boolean isSetIndeterminateValue() { * * @param value * Expected value - * @return <code>true</code>, if this indeterminate value equals expected - * value + * @return <code>true</code>, if this indeterminate value equals expected value */ @SuppressWarnings("rawtypes") public boolean isIndeterminateValueEqualTo(IndeterminateValue value) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimePeriod.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimePeriod.java index a78d5c10f..d3f745dab 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimePeriod.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimePeriod.java @@ -25,7 +25,6 @@ import org.joda.time.Interval; import org.joda.time.Period; import org.joda.time.format.ISOPeriodFormat; - import org.n52.shetland.util.CollectionHelper; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -35,8 +34,7 @@ * * @since 1.0.0 */ -public class TimePeriod - extends Time { +public class TimePeriod extends Time { /** * serial number */ @@ -70,7 +68,8 @@ public TimePeriod() { /** * Creates a new {@code TimePeriod} from an {@code Interval}. * - * @param interval the interval + * @param interval + * the interval */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public TimePeriod(Interval interval) { @@ -144,13 +143,11 @@ public TimePeriod(DateTime start, IndeterminateValue startIndet, DateTime end, I * @param id * the optional GML id * @throws ParseException - * if parsing the time strings of start or end into - * java.util.Date failed + * if parsing the time strings of start or end into java.util.Date failed */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) - public TimePeriod( - DateTime start, IndeterminateValue startIndet, DateTime end, IndeterminateValue endIndet, String duration, - String id) throws ParseException { + public TimePeriod(DateTime start, IndeterminateValue startIndet, DateTime end, IndeterminateValue endIndet, + String duration, String id) throws ParseException { super(id); this.start = start; this.startIndet = startIndet; @@ -180,8 +177,7 @@ public TimePeriod(TimeInstant startTime, TimeInstant endTime) { } /** - * Constructor using Java {@link Date}s, setting unknown indeterminate - * values if null + * Constructor using Java {@link Date}s, setting unknown indeterminate values if null * * @param start * start Date @@ -203,8 +199,7 @@ public TimePeriod(Date start, Date end) { } /** - * Constructor using Java {@link Object}s, setting unknown indeterminate - * values if null + * Constructor using Java {@link Object}s, setting unknown indeterminate values if null * * @param start * start {@link Object} @@ -445,8 +440,7 @@ public void extendToContain(TimeInstant instant) { } /** - * Extend TimePeriod to contain DateTime. Used by other extendToContain - * methods. + * Extend TimePeriod to contain DateTime. Used by other extendToContain methods. * * @param time * the time to contain @@ -463,8 +457,8 @@ public void extendToContain(DateTime time) { } /** - * Is this TimePeriod contained by another TimePeriod? Equal start/end times - * are considered to be containing, as are equal indeterminate times. + * Is this TimePeriod contained by another TimePeriod? Equal start/end times are considered to be + * containing, as are equal indeterminate times. * * @param otherTimePeriod * Potentially containing TimePeriod diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimePosition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimePosition.java index 2b0543224..7d1baf4a8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimePosition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gml/time/TimePosition.java @@ -18,14 +18,13 @@ import java.util.Optional; import org.joda.time.DateTime; - import org.n52.shetland.ogc.gml.time.Time.TimeFormat; import com.google.common.base.MoreObjects; /** - * Representation class for GML TimePosition. Used by TimeInstant and TimePeriod - * during encoding to reduce duplicate code. + * Representation class for GML TimePosition. Used by TimeInstant and TimePeriod during encoding to reduce + * duplicate code. * * @since 1.0.0 * @@ -129,9 +128,7 @@ public boolean isSetTimeFormat() { @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("time", this.time.get()) - .add("indeterminate time", this.indeterminateValue.get()) - .omitNullValues().toString(); + return MoreObjects.toStringHelper(this).add("time", this.time.get()) + .add("indeterminate time", this.indeterminateValue.get()).omitNullValues().toString(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/gmlcov/GmlCoverageConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/gmlcov/GmlCoverageConstants.java index fc4b7d78f..967f956c5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/gmlcov/GmlCoverageConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/gmlcov/GmlCoverageConstants.java @@ -19,6 +19,7 @@ /** * Interface for GML coverage constants + * * @since 1.0.0 * */ @@ -30,7 +31,7 @@ public interface GmlCoverageConstants { String SCHEMA_LOCATION_URL_GML_COVERAGE_10 = "http://schemas.opengis.net/gmlcov/1.0/gmlcovAll.xsd"; - SchemaLocation GML_COVERAGE_10_SCHEMA_LOCATION = new SchemaLocation(NS_GML_COV, - SCHEMA_LOCATION_URL_GML_COVERAGE_10); + SchemaLocation GML_COVERAGE_10_SCHEMA_LOCATION = + new SchemaLocation(NS_GML_COV, SCHEMA_LOCATION_URL_GML_COVERAGE_10); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/AbstractObservationStream.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/AbstractObservationStream.java index b4df8f0b8..3000f19c6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/AbstractObservationStream.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/AbstractObservationStream.java @@ -15,11 +15,9 @@ */ package org.n52.shetland.ogc.om; - import org.n52.janmayen.AbstractThrowingIterator; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; -public abstract class AbstractObservationStream - extends AbstractThrowingIterator<OmObservation, OwsExceptionReport> +public abstract class AbstractObservationStream extends AbstractThrowingIterator<OmObservation, OwsExceptionReport> implements ObservationStream { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/AbstractObservationValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/AbstractObservationValue.java index 2f393f4cc..45c78365d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/AbstractObservationValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/AbstractObservationValue.java @@ -19,8 +19,8 @@ import org.n52.shetland.ogc.om.series.Metadata; import org.n52.shetland.ogc.om.values.Value; -public abstract class AbstractObservationValue<T extends Value<?>> - implements ObservationValue<T> { +public abstract class AbstractObservationValue< + T extends Value<?>> implements ObservationValue<T> { private String observationID; private String observationType; private String observableProperty; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/AbstractPhenomenon.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/AbstractPhenomenon.java index d65c1e694..b9de202eb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/AbstractPhenomenon.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/AbstractPhenomenon.java @@ -15,7 +15,6 @@ */ package org.n52.shetland.ogc.om; - import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.gml.CodeWithAuthority; @@ -68,8 +67,7 @@ public int hashCode() { @Override public int compareTo(final AbstractPhenomenon o) { - return getIdentifierCodeWithAuthority().compareTo(o - .getIdentifierCodeWithAuthority()); + return getIdentifierCodeWithAuthority().compareTo(o.getIdentifierCodeWithAuthority()); } public abstract boolean isComposite(); @@ -84,13 +82,9 @@ public OmCompositePhenomenon asCompositePhenomenon() { return (OmCompositePhenomenon) this; } - @Override public String toString() { - return MoreObjects.toStringHelper(this) - .omitNullValues() - .add("identifier", getIdentifier()) - .add("description", getDescription()) - .toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("identifier", getIdentifier()) + .add("description", getDescription()).toString(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/MultiObservationValues.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/MultiObservationValues.java index 1b9f7f13e..2e7cf78d5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/MultiObservationValues.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/MultiObservationValues.java @@ -28,7 +28,8 @@ * @param <T> * value type */ -public class MultiObservationValues<T> extends AbstractObservationValue<MultiValue<T>> { +public class MultiObservationValues< + T> extends AbstractObservationValue<MultiValue<T>> { /** * Mesurement values */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/NamedValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/NamedValue.java index 04aa6408a..49249a7cf 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/NamedValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/NamedValue.java @@ -30,7 +30,8 @@ * @param <T> * value type */ -public class NamedValue<T> implements Comparable<NamedValue<T>> { +public class NamedValue< + T> implements Comparable<NamedValue<T>> { /** * Value name diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationMergeIndicator.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationMergeIndicator.java index 89626f10e..f7431aa39 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationMergeIndicator.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationMergeIndicator.java @@ -39,7 +39,8 @@ public ObservationMergeIndicator() { /** * Creates a new {@code ObservationMergeIndicator} that requires the supplied parameters to be equal. * - * @param parameters the parameters + * @param parameters + * the parameters */ private ObservationMergeIndicator(Set<Param> parameters) { this.parameters = Objects.requireNonNull(parameters); @@ -48,7 +49,8 @@ private ObservationMergeIndicator(Set<Param> parameters) { /** * Sets that the parameter idoes not need to be equal to merge two observations. * - * @param param the parameter + * @param param + * the parameter * * @return {@code this} */ @@ -60,7 +62,8 @@ private ObservationMergeIndicator without(Param param) { /** * Sets that the parameter should be equal to merge two observations. * - * @param param the parameter + * @param param + * the parameter * * @return {@code this} */ @@ -72,7 +75,8 @@ private ObservationMergeIndicator with(Param param) { /** * Checks if all of the parameters should be equal to merge two observations. * - * @param param the parameters + * @param param + * the parameters * * @return if all should be equal */ @@ -297,8 +301,8 @@ public boolean isObservationType() { } /** - * Checks if the observation constellation (procedure, observable property, feature of interest and offering) should - * be equal to merge two observations. + * Checks if the observation constellation (procedure, observable property, feature of interest and + * offering) should be equal to merge two observations. * * @return if the observation constellation should be equal */ @@ -309,7 +313,8 @@ public boolean isSameObservationConstellation() { /** * Sets whether the procedure should be to merge two observations. * - * @param procedure if the procedure should be equal + * @param procedure + * if the procedure should be equal * * @return {@code this} */ @@ -320,7 +325,8 @@ public ObservationMergeIndicator setProcedure(boolean procedure) { /** * Sets whether the observable property should be to merge two observations. * - * @param observableProperty if the observable property should be equal + * @param observableProperty + * if the observable property should be equal * * @return {@code this} */ @@ -331,7 +337,8 @@ public ObservationMergeIndicator setObservableProperty(boolean observablePropert /** * Sets whether the feature of interest should be to merge two observations. * - * @param featureOfInterest if the feature of interest should be equal + * @param featureOfInterest + * if the feature of interest should be equal * * @return {@code this} */ @@ -342,7 +349,8 @@ public ObservationMergeIndicator setFeatureOfInterest(boolean featureOfInterest) /** * Sets whether the offering should be to merge two observations. * - * @param offerings if the offerings should be equal + * @param offerings + * if the offerings should be equal * * @return {@code this} */ @@ -353,7 +361,8 @@ public ObservationMergeIndicator setOfferings(boolean offerings) { /** * Sets whether the phenomenon time should be to merge two observations. * - * @param phenomenonTime if the phenomenon time should be equal + * @param phenomenonTime + * if the phenomenon time should be equal * * @return {@code this} */ @@ -364,7 +373,8 @@ public ObservationMergeIndicator setPhenomenonTime(boolean phenomenonTime) { /** * Sets whether the result time should be to merge two observations. * - * @param resultTime if the result time should be equal + * @param resultTime + * if the result time should be equal * * @return {@code this} */ @@ -375,7 +385,8 @@ public ObservationMergeIndicator setResultTime(boolean resultTime) { /** * Sets whether the sampling geometry should be to merge two observations. * - * @param samplingGeometry if the sampling geometry should be equal + * @param samplingGeometry + * if the sampling geometry should be equal * * @return {@code this} */ @@ -386,7 +397,8 @@ public ObservationMergeIndicator setSamplingGeometry(boolean samplingGeometry) { /** * Sets whether the observation type should be checked to merge two observations. * - * @param observationType if the observation type should be checked + * @param observationType + * if the observation type should be checked * * @return {@code this} */ @@ -415,8 +427,8 @@ public boolean equals(Object obj) { } /** - * Gets an indicator that requires the observation constellations (procedure, observable property, feature of - * interest and offering) to be the same. + * Gets an indicator that requires the observation constellations (procedure, observable property, feature + * of interest and offering) to be the same. * * @return the indicator */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationParameterHelper.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationParameterHelper.java index 1341f721c..d6a19eb1e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationParameterHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationParameterHelper.java @@ -19,7 +19,8 @@ import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.om.values.TextValue; -public interface ObservationParameterHelper<T extends AbstractFeature> { +public interface ObservationParameterHelper< + T extends AbstractFeature> { ParameterHolder getParameterHolder(); @@ -53,8 +54,8 @@ default T addCategoryParameter(String category) { } default T addCategoryParameter(TextValue category) { - return addCategoryParameter(new NamedValue<String>(new ReferenceType(OmConstants.PARAMETER_NAME_CATEGORY), - category)); + return addCategoryParameter( + new NamedValue<String>(new ReferenceType(OmConstants.PARAMETER_NAME_CATEGORY), category)); } default T addCategoryParameter(NamedValue<String> categoryParameter) { @@ -108,8 +109,8 @@ default T addPlatformParameter(String platform) { } default T addPlatformParameter(TextValue platform) { - return addPlatformParameter(new NamedValue<String>(new ReferenceType(OmConstants.PARAMETER_NAME_PLATFORM), - platform)); + return addPlatformParameter( + new NamedValue<String>(new ReferenceType(OmConstants.PARAMETER_NAME_PLATFORM), platform)); } default T addPlatformParameter(NamedValue<String> platformParameter) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationStream.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationStream.java index 7a9f5dc0a..96b6fee4e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationStream.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationStream.java @@ -40,13 +40,13 @@ * * @author Christian Autermann */ -public interface ObservationStream - extends ThrowingIterator<OmObservation, OwsExceptionReport>, AutoCloseable { +public interface ObservationStream extends ThrowingIterator<OmObservation, OwsExceptionReport>, AutoCloseable { @Override default void close() { } - default <T extends Collection<OmObservation>> T collect(Supplier<T> supplier) throws OwsExceptionReport { + default < + T extends Collection<OmObservation>> T collect(Supplier<T> supplier) throws OwsExceptionReport { T collection = supplier.get(); forEachRemaining(collection::add); return collection; @@ -69,9 +69,8 @@ default Optional<OmObservation> findFirst() throws OwsExceptionReport { } /** - * Creates a new stream of this observation stream. Note that consuming the - * stream will drain the iterator and all thrown exceptions will be wrapped - * in {@link RuntimeException}s. + * Creates a new stream of this observation stream. Note that consuming the stream will drain the iterator + * and all thrown exceptions will be wrapped in {@link RuntimeException}s. * * @return the stream */ @@ -99,8 +98,7 @@ public OmObservation next() { } /** - * As this stream is always serial this is the same as {@link #findFirst() } - * . + * As this stream is always serial this is the same as {@link #findFirst() } . * * @return the first observation of the stream * @@ -113,8 +111,8 @@ default Optional<OmObservation> findAny() throws OwsExceptionReport { /** * - * Creates a new observation stream from an consumer that consumes every - * observation before it is emitted by the stream. + * Creates a new observation stream from an consumer that consumes every observation before it is emitted + * by the stream. * * @param consumer * the consumer @@ -131,8 +129,8 @@ default ObservationStream modify(ThrowingConsumer<OmObservation, OwsExceptionRep } /** - * Creates a new observation stream from a mapping function that produces a - * stream for every observation in this stream. + * Creates a new observation stream from a mapping function that produces a stream for every observation + * in this stream. * * @param mapper * the mapping function @@ -176,8 +174,8 @@ public void close() { } /** - * Produces a observation new stream from a mapping function that produces a - * new observation for every observation in this stream. + * Produces a observation new stream from a mapping function that produces a new observation for every + * observation in this stream. * * @param operator * the mapping function @@ -205,8 +203,8 @@ public void close() { } /** - * Creates a new observation stream that filters the observatons from the - * original stream using the supplied predicate. + * Creates a new observation stream that filters the observatons from the original stream using the + * supplied predicate. * * @param predicate * the filter @@ -237,9 +235,8 @@ public void close() { } /** - * Creates a new stream out of this stream in which observations with the - * same observation constellation are merged. Be aware that this method will - * consume this stream completely. + * Creates a new stream out of this stream in which observations with the same observation constellation + * are merged. Be aware that this method will consume this stream completely. * * @return the new observation stream * @@ -255,9 +252,8 @@ default ObservationStream merge() throws OwsExceptionReport { } /** - * Creates a new stream out of this stream in which observations with the - * same observation constellation are merged. Be aware that this method will - * consume this stream completely. + * Creates a new stream out of this stream in which observations with the same observation constellation + * are merged. Be aware that this method will consume this stream completely. * * @param indicator * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationValue.java index 52d072eca..222ae7e24 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ObservationValue.java @@ -28,7 +28,8 @@ * @param <T> * observation value type */ -public interface ObservationValue<T extends Value<?>> { +public interface ObservationValue< + T extends Value<?>> { /** * Get phenomenon or sampling time of the observation diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmCompositePhenomenon.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmCompositePhenomenon.java index ebb94346c..b05caa9e6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmCompositePhenomenon.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmCompositePhenomenon.java @@ -69,7 +69,7 @@ public List<OmObservableProperty> getPhenomenonComponents() { * * @param phenomenonComponents * The phenomenonComponents to set. - * @return + * @return this */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OmCompositePhenomenon setPhenomenonComponents(Collection<OmObservableProperty> phenomenonComponents) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java index fba6db650..b6fbdfaa5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmConstants.java @@ -28,8 +28,7 @@ /** * Class contains element names and namespaces used to encode the O&M responses. * - * Interface contains element names and namespaces used to encode the OGC O&M - * responses. + * Interface contains element names and namespaces used to encode the OGC O&M responses. * * @since 1.0.0 */ @@ -333,16 +332,8 @@ public interface OmConstants { ObservationType OBS_TYPE_REFERENCE_OBSERVATION_TYPE = new ObservationType(OBS_TYPE_REFERENCE_OBSERVATION); ObservationType OBS_TYPE_TRAJECTORY_OBSERVATION_TYPE = new ObservationType(OBS_TYPE_TRAJECTORY_OBSERVATION); - Set<String> OBSERVATION_TYPES = - ImmutableSet.of(OBS_TYPE_MEASUREMENT, - OBS_TYPE_CATEGORY_OBSERVATION, - OBS_TYPE_COMPLEX_OBSERVATION, - OBS_TYPE_COUNT_OBSERVATION, - OBS_TYPE_GEOMETRY_OBSERVATION, - OBS_TYPE_TEXT_OBSERVATION, - OBS_TYPE_TRUTH_OBSERVATION, - OBS_TYPE_SWE_ARRAY_OBSERVATION, - OBS_TYPE_PROFILE_OBSERVATION, - OBS_TYPE_TRAJECTORY_OBSERVATION, - OBS_TYPE_REFERENCE_OBSERVATION); + Set<String> OBSERVATION_TYPES = ImmutableSet.of(OBS_TYPE_MEASUREMENT, OBS_TYPE_CATEGORY_OBSERVATION, + OBS_TYPE_COMPLEX_OBSERVATION, OBS_TYPE_COUNT_OBSERVATION, OBS_TYPE_GEOMETRY_OBSERVATION, + OBS_TYPE_TEXT_OBSERVATION, OBS_TYPE_TRUTH_OBSERVATION, OBS_TYPE_SWE_ARRAY_OBSERVATION, + OBS_TYPE_PROFILE_OBSERVATION, OBS_TYPE_TRAJECTORY_OBSERVATION, OBS_TYPE_REFERENCE_OBSERVATION); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservableProperty.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservableProperty.java index b3d06322c..393c09ce8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservableProperty.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservableProperty.java @@ -36,7 +36,7 @@ public class OmObservableProperty extends AbstractPhenomenon { * constructor * * @param identifier - * observableProperty identifier + * observableProperty identifier */ public OmObservableProperty(String identifier) { super(identifier); @@ -46,15 +46,13 @@ public OmObservableProperty(String identifier) { * constructor * * @param identifier - * id of the observableProperty + * id of the observableProperty * @param description - * description of the observableProperty + * description of the observableProperty * @param unit - * unit of the observation values according to this - * observableProperty + * unit of the observation values according to this observableProperty * @param valueType - * database valType of the observation values according to this - * observableProperty + * database valType of the observation values according to this observableProperty */ public OmObservableProperty(String identifier, String description, String unit, String valueType) { super(identifier, description); @@ -75,7 +73,7 @@ public String getUnit() { * Set unit of measurement * * @param unit - * The unit to set. + * The unit to set. */ public void setUnit(String unit) { this.unit = unit; @@ -94,7 +92,7 @@ public String getValueType() { * Set value type * * @param valueType - * The valueType to set. + * The valueType to set. */ public void setValueType(String valueType) { this.valueType = valueType; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java index 28cee612f..75fbeca29 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservation.java @@ -199,7 +199,7 @@ public String getObservationID() { * * @param observationID * the observationID to set - * @return + * @return this */ public OmObservation setObservationID(final String observationID) { this.observationID = observationID; @@ -234,7 +234,7 @@ public TimeInstant getResultTime() { * * @param resultTime * the resultTime to set - * @return + * @return this */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OmObservation setResultTime(final TimeInstant resultTime) { @@ -257,7 +257,7 @@ public TimePeriod getValidTime() { * * @param validTime * the validTime to set - * @return + * @return this */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OmObservation setValidTime(final TimePeriod validTime) { @@ -279,7 +279,7 @@ public String getResultType() { * * @param resultType * the resultType to set - * @return + * @return this */ public OmObservation setResultType(final String resultType) { this.resultType = resultType; @@ -300,7 +300,7 @@ public String getTokenSeparator() { * * @param tokenSeparator * the tokenSeparator to set - * @return + * @return this */ public OmObservation setTokenSeparator(final String tokenSeparator) { this.tokenSeparator = tokenSeparator; @@ -321,7 +321,7 @@ public String getNoDataValue() { * * @param noDataValue * the noDataValue to set - * @return + * @return this */ public OmObservation setNoDataValue(final String noDataValue) { this.noDataValue = noDataValue; @@ -342,7 +342,7 @@ public String getTupleSeparator() { * * @param tupleSeparator * the tupleSeparator to set - * @return + * @return this */ public OmObservation setTupleSeparator(final String tupleSeparator) { this.tupleSeparator = tupleSeparator; @@ -363,7 +363,7 @@ public String getDecimalSeparator() { * * @param decimalSeparator * the decimalSeparator to set - * @return + * @return this */ public OmObservation setDecimalSeparator(final String decimalSeparator) { this.decimalSeparator = decimalSeparator; @@ -385,7 +385,7 @@ public ObservationValue<?> getValue() { * * @param value * the values to set - * @return + * @return this */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public OmObservation setValue(final ObservationValue<?> value) { @@ -402,7 +402,7 @@ public boolean isSetValue() { * * @param sosObservation * Observation to merge - * @return + * @return this */ public OmObservation mergeWithObservation(final OmObservation sosObservation) { mergeValues(sosObservation.getValue()); @@ -415,7 +415,7 @@ public OmObservation mergeWithObservation(final OmObservation sosObservation) { * * @param observationValue * Observation to merge - * @return + * @return this */ public OmObservation mergeWithObservation(ObservationValue<?> observationValue) { mergeValues(observationValue); @@ -486,7 +486,7 @@ protected boolean mergeValues(final ObservationValue<?> observationValue) { * Observation to merge * @param merged * the observation to merge into - * @return + * @return this */ private OmObservation mergeResultTimes(OmObservation merged, OmObservation sosObservation) { if (merged.isSetResultTime() && sosObservation.isSetResultTime()) { @@ -504,7 +504,7 @@ private OmObservation mergeResultTimes(OmObservation merged, OmObservation sosOb * * @param sosObservation * Observation to merge - * @return + * @return this */ private OmObservation mergeResultTimes(final OmObservation sosObservation) { if (isSetResultTime() && sosObservation.isSetResultTime()) { @@ -633,7 +633,7 @@ public Collection<NamedValue<?>> getParameter() { * * @param parameter * the parameter to set - * @return + * @return this */ public OmObservation setParameter(Collection<NamedValue<?>> parameter) { this.parameterHolder.addParameter(parameter); @@ -645,7 +645,7 @@ public OmObservation setParameter(Collection<NamedValue<?>> parameter) { * * @param namedValue * the namedValue to add to parameter - * @return + * @return this */ public OmObservation addParameter(NamedValue<?> namedValue) { parameterHolder.addParameter(namedValue); @@ -869,7 +869,7 @@ public Set<OmObservationContext> getRelatedObservations() { * * @param relatedObservations * the relatedObservations to set - * @return + * @return this */ public OmObservation setRelatedObservations(Collection<OmObservationContext> relatedObservations) { this.relatedObservations.clear(); @@ -884,7 +884,7 @@ public OmObservation setRelatedObservations(Collection<OmObservationContext> rel * * @param relatedObservations * the relatedObservations to set - * @return + * @return this */ public OmObservation addRelatedObservations(Collection<OmObservationContext> relatedObservations) { if (relatedObservations != null) { @@ -898,7 +898,7 @@ public OmObservation addRelatedObservations(Collection<OmObservationContext> rel * * @param relatedObservation * the relatedObservation to add - * @return + * @return this */ public OmObservation addRelatedObservation(OmObservationContext relatedObservation) { if (relatedObservation != null) { @@ -991,9 +991,9 @@ private boolean checkResultTime(ObservationMergeIndicator indicator, OmObservati private boolean checkSamplingGeometry(ObservationMergeIndicator indicator, OmObservation observation) { return !indicator.isSamplingGeometry() - || (isSetSpatialFilteringProfileParameter() && observation.isSetSpatialFilteringProfileParameter() + || isSetSpatialFilteringProfileParameter() && observation.isSetSpatialFilteringProfileParameter() && getSpatialFilteringProfileParameter().getValue().getValue() - .equals(observation.getSpatialFilteringProfileParameter().getValue().getValue())); + .equals(observation.getSpatialFilteringProfileParameter().getValue().getValue()); } private boolean checkMergeIndicator(OmObservation observation) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java index 7ca893345..9eac256e5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java @@ -40,7 +40,8 @@ public class OmObservationConstellation extends AbstractFeature /** * Identifier of the procedure by which the observation is made */ - private Nillable<AbstractFeature> procedure = Nillable.<AbstractFeature> nil(); + private Nillable<AbstractFeature> procedure = Nillable.< + AbstractFeature> nil(); /** * Identifier of the observableProperty to which the observation accords to @@ -55,7 +56,8 @@ public class OmObservationConstellation extends AbstractFeature /** * Identifier of the featureOfInterest to which this observation belongs */ - private Nillable<AbstractFeature> featureOfInterest = Nillable.<AbstractFeature> nil(); + private Nillable<AbstractFeature> featureOfInterest = Nillable.< + AbstractFeature> nil(); /** * type of the observation @@ -188,7 +190,8 @@ public String getProcedureIdentifier() { */ public OmObservationConstellation setProcedure(AbstractFeature procedure) { if (procedure == null) { - return setProcedure(Nillable.<AbstractFeature> nil()); + return setProcedure(Nillable.< + AbstractFeature> nil()); } return setProcedure(Nillable.of(procedure)); } @@ -292,7 +295,8 @@ public Nillable<AbstractFeature> getNillableFeatureOfInterest() { */ public OmObservationConstellation setFeatureOfInterest(AbstractFeature featureOfInterest) { if (featureOfInterest == null) { - return setFeatureOfInterest(Nillable.<AbstractFeature> nil()); + return setFeatureOfInterest(Nillable.< + AbstractFeature> nil()); } return setFeatureOfInterest(Nillable.of(featureOfInterest)); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationContext.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationContext.java index 2f69af476..4a20d9d2d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationContext.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationContext.java @@ -19,7 +19,6 @@ import org.n52.shetland.ogc.gml.ReferenceType; - /** * Representation of OGC O&M 2.0 ObservationContext * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java index d64d7cd86..3e9756e06 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java @@ -21,14 +21,13 @@ import java.util.SortedSet; import java.util.TreeSet; +import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.om.values.GeometryValue; import org.n52.shetland.ogc.om.values.QuantityValue; import org.n52.shetland.ogc.om.values.Value; import org.n52.shetland.util.CollectionHelper; -import org.locationtech.jts.geom.Geometry; - public class ParameterHolder { private final SortedSet<NamedValue<?>> parameter = new TreeSet<>(); @@ -38,14 +37,13 @@ public SortedSet<NamedValue<?>> getParameter() { } @SuppressWarnings("unchecked") - public <T> Optional<Value<T>> getParameter(String name) { + public < + T> Optional<Value<T>> getParameter(String name) { if (name == null || name.isEmpty()) { return Optional.empty(); } - return this.parameter.stream() - .filter(nv -> nv.getName().getHref().equals(name)) - .map(nv -> (Value<T>) nv.getValue()) - .findAny(); + return this.parameter.stream().filter(nv -> nv.getName().getHref().equals(name)) + .map(nv -> (Value<T>) nv.getValue()).findAny(); } public boolean hasParameter(String name) { @@ -112,13 +110,13 @@ public NamedValue<BigDecimal> getHeightParameter() { } private boolean isHeightParameter(NamedValue<?> namedValue) { - return namedValue.isSetName() && namedValue.getName().isSetHref() && - (namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_HEIGHT_URL) || - namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_HEIGHT) || - namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_ELEVATION) || - namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_FROM_HEIGHT) || - namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_TO_HEIGHT)) && - namedValue.getValue() instanceof QuantityValue; + return namedValue.isSetName() && namedValue.getName().isSetHref() + && (namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_HEIGHT_URL) + || namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_HEIGHT) + || namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_ELEVATION) + || namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_FROM_HEIGHT) + || namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_TO_HEIGHT)) + && namedValue.getValue() instanceof QuantityValue; } /** @@ -148,12 +146,12 @@ public NamedValue<BigDecimal> getDepthParameter() { } private boolean isDepthParameter(NamedValue<?> namedValue) { - return namedValue.isSetName() && namedValue.getName().isSetHref() && - (namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_DEPTH_URL) || - namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_DEPTH) || - namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_FROM_DEPTH) || - namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_TO_DEPTH)) && - namedValue.getValue() instanceof QuantityValue; + return namedValue.isSetName() && namedValue.getName().isSetHref() + && (namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_DEPTH_URL) + || namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_DEPTH) + || namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_FROM_DEPTH) + || namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_TO_DEPTH)) + && namedValue.getValue() instanceof QuantityValue; } public boolean isSetHeightDepthParameter() { @@ -181,31 +179,31 @@ private boolean isSetFromParameter() { } private boolean isToParameter(NamedValue<?> namedValue) { - return namedValue.isSetName() && namedValue.getName().isSetHref() && - (namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_TO_DEPTH) || - namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_TO_HEIGHT) || - namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_TO)) && - namedValue.getValue() instanceof QuantityValue; + return namedValue.isSetName() && namedValue.getName().isSetHref() + && (namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_TO_DEPTH) + || namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_TO_HEIGHT) + || namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_TO)) + && namedValue.getValue() instanceof QuantityValue; } private boolean isFromParameter(NamedValue<?> namedValue) { - return namedValue.isSetName() && namedValue.getName().isSetHref() && - (namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_FROM_DEPTH) || - namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_FROM_HEIGHT) || - namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_FROM)) && - namedValue.getValue() instanceof QuantityValue; + return namedValue.isSetName() && namedValue.getName().isSetHref() + && (namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_FROM_DEPTH) + || namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_FROM_HEIGHT) + || namedValue.getName().getHref().equals(OmConstants.PARAMETER_NAME_FROM)) + && namedValue.getValue() instanceof QuantityValue; } @SuppressWarnings("unchecked") public NamedValue<BigDecimal> getToParameter() { - return getParameter().stream().filter(this::isToParameter) - .findFirst().map(nv -> (NamedValue<BigDecimal>) nv).orElse(null); + return getParameter().stream().filter(this::isToParameter).findFirst().map(nv -> (NamedValue<BigDecimal>) nv) + .orElse(null); } @SuppressWarnings("unchecked") public NamedValue<BigDecimal> getFromParameter() { - return getParameter().stream().filter(this::isFromParameter) - .findFirst().map(nv -> (NamedValue<BigDecimal>) nv).orElse(null); + return getParameter().stream().filter(this::isFromParameter).findFirst().map(nv -> (NamedValue<BigDecimal>) nv) + .orElse(null); } /** @@ -220,7 +218,8 @@ public boolean isSetSpatialFilteringProfileParameter() { /** * Add sampling geometry to observation * - * @param samplingGeometry The sampling geometry to set + * @param samplingGeometry + * The sampling geometry to set * * @return this */ @@ -239,8 +238,8 @@ public ParameterHolder addSpatialFilteringProfileParameter(Geometry samplingGeom */ @SuppressWarnings("unchecked") public NamedValue<Geometry> getSpatialFilteringProfileParameter() { - return getParameter().stream().filter(this::isSamplingGeometryParameter) - .findFirst().map(nv -> (NamedValue<Geometry>) nv).orElse(null); + return getParameter().stream().filter(this::isSamplingGeometryParameter).findFirst() + .map(nv -> (NamedValue<Geometry>) nv).orElse(null); } /** @@ -249,9 +248,9 @@ public NamedValue<Geometry> getSpatialFilteringProfileParameter() { * @return <code>true</code>, if sampling geometry for spatial filtering profile is set */ private boolean isSamplingGeometryParameter(NamedValue<?> namedValue) { - return namedValue.isSetName() && namedValue.getName().isSetHref() && - namedValue.getName().getHref().equals(OmConstants.PARAM_NAME_SAMPLING_GEOMETRY) && - namedValue.getValue() instanceof GeometryValue; + return namedValue.isSetName() && namedValue.getName().isSetHref() + && namedValue.getName().getHref().equals(OmConstants.PARAM_NAME_SAMPLING_GEOMETRY) + && namedValue.getValue() instanceof GeometryValue; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/PointValuePair.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/PointValuePair.java index c547da82f..d0fa3293e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/PointValuePair.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/PointValuePair.java @@ -15,17 +15,14 @@ */ package org.n52.shetland.ogc.om; - import java.util.Objects; import org.apache.commons.lang.builder.CompareToBuilder; - +import org.locationtech.jts.geom.Point; import org.n52.shetland.ogc.om.values.Value; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.locationtech.jts.geom.Point; - public class PointValuePair implements Comparable<PointValuePair> { /** * Point value pair point diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/SingleObservationValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/SingleObservationValue.java index 04af791d4..a1e23396d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/SingleObservationValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/SingleObservationValue.java @@ -36,7 +36,8 @@ * @param <T> * value type */ -public class SingleObservationValue<T> extends AbstractObservationValue<Value<T>> { +public class SingleObservationValue< + T> extends AbstractObservationValue<Value<T>> { /** * Phenomenon time diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/StreamingValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/StreamingValue.java index 613b0f2bc..7eb968635 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/StreamingValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/StreamingValue.java @@ -15,7 +15,9 @@ */ package org.n52.shetland.ogc.om; +import java.util.List; +import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.UoM; import org.n52.shetland.ogc.gml.time.Time; import org.n52.shetland.ogc.gml.time.TimeInstant; @@ -28,10 +30,6 @@ import org.n52.shetland.util.GeometryTransformer; import org.n52.shetland.util.JavaHelper; -import java.util.List; - -import org.locationtech.jts.geom.Geometry; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** @@ -43,7 +41,8 @@ * @param <S> * Entity type */ -public abstract class StreamingValue<S> extends AbstractStreaming { +public abstract class StreamingValue< + S> extends AbstractStreaming { private Time phenomenonTime; private TimeInstant resultTime; private Time validTime; @@ -167,7 +166,9 @@ public UoM getUnitObject() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { throw new UnsupportedOperationException(); } }; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeLocationValueTriple.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeLocationValueTriple.java index a002bca24..c146185d9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeLocationValueTriple.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeLocationValueTriple.java @@ -15,18 +15,15 @@ */ package org.n52.shetland.ogc.om; - import java.util.Objects; import org.apache.commons.lang.builder.CompareToBuilder; - +import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.gml.time.Time; import org.n52.shetland.ogc.om.values.Value; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.locationtech.jts.geom.Geometry; - /** * Class that hold the time, the location and the value. * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeValuePair.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeValuePair.java index 8863623ec..85172a4c6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeValuePair.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/TimeValuePair.java @@ -121,8 +121,7 @@ public boolean equals(Object obj) { return false; } final TimeValuePair other = (TimeValuePair) obj; - return Objects.equals(this.time, other.time) && - Objects.equals(this.value, other.value); + return Objects.equals(this.time, other.time) && Objects.equals(this.value, other.value); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/FeatureCollection.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/FeatureCollection.java index dde7d9b4f..224f55508 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/FeatureCollection.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/FeatureCollection.java @@ -31,15 +31,15 @@ * * @since 1.0.0 */ -public class FeatureCollection - extends AbstractFeature - implements Iterable<AbstractFeature> { +public class FeatureCollection extends AbstractFeature implements Iterable<AbstractFeature> { private static String GML_FEATURE_COLLECTION = "gml:FeatureCollection"; /** * members of this feature collection */ - private SortedMap<String, AbstractFeature> members = Maps.<String, AbstractFeature> newTreeMap(); + private SortedMap<String, AbstractFeature> members = Maps.< + String, + AbstractFeature> newTreeMap(); /** * constructor diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/AbstractSamplingFeature.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/AbstractSamplingFeature.java index d6afdbd77..56a4791e5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/AbstractSamplingFeature.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/AbstractSamplingFeature.java @@ -20,6 +20,7 @@ import java.util.LinkedList; import java.util.List; +import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.OGCConstants; import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.gml.CodeWithAuthority; @@ -32,12 +33,9 @@ import org.n52.shetland.util.IdGenerator; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.locationtech.jts.geom.Geometry; - public abstract class AbstractSamplingFeature extends AbstractFeature implements FeatureWithGeometry, FeatureWithFeatureType, FeatureWithUrl, FeatureWithEncode { @@ -154,7 +152,7 @@ public void setUrl(final String url) { * * @param sampledFeatures * Sampled fearure list - * @return + * @return this */ public AbstractSamplingFeature setSampledFeatures(final List<AbstractFeature> sampledFeatures) { this.sampledFeatures.clear(); @@ -190,7 +188,7 @@ public boolean isSetSampledFeatures() { * * @param namedValue * Parameter ro add - * @return + * @return this */ public AbstractSamplingFeature addParameter(final NamedValue<?> namedValue) { if (namedValue != null) { @@ -204,7 +202,7 @@ public AbstractSamplingFeature addParameter(final NamedValue<?> namedValue) { * * @param parameters * Parameters to add - * @return + * @return this */ public AbstractSamplingFeature setParameters(final Collection<NamedValue<?>> parameters) { this.parameters.clear(); @@ -238,7 +236,7 @@ public boolean isEncode() { * * @param encode * Encoding indicator - * @return + * @return this */ public AbstractSamplingFeature setEncode(final boolean encode) { this.encode = encode; @@ -250,7 +248,7 @@ public AbstractSamplingFeature setEncode(final boolean encode) { * * @param relatedSamplingFeature * Related sampling feature to add - * @return + * @return this */ public AbstractSamplingFeature addRelatedSamplingFeature(final SamplingFeatureComplex relatedSamplingFeature) { if (relatedSamplingFeature != null) { @@ -264,7 +262,7 @@ public AbstractSamplingFeature addRelatedSamplingFeature(final SamplingFeatureCo * * @param relatedSamplingFeatures * Related sampling features to add - * @return + * @return this */ public AbstractSamplingFeature addAllRelatedSamplingFeatures( final Collection<SamplingFeatureComplex> relatedSamplingFeatures) { @@ -279,7 +277,7 @@ public AbstractSamplingFeature addAllRelatedSamplingFeatures( * * @param relatedSamplingFeatures * Related sampling features to set - * @return + * @return this */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public AbstractSamplingFeature setRelatedSamplingFeatures( @@ -298,7 +296,8 @@ public AbstractSamplingFeature setRelatedSamplingFeatures( */ public List<SamplingFeatureComplex> getRelatedSamplingFeatures() { return relatedSamplingFeatures != null ? Lists.newArrayList(relatedSamplingFeatures) - : Collections.<SamplingFeatureComplex> emptyList(); + : Collections.< + SamplingFeatureComplex> emptyList(); } /** diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/FeatureOfInterestVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/FeatureOfInterestVisitor.java index e5a690327..6d23184f8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/FeatureOfInterestVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/FeatureOfInterestVisitor.java @@ -19,18 +19,15 @@ import org.n52.shetland.ogc.om.series.wml.WmlMonitoringPoint; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; -public interface FeatureOfInterestVisitor<T> { +public interface FeatureOfInterestVisitor< + T> { - T visit(SamplingFeature value) - throws OwsExceptionReport; + T visit(SamplingFeature value) throws OwsExceptionReport; - T visit(SfSpecimen value) - throws OwsExceptionReport; + T visit(SfSpecimen value) throws OwsExceptionReport; - T visit(WmlMonitoringPoint value) - throws OwsExceptionReport; + T visit(WmlMonitoringPoint value) throws OwsExceptionReport; - T visit(TsmlMonitoringFeature value) - throws OwsExceptionReport; + T visit(TsmlMonitoringFeature value) throws OwsExceptionReport; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/InvalidSridException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/InvalidSridException.java index a30977fec..afb487934 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/InvalidSridException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/InvalidSridException.java @@ -17,8 +17,7 @@ /** * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeature.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeature.java index dc0293658..1bca81bb6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeature.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeature.java @@ -52,17 +52,17 @@ public SamplingFeature(final CodeWithAuthority featureIdentifier, final String g } @Override - public <X> X accept(FeatureOfInterestVisitor<X> visitor) throws OwsExceptionReport { + public < + X> X accept(FeatureOfInterestVisitor<X> visitor) throws OwsExceptionReport { return visitor.visit(this); } @Override public String toString() { - return String.format( - "SamplingFeature [name=%s, description=%s, xmlDescription=%s, geometry=%s, " + return String.format("SamplingFeature [name=%s, description=%s, xmlDescription=%s, geometry=%s, " + "featureType=%s, url=%s, sampledFeatures=%s, parameters=%s, encode=%b, relatedSamplingFeatures=%s]", - getName(), getDescription(), getXml(), getGeometry(), getFeatureType(), getUrl(), - getSampledFeatures(), getParameters(), isEncode(), getRelatedSamplingFeatures()); + getName(), getDescription(), getXml(), getGeometry(), getFeatureType(), getUrl(), getSampledFeatures(), + getParameters(), isEncode(), getRelatedSamplingFeatures()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureComplex.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureComplex.java index 958e9ce28..9b3f068b5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureComplex.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureComplex.java @@ -22,8 +22,7 @@ /** * Implementation for sam:SamplingFeatureComplex * - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ @@ -47,12 +46,12 @@ public class SamplingFeatureComplex { * @param relatedSamplingFeature * Related sampling feature * @exception IllegalArgumentException - * If {@link #relatedSamplingFeatureRole} is null or empty - * and {@link #relatedSamplingFeature} is null or empty + * If {@link #relatedSamplingFeatureRole} is null or empty and + * {@link #relatedSamplingFeature} is null or empty */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) - public SamplingFeatureComplex( - final String relatedSamplingFeatureRole, final SamplingFeature relatedSamplingFeature) { + public SamplingFeatureComplex(final String relatedSamplingFeatureRole, + final SamplingFeature relatedSamplingFeature) { if (Strings.isNullOrEmpty(relatedSamplingFeatureRole)) { throw new IllegalArgumentException("relatedSamplingFeatureRole is required."); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SfSpecimen.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SfSpecimen.java index b88f8350d..dd00b3173 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SfSpecimen.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/samplingFeatures/SfSpecimen.java @@ -19,6 +19,7 @@ import java.util.Collections; import java.util.List; +import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.gml.CodeWithAuthority; import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.gml.time.Time; @@ -31,8 +32,6 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.locationtech.jts.geom.Geometry; - public class SfSpecimen extends SamplingFeature { /* @@ -176,7 +175,7 @@ public List<PreparationStep> getProcessingDetails() { /** * @param processingDetails * the processingDetails to set - * @return + * @return this */ public SfSpecimen setProcessingDetails(Collection<PreparationStep> processingDetails) { this.processingDetails.clear(); @@ -256,7 +255,7 @@ public ReferenceType getSpecimenType() { /** * @param specimenType * the specimenType to set - * @return + * @return this */ public SfSpecimen setSpecimenType(ReferenceType specimenType) { this.specimenType = specimenType; @@ -268,7 +267,8 @@ public boolean isSetSpecimenType() { } @Override - public <X> X accept(FeatureOfInterestVisitor<X> visitor) throws OwsExceptionReport { + public < + X> X accept(FeatureOfInterestVisitor<X> visitor) throws OwsExceptionReport { return visitor.visit(this); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/AbstractDefaultTVPMeasurementMetadata.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/AbstractDefaultTVPMeasurementMetadata.java index aa53c5b0a..417706481 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/AbstractDefaultTVPMeasurementMetadata.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/AbstractDefaultTVPMeasurementMetadata.java @@ -22,10 +22,10 @@ * See <code>/req/xsd-measurement-timeseries-tvp/</code>. * * @see <a href="http://www.opengeospatial.org/standards/tsml">OGC TSML</a> - * @see <a href="http://www.opengeospatial.org/standards/waterml">OGC - * WaterML</a> + * @see <a href="http://www.opengeospatial.org/standards/waterml">OGC WaterML</a> */ -public abstract class AbstractDefaultTVPMeasurementMetadata<T extends AbstractDefaultTVPMeasurementMetadata<?>> { +public abstract class AbstractDefaultTVPMeasurementMetadata< + T extends AbstractDefaultTVPMeasurementMetadata<?>> { private String aggregationDuration; @@ -48,7 +48,6 @@ public boolean isSetInterpolationType() { public abstract AbstractInterpolationType getInterpolationtype(); - public abstract T setInterpolationtype( - AbstractInterpolationType interpolationtype); + public abstract T setInterpolationtype(AbstractInterpolationType interpolationtype); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/DefaultPointMetadata.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/DefaultPointMetadata.java index cfbca4d43..45a539355 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/DefaultPointMetadata.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/DefaultPointMetadata.java @@ -22,8 +22,10 @@ * * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * @since 1.0.0 - * @see <a href="http://www.opengeospatial.org/standards/waterml">http://www.opengeospatial.org/standards/waterml</a> - * @see <a href="http://www.opengeospatial.org/standards/tsml">http://www.opengeospatial.org/standards/tsml</a> + * @see <a href= + * "http://www.opengeospatial.org/standards/waterml">http://www.opengeospatial.org/standards/waterml</a> + * @see <a href= + * "http://www.opengeospatial.org/standards/tsml">http://www.opengeospatial.org/standards/tsml</a> */ public class DefaultPointMetadata { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/MeasurementTimeseriesMetadata.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/MeasurementTimeseriesMetadata.java index c9bf0680a..c749c4a1e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/MeasurementTimeseriesMetadata.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/MeasurementTimeseriesMetadata.java @@ -19,22 +19,21 @@ * This class implements the OGC WaterML 2.0 and TimeseriesML 1.0 element <code>metadata</code>. See * <code>/req/uml-timeseries-observation/metadata</code>. * - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> - * @see <a href="http://www.opengeospatial.org/standards/waterml">http://www.opengeospatial.org/standards/waterml</a> - * @see <a href="http://www.opengeospatial.org/standards/tsml">http://www.opengeospatial.org/standards/tsml</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> + * @see <a href= + * "http://www.opengeospatial.org/standards/waterml">http://www.opengeospatial.org/standards/waterml</a> + * @see <a href= + * "http://www.opengeospatial.org/standards/tsml">http://www.opengeospatial.org/standards/tsml</a> * @since 1.0.0 */ -public class MeasurementTimeseriesMetadata - extends TimeseriesMetadata { +public class MeasurementTimeseriesMetadata extends TimeseriesMetadata { private boolean cumulative; /** - * "A series that is defined as cumulative is one where the values indicate - * a sequentially increasing series; i.e. each value is added to the last so - * the value represents the total of a value since accumulation began." - * (Source: OGC#10-126r3) + * "A series that is defined as cumulative is one where the values indicate a sequentially increasing + * series; i.e. each value is added to the last so the value represents the total of a value since + * accumulation began." (Source: OGC#10-126r3) */ public boolean isCumulative() { return cumulative; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/Metadata.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/Metadata.java index c8088b519..4db266d2f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/Metadata.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/Metadata.java @@ -16,8 +16,8 @@ package org.n52.shetland.ogc.om.series; /** - * This class implements the OGC TimeseriesML 1.0 and OGC WaterML 2.0 Metadata Element - * element <code>metadata</code>. See <code>/req/uml-timeseries-observation/metadata</code>. + * This class implements the OGC TimeseriesML 1.0 and OGC WaterML 2.0 Metadata Element element + * <code>metadata</code>. See <code>/req/uml-timeseries-observation/metadata</code>. * * @see <a href="http://www.opengeospatial.org/standards/tsml">OGC TSML</a> * @see <a href="http://www.opengeospatial.org/standards/waterml">OGC WaterML</a> diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/tsml/TimeseriesMLConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/tsml/TimeseriesMLConstants.java index 355951034..d34cb185d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/tsml/TimeseriesMLConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/tsml/TimeseriesMLConstants.java @@ -128,68 +128,55 @@ public interface TimeseriesMLConstants extends SeriesConstants { enum InterpolationType implements AbstractInterpolationType { /** - * Continuous - * http://www.opengis.net/def/timeseries/InterpolationCode/Continuous + * Continuous http://www.opengis.net/def/timeseries/InterpolationCode/Continuous */ Continuous("Continuous"), /** - * Discontinuous - * http://www.opengis.net/def/timeseries/InterpolationCode/Discontinuous + * Discontinuous http://www.opengis.net/def/timeseries/InterpolationCode/Discontinuous */ Discontinuous("Discontinuous"), /** - * Instantaneous total - * http://www.opengis.net/def/timeseries/InterpolationCode/InstantTotal + * Instantaneous total http://www.opengis.net/def/timeseries/InterpolationCode/InstantTotal */ InstantTotal("Instant Total"), /** - * Average in preceding interval - * http://www.opengis.net/def/timeseries/InterpolationCode/AveragePrec + * Average in preceding interval http://www.opengis.net/def/timeseries/InterpolationCode/AveragePrec */ AveragePrec("Average Preceding"), /** - * Maximum in preceding interval - * http://www.opengis.net/def/timeseries/InterpolationCode/MaxPrec + * Maximum in preceding interval http://www.opengis.net/def/timeseries/InterpolationCode/MaxPrec */ MaxPrec("Maximum Preceding"), /** - * Minimum in preceding interval - * http://www.opengis.net/def/timeseries/InterpolationCode/MinPrec + * Minimum in preceding interval http://www.opengis.net/def/timeseries/InterpolationCode/MinPrec */ MinPrec("Minimum Preceding"), /** - * Preceding total - * http://www.opengis.net/def/timeseries/InterpolationCode/PrecTotal + * Preceding total http://www.opengis.net/def/timeseries/InterpolationCode/PrecTotal */ TotalPrec("Preceding Total"), /** - * Average in succeeding interval - * http://www.opengis.net/def/timeseries/InterpolationCode/AverageSucc + * Average in succeeding interval http://www.opengis.net/def/timeseries/InterpolationCode/AverageSucc */ AverageSucc("Average Succeeding"), /** - * Succeeding total - * http://www.opengis.net/def/timeseries/InterpolationCode/TotalSucc + * Succeeding total http://www.opengis.net/def/timeseries/InterpolationCode/TotalSucc */ TotalSucc("Total Succeeding"), /** - * Minimum in succeeding interval - * http://www.opengis.net/def/timeseries/InterpolationCode/MinSucc + * Minimum in succeeding interval http://www.opengis.net/def/timeseries/InterpolationCode/MinSucc */ MinSucc("Minimum Succeeding"), /** - * Maximum in succeeding interval - * http://www.opengis.net/def/timeseries/InterpolationCode/MaxSucc + * Maximum in succeeding interval http://www.opengis.net/def/timeseries/InterpolationCode/MaxSucc */ MaxSucc("Maximum Succeeding"), /** - * Constant in preceding interval - * http://www.opengis.net/def/timeseries/InterpolationCode/ConstPrec + * Constant in preceding interval http://www.opengis.net/def/timeseries/InterpolationCode/ConstPrec */ ConstPrec("Constant Preceding"), /** - * Constant in succeeding interval - * http://www.opengis.net/def/timeseries/InterpolationCode/ConstSucc + * Constant in succeeding interval http://www.opengis.net/def/timeseries/InterpolationCode/ConstSucc */ ConstSucc("Constant Succeeding"); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/tsml/TsmlMonitoringFeature.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/tsml/TsmlMonitoringFeature.java index 9a6a98168..806b1649a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/tsml/TsmlMonitoringFeature.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/tsml/TsmlMonitoringFeature.java @@ -20,8 +20,7 @@ import org.n52.shetland.ogc.om.series.AbstractMonitoringFeature; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; -public class TsmlMonitoringFeature - extends AbstractMonitoringFeature { +public class TsmlMonitoringFeature extends AbstractMonitoringFeature { public TsmlMonitoringFeature(CodeWithAuthority featureIdentifier) { this(featureIdentifier, null); @@ -33,14 +32,14 @@ public TsmlMonitoringFeature(CodeWithAuthority featureIdentifier, String gmlId) } @Override - public <X> X accept(FeatureOfInterestVisitor<X> visitor) throws OwsExceptionReport { + public < + X> X accept(FeatureOfInterestVisitor<X> visitor) throws OwsExceptionReport { return visitor.visit(this); } @Override public String toString() { - return String.format( - "MonitoringFeature [name=%s, description=%s, xmlDescription=%s, geometry=%s, " + return String.format("MonitoringFeature [name=%s, description=%s, xmlDescription=%s, geometry=%s, " + "featureType=%s, url=%s, sampledFeatures=%s, parameters=%s, encode=%b, relatedSamplingFeatures=%s]", getName(), getDescription(), getXml(), getGeometry(), getFeatureType(), getUrl(), getSampledFeatures(), getParameters(), isEncode(), getRelatedSamplingFeatures()); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/wml/DefaultTVPMeasurementMetadata.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/wml/DefaultTVPMeasurementMetadata.java index 8f0cdcd78..77c0a3625 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/wml/DefaultTVPMeasurementMetadata.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/wml/DefaultTVPMeasurementMetadata.java @@ -25,11 +25,9 @@ * * See <code>/req/xsd-measurement-timeseries-tvp/interpolation-type</code>. * - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * @since 1.0.0 - * @see <a href="http://www.opengeospatial.org/standards/waterml">OGC - * WaterML</a> + * @see <a href="http://www.opengeospatial.org/standards/waterml">OGC WaterML</a> */ public class DefaultTVPMeasurementMetadata extends AbstractDefaultTVPMeasurementMetadata<DefaultTVPMeasurementMetadata> { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/wml/WaterMLConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/wml/WaterMLConstants.java index bf75080f6..c70f38b9b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/wml/WaterMLConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/wml/WaterMLConstants.java @@ -26,7 +26,8 @@ /** * @since 1.0.0 - * @see <a href="http://www.opengeospatial.org/standards/waterml">http://www.opengeospatial.org/standards/waterml</a> + * @see <a href= + * "http://www.opengeospatial.org/standards/waterml">http://www.opengeospatial.org/standards/waterml</a> */ public interface WaterMLConstants extends SeriesConstants { String NS_WML_20 = "http://www.opengis.net/waterml/2.0"; @@ -134,80 +135,65 @@ public interface WaterMLConstants extends SeriesConstants { * * See <code>/req/xsd-measurement-timeseries-tvp/interpolation-type</code>. * - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * @since 1.0.0 */ enum InterpolationType implements AbstractInterpolationType { /** - * Continuous/Instantaneous - * http://www.opengis.net/def/waterml/2.0/interpolationType/Continuous + * Continuous/Instantaneous http://www.opengis.net/def/waterml/2.0/interpolationType/Continuous */ Continuous("Continuous"), /** - * http://www.opengis.net/def/waterml/2.0/interpolationType/ - * Discontinuous + * http://www.opengis.net/def/waterml/2.0/interpolationType/ Discontinuous */ Discontinuous("Discontinuous"), /** - * Instantaneous total - * http://www.opengis.net/def/waterml/2.0/interpolationType/InstantTotal + * Instantaneous total http://www.opengis.net/def/waterml/2.0/interpolationType/InstantTotal */ InstantTotal("Instantaneous Total"), /** - * Average in preceding interval - * http://www.opengis.net/def/waterml/2.0/interpolationType/AveragePrec + * Average in preceding interval http://www.opengis.net/def/waterml/2.0/interpolationType/AveragePrec */ AveragePrec("Average in Preceding Interval"), /** - * Maximum in preceding interval - * http://www.opengis.net/def/waterml/2.0/interpolationType/MaxPrec + * Maximum in preceding interval http://www.opengis.net/def/waterml/2.0/interpolationType/MaxPrec */ MaxPrec("Maximum in Preceding Interval"), /** - * Minimum in preceding interval - * http://www.opengis.net/def/waterml/2.0/interpolationType/MinPrec + * Minimum in preceding interval http://www.opengis.net/def/waterml/2.0/interpolationType/MinPrec */ MinPrec("Minimum in Preceding Interval"), /** - * Preceding total - * http://www.opengis.net/def/waterml/2.0/interpolationType/TotalPrec + * Preceding total http://www.opengis.net/def/waterml/2.0/interpolationType/TotalPrec */ TotalPrec("Preceding Total"), /** - * Average in succeeding interval - * http://www.opengis.net/def/waterml/2.0/interpolationType/AverageSucc + * Average in succeeding interval http://www.opengis.net/def/waterml/2.0/interpolationType/AverageSucc */ AverageSucc("Average in Succeeding Interval"), /** - * Succeeding total - * http://www.opengis.net/def/waterml/2.0/interpolationType/TotalSucc + * Succeeding total http://www.opengis.net/def/waterml/2.0/interpolationType/TotalSucc */ TotalSucc("Succeeding Total"), /** - * Minimum in succeeding interval - * http://www.opengis.net/def/waterml/2.0/interpolationType/MinSucc + * Minimum in succeeding interval http://www.opengis.net/def/waterml/2.0/interpolationType/MinSucc */ MinSucc("Minimum in Succeeding Interval"), /** - * Maximum in succeeding interval - * http://www.opengis.net/def/waterml/2.0/interpolationType/MaxSucc + * Maximum in succeeding interval http://www.opengis.net/def/waterml/2.0/interpolationType/MaxSucc */ MaxSucc("Maximum in Succeeding Interval"), /** - * Constant in preceding interval - * http://www.opengis.net/def/waterml/2.0/interpolationType/ConstPrec + * Constant in preceding interval http://www.opengis.net/def/waterml/2.0/interpolationType/ConstPrec */ ConstPrec("Constant in Preceding Interval"), /** - * Constant in succeeding interval - * http://www.opengis.net/def/waterml/2.0/interpolationType/ConstSucc + * Constant in succeeding interval http://www.opengis.net/def/waterml/2.0/interpolationType/ConstSucc */ ConstSucc("Constant in Succeeding Interval"), /** - * Statistical - * http://www.opengis.net/def/waterml/2.0/interpolationType/Statistical + * Statistical http://www.opengis.net/def/waterml/2.0/interpolationType/Statistical */ Statistical("Statistical"); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/wml/WmlMonitoringPoint.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/wml/WmlMonitoringPoint.java index 71aaf1105..e9d167f52 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/wml/WmlMonitoringPoint.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/series/wml/WmlMonitoringPoint.java @@ -20,8 +20,7 @@ import org.n52.shetland.ogc.om.series.AbstractMonitoringFeature; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; -public class WmlMonitoringPoint - extends AbstractMonitoringFeature { +public class WmlMonitoringPoint extends AbstractMonitoringFeature { public WmlMonitoringPoint(CodeWithAuthority featureIdentifier) { this(featureIdentifier, null); @@ -33,14 +32,14 @@ public WmlMonitoringPoint(CodeWithAuthority featureIdentifier, String gmlId) { } @Override - public <X> X accept(FeatureOfInterestVisitor<X> visitor) throws OwsExceptionReport { + public < + X> X accept(FeatureOfInterestVisitor<X> visitor) throws OwsExceptionReport { return visitor.visit(this); } @Override public String toString() { - return String.format( - "MonitoringPoint [name=%s, description=%s, xmlDescription=%s, geometry=%s, " + return String.format("MonitoringPoint [name=%s, description=%s, xmlDescription=%s, geometry=%s, " + "featureType=%s, url=%s, sampledFeatures=%s, parameters=%s, encode=%b, relatedSamplingFeatures=%s]", getName(), getDescription(), getXml(), getGeometry(), getFeatureType(), getUrl(), getSampledFeatures(), getParameters(), isEncode(), getRelatedSamplingFeatures()); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/AbstractPofileTrajectoryElement.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/AbstractPofileTrajectoryElement.java index 15bd57056..bd555b4ed 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/AbstractPofileTrajectoryElement.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/AbstractPofileTrajectoryElement.java @@ -21,11 +21,13 @@ import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.gml.time.Time; + import com.google.common.collect.Lists; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -public abstract class AbstractPofileTrajectoryElement<T> { +public abstract class AbstractPofileTrajectoryElement< + T> { private List<Value<?>> value = Lists.newArrayList(); private Geometry location; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/BooleanValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/BooleanValue.java index d7d338f83..a711e1d58 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/BooleanValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/BooleanValue.java @@ -19,7 +19,6 @@ import org.n52.shetland.ogc.om.values.visitor.ValueVisitor; import org.n52.shetland.ogc.swe.simpleType.SweBoolean; - /** * Boolean measurement representation for observation * @@ -44,7 +43,7 @@ public BooleanValue() { * constructor * * @param value - * Measurement value + * Measurement value */ public BooleanValue(Boolean value) { super(); @@ -88,12 +87,13 @@ public boolean isSetUnit() { @Override public String toString() { - return String - .format("BooleanValue [value=%s, unit=%s]", getValue(), getUnit()); + return String.format("BooleanValue [value=%s, unit=%s]", getValue(), getUnit()); } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CategoryValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CategoryValue.java index e2623c313..8fd6fd23d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CategoryValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CategoryValue.java @@ -25,9 +25,7 @@ * @since 1.0.0 * */ -public class CategoryValue - extends SweCategory - implements Value<String> { +public class CategoryValue extends SweCategory implements Value<String> { /** * constructor @@ -109,7 +107,9 @@ public String toString() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ComparableValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ComparableValue.java index 40b6f402c..76b0e6b8d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ComparableValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ComparableValue.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.ogc.om.values; -public interface ComparableValue<T, C extends ComparableValue<T, C>> extends Value<T>, Comparable<C> { +public interface ComparableValue< + T, + C extends ComparableValue<T, C>> extends Value<T>, Comparable<C> { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ComplexValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ComplexValue.java index e3ca2a957..a4799bbda 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ComplexValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ComplexValue.java @@ -25,8 +25,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -public class ComplexValue - implements Value<SweAbstractDataRecord> { +public class ComplexValue implements Value<SweAbstractDataRecord> { private SweAbstractDataRecord value; private UoM unit; @@ -83,10 +82,7 @@ public UoM getUnitObject() { @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("value", this.value) - .add("unit", this.unit) - .toString(); + return MoreObjects.toStringHelper(this).add("value", this.value).add("unit", this.unit).toString(); } @Override @@ -106,12 +102,13 @@ public boolean equals(Object obj) { return false; } final ComplexValue other = (ComplexValue) obj; - return Objects.equals(this.value, other.value) && - Objects.equals(this.unit, other.unit); + return Objects.equals(this.value, other.value) && Objects.equals(this.unit, other.unit); } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CountValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CountValue.java index c4b28c3f0..1c8453651 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CountValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CountValue.java @@ -25,9 +25,7 @@ * @since 1.0.0 * */ -public class CountValue - extends SweCount - implements Value<Integer> { +public class CountValue extends SweCount implements Value<Integer> { /** * Unit of measure */ @@ -87,7 +85,9 @@ public String toString() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CvDiscretePointCoverage.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CvDiscretePointCoverage.java index bbf8cfe6b..ce9fdac59 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CvDiscretePointCoverage.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/CvDiscretePointCoverage.java @@ -32,8 +32,7 @@ * @since 1.0.0 * */ -public class CvDiscretePointCoverage - implements Value<PointValuePair> { +public class CvDiscretePointCoverage implements Value<PointValuePair> { private static final String GML_ID_PREFIX = "dpc_"; private final String gmlId; @@ -133,7 +132,9 @@ public UoM getUnitObject() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/DiscreteCoverage.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/DiscreteCoverage.java index 176fc5a2a..a55c1ce86 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/DiscreteCoverage.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/DiscreteCoverage.java @@ -26,8 +26,8 @@ * @param <T> * Value tpe */ -public interface DiscreteCoverage<T> - extends Value<T> { +public interface DiscreteCoverage< + T> extends Value<T> { String getGmlId(); @@ -39,7 +39,8 @@ public interface DiscreteCoverage<T> String getRangeParameters(); /** - * @param rangeParameters the rangeParameters to set + * @param rangeParameters + * the rangeParameters to set */ void setRangeParameters(String rangeParameters); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/GeometryValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/GeometryValue.java index 603e35155..5c7160366 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/GeometryValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/GeometryValue.java @@ -27,9 +27,7 @@ * @since 1.0.0 * */ -public class GeometryValue - extends AbstractGeometry - implements Value<Geometry> { +public class GeometryValue extends AbstractGeometry implements Value<Geometry> { private static final String GML_ID_PREFIX = "sp_"; /** * Unit of measure @@ -104,7 +102,9 @@ public boolean isSetValue() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/HrefAttributeValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/HrefAttributeValue.java index 0bcf529ee..c073742b3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/HrefAttributeValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/HrefAttributeValue.java @@ -19,8 +19,7 @@ import org.n52.shetland.ogc.om.values.visitor.ValueVisitor; import org.n52.shetland.w3c.xlink.W3CHrefAttribute; -public class HrefAttributeValue - implements Value<W3CHrefAttribute> { +public class HrefAttributeValue implements Value<W3CHrefAttribute> { private W3CHrefAttribute value; @@ -82,7 +81,9 @@ public String toString() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/MultiPointCoverage.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/MultiPointCoverage.java index a70d23c97..7d4d266d9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/MultiPointCoverage.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/MultiPointCoverage.java @@ -98,7 +98,7 @@ public MultiPointCoverage setValue(List<PointValuePair> value) { * * @param value * Time value pair value to add - * @return + * @return this */ public MultiPointCoverage addValue(PointValuePair value) { if (value != null) { @@ -112,7 +112,7 @@ public MultiPointCoverage addValue(PointValuePair value) { * * @param values * Time value pair values to add - * @return + * @return this */ public MultiPointCoverage addValues(Collection<PointValuePair> values) { if (value != null) { @@ -198,7 +198,9 @@ public boolean isSetRangeParameters() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/MultiValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/MultiValue.java index 026acdadd..7a5525ee5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/MultiValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/MultiValue.java @@ -25,7 +25,8 @@ * @param <T> * type of the multi value */ -public interface MultiValue<T> extends Value<T> { +public interface MultiValue< + T> extends Value<T> { /** * Get the phenomenon time for the multiple values diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/NilTemplateValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/NilTemplateValue.java index f75ef38ec..f32a78fc2 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/NilTemplateValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/NilTemplateValue.java @@ -24,8 +24,7 @@ * @since 1.0.0 * */ -public class NilTemplateValue - implements Value<String> { +public class NilTemplateValue implements Value<String> { /** * Unit of measure @@ -77,7 +76,9 @@ public boolean isSetValue() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } } \ No newline at end of file diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java index e99c343d4..ebb58f734 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileLevel.java @@ -39,8 +39,7 @@ * @since 1.0.0 * */ -public class ProfileLevel extends AbstractPofileTrajectoryElement<ProfileLevel> - implements Comparable<ProfileLevel> { +public class ProfileLevel extends AbstractPofileTrajectoryElement<ProfileLevel> implements Comparable<ProfileLevel> { private QuantityValue levelStart; private QuantityValue levelEnd; @@ -115,7 +114,6 @@ public boolean isSetLevelEnd() { return getLevelEnd() != null; } - @Override public int compareTo(ProfileLevel o) { if (o == null) { @@ -214,7 +212,8 @@ public Collection<NamedValue<?>> getLevelStartEndAsParameter() { return parameter; } - public <X> Collection<X> accept(ProfileLevelVisitor<X> visitor) throws OwsExceptionReport { + public < + X> Collection<X> accept(ProfileLevelVisitor<X> visitor) throws OwsExceptionReport { return visitor.visit(this); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileValue.java index 4b0911621..bf5e8bd96 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ProfileValue.java @@ -242,7 +242,9 @@ public String getDefaultElementEncoding() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/QuantityRangeValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/QuantityRangeValue.java index b16042eff..a4dd4f001 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/QuantityRangeValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/QuantityRangeValue.java @@ -36,8 +36,10 @@ public QuantityRangeValue() { /** * Creates a new {@code QuantityRangeValue}. * - * @param rangeStart the start of the range - * @param rangeEnd the end of the range + * @param rangeStart + * the start of the range + * @param rangeEnd + * the end of the range */ public QuantityRangeValue(BigDecimal rangeStart, BigDecimal rangeEnd) { super(); @@ -47,9 +49,12 @@ public QuantityRangeValue(BigDecimal rangeStart, BigDecimal rangeEnd) { /** * Creates a new {@code QuantityRangeValue}. * - * @param rangeStart the start of the range - * @param rangeEnd the end of the range - * @param unit Unit of measure + * @param rangeStart + * the start of the range + * @param rangeEnd + * the end of the range + * @param unit + * Unit of measure */ public QuantityRangeValue(BigDecimal rangeStart, BigDecimal rangeEnd, String unit) { this(rangeStart, rangeEnd); @@ -94,7 +99,9 @@ public String toString() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/QuantityValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/QuantityValue.java index affe2e067..659e38ea5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/QuantityValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/QuantityValue.java @@ -27,9 +27,7 @@ * @since 1.0.0 * */ -public class QuantityValue - extends SweQuantity - implements ComparableValue<BigDecimal, QuantityValue> { +public class QuantityValue extends SweQuantity implements ComparableValue<BigDecimal, QuantityValue> { /** * c @@ -145,7 +143,9 @@ public String toString() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/RectifiedGridCoverage.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/RectifiedGridCoverage.java index 76f76e55a..7e06ca4f6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/RectifiedGridCoverage.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/RectifiedGridCoverage.java @@ -36,8 +36,7 @@ * @since 1.0.0 * */ -public class RectifiedGridCoverage - implements DiscreteCoverage<SortedMap<ComparableValue<?, ?>, Value<?>>> { +public class RectifiedGridCoverage implements DiscreteCoverage<SortedMap<ComparableValue<?, ?>, Value<?>>> { private static final String GML_ID_PREFIX = "rgc_"; private final String gmlId; @@ -127,8 +126,9 @@ public boolean isSetValue() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) - throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ReferenceValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ReferenceValue.java index 6ec70577f..0fe0aefaa 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ReferenceValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/ReferenceValue.java @@ -19,8 +19,7 @@ import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.om.values.visitor.ValueVisitor; -public class ReferenceValue - implements Value<ReferenceType> { +public class ReferenceValue implements Value<ReferenceType> { private ReferenceType value; @@ -82,7 +81,9 @@ public String toString() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/SweDataArrayValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/SweDataArrayValue.java index 0b0982209..142a3e17b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/SweDataArrayValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/SweDataArrayValue.java @@ -45,8 +45,7 @@ * @since 1.0.0 * */ -public class SweDataArrayValue - implements MultiValue<SweDataArray> { +public class SweDataArrayValue implements MultiValue<SweDataArray> { private static final Logger LOGGER = LoggerFactory.getLogger(SweDataArrayValue.class); /** @@ -102,8 +101,7 @@ public UoM getUnitObject() { } /** - * Adds the given block - a {@link List}<{@link String}> - add the end of - * the current list of blocks + * Adds the given block - a {@link List}<{@link String}> - add the end of the current list of blocks * * @param blockOfTokensToAddAtTheEnd * @@ -184,7 +182,9 @@ public boolean isSetValue() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TLVTValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TLVTValue.java index 1e62aef3b..625c58426 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TLVTValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TLVTValue.java @@ -64,7 +64,7 @@ public List<TimeLocationValueTriple> getValue() { * * @param value * Time value pair value to add - * @return + * @return this */ public TLVTValue addValue(TimeLocationValueTriple value) { if (value != null) { @@ -78,7 +78,7 @@ public TLVTValue addValue(TimeLocationValueTriple value) { * * @param values * Time value pair values to add - * @return + * @return this */ public TLVTValue addValues(List<TimeLocationValueTriple> values) { if (values != null) { @@ -128,7 +128,9 @@ public boolean isSetValue() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TVPValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TVPValue.java index 82234b6c1..53a77c01f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TVPValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TVPValue.java @@ -65,7 +65,7 @@ public List<TimeValuePair> getValue() { * * @param value * Time value pair value to add - * @return + * @return this */ public TVPValue addValue(TimeValuePair value) { if (value != null) { @@ -79,7 +79,7 @@ public TVPValue addValue(TimeValuePair value) { * * @param values * Time value pair values to add - * @return + * @return this */ public TVPValue addValues(Collection<TimeValuePair> values) { if (values != null) { @@ -129,7 +129,9 @@ public boolean isSetValue() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TextValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TextValue.java index cdd7a265d..903854231 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TextValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TextValue.java @@ -27,9 +27,7 @@ * @since 1.0.0 * */ -public class TextValue - extends SweText - implements Value<String> { +public class TextValue extends SweText implements Value<String> { /** * Unit of measure */ @@ -106,7 +104,9 @@ public boolean isSetValue() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TimeRangeValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TimeRangeValue.java index 6158fb501..c57a7e043 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TimeRangeValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TimeRangeValue.java @@ -26,9 +26,7 @@ * * @author Christian Autermann */ -public class TimeRangeValue - extends SweTimeRange - implements Value<RangeValue<DateTime>> { +public class TimeRangeValue extends SweTimeRange implements Value<RangeValue<DateTime>> { /** * constructor @@ -109,7 +107,9 @@ public String toString() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TimeValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TimeValue.java index 8a06f1c54..5037a1169 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TimeValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TimeValue.java @@ -102,7 +102,9 @@ public String toString() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryElement.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryElement.java index 3c406e4b4..dbf8fb40e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryElement.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryElement.java @@ -50,8 +50,7 @@ public int compareTo(TrajectoryElement o) { if (getPhenomenonTime() == null && o.getPhenomenonTime() == null) { return 0; } - return this.getPhenomenonTime() - .equals(o.getPhenomenonTime()) ? 0 : 1; + return this.getPhenomenonTime().equals(o.getPhenomenonTime()) ? 0 : 1; } @Override @@ -82,7 +81,8 @@ public int hashCode() { return hash; } - public <X> Collection<X> accept(TrajectoryElementVisitor<X> visitor) throws OwsExceptionReport { + public < + X> Collection<X> accept(TrajectoryElementVisitor<X> visitor) throws OwsExceptionReport { return visitor.visit(this); } @@ -101,8 +101,7 @@ public SweDataRecord valueAsDataRecord(SweDataRecord dataRecord) { SweAbstractDataComponent adc = (SweAbstractDataComponent) v; String name; if (adc.isSetName()) { - name = adc.getName() - .getValue(); + name = adc.getName().getValue(); } else if (adc.isSetDefinition()) { name = adc.getDefinition(); } else { @@ -111,18 +110,11 @@ public SweDataRecord valueAsDataRecord(SweDataRecord dataRecord) { dataRecord.addField(new SweField(name, adc)); } } - if (counter == 1 && dataRecord.getFields() - .size() > 1 && dataRecord.getFields() - .stream() - .map(f -> f.getName() - .getValue()) - .collect(Collectors.toSet()) - .size() != dataRecord.getFields() - .size()) { + if (counter == 1 && dataRecord.getFields().size() > 1 + && dataRecord.getFields().stream().map(f -> f.getName().getValue()).collect(Collectors.toSet()) + .size() != dataRecord.getFields().size()) { for (SweField field : dataRecord.getFields()) { - field.getName() - .setValue(field.getName() - .getValue() + "_" + counter++); + field.getName().setValue(field.getName().getValue() + "_" + counter++); } } return dataRecord; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryValue.java index c0dcff09a..030ebf9d0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/TrajectoryValue.java @@ -101,7 +101,9 @@ public String getUnit() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/UnknownValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/UnknownValue.java index 44db2822b..bb7bd1bf5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/UnknownValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/UnknownValue.java @@ -24,8 +24,7 @@ * @since 1.0.0 * */ -public class UnknownValue - implements Value<Object> { +public class UnknownValue implements Value<Object> { /** * Measurement @@ -88,7 +87,9 @@ public String toString() { } @Override - public <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { + public < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E { return visitor.visit(this); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/Value.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/Value.java index 8c676e292..304e93357 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/Value.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/Value.java @@ -15,7 +15,6 @@ */ package org.n52.shetland.ogc.om.values; - import org.n52.shetland.ogc.UoM; import org.n52.shetland.ogc.om.values.visitor.ValueVisitor; @@ -27,13 +26,14 @@ * @param <T> * specific value type */ -public interface Value<T> { +public interface Value< + T> { /** * Set the measurment value * * @param value - * Value to set + * Value to set */ Value<T> setValue(T value); @@ -92,6 +92,8 @@ default boolean isSetUnit() { return getUnitObject() != null && !getUnitObject().isEmpty(); } - <X, E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E; + < + X, + E extends Exception> X accept(ValueVisitor<X, E> visitor) throws E; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/XmlValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/XmlValue.java index 7f3027012..b20651fb0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/XmlValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/XmlValue.java @@ -15,7 +15,7 @@ */ package org.n52.shetland.ogc.om.values; -public interface XmlValue<T> - extends Value<T> { +public interface XmlValue< + T> extends Value<T> { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ProfileLevelVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ProfileLevelVisitor.java index 6e826c291..b697f710e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ProfileLevelVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ProfileLevelVisitor.java @@ -20,8 +20,8 @@ import org.n52.shetland.ogc.om.values.ProfileLevel; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; -public interface ProfileLevelVisitor<T> { +public interface ProfileLevelVisitor< + T> { - Collection<T> visit(ProfileLevel value) - throws OwsExceptionReport; + Collection<T> visit(ProfileLevel value) throws OwsExceptionReport; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/TrajectoryElementVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/TrajectoryElementVisitor.java index 0e0f2f210..6dd490bd8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/TrajectoryElementVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/TrajectoryElementVisitor.java @@ -20,8 +20,8 @@ import org.n52.shetland.ogc.om.values.TrajectoryElement; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; -public interface TrajectoryElementVisitor<T> { +public interface TrajectoryElementVisitor< + T> { - Collection<T> visit(TrajectoryElement value) - throws OwsExceptionReport; + Collection<T> visit(TrajectoryElement value) throws OwsExceptionReport; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java index 31fe1fd05..b7742c295 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/ValueVisitor.java @@ -43,77 +43,58 @@ * TODO JavaDoc * * @author Christian Autermann - * @param <T> the return type - * @param <X> the exception type + * @param <T> + * the return type + * @param <X> + * the exception type */ -public interface ValueVisitor<T, X extends Exception> { - T visit(BooleanValue value) - throws X; +public interface ValueVisitor< + T, + X extends Exception> { + T visit(BooleanValue value) throws X; - T visit(CategoryValue value) - throws X; + T visit(CategoryValue value) throws X; - T visit(ComplexValue value) - throws X; + T visit(ComplexValue value) throws X; - T visit(CountValue value) - throws X; + T visit(CountValue value) throws X; - T visit(GeometryValue value) - throws X; + T visit(GeometryValue value) throws X; - T visit(HrefAttributeValue value) - throws X; + T visit(HrefAttributeValue value) throws X; - T visit(NilTemplateValue value) - throws X; + T visit(NilTemplateValue value) throws X; - T visit(QuantityValue value) - throws X; + T visit(QuantityValue value) throws X; - T visit(QuantityRangeValue value) - throws X; + T visit(QuantityRangeValue value) throws X; - T visit(ReferenceValue value) - throws X; + T visit(ReferenceValue value) throws X; - T visit(SweDataArrayValue value) - throws X; + T visit(SweDataArrayValue value) throws X; - T visit(TVPValue value) - throws X; + T visit(TVPValue value) throws X; - T visit(TLVTValue value) - throws X; + T visit(TLVTValue value) throws X; - T visit(TextValue value) - throws X; + T visit(TextValue value) throws X; - T visit(CvDiscretePointCoverage value) - throws X; + T visit(CvDiscretePointCoverage value) throws X; - T visit(MultiPointCoverage value) - throws X; + T visit(MultiPointCoverage value) throws X; - T visit(RectifiedGridCoverage value) - throws X; + T visit(RectifiedGridCoverage value) throws X; - T visit(ProfileValue value) - throws X; + T visit(ProfileValue value) throws X; - T visit(TrajectoryValue value) - throws X; + T visit(TrajectoryValue value) throws X; - T visit(UnknownValue value) - throws X; + T visit(UnknownValue value) throws X; - T visit(TimeValue value) - throws X; + T visit(TimeValue value) throws X; - T visit(TimeRangeValue value) - throws X; + T visit(TimeRangeValue value) throws X; - T visit(XmlValue<?> value) - throws X; + T visit(XmlValue<?> value) throws X; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/VoidValueVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/VoidValueVisitor.java index a954f57f4..6f16f4b29 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/VoidValueVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/visitor/VoidValueVisitor.java @@ -36,156 +36,126 @@ * * @author Christian Autermann */ -public abstract class VoidValueVisitor<E extends Exception> - implements ValueVisitor<Void, E> { +public abstract class VoidValueVisitor< + E extends Exception> implements ValueVisitor<Void, E> { @Override - public Void visit(BooleanValue value) - throws E { + public Void visit(BooleanValue value) throws E { _visit(value); return null; } @Override - public Void visit(CategoryValue value) - throws E { + public Void visit(CategoryValue value) throws E { _visit(value); return null; } @Override - public Void visit(ComplexValue value) - throws E { + public Void visit(ComplexValue value) throws E { _visit(value); return null; } @Override - public Void visit(CountValue value) - throws E { + public Void visit(CountValue value) throws E { _visit(value); return null; } @Override - public Void visit(GeometryValue value) - throws E { + public Void visit(GeometryValue value) throws E { _visit(value); return null; } @Override - public Void visit(HrefAttributeValue value) - throws E { + public Void visit(HrefAttributeValue value) throws E { _visit(value); return null; } @Override - public Void visit(NilTemplateValue value) - throws E { + public Void visit(NilTemplateValue value) throws E { _visit(value); return null; } @Override - public Void visit(QuantityValue value) - throws E { + public Void visit(QuantityValue value) throws E { _visit(value); return null; } @Override - public Void visit(ReferenceValue value) - throws E { + public Void visit(ReferenceValue value) throws E { _visit(value); return null; } @Override - public Void visit(SweDataArrayValue value) - throws E { + public Void visit(SweDataArrayValue value) throws E { _visit(value); return null; } @Override - public Void visit(TVPValue value) - throws E { + public Void visit(TVPValue value) throws E { _visit(value); return null; } @Override - public Void visit(TLVTValue value) - throws E { + public Void visit(TLVTValue value) throws E { _visit(value); return null; } @Override - public Void visit(TextValue value) - throws E { + public Void visit(TextValue value) throws E { _visit(value); return null; } @Override - public Void visit(UnknownValue value) - throws E { + public Void visit(UnknownValue value) throws E { _visit(value); return null; } @Override - public Void visit(XmlValue<?> value) - throws E { + public Void visit(XmlValue<?> value) throws E { _visit(value); return null; } - protected abstract void _visit(BooleanValue value) - throws E; + protected abstract void _visit(BooleanValue value) throws E; - protected abstract void _visit(CategoryValue value) - throws E; + protected abstract void _visit(CategoryValue value) throws E; - protected abstract void _visit(ComplexValue value) - throws E; + protected abstract void _visit(ComplexValue value) throws E; - protected abstract void _visit(CountValue value) - throws E; + protected abstract void _visit(CountValue value) throws E; - protected abstract void _visit(GeometryValue value) - throws E; + protected abstract void _visit(GeometryValue value) throws E; - protected abstract void _visit(HrefAttributeValue value) - throws E; + protected abstract void _visit(HrefAttributeValue value) throws E; - protected abstract void _visit(NilTemplateValue value) - throws E; + protected abstract void _visit(NilTemplateValue value) throws E; - protected abstract void _visit(QuantityValue value) - throws E; + protected abstract void _visit(QuantityValue value) throws E; - protected abstract void _visit(ReferenceValue value) - throws E; + protected abstract void _visit(ReferenceValue value) throws E; - protected abstract void _visit(SweDataArrayValue value) - throws E; + protected abstract void _visit(SweDataArrayValue value) throws E; - protected abstract void _visit(TVPValue value) - throws E; + protected abstract void _visit(TVPValue value) throws E; - protected abstract void _visit(TLVTValue value) - throws E; + protected abstract void _visit(TLVTValue value) throws E; - protected abstract void _visit(TextValue value) - throws E; + protected abstract void _visit(TextValue value) throws E; - protected abstract void _visit(UnknownValue value) - throws E; + protected abstract void _visit(UnknownValue value) throws E; - protected abstract void _visit(XmlValue<?> value) - throws E; + protected abstract void _visit(XmlValue<?> value) throws E; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/Enums.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/Enums.java index 0fce73002..2c74b7f80 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/Enums.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/Enums.java @@ -33,7 +33,6 @@ */ public final class Enums { - private static final Map<Class<? extends Enum<?>>, Map<String, Enum<?>>> NAMES = new HashMap<>(); private Enums() { @@ -48,14 +47,16 @@ private static Map<String, Enum<?>> getNamesForEnum(Class<? extends Enum<?>> enu return stream.collect(collector); } - static <E extends Enum<E>> boolean contains(Class<? extends E> enumClass, String string) { + static < + E extends Enum<E>> boolean contains(Class<? extends E> enumClass, String string) { return fromString(enumClass, string).isPresent(); } @SuppressWarnings(value = "unchecked") - static <E extends Enum<E>> Optional<E> fromString(Class<? extends E> enumClass, String string) { - return Optional.ofNullable((E) NAMES.computeIfAbsent(enumClass, Enums::getNamesForEnum) - .get(string.toLowerCase(Locale.ROOT))); + static < + E extends Enum<E>> Optional<E> fromString(Class<? extends E> enumClass, String string) { + return Optional.ofNullable( + (E) NAMES.computeIfAbsent(enumClass, Enums::getNamesForEnum).get(string.toLowerCase(Locale.ROOT))); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/HasExtension.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/HasExtension.java index e58427ce4..3d5bb903a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/HasExtension.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/HasExtension.java @@ -31,9 +31,11 @@ * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 1.0.0 * - * @param <T> Extension type + * @param <T> + * Extension type */ -public interface HasExtension<T extends HasExtension<? extends T>> { +public interface HasExtension< + T extends HasExtension<? extends T>> { /** * Get the {@link Extension}s * @@ -44,7 +46,8 @@ public interface HasExtension<T extends HasExtension<? extends T>> { /** * Set the {@link Extensions} object * - * @param extensions the {@link Extensions} object to set + * @param extensions + * the {@link Extensions} object to set * * @return this */ @@ -53,7 +56,8 @@ public interface HasExtension<T extends HasExtension<? extends T>> { /** * Add a {@link Extensions} to this object * - * @param extensions the {@link Extensions} to add + * @param extensions + * the {@link Extensions} to add * * @return this */ @@ -66,7 +70,8 @@ default T addExtensions(Extensions extensions) { /** * Add a {@link Extension} to this object * - * @param extension the {@link Extension} to add + * @param extension + * the {@link Extension} to add * * @return this */ @@ -79,7 +84,8 @@ default T addExtension(Extension<?> extension) { /** * Add a {@link Extension}s to this object * - * @param extensions the {@link Extension}s to add + * @param extensions + * the {@link Extension}s to add * * @return this */ @@ -96,10 +102,10 @@ default boolean hasExtensions() { /** * Check if {@link Extension} for identifier is set * - * @param identifier Identifier to check + * @param identifier + * Identifier to check * - * @return <code>true</code>, if {@link Extensions} is available for the - * identifier + * @return <code>true</code>, if {@link Extensions} is available for the identifier */ default boolean hasExtension(Enum<?> identifier) { return getExtensions().containsExtension(identifier); @@ -108,10 +114,10 @@ default boolean hasExtension(Enum<?> identifier) { /** * Check if {@link Extension} for identifier is set * - * @param identifier Identifier to check + * @param identifier + * Identifier to check * - * @return <code>true</code>, if {@link Extensions} is available for the - * identifier + * @return <code>true</code>, if {@link Extensions} is available for the identifier */ default boolean hasExtension(String identifier) { return getExtensions().containsExtension(identifier); @@ -120,7 +126,8 @@ default boolean hasExtension(String identifier) { /** * Get {@link Extension} for identifier * - * @param identifier Identifier to get {@link Extension} for + * @param identifier + * Identifier to get {@link Extension} for * * @return The requested {@link Extension} * @@ -132,7 +139,8 @@ default Optional<Extension<?>> getExtension(Enum<?> identifier) { /** * Get {@link Extension} for identifier * - * @param identifier Identifier to get {@link Extension} for + * @param identifier + * Identifier to get {@link Extension} for * * @return The requested {@link Extension} * @@ -141,7 +149,6 @@ default Optional<Extension<?>> getExtension(String identifier) { return getExtensions().getExtension(identifier); } - default int getExtensionCount(String identifier) { return getExtensions().countExtensions(identifier); } @@ -162,7 +169,8 @@ default boolean getBooleanExtension(String identifier, boolean defaultValue) { return getExtensions().getBooleanExtension(identifier, defaultValue); } - default <V extends SweAbstractDataComponent> void addSwesExtension(String name, V value) { + default < + V extends SweAbstractDataComponent> void addSwesExtension(String name, V value) { SwesExtension<V> extension = new SwesExtension<V>(); extension.setIdentifier(name); extension.setValue(value); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OWSConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OWSConstants.java index b72bb042b..73370b684 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OWSConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OWSConstants.java @@ -54,11 +54,11 @@ public interface OWSConstants { String SOAP_REASON_INVALID_UPDATE_SEQUENCES = "The value of the updateSequence parameter in the GetCapabilities operation request " - + "was greater than the current value of the service metadata updateSequence number."; + + "was greater than the current value of the service metadata updateSequence number."; String SOAP_REASON_MISSING_PARAMETER_VALUE = "The request did not include a value for a required parameter and this server " - + "does not declare a default value for it."; + + "does not declare a default value for it."; String SOAP_REASON_NO_APPLICABLE_CODE = "A server exception was encountered."; @@ -74,7 +74,7 @@ public interface OWSConstants { String SOAP_REASON_VERSION_NEGOTIATION_FAILED = "The list of versions in the ‘AcceptVersions’ parameter value of the GetCapabilities operation " - + "request did not include any version supported by this server."; + + "request did not include any version supported by this server."; String SOAP_REASON_UNKNOWN = SOAP_REASON_NO_APPLICABLE_CODE; @@ -111,8 +111,7 @@ enum GetCapabilitiesParams { public static final String DYNAMIC_CAPABILITIES_IDENTIFIER = "dynamic"; /** - * Check if the supplied string represents a constant of this - * enumeration. + * Check if the supplied string represents a constant of this enumeration. * * @param string * the string value @@ -124,8 +123,7 @@ public static boolean contains(String string) { } /** - * Get the corresponding enum constant for the supplied string - * representation. + * Get the corresponding enum constant for the supplied string representation. * * @param string * the string value @@ -147,8 +145,7 @@ enum CapabilitiesSection { Contents; /** - * Check if the supplied string represents a constant of this - * enumeration. + * Check if the supplied string represents a constant of this enumeration. * * @param string * the string value @@ -160,8 +157,7 @@ public static boolean contains(String string) { } /** - * Get the corresponding enum constant for the supplied string - * representation. + * Get the corresponding enum constant for the supplied string representation. * * @param string * the string value @@ -174,8 +170,7 @@ public static Optional<CapabilitiesSection> from(String string) { } /** - * the names of the operations supported by all versions of the service - * specification + * the names of the operations supported by all versions of the service specification */ enum Operations { GetCapabilities; @@ -188,8 +183,7 @@ enum RequestParams { version; /** - * Check if the supplied string represents a constant of this - * enumeration. + * Check if the supplied string represents a constant of this enumeration. * * @param string * the string value @@ -201,8 +195,7 @@ public static boolean contains(String string) { } /** - * Get the corresponding enum constant for the supplied string - * representation. + * Get the corresponding enum constant for the supplied string representation. * * @param string * the string value @@ -221,8 +214,7 @@ enum AdditionalRequestParams { returnHumanReadableIdentifier; /** - * Check if the supplied string represents a constant of this - * enumeration. + * Check if the supplied string represents a constant of this enumeration. * * @param string * the string value @@ -234,8 +226,7 @@ public static boolean contains(String string) { } /** - * Get the corresponding enum constant for the supplied string - * representation. + * Get the corresponding enum constant for the supplied string representation. * * @param string * the string value diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsAddress.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsAddress.java index 58a1a0c7c..a53c9936d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsAddress.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsAddress.java @@ -24,6 +24,7 @@ /** * TODO JavaDoc + * * @author Christian Autermann */ public class OwsAddress { @@ -35,27 +36,18 @@ public class OwsAddress { private final Optional<String> country; private final List<String> electronicMailAddress; - public OwsAddress(List<String> deliveryPoint, String city, - String administrativeArea, String postalCode, - String country, List<String> electronicMailAddress) { - this.deliveryPoint - = deliveryPoint == null ? Collections.emptyList() : deliveryPoint; + public OwsAddress(List<String> deliveryPoint, String city, String administrativeArea, String postalCode, + String country, List<String> electronicMailAddress) { + this.deliveryPoint = deliveryPoint == null ? Collections.emptyList() : deliveryPoint; this.city = Optional.ofNullable(Strings.emptyToNull(city)); - this.administrativeArea - = Optional.ofNullable(Strings.emptyToNull(administrativeArea)); + this.administrativeArea = Optional.ofNullable(Strings.emptyToNull(administrativeArea)); this.postalCode = Optional.ofNullable(Strings.emptyToNull(postalCode)); this.country = Optional.ofNullable(Strings.emptyToNull(country)); - this.electronicMailAddress - = electronicMailAddress == null ? Collections.emptyList() - : electronicMailAddress; + this.electronicMailAddress = electronicMailAddress == null ? Collections.emptyList() : electronicMailAddress; } - public OwsAddress(String deliveryPoint, - String city, - String administrativeArea, - String postalCode, - String country, - String electronicMailAddress) { + public OwsAddress(String deliveryPoint, String city, String administrativeArea, String postalCode, String country, + String electronicMailAddress) { this(toList(deliveryPoint), city, administrativeArea, postalCode, country, toList(electronicMailAddress)); } @@ -130,13 +122,13 @@ public boolean equals(Object obj) { @Override public String toString() { - return "OwsAddress{" + "deliveryPoint=" + deliveryPoint + ", city=" + - city + ", administrativeArea=" + administrativeArea + - ", postalCode=" + postalCode + ", country=" + country + - ", electronicMailAddress=" + electronicMailAddress + '}'; + return "OwsAddress{" + "deliveryPoint=" + deliveryPoint + ", city=" + city + ", administrativeArea=" + + administrativeArea + ", postalCode=" + postalCode + ", country=" + country + + ", electronicMailAddress=" + electronicMailAddress + '}'; } - private static <T> List<T> toList(T t) { + private static < + T> List<T> toList(T t) { return Optional.ofNullable(t).map(Collections::singletonList).orElseGet(Collections::emptyList); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsAllowedValues.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsAllowedValues.java index 538455d72..6714e8544 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsAllowedValues.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsAllowedValues.java @@ -65,8 +65,7 @@ public OwsAllowedValues setRestrictions(Iterable<? extends OwsValueRestriction> public OwsAllowedValues setRestrictions(Stream<? extends OwsValueRestriction> restrictions) { if (restrictions != null) { this.restrictions.clear(); - restrictions.map(Objects::requireNonNull) - .forEach(this.restrictions::add); + restrictions.map(Objects::requireNonNull).forEach(this.restrictions::add); } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsBasicIdentification.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsBasicIdentification.java index 71b765294..53832ad73 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsBasicIdentification.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsBasicIdentification.java @@ -29,9 +29,8 @@ public abstract class OwsBasicIdentification extends OwsDescription { private final Optional<OwsCode> identifier; - public OwsBasicIdentification(OwsCode identifier, MultilingualString title, - MultilingualString abstrakt, - Set<OwsKeyword> keywords) { + public OwsBasicIdentification(OwsCode identifier, MultilingualString title, MultilingualString abstrakt, + Set<OwsKeyword> keywords) { super(title, abstrakt, keywords); this.identifier = Optional.ofNullable(identifier); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsCapabilities.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsCapabilities.java index b63aa0fb1..a8931b7c3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsCapabilities.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsCapabilities.java @@ -15,10 +15,6 @@ */ package org.n52.shetland.ogc.ows; -import com.google.common.base.Preconditions; -import com.google.common.base.Strings; -import org.n52.shetland.util.CollectionHelper; - import java.util.Collection; import java.util.Collections; import java.util.Objects; @@ -26,6 +22,11 @@ import java.util.SortedSet; import java.util.TreeSet; +import org.n52.shetland.util.CollectionHelper; + +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; + /** * TODO JavaDoc * @@ -41,14 +42,10 @@ public class OwsCapabilities { private Optional<SortedSet<String>> languages; private SortedSet<OwsCapabilitiesExtension> extensions; - public OwsCapabilities(String service, - String version, - String updateSequence, - OwsServiceIdentification serviceIdentification, - OwsServiceProvider serviceProvider, - OwsOperationsMetadata operationsMetadata, - Collection<String> languages, - Collection<OwsCapabilitiesExtension> extensions) { + public OwsCapabilities(String service, String version, String updateSequence, + OwsServiceIdentification serviceIdentification, OwsServiceProvider serviceProvider, + OwsOperationsMetadata operationsMetadata, Collection<String> languages, + Collection<OwsCapabilitiesExtension> extensions) { this.service = Optional.ofNullable(Strings.emptyToNull(service)); Preconditions.checkArgument(!Objects.requireNonNull(version).isEmpty()); this.version = version; @@ -57,19 +54,13 @@ public OwsCapabilities(String service, this.serviceProvider = Optional.ofNullable(serviceProvider); this.operationsMetadata = Optional.ofNullable(operationsMetadata); this.languages = Optional.ofNullable(languages).map(TreeSet::new); - this.extensions = - Optional.ofNullable(extensions).map(TreeSet::new).orElseGet(TreeSet::new); + this.extensions = Optional.ofNullable(extensions).map(TreeSet::new).orElseGet(TreeSet::new); } public OwsCapabilities(OwsCapabilities other) { - this(other.getService().orElse(null), - other.getVersion(), - other.getUpdateSequence().orElse(null), - other.getServiceIdentification().orElse(null), - other.getServiceProvider().orElse(null), - other.getOperationsMetadata().orElse(null), - other.getLanguages().orElse(null), - other.getExtensions()); + this(other.getService().orElse(null), other.getVersion(), other.getUpdateSequence().orElse(null), + other.getServiceIdentification().orElse(null), other.getServiceProvider().orElse(null), + other.getOperationsMetadata().orElse(null), other.getLanguages().orElse(null), other.getExtensions()); } public String getVersion() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsCapabilitiesExtension.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsCapabilitiesExtension.java index 9c7f0a813..39d3b747a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsCapabilitiesExtension.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsCapabilitiesExtension.java @@ -24,12 +24,12 @@ * */ public interface OwsCapabilitiesExtension extends Comparable<OwsCapabilitiesExtension> { - Comparator<OwsCapabilitiesExtension> COMPARATOR = Comparator - .comparing(OwsCapabilitiesExtension::getSectionName, - Comparator.nullsLast(String::compareTo)); + Comparator<OwsCapabilitiesExtension> COMPARATOR = + Comparator.comparing(OwsCapabilitiesExtension::getSectionName, Comparator.nullsLast(String::compareTo)); /** - * Get the section name if it should be listed in the GetCapabilities OperationMetadata. E.g InsertionCapabilities. + * Get the section name if it should be listed in the GetCapabilities OperationMetadata. E.g + * InsertionCapabilities. * * @return Section name to be listed */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsCode.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsCode.java index 41beb0294..b3756de65 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsCode.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsCode.java @@ -15,17 +15,19 @@ */ package org.n52.shetland.ogc.ows; -import com.google.common.base.MoreObjects; -import com.google.common.base.Strings; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.n52.janmayen.Optionals; - import java.io.Serializable; import java.net.URI; import java.util.Comparator; import java.util.Objects; import java.util.Optional; +import org.n52.janmayen.Optionals; + +import com.google.common.base.MoreObjects; +import com.google.common.base.Strings; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -34,9 +36,8 @@ public class OwsCode implements Comparable<OwsCode>, Serializable { private static final long serialVersionUID = -1884521299174349193L; - private static final Comparator<OwsCode> COMPARATOR - = Comparator.nullsLast(Comparator.comparing(OwsCode::getCodeSpace, Optionals.nullsLast()) - .thenComparing(OwsCode::getValue)); + private static final Comparator<OwsCode> COMPARATOR = Comparator.nullsLast( + Comparator.comparing(OwsCode::getCodeSpace, Optionals.nullsLast()).thenComparing(OwsCode::getValue)); private final String value; private final URI codeSpace; @@ -80,17 +81,14 @@ public boolean equals(Object obj) { return false; } final OwsCode other = (OwsCode) obj; - return Objects.equals(this.getValue(), other.getValue()) && - Objects.equals(this.getCodeSpace(), other.getCodeSpace()); + return Objects.equals(this.getValue(), other.getValue()) + && Objects.equals(this.getCodeSpace(), other.getCodeSpace()); } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .omitNullValues() - .add("value", getValue()) - .add("codeSpace", getCodeSpace().orElse(null)) - .toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("value", getValue()) + .add("codeSpace", getCodeSpace().orElse(null)).toString(); } @Override diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsContact.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsContact.java index 50981f50a..ca7b9739f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsContact.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsContact.java @@ -31,11 +31,8 @@ public class OwsContact { private final Optional<String> hoursOfService; private final Optional<String> contactInstructions; - public OwsContact(OwsPhone phone, - OwsAddress address, - OwsOnlineResource onlineResource, - String hoursOfService, - String contactInstructions) { + public OwsContact(OwsPhone phone, OwsAddress address, OwsOnlineResource onlineResource, String hoursOfService, + String contactInstructions) { this.phone = Optional.ofNullable(phone); this.address = Optional.ofNullable(address); this.onlineResource = Optional.ofNullable(onlineResource); @@ -106,10 +103,8 @@ public boolean equals(Object obj) { @Override public String toString() { - return "OwsContact{" + "phone=" + phone + ", address=" + address + - ", onlineResource=" + onlineResource + ", hoursOfService=" + - hoursOfService + ", contactInstructions=" + contactInstructions + - '}'; + return "OwsContact{" + "phone=" + phone + ", address=" + address + ", onlineResource=" + onlineResource + + ", hoursOfService=" + hoursOfService + ", contactInstructions=" + contactInstructions + '}'; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsDescription.java index 7a6531c64..3fe9fc179 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsDescription.java @@ -30,13 +30,11 @@ */ public abstract class OwsDescription { - private Optional<MultilingualString> title; - private Optional<MultilingualString> abstrakt; - private SortedSet<OwsKeyword> keywords; + private Optional<MultilingualString> title; + private Optional<MultilingualString> abstrakt; + private SortedSet<OwsKeyword> keywords; - public OwsDescription(MultilingualString title, - MultilingualString abstrakt, - Collection<OwsKeyword> keywords) { + public OwsDescription(MultilingualString title, MultilingualString abstrakt, Collection<OwsKeyword> keywords) { this.title = Optional.ofNullable(title); this.abstrakt = Optional.ofNullable(abstrakt); this.keywords = CollectionHelper.newSortedSet(keywords); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsDomain.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsDomain.java index b3cad3832..15796d15e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsDomain.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsDomain.java @@ -15,12 +15,13 @@ */ package org.n52.shetland.ogc.ows; -import com.google.common.base.Strings; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import java.util.Collection; import java.util.Objects; +import com.google.common.base.Strings; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -41,31 +42,19 @@ public OwsDomain(Enum<?> name, OwsPossibleValues possibleValues, OwsValue defaul this(name.toString(), possibleValues, defaultValue, null, null, null, null); } - public OwsDomain(Enum<?> name, - OwsPossibleValues possibleValues, - OwsValue defaultValue, - OwsDomainMetadata meaning, - OwsDomainMetadata dataType, - OwsValuesUnit valuesUnit, - Collection<OwsMetadata> metadata) { + public OwsDomain(Enum<?> name, OwsPossibleValues possibleValues, OwsValue defaultValue, OwsDomainMetadata meaning, + OwsDomainMetadata dataType, OwsValuesUnit valuesUnit, Collection<OwsMetadata> metadata) { this(name.toString(), possibleValues, defaultValue, meaning, dataType, valuesUnit, metadata); } - public OwsDomain(String name, - OwsPossibleValues possibleValues, - OwsValue defaultValue) { + public OwsDomain(String name, OwsPossibleValues possibleValues, OwsValue defaultValue) { this(name, possibleValues, defaultValue, null, null, null, null); } @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE") - public OwsDomain(String name, - OwsPossibleValues possibleValues, - OwsValue defaultValue, - OwsDomainMetadata meaning, - OwsDomainMetadata dataType, - OwsValuesUnit valuesUnit, - Collection<OwsMetadata> metadata) { + public OwsDomain(String name, OwsPossibleValues possibleValues, OwsValue defaultValue, OwsDomainMetadata meaning, + OwsDomainMetadata dataType, OwsValuesUnit valuesUnit, Collection<OwsMetadata> metadata) { super(possibleValues, defaultValue, meaning, dataType, valuesUnit, metadata); this.name = Objects.requireNonNull(Strings.emptyToNull(name), "name"); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsDomainMetadata.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsDomainMetadata.java index 734e1f355..1d8464513 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsDomainMetadata.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsDomainMetadata.java @@ -72,15 +72,13 @@ public boolean equals(Object obj) { return false; } final OwsDomainMetadata that = (OwsDomainMetadata) obj; - return Objects.equals(this.getValue(), that.getValue()) && - Objects.equals(this.getReference(), that.getReference()); + return Objects.equals(this.getValue(), that.getValue()) + && Objects.equals(this.getReference(), that.getReference()); } @Override public String toString() { - return MoreObjects.toStringHelper(this).omitNullValues() - .add("reference", getReference().orElse(null)) - .add("value", getValue().orElse(null)) - .toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("reference", getReference().orElse(null)) + .add("value", getValue().orElse(null)).toString(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsHttp.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsHttp.java index c75bfcb8a..bed8e0f0d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsHttp.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsHttp.java @@ -30,8 +30,7 @@ * * @author Christian Autermann */ -public class OwsHttp - implements OwsDCP { +public class OwsHttp implements OwsDCP { private final SortedSet<OwsRequestMethod> requestMethods; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsKeyword.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsKeyword.java index d4b7f656a..78e10f792 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsKeyword.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsKeyword.java @@ -27,12 +27,10 @@ * @author Christian Autermann */ public class OwsKeyword implements Comparable<OwsKeyword> { - private static final Comparator<OwsKeyword> COMPARATOR - = Comparator.nullsLast(Comparator - .comparing(OwsKeyword::getType, Optionals.nullsLast()) - .thenComparing(OwsKeyword::getKeyword, Comparator - .comparing(OwsLanguageString::getLang, Optionals.nullsLast()) - .thenComparing(OwsLanguageString::getValue))); + private static final Comparator<OwsKeyword> COMPARATOR = + Comparator.nullsLast(Comparator.comparing(OwsKeyword::getType, Optionals.nullsLast()).thenComparing( + OwsKeyword::getKeyword, Comparator.comparing(OwsLanguageString::getLang, Optionals.nullsLast()) + .thenComparing(OwsLanguageString::getValue))); private final OwsLanguageString keyword; private final Optional<OwsCode> type; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsLanguageString.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsLanguageString.java index 917bad45e..9514cf95f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsLanguageString.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsLanguageString.java @@ -15,32 +15,33 @@ */ package org.n52.shetland.ogc.ows; -import com.google.common.base.MoreObjects; -import com.google.common.base.Strings; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.n52.janmayen.Optionals; -import org.n52.janmayen.i18n.LocalizedString; - -import javax.annotation.Nullable; import java.util.Comparator; import java.util.Objects; import java.util.Optional; +import javax.annotation.Nullable; + +import org.n52.janmayen.Optionals; +import org.n52.janmayen.i18n.LocalizedString; + +import com.google.common.base.MoreObjects; +import com.google.common.base.Strings; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * * @author Christian Autermann */ public class OwsLanguageString implements Comparable<OwsLanguageString> { - private static final Comparator<OwsLanguageString> COMPARATOR - = Comparator.nullsLast(Comparator - .comparing(OwsLanguageString::getLang, Optionals.nullsLast()) - .thenComparing(OwsLanguageString::getValue)); + private static final Comparator<OwsLanguageString> COMPARATOR = Comparator.nullsLast(Comparator + .comparing(OwsLanguageString::getLang, Optionals.nullsLast()).thenComparing(OwsLanguageString::getValue)); private final String lang; private final String value; - @SuppressFBWarnings({"NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE", - "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"}) + @SuppressFBWarnings({ "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE", + "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE" }) public OwsLanguageString(@Nullable String lang, String value) { this.lang = Strings.emptyToNull(lang); this.value = Objects.requireNonNull(Strings.emptyToNull(value)); @@ -76,17 +77,13 @@ public boolean equals(Object obj) { return false; } final OwsLanguageString that = (OwsLanguageString) obj; - return Objects.equals(this.lang, that.lang) && - Objects.equals(this.value, that.value); + return Objects.equals(this.lang, that.lang) && Objects.equals(this.value, that.value); } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .omitNullValues() - .add("lang", this.lang) - .add("value", this.value) - .toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("lang", this.lang).add("value", this.value) + .toString(); } @Override diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsMetadata.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsMetadata.java index c3790c72d..6abe6396d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsMetadata.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsMetadata.java @@ -15,19 +15,21 @@ */ package org.n52.shetland.ogc.ows; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.net.URI; +import java.util.Comparator; +import java.util.Objects; +import java.util.Optional; + +import javax.annotation.Nullable; + import org.n52.janmayen.Optionals; import org.n52.shetland.w3c.xlink.Actuate; import org.n52.shetland.w3c.xlink.Link; import org.n52.shetland.w3c.xlink.Show; -import javax.annotation.Nullable; -import java.net.URI; -import java.util.Comparator; -import java.util.Objects; -import java.util.Optional; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; /** * @author Christian Autermann @@ -35,9 +37,9 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) public class OwsMetadata extends Link implements Comparable<OwsMetadata> { - private static final Comparator<OwsMetadata> COMPARATOR - = Comparator.nullsLast(Comparator.comparing(OwsMetadata::getTitle, Optionals.nullsLast()) - .thenComparing(OwsMetadata::getHref, Optionals.nullsLast())); + private static final Comparator<OwsMetadata> COMPARATOR = + Comparator.nullsLast(Comparator.comparing(OwsMetadata::getTitle, Optionals.nullsLast()) + .thenComparing(OwsMetadata::getHref, Optionals.nullsLast())); private static final String ABOUT = "about"; private final Optional<URI> about; @@ -59,13 +61,10 @@ public OwsMetadata(URI href, String title, URI about) { } @JsonCreator - public OwsMetadata(@JsonProperty(HREF) @Nullable URI href, - @JsonProperty(ROLE) @Nullable URI role, - @JsonProperty(ARCROLE) @Nullable URI arcrole, - @JsonProperty(TITLE) @Nullable String title, - @JsonProperty(SHOW) @Nullable Show show, - @JsonProperty(ACTUATE) @Nullable Actuate actuate, - @JsonProperty(ABOUT) @Nullable URI about) { + public OwsMetadata(@JsonProperty(HREF) @Nullable URI href, @JsonProperty(ROLE) @Nullable URI role, + @JsonProperty(ARCROLE) @Nullable URI arcrole, @JsonProperty(TITLE) @Nullable String title, + @JsonProperty(SHOW) @Nullable Show show, @JsonProperty(ACTUATE) @Nullable Actuate actuate, + @JsonProperty(ABOUT) @Nullable URI about) { super(href, role, arcrole, title, show, actuate); this.about = Optional.ofNullable(about); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsNoValues.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsNoValues.java index 9b09c95b8..eb306fd86 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsNoValues.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsNoValues.java @@ -20,8 +20,7 @@ * * @author Christian Autermann */ -public final class OwsNoValues - implements OwsPossibleValues { +public final class OwsNoValues implements OwsPossibleValues { private static final OwsNoValues INSTANCE = new OwsNoValues(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsOnlineResource.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsOnlineResource.java index a7cfbf785..e2d784fe4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsOnlineResource.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsOnlineResource.java @@ -35,8 +35,7 @@ public OwsOnlineResource(URI href, String title) { super(href, title); } - public OwsOnlineResource(URI href, URI role, URI arcrole, String title, - Show show, Actuate actuate) { + public OwsOnlineResource(URI href, URI role, URI arcrole, String title, Show show, Actuate actuate) { super(href, role, arcrole, title, show, actuate); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsOperation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsOperation.java index 406b87240..ca81cfce2 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsOperation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsOperation.java @@ -15,15 +15,17 @@ */ package org.n52.shetland.ogc.ows; -import com.google.common.base.Strings; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.n52.shetland.util.CollectionHelper; - import java.util.Collection; import java.util.Collections; import java.util.Objects; import java.util.SortedSet; +import org.n52.shetland.util.CollectionHelper; + +import com.google.common.base.Strings; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -37,11 +39,8 @@ public class OwsOperation implements Comparable<OwsOperation> { private SortedSet<OwsDCP> dcp; @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE") - public OwsOperation(String name, - Collection<OwsDomain> parameters, - Collection<OwsDomain> constraints, - Collection<OwsMetadata> metadata, - Collection<OwsDCP> dcp) { + public OwsOperation(String name, Collection<OwsDomain> parameters, Collection<OwsDomain> constraints, + Collection<OwsMetadata> metadata, Collection<OwsDCP> dcp) { this.name = Objects.requireNonNull(Strings.emptyToNull(name)); this.parameters = CollectionHelper.newSortedSet(parameters); this.constraints = CollectionHelper.newSortedSet(constraints); @@ -151,9 +150,8 @@ public boolean equals(Object obj) { @Override public String toString() { - return "OwsOperation{" + "name=" + name + ", parameters=" + parameters + - ", constraints=" + constraints + ", metadata=" + metadata + - ", dcp=" + dcp + '}'; + return "OwsOperation{" + "name=" + name + ", parameters=" + parameters + ", constraints=" + constraints + + ", metadata=" + metadata + ", dcp=" + dcp + '}'; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsOperationsMetadata.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsOperationsMetadata.java index eeeca4435..bbb776c59 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsOperationsMetadata.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsOperationsMetadata.java @@ -35,10 +35,8 @@ public class OwsOperationsMetadata { private SortedSet<OwsDomain> constraints; private Optional<OwsOperationMetadataExtension> extension; - public OwsOperationsMetadata(Collection<OwsOperation> operations, - Collection<OwsDomain> parameters, - Collection<OwsDomain> constraints, - OwsOperationMetadataExtension extension) { + public OwsOperationsMetadata(Collection<OwsOperation> operations, Collection<OwsDomain> parameters, + Collection<OwsDomain> constraints, OwsOperationMetadataExtension extension) { this.operations = CollectionHelper.newSortedSet(operations); this.parameters = CollectionHelper.newSortedSet(parameters); this.constraints = CollectionHelper.newSortedSet(constraints); @@ -116,8 +114,7 @@ public boolean equals(Object obj) { @Override public String toString() { - return "OwsOperationsMetadata{" + "operations=" + operations + - ", parameters=" + parameters + ", constraints=" + constraints + - '}'; + return "OwsOperationsMetadata{" + "operations=" + operations + ", parameters=" + parameters + ", constraints=" + + constraints + '}'; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsPhone.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsPhone.java index 10205ae13..1877481a4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsPhone.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsPhone.java @@ -84,10 +84,9 @@ public String toString() { return "OwsPhone{" + "voice=" + voice + ", facsimile=" + facsimile + '}'; } - private static <T> Set<T> toSet(T t) { + private static < + T> Set<T> toSet(T t) { return Optional.ofNullable(t).map(Collections::singleton).orElseGet(Collections::emptySet); } - - } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsRange.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsRange.java index 07fc4328b..48831d300 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsRange.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsRange.java @@ -25,16 +25,14 @@ import com.google.common.base.Strings; /** - * A range of values of a numeric parameter. This range can be continuous or - * discrete, defined by a fixed spacing between adjacent valid values. If the - * MinimumValue or MaximumValue is not included, there is no value limit in that - * direction. Inclusion of the specified minimum and maximum values in the range - * shall be defined by the rangeClosure. + * A range of values of a numeric parameter. This range can be continuous or discrete, defined by a fixed + * spacing between adjacent valid values. If the MinimumValue or MaximumValue is not included, there is no + * value limit in that direction. Inclusion of the specified minimum and maximum values in the range shall be + * defined by the rangeClosure. * * @author Christian Autermann */ -public class OwsRange - implements OwsValueRestriction { +public class OwsRange implements OwsValueRestriction { public static final Comparator<OwsRange> COMPARATOR = Comparator.comparing(OwsRange::getLowerBound, Optionals.nullsFirst()) .thenComparing(Comparator.comparing(OwsRange::getUpperBound, Optionals.nullsLast())); @@ -63,8 +61,7 @@ public OwsRange(OwsValue lowerBound, BoundType lowerBoundType, OwsValue upperBou this(lowerBound, lowerBoundType, upperBound, upperBoundType, null); } - public OwsRange( - OwsValue lowerBound, BoundType lowerBoundType, OwsValue upperBound, BoundType upperBoundType, + public OwsRange(OwsValue lowerBound, BoundType lowerBoundType, OwsValue upperBound, BoundType upperBoundType, OwsValue spacing) { this(new Bound(lowerBoundType, lowerBound), new Bound(upperBoundType, upperBound), spacing); } @@ -211,7 +208,8 @@ public boolean equals(Object obj) { } public enum BoundType { - OPEN('(', ')'), CLOSED('[', ']'); + OPEN('(', ')'), + CLOSED('[', ']'); private final char upper; private final char lower; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsRequestMethod.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsRequestMethod.java index a39c11d70..b4b6439f5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsRequestMethod.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsRequestMethod.java @@ -15,13 +15,6 @@ */ package org.n52.shetland.ogc.ows; -import com.google.common.base.Strings; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.n52.janmayen.Optionals; -import org.n52.shetland.util.CollectionHelper; -import org.n52.shetland.w3c.xlink.Actuate; -import org.n52.shetland.w3c.xlink.Show; - import java.net.URI; import java.util.Collection; import java.util.Collections; @@ -29,16 +22,24 @@ import java.util.Objects; import java.util.SortedSet; +import org.n52.janmayen.Optionals; +import org.n52.shetland.util.CollectionHelper; +import org.n52.shetland.w3c.xlink.Actuate; +import org.n52.shetland.w3c.xlink.Show; + +import com.google.common.base.Strings; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * * @author Christian Autermann */ public class OwsRequestMethod extends OwsOnlineResource implements Comparable<OwsRequestMethod> { - private static final Comparator<OwsRequestMethod> COMPARATOR - = Comparator.nullsLast(Comparator.comparing(OwsRequestMethod::getHttpMethod) - .thenComparing(OwsRequestMethod::getHref, Optionals.nullsLast()) - .thenComparing(OwsRequestMethod::getTitle, Optionals.nullsLast())); + private static final Comparator<OwsRequestMethod> COMPARATOR = Comparator.nullsLast(Comparator + .comparing(OwsRequestMethod::getHttpMethod).thenComparing(OwsRequestMethod::getHref, Optionals.nullsLast()) + .thenComparing(OwsRequestMethod::getTitle, Optionals.nullsLast())); private final SortedSet<OwsDomain> constraints; private final String httpMethod; @@ -48,8 +49,8 @@ public OwsRequestMethod(URI href, String httpMethod, Collection<OwsDomain> const } @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE") - public OwsRequestMethod(URI href, Collection<OwsDomain> constraints, String httpMethod, - URI role, URI arcrole, String title, Show show, Actuate actuate) { + public OwsRequestMethod(URI href, Collection<OwsDomain> constraints, String httpMethod, URI role, URI arcrole, + String title, Show show, Actuate actuate) { super(href, role, arcrole, title, show, actuate); this.httpMethod = Objects.requireNonNull(Strings.emptyToNull(httpMethod)); this.constraints = CollectionHelper.newSortedSet(constraints); @@ -82,14 +83,13 @@ public boolean equals(Object obj) { return false; } final OwsRequestMethod other = (OwsRequestMethod) obj; - return Objects.equals(this.httpMethod, other.httpMethod) && - Objects.equals(this.constraints, other.constraints); + return Objects.equals(this.httpMethod, other.httpMethod) + && Objects.equals(this.constraints, other.constraints); } @Override public String toString() { - return "OwsRequestMethod{" + "constraints=" + constraints + - ", httpMethod=" + httpMethod + '}'; + return "OwsRequestMethod{" + "constraints=" + constraints + ", httpMethod=" + httpMethod + '}'; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsResponsibleParty.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsResponsibleParty.java index 7d54fff51..c01c45bed 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsResponsibleParty.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsResponsibleParty.java @@ -33,9 +33,8 @@ public class OwsResponsibleParty { private final Optional<OwsContact> contactInfo; private final Optional<OwsCode> role; - public OwsResponsibleParty(String individualName, String organisationName, - String positionName, OwsContact contactInfo, - OwsCode role) { + public OwsResponsibleParty(String individualName, String organisationName, String positionName, + OwsContact contactInfo, OwsCode role) { this.individualName = Optional.ofNullable(Strings.emptyToNull(individualName)); this.organisationName = Optional.ofNullable(Strings.emptyToNull(organisationName)); this.positionName = Optional.ofNullable(Strings.emptyToNull(positionName)); @@ -106,11 +105,8 @@ public boolean equals(Object obj) { @Override public String toString() { - return "OwsResponsibleParty{" + "individualName=" + individualName + - ", organisationName=" + organisationName + ", positionName=" + - positionName + ", contactInfo=" + contactInfo + ", role=" + role + - '}'; + return "OwsResponsibleParty{" + "individualName=" + individualName + ", organisationName=" + organisationName + + ", positionName=" + positionName + ", contactInfo=" + contactInfo + ", role=" + role + '}'; } - } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsServiceIdentification.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsServiceIdentification.java index 4769c4f47..573f0c496 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsServiceIdentification.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsServiceIdentification.java @@ -38,14 +38,9 @@ public class OwsServiceIdentification extends OwsDescription { private SortedSet<String> fees; private SortedSet<String> accessConstraints; - public OwsServiceIdentification(OwsCode serviceType, - Set<String> serviceTypeVersion, - Set<URI> profiles, - Set<String> fees, - Set<String> accessConstraints, - MultilingualString title, - MultilingualString abstrakt, - Set<OwsKeyword> keywords) { + public OwsServiceIdentification(OwsCode serviceType, Set<String> serviceTypeVersion, Set<URI> profiles, + Set<String> fees, Set<String> accessConstraints, MultilingualString title, MultilingualString abstrakt, + Set<OwsKeyword> keywords) { super(title, abstrakt, keywords); this.serviceType = Objects.requireNonNull(serviceType); this.serviceTypeVersion = CollectionHelper.newSortedSet(serviceTypeVersion); @@ -134,11 +129,9 @@ public boolean equals(Object obj) { @Override public String toString() { - return "OwsServiceIdentification{" + "serviceType=" + serviceType + - ", serviceTypeVersion=" + serviceTypeVersion + ", profiles=" + - profiles + ", fees=" + fees + ", accessConstraints=" + - accessConstraints + '}'; + return "OwsServiceIdentification{" + "serviceType=" + serviceType + ", serviceTypeVersion=" + + serviceTypeVersion + ", profiles=" + profiles + ", fees=" + fees + ", accessConstraints=" + + accessConstraints + '}'; } - } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsServiceProvider.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsServiceProvider.java index 7bdeba901..c606a1471 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsServiceProvider.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsServiceProvider.java @@ -15,12 +15,13 @@ */ package org.n52.shetland.ogc.ows; -import com.google.common.base.Strings; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import java.util.Objects; import java.util.Optional; +import com.google.common.base.Strings; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -33,9 +34,8 @@ public class OwsServiceProvider { private final OwsResponsibleParty serviceContact; @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE") - public OwsServiceProvider(String providerName, - OwsOnlineResource providerSite, - OwsResponsibleParty serviceContact) { + public OwsServiceProvider(String providerName, OwsOnlineResource providerSite, + OwsResponsibleParty serviceContact) { this.providerName = Objects.requireNonNull(Strings.emptyToNull(providerName)); this.providerSite = Optional.ofNullable(providerSite); this.serviceContact = Objects.requireNonNull(serviceContact); @@ -88,9 +88,8 @@ public boolean equals(Object obj) { @Override public String toString() { - return "OwsServiceProvider{" + "providerName=" + providerName + - ", providerSite=" + providerSite + ", serviceContact=" + - serviceContact + '}'; + return "OwsServiceProvider{" + "providerName=" + providerName + ", providerSite=" + providerSite + + ", serviceContact=" + serviceContact + '}'; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsUnNamedDomain.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsUnNamedDomain.java index 6c37c2c41..a4147d2a7 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsUnNamedDomain.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsUnNamedDomain.java @@ -25,6 +25,7 @@ /** * TODO JavaDoc + * * @author Christian Autermann */ public class OwsUnNamedDomain { @@ -36,12 +37,8 @@ public class OwsUnNamedDomain { private Optional<OwsValuesUnit> valuesUnit; private SortedSet<OwsMetadata> metadata; - public OwsUnNamedDomain(OwsPossibleValues possibleValues, - OwsValue defaultValue, - OwsDomainMetadata meaning, - OwsDomainMetadata dataType, - OwsValuesUnit valuesUnit, - Collection<OwsMetadata> metadata) { + public OwsUnNamedDomain(OwsPossibleValues possibleValues, OwsValue defaultValue, OwsDomainMetadata meaning, + OwsDomainMetadata dataType, OwsValuesUnit valuesUnit, Collection<OwsMetadata> metadata) { this.possibleValues = Objects.requireNonNull(possibleValues, "possibleValues"); this.defaultValue = Optional.ofNullable(defaultValue); this.meaning = Optional.ofNullable(meaning); @@ -145,10 +142,9 @@ public boolean equals(Object obj) { @Override public String toString() { - return "OwsUnNamedDomain{" + "possibleValues=" + possibleValues + - ", defaultValue=" + defaultValue + ", meaning=" + meaning + - ", dataType=" + dataType + ", valuesUnit=" + valuesUnit + - ", metadata=" + metadata + '}'; + return "OwsUnNamedDomain{" + "possibleValues=" + possibleValues + ", defaultValue=" + defaultValue + + ", meaning=" + meaning + ", dataType=" + dataType + ", valuesUnit=" + valuesUnit + ", metadata=" + + metadata + '}'; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValue.java index b6c32eb86..bcd7329d0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValue.java @@ -15,15 +15,15 @@ */ package org.n52.shetland.ogc.ows; -import com.fasterxml.jackson.annotation.JsonValue; -import com.google.common.base.MoreObjects; - import java.util.Comparator; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonValue; +import com.google.common.base.MoreObjects; + /** - * A single value, encoded as a string. This type can be used for one value, for a spacing between allowed values, or - * for the default value of a parameter. + * A single value, encoded as a string. This type can be used for one value, for a spacing between allowed + * values, or for the default value of a parameter. * * @author Christian Autermann */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValueRestriction.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValueRestriction.java index 5e634cbae..62ed84593 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValueRestriction.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValueRestriction.java @@ -24,8 +24,7 @@ * * @author Christian Autermann */ -public interface OwsValueRestriction - extends Comparable<OwsValueRestriction> { +public interface OwsValueRestriction extends Comparable<OwsValueRestriction> { Comparator<OwsValueRestriction> COMPARATOR = Comparator.nullsLast((o1, o2) -> { if (o1.isRange()) { if (o2.isRange()) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValuesReference.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValuesReference.java index 5334a0c8e..f19dd9ff6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValuesReference.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValuesReference.java @@ -25,8 +25,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** - * Reference to externally specified list of all the valid values and/or ranges - * of values for this quantity. + * Reference to externally specified list of all the valid values and/or ranges of values for this quantity. * * @author Christian Autermann */ @@ -60,8 +59,8 @@ public URI getReference() { } /** - * Human-readable name of the list of values provided by the referenced - * document. Can be empty string when this list has no name. + * Human-readable name of the list of values provided by the referenced document. Can be empty string when + * this list has no name. * * @return the value */ @@ -89,14 +88,12 @@ public boolean equals(Object obj) { return false; } final OwsValuesReference other = (OwsValuesReference) obj; - return Objects.equals(this.value, other.value) && - Objects.equals(this.reference, other.reference); + return Objects.equals(this.value, other.value) && Objects.equals(this.reference, other.reference); } @Override public String toString() { - return "OwsValuesReference{" + "reference=" + reference + ", value=" + - value + '}'; + return "OwsValuesReference{" + "reference=" + reference + ", value=" + value + '}'; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValuesUnit.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValuesUnit.java index 6c9ff6088..0cad886c3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValuesUnit.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/OwsValuesUnit.java @@ -51,5 +51,4 @@ public OwsReferenceSystem asReferenceSystem() { throw new UnsupportedOperationException(); } - } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/CodedException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/CodedException.java index 2c416b221..6ee47d039 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/CodedException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/CodedException.java @@ -20,8 +20,7 @@ /** * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/CompositeOwsException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/CompositeOwsException.java index 8e58f0ed3..f336574b0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/CompositeOwsException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/CompositeOwsException.java @@ -34,8 +34,8 @@ import org.n52.janmayen.function.ThrowingRunnable; /** - * Composite {@link OwsExceptionReport} which can contain several - * {@link OwsExceptionReport}s which were thrown + * Composite {@link OwsExceptionReport} which can contain several {@link OwsExceptionReport}s which were + * thrown * * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> * @@ -63,9 +63,7 @@ public final CompositeOwsException addAllOf(CompositeOwsException exceptions) { public final CompositeOwsException add(Collection<? extends OwsExceptionReport> exceptions) { if (exceptions != null) { - exceptions.stream() - .map(OwsExceptionReport::getExceptions) - .forEach(this.exceptions::addAll); + exceptions.stream().map(OwsExceptionReport::getExceptions).forEach(this.exceptions::addAll); if (getCause() == null && !this.exceptions.isEmpty()) { initCause(this.exceptions.get(0)); @@ -109,7 +107,8 @@ public void wrap(ThrowingRunnable<OwsExceptionReport> runnable) { } } - public <T> Optional<T> wrap(ThrowingCallable<T, OwsExceptionReport> runnable) { + public < + T> Optional<T> wrap(ThrowingCallable<T, OwsExceptionReport> runnable) { try { return Optional.ofNullable(runnable.call()); } catch (OwsExceptionReport e) { @@ -118,20 +117,22 @@ public <T> Optional<T> wrap(ThrowingCallable<T, OwsExceptionReport> runnable) { } } - public static <T> Collector<? super T, ?, CompositeOwsException> toCompositeException( - ThrowingConsumer<? super T, ? extends OwsExceptionReport> fun) { + public static < + T> Collector<? super T, ?, CompositeOwsException> toCompositeException( + ThrowingConsumer<? super T, ? extends OwsExceptionReport> fun) { return new ExceptionCollector<>(fun); } - public static <T> void check(Stream<? extends T> stream, - ThrowingConsumer<? super T, ? extends OwsExceptionReport> consumer) - throws OwsExceptionReport { + public static < + T> void check(Stream<? extends T> stream, + ThrowingConsumer<? super T, ? extends OwsExceptionReport> consumer) throws OwsExceptionReport { CompositeOwsException exceptions = new CompositeOwsException(); stream.forEach(t -> exceptions.wrap(() -> consumer.accept(t))); exceptions.throwIfNotEmpty(); } - private static class ExceptionCollector<T> implements Collector<T, CompositeOwsException, CompositeOwsException> { + private static class ExceptionCollector< + T> implements Collector<T, CompositeOwsException, CompositeOwsException> { private final ThrowingConsumer<? super T, ? extends OwsExceptionReport> fun; ExceptionCollector(ThrowingConsumer<? super T, ? extends OwsExceptionReport> fun) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/InvalidParameterValueException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/InvalidParameterValueException.java index 7ed4225b3..716a02323 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/InvalidParameterValueException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/InvalidParameterValueException.java @@ -18,15 +18,14 @@ import org.n52.janmayen.http.HTTPStatus; /** - * Implementation of {@link CodedOwsException} to be used if <p> <i>Operation - * request contains an invalid parameter value.</i> + * Implementation of {@link CodedOwsException} to be used if + * <p> + * <i>Operation request contains an invalid parameter value.</i> * - * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC - * Web Service Common Specification 1.1.0, Table 25 — Standard exception codes and - * meanings</a> + * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC Web Service Common + * Specification 1.1.0, Table 25 — Standard exception codes and meanings</a> * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/InvalidUpdateSequenceException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/InvalidUpdateSequenceException.java index 0b7abd6dc..28bc1de2f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/InvalidUpdateSequenceException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/InvalidUpdateSequenceException.java @@ -18,16 +18,15 @@ import org.n52.janmayen.http.HTTPStatus; /** - * Implementation of {@link CodedOwsException} to be used if <p> <i>Value of - * (optional) updateSequence parameter in GetCapabilities operation request is - * greater than current value of service metadata updateSequence number.</i> + * Implementation of {@link CodedOwsException} to be used if + * <p> + * <i>Value of (optional) updateSequence parameter in GetCapabilities operation request is greater than + * current value of service metadata updateSequence number.</i> * - * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC - * Web Service Common Specification 1.1.0, Table 25 — Standard exception codes and - * meanings</a> + * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC Web Service Common + * Specification 1.1.0, Table 25 — Standard exception codes and meanings</a> * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/MissingParameterValueException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/MissingParameterValueException.java index b186437b6..00817a288 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/MissingParameterValueException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/MissingParameterValueException.java @@ -18,13 +18,13 @@ import org.n52.janmayen.http.HTTPStatus; /** - * Implementation of {@link CodedOwsException} to be used if <p> <i>Operation - * request does not include a parameter value, and this server did not declare a - * default value for that parameter.</i> + * Implementation of {@link CodedOwsException} to be used if + * <p> + * <i>Operation request does not include a parameter value, and this server did not declare a default value + * for that parameter.</i> * - * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC - * Web Service Common Specification 1.1.0, Table 25 — Standard exception codes and - * meanings</a> + * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC Web Service Common + * Specification 1.1.0, Table 25 — Standard exception codes and meanings</a> * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> * * @since 1.0.0 diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/NoApplicableCodeException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/NoApplicableCodeException.java index 4da37d4e2..55e2c4d75 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/NoApplicableCodeException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/NoApplicableCodeException.java @@ -16,13 +16,12 @@ package org.n52.shetland.ogc.ows.exception; /** - * Implementation of {@link CodedOwsException} to be used if <p> <i>No other - * exceptionCode specified by this service and server applies to this - * exception.</i> + * Implementation of {@link CodedOwsException} to be used if + * <p> + * <i>No other exceptionCode specified by this service and server applies to this exception.</i> * - * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC - * Web Service Common Specification 1.1.0, Table 25 — Standard exception codes and - * meanings</a> + * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC Web Service Common + * Specification 1.1.0, Table 25 — Standard exception codes and meanings</a> * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> * * @since 1.0.0 diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OperationNotSupportedException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OperationNotSupportedException.java index 902a110cb..db961382a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OperationNotSupportedException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OperationNotSupportedException.java @@ -16,15 +16,14 @@ package org.n52.shetland.ogc.ows.exception; /** - * Implementation of {@link CodedOwsException} to be used if <p> <i>Request is - * for an operation that is not supported by this server.</i> + * Implementation of {@link CodedOwsException} to be used if + * <p> + * <i>Request is for an operation that is not supported by this server.</i> * - * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC - * Web Service Common Specification 1.1.0, Table 25 — Standard exception codes and - * meanings</a> + * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC Web Service Common + * Specification 1.1.0, Table 25 — Standard exception codes and meanings</a> * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OptionNotSupportedException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OptionNotSupportedException.java index 2a303baf7..9142b6f4c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OptionNotSupportedException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OptionNotSupportedException.java @@ -18,15 +18,14 @@ import org.n52.janmayen.http.HTTPStatus; /** - * Implementation of {@link CodedOwsException} to be used if <p> <i>Request is - * for an option that is not supported by this server.</i> + * Implementation of {@link CodedOwsException} to be used if + * <p> + * <i>Request is for an option that is not supported by this server.</i> * - * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC - * Web Service Common Specification 1.1.0, Table 25 — Standard exception codes and - * meanings</a> + * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC Web Service Common + * Specification 1.1.0, Table 25 — Standard exception codes and meanings</a> * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OwsExceptionCode.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OwsExceptionCode.java index 881155972..eff01c9f1 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OwsExceptionCode.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OwsExceptionCode.java @@ -18,8 +18,7 @@ import org.n52.shetland.ogc.ows.OWSConstants; /** - * ExceptionCodes are defined in - * <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC Web + * ExceptionCodes are defined in <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC Web * Service Common Specification 1.1.0</a>. * * @since 1.0.0 @@ -32,6 +31,7 @@ public enum OwsExceptionCode implements ExceptionCode { OperationNotSupported(OWSConstants.SOAP_REASON_OPTION_NOT_SUPPORTED), OptionNotSupported(OWSConstants.SOAP_REASON_OPERATION_NOT_SUPPORTED), VersionNegotiationFailed(OWSConstants.SOAP_REASON_VERSION_NEGOTIATION_FAILED); + private final String soapFaulReason; OwsExceptionCode(String soapFaultReason) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OwsExceptionReport.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OwsExceptionReport.java index 9c2dff846..475bde86b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OwsExceptionReport.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/OwsExceptionReport.java @@ -22,14 +22,12 @@ import org.n52.shetland.ogc.ows.OWSConstants; /** - * Implementation of the OWS service exception. The exception codes are defined - * according the <a - * href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC Web - * Service Common Specification 1.1.0</a> + * Implementation of the OWS service exception. The exception codes are defined according the + * <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC Web Service Common Specification + * 1.1.0</a> * * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ @@ -107,8 +105,8 @@ public final HTTPStatus getStatus() { } /** - * @return <tt>true</tt>, if a HTTP response code for this - * {@code OwsExceptionReport} or any sub exception is available + * @return <tt>true</tt>, if a HTTP response code for this {@code OwsExceptionReport} or any sub exception + * is available */ public final boolean hasStatus() { return getStatus() != null; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/VersionNegotiationFailedException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/VersionNegotiationFailedException.java index a1d697acd..ce9ae7c63 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/VersionNegotiationFailedException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/exception/VersionNegotiationFailedException.java @@ -18,16 +18,15 @@ import org.n52.janmayen.http.HTTPStatus; /** - * Implementation of {@link CodedOwsException} to be used if <p> <i>List of - * versions in “AcceptVersions” parameter value in GetCapabilities operation - * request did not include any version supported by this server.</i> + * Implementation of {@link CodedOwsException} to be used if + * <p> + * <i>List of versions in “AcceptVersions” parameter value in GetCapabilities operation request did not + * include any version supported by this server.</i> * - * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC - * Web Service Common Specification 1.1.0, Table 25 — Standard exception codes and - * meanings</a> + * @see <a href="http://portal.opengeospatial.org/files/?artifact_id=20040">OGC Web Service Common + * Specification 1.1.0, Table 25 — Standard exception codes and meanings</a> * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/AbstractExtension.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/AbstractExtension.java index c88bdde09..53368d031 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/AbstractExtension.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/AbstractExtension.java @@ -15,8 +15,8 @@ */ package org.n52.shetland.ogc.ows.extension; -public abstract class AbstractExtension<T> - implements Extension<T> { +public abstract class AbstractExtension< + T> implements Extension<T> { private String namespace; private String identifier; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/CapabilitiesExtension.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/CapabilitiesExtension.java index 55a9cae7a..bb5c0c268 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/CapabilitiesExtension.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/CapabilitiesExtension.java @@ -15,8 +15,8 @@ */ package org.n52.shetland.ogc.ows.extension; -public class CapabilitiesExtension<T> - extends AbstractExtension<T> { +public class CapabilitiesExtension< + T> extends AbstractExtension<T> { private T value; @@ -38,5 +38,4 @@ public Extension<T> setValue(T value) { return this; } - } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/Extension.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/Extension.java index 40440aa69..006917378 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/Extension.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/Extension.java @@ -15,7 +15,8 @@ */ package org.n52.shetland.ogc.ows.extension; -public interface Extension<T> { +public interface Extension< + T> { String getNamespace(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/Extensions.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/Extensions.java index e89484782..471970c08 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/Extensions.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/Extensions.java @@ -38,9 +38,7 @@ public boolean addExtension(Extensions extensions) { } public boolean addExtension(Collection<Extension<?>> extensions) { - return extensions.stream() - .map(this::addExtension) - .reduce(false, (ret, changed) -> ret || changed); + return extensions.stream().map(this::addExtension).reduce(false, (ret, changed) -> ret || changed); } public boolean addExtension(Extension<?> extensions) { @@ -61,15 +59,12 @@ public boolean containsExtension(Enum identifier) { } public boolean containsExtension(String identifier) { - return this.extensions.stream() - .filter(e -> checkExtensionName(identifier, e)) - .findAny().isPresent(); + return this.extensions.stream().filter(e -> checkExtensionName(identifier, e)).findAny().isPresent(); } public int countExtensions(String identifier) { - return this.extensions.stream() - .filter(e -> checkExtensionName(identifier, e)) - .collect(Collectors.toSet()).size(); + return this.extensions.stream().filter(e -> checkExtensionName(identifier, e)).collect(Collectors.toSet()) + .size(); } @SuppressWarnings("rawtypes") @@ -78,9 +73,7 @@ public Optional<Extension<?>> getExtension(Enum identifier) { } public Optional<Extension<?>> getExtension(String identifier) { - return this.extensions.stream() - .filter(e -> checkExtensionName(identifier, e)) - .findFirst(); + return this.extensions.stream().filter(e -> checkExtensionName(identifier, e)).findFirst(); } public boolean isEmpty() { @@ -121,9 +114,8 @@ private boolean check(String name, Extension<?> extension, Function<Extension<?> if (Strings.emptyToNull(name) == null || extension == null) { return false; } - return Optional.ofNullable(extractor - .apply(extension)) - .map(s -> s.equalsIgnoreCase(name)).orElseGet(() -> false); + return Optional.ofNullable(extractor.apply(extension)).map(s -> s.equalsIgnoreCase(name)) + .orElseGet(() -> false); } private boolean checkExtensionName(String extensionName, Extension<?> extension) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/MergableExtension.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/MergableExtension.java index bde8dec34..7e93f1490 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/MergableExtension.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/MergableExtension.java @@ -20,9 +20,11 @@ /** * @since 1.0.0 * - * @param <T> Extension type + * @param <T> + * Extension type */ -public interface MergableExtension<T extends MergableExtension<T>> extends OwsCapabilitiesExtension { +public interface MergableExtension< + T extends MergableExtension<T>> extends OwsCapabilitiesExtension { void merge(T t); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/StringBasedCapabilitiesExtension.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/StringBasedCapabilitiesExtension.java index 33d638b0a..61a56a930 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/StringBasedCapabilitiesExtension.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/StringBasedCapabilitiesExtension.java @@ -17,7 +17,6 @@ import org.n52.shetland.ogc.ows.OwsCapabilitiesExtension; -public interface StringBasedCapabilitiesExtension extends OwsCapabilitiesExtension, - StringBasedExtension, - DisableableExtension { +public interface StringBasedCapabilitiesExtension + extends OwsCapabilitiesExtension, StringBasedExtension, DisableableExtension { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/StringBasedExtension.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/StringBasedExtension.java index 69275de6e..9b56d9569 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/StringBasedExtension.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/StringBasedExtension.java @@ -18,8 +18,7 @@ //FIXME should this one replaced by SwesExtension<String> or should // {@link SwesExtension} provide a direct and easy way to get the string represenation of this extension Object? //<!--@deprecated use {@link Encoder.encode(Object).toString()}--> -public interface StringBasedExtension - extends Extension<String> { +public interface StringBasedExtension extends Extension<String> { /** * Get this extension as a String. diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/Value.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/Value.java index 73b29ec35..563ceb658 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/Value.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/extension/Value.java @@ -26,7 +26,9 @@ * @param <S> * Instance type */ -public interface Value<T, S> { +public interface Value< + T, + S> { /** * Get value diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesRequest.java index b58403f1f..16baf99e6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesRequest.java @@ -29,8 +29,7 @@ * * @since 1.0.0 */ -public class GetCapabilitiesRequest - extends OwsServiceRequest { +public class GetCapabilitiesRequest extends OwsServiceRequest { private final List<String> acceptVersions = new LinkedList<>(); private final List<String> sections = new LinkedList<>(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java index 6eaac18b4..6b16a8e6d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java @@ -21,8 +21,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** - * Implementation of {@link OwsServiceResponse} for OWS GetCapabilities - * operation + * Implementation of {@link OwsServiceResponse} for OWS GetCapabilities operation * * @since 1.0.0 * @@ -49,11 +48,11 @@ public OwsCapabilities getCapabilities() { } /** - * Set {@link OwsCapabilities}. Adds service and version from - * {@link OwsCapabilities} to {@link GetCapabilitiesResponse} is missing. + * Set {@link OwsCapabilities}. Adds service and version from {@link OwsCapabilities} to + * {@link GetCapabilitiesResponse} is missing. * * @param capabilities - * {@link OwsCapabilities} to set + * {@link OwsCapabilities} to set * * @return this */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsOperationKey.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsOperationKey.java index a08f0c8b5..d52132cfc 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsOperationKey.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsOperationKey.java @@ -28,10 +28,8 @@ * @since 1.0.0 */ public class OwsOperationKey implements Comparable<OwsOperationKey> { - private static final Comparator<OwsOperationKey> COMPARATOR - = Comparator.comparing(OwsOperationKey::getService) - .thenComparing(OwsOperationKey::getVersion) - .thenComparing(OwsOperationKey::getOperation); + private static final Comparator<OwsOperationKey> COMPARATOR = Comparator.comparing(OwsOperationKey::getService) + .thenComparing(OwsOperationKey::getVersion).thenComparing(OwsOperationKey::getOperation); private final String service; // TODO should be optional because GetCapabilities does not need to have it private final String version; @@ -71,8 +69,8 @@ public String getOperation() { public boolean equals(Object obj) { if (obj != null && getClass() == obj.getClass()) { final OwsOperationKey o = (OwsOperationKey) obj; - return Objects.equal(getService(), o.getService()) && Objects.equal(getVersion(), o.getVersion()) && - Objects.equal(getOperation(), o.getOperation()); + return Objects.equal(getService(), o.getService()) && Objects.equal(getVersion(), o.getVersion()) + && Objects.equal(getOperation(), o.getOperation()); } return false; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceCommunicationObject.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceCommunicationObject.java index f50053fc8..1292ed05c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceCommunicationObject.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceCommunicationObject.java @@ -91,12 +91,10 @@ public boolean isSetVersion() { } /** - * Set service and version from another - * {@link OwsServiceCommunicationObject} + * Set service and version from another {@link OwsServiceCommunicationObject} * * @param object - * The {@link OwsServiceCommunicationObject} to get values - * from + * The {@link OwsServiceCommunicationObject} to get values from * @return this. */ public OwsServiceCommunicationObject set(OwsServiceCommunicationObject object) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceKey.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceKey.java index 6a9db5931..52b650e70 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceKey.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceKey.java @@ -25,17 +25,18 @@ * */ public class OwsServiceKey implements Comparable<OwsServiceKey> { - private static final Comparator<OwsServiceKey> COMPARATOR - = Comparator.comparing(OwsServiceKey::getService) - .thenComparing(OwsServiceKey::getVersion); + private static final Comparator<OwsServiceKey> COMPARATOR = + Comparator.comparing(OwsServiceKey::getService).thenComparing(OwsServiceKey::getVersion); private final String service; private final String version; /** * Constructor * - * @param service Service name - * @param version Service version + * @param service + * Service name + * @param version + * Service version */ public OwsServiceKey(String service, String version) { this.service = service; @@ -87,8 +88,8 @@ public int compareTo(OwsServiceKey other) { public boolean equals(Object o) { if (o != null && o.getClass() == getClass()) { OwsServiceKey other = (OwsServiceKey) o; - return Objects.equals(getService(), other.getService()) && - Objects.equals(getVersion(), other.getVersion()); + return Objects.equals(getService(), other.getService()) + && Objects.equals(getVersion(), other.getVersion()); } return false; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceRequest.java index 14865bf94..c98f0f143 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceRequest.java @@ -38,8 +38,7 @@ * @since 1.0.0 * */ -public abstract class OwsServiceRequest - extends OwsServiceCommunicationObject +public abstract class OwsServiceRequest extends OwsServiceCommunicationObject implements HasExtension<OwsServiceRequest> { private List<OwsServiceKey> serviceOperatorKeyTypes; @@ -58,8 +57,7 @@ public OwsServiceRequest(String service, String version, String operationName) { super(service, version, operationName); } - public List<OwsServiceKey> getServiceOperatorKeys() - throws OwsExceptionReport { + public List<OwsServiceKey> getServiceOperatorKeys() throws OwsExceptionReport { if (serviceOperatorKeyTypes == null) { checkServiceAndVersionParameter(); serviceOperatorKeyTypes = Collections.singletonList(new OwsServiceKey(getService(), getVersion())); @@ -67,8 +65,7 @@ public List<OwsServiceKey> getServiceOperatorKeys() return Collections.unmodifiableList(serviceOperatorKeyTypes); } - private void checkServiceAndVersionParameter() - throws OwsExceptionReport { + private void checkServiceAndVersionParameter() throws OwsExceptionReport { if (!isSetService()) { throw new MissingServiceParameterException(); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceRequestContext.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceRequestContext.java index d65f56745..e004fc4b3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceRequestContext.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceRequestContext.java @@ -24,13 +24,12 @@ import javax.servlet.http.HttpServletRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.janmayen.http.HTTPHeaders; import org.n52.janmayen.http.MediaType; import org.n52.janmayen.net.IPAddress; import org.n52.janmayen.net.ProxyChain; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; @@ -38,8 +37,8 @@ import com.google.common.net.InetAddresses; /** - * Holds information about a user's request that can be evaluated during request - * processing (e.g. security info) + * Holds information about a user's request that can be evaluated during request processing (e.g. security + * info) * * @author <a href="mailto:shane@axiomalaska.com">Shane StClair</a> * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceResponse.java index 9f41d0807..545535d4f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/OwsServiceResponse.java @@ -28,8 +28,7 @@ * * @since 1.0.0 */ -public abstract class OwsServiceResponse - extends OwsServiceCommunicationObject +public abstract class OwsServiceResponse extends OwsServiceCommunicationObject implements HasExtension<OwsServiceResponse>, AutoCloseable { private MediaType contentType; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/ResponseFormat.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/ResponseFormat.java index 607148ff8..a594d00af 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/ResponseFormat.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/ResponseFormat.java @@ -37,7 +37,7 @@ public interface ResponseFormat { * Set response format * * @param responseFormat - * response format + * response format */ void setResponseFormat(String responseFormat); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/VersionedOperationKey.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/VersionedOperationKey.java index 5a75acff4..fbea186a3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/VersionedOperationKey.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/VersionedOperationKey.java @@ -20,9 +20,7 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -public class VersionedOperationKey - extends OwsOperationKey - implements Comparable<OwsOperationKey> { +public class VersionedOperationKey extends OwsOperationKey implements Comparable<OwsOperationKey> { private static final Comparator<VersionedOperationKey> COMPARATOR = Comparator.comparing(VersionedOperationKey::getService).thenComparing(VersionedOperationKey::getVersion) diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractProcess.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractProcess.java index f66d44faa..30a00fbf2 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractProcess.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractProcess.java @@ -58,8 +58,7 @@ public AbstractProcess setDescriptions(Collection<String> descriptions) { public AbstractProcess addDescription(final String description) { if (isSetDescription()) { - setDescription(new StringBuilder(getDescription()).append(", ") - .append(description).toString()); + setDescription(new StringBuilder(getDescription()).append(", ").append(description).toString()); } else { setDescription(description); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractSensorML.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractSensorML.java index 5f397d1bc..3e4adfc71 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractSensorML.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/AbstractSensorML.java @@ -399,7 +399,7 @@ public boolean isSetHistory() { public boolean isSetMobile() { return getSweBooleanFromCapabilitiesFor( - Sets.newHashSet(SensorMLConstants.STATIONARY, SensorMLConstants.MOBILE)) == null ? false : true; + Sets.newHashSet(SensorMLConstants.STATIONARY, SensorMLConstants.MOBILE)) != null; } public boolean getMobile() { @@ -415,8 +415,7 @@ public boolean getMobile() { public boolean isSetInsitu() { return getSweBooleanFromCapabilitiesFor( - Sets.newHashSet(Sets.newHashSet(SensorMLConstants.INSITU, SensorMLConstants.REMOTE))) == null ? false - : true; + Sets.newHashSet(Sets.newHashSet(SensorMLConstants.INSITU, SensorMLConstants.REMOTE))) != null; } public boolean getInsitu() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/HasComponents.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/HasComponents.java index 59e1247dd..c8b7bd82b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/HasComponents.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/HasComponents.java @@ -28,7 +28,8 @@ * @param <T> * Implemented class */ -public interface HasComponents<T> { +public interface HasComponents< + T> { List<SmlComponent> getComponents(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/HasConnections.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/HasConnections.java index b4c6df155..480719dca 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/HasConnections.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/HasConnections.java @@ -17,7 +17,8 @@ import org.n52.shetland.ogc.sensorML.elements.SmlConnection; -public interface HasConnections<T> { +public interface HasConnections< + T> { SmlConnection getConnections(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/HasPosition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/HasPosition.java index d76cbc9fe..1561dce39 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/HasPosition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/HasPosition.java @@ -17,7 +17,8 @@ import org.n52.shetland.ogc.sensorML.elements.SmlPosition; -public interface HasPosition<T> { +public interface HasPosition< + T> { /** * @return the position diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessChain.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessChain.java index 9fa62356b..d6cea350a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessChain.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessChain.java @@ -24,7 +24,8 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -public class ProcessChain extends AbstractProcess implements HasComponents<ProcessChain>, HasConnections<ProcessChain> { +public class ProcessChain extends AbstractProcess + implements HasComponents<ProcessChain>, HasConnections<ProcessChain> { private final List<SmlComponent> components = new ArrayList<>(0); private SmlConnection connections; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessMethod.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessMethod.java index 20f0096c4..a56445492 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessMethod.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/ProcessMethod.java @@ -23,8 +23,7 @@ /** * Implementation for sml:ProcessMethod * - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ @@ -49,8 +48,8 @@ public ProcessMethod(final RulesDefinition rulesDefinition) { } /** - * Text and/or language defining rules for process profile (e.g. inputs, - * outputs, parameters, and metadata) (Source: SensorML 1.0.1) + * Text and/or language defining rules for process profile (e.g. inputs, outputs, parameters, and + * metadata) (Source: SensorML 1.0.1) * * @return SOS rules definition */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/RulesDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/RulesDefinition.java index 7631ce2c8..e55f1cba5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/RulesDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/RulesDefinition.java @@ -18,8 +18,7 @@ /** * Implementation for sml:RulesDefinition * - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ @@ -44,8 +43,7 @@ public boolean isSetDescription() { /** * * @param description - * a {@link String} holding the - * "[t]extual description of the i/o structure" (Source: SensorML + * a {@link String} holding the "[t]extual description of the i/o structure" (Source: SensorML * 1.0.1). * @return the {@link RulesDefinition} object instance */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SensorMLConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SensorMLConstants.java index 9ed534839..a9b83f4ac 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SensorMLConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SensorMLConstants.java @@ -23,8 +23,7 @@ /** * Constants class for SensorML * - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> * @author ShaneStClair @@ -67,8 +66,8 @@ public interface SensorMLConstants { String VERSION_V101 = "1.0.1"; /** - * Name of a SensorML element describing the offerings a procedure/sensor is - * related to or should be inserted into + * Name of a SensorML element describing the offerings a procedure/sensor is related to or should be + * inserted into */ String ELEMENT_NAME_OFFERINGS = "offerings"; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlContact.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlContact.java index a78c45328..b82fd6124 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlContact.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlContact.java @@ -18,8 +18,7 @@ import org.n52.shetland.ogc.gml.AbstractReferenceType; /** - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlContactList.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlContactList.java index c53909646..231522fb6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlContactList.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlContactList.java @@ -53,7 +53,7 @@ public SmlContactList setMembers(Collection<SmlContact> members) { public SmlContactList addMember(SmlContact member) { if (member != null) { - this.members.add(member); + this.members.add(member); } return this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlPerson.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlPerson.java index 986211808..81a3bcce9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlPerson.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/SmlPerson.java @@ -18,8 +18,7 @@ /** * Implementation for sml:Person * - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/System.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/System.java index 29e618e92..a8df006ed 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/System.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/System.java @@ -28,9 +28,7 @@ * @since 1.0.0 * */ -public class System - extends AbstractComponent - implements HasComponents<System>, HasConnections<System> { +public class System extends AbstractComponent implements HasComponents<System>, HasConnections<System> { // private EngineeringCRS spatialReferenceFrame; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/Term.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/Term.java index 99bc12334..5e4c34539 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/Term.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/Term.java @@ -51,7 +51,8 @@ public String getName() { } /** - * @param name the name to set + * @param name + * the name to set */ public void setName(final String name) { this.name = name; @@ -65,7 +66,8 @@ public String getLabel() { } /** - * @param label Identifier label + * @param label + * Identifier label */ public void setLabel(final String label) { this.label = label; @@ -80,7 +82,8 @@ public String getDefinition() { } /** - * @param definition Identifier definition + * @param definition + * Identifier definition */ public void setDefinition(final String definition) { this.definition = definition; @@ -94,7 +97,8 @@ public String getCodeSpace() { } /** - * @param codeSpace href Classifier codeSpace href + * @param codeSpace + * href Classifier codeSpace href */ public void setCodeSpace(final String codeSpace) { this.codeSpace = codeSpace; @@ -108,7 +112,8 @@ public String getValue() { } /** - * @param value the value to set + * @param value + * the value to set */ public void setValue(final String value) { this.value = value; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractDataComponentContainer.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractDataComponentContainer.java index 2c9ab7258..bbf8de414 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractDataComponentContainer.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractDataComponentContainer.java @@ -29,7 +29,8 @@ * @param <T> * Implemented class */ -public class AbstractDataComponentContainer<T> extends AbstractReferenceType { +public class AbstractDataComponentContainer< + T> extends AbstractReferenceType { private String name; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractSmlDataComponentContainer.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractSmlDataComponentContainer.java index 3ec045405..cc381456f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractSmlDataComponentContainer.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/AbstractSmlDataComponentContainer.java @@ -19,13 +19,13 @@ import java.util.Collections; import java.util.Set; -import org.n52.shetland.util.CollectionHelper; import org.n52.shetland.ogc.gml.AbstractReferenceType; import org.n52.shetland.ogc.swe.DataRecord; import org.n52.shetland.ogc.swe.SweAbstractDataComponent; import org.n52.shetland.ogc.swe.SweField; import org.n52.shetland.ogc.swe.SweSimpleDataRecord; import org.n52.shetland.ogc.swe.simpleType.SweAbstractSimpleType; +import org.n52.shetland.util.CollectionHelper; import com.google.common.collect.Sets; @@ -40,7 +40,8 @@ * @param <T> * Implemented class */ -public class AbstractSmlDataComponentContainer<T> extends AbstractReferenceType { +public class AbstractSmlDataComponentContainer< + T> extends AbstractReferenceType { private String name; @@ -89,7 +90,7 @@ public String getTypeDefinition() { /** * @param typeDefinition * the typeDefinition to set - * @return + * @return this */ public T setTypeDefinition(String typeDefinition) { this.typeDefinition = typeDefinition; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCapabilities.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCapabilities.java index 32217b117..72b44dac6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCapabilities.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCapabilities.java @@ -90,7 +90,7 @@ public List<SmlCapability> getCapabilities() { /** * @param capabilities * the capabilities to set - * @return + * @return this */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SmlCapabilities setCapabilities(List<SmlCapability> capabilities) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCapabilitiesPredicates.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCapabilitiesPredicates.java index 330ec4ccc..e72f9ea4c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCapabilitiesPredicates.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCapabilitiesPredicates.java @@ -18,7 +18,6 @@ import java.util.Objects; import java.util.function.Predicate; - /** * TODO JavaDoc * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCharacteristics.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCharacteristics.java index 8216ef395..a3fa77494 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCharacteristics.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlCharacteristics.java @@ -19,9 +19,9 @@ import java.util.Collections; import java.util.List; -import org.n52.shetland.util.CollectionHelper; import org.n52.shetland.ogc.swe.DataRecord; import org.n52.shetland.ogc.swe.SweAbstractDataComponent; +import org.n52.shetland.util.CollectionHelper; import com.google.common.collect.Lists; @@ -72,7 +72,7 @@ public List<SmlCharacteristic> getCharacteristic() { /** * @param characteristics * the characteristics to set - * @return + * @return this */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SmlCharacteristics setCharacteristic(Collection<SmlCharacteristic> characteristics) { @@ -89,7 +89,7 @@ public SmlCharacteristics setCharacteristic(Collection<SmlCharacteristic> charac /** * @param characteristics * the characteristics to add - * @return + * @return this */ public SmlCharacteristics addCharacteristic(Collection<SmlCharacteristic> characteristics) { if (CollectionHelper.isNotEmpty(characteristics)) { @@ -104,7 +104,7 @@ public SmlCharacteristics addCharacteristic(Collection<SmlCharacteristic> charac /** * @param characteristic * the characteristic to add - * @return + * @return this */ public SmlCharacteristics addCharacteristic(SmlCharacteristic characteristic) { if (characteristic != null) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlClassifier.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlClassifier.java index 6671fe7de..650fc7778 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlClassifier.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlClassifier.java @@ -20,8 +20,7 @@ /** * SOS internal representation of SensorML classifier * - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * * @since 1.0.0 @@ -51,8 +50,7 @@ public SmlClassifier() { * @param value * Classifier value */ - public SmlClassifier(final String name, final String definition, final String codeSpace, - final String value) { + public SmlClassifier(final String name, final String definition, final String codeSpace, final String value) { super(); setName(name); setCodeSpace(codeSpace); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlClassifierPredicates.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlClassifierPredicates.java index 226e41e39..b910b941d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlClassifierPredicates.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlClassifierPredicates.java @@ -17,7 +17,6 @@ import java.util.function.Predicate; - /** * TODO JavaDoc * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentationList.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentationList.java index fde251bf6..aa2bef5d5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentationList.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlDocumentationList.java @@ -37,7 +37,7 @@ public SmlDocumentationList setMember(Collection<SmlDocumentationListMember> mem if (members != null) { this.members.addAll(members); } - return this; + return this; } public SmlDocumentationList addMember(SmlDocumentationListMember member) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIdentifier.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIdentifier.java index e4cb1ae81..b24e6e04e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIdentifier.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIdentifier.java @@ -22,8 +22,7 @@ * * @since 1.0.0 */ -public class SmlIdentifier - extends Term { +public class SmlIdentifier extends Term { /** * constructor diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIdentifierPredicates.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIdentifierPredicates.java index 25365fb86..000f078b2 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIdentifierPredicates.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIdentifierPredicates.java @@ -17,7 +17,6 @@ import java.util.function.Predicate; - /** * TODO JavaDoc * @@ -35,13 +34,11 @@ public static Predicate<SmlIdentifier> definition(String definition) { return new DefinitionPredicate(definition); } - public static Predicate<SmlIdentifier> nameOrDefinition(String name, - String definition) { + public static Predicate<SmlIdentifier> nameOrDefinition(String name, String definition) { return name(name).or(definition(definition)); } - public static Predicate<SmlIdentifier> nameAndDefinition(String name, - String definition) { + public static Predicate<SmlIdentifier> nameAndDefinition(String name, String definition) { return name(name).and(definition(definition)); } @@ -54,8 +51,7 @@ private static class DefinitionPredicate implements Predicate<SmlIdentifier> { @Override public boolean test(SmlIdentifier input) { - return input.isSetDefinition() && - input.getDefinition().equalsIgnoreCase(definition); + return input.isSetDefinition() && input.getDefinition().equalsIgnoreCase(definition); } } @@ -68,8 +64,7 @@ private static class NamePredicate implements Predicate<SmlIdentifier> { @Override public boolean test(SmlIdentifier input) { - return input.isSetName() && - input.getName().equalsIgnoreCase(name); + return input.isSetName() && input.getName().equalsIgnoreCase(name); } } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIoPredicates.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIoPredicates.java index 34c1c281f..802b70939 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIoPredicates.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlIoPredicates.java @@ -34,8 +34,7 @@ public static Predicate<SmlIo> definition(String definition) { return new DefinitionPredicate(definition); } - public static Predicate<SmlIo> nameOrDefinition(String name, - String definition) { + public static Predicate<SmlIo> nameOrDefinition(String name, String definition) { return name(name).or(definition(definition)); } @@ -43,8 +42,7 @@ public static Predicate<SmlIo> identifierOrNameOrDefinition(String identifier, S return identifier(identifier).or(name(name)).or(definition(definition)); } - public static Predicate<SmlIo> nameAndDefinition(String name, - String definition) { + public static Predicate<SmlIo> nameAndDefinition(String name, String definition) { return name(name).and(definition(definition)); } @@ -57,8 +55,8 @@ private static class DefinitionPredicate implements Predicate<SmlIo> { @Override public boolean test(SmlIo input) { - return input.getIoValue().isSetDefinition() && - input.getIoValue().getDefinition().equalsIgnoreCase(definition); + return input.getIoValue().isSetDefinition() + && input.getIoValue().getDefinition().equalsIgnoreCase(definition); } } @@ -71,8 +69,8 @@ private static class NamePredicate implements Predicate<SmlIo> { @Override public boolean test(SmlIo input) { - return (input.isSetName() && input.getIoName().equalsIgnoreCase(name)) || (input.getIoValue().isSetName() - && input.getIoValue().getName().getValue().equalsIgnoreCase(name)); + return input.isSetName() && input.getIoName().equalsIgnoreCase(name) || input.getIoValue().isSetName() + && input.getIoValue().getName().getValue().equalsIgnoreCase(name); } } @@ -85,8 +83,8 @@ private static class IdentifierPredicate implements Predicate<SmlIo> { @Override public boolean test(SmlIo input) { - return input.isSetHref() || (input.getIoValue().isSetIdentifier() - && input.getIoValue().getIdentifier().equalsIgnoreCase(identifier)); + return input.isSetHref() || input.getIoValue().isSetIdentifier() + && input.getIoValue().getIdentifier().equalsIgnoreCase(identifier); } } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlLocation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlLocation.java index deac9c09a..ffa8b808b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlLocation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlLocation.java @@ -35,7 +35,8 @@ public class SmlLocation { * * @param point * Point - */@SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SmlLocation(final Point point) { super(); this.point = point; @@ -44,7 +45,7 @@ public SmlLocation(final Point point) { /** * @return the point */ - @SuppressFBWarnings({ "EI_EXPOSE_REP" }) + @SuppressFBWarnings({ "EI_EXPOSE_REP" }) public Point getPoint() { return point; } @@ -59,7 +60,7 @@ public boolean isSetPoint() { /** * @param point * Point - * @return + * @return this */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public SmlLocation setPoint(final Point point) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlPosition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlPosition.java index b86794764..39fcff0e2 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlPosition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/elements/SmlPosition.java @@ -18,6 +18,7 @@ import static java.util.stream.Collectors.toList; import java.util.Collections; +import java.util.LinkedList; import java.util.List; import org.n52.shetland.ogc.gml.CodeType; @@ -48,7 +49,7 @@ public class SmlPosition extends SweAbstractDataComponent { private String referenceFrame; - private List<? extends SweCoordinate<? extends Number>> position; + private List<? extends SweCoordinate<? extends Number>> position = new LinkedList<>(); private SweVector vector; @@ -245,12 +246,15 @@ public SweDataComponentType getDataComponentType() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractPhysicalProcess.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractPhysicalProcess.java index 730a2ac3d..d48c810e2 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractPhysicalProcess.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractPhysicalProcess.java @@ -28,9 +28,7 @@ * @since 1.0.0 * */ -public class AbstractPhysicalProcess - extends DescribedObject - implements HasPosition<AbstractPhysicalProcess> { +public class AbstractPhysicalProcess extends DescribedObject implements HasPosition<AbstractPhysicalProcess> { private ReferenceType attachedTo; private SpatialFrame localReferenceFrame; @@ -48,8 +46,8 @@ public ReferenceType getAttachedTo() { } /** - * Set the attachedTo reference. It is automatically added to - * parentProcedure list. If title is set, the title is used, else the href. + * Set the attachedTo reference. It is automatically added to parentProcedure list. If title is set, the + * title is used, else the href. * * @param attachedTo * the attachedTo to set diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java index a46a5ce5f..7e4e0226d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java @@ -60,7 +60,8 @@ public AbstractSettings getConfiguration() { } /** - * @param configuration the configuration to set + * @param configuration + * the configuration to set */ public void setConfiguration(AbstractSettings configuration) { this.configuration = configuration; @@ -74,7 +75,8 @@ public AbstractModes getModes() { } /** - * @param modes the modes to set + * @param modes + * the modes to set */ public void setModes(AbstractModes modes) { this.modes = modes; @@ -88,7 +90,8 @@ public String getDefinition() { } /** - * @param definition the definition to set + * @param definition + * the definition to set */ public void setDefinition(String definition) { this.definition = definition; @@ -102,7 +105,8 @@ public ReferenceType getTypeOf() { } /** - * @param typeOf the typeOf to set + * @param typeOf + * the typeOf to set */ public void setTypeOf(ReferenceType typeOf) { this.typeOf = typeOf; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AggregateProcess.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AggregateProcess.java index a65123b69..3fd3ac4c3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AggregateProcess.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/AggregateProcess.java @@ -34,8 +34,7 @@ * @since 1.0.0 * */ -public class AggregateProcess - extends DescribedObject +public class AggregateProcess extends DescribedObject implements HasComponents<AggregateProcess>, HasConnections<AggregateProcess> { public static final String ID_PREFIX = "ap_"; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/DescribedObject.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/DescribedObject.java index 41ddf7ed2..c0ce481ae 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/DescribedObject.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/DescribedObject.java @@ -16,9 +16,8 @@ package org.n52.shetland.ogc.sensorML.v20; /** - * In the OGC SensorML 2.0 specification the AbstractProcess is a subclass of - * the DescribedObject but to avoid duplicate definition of classes, the - * super-/subclass is inverted in the API. + * In the OGC SensorML 2.0 specification the AbstractProcess is a subclass of the DescribedObject but to avoid + * duplicate definition of classes, the super-/subclass is inverted in the API. * * * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalComponent.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalComponent.java index 545b10c91..879329011 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalComponent.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalComponent.java @@ -28,9 +28,7 @@ * @since 1.0.0 * */ -public class PhysicalComponent - extends AbstractPhysicalProcess - implements HasProcessMethod { +public class PhysicalComponent extends AbstractPhysicalProcess implements HasProcessMethod { public static final String ID_PREFIX = "pc_"; private ProcessMethod method; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalSystem.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalSystem.java index 7481ddedc..e20500d15 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalSystem.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/PhysicalSystem.java @@ -34,8 +34,7 @@ * @since 1.0.0 * */ -public class PhysicalSystem - extends AbstractPhysicalProcess +public class PhysicalSystem extends AbstractPhysicalProcess implements HasComponents<PhysicalSystem>, HasConnections<PhysicalSystem> { public static final String ID_PREFIX = "ps_"; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SimpleProcess.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SimpleProcess.java index 205be5f34..bcfd486c3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SimpleProcess.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SimpleProcess.java @@ -28,9 +28,7 @@ * @since 1.0.0 * */ -public class SimpleProcess - extends DescribedObject - implements HasProcessMethod { +public class SimpleProcess extends DescribedObject implements HasProcessMethod { public static final String ID_PREFIX = "sp_"; private ProcessMethod method; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlDataInterface.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlDataInterface.java index 507670e07..9fc4d3fbd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlDataInterface.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlDataInterface.java @@ -17,17 +17,15 @@ import org.n52.shetland.ogc.swe.SweAbstractDataComponent; import org.n52.shetland.ogc.swe.SweConstants.SweDataComponentType; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import org.n52.shetland.ogc.swe.SweDataComponentVisitor; import org.n52.shetland.ogc.swe.SweDataRecord; import org.n52.shetland.ogc.swe.SweDataStream; import org.n52.shetland.ogc.swe.VoidSweDataComponentVisitor; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ @@ -60,18 +58,22 @@ public Boolean isSetInterfaceParameters() { public SweDataRecord getInterfaceParameters() { return inputParameters; } + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setInputParameters(SweDataRecord inputParameters) { this.inputParameters = inputParameters; } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlFeatureOfInterest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlFeatureOfInterest.java index c83ee3303..2779e25ce 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlFeatureOfInterest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sensorML/v20/SmlFeatureOfInterest.java @@ -105,12 +105,15 @@ public boolean isSetFeatures() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ExtendedIndeterminateTime.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ExtendedIndeterminateTime.java index 422ac3c95..34e36e2dd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ExtendedIndeterminateTime.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ExtendedIndeterminateTime.java @@ -19,6 +19,7 @@ /** * TODO JavaDoc + * * @author Christian Autermann */ public interface ExtendedIndeterminateTime { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ObjectWithXmlString.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ObjectWithXmlString.java index 09e4c9399..1968806dd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ObjectWithXmlString.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ObjectWithXmlString.java @@ -31,7 +31,8 @@ * * @author Christian Autermann */ -public class ObjectWithXmlString<T> { +public class ObjectWithXmlString< + T> { private Optional<T> object; private Optional<String> xml; @@ -104,7 +105,7 @@ public boolean equals(Object obj) { return false; } ObjectWithXmlString<?> other = (ObjectWithXmlString<?>) obj; - return ((this.isDecoded() && other.isDecoded()) || (this.isEncoded() && other.isEncoded())) + return (this.isDecoded() && other.isDecoded() || this.isEncoded() && other.isEncoded()) && (this.isDecoded() && other.isDecoded() ? Objects.equals(this.object, other.object) : true) && (this.isEncoded() && other.isEncoded() ? Objects.equals(this.xml, other.xml) : true); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/Sos1Constants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/Sos1Constants.java index 89c3729cb..4618098c0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/Sos1Constants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/Sos1Constants.java @@ -24,13 +24,12 @@ import com.google.common.collect.ImmutableSet; /** - * SosConstants holds all important and often used constants (e.g. name of the - * getCapabilities operation) that are specific to OGC OGC SOS 1.0.0.0 + * SosConstants holds all important and often used constants (e.g. name of the getCapabilities operation) that + * are specific to OGC OGC SOS 1.0.0.0 * * @since 1.0.0 */ -public interface Sos1Constants - extends SosConstants { +public interface Sos1Constants extends SosConstants { String NS_SOS = "http://www.opengis.net/sos/1.0"; @@ -53,72 +52,83 @@ public interface Sos1Constants String SERVICEVERSION = "1.0.0"; /** - * the names of the OGC SOS 1.0.0 operations that are not supported by all - * versions + * the names of the OGC SOS 1.0.0 operations that are not supported by all versions */ enum Operations { - GetFeatureOfInterestTime, DescribeFeatureType, DescribeObservationType, DescribeResultModel, RegisterSensor; + GetFeatureOfInterestTime, + DescribeFeatureType, + DescribeObservationType, + DescribeResultModel, + RegisterSensor; } /** - * enum with names of OGC SOS 1.0.0 Capabilities sections not supported by - * all versions + * enum with names of OGC SOS 1.0.0 Capabilities sections not supported by all versions */ enum CapabilitiesSections { Filter_Capabilities; } /** - * enum with parameter names for OGC SOS 1.0.0 getObservation request not - * supported by all versions + * enum with parameter names for OGC SOS 1.0.0 getObservation request not supported by all versions */ enum GetObservationParams { - eventTime, resultModel, result; + eventTime, + resultModel, + result; } /** - * enum with parameter names for OGC SOS 1.0.0 insertObservation request not - * supported by all versions + * enum with parameter names for OGC SOS 1.0.0 insertObservation request not supported by all versions */ enum InsertObservationParams { - AssignedSensorId, Observation; + AssignedSensorId, + Observation; } /** - * enum with parameter names for OGC SOS 1.0.0 getObservation request not - * supported by all versions + * enum with parameter names for OGC SOS 1.0.0 getObservation request not supported by all versions */ enum DescribeSensorParams { - outputFormat, time; + outputFormat, + time; } /** - * enum with parameter names for OGC SOS 1.0.0 getFeatureOfInterest request - * not supported by all versions + * enum with parameter names for OGC SOS 1.0.0 getFeatureOfInterest request not supported by all versions */ enum GetFeatureOfInterestParams { - featureOfInterestID, location; + featureOfInterestID, + location; } /** * enum with parameter names for getFeatureOfInterestTime request */ enum GetFeatureOfInterestTimeParams { - featureOfInterestID, location, observedProperty, procedure; + featureOfInterestID, + location, + observedProperty, + procedure; } /** * enum with parameter names for registerSensor request */ enum RegisterSensorParams { - SensorDescription, ObservationTemplate; + SensorDescription, + ObservationTemplate; } /** - * enum with parameter names for OGC SOS 1.0.0 getObservationById request - * not supported by all versions + * enum with parameter names for OGC SOS 1.0.0 getObservationById request not supported by all versions */ enum GetObservationByIdParams { - srsName, ObservationId, responseFormat, resultModel, responseMode, SortBy; + srsName, + ObservationId, + responseFormat, + resultModel, + responseMode, + SortBy; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/Sos2Constants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/Sos2Constants.java index 26e4d94a4..54e4e15e6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/Sos2Constants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/Sos2Constants.java @@ -26,13 +26,12 @@ import com.google.common.collect.ImmutableSet; /** - * SosConstants holds all important and often used constants (e.g. name of the - * getCapabilities operation) that are specific to OGC SOS 2.0 + * SosConstants holds all important and often used constants (e.g. name of the getCapabilities operation) that + * are specific to OGC SOS 2.0 * * @since 1.0.0 */ -public interface Sos2Constants - extends SosConstants { +public interface Sos2Constants extends SosConstants { String NS_SOS_20 = "http://www.opengis.net/sos/2.0"; @@ -221,7 +220,7 @@ public interface Sos2Constants String SOAP_REASON_INVALID_PROPERTY_OFFERING_COMBINATION = "Observations for the requested combination of observedProperty and offering do not use " - + "SWE Common encoded results."; + + "SWE Common encoded results."; String SOAP_REASON_RESPONSE_EXCEEDS_SIZE_LIMIT = "The requested result set exceeds the response size limit of this service and thus cannot be delivered."; @@ -242,8 +241,7 @@ enum Extensions { String SERVICEVERSION = "2.0.0"; /** - * the names of the OGC SOS 2.0 operations that are not supported by all - * versions + * the names of the OGC SOS 2.0 operations that are not supported by all versions */ enum Operations { InsertSensor, @@ -255,8 +253,7 @@ enum Operations { } /** - * enum with names of OGC SOS 2.0 Capabilities sections not supported by all - * versions + * enum with names of OGC SOS 2.0 Capabilities sections not supported by all versions */ enum CapabilitiesSections { FilterCapabilities, @@ -273,8 +270,7 @@ enum GetObservationParams { } /** - * enum with parameter names for OGC SOS 2.0 insertObservation request not - * supported by all versions + * enum with parameter names for OGC SOS 2.0 insertObservation request not supported by all versions */ enum InsertObservationParams { offering, @@ -287,8 +283,7 @@ enum InsertObservationParams { } /** - * enum with parameter names for OGC SOS 2.0 getObservation request not - * supported by all versions + * enum with parameter names for OGC SOS 2.0 getObservation request not supported by all versions */ enum DescribeSensorParams { procedureDescriptionFormat, @@ -296,8 +291,7 @@ enum DescribeSensorParams { } /** - * enum with parameter names for OGC SOS 2.0 getFeatureOfInterest request - * not supported by all versions + * enum with parameter names for OGC SOS 2.0 getFeatureOfInterest request not supported by all versions */ enum GetFeatureOfInterestParams { featureOfInterest, diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosCapabilities.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosCapabilities.java index 3ed586677..305f6da0e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosCapabilities.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosCapabilities.java @@ -15,7 +15,6 @@ */ package org.n52.shetland.ogc.sos; - import java.util.Collection; import java.util.Collections; import java.util.Optional; @@ -58,19 +57,17 @@ public SosCapabilities(OwsCapabilities owsCapabilities) { this(owsCapabilities, null, null); } - public SosCapabilities( - OwsCapabilities owsCapabilities, FilterCapabilities filterCapabilities, + public SosCapabilities(OwsCapabilities owsCapabilities, FilterCapabilities filterCapabilities, Collection<SosObservationOffering> contents) { super(owsCapabilities); this.filterCapabilities = Optional.ofNullable(filterCapabilities); this.contents = Optional.ofNullable(contents).map(CollectionHelper::newSortedSet); } - public SosCapabilities( - String service, String version, String updateSequence, OwsServiceIdentification serviceIdentification, - OwsServiceProvider serviceProvider, OwsOperationsMetadata operationsMetadata, Set<String> languages, - FilterCapabilities filterCapabilities, Collection<SosObservationOffering> contents, - Collection<OwsCapabilitiesExtension> extensions) { + public SosCapabilities(String service, String version, String updateSequence, + OwsServiceIdentification serviceIdentification, OwsServiceProvider serviceProvider, + OwsOperationsMetadata operationsMetadata, Set<String> languages, FilterCapabilities filterCapabilities, + Collection<SosObservationOffering> contents, Collection<OwsCapabilitiesExtension> extensions) { super(SosConstants.SOS, version, updateSequence, serviceIdentification, serviceProvider, operationsMetadata, languages, extensions); this.filterCapabilities = Optional.ofNullable(filterCapabilities); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosConstants.java index b36aec102..53e13511c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosConstants.java @@ -24,9 +24,8 @@ import com.google.common.collect.Sets; /** - * SosConstants holds all important and often used constants of OGC SOS (e.g. - * name of the getCapabilities operation) that are global between all supported - * versions + * SosConstants holds all important and often used constants of OGC SOS (e.g. name of the getCapabilities + * operation) that are global between all supported versions * * @since 1.0.0 */ @@ -47,14 +46,12 @@ public interface SosConstants { String SOS = "SOS"; /** - * String representing parameter value, if parameter is any in an operation - * request + * String representing parameter value, if parameter is any in an operation request */ String PARAMETER_ANY = "ANY"; /** - * String representing parameter value, if parameter is no values in an - * operation request + * String representing parameter value, if parameter is no values in an operation request */ String PARAMETER_NO_VALUES = "NoValues"; @@ -86,35 +83,33 @@ public interface SosConstants { String OBS_TEMP_ID_PREFIX = "ot_"; /** - * Constant 'out-of-bands' for response mode, which means that the results - * in an observation response appear external to the observation element + * Constant 'out-of-bands' for response mode, which means that the results in an observation response + * appear external to the observation element */ String RESPONSE_MODE_OUT_OF_BANDS = "out-of-bands"; /** - * Constant 'resultTemplate' for response mode, which means that the result - * is an ObservationTemplate for subsequent calls to GetResult operation + * Constant 'resultTemplate' for response mode, which means that the result is an ObservationTemplate for + * subsequent calls to GetResult operation */ String RESPONSE_RESULT_TEMPLATE = "resultTemplate"; /** - * Constant 'inline' for response mode, which means that results are - * contained inline the Observation elements of an observation response - * document + * Constant 'inline' for response mode, which means that results are contained inline the Observation + * elements of an observation response document */ String RESPONSE_MODE_INLINE = "inline"; /** - * Constant 'attached' for response mode, which means that result values of - * an observation response are attached as MIME attachments + * Constant 'attached' for response mode, which means that result values of an observation response are + * attached as MIME attachments */ String RESPONSE_MODE_ATTACHED = "attached"; /** * Array of constants for response mode. */ - Set<String> RESPONSE_MODES = ImmutableSet.of(RESPONSE_MODE_INLINE, - RESPONSE_RESULT_TEMPLATE); + Set<String> RESPONSE_MODES = ImmutableSet.of(RESPONSE_MODE_INLINE, RESPONSE_RESULT_TEMPLATE); String MIN_VALUE = "MinValue"; @@ -131,7 +126,7 @@ public interface SosConstants { String SOAP_REASON_INVALID_PROPERTY_OFFERING_COMBINATION = "Observations for the requested combination of observedProperty and " - + "offering do not use SWE Common encoded results."; + + "offering do not use SWE Common encoded results."; String GENERATED_IDENTIFIER_PREFIX = "generated_"; @@ -144,8 +139,7 @@ public interface SosConstants { String VALID_DESCRIBE_SENSOR_TIME_VALUE_REFERENCE = "validDescribeSensorTime"; /** - * the names of the operations supported by all versions of the SOS - * specification + * the names of the operations supported by all versions of the SOS specification */ enum Operations { GetCapabilities, @@ -175,8 +169,7 @@ enum CapabilitiesSections { } /** - * enum with parameter names for getObservation request supported by all - * versions + * enum with parameter names for getObservation request supported by all versions */ enum GetObservationParams { srsName, @@ -196,8 +189,7 @@ enum GetObservationParams { } /** - * enum with parameter names for getObservation request supported by all - * versions + * enum with parameter names for getObservation request supported by all versions */ enum DescribeSensorParams { procedure; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosInsertionCapabilities.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosInsertionCapabilities.java index f6867fe82..36b64a5a9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosInsertionCapabilities.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosInsertionCapabilities.java @@ -29,7 +29,8 @@ * @since 1.0.0 * */ -public class SosInsertionCapabilities implements OwsCapabilitiesExtension, MergableExtension<SosInsertionCapabilities> { +public class SosInsertionCapabilities + implements OwsCapabilitiesExtension, MergableExtension<SosInsertionCapabilities> { private static final String SECTION_NAME = Sos2Constants.CapabilitiesSections.InsertionCapabilities.name(); private final SortedSet<String> featureOfInterestTypes = new TreeSet<>(); @@ -136,9 +137,9 @@ public boolean equals(Object obj) { return false; } final SosInsertionCapabilities other = (SosInsertionCapabilities) obj; - return Objects.equals(this.featureOfInterestTypes, other.featureOfInterestTypes) && - Objects.equals(this.observationTypes, other.observationTypes) && - Objects.equals(this.procedureDescriptionFormats, other.procedureDescriptionFormats) && - Objects.equals(this.supportedEncodings, other.supportedEncodings); + return Objects.equals(this.featureOfInterestTypes, other.featureOfInterestTypes) + && Objects.equals(this.observationTypes, other.observationTypes) + && Objects.equals(this.procedureDescriptionFormats, other.procedureDescriptionFormats) + && Objects.equals(this.supportedEncodings, other.supportedEncodings); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosObservationOffering.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosObservationOffering.java index bf9053046..4a450fdc8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosObservationOffering.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosObservationOffering.java @@ -136,14 +136,16 @@ public SosOffering getOffering() { } /** - * @param offering Offering identifier + * @param offering + * Offering identifier */ public void setOffering(String offering) { setOffering(new SosOffering(offering, "")); } /** - * @param offering Offering identifier + * @param offering + * Offering identifier */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setOffering(SosOffering offering) { @@ -167,7 +169,8 @@ public SortedSet<String> getObservableProperties() { } /** - * @param observableProperties observableProperties to se + * @param observableProperties + * observableProperties to se */ public void setObservableProperties(Collection<String> observableProperties) { set(this.observableProperties, observableProperties); @@ -185,22 +188,23 @@ public SortedSet<String> getCompositePhenomena() { } /** - * @param compositePhenomena compositePhenomena to set + * @param compositePhenomena + * compositePhenomena to set */ public void setCompositePhenomena(Collection<String> compositePhenomena) { set(this.compositePhenomena, compositePhenomena); } /** - * @return Sorted map containing the observableProperties and related - * composite phenomena + * @return Sorted map containing the observableProperties and related composite phenomena */ public SortedMap<String, SortedSet<String>> getPhens4CompPhens() { return Collections.unmodifiableSortedMap(phens4CompPhens); } /** - * @param phens4CompPhens phens4CompPhens to set + * @param phens4CompPhens + * phens4CompPhens to set */ public void setPhens4CompPhens(Map<String, ? extends Collection<String>> phens4CompPhens) { set(this.phens4CompPhens, phens4CompPhens); @@ -208,7 +212,7 @@ public void setPhens4CompPhens(Map<String, ? extends Collection<String>> phens4C /** * @param phenomenonTime - * the phenomenon time + * the phenomenon time */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setPhenomenonTime(Time phenomenonTime) { @@ -224,7 +228,8 @@ public Time getPhenomenonTime() { } /** - * @param resultTime the result time + * @param resultTime + * the result time */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setResultTime(Time resultTime) { @@ -240,7 +245,8 @@ public Time getResultTime() { } /** - * @param featureOfInterest the fature of interest + * @param featureOfInterest + * the fature of interest */ public void setFeatureOfInterest(Collection<String> featureOfInterest) { set(this.featureOfInterest, featureOfInterest); @@ -254,7 +260,8 @@ public SortedSet<String> getFeatureOfInterest() { } /** - * @param relatedFeatures the related features + * @param relatedFeatures + * the related features */ public void setRelatedFeatures(Map<String, Set<String>> relatedFeatures) { set(this.relatedFeatures, relatedFeatures); @@ -270,8 +277,10 @@ public SortedMap<String, SortedSet<String>> getRelatedFeatures() { /** * Add a related feature to this offering * - * @param identifier Related feature identifier - * @param role Related feature role + * @param identifier + * Related feature identifier + * @param role + * Related feature role */ public void addRelatedFeature(String identifier, String role) { addToMap(this.relatedFeatures, identifier, role); @@ -280,8 +289,10 @@ public void addRelatedFeature(String identifier, String role) { /** * Add a related feature to this offering * - * @param identifier Related feature identifier - * @param roles Related feature roles + * @param identifier + * Related feature identifier + * @param roles + * Related feature roles */ public void addRelatedFeature(String identifier, Set<String> roles) { addToMap(this.relatedFeatures, identifier, roles); @@ -295,7 +306,8 @@ public SortedSet<String> getProcedures() { } /** - * @param procedures procedures to set + * @param procedures + * procedures to set */ public void setProcedures(Collection<String> procedures) { set(this.procedures, procedures); @@ -309,7 +321,8 @@ public SortedSet<QName> getResultModels() { } /** - * @param resultModels resultModels to set + * @param resultModels + * resultModels to set */ public void setResultModels(Collection<QName> resultModels) { set(this.resultModels, resultModels); @@ -323,7 +336,8 @@ public SortedSet<String> getObservationTypes() { } /** - * @param observationTypes the observationTypes to set + * @param observationTypes + * the observationTypes to set */ public void setObservationTypes(Collection<String> observationTypes) { set(this.observationTypes, observationTypes); @@ -337,7 +351,8 @@ public SortedMap<String, SortedSet<String>> getObservationResultTypes() { } /** - * @param observationResultTypes the observationResultTypes to set + * @param observationResultTypes + * the observationResultTypes to set */ public void setObservationResultTypes(Map<String, Collection<String>> observationResultTypes) { set(this.observationResultTypes, observationResultTypes); @@ -351,7 +366,8 @@ public SortedSet<String> getResponseFormats() { } /** - * @param responseFormats responseFormats to set + * @param responseFormats + * responseFormats to set */ public void setResponseFormats(Collection<String> responseFormats) { set(this.responseFormats, responseFormats); @@ -365,7 +381,8 @@ public SortedSet<String> getResponseModes() { } /** - * @param responseModes the response modes + * @param responseModes + * the response modes */ public void setResponseModes(Collection<String> responseModes) { set(this.responseModes, responseModes); @@ -413,23 +430,11 @@ public int compareTo(SosObservationOffering o) { } public boolean isEmpty() { - return !isSetOffering() && - !isSetObservedArea() && - !isSetObservableProperties() && - !isSetCompositePhenomena() && - !isSetPhens4CompPhens() && - !isSetPhenomenonTime() && - !isSetResultTime() && - !isSetFeatureOfInterest() && - !isSetRelatedFeature() && - !isSetProcedures() && - !isSetresultModels() && - !isSetObservationTypes() && - !isSetFeatureOfInterestTypes() && - !isSetObservationResultTypes() && - !isSetResponseFormats() && - !isSetResponseModes() && - !isSetProcedureDescriptionFormats(); + return !isSetOffering() && !isSetObservedArea() && !isSetObservableProperties() && !isSetCompositePhenomena() + && !isSetPhens4CompPhens() && !isSetPhenomenonTime() && !isSetResultTime() && !isSetFeatureOfInterest() + && !isSetRelatedFeature() && !isSetProcedures() && !isSetresultModels() && !isSetObservationTypes() + && !isSetFeatureOfInterestTypes() && !isSetObservationResultTypes() && !isSetResponseFormats() + && !isSetResponseModes() && !isSetProcedureDescriptionFormats(); } public boolean isValidObservationOffering() { @@ -512,11 +517,15 @@ public String toString() { /** * clear and add collection to sorted set. * - * @param <T> the element type - * @param set the set - * @param coll the collection - */ - private static <T> void set(SortedSet<T> set, Collection<? extends T> coll) { + * @param <T> + * the element type + * @param set + * the set + * @param coll + * the collection + */ + private static < + T> void set(SortedSet<T> set, Collection<? extends T> coll) { if (set != null) { set.clear(); add(set, coll); @@ -526,17 +535,24 @@ private static <T> void set(SortedSet<T> set, Collection<? extends T> coll) { /** * Add map to sorted map. * - * @param <K> the key type - * @param <V> the value type - * @param sortedMap the target map - * @param map the source map - */ - private static <K, V extends Comparable<? super V>> void set( - SortedMap<K, SortedSet<V>> sortedMap, Map<K, ? extends Collection<V>> map) { + * @param <K> + * the key type + * @param <V> + * the value type + * @param sortedMap + * the target map + * @param map + * the source map + */ + private static < + K, + V extends Comparable<? super V>> void set(SortedMap<K, SortedSet<V>> sortedMap, + Map<K, ? extends Collection<V>> map) { if (sortedMap != null) { sortedMap.clear(); if (map != null) { - map.forEach((key, value) -> sortedMap.put(key, value != null ? new TreeSet<>(value) : new TreeSet<>())); + map.forEach( + (key, value) -> sortedMap.put(key, value != null ? new TreeSet<>(value) : new TreeSet<>())); } } } @@ -544,11 +560,15 @@ private static <K, V extends Comparable<? super V>> void set( /** * add collection to sorted set. * - * @param <T> the element type - * @param set the set - * @param coll the collection - */ - private static <T> void add(SortedSet<T> set, Collection<? extends T> coll) { + * @param <T> + * the element type + * @param set + * the set + * @param coll + * the collection + */ + private static < + T> void add(SortedSet<T> set, Collection<? extends T> coll) { if (set != null && coll != null) { set.addAll(coll); } @@ -557,13 +577,20 @@ private static <T> void add(SortedSet<T> set, Collection<? extends T> coll) { /** * Add key and value to map. * - * @param <K> the key type - * @param <V> the value type - * @param map the map - * @param key the key - * @param value the value - */ - private static <K, V> void addToMap(SortedMap<K, SortedSet<V>> map, K key, V value) { + * @param <K> + * the key type + * @param <V> + * the value type + * @param map + * the map + * @param key + * the key + * @param value + * the value + */ + private static < + K, + V> void addToMap(SortedMap<K, SortedSet<V>> map, K key, V value) { if (map != null && key != null && value != null) { map.computeIfAbsent(key, Functions.forSupplier(TreeSet::new)).add(value); } @@ -572,13 +599,20 @@ private static <K, V> void addToMap(SortedMap<K, SortedSet<V>> map, K key, V val /** * Add key and values to map. * - * @param <K> the key type - * @param <V> the value type - * @param map the map - * @param key the key - * @param value the values - */ - private static <K, V> void addToMap(SortedMap<K, SortedSet<V>> map, K key, Collection<V> value) { + * @param <K> + * the key type + * @param <V> + * the value type + * @param map + * the map + * @param key + * the key + * @param value + * the values + */ + private static < + K, + V> void addToMap(SortedMap<K, SortedSet<V>> map, K key, Collection<V> value) { if (map != null && key != null && value != null) { map.computeIfAbsent(key, Functions.forSupplier(TreeSet::new)).addAll(value); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosOffering.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosOffering.java index a5f47d9f8..82e01bdf7 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosOffering.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosOffering.java @@ -36,13 +36,10 @@ * * @since 1.0.0 */ -public class SosOffering - extends AbstractFeature - implements Comparable<SosOffering> { +public class SosOffering extends AbstractFeature implements Comparable<SosOffering> { private static final String OFFERING_NAME_PREFIX = "Offering for sensor "; /** - * flag to identify offering as offering from a parent procedure, default = - * false. + * flag to identify offering as offering from a parent procedure, default = false. */ private boolean parentOffering; @@ -160,8 +157,7 @@ public int hashCode() { } /** - * Creates a set of {@literal SosOffering}s from a map containing - * identifiers as keys and names as values. + * Creates a set of {@literal SosOffering}s from a map containing identifiers as keys and names as values. * * @param map * the map (may be {@literal null}) @@ -174,8 +170,7 @@ public static Set<SosOffering> fromMap(Map<String, String> map) { } /** - * Creates a set of {@literal SosOffering}s from a set containing - * identifiers as keys and names as values. + * Creates a set of {@literal SosOffering}s from a set containing identifiers as keys and names as values. * * @param set * the set (may be {@literal null}) diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java index 7d9fdf907..1c11ec37f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java @@ -37,7 +37,8 @@ * @since 1.0.0 * */ -public class SosProcedureDescription<T extends AbstractFeature> extends AbstractFeature { +public class SosProcedureDescription< + T extends AbstractFeature> extends AbstractFeature { private final T procedureDescription; private Time validTime; @@ -179,14 +180,14 @@ public SosProcedureDescription<T> addFeaturesOfInterest(Collection<String> featu public SosProcedureDescription<T> addFeatureOfInterest(AbstractFeature featureOfInterest) { if (featureOfInterest != null) { - this.featuresOfInterestMap.put(featureOfInterest.getIdentifier(), featureOfInterest); + this.featuresOfInterestMap.put(featureOfInterest.getIdentifier(), featureOfInterest); } return this; } public SosProcedureDescription<T> addFeatureOfInterest(String featureOfInterest) { if (featureOfInterest != null) { - this.featuresOfInterest.add(featureOfInterest); + this.featuresOfInterest.add(featureOfInterest); } return this; } @@ -336,7 +337,7 @@ public String getDefaultElementEncoding() { @Override public boolean isSetDefaultElementEncoding() { - return super.isSetDefaultElementEncoding() || (getProcedureDescription() != null - && !Strings.isNullOrEmpty(getProcedureDescription().getDefaultElementEncoding())); + return super.isSetDefaultElementEncoding() || getProcedureDescription() != null + && !Strings.isNullOrEmpty(getProcedureDescription().getDefaultElementEncoding()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescriptionUnknownType.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescriptionUnknownType.java index 22b5c9408..19cb543f8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescriptionUnknownType.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescriptionUnknownType.java @@ -21,11 +21,10 @@ * @since 1.0.0 * */ -public class SosProcedureDescriptionUnknownType - extends SosProcedureDescription<AbstractFeature> { +public class SosProcedureDescriptionUnknownType extends SosProcedureDescription<AbstractFeature> { - public SosProcedureDescriptionUnknownType( - String identifier, String procedureDescriptionFormat, String xmlDescription) { + public SosProcedureDescriptionUnknownType(String identifier, String procedureDescriptionFormat, + String xmlDescription) { super(new UnknownGMLDescription(identifier, procedureDescriptionFormat, xmlDescription)); } @@ -49,8 +48,7 @@ public AbstractFeature setXml(String xml) { return this; } - private static class UnknownGMLDescription - extends AbstractFeature { + private static class UnknownGMLDescription extends AbstractFeature { UnknownGMLDescription(String identifier, String procedureDescriptionFormat, String xmlDescription) { super(identifier); setDefaultElementEncoding(procedureDescriptionFormat); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosSoapConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosSoapConstants.java index d1b3ea6bc..81126d32e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosSoapConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosSoapConstants.java @@ -98,7 +98,7 @@ public interface SosSoapConstants { String REQ_ACTION_GET_DATA_AVAILABILITY = "http://www.opengis.net/def/serviceOperation/sos/daRetrieval/2.0/GetDataAvailability"; - String RESP_ACTION_GET_DATA_AVAILABILITY = + String RESP_ACTION_GET_DATA_AVAILABILITY = "http://www.opengis.net/def/serviceOperation/sos/daRetrieval/2.0/GetDataAvailabilityResponse"; // Exceptions diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationConstants.java index 9b2cef970..7d65361d6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationConstants.java @@ -21,8 +21,7 @@ import com.google.common.collect.Sets; /** - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationRequest.java index 33cdd5889..b2a17e002 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/delobs/DeleteObservationRequest.java @@ -176,7 +176,7 @@ public Set<String> getOfferings() { /** * @param offerings * the offerings to set - * @return + * @return this */ public DeleteObservationRequest setOfferings(Collection<String> offerings) { this.offerings.clear(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateConstants.java index 7c11f3516..b00285ea2 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateConstants.java @@ -29,7 +29,7 @@ enum PARAMETERS { String NS_PREFIX = "drt"; - String SCHEMA_LOCATION_URL = "http://52north.org/schema/sosdrt/1.0/sosdrt.xsd"; + String SCHEMA_LOCATION_URL = "http://52north.org/schema/sosdrt/1.0/sosdrt.xsd"; String CONFORMANCE_CLASS_INSERTION = "http://www.opengis.net/spec/SOS/2.0/conf/resultInsertion"; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateRequest.java index aac7274d4..b4a6506e6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/drt/DeleteResultTemplateRequest.java @@ -24,7 +24,6 @@ import org.n52.shetland.util.CollectionHelper; import com.google.common.base.Strings; -import com.google.common.collect.Lists; public class DeleteResultTemplateRequest extends OwsServiceRequest { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/exception/SosExceptionCode.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/exception/SosExceptionCode.java index a2bb071fb..d4c6327bb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/exception/SosExceptionCode.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/exception/SosExceptionCode.java @@ -26,6 +26,7 @@ public enum SosExceptionCode implements ExceptionCode { ResponseExceedsSizeLimit(SosConstants.SOAP_REASON_RESPONSE_EXCEEDS_SIZE_LIMIT), InvalidPropertyOfferingCombination(SosConstants.SOAP_REASON_INVALID_PROPERTY_OFFERING_COMBINATION); + private final String soapFaultReason; SosExceptionCode(String soapFaultReason) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityConstants.java index 094684704..a35476399 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityConstants.java @@ -17,9 +17,9 @@ import javax.xml.namespace.QName; +import org.n52.shetland.ogc.om.OmConstants; import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; -import org.n52.shetland.ogc.om.OmConstants; import org.n52.shetland.w3c.SchemaLocation; import org.n52.shetland.w3c.W3CConstants; @@ -151,8 +151,8 @@ public interface GetDataAvailabilityConstants { QName GDA_GET_DATA_AVAILABILITY_20 = new QName(GetDataAvailabilityConstants.NS_GDA_20, EN_GET_DATA_AVAILABILITY, GetDataAvailabilityConstants.NS_GDA_PREFIX); - QName GDA_20_EXTENSION = - new QName(GetDataAvailabilityConstants.NS_GDA_20, EN_EXTENSION, GetDataAvailabilityConstants.NS_GDA_PREFIX); + QName GDA_20_EXTENSION = new QName(GetDataAvailabilityConstants.NS_GDA_20, EN_EXTENSION, + GetDataAvailabilityConstants.NS_GDA_PREFIX); /** * The {@code QName} for {@code gda:featureOfInterest}. @@ -286,8 +286,7 @@ public interface GetDataAvailabilityConstants { /** * The {@code QName} for {@code xlink:title}. */ - QName XLINK_TITLE = - new QName(W3CConstants.NS_XLINK, W3CConstants.AN_TITLE, W3CConstants.NS_XLINK_PREFIX); + QName XLINK_TITLE = new QName(W3CConstants.NS_XLINK, W3CConstants.AN_TITLE, W3CConstants.NS_XLINK_PREFIX); /** * The {@code QName} for {@code om:featureOfInterest}. @@ -321,7 +320,10 @@ public interface GetDataAvailabilityConstants { * The available parameters of the operation. */ enum GetDataAvailabilityParams { - featureOfInterest, observedProperty, procedure, offering; + featureOfInterest, + observedProperty, + procedure, + offering; } enum GetDataAvailabilityV20Params { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityRequest.java index 8e096be22..652fbccb8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityRequest.java @@ -108,7 +108,7 @@ public void addProcedure(String procedure) { * * @param observedProperty * the {@code observedProperty} - * @return + * @return this */ public GetDataAvailabilityRequest addObservedProperty(String observedProperty) { if (observedProperty != null) { @@ -122,7 +122,7 @@ public GetDataAvailabilityRequest addObservedProperty(String observedProperty) { * * @param featureOfInterest * the {@code featureOfInterest} - * @return + * @return this */ public GetDataAvailabilityRequest addFeatureOfInterest(String featureOfInterest) { if (featuresOfInterest != null) { @@ -144,7 +144,7 @@ public GetDataAvailabilityRequest setFeatureOfInterest(Collection<String> featur * * @param offering * the {@code offering} - * @return + * @return this */ public GetDataAvailabilityRequest addOffering(String offering) { if (offering != null) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityResponse.java index 097b56201..55799c7bd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/gda/GetDataAvailabilityResponse.java @@ -90,7 +90,7 @@ public List<DataAvailability> getDataAvailabilities() { * * @param dataAvailabilities * the {@code DataAvailabilities} - * @return + * @return this */ public GetDataAvailabilityResponse setDataAvailabilities( Collection<? extends DataAvailability> dataAvailabilities) { @@ -106,7 +106,7 @@ public GetDataAvailabilityResponse setDataAvailabilities( * * @param dataAvailability * the {@code DataAvailability}. - * @return + * @return this */ public GetDataAvailabilityResponse addDataAvailability(DataAvailability dataAvailability) { this.dataAvailabilities.add(dataAvailability); @@ -326,7 +326,7 @@ public Map<String, NamedValue<?>> getMetadata() { /** * @param metadata * the metadata to set - * @return + * @return this */ public DataAvailability setMetadata(Map<String, NamedValue<?>> metadata) { this.metadata.clear(); @@ -341,7 +341,7 @@ public DataAvailability setMetadata(Map<String, NamedValue<?>> metadata) { * the key of the metadata * @param metadata * the metadata to add - * @return + * @return this */ public DataAvailability addMetadata(String key, NamedValue<?> metadata) { this.metadata.put(key, metadata); @@ -464,7 +464,7 @@ public Set<ObservationFormatDescriptor> getObservationFormatDescriptors() { /** * @param observationFormatDescriptors * the observationFormatDescriptors to set - * @return + * @return this */ public FormatDescriptor setObservationFormatDescriptors( Collection<ObservationFormatDescriptor> observationFormatDescriptors) { @@ -532,7 +532,7 @@ public Set<String> getObservationTypes() { /** * @param observationTypes * the observationTypes to set - * @return + * @return this */ public ObservationFormatDescriptor setObservationTypes(Collection<String> observationTypes) { this.observationTypes.clear(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ifoi/InsertFeatureOfInterestConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ifoi/InsertFeatureOfInterestConstants.java index 40118792a..0e99c799f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ifoi/InsertFeatureOfInterestConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ifoi/InsertFeatureOfInterestConstants.java @@ -34,7 +34,7 @@ public interface InsertFeatureOfInterestConstants { String CONFORMANCE_CLASS = "http://www.opengis.net/spec/SOS/2.0/conf/foi"; - public interface InsertFeatureOfInterestParams { + interface InsertFeatureOfInterestParams { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/AbstractObservationRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/AbstractObservationRequest.java index 3e1d567a5..ec04f794a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/AbstractObservationRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/AbstractObservationRequest.java @@ -25,9 +25,7 @@ * * @since 1.0.0 */ -public abstract class AbstractObservationRequest - extends OwsServiceRequest - implements ResponseFormat, SrsNameRequest { +public abstract class AbstractObservationRequest extends OwsServiceRequest implements ResponseFormat, SrsNameRequest { /** * SRS name */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/DeleteSensorRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/DeleteSensorRequest.java index 3de26b2b3..2d28b1673 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/DeleteSensorRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/DeleteSensorRequest.java @@ -22,8 +22,7 @@ * @since 1.0.0 * */ -public class DeleteSensorRequest - extends OwsServiceRequest { +public class DeleteSensorRequest extends OwsServiceRequest { private String procedureIdentifier; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/DescribeSensorRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/DescribeSensorRequest.java index 74e18c106..0859c6ea8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/DescribeSensorRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/DescribeSensorRequest.java @@ -57,7 +57,6 @@ public DescribeSensorRequest(String service, String version, String operationNam super(service, version, operationName); } - /** * Get output format * @@ -119,7 +118,8 @@ public Time getValidTime() { * * @param validTime * valid time - */@SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + */ + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setValidTime(Time validTime) { this.validTime = validTime; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/FeatureOfInterestIdentifierRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/FeatureOfInterestIdentifierRequest.java index 87d6151e0..4b08ac5b0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/FeatureOfInterestIdentifierRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/FeatureOfInterestIdentifierRequest.java @@ -35,7 +35,8 @@ public interface FeatureOfInterestIdentifierRequest { /** * Set FeatureOfInterest identifiers * - * @param featureIdentifiers FeatureOfInterest identifiers + * @param featureIdentifiers + * FeatureOfInterest identifiers */ void setFeatureIdentifiers(List<String> featureIdentifiers); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetFeatureOfInterestRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetFeatureOfInterestRequest.java index 9cfbb87b1..982417823 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetFeatureOfInterestRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetFeatureOfInterestRequest.java @@ -89,7 +89,7 @@ public List<TemporalFilter> getTemporalFilters() { * Set temporal filters * * @param temporalFilters - * temporal filters + * temporal filters */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GetFeatureOfInterestRequest setTemporalFilters(List<TemporalFilter> temporalFilters) { @@ -113,7 +113,7 @@ public List<String> getFeatureIdentifiers() { * Set FOI identifiers * * @param featureIDs - * FOI identifiers + * FOI identifiers */ public GetFeatureOfInterestRequest setFeatureIdentifiers(Collection<String> featureIDs) { this.featureIdentifiers.clear(); @@ -136,7 +136,7 @@ public List<String> getObservedProperties() { * Set FOI observedProperties * * @param observedProperties - * FOI observedProperties + * FOI observedProperties */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GetFeatureOfInterestRequest setObservedProperties(List<String> observedProperties) { @@ -160,7 +160,7 @@ public List<String> getProcedures() { * Set FOI procedures * * @param procedures - * FOI procedures + * FOI procedures */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GetFeatureOfInterestRequest setProcedures(List<String> procedures) { @@ -184,7 +184,7 @@ public List<SpatialFilter> getSpatialFilters() { * Set spatial filters * * @param spatialFilters - * spatial filters + * spatial filters */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GetFeatureOfInterestRequest setSpatialFilters(List<SpatialFilter> spatialFilters) { @@ -237,8 +237,8 @@ public boolean containsOnlyFeatureParameter() { } public boolean hasNoParameter() { - return !isSetObservableProperties() && !isSetProcedures() && !isSetTemporalFilters() && - !isSetFeatureOfInterestIdentifiers() && !isSetSpatialFilters(); + return !isSetObservableProperties() && !isSetProcedures() && !isSetTemporalFilters() + && !isSetFeatureOfInterestIdentifiers() && !isSetSpatialFilters(); } public boolean hasParameter() { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationByIdRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationByIdRequest.java index d2ad70586..3c5d372b7 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationByIdRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationByIdRequest.java @@ -65,8 +65,8 @@ public boolean isSetObservationIdentifier() { * Set observation identifier * * @param observationIdentifier - * observation identifier - * @return + * observation identifier + * @return this */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public GetObservationByIdRequest setObservationIdentifier(Collection<String> observationIdentifier) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationRequest.java index fdc7aa61c..7b744d74b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationRequest.java @@ -56,9 +56,7 @@ * * @since 1.0.0 */ -public class GetObservationRequest - extends AbstractObservationRequest - implements SpatialFeatureQueryRequest { +public class GetObservationRequest extends AbstractObservationRequest implements SpatialFeatureQueryRequest { /** * Request as String. @@ -265,7 +263,6 @@ public Filter getResultFilter() { return resultFilter; } - public GetObservationRequest setResultFilter(ComparisonFilter filter) { this.resultFilter = filter; addExtension(new ResultFilter(filter)); @@ -441,9 +438,9 @@ public boolean isEmpty() { public boolean hasSpatialFilteringProfileSpatialFilter() { return isSetSpatialFilter() && (getSpatialFilter().getValueReference() .equals(Sos2Constants.VALUE_REFERENCE_SPATIAL_FILTERING_PROFILE) - || (hasExtension(SosSpatialFilterConstants.SPATIAL_FILTER) + || hasExtension(SosSpatialFilterConstants.SPATIAL_FILTER) && ((SosSpatialFilter) getExtension(SosSpatialFilterConstants.SPATIAL_FILTER).get()).getValue() - .getValueReference().equals(Sos2Constants.VALUE_REFERENCE_SPATIAL_FILTERING_PROFILE))); + .getValueReference().equals(Sos2Constants.VALUE_REFERENCE_SPATIAL_FILTERING_PROFILE)); } public boolean isSetRequestString() { @@ -466,8 +463,7 @@ public boolean isSetMergeObservationValues() { /** * Check if the {@link Extensions} contains {@link Filter} * - * @return <code>true</code>, if the {@link Extensions} contains - * {@link Filter} + * @return <code>true</code>, if the {@link Extensions} contains {@link Filter} */ public boolean isSetFesFilterExtension() { return getExtensions().stream().anyMatch(this::isFesFilterExtension); @@ -484,10 +480,8 @@ public Set<Extension<?>> getFesFilterExtensions() { } private boolean isFesFilterExtension(Extension<?> extension) { - return !((extension instanceof ResultFilter) - || (extension instanceof SpatialFilter) - || (extension instanceof SosSpatialFilter)) - && extension.getValue() instanceof Filter<?>; + return !(extension instanceof ResultFilter || extension instanceof SpatialFilter + || extension instanceof SosSpatialFilter) && extension.getValue() instanceof Filter<?>; } private boolean isFirstLatest(IndeterminateValue v) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetResultRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetResultRequest.java index 35e45841a..3920aa442 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetResultRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetResultRequest.java @@ -36,9 +36,7 @@ * @since 1.0.0 * */ -public class GetResultRequest - extends OwsServiceRequest - implements SpatialFeatureQueryRequest { +public class GetResultRequest extends OwsServiceRequest implements SpatialFeatureQueryRequest { /** * Identifier for the observation template @@ -83,7 +81,7 @@ public String getObservationTemplateIdentifier() { * * @param observationTemplateIdentifier * observation template identifier - * @return + * @return this */ public GetResultRequest setObservationTemplateIdentifier(String observationTemplateIdentifier) { this.observationTemplateIdentifier = observationTemplateIdentifier; @@ -135,7 +133,7 @@ public List<String> getFeatureIdentifiers() { * * @param featureIdentifiers * FOI identifiers - * @return + * @return this */ @Override public void setFeatureIdentifiers(List<String> featureIdentifiers) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetResultTemplateRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetResultTemplateRequest.java index db203021d..7f944705f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetResultTemplateRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/GetResultTemplateRequest.java @@ -24,8 +24,7 @@ * @since 1.0.0 * */ -public class GetResultTemplateRequest - extends OwsServiceRequest { +public class GetResultTemplateRequest extends OwsServiceRequest { private String offering; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertObservationRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertObservationRequest.java index 54c2426f4..7ad88b0be 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertObservationRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertObservationRequest.java @@ -42,8 +42,7 @@ * * @since 1.0.0 */ -public class InsertObservationRequest - extends OwsServiceRequest { +public class InsertObservationRequest extends OwsServiceRequest { /** * Assigned sensor id @@ -143,8 +142,8 @@ public boolean isSetExtensionSplitDataArrayIntoObservations() { } /** - * Checks if an observation contains referenced elements. Checked elements - * are phenomenonTime, resultTime and featureOfInterest. + * Checks if an observation contains referenced elements. Checked elements are phenomenonTime, resultTime + * and featureOfInterest. * * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 4.3.7 diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertResultRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertResultRequest.java index 98142190d..d5291e6eb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertResultRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertResultRequest.java @@ -24,8 +24,7 @@ * @since 1.0.0 * */ -public class InsertResultRequest - extends OwsServiceRequest { +public class InsertResultRequest extends OwsServiceRequest { private String templateIdentifier; private String resultValues; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertResultTemplateRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertResultTemplateRequest.java index f2cda1c9c..784030510 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertResultTemplateRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertResultTemplateRequest.java @@ -16,7 +16,6 @@ package org.n52.shetland.ogc.sos.request; import org.joda.time.DateTime; - import org.n52.shetland.ogc.gml.CodeWithAuthority; import org.n52.shetland.ogc.om.OmObservationConstellation; import org.n52.shetland.ogc.ows.service.OwsServiceRequest; @@ -31,8 +30,7 @@ /** * @since 1.0.0 */ -public class InsertResultTemplateRequest - extends OwsServiceRequest { +public class InsertResultTemplateRequest extends OwsServiceRequest { private OmObservationConstellation observationTemplate; private final SosResultTemplate resultTemplate = new SosResultTemplate(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertSensorRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertSensorRequest.java index 62ab78148..bf9edf183 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertSensorRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/InsertSensorRequest.java @@ -52,7 +52,7 @@ public class InsertSensorRequest extends OwsServiceRequest { */ private SosProcedureDescription<?> procedureDescription; private String assignedProcedureIdentifier; - private List<SosOffering> assignedOfferings = new LinkedList<>(); + private List<SosOffering> assignedOfferings = new LinkedList<>(); /** * metadata parameter @@ -101,7 +101,7 @@ public List<String> getObservableProperty() { * Set the observableProperty contained in request. * * @param observableProperty - * the observableProperty to set + * the observableProperty to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public InsertSensorRequest setObservableProperty(Collection<String> observableProperty) { @@ -130,7 +130,7 @@ public SosProcedureDescription<?> getProcedureDescription() { * Set the sensor description contained in request. * * @param procedureDescription - * the procedureDescription to set + * the procedureDescription to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public InsertSensorRequest setProcedureDescription(SosProcedureDescription<?> procedureDescription) { @@ -155,7 +155,7 @@ public SosInsertionMetadata getMetadata() { * Set the metadata contained in request. * * @param metadata - * the metadata to set + * the metadata to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public InsertSensorRequest setMetadata(SosInsertionMetadata metadata) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosDescribeFeatureTypeRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosDescribeFeatureTypeRequest.java index 26714e1aa..e051a2f95 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosDescribeFeatureTypeRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosDescribeFeatureTypeRequest.java @@ -23,8 +23,7 @@ * * @since 1.0.0 */ -public class SosDescribeFeatureTypeRequest - extends OwsServiceRequest { +public class SosDescribeFeatureTypeRequest extends OwsServiceRequest { /** * FeatureOfInterest identifier diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosDescribeObservationTypeRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosDescribeObservationTypeRequest.java index 99a57b9d8..2e5b15ea4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosDescribeObservationTypeRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosDescribeObservationTypeRequest.java @@ -23,8 +23,7 @@ * * @since 1.0.0 */ -public class SosDescribeObservationTypeRequest - extends OwsServiceRequest { +public class SosDescribeObservationTypeRequest extends OwsServiceRequest { public SosDescribeObservationTypeRequest() { super(null, null, Sos1Constants.Operations.DescribeObservationType.name()); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosGetFeatureOfInterestTimeRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosGetFeatureOfInterestTimeRequest.java index 13b9a9ebd..c68766a6d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosGetFeatureOfInterestTimeRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosGetFeatureOfInterestTimeRequest.java @@ -23,8 +23,7 @@ * * @since 1.0.0 */ -public class SosGetFeatureOfInterestTimeRequest - extends OwsServiceRequest { +public class SosGetFeatureOfInterestTimeRequest extends OwsServiceRequest { /** * FOI identifier diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosRegisterSensorRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosRegisterSensorRequest.java index feb3ed1ff..5bc526cdd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosRegisterSensorRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SosRegisterSensorRequest.java @@ -31,8 +31,7 @@ * * @since 1.0.0 */ -public class SosRegisterSensorRequest - extends OwsServiceRequest { +public class SosRegisterSensorRequest extends OwsServiceRequest { /** * SOS Sensor system @@ -65,8 +64,7 @@ public class SosRegisterSensorRequest * FeatureOfInterest */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) - public SosRegisterSensorRequest( - Collection<AbstractPhenomenon> observableProperties, String sensorDescription, + public SosRegisterSensorRequest(Collection<AbstractPhenomenon> observableProperties, String sensorDescription, Collection<AbstractFeature> featuresOfInterest) { super(null, null, Sos1Constants.Operations.RegisterSensor.name()); // this.system = system; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SpatialFeatureQueryRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SpatialFeatureQueryRequest.java index 35e581944..840bb2f32 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SpatialFeatureQueryRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SpatialFeatureQueryRequest.java @@ -16,14 +16,13 @@ package org.n52.shetland.ogc.sos.request; /** - * Interface to merge {@link SpatialFeatureQueryRequest} and - * {@link FeatureOfInterestIdentifierRequest} interfaces to be used by - * {@link GetObservationRequest} and {@link GetResultRequest} + * Interface to merge {@link SpatialFeatureQueryRequest} and {@link FeatureOfInterestIdentifierRequest} + * interfaces to be used by {@link GetObservationRequest} and {@link GetResultRequest} * * @since 1.0.0 * */ -public interface SpatialFeatureQueryRequest extends SpatialFilteringProfileRequest, - FeatureOfInterestIdentifierRequest { +public interface SpatialFeatureQueryRequest + extends SpatialFilteringProfileRequest, FeatureOfInterestIdentifierRequest { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SpatialFilteringProfileRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SpatialFilteringProfileRequest.java index 531b26225..accb88c65 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SpatialFilteringProfileRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/SpatialFilteringProfileRequest.java @@ -26,7 +26,6 @@ */ public interface SpatialFilteringProfileRequest { - /** * Get SpatialFilter * @@ -37,7 +36,8 @@ public interface SpatialFilteringProfileRequest { /** * Set SpatialFilter * - * @param spatialFilter SpatialFilter to set + * @param spatialFilter + * SpatialFilter to set */ void setSpatialFilter(SpatialFilter spatialFilter); @@ -56,8 +56,8 @@ default boolean isSetSpatialFilter() { * @return True if SpatialFilter is a SpatialFilteringProfile spatial filter */ default boolean hasSpatialFilteringProfileSpatialFilter() { - return isSetSpatialFilter() && - getSpatialFilter().getValueReference().equals(Sos2Constants.VALUE_REFERENCE_SPATIAL_FILTERING_PROFILE); + return isSetSpatialFilter() && getSpatialFilter().getValueReference() + .equals(Sos2Constants.VALUE_REFERENCE_SPATIAL_FILTERING_PROFILE); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/UpdateSensorRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/UpdateSensorRequest.java index 37016502c..b93cf6de6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/UpdateSensorRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/request/UpdateSensorRequest.java @@ -15,7 +15,6 @@ */ package org.n52.shetland.ogc.sos.request; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.LinkedList; @@ -69,7 +68,7 @@ public String getProcedureIdentifier() { /** * @param procedureIdentifier - * the procedureIdentifier to set + * the procedureIdentifier to set */ public void setProcedureIdentifier(String procedureIdentifier) { this.procedureIdentifier = procedureIdentifier; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/AbstractObservationResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/AbstractObservationResponse.java index 50b93a715..9538b28d6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/AbstractObservationResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/AbstractObservationResponse.java @@ -29,9 +29,7 @@ * * @since 1.0.0 */ -public abstract class AbstractObservationResponse - extends OwsServiceResponse - implements ResponseFormat { +public abstract class AbstractObservationResponse extends OwsServiceResponse implements ResponseFormat { private ObservationStream observationCollection = ObservationStream.empty(); private String responseFormat; private String resultModel; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/AbstractStreaming.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/AbstractStreaming.java index 2cffe9b7b..1e42ead3a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/AbstractStreaming.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/AbstractStreaming.java @@ -31,8 +31,7 @@ import com.google.common.collect.Maps; -public abstract class AbstractStreaming - extends AbstractObservationValue<Value<ObservationStream>> +public abstract class AbstractStreaming extends AbstractObservationValue<Value<ObservationStream>> implements ObservationStream { private final Map<AdditionalRequestParams, Object> additionalRequestParams = Maps.newHashMap(); @@ -43,16 +42,13 @@ public abstract class AbstractStreaming private ObservationMergeIndicator mergeIndicator; @Override - public abstract OmObservation next() - throws NoSuchElementException, OwsExceptionReport; + public abstract OmObservation next() throws NoSuchElementException, OwsExceptionReport; @Override - public abstract boolean hasNext() - throws OwsExceptionReport; + public abstract boolean hasNext() throws OwsExceptionReport; /** - * Check and modify observation for Spatial Filtering Profile and requested - * crs + * Check and modify observation for Spatial Filtering Profile and requested crs * * @param observation * {@link OmObservation} to check @@ -60,8 +56,7 @@ public abstract boolean hasNext() * @throws OwsExceptionReport * If an error occurs when modifying the {@link OmObservation} */ - protected abstract void checkForModifications(OmObservation observation) - throws OwsExceptionReport; + protected abstract void checkForModifications(OmObservation observation) throws OwsExceptionReport; public void add(AdditionalRequestParams parameter, Object object) { additionalRequestParams.put(parameter, object); @@ -116,8 +111,7 @@ public void setMaxNumberOfValues(int maxNumberOfValues) { * @throws CodedException * If the size limit is exceeded */ - protected void checkMaxNumberOfReturnedValues(int size) - throws OwsExceptionReport { + protected void checkMaxNumberOfReturnedValues(int size) throws OwsExceptionReport { if (getMaxNumberOfValues() > 0) { currentNumberOfValues += size; if (currentNumberOfValues > getMaxNumberOfValues()) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/BinaryAttachmentResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/BinaryAttachmentResponse.java index 436852f08..afeb035b8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/BinaryAttachmentResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/BinaryAttachmentResponse.java @@ -19,7 +19,6 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - /** * Simple response class for binary data to be included as a response attachment (for download) * @@ -27,7 +26,7 @@ * * @since 1.0.0 */ -@SuppressFBWarnings({"EI_EXPOSE_REP", "EI_EXPOSE_REP2"}) +@SuppressFBWarnings({ "EI_EXPOSE_REP", "EI_EXPOSE_REP2" }) public class BinaryAttachmentResponse { private byte[] bytes; private MediaType contentType; @@ -69,8 +68,7 @@ public int getSize() { @Override public String toString() { - return "BinaryAttachmentResponse [size = " + getSize() - + ", contentType=" + contentType - + ", filename=" + filename + "]"; + return "BinaryAttachmentResponse [size = " + getSize() + ", contentType=" + contentType + ", filename=" + + filename + "]"; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/DescribeSensorResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/DescribeSensorResponse.java index b90e08ffd..869e1ca2d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/DescribeSensorResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/DescribeSensorResponse.java @@ -56,8 +56,8 @@ public void setOutputFormat(String outputFormat) { public void setSensorDescriptions(List<SosProcedureDescription<?>> procedureDescriptions) { if (isSetProcedureDescriptions()) { - this.procedureDescriptions = CollectionHelper - .conjunctCollections(getProcedureDescriptions(), procedureDescriptions); + this.procedureDescriptions = + CollectionHelper.conjunctCollections(getProcedureDescriptions(), procedureDescriptions); } else { this.procedureDescriptions.addAll(procedureDescriptions); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetFeatureOfInterestResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetFeatureOfInterestResponse.java index 0a95240a9..e1be7ea8b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetFeatureOfInterestResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetFeatureOfInterestResponse.java @@ -25,8 +25,7 @@ * @since 1.0.0 * */ -public class GetFeatureOfInterestResponse - extends OwsServiceResponse { +public class GetFeatureOfInterestResponse extends OwsServiceResponse { private AbstractFeature abstractFeature; @@ -52,8 +51,8 @@ public GetFeatureOfInterestResponse(String service, String version, AbstractFeat } @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) - public GetFeatureOfInterestResponse( - String service, String version, String operationName, AbstractFeature abstractFeature) { + public GetFeatureOfInterestResponse(String service, String version, String operationName, + AbstractFeature abstractFeature) { super(service, version, operationName); this.abstractFeature = abstractFeature; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetObservationResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetObservationResponse.java index 7c3cf1d67..0a9e9e1da 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetObservationResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetObservationResponse.java @@ -15,7 +15,6 @@ */ package org.n52.shetland.ogc.sos.response; - import org.n52.shetland.ogc.sos.SosConstants; /** diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetResultResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetResultResponse.java index 5446b7afb..1179a648c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetResultResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/response/GetResultResponse.java @@ -15,8 +15,8 @@ */ package org.n52.shetland.ogc.sos.response; -import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.ogc.ows.service.OwsServiceResponse; +import org.n52.shetland.ogc.sos.SosConstants; /** * @since 1.0.0 diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ro/RelatedOfferings.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ro/RelatedOfferings.java index 737cba055..9d3193252 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ro/RelatedOfferings.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/ro/RelatedOfferings.java @@ -34,7 +34,6 @@ public class RelatedOfferings implements Extension<Set<OfferingContext>> { private String definition; private Set<OfferingContext> offeringRelations = Sets.newHashSet(); - @Override public String getNamespace() { return RelatedOfferingConstants.NS_RO; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/DatastreamEntityDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/DatastreamEntityDefinition.java index 98e6811bf..41a957f1d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/DatastreamEntityDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/DatastreamEntityDefinition.java @@ -27,21 +27,15 @@ public class DatastreamEntityDefinition extends STAEntityDefinition { public static final String ENTITY_SET_NAME = DATASTREAMS; - private static final String[] NAV_PROPS_MANDATORY = new String[]{SENSOR, - THING, - OBSERVED_PROPERTY}; + private static final String[] NAV_PROPS_MANDATORY = new String[] { SENSOR, THING, OBSERVED_PROPERTY }; - private static final String[] NAV_PROPS_OPTIONAL = new String[]{OBSERVATIONS}; + private static final String[] NAV_PROPS_OPTIONAL = new String[] { OBSERVATIONS }; - private static final String[] ENTITY_PROPS_MANDATORY = new String[]{PROP_ID, - PROP_NAME, - PROP_DESCRIPTION, - PROP_OBSERVATION_TYPE, - PROP_UOM}; + private static final String[] ENTITY_PROPS_MANDATORY = + new String[] { PROP_ID, PROP_NAME, PROP_DESCRIPTION, PROP_OBSERVATION_TYPE, PROP_UOM }; - private static final String[] ENTITY_PROPS_OPTIONAL = new String[]{PROP_OBSERVED_AREA, - PROP_PHENOMENON_TIME, - PROP_RESULT_TIME}; + private static final String[] ENTITY_PROPS_OPTIONAL = + new String[] { PROP_OBSERVED_AREA, PROP_PHENOMENON_TIME, PROP_RESULT_TIME }; public static final Set<String> NAVIGATION_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_OPTIONAL))); @@ -49,9 +43,8 @@ public class DatastreamEntityDefinition extends STAEntityDefinition { public static final Set<String> NAVIGATION_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_MANDATORY))); - public static final Set<String> NAVIGATION_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY)); + public static final Set<String> NAVIGATION_PROPERTIES = Collections.unmodifiableSet( + STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY)); public static final Set<String> ENTITY_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_OPTIONAL))); @@ -59,14 +52,11 @@ public class DatastreamEntityDefinition extends STAEntityDefinition { public static final Set<String> ENTITY_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_MANDATORY))); - public static final Set<String> ENTITY_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY)); + public static final Set<String> ENTITY_PROPERTIES = Collections + .unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, ENTITY_PROPERTIES_MANDATORY)); public DatastreamEntityDefinition() { - super(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY, - ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY); + super(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY, ENTITY_PROPERTIES_OPTIONAL, + ENTITY_PROPERTIES_MANDATORY); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/FeatureOfInterestEntityDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/FeatureOfInterestEntityDefinition.java index 0441b32de..b81dec1cf 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/FeatureOfInterestEntityDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/FeatureOfInterestEntityDefinition.java @@ -27,17 +27,14 @@ public class FeatureOfInterestEntityDefinition extends STAEntityDefinition { public static final String ENTITY_SET_NAME = FEATURES_OF_INTEREST; - private static final String[] NAV_PROPS_MANDATORY = new String[]{}; + private static final String[] NAV_PROPS_MANDATORY = new String[] {}; - private static final String[] NAV_PROPS_OPTIONAL = new String[]{OBSERVATIONS}; + private static final String[] NAV_PROPS_OPTIONAL = new String[] { OBSERVATIONS }; - private static final String[] ENTITY_PROPS_MANDATORY = new String[]{PROP_ID, - PROP_NAME, - PROP_DESCRIPTION, - PROP_ENCODINGTYPE, - PROP_FEATURE}; + private static final String[] ENTITY_PROPS_MANDATORY = + new String[] { PROP_ID, PROP_NAME, PROP_DESCRIPTION, PROP_ENCODINGTYPE, PROP_FEATURE }; - private static final String[] ENTITY_PROPS_OPTIONAL = new String[]{}; + private static final String[] ENTITY_PROPS_OPTIONAL = new String[] {}; public static final Set<String> NAVIGATION_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_OPTIONAL))); @@ -45,9 +42,8 @@ public class FeatureOfInterestEntityDefinition extends STAEntityDefinition { public static final Set<String> NAVIGATION_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_MANDATORY))); - public static final Set<String> NAVIGATION_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY)); + public static final Set<String> NAVIGATION_PROPERTIES = Collections.unmodifiableSet( + STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY)); public static final Set<String> ENTITY_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_OPTIONAL))); @@ -55,14 +51,11 @@ public class FeatureOfInterestEntityDefinition extends STAEntityDefinition { public static final Set<String> ENTITY_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_MANDATORY))); - public static final Set<String> ENTITY_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY)); + public static final Set<String> ENTITY_PROPERTIES = Collections + .unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, ENTITY_PROPERTIES_MANDATORY)); public FeatureOfInterestEntityDefinition() { - super(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY, - ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY); + super(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY, ENTITY_PROPERTIES_OPTIONAL, + ENTITY_PROPERTIES_MANDATORY); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/HistoricalLocationEntityDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/HistoricalLocationEntityDefinition.java index 03aa3b577..9e9cb770a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/HistoricalLocationEntityDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/HistoricalLocationEntityDefinition.java @@ -27,13 +27,13 @@ public class HistoricalLocationEntityDefinition extends STAEntityDefinition { public static final String ENTITY_SET_NAME = HISTORICAL_LOCATIONS; - private static final String[] NAV_PROPS_MANDATORY = new String[]{THING, LOCATIONS}; + private static final String[] NAV_PROPS_MANDATORY = new String[] { THING, LOCATIONS }; - private static final String[] NAV_PROPS_OPTIONAL = new String[]{}; + private static final String[] NAV_PROPS_OPTIONAL = new String[] {}; - private static final String[] ENTITY_PROPS_MANDATORY = new String[]{PROP_ID, PROP_TIME}; + private static final String[] ENTITY_PROPS_MANDATORY = new String[] { PROP_ID, PROP_TIME }; - private static final String[] ENTITY_PROPS_OPTIONAL = new String[]{}; + private static final String[] ENTITY_PROPS_OPTIONAL = new String[] {}; public static final Set<String> NAVIGATION_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_OPTIONAL))); @@ -41,9 +41,8 @@ public class HistoricalLocationEntityDefinition extends STAEntityDefinition { public static final Set<String> NAVIGATION_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_MANDATORY))); - public static final Set<String> NAVIGATION_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY)); + public static final Set<String> NAVIGATION_PROPERTIES = Collections.unmodifiableSet( + STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY)); public static final Set<String> ENTITY_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_OPTIONAL))); @@ -51,14 +50,11 @@ public class HistoricalLocationEntityDefinition extends STAEntityDefinition { public static final Set<String> ENTITY_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_MANDATORY))); - public static final Set<String> ENTITY_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY)); + public static final Set<String> ENTITY_PROPERTIES = Collections + .unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, ENTITY_PROPERTIES_MANDATORY)); public HistoricalLocationEntityDefinition() { - super(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY, - ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY); + super(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY, ENTITY_PROPERTIES_OPTIONAL, + ENTITY_PROPERTIES_MANDATORY); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/LocationEntityDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/LocationEntityDefinition.java index 4a6f813b1..421a1579f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/LocationEntityDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/LocationEntityDefinition.java @@ -27,18 +27,14 @@ public class LocationEntityDefinition extends STAEntityDefinition { public static final String ENTITY_SET_NAME = LOCATIONS; - private static final String[] NAV_PROPS_MANDATORY = new String[]{}; + private static final String[] NAV_PROPS_MANDATORY = new String[] {}; - private static final String[] NAV_PROPS_OPTIONAL = new String[]{THINGS, - HISTORICAL_LOCATIONS}; + private static final String[] NAV_PROPS_OPTIONAL = new String[] { THINGS, HISTORICAL_LOCATIONS }; - private static final String[] ENTITY_PROPS_MANDATORY = new String[]{PROP_ID, - PROP_NAME, - PROP_DESCRIPTION, - PROP_ENCODINGTYPE, - PROP_LOCATION}; + private static final String[] ENTITY_PROPS_MANDATORY = + new String[] { PROP_ID, PROP_NAME, PROP_DESCRIPTION, PROP_ENCODINGTYPE, PROP_LOCATION }; - private static final String[] ENTITY_PROPS_OPTIONAL = new String[]{}; + private static final String[] ENTITY_PROPS_OPTIONAL = new String[] {}; public static final Set<String> NAVIGATION_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_OPTIONAL))); @@ -46,9 +42,8 @@ public class LocationEntityDefinition extends STAEntityDefinition { public static final Set<String> NAVIGATION_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_MANDATORY))); - public static final Set<String> NAVIGATION_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY)); + public static final Set<String> NAVIGATION_PROPERTIES = Collections.unmodifiableSet( + STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY)); public static final Set<String> ENTITY_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_OPTIONAL))); @@ -56,14 +51,11 @@ public class LocationEntityDefinition extends STAEntityDefinition { public static final Set<String> ENTITY_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_MANDATORY))); - public static final Set<String> ENTITY_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY)); + public static final Set<String> ENTITY_PROPERTIES = Collections + .unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, ENTITY_PROPERTIES_MANDATORY)); public LocationEntityDefinition() { - super(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY, - ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY); + super(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY, ENTITY_PROPERTIES_OPTIONAL, + ENTITY_PROPERTIES_MANDATORY); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/ObservationEntityDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/ObservationEntityDefinition.java index 42b40e1e7..115b3b080 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/ObservationEntityDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/ObservationEntityDefinition.java @@ -27,19 +27,15 @@ public class ObservationEntityDefinition extends STAEntityDefinition { public static final String ENTITY_SET_NAME = OBSERVATIONS; - private static final String[] NAV_PROPS_MANDATORY = new String[]{DATASTREAM, - FEATURE_OF_INTEREST}; + private static final String[] NAV_PROPS_MANDATORY = new String[] { DATASTREAM, FEATURE_OF_INTEREST }; - private static final String[] NAV_PROPS_OPTIONAL = new String[]{}; + private static final String[] NAV_PROPS_OPTIONAL = new String[] {}; - private static final String[] ENTITY_PROPS_MANDATORY = new String[]{PROP_ID, - PROP_PHENOMENON_TIME, - PROP_RESULT, - PROP_RESULT_TIME}; + private static final String[] ENTITY_PROPS_MANDATORY = + new String[] { PROP_ID, PROP_PHENOMENON_TIME, PROP_RESULT, PROP_RESULT_TIME }; - private static final String[] ENTITY_PROPS_OPTIONAL = new String[]{PROP_RESULT_QUALITY, - PROP_VALID_TIME, - PROP_PARAMETERS}; + private static final String[] ENTITY_PROPS_OPTIONAL = + new String[] { PROP_RESULT_QUALITY, PROP_VALID_TIME, PROP_PARAMETERS }; public static final Set<String> NAVIGATION_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_OPTIONAL))); @@ -47,9 +43,8 @@ public class ObservationEntityDefinition extends STAEntityDefinition { public static final Set<String> NAVIGATION_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_MANDATORY))); - public static final Set<String> NAVIGATION_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY)); + public static final Set<String> NAVIGATION_PROPERTIES = Collections.unmodifiableSet( + STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY)); public static final Set<String> ENTITY_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_OPTIONAL))); @@ -57,14 +52,11 @@ public class ObservationEntityDefinition extends STAEntityDefinition { public static final Set<String> ENTITY_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_MANDATORY))); - public static final Set<String> ENTITY_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY)); + public static final Set<String> ENTITY_PROPERTIES = Collections + .unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, ENTITY_PROPERTIES_MANDATORY)); public ObservationEntityDefinition() { - super(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY, - ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY); + super(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY, ENTITY_PROPERTIES_OPTIONAL, + ENTITY_PROPERTIES_MANDATORY); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/ObservedPropertyEntityDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/ObservedPropertyEntityDefinition.java index 4add55d22..d82339473 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/ObservedPropertyEntityDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/ObservedPropertyEntityDefinition.java @@ -27,17 +27,14 @@ public class ObservedPropertyEntityDefinition extends STAEntityDefinition { public static final String ENTITY_SET_NAME = OBSERVED_PROPERTIES; - private static final String[] NAV_PROPS_MANDATORY = new String[]{}; + private static final String[] NAV_PROPS_MANDATORY = new String[] {}; - private static final String[] NAV_PROPS_OPTIONAL = new String[]{DATASTREAMS - }; + private static final String[] NAV_PROPS_OPTIONAL = new String[] { DATASTREAMS }; - private static final String[] ENTITY_PROPS_MANDATORY = new String[]{PROP_ID, - PROP_NAME, - PROP_DESCRIPTION, - PROP_DEFINITION}; + private static final String[] ENTITY_PROPS_MANDATORY = + new String[] { PROP_ID, PROP_NAME, PROP_DESCRIPTION, PROP_DEFINITION }; - private static final String[] ENTITY_PROPS_OPTIONAL = new String[]{}; + private static final String[] ENTITY_PROPS_OPTIONAL = new String[] {}; public static final Set<String> NAVIGATION_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_OPTIONAL))); @@ -45,9 +42,8 @@ public class ObservedPropertyEntityDefinition extends STAEntityDefinition { public static final Set<String> NAVIGATION_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_MANDATORY))); - public static final Set<String> NAVIGATION_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY)); + public static final Set<String> NAVIGATION_PROPERTIES = Collections.unmodifiableSet( + STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY)); public static final Set<String> ENTITY_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_OPTIONAL))); @@ -55,14 +51,11 @@ public class ObservedPropertyEntityDefinition extends STAEntityDefinition { public static final Set<String> ENTITY_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_MANDATORY))); - public static final Set<String> ENTITY_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY)); + public static final Set<String> ENTITY_PROPERTIES = Collections + .unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, ENTITY_PROPERTIES_MANDATORY)); public ObservedPropertyEntityDefinition() { - super(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY, - ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY); + super(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY, ENTITY_PROPERTIES_OPTIONAL, + ENTITY_PROPERTIES_MANDATORY); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/STAEntityDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/STAEntityDefinition.java index d06792d78..477430561 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/STAEntityDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/STAEntityDefinition.java @@ -15,25 +15,19 @@ */ package org.n52.shetland.ogc.sta.model; -import org.n52.shetland.ogc.sta.StaConstants; - import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.n52.shetland.ogc.sta.StaConstants; + @SuppressWarnings("VisibilityModifier") public abstract class STAEntityDefinition implements StaConstants { - public static String[] ALLCOLLECTIONS = new String[]{DATASTREAMS, - OBSERVATIONS, - THINGS, - LOCATIONS, - HISTORICAL_LOCATIONS, - SENSORS, - OBSERVED_PROPERTIES, - FEATURES_OF_INTEREST}; + public static String[] ALLCOLLECTIONS = new String[] { DATASTREAMS, OBSERVATIONS, THINGS, LOCATIONS, + HISTORICAL_LOCATIONS, SENSORS, OBSERVED_PROPERTIES, FEATURES_OF_INTEREST }; // Map from EntityName to Definition public static Map<String, STAEntityDefinition> definitions = createMap(); @@ -43,10 +37,8 @@ public abstract class STAEntityDefinition implements StaConstants { private final Set<String> entityPropsOptional; private final Set<String> entityPropsMandatory; - protected STAEntityDefinition(Set<String> navPropOptional, - Set<String> navPropMandatory, - Set<String> entityPropOptional, - Set<String> entityPropMandatory) { + protected STAEntityDefinition(Set<String> navPropOptional, Set<String> navPropMandatory, + Set<String> entityPropOptional, Set<String> entityPropMandatory) { this.navPropsOptional = navPropOptional; this.navPropsMandatory = navPropMandatory; this.entityPropsOptional = entityPropOptional; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/SensorEntityDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/SensorEntityDefinition.java index 18ad5332b..b9c349661 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/SensorEntityDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/SensorEntityDefinition.java @@ -27,17 +27,14 @@ public class SensorEntityDefinition extends STAEntityDefinition { public static final String ENTITY_SET_NAME = SENSORS; - private static final String[] NAV_PROPS_MANDATORY = new String[]{}; + private static final String[] NAV_PROPS_MANDATORY = new String[] {}; - private static final String[] NAV_PROPS_OPTIONAL = new String[]{DATASTREAMS}; + private static final String[] NAV_PROPS_OPTIONAL = new String[] { DATASTREAMS }; - private static final String[] ENTITY_PROPS_MANDATORY = new String[]{PROP_ID, - PROP_NAME, - PROP_DESCRIPTION, - PROP_ENCODINGTYPE, - PROP_METADATA}; + private static final String[] ENTITY_PROPS_MANDATORY = + new String[] { PROP_ID, PROP_NAME, PROP_DESCRIPTION, PROP_ENCODINGTYPE, PROP_METADATA }; - private static final String[] ENTITY_PROPS_OPTIONAL = new String[]{}; + private static final String[] ENTITY_PROPS_OPTIONAL = new String[] {}; public static final Set<String> NAVIGATION_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_OPTIONAL))); @@ -45,9 +42,8 @@ public class SensorEntityDefinition extends STAEntityDefinition { public static final Set<String> NAVIGATION_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_MANDATORY))); - public static final Set<String> NAVIGATION_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY)); + public static final Set<String> NAVIGATION_PROPERTIES = Collections.unmodifiableSet( + STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY)); public static final Set<String> ENTITY_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_OPTIONAL))); @@ -55,14 +51,11 @@ public class SensorEntityDefinition extends STAEntityDefinition { public static final Set<String> ENTITY_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_MANDATORY))); - public static final Set<String> ENTITY_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY)); + public static final Set<String> ENTITY_PROPERTIES = Collections + .unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, ENTITY_PROPERTIES_MANDATORY)); public SensorEntityDefinition() { - super(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY, - ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY); + super(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY, ENTITY_PROPERTIES_OPTIONAL, + ENTITY_PROPERTIES_MANDATORY); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/ThingEntityDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/ThingEntityDefinition.java index d50871fe1..0394a3350 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/ThingEntityDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sta/model/ThingEntityDefinition.java @@ -27,19 +27,13 @@ public class ThingEntityDefinition extends STAEntityDefinition { public static final String ENTITY_SET_NAME = THINGS; - private static final String[] NAV_PROPS_OPTIONAL = new String[]{DATASTREAMS, - LOCATIONS, - HISTORICAL_LOCATIONS}; + private static final String[] NAV_PROPS_OPTIONAL = new String[] { DATASTREAMS, LOCATIONS, HISTORICAL_LOCATIONS }; - private static final String[] NAV_PROPS_MANDATORY = new String[]{DATASTREAMS, - LOCATIONS, - HISTORICAL_LOCATIONS}; + private static final String[] NAV_PROPS_MANDATORY = new String[] { DATASTREAMS, LOCATIONS, HISTORICAL_LOCATIONS }; - private static final String[] ENTITY_PROPS_OPTIONAL = new String[]{PROP_PROPERTIES}; + private static final String[] ENTITY_PROPS_OPTIONAL = new String[] { PROP_PROPERTIES }; - private static final String[] ENTITY_PROPS_MANDATORY = new String[]{PROP_ID, - PROP_NAME, - PROP_DESCRIPTION}; + private static final String[] ENTITY_PROPS_MANDATORY = new String[] { PROP_ID, PROP_NAME, PROP_DESCRIPTION }; public static final Set<String> NAVIGATION_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_OPTIONAL))); @@ -47,9 +41,8 @@ public class ThingEntityDefinition extends STAEntityDefinition { public static final Set<String> NAVIGATION_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(NAV_PROPS_MANDATORY))); - public static final Set<String> NAVIGATION_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY)); + public static final Set<String> NAVIGATION_PROPERTIES = Collections.unmodifiableSet( + STAEntityDefinition.combineSets(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY)); public static final Set<String> ENTITY_PROPERTIES_OPTIONAL = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_OPTIONAL))); @@ -57,15 +50,12 @@ public class ThingEntityDefinition extends STAEntityDefinition { public static final Set<String> ENTITY_PROPERTIES_MANDATORY = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(ENTITY_PROPS_MANDATORY))); - public static final Set<String> ENTITY_PROPERTIES = - Collections.unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY)); + public static final Set<String> ENTITY_PROPERTIES = Collections + .unmodifiableSet(STAEntityDefinition.combineSets(ENTITY_PROPERTIES_OPTIONAL, ENTITY_PROPERTIES_MANDATORY)); public ThingEntityDefinition() { - super(NAVIGATION_PROPERTIES_OPTIONAL, - NAVIGATION_PROPERTIES_MANDATORY, - ENTITY_PROPERTIES_OPTIONAL, - ENTITY_PROPERTIES_MANDATORY); + super(NAVIGATION_PROPERTIES_OPTIONAL, NAVIGATION_PROPERTIES_MANDATORY, ENTITY_PROPERTIES_OPTIONAL, + ENTITY_PROPERTIES_MANDATORY); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractOptionalSweDataComponentVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractOptionalSweDataComponentVisitor.java index b5f30d36d..28bad864f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractOptionalSweDataComponentVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractOptionalSweDataComponentVisitor.java @@ -33,8 +33,9 @@ import org.n52.shetland.ogc.swe.simpleType.SweTimeRange; import org.n52.shetland.ogc.swe.stream.StreamingSweDataArray; -public class AbstractOptionalSweDataComponentVisitor<T, X extends Throwable> - implements SweDataComponentVisitor<Optional<T>, X> { +public class AbstractOptionalSweDataComponentVisitor< + T, + X extends Throwable> implements SweDataComponentVisitor<Optional<T>, X> { @Override public Optional<T> visit(SweField component) throws X { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractThrowingSweDataComponentVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractThrowingSweDataComponentVisitor.java index 4a7e3913b..44a5207fd 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractThrowingSweDataComponentVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractThrowingSweDataComponentVisitor.java @@ -32,8 +32,9 @@ import org.n52.shetland.ogc.swe.simpleType.SweTime; import org.n52.shetland.ogc.swe.simpleType.SweTimeRange; -public abstract class AbstractThrowingSweDataComponentVisitor<T, X extends Throwable> - implements SweDataComponentVisitor<T, X> { +public abstract class AbstractThrowingSweDataComponentVisitor< + T, + X extends Throwable> implements SweDataComponentVisitor<T, X> { private final Supplier<X> exceptionSupplier; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractThrowingVoidSweDataComponentVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractThrowingVoidSweDataComponentVisitor.java index d09970351..c0dc00d4c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractThrowingVoidSweDataComponentVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractThrowingVoidSweDataComponentVisitor.java @@ -34,8 +34,8 @@ import org.n52.shetland.ogc.swe.simpleType.SweTimeRange; import org.n52.shetland.ogc.swe.stream.StreamingSweDataArray; - -public class AbstractThrowingVoidSweDataComponentVisitor<X extends Throwable> extends VoidSweDataComponentVisitor<X> { +public class AbstractThrowingVoidSweDataComponentVisitor< + X extends Throwable> extends VoidSweDataComponentVisitor<X> { private final Supplier<X> exceptionSupplier; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractVoidSweDataComponentVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractVoidSweDataComponentVisitor.java index d41e6173c..c1ef5c146 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractVoidSweDataComponentVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/AbstractVoidSweDataComponentVisitor.java @@ -31,8 +31,8 @@ import org.n52.shetland.ogc.swe.simpleType.SweTimeRange; import org.n52.shetland.ogc.swe.stream.StreamingSweDataArray; - -public class AbstractVoidSweDataComponentVisitor<X extends Throwable> extends VoidSweDataComponentVisitor<X> { +public class AbstractVoidSweDataComponentVisitor< + X extends Throwable> extends VoidSweDataComponentVisitor<X> { @Override protected void _visit(SmlDataInterface component) throws X { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/DataRecord.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/DataRecord.java index 37d33b8bf..c92393ef1 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/DataRecord.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/DataRecord.java @@ -55,14 +55,12 @@ public interface DataRecord { boolean isSetFields(); /** - * Return the index of the first field with the given - * <tt>fieldNameOrElementDefinition</tt> or -1 if not found. + * Return the index of the first field with the given <tt>fieldNameOrElementDefinition</tt> or -1 if not + * found. * * @param fieldNameOrElementDefinition - * a definition identifying a {@link SweField} in this - * {@link DataRecord}. - * @return the index of the first field with the given fieldDefinition or -1 - * if not found. + * a definition identifying a {@link SweField} in this {@link DataRecord}. + * @return the index of the first field with the given fieldDefinition or -1 if not found. */ int getFieldIndexByIdentifier(String fieldNameOrElementDefinition); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/RangeValue.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/RangeValue.java index c368c80be..6e72cbd83 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/RangeValue.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/RangeValue.java @@ -23,9 +23,11 @@ /** * @since 1.0.0 * - * @param <T> Value type + * @param <T> + * Value type */ -public class RangeValue<T> implements Comparable<RangeValue<T>>, Copyable<RangeValue<T>> { +public class RangeValue< + T> implements Comparable<RangeValue<T>>, Copyable<RangeValue<T>> { private static final String NULL = "null"; private T rangeStart; @@ -138,8 +140,8 @@ public RangeValue<T> copy() { @Override public int compareTo(RangeValue<T> o) { - if (checkCompareToParameter(getRangeStart(), o.getRangeStart()) && - checkCompareToParameter(getRangeEnd(), o.getRangeEnd())) { + if (checkCompareToParameter(getRangeStart(), o.getRangeStart()) + && checkCompareToParameter(getRangeEnd(), o.getRangeEnd())) { return 0; } return 1; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataComponent.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataComponent.java index c499a597b..07d353309 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataComponent.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataComponent.java @@ -230,13 +230,15 @@ public boolean equals(final Object obj) { public abstract SweDataComponentType getDataComponentType(); - public abstract <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X; + public abstract < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X; - public abstract <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X; + public abstract < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X; /** - * Copies all values from this {@link SweAbstractDataComponent} to the - * passed + * Copies all values from this {@link SweAbstractDataComponent} to the passed * * @param copy * {@link SweAbstractDataComponent} to copy values to diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java index 0e3862c95..55b053fb7 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweAbstractDataRecord.java @@ -25,8 +25,7 @@ import com.google.common.collect.Sets; /** - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ @@ -96,8 +95,7 @@ public boolean existsFieldForIdentifier(final String fieldNameOrElementDefinitio } boolean isFieldName(final String fieldNameOrElementDefinition, final SweField sweField) { - return sweField.isSetName() - && sweField.getName().getValue().equalsIgnoreCase(fieldNameOrElementDefinition); + return sweField.isSetName() && sweField.getName().getValue().equalsIgnoreCase(fieldNameOrElementDefinition); } boolean isElementDefinition(final String fieldNameOrElementDefinition, final SweField sweField) { @@ -113,7 +111,7 @@ public boolean equals(final Object obj) { if (getClass() != obj.getClass()) { return false; } - if (obj instanceof SweAbstractDataRecord) { + if (obj instanceof SweAbstractDataRecord) { final SweAbstractDataRecord other = (SweAbstractDataRecord) obj; if (getFields() != other.getFields() && (getFields() == null || !getFields().equals(other.getFields()))) { return false; @@ -153,5 +151,4 @@ public Set<SweAbstractSimpleType<?>> getSweAbstractSimpleTypeFromFields(Class cl @Override public abstract SweAbstractDataRecord copy(); - } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweConstants.java index 68836ea8c..4996e0d47 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweConstants.java @@ -220,14 +220,14 @@ final class SweCoordinateNames { private static final Set<String> Y_NAMES = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); private static final Set<String> Z_NAMES = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); - static { Collections.addAll(X_NAMES, EASTING, WESTING, LONGITUDE); Collections.addAll(Y_NAMES, NORTHING, SOUTHING, LATITUDE); Collections.addAll(Z_NAMES, ALTITUDE, HEIGHT, DEPTH); } - private SweCoordinateNames() {} + private SweCoordinateNames() { + } public static boolean isX(String name) { return X_NAMES.contains(name); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweCoordinate.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweCoordinate.java index 75ba20fd4..bdde05853 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweCoordinate.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweCoordinate.java @@ -28,8 +28,8 @@ * Value type * @since 1.0.0 */ -public class SweCoordinate<T extends Number> - implements Copyable<SweCoordinate<T>> { +public class SweCoordinate< + T extends Number> implements Copyable<SweCoordinate<T>> { /** * Coordinate name @@ -37,8 +37,7 @@ public class SweCoordinate<T extends Number> private String name; /** - * Coordinate value TODO is this assignment to generic? maybe, we switch to - * {@link SweAbstractUomType}? + * Coordinate value TODO is this assignment to generic? maybe, we switch to {@link SweAbstractUomType}? */ private SweAbstractSimpleType<T> value; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java index fce2eea3c..edfdbba6f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataArray.java @@ -30,7 +30,6 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - public class SweDataArray extends SweAbstractDataComponent { /** @@ -142,10 +141,10 @@ public boolean isSetValues() { } /** - * Adds the given block - a {@link List}<{@link String}> - add the end of - * the current list of blocks + * Adds the given block - a {@link List}<{@link String}> - add the end of the current list of blocks * - * @param blockOfTokensToAddAtTheEnd the blocks of tokens to add + * @param blockOfTokensToAddAtTheEnd + * the blocks of tokens to add * @return <tt>true</tt> (as specified by {@link Collection#add}) <br /> * <tt>false</tt> if block could not be added */ @@ -220,12 +219,15 @@ public SweDataComponentType getDataComponentType() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataComponentVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataComponentVisitor.java index 7d4ad9a97..eb7796505 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataComponentVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataComponentVisitor.java @@ -36,7 +36,9 @@ * * @author Christian Autermann */ -public interface SweDataComponentVisitor<T, X extends Throwable> { +public interface SweDataComponentVisitor< + T, + X extends Throwable> { T visit(SweField component) throws X; T visit(SweDataRecord component) throws X; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataRecord.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataRecord.java index a65b64cbb..fa640e793 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataRecord.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataRecord.java @@ -24,8 +24,7 @@ * * @since 1.0.0 */ -public class SweDataRecord - extends SweAbstractDataRecord { +public class SweDataRecord extends SweAbstractDataRecord { @Override public SweDataComponentType getDataComponentType() { @@ -60,14 +59,15 @@ public String toString() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) - throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) - throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java index f052bdc3d..f0ae7d21d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweDataStream.java @@ -29,10 +29,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -public class SweDataStream - implements - HasDefaultEncoding<SweDataStream>, - Copyable<SweDataStream> { +public class SweDataStream implements HasDefaultEncoding<SweDataStream>, Copyable<SweDataStream> { /** * optional: swe:description[0..1] @@ -177,8 +174,7 @@ public boolean isSetValues() { } /** - * Adds the given block - a {@link List}<{@link String}> - add the end of - * the current list of blocks + * Adds the given block - a {@link List}<{@link String}> - add the end of the current list of blocks * * @param blockOfTokensToAddAtTheEnd * the blocks of tokens to add diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweEnvelope.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweEnvelope.java index b249b9824..60cb0045f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweEnvelope.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweEnvelope.java @@ -15,6 +15,8 @@ */ package org.n52.shetland.ogc.swe; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Envelope; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; import org.n52.shetland.ogc.swe.SweConstants.SweCoordinateNames; import org.n52.shetland.ogc.swe.SweConstants.SweDataComponentType; @@ -28,15 +30,11 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.locationtech.jts.geom.Coordinate; -import org.locationtech.jts.geom.Envelope; - /** * @since 1.0.0 * */ -public class SweEnvelope - extends SweAbstractDataComponent { +public class SweEnvelope extends SweAbstractDataComponent { private String referenceFrame; private SweVector upperCorner; private SweVector lowerCorner; @@ -59,8 +57,7 @@ public SweEnvelope(ReferencedEnvelope sosEnvelope, String uom, boolean northingF } @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) - public SweEnvelope( - String referenceFrame, SweVector upperCorner, SweVector lowerCorner, SweTimeRange time, + public SweEnvelope(String referenceFrame, SweVector upperCorner, SweVector lowerCorner, SweTimeRange time, boolean northingFirst) { this.referenceFrame = referenceFrame; this.upperCorner = upperCorner; @@ -208,12 +205,15 @@ private Double extractDouble(SweCoordinate<?> coord) { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweField.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweField.java index 789a877b9..fd2fcf61c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweField.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweField.java @@ -25,7 +25,7 @@ * * @since 1.0.0 */ -//FIXME this is not a AbstractDataComponent according to the SWE standard +// FIXME this is not a AbstractDataComponent according to the SWE standard public class SweField extends SweAbstractDataComponent { /** @@ -124,12 +124,15 @@ public SweDataComponentType getDataComponentType() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweSimpleDataRecord.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweSimpleDataRecord.java index fae064f18..b4524620f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweSimpleDataRecord.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweSimpleDataRecord.java @@ -23,8 +23,7 @@ * @since 1.0.0 * */ -public class SweSimpleDataRecord - extends SweAbstractDataRecord { +public class SweSimpleDataRecord extends SweAbstractDataRecord { @Override public SweDataComponentType getDataComponentType() { @@ -53,12 +52,15 @@ public String toString() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweVector.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweVector.java index 0b07e4bc0..32085f8f1 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweVector.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/SweVector.java @@ -124,12 +124,15 @@ public boolean isSetLocalFrame() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/VoidSweDataComponentVisitor.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/VoidSweDataComponentVisitor.java index b9b151347..c3d1932cb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/VoidSweDataComponentVisitor.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/VoidSweDataComponentVisitor.java @@ -36,7 +36,8 @@ * * @author Christian Autermann */ -public abstract class VoidSweDataComponentVisitor<X extends Throwable> implements SweDataComponentVisitor<Void, X> { +public abstract class VoidSweDataComponentVisitor< + X extends Throwable> implements SweDataComponentVisitor<Void, X> { @Override public Void visit(SweField component) throws X { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/encoding/SweTextEncoding.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/encoding/SweTextEncoding.java index 99865bc72..f93669512 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/encoding/SweTextEncoding.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/encoding/SweTextEncoding.java @@ -85,16 +85,16 @@ public boolean equals(Object obj) { return false; } final SweTextEncoding other = (SweTextEncoding) obj; - if ((this.getBlockSeparator() == null) ? (other.getBlockSeparator() != null) : !this.getBlockSeparator() - .equals(other.getBlockSeparator())) { + if ((this.getBlockSeparator() == null) ? (other.getBlockSeparator() != null) + : !this.getBlockSeparator().equals(other.getBlockSeparator())) { return false; } - if ((this.getTokenSeparator() == null) ? (other.getTokenSeparator() != null) : !this.getTokenSeparator() - .equals(other.getTokenSeparator())) { + if ((this.getTokenSeparator() == null) ? (other.getTokenSeparator() != null) + : !this.getTokenSeparator().equals(other.getTokenSeparator())) { return false; } - if ((this.getDecimalSeparator() == null) ? (other.getDecimalSeparator() != null) : !this.getDecimalSeparator() - .equals(other.getDecimalSeparator())) { + if ((this.getDecimalSeparator() == null) ? (other.getDecimalSeparator() != null) + : !this.getDecimalSeparator().equals(other.getDecimalSeparator())) { return false; } if (this.collapseWhiteSpaces != other.collapseWhiteSpaces diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAbstractSimpleType.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAbstractSimpleType.java index 00b00b080..6388b4150 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAbstractSimpleType.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAbstractSimpleType.java @@ -30,9 +30,8 @@ * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 1.0.0 */ -public abstract class SweAbstractSimpleType<T> - extends SweAbstractDataComponent - implements Value<T, SweAbstractSimpleType<T>> { +public abstract class SweAbstractSimpleType< + T> extends SweAbstractDataComponent implements Value<T, SweAbstractSimpleType<T>> { private SweQualityHolder quality; @@ -51,7 +50,8 @@ public SweQualityHolder getQuality() { /** * Set quality information * - * @param quality quality information to set + * @param quality + * quality information to set * * @return This SweAbstractSimpleType */ @@ -63,7 +63,7 @@ public SweAbstractSimpleType<T> setQuality(SweQualityHolder quality) { /** * @return <tt>true</tt>, if the quality field is not <tt>null</tt>,<br> - * <tt>false</tt> else. + * <tt>false</tt> else. */ public boolean isSetQuality() { return getQuality() != null && !getQuality().isEmpty(); @@ -82,9 +82,8 @@ public int hashCode() { @Override public String toString() { - return String.format("%s [value=%s; quality=%s; simpleType=%s]", - this.getClass().getSimpleName(), getValue(), - getQuality(), getDataComponentType()); + return String.format("%s [value=%s; quality=%s; simpleType=%s]", this.getClass().getSimpleName(), getValue(), + getQuality(), getDataComponentType()); } @Override @@ -102,8 +101,7 @@ public boolean equals(Object obj) { return false; } final SweAbstractSimpleType<?> other = (SweAbstractSimpleType<?>) obj; - return Objects.equals(this.getQuality(), other.getQuality()) && - Objects.equals(getValue(), other.getValue()); + return Objects.equals(this.getQuality(), other.getQuality()) && Objects.equals(getValue(), other.getValue()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAbstractUomType.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAbstractUomType.java index abedb32c8..bf1797b40 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAbstractUomType.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAbstractUomType.java @@ -19,12 +19,12 @@ import org.n52.shetland.ogc.swe.SweAbstractDataComponent; /** - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ -public abstract class SweAbstractUomType<T> extends SweAbstractSimpleType<T> { +public abstract class SweAbstractUomType< + T> extends SweAbstractSimpleType<T> { /** * unit of measurement diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedTokens.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedTokens.java index 89d5e85cd..ef5762d0e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedTokens.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweAllowedTokens.java @@ -24,8 +24,7 @@ import com.google.common.base.Strings; -public class SweAllowedTokens - extends AbstractSWES { +public class SweAllowedTokens extends AbstractSWES { private List<String> value = new LinkedList<>(); private String pattern; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweBoolean.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweBoolean.java index da5917586..20af058a6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweBoolean.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweBoolean.java @@ -61,12 +61,15 @@ public SweDataComponentType getDataComponentType() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCategory.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCategory.java index 7d4469dbe..20b719a84 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCategory.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCategory.java @@ -17,13 +17,12 @@ import org.n52.shetland.ogc.UoM; import org.n52.shetland.ogc.swe.SweConstants.SweDataComponentType; -import org.n52.shetland.w3c.xlink.Referenceable; import org.n52.shetland.ogc.swe.SweDataComponentVisitor; import org.n52.shetland.ogc.swe.VoidSweDataComponentVisitor; +import org.n52.shetland.w3c.xlink.Referenceable; /** - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * @since 1.0.0 */ public class SweCategory extends SweAbstractUomType<String> implements SweQuality { @@ -70,8 +69,8 @@ public boolean isSetCodeSpace() { @Override public String toString() { - return String.format("SosSweCategory [quality=%s, value=%s, codeSpace=%s, simpleType=%s]", getQuality(), - value, getUom(), getDataComponentType()); + return String.format("SosSweCategory [quality=%s, value=%s, codeSpace=%s, simpleType=%s]", getQuality(), value, + getUom(), getDataComponentType()); } @Override @@ -99,14 +98,16 @@ public Referenceable<SweAllowedTokens> getConstraint() { } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(SweAllowedTokens constraint) { this.constraint = Referenceable.of(constraint); } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(Referenceable<SweAllowedTokens> constraint) { this.constraint = constraint; @@ -122,12 +123,15 @@ public SweDataComponentType getDataComponentType() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCategoryRange.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCategoryRange.java index 85122e66d..43b751dcc 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCategoryRange.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCategoryRange.java @@ -17,13 +17,12 @@ import org.n52.shetland.ogc.swe.RangeValue; import org.n52.shetland.ogc.swe.SweConstants.SweDataComponentType; +import org.n52.shetland.ogc.swe.SweDataComponentVisitor; +import org.n52.shetland.ogc.swe.VoidSweDataComponentVisitor; import org.n52.shetland.w3c.xlink.Referenceable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.n52.shetland.ogc.swe.SweDataComponentVisitor; -import org.n52.shetland.ogc.swe.VoidSweDataComponentVisitor; - public class SweCategoryRange extends SweAbstractUomType<RangeValue<String>> implements SweQuality { /** @@ -71,14 +70,16 @@ public Referenceable<SweAllowedTokens> getConstraint() { } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(SweAllowedTokens constraint) { this.constraint = Referenceable.of(constraint); } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(Referenceable<SweAllowedTokens> constraint) { this.constraint = constraint; @@ -93,14 +94,16 @@ public SweDataComponentType getDataComponentType() { return SweDataComponentType.CategoryRange; } - @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCount.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCount.java index 18e662c40..f5546911f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCount.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCount.java @@ -81,14 +81,16 @@ public Referenceable<SweAllowedValues> getConstraint() { } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(SweAllowedValues constraint) { this.constraint = Referenceable.of(constraint); } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(Referenceable<SweAllowedValues> constraint) { this.constraint = constraint; @@ -99,12 +101,15 @@ public boolean isSetContstraint() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCountRange.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCountRange.java index 41ad4471c..6f8130ce0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCountRange.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweCountRange.java @@ -17,13 +17,12 @@ import org.n52.shetland.ogc.swe.RangeValue; import org.n52.shetland.ogc.swe.SweConstants.SweDataComponentType; +import org.n52.shetland.ogc.swe.SweDataComponentVisitor; +import org.n52.shetland.ogc.swe.VoidSweDataComponentVisitor; import org.n52.shetland.w3c.xlink.Referenceable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.n52.shetland.ogc.swe.SweDataComponentVisitor; -import org.n52.shetland.ogc.swe.VoidSweDataComponentVisitor; - /** * @since 1.0.0 * @@ -72,14 +71,16 @@ public Referenceable<SweAllowedValues> getConstraint() { } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(SweAllowedValues constraint) { this.constraint = Referenceable.of(constraint); } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(Referenceable<SweAllowedValues> constraint) { this.constraint = constraint; @@ -95,12 +96,15 @@ public SweDataComponentType getDataComponentType() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweObservableProperty.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweObservableProperty.java index 3199e7546..36b9e78d7 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweObservableProperty.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweObservableProperty.java @@ -71,12 +71,15 @@ public SweDataComponentType getDataComponentType() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuality.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuality.java index 89c06eec9..2c34e62ca 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuality.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuality.java @@ -20,4 +20,5 @@ * * @since 1.0.0 */ -public interface SweQuality {} +public interface SweQuality { +} diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuantity.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuantity.java index 359255e73..fa2454077 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuantity.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuantity.java @@ -175,14 +175,16 @@ public Referenceable<SweAllowedValues> getConstraint() { } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(SweAllowedValues constraint) { this.constraint = Referenceable.of(constraint); } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(Referenceable<SweAllowedValues> constraint) { this.constraint = constraint; @@ -203,12 +205,15 @@ public SweQuantity setUom(String uom) { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuantityRange.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuantityRange.java index d82a88d3e..0557afa2e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuantityRange.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweQuantityRange.java @@ -131,14 +131,16 @@ public Referenceable<SweAllowedValues> getConstraint() { } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(SweAllowedValues constraint) { this.constraint = Referenceable.of(constraint); } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(Referenceable<SweAllowedValues> constraint) { this.constraint = constraint; @@ -154,12 +156,15 @@ public SweDataComponentType getDataComponentType() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweText.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweText.java index 15326d0c5..99a154a50 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweText.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweText.java @@ -79,14 +79,16 @@ public Referenceable<SweAllowedTokens> getConstraint() { } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(SweAllowedTokens constraint) { this.constraint = Referenceable.of(constraint); } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(Referenceable<SweAllowedTokens> constraint) { this.constraint = constraint; @@ -108,12 +110,15 @@ public int compareTo(SweText o) { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTime.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTime.java index 583cde963..a9b39d243 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTime.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTime.java @@ -78,14 +78,16 @@ public Referenceable<SweAllowedTimes> getConstraint() { } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(SweAllowedTimes constraint) { this.constraint = Referenceable.of(constraint); } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(Referenceable<SweAllowedTimes> constraint) { this.constraint = constraint; @@ -101,12 +103,15 @@ public SweDataComponentType getDataComponentType() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTimeRange.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTimeRange.java index 490ffba7b..e0003425a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTimeRange.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/simpleType/SweTimeRange.java @@ -19,22 +19,19 @@ import org.n52.shetland.ogc.UoM; import org.n52.shetland.ogc.swe.RangeValue; import org.n52.shetland.ogc.swe.SweConstants.SweDataComponentType; +import org.n52.shetland.ogc.swe.SweDataComponentVisitor; +import org.n52.shetland.ogc.swe.VoidSweDataComponentVisitor; import org.n52.shetland.util.DateTimeHelper; import org.n52.shetland.w3c.xlink.Referenceable; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.n52.shetland.ogc.swe.SweDataComponentVisitor; -import org.n52.shetland.ogc.swe.VoidSweDataComponentVisitor; - /** - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ -public class SweTimeRange - extends SweAbstractUomType<RangeValue<DateTime>> { +public class SweTimeRange extends SweAbstractUomType<RangeValue<DateTime>> { private RangeValue<DateTime> value; private Referenceable<SweAllowedTimes> constraint; @@ -99,14 +96,16 @@ public Referenceable<SweAllowedTimes> getConstraint() { } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(SweAllowedTimes constraint) { this.constraint = Referenceable.of(constraint); } /** - * @param constraint the constraint to set + * @param constraint + * the constraint to set */ public void setConstraint(Referenceable<SweAllowedTimes> constraint) { this.constraint = constraint; @@ -122,12 +121,15 @@ public SweDataComponentType getDataComponentType() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/stream/StreamingSweDataArray.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/stream/StreamingSweDataArray.java index 8d34645b6..575aea90f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swe/stream/StreamingSweDataArray.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swe/stream/StreamingSweDataArray.java @@ -57,7 +57,7 @@ public StreamingValue<?> getValues() { /** * * @param values - * the values to set + * the values to set * * @return This SweDataArray */ @@ -77,13 +77,12 @@ public SweAbstractDataComponent getElementType() { /** * @param elementType - * the elementType to set + * the elementType to set * * @return This SweDataArray */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) - public StreamingSweDataArray setElementType( - final SweAbstractDataComponent elementType) { + public StreamingSweDataArray setElementType(final SweAbstractDataComponent elementType) { this.elementType = elementType; return this; } @@ -157,12 +156,15 @@ public SweAbstractDataComponent copy() { } @Override - public <T, X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { + public < + T, + X extends Throwable> T accept(SweDataComponentVisitor<T, X> visitor) throws X { return visitor.visit(this); } @Override - public <X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { + public < + X extends Throwable> void accept(VoidSweDataComponentVisitor<X> visitor) throws X { visitor.visit(this); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/swes/SwesExtension.java b/shetland/core/src/main/java/org/n52/shetland/ogc/swes/SwesExtension.java index fd17d46c4..a5d2e6444 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/swes/SwesExtension.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/swes/SwesExtension.java @@ -23,7 +23,8 @@ * * @since 1.0.0 */ -public class SwesExtension<T> extends AbstractExtension<T> { +public class SwesExtension< + T> extends AbstractExtension<T> { private T value; @@ -58,7 +59,7 @@ public SwesExtension<T> setValue(T value) { @Override public String toString() { - return String.format("SwesExtension [value=%s, identifier=%s, definition=%s]", - value, getIdentifier(), getDefinition()); + return String.format("SwesExtension [value=%s, identifier=%s, definition=%s]", value, getIdentifier(), + getDefinition()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/DataTransmissionMode.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/DataTransmissionMode.java index 402311447..03324bcd9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/DataTransmissionMode.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/DataTransmissionMode.java @@ -15,11 +15,11 @@ */ package org.n52.shetland.ogc.wps; +import java.util.Optional; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import java.util.Optional; - /** * TODO JavaDoc * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ExecutionMode.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ExecutionMode.java index 6a71862e6..2a7d4fb29 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ExecutionMode.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ExecutionMode.java @@ -15,11 +15,11 @@ */ package org.n52.shetland.ogc.wps; +import java.util.Optional; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import java.util.Optional; - /** * TODO JavaDoc * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/Format.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/Format.java index b70e78f15..0acddaf25 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/Format.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/Format.java @@ -15,14 +15,6 @@ */ package org.n52.shetland.ogc.wps; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Strings; -import org.n52.janmayen.Optionals; -import org.n52.janmayen.http.MediaType; - import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Collections; @@ -35,6 +27,15 @@ import java.util.function.Predicate; import java.util.stream.Collectors; +import org.n52.janmayen.Optionals; +import org.n52.janmayen.http.MediaType; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.base.Strings; + /** * TODO JavaDoc * @@ -50,8 +51,8 @@ public class Format implements Comparable<Format> { public static final Format TEXT_XML = new Format("text/xml"); private static final Comparator<Format> COMPARATOR = Comparator.nullsLast(Comparator.comparing(Format::getMimeType, Optionals.nullsFirst())) - .thenComparing(Format::getSchema, Optionals.nullsFirst()) - .thenComparing(Format::getEncoding, Optionals.nullsFirst()); + .thenComparing(Format::getSchema, Optionals.nullsFirst()) + .thenComparing(Format::getEncoding, Optionals.nullsFirst()); private static final String STAR_SLASH_STAR = "*/*"; private static final Set<String> CHARSETS = new HashSet<>(Charset.availableCharsets().keySet()); private static final String SCHEMA = "schema"; @@ -63,9 +64,8 @@ public class Format implements Comparable<Format> { private final String schema; @JsonCreator - public Format(@JsonProperty(MIME_TYPE) String mimeType, - @JsonProperty(ENCODING) String encoding, - @JsonProperty(SCHEMA) String schema) { + public Format(@JsonProperty(MIME_TYPE) String mimeType, @JsonProperty(ENCODING) String encoding, + @JsonProperty(SCHEMA) String schema) { this.mimeType = Strings.emptyToNull(mimeType); this.encoding = Strings.emptyToNull(encoding); this.schema = Strings.emptyToNull(schema); @@ -221,9 +221,8 @@ public int hashCode() { public boolean equals(Object obj) { if (obj instanceof Format) { final Format that = (Format) obj; - return Objects.equals(this.mimeType, that.mimeType) && - Objects.equals(this.encoding, that.encoding) && - Objects.equals(this.schema, that.schema); + return Objects.equals(this.mimeType, that.mimeType) && Objects.equals(this.encoding, that.encoding) + && Objects.equals(this.schema, that.schema); } return false; } @@ -241,7 +240,7 @@ public Predicate<Format> matchingMimeType() { } public boolean isCompatible(Format that) { - if (!((!this.hasEncoding() && (!that.hasEncoding() || that.isCharacterEncoding())) || + if (!(!this.hasEncoding() && (!that.hasEncoding() || that.isCharacterEncoding()) || this.hasEncoding(that))) { return false; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/InputOccurence.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/InputOccurence.java index 88933b5c2..b720d2611 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/InputOccurence.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/InputOccurence.java @@ -15,14 +15,14 @@ */ package org.n52.shetland.ogc.wps; +import java.math.BigInteger; +import java.util.Optional; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import java.math.BigInteger; -import java.util.Optional; - /** * TODO JavaDoc * @@ -37,7 +37,7 @@ public class InputOccurence { @JsonCreator public InputOccurence(@JsonProperty(value = MIN_OCCURS, required = true) BigInteger min, - @JsonProperty(MAX_OCCURS) BigInteger max) { + @JsonProperty(MAX_OCCURS) BigInteger max) { this.min = min == null ? BigInteger.ONE : min; if (max == null) { @@ -80,8 +80,7 @@ public boolean isMultiple() { } public boolean isInBounds(BigInteger occurence) { - return this.min.compareTo(occurence) <= 0 && - (this.max == null || this.max.compareTo(occurence) >= 0); + return this.min.compareTo(occurence) <= 0 && (this.max == null || this.max.compareTo(occurence) >= 0); } @Override diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobControlOption.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobControlOption.java index 7315a508e..82c8d088f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobControlOption.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobControlOption.java @@ -15,19 +15,20 @@ */ package org.n52.shetland.ogc.wps; -import com.google.common.base.Strings; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import java.util.Arrays; import java.util.Comparator; import java.util.HashSet; import java.util.Objects; import java.util.Set; +import com.google.common.base.Strings; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** - * This attribute type is used to specify process control options. The WPS specification only defines "execute-sync" and - * "execute-async", each with an associated execution protocol. Extensions may specify additional control options, such - * as "dimiss" which is defined in the WPS dismiss extension. + * This attribute type is used to specify process control options. The WPS specification only defines + * "execute-sync" and "execute-async", each with an associated execution protocol. Extensions may specify + * additional control options, such as "dimiss" which is defined in the WPS dismiss extension. * * @author Christian Autermann */ @@ -36,8 +37,8 @@ public class JobControlOption implements Comparable<JobControlOption> { private static final JobControlOption SYNC_EXECUTE = new JobControlOption("sync-execute"); private static final JobControlOption ASYNC_EXECUTE = new JobControlOption("async-execute"); private static final JobControlOption DISMISS = new JobControlOption("dismiss"); - private static final Comparator<JobControlOption> COMPARATOR - = Comparator.nullsLast(Comparator.comparing(JobControlOption::getValue)); + private static final Comparator<JobControlOption> COMPARATOR = + Comparator.nullsLast(Comparator.comparing(JobControlOption::getValue)); private final String value; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobId.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobId.java index 062273cf9..dc7f31fe3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobId.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobId.java @@ -18,10 +18,9 @@ import java.util.Objects; /** - * A JobID is a unique identifier for a process execution, i.e. a process - * instance. Particularly suitable JobIDs are UUIDs or monotonic identifiers - * such as unique timestamps. If the privacy of a Processing Job is imperative, - * the JobID should be non-guessable. + * A JobID is a unique identifier for a process execution, i.e. a process instance. Particularly suitable + * JobIDs are UUIDs or monotonic identifiers such as unique timestamps. If the privacy of a Processing Job is + * imperative, the JobID should be non-guessable. * * @author Christian Autermann */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobStatus.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobStatus.java index 1824b1093..0436e4f9f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobStatus.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/JobStatus.java @@ -15,13 +15,13 @@ */ package org.n52.shetland.ogc.wps; -import com.google.common.base.Preconditions; - import java.util.Objects; +import com.google.common.base.Preconditions; + /** - * Basic status set to communicate the status of a server-side job to the client. Extensions of this specification may - * introduce additional states for fine-grained monitoring or domain-specific purposes. + * Basic status set to communicate the status of a server-side job to the client. Extensions of this + * specification may introduce additional states for fine-grained monitoring or domain-specific purposes. * * @author Christian Autermann */ diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/OutputDefinition.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/OutputDefinition.java index 4f3df7f42..eced71bcb 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/OutputDefinition.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/OutputDefinition.java @@ -42,8 +42,7 @@ public class OutputDefinition { private Format format; private List<OutputDefinition> outputs; - public OutputDefinition(OwsCode id, Format format, - List<OutputDefinition> outputs) { + public OutputDefinition(OwsCode id, Format format, List<OutputDefinition> outputs) { this(id, format, null, outputs); } @@ -59,14 +58,12 @@ public OutputDefinition() { this(null, null, null, null); } - public OutputDefinition(OwsCode id, Format format, - DataTransmissionMode dataTransmissionMode) { + public OutputDefinition(OwsCode id, Format format, DataTransmissionMode dataTransmissionMode) { this(id, format, dataTransmissionMode, null); } - public OutputDefinition(OwsCode id, Format format, - DataTransmissionMode dataTransmissionMode, - List<OutputDefinition> outputs) { + public OutputDefinition(OwsCode id, Format format, DataTransmissionMode dataTransmissionMode, + List<OutputDefinition> outputs) { this.dataTransmissionMode = dataTransmissionMode == null ? DataTransmissionMode.VALUE : dataTransmissionMode; this.id = id; this.format = format == null ? Format.empty() : format; @@ -77,8 +74,7 @@ public DataTransmissionMode getDataTransmissionMode() { return dataTransmissionMode; } - public void setDataTransmissionMode( - DataTransmissionMode dataTransmissionMode) { + public void setDataTransmissionMode(DataTransmissionMode dataTransmissionMode) { this.dataTransmissionMode = dataTransmissionMode; } @@ -122,8 +118,7 @@ public boolean hasOutputs() { @Override public int hashCode() { - return Objects - .hash(this.dataTransmissionMode, this.id, this.format, this.outputs); + return Objects.hash(this.dataTransmissionMode, this.id, this.format, this.outputs); } @Override @@ -138,20 +133,15 @@ public boolean equals(Object obj) { return false; } final OutputDefinition other = (OutputDefinition) obj; - return this.getDataTransmissionMode() == other.getDataTransmissionMode() && - Objects.equals(this.getId(), other.getId()) && - Objects.equals(this.getFormat(), other.getFormat()) && - Objects.equals(this.getOutputs(), other.getOutputs()); + return this.getDataTransmissionMode() == other.getDataTransmissionMode() + && Objects.equals(this.getId(), other.getId()) && Objects.equals(this.getFormat(), other.getFormat()) + && Objects.equals(this.getOutputs(), other.getOutputs()); } @Override public String toString() { - return MoreObjects.toStringHelper(this).omitNullValues() - .add("id", this.id) - .add("format", this.format) - .add("dataTransmissionMode", this.dataTransmissionMode) - .add("outputs", this.outputs) - .toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("id", this.id).add("format", this.format) + .add("dataTransmissionMode", this.dataTransmissionMode).add("outputs", this.outputs).toString(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ProcessOffering.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ProcessOffering.java index 7e6d216c7..3f554b768 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ProcessOffering.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ProcessOffering.java @@ -15,9 +15,6 @@ */ package org.n52.shetland.ogc.wps; -import org.n52.shetland.ogc.wps.description.ProcessDescription; -import org.n52.shetland.util.CollectionHelper; - import java.util.Collection; import java.util.Collections; import java.util.EnumSet; @@ -25,6 +22,9 @@ import java.util.Optional; import java.util.Set; +import org.n52.shetland.ogc.wps.description.ProcessDescription; +import org.n52.shetland.util.CollectionHelper; + /** * TODO JavaDoc * @@ -38,26 +38,21 @@ public class ProcessOffering implements Comparable<ProcessOffering> { private final String processModel; public ProcessOffering(ProcessDescription processDescription) { - this(processDescription, - JobControlOption.defaultOptions(), - EnumSet.allOf(DataTransmissionMode.class), DEFAULT_PROCESS_MODEL); + this(processDescription, JobControlOption.defaultOptions(), EnumSet.allOf(DataTransmissionMode.class), + DEFAULT_PROCESS_MODEL); } - public ProcessOffering(ProcessDescription processDescription, - Collection<JobControlOption> jobControlOptions) { + public ProcessOffering(ProcessDescription processDescription, Collection<JobControlOption> jobControlOptions) { this(processDescription, jobControlOptions, EnumSet.allOf(DataTransmissionMode.class), DEFAULT_PROCESS_MODEL); } - public ProcessOffering(ProcessDescription processDescription, - Collection<JobControlOption> jobControlOptions, - Collection<DataTransmissionMode> outputTransmissionModes) { + public ProcessOffering(ProcessDescription processDescription, Collection<JobControlOption> jobControlOptions, + Collection<DataTransmissionMode> outputTransmissionModes) { this(processDescription, jobControlOptions, outputTransmissionModes, DEFAULT_PROCESS_MODEL); } - public ProcessOffering(ProcessDescription processDescription, - Collection<JobControlOption> jobControlOptions, - Collection<DataTransmissionMode> outputTransmissionModes, - String processModel) { + public ProcessOffering(ProcessDescription processDescription, Collection<JobControlOption> jobControlOptions, + Collection<DataTransmissionMode> outputTransmissionModes, String processModel) { this.processDescription = Objects.requireNonNull(processDescription); this.jobControlOptions = CollectionHelper.newSortedSet(jobControlOptions); this.outputTransmissionModes = CollectionHelper.newSortedSet(outputTransmissionModes); @@ -111,9 +106,9 @@ public boolean equals(Object obj) { return false; } final ProcessOffering other = (ProcessOffering) obj; - return Objects.equals(this.getProcessModel(), other.getProcessModel()) && - Objects.equals(this.getProcessDescription(), other.getProcessDescription()) && - Objects.equals(this.getJobControlOptions(), other.getJobControlOptions()) && - Objects.equals(this.getOutputTransmissionModes(), other.getOutputTransmissionModes()); + return Objects.equals(this.getProcessModel(), other.getProcessModel()) + && Objects.equals(this.getProcessDescription(), other.getProcessDescription()) + && Objects.equals(this.getJobControlOptions(), other.getJobControlOptions()) + && Objects.equals(this.getOutputTransmissionModes(), other.getOutputTransmissionModes()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ProcessOfferings.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ProcessOfferings.java index bf4c616c6..6cfe942d0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ProcessOfferings.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ProcessOfferings.java @@ -15,13 +15,13 @@ */ package org.n52.shetland.ogc.wps; -import org.n52.shetland.util.CollectionHelper; - import java.util.Collections; import java.util.Iterator; import java.util.Set; import java.util.SortedSet; +import org.n52.shetland.util.CollectionHelper; + /** * TODO JavaDoc * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ResponseMode.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ResponseMode.java index dc0f8601f..846adcba0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ResponseMode.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ResponseMode.java @@ -15,11 +15,11 @@ */ package org.n52.shetland.ogc.wps; +import java.util.Optional; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import java.util.Optional; - /** * TODO JavaDoc * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/Result.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/Result.java index b22964a2f..b16c63e1d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/Result.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/Result.java @@ -15,8 +15,6 @@ */ package org.n52.shetland.ogc.wps; -import org.n52.shetland.ogc.wps.data.ProcessData; - import java.time.OffsetDateTime; import java.util.Collections; import java.util.LinkedList; @@ -24,6 +22,8 @@ import java.util.Objects; import java.util.Optional; +import org.n52.shetland.ogc.wps.data.ProcessData; + /** * TODO JavaDoc * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPS100Constants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPS100Constants.java index 18051becf..a504b4078 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPS100Constants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPS100Constants.java @@ -18,13 +18,12 @@ import org.n52.shetland.w3c.SchemaLocation; /** - * WpsConstants holds all important and often used constants (e.g. name of the - * getCapabilities operation) that are specific to OGC WPS 1.0.0 + * WpsConstants holds all important and often used constants (e.g. name of the getCapabilities operation) that + * are specific to OGC WPS 1.0.0 * * @since 1.0.0 */ -public interface WPS100Constants - extends WPSConstants { +public interface WPS100Constants extends WPSConstants { String NS_WPS = "http://www.opengis.net/wps/1.0.0"; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPS200Constants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPS200Constants.java index 111322737..ea74cb371 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPS200Constants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPS200Constants.java @@ -21,9 +21,7 @@ public interface WPS200Constants { String VERSION = "2.0.0"; - String REASON_NO_SUCH_JOB = - "No job found for the requested id."; + String REASON_NO_SUCH_JOB = "No job found for the requested id."; - String REASON_RESULT_NOT_READY = - "The result for the requested id is not ready."; + String REASON_RESULT_NOT_READY = "The result for the requested id is not ready."; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPSCapabilities.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPSCapabilities.java index 2a37ca8ac..7217b5891 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPSCapabilities.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPSCapabilities.java @@ -28,24 +28,17 @@ public class WPSCapabilities extends OwsCapabilities { private final Optional<ProcessOfferings> processOfferings; - public WPSCapabilities(String version, String updateSequence, - OwsServiceIdentification serviceIdentification, - OwsServiceProvider serviceProvider, - OwsOperationsMetadata operationsMetadata, - Collection<String> languages, - Collection<OwsCapabilitiesExtension> extension, - ProcessOfferings processOfferings) { + public WPSCapabilities(String version, String updateSequence, OwsServiceIdentification serviceIdentification, + OwsServiceProvider serviceProvider, OwsOperationsMetadata operationsMetadata, Collection<String> languages, + Collection<OwsCapabilitiesExtension> extension, ProcessOfferings processOfferings) { this(WPSConstants.SERVICE, version, updateSequence, serviceIdentification, serviceProvider, operationsMetadata, languages, extension, processOfferings); } public WPSCapabilities(String service, String version, String updateSequence, - OwsServiceIdentification serviceIdentification, - OwsServiceProvider serviceProvider, - OwsOperationsMetadata operationsMetadata, - Collection<String> languages, - Collection<OwsCapabilitiesExtension> extension, - ProcessOfferings processOfferings) { + OwsServiceIdentification serviceIdentification, OwsServiceProvider serviceProvider, + OwsOperationsMetadata operationsMetadata, Collection<String> languages, + Collection<OwsCapabilitiesExtension> extension, ProcessOfferings processOfferings) { super(service, version, updateSequence, serviceIdentification, serviceProvider, operationsMetadata, languages, extension); this.processOfferings = Optional.ofNullable(processOfferings); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPSConstants.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPSConstants.java index 2b6d23624..c49a24e57 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPSConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/WPSConstants.java @@ -15,7 +15,6 @@ */ package org.n52.shetland.ogc.wps; - import java.util.Set; import org.n52.janmayen.http.MediaTypes; @@ -23,9 +22,8 @@ import com.google.common.collect.ImmutableSet; /** - * {@code WPSConstants} holds all important and often used constants of OGC WPS (e.g. - * name of the getCapabilities operation) that are global between all supported - * versions + * {@code WPSConstants} holds all important and often used constants of OGC WPS (e.g. name of the + * getCapabilities operation) that are global between all supported versions * * @since 1.0.0 */ @@ -45,17 +43,18 @@ public interface WPSConstants { String SERVICE = "WPS"; /** - * Constant 'inline' for response mode, which means that results are - * contained inline the ProcessOutputs element of an execute response - * document. + * Constant 'inline' for response mode, which means that results are contained inline the ProcessOutputs + * element of an execute response document. + * * @deprecated see {@link ResponseMode} */ @Deprecated String RESPONSE_MODE_INLINE = "inline"; /** - * Constant 'raw' for response mode, which means that result values of - * an execute response are returned directly, i.e. not wrapped in an xml response + * Constant 'raw' for response mode, which means that result values of an execute response are returned + * directly, i.e. not wrapped in an xml response + * * @deprecated see {@link ResponseMode} */ @Deprecated @@ -63,17 +62,16 @@ public interface WPSConstants { /** * Array of constants for response mode. + * * @deprecated see {@link ResponseMode} */ @Deprecated - Set<String> RESPONSE_MODES = ImmutableSet.of(RESPONSE_MODE_INLINE, - RESPONSE_MODE_RAW); + Set<String> RESPONSE_MODES = ImmutableSet.of(RESPONSE_MODE_INLINE, RESPONSE_MODE_RAW); String VERSION_200 = "2.0.0"; /** - * The names of the operations supported by all versions of the WPS - * specification. + * The names of the operations supported by all versions of the WPS specification. */ enum Operations { GetCapabilities, diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ap/ApplicationPackage.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ap/ApplicationPackage.java index a137b86d6..7fe9d11ce 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ap/ApplicationPackage.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/ap/ApplicationPackage.java @@ -15,13 +15,13 @@ */ package org.n52.shetland.ogc.wps.ap; -import org.n52.shetland.ogc.wps.ProcessOffering; - import java.net.URI; import java.util.Collections; import java.util.List; import java.util.Optional; +import org.n52.shetland.ogc.wps.ProcessOffering; + public class ApplicationPackage { private ProcessOffering processDescription; private List<ExecutionUnit> executionUnits = Collections.emptyList(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/FormattedProcessData.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/FormattedProcessData.java index bc21ffcd9..7757a7913 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/FormattedProcessData.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/FormattedProcessData.java @@ -15,13 +15,13 @@ */ package org.n52.shetland.ogc.wps.data; +import java.util.Objects; + import org.n52.shetland.ogc.ows.OwsCode; import org.n52.shetland.ogc.wps.Format; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import java.util.Objects; - /** * TODO JavaDoc * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/GroupProcessData.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/GroupProcessData.java index b1c3e7ad9..8b414e21c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/GroupProcessData.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/GroupProcessData.java @@ -91,15 +91,12 @@ public boolean equals(Object obj) { return false; } final GroupProcessData other = (GroupProcessData) obj; - return Objects.equals(getId(), other.getId()) && - Objects.equals(getElements(), other.getElements()); + return Objects.equals(getId(), other.getId()) && Objects.equals(getElements(), other.getElements()); } @Override public String toString() { - return MoreObjects.toStringHelper(this).omitNullValues() - .add("id", getId()) - .add("elements", getElements()) + return MoreObjects.toStringHelper(this).omitNullValues().add("id", getId()).add("elements", getElements()) .toString(); } @@ -112,6 +109,4 @@ public Stream<ProcessData> stream() { return this.elements.stream(); } - - } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/InlineBody.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/InlineBody.java index f104e0c6a..6b2bd3ccc 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/InlineBody.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/InlineBody.java @@ -74,5 +74,4 @@ public String toString() { return MoreObjects.toStringHelper(this).add("body", getBody()).toString(); } - } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/ReferenceProcessData.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/ReferenceProcessData.java index 6982c89a5..2059c466b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/ReferenceProcessData.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/ReferenceProcessData.java @@ -15,14 +15,15 @@ */ package org.n52.shetland.ogc.wps.data; -import com.google.common.base.MoreObjects; -import org.n52.shetland.ogc.ows.OwsCode; -import org.n52.shetland.ogc.wps.Format; - import java.net.URI; import java.util.Objects; import java.util.Optional; +import org.n52.shetland.ogc.ows.OwsCode; +import org.n52.shetland.ogc.wps.Format; + +import com.google.common.base.MoreObjects; + /** * TODO JavaDoc * @@ -80,7 +81,7 @@ public ReferenceProcessData asReference() { @Override public String toString() { return MoreObjects.toStringHelper(this).omitNullValues().add("id", getId()).add("format", getFormat()) - .add("uri", getURI()).add("body", getBody().orElse(null)).toString(); + .add("uri", getURI()).add("body", getBody().orElse(null)).toString(); } @Override @@ -100,8 +101,8 @@ public boolean equals(Object obj) { return false; } final ReferenceProcessData other = (ReferenceProcessData) obj; - return Objects.equals(getId(), other.getId()) && Objects.equals(getFormat(), other.getFormat()) && - Objects.equals(getURI(), other.getURI()) && Objects.equals(getBody(), other.getBody()); + return Objects.equals(getId(), other.getId()) && Objects.equals(getFormat(), other.getFormat()) + && Objects.equals(getURI(), other.getURI()) && Objects.equals(getBody(), other.getBody()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/ReferencedBody.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/ReferencedBody.java index 3920f3572..e6eea6e9e 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/ReferencedBody.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/ReferencedBody.java @@ -15,13 +15,14 @@ */ package org.n52.shetland.ogc.wps.data; -import com.google.common.base.MoreObjects; -import org.n52.shetland.util.HTTP; - import java.io.IOException; import java.net.URI; import java.util.Objects; +import org.n52.shetland.util.HTTP; + +import com.google.common.base.MoreObjects; + /** * TODO JavaDoc * @@ -78,8 +79,6 @@ public int hashCode() { @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("href", getHref()) - .toString(); + return MoreObjects.toStringHelper(this).add("href", getHref()).toString(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/ValueProcessData.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/ValueProcessData.java index 494db2669..a7b6733f8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/ValueProcessData.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/ValueProcessData.java @@ -15,12 +15,12 @@ */ package org.n52.shetland.ogc.wps.data; -import org.n52.shetland.ogc.ows.OwsCode; -import org.n52.shetland.ogc.wps.Format; - import java.io.IOException; import java.io.InputStream; +import org.n52.shetland.ogc.ows.OwsCode; +import org.n52.shetland.ogc.wps.Format; + /** * TODO JavaDoc * diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/impl/InMemoryValueProcessData.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/impl/InMemoryValueProcessData.java index f3cb2bd1a..b09ff972b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/impl/InMemoryValueProcessData.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/impl/InMemoryValueProcessData.java @@ -68,18 +68,14 @@ public boolean equals(Object obj) { return false; } final InMemoryValueProcessData other = (InMemoryValueProcessData) obj; - return Objects.equals(getId(), other.getId()) && - Objects.equals(getFormat(), other.getFormat()) && - Arrays.equals(this.bytes, other.bytes); + return Objects.equals(getId(), other.getId()) && Objects.equals(getFormat(), other.getFormat()) + && Arrays.equals(this.bytes, other.bytes); } @Override public String toString() { - return MoreObjects.toStringHelper(this).omitNullValues() - .add("id", getId()) - .add("format", getFormat()) - .add("value", this.bytes) - .toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("id", getId()).add("format", getFormat()) + .add("value", this.bytes).toString(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/impl/StringValueProcessData.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/impl/StringValueProcessData.java index aac8e5908..f2af92464 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/impl/StringValueProcessData.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/data/impl/StringValueProcessData.java @@ -31,8 +31,7 @@ * * @author Christian Autermann */ -public class StringValueProcessData - extends ValueProcessData { +public class StringValueProcessData extends ValueProcessData { private final String string; diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/BoundingBoxDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/BoundingBoxDescription.java index f1b028b05..8aabc39d2 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/BoundingBoxDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/BoundingBoxDescription.java @@ -15,13 +15,13 @@ */ package org.n52.shetland.ogc.wps.description; -import org.n52.janmayen.stream.Streams; -import org.n52.shetland.ogc.ows.OwsCRS; - import java.net.URI; import java.util.Arrays; import java.util.Set; +import org.n52.janmayen.stream.Streams; +import org.n52.shetland.ogc.ows.OwsCRS; + /** * TODO JavaDoc * @@ -33,8 +33,9 @@ public interface BoundingBoxDescription { Set<OwsCRS> getSupportedCRS(); - interface Builder<T extends BoundingBoxDescription, B extends Builder<T, B>> - extends org.n52.janmayen.Builder<T, B> { + interface Builder< + T extends BoundingBoxDescription, + B extends Builder<T, B>> extends org.n52.janmayen.Builder<T, B> { B withDefaultCRS(OwsCRS defaultCRS); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/BoundingBoxInputDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/BoundingBoxInputDescription.java index 22dccd9ac..7cd9b4664 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/BoundingBoxInputDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/BoundingBoxInputDescription.java @@ -33,18 +33,23 @@ default BoundingBoxInputDescription asBoundingBox() { } @Override - default <T> T visit(ReturningVisitor<T> visitor) { + default < + T> T visit(ReturningVisitor<T> visitor) { return visitor.visit(this); } @Override - default <T, X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { + default < + T, + X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { return visitor.visit(this); } Builder<?, ?> newBuilder(); - interface Builder<T extends BoundingBoxInputDescription, B extends Builder<T, B>> + interface Builder< + T extends BoundingBoxInputDescription, + B extends Builder<T, B>> extends ProcessInputDescription.Builder<T, B>, BoundingBoxDescription.Builder<T, B> { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/BoundingBoxOutputDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/BoundingBoxOutputDescription.java index 377d28783..d3af6939f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/BoundingBoxOutputDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/BoundingBoxOutputDescription.java @@ -33,18 +33,23 @@ default boolean isBoundingBox() { } @Override - default <T> T visit(ReturningVisitor<T> visitor) { + default < + T> T visit(ReturningVisitor<T> visitor) { return visitor.visit(this); } @Override - default <T, X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { + default < + T, + X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { return visitor.visit(this); } Builder<?, ?> newBuilder(); - interface Builder<T extends BoundingBoxOutputDescription, B extends Builder<T, B>> + interface Builder< + T extends BoundingBoxOutputDescription, + B extends Builder<T, B>> extends ProcessOutputDescription.Builder<T, B>, BoundingBoxDescription.Builder<T, B> { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ComplexDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ComplexDescription.java index cc4d5d821..d8809be6f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ComplexDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ComplexDescription.java @@ -15,14 +15,14 @@ */ package org.n52.shetland.ogc.wps.description; -import org.n52.janmayen.stream.Streams; -import org.n52.shetland.ogc.wps.Format; - import java.math.BigInteger; import java.util.Arrays; import java.util.Optional; import java.util.Set; +import org.n52.janmayen.stream.Streams; +import org.n52.shetland.ogc.wps.Format; + /** * TODO JavaDoc * @@ -36,7 +36,9 @@ public interface ComplexDescription { Optional<BigInteger> getMaximumMegabytes(); - interface Builder<T extends ComplexDescription, B extends Builder<T, B>> extends org.n52.janmayen.Builder<T, B> { + interface Builder< + T extends ComplexDescription, + B extends Builder<T, B>> extends org.n52.janmayen.Builder<T, B> { B withDefaultFormat(Format format); B withSupportedFormat(Format format); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ComplexInputDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ComplexInputDescription.java index 15612d216..11c7ee9a6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ComplexInputDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ComplexInputDescription.java @@ -20,8 +20,7 @@ * * @author Christian Autermann */ -public interface ComplexInputDescription extends ComplexDescription, - ProcessInputDescription { +public interface ComplexInputDescription extends ComplexDescription, ProcessInputDescription { @Override default ComplexInputDescription asComplex() { @@ -34,19 +33,23 @@ default boolean isComplex() { } @Override - default <T> T visit(ReturningVisitor<T> visitor) { + default < + T> T visit(ReturningVisitor<T> visitor) { return visitor.visit(this); } @Override - default <T, X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { + default < + T, + X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { return visitor.visit(this); } Builder<?, ?> newBuilder(); - interface Builder<T extends ComplexInputDescription, B extends Builder<T, B>> - extends ProcessInputDescription.Builder<T, B>, ComplexDescription.Builder<T, B> { + interface Builder< + T extends ComplexInputDescription, + B extends Builder<T, B>> extends ProcessInputDescription.Builder<T, B>, ComplexDescription.Builder<T, B> { } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ComplexOutputDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ComplexOutputDescription.java index 5a0b8f8d9..bdd45133c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ComplexOutputDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ComplexOutputDescription.java @@ -33,19 +33,23 @@ default boolean isComplex() { } @Override - default <T> T visit(ReturningVisitor<T> visitor) { + default < + T> T visit(ReturningVisitor<T> visitor) { return visitor.visit(this); } @Override - default <T, X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { + default < + T, + X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { return visitor.visit(this); } Builder<?, ?> newBuilder(); - interface Builder<T extends ComplexOutputDescription, B extends Builder<T, B>> - extends ProcessOutputDescription.Builder<T, B>, ComplexDescription.Builder<T, B> { + interface Builder< + T extends ComplexOutputDescription, + B extends Builder<T, B>> extends ProcessOutputDescription.Builder<T, B>, ComplexDescription.Builder<T, B> { } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/DataDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/DataDescription.java index d7b7da537..d9fac0ec9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/DataDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/DataDescription.java @@ -35,5 +35,8 @@ default boolean isGroup() { return false; } - interface Builder<T extends DataDescription, B extends Builder<T, B>> extends Description.Builder<T, B> {} + interface Builder< + T extends DataDescription, + B extends Builder<T, B>> extends Description.Builder<T, B> { + } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/Description.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/Description.java index a54342fdb..c093429c4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/Description.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/Description.java @@ -15,16 +15,17 @@ */ package org.n52.shetland.ogc.wps.description; -import com.google.common.base.Strings; +import java.net.URI; +import java.util.Arrays; +import java.util.Optional; +import java.util.Set; + import org.n52.shetland.ogc.ows.OwsCode; import org.n52.shetland.ogc.ows.OwsKeyword; import org.n52.shetland.ogc.ows.OwsLanguageString; import org.n52.shetland.ogc.ows.OwsMetadata; -import java.net.URI; -import java.util.Arrays; -import java.util.Optional; -import java.util.Set; +import com.google.common.base.Strings; /** * TODO JavaDoc @@ -43,15 +44,14 @@ public interface Description { Set<OwsMetadata> getMetadata(); - interface Builder<T extends Description, B extends Builder<T, B>> - extends org.n52.janmayen.Builder<T, B> { + interface Builder< + T extends Description, + B extends Builder<T, B>> extends org.n52.janmayen.Builder<T, B> { default B withDescription(Description description) { - return withIdentifier(description.getId()) - .withTitle(description.getTitle()) - .withAbstract(description.getAbstract().orElse(null)) - .withKeywords(description.getKeywords()) - .withMetadata(description.getMetadata()); + return withIdentifier(description.getId()).withTitle(description.getTitle()) + .withAbstract(description.getAbstract().orElse(null)).withKeywords(description.getKeywords()) + .withMetadata(description.getMetadata()); } B withAbstract(OwsLanguageString abstrakt); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/GroupInputDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/GroupInputDescription.java index 7c5855312..1f393d1c8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/GroupInputDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/GroupInputDescription.java @@ -18,14 +18,14 @@ /** * @author Christian Autermann */ -public interface GroupInputDescription extends ProcessInputDescription, - ProcessInputDescriptionContainer { +public interface GroupInputDescription extends ProcessInputDescription, ProcessInputDescriptionContainer { Builder<?, ?> newBuilder(); - interface Builder<T extends GroupInputDescription, B extends Builder<T, B>> - extends ProcessInputDescription.Builder<T, B>, - ProcessInputDescriptionContainer.Builder<T, B> { + interface Builder< + T extends GroupInputDescription, + B extends Builder<T, B>> + extends ProcessInputDescription.Builder<T, B>, ProcessInputDescriptionContainer.Builder<T, B> { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/GroupOutputDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/GroupOutputDescription.java index f45d03805..35b5ca3ff 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/GroupOutputDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/GroupOutputDescription.java @@ -18,14 +18,14 @@ /** * @author Christian Autermann */ -public interface GroupOutputDescription extends ProcessOutputDescription, - ProcessOutputDescriptionContainer { +public interface GroupOutputDescription extends ProcessOutputDescription, ProcessOutputDescriptionContainer { Builder<?, ?> newBuilder(); - interface Builder<T extends GroupOutputDescription, B extends Builder<T, B>> - extends ProcessOutputDescription.Builder<T, B>, - ProcessOutputDescriptionContainer.Builder<T, B> { + interface Builder< + T extends GroupOutputDescription, + B extends Builder<T, B>> + extends ProcessOutputDescription.Builder<T, B>, ProcessOutputDescriptionContainer.Builder<T, B> { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralDataDomain.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralDataDomain.java index a099b6cc8..e00fdf69c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralDataDomain.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralDataDomain.java @@ -15,13 +15,14 @@ */ package org.n52.shetland.ogc.wps.description; -import com.google.common.base.Strings; +import java.net.URI; +import java.util.Optional; + import org.n52.shetland.ogc.ows.OwsDomainMetadata; import org.n52.shetland.ogc.ows.OwsPossibleValues; import org.n52.shetland.ogc.ows.OwsValue; -import java.net.URI; -import java.util.Optional; +import com.google.common.base.Strings; /** * TODO JavaDoc @@ -39,7 +40,9 @@ public interface LiteralDataDomain { Builder<?, ?> newBuilder(); - interface Builder<T extends LiteralDataDomain, B extends Builder<T, B>> extends org.n52.janmayen.Builder<T, B> { + interface Builder< + T extends LiteralDataDomain, + B extends Builder<T, B>> extends org.n52.janmayen.Builder<T, B> { B withDefaultValue(OwsValue value); default B withDefaultValue(String value) { @@ -49,25 +52,21 @@ default B withDefaultValue(String value) { B withDataType(OwsDomainMetadata dataType); default B withDataType(URI reference, String value) { - return withDataType(Strings.emptyToNull(value) == null - ? null : new OwsDomainMetadata(reference, value)); + return withDataType(Strings.emptyToNull(value) == null ? null : new OwsDomainMetadata(reference, value)); } default B withDataType(String value) { - return withDataType(Strings.emptyToNull(value) == null - ? null : new OwsDomainMetadata(value)); + return withDataType(Strings.emptyToNull(value) == null ? null : new OwsDomainMetadata(value)); } B withUOM(OwsDomainMetadata uom); default B withUOM(URI reference, String value) { - return withUOM(Strings.emptyToNull(value) == null - ? null : new OwsDomainMetadata(reference, value)); + return withUOM(Strings.emptyToNull(value) == null ? null : new OwsDomainMetadata(reference, value)); } default B withUOM(String value) { - return withUOM(Strings.emptyToNull(value) == null - ? null : new OwsDomainMetadata(value)); + return withUOM(Strings.emptyToNull(value) == null ? null : new OwsDomainMetadata(value)); } B withValueDescription(OwsPossibleValues allowedValues); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralDescription.java index 8e9fc706c..ca3d9f232 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralDescription.java @@ -15,10 +15,10 @@ */ package org.n52.shetland.ogc.wps.description; -import org.n52.janmayen.stream.Streams; - import java.util.Set; +import org.n52.janmayen.stream.Streams; + /** * TODO JavaDoc * @@ -29,7 +29,9 @@ public interface LiteralDescription { LiteralDataDomain getDefaultLiteralDataDomain(); - interface Builder<T extends LiteralDescription, B extends Builder<T, B>> extends org.n52.janmayen.Builder<T, B> { + interface Builder< + T extends LiteralDescription, + B extends Builder<T, B>> extends org.n52.janmayen.Builder<T, B> { default B withSupportedLiteralDataDomain(Iterable<LiteralDataDomain> domains) { Streams.stream(domains).forEach(this::withDefaultLiteralDataDomain); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralInputDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralInputDescription.java index d06b9b1f4..cdc98f4e3 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralInputDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralInputDescription.java @@ -33,19 +33,23 @@ default LiteralInputDescription asLiteral() { } @Override - default <T> T visit(ReturningVisitor<T> visitor) { + default < + T> T visit(ReturningVisitor<T> visitor) { return visitor.visit(this); } @Override - default <T, X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { + default < + T, + X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { return visitor.visit(this); } Builder<?, ?> newBuilder(); - interface Builder<T extends LiteralInputDescription, B extends Builder<T, B>> - extends ProcessInputDescription.Builder<T, B>, LiteralDescription.Builder<T, B> { + interface Builder< + T extends LiteralInputDescription, + B extends Builder<T, B>> extends ProcessInputDescription.Builder<T, B>, LiteralDescription.Builder<T, B> { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralOutputDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralOutputDescription.java index 338ccbbff..6c8360873 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralOutputDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/LiteralOutputDescription.java @@ -33,19 +33,23 @@ default boolean isLiteral() { } @Override - default <T> T visit(ReturningVisitor<T> visitor) { + default < + T> T visit(ReturningVisitor<T> visitor) { return visitor.visit(this); } @Override - default <T, X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { + default < + T, + X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { return visitor.visit(this); } Builder<?, ?> newBuilder(); - interface Builder<T extends LiteralOutputDescription, B extends Builder<T, B>> - extends LiteralDescription.Builder<T, B>, ProcessOutputDescription.Builder<T, B> { + interface Builder< + T extends LiteralOutputDescription, + B extends Builder<T, B>> extends LiteralDescription.Builder<T, B>, ProcessOutputDescription.Builder<T, B> { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessDescription.java index 833146ad7..e3c8ce559 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessDescription.java @@ -15,10 +15,10 @@ */ package org.n52.shetland.ogc.wps.description; -import org.n52.shetland.ogc.ows.OwsCode; - import java.util.Comparator; +import org.n52.shetland.ogc.ows.OwsCode; + /** * TODO JavaDoc * @@ -27,14 +27,20 @@ public interface ProcessDescription extends ProcessInputDescriptionContainer, ProcessOutputDescriptionContainer, Comparable<ProcessDescription> { - Comparator<ProcessDescription> COMPARATOR = Comparator.nullsLast( - Comparator.comparing(ProcessDescription::getId, - Comparator.comparing(OwsCode::getCodeSpace, - Comparator.comparing(x -> x.orElse(null), - Comparator.nullsLast( - Comparator.naturalOrder()))) - .thenComparing(OwsCode::getValue)) - .thenComparing(ProcessDescription::getVersion, Comparator.nullsLast(Comparator.naturalOrder()))); + Comparator< + ProcessDescription> COMPARATOR = + Comparator + .nullsLast( + Comparator + .comparing(ProcessDescription::getId, + Comparator + .comparing(OwsCode::getCodeSpace, + Comparator.comparing(x -> x.orElse(null), + Comparator.nullsLast( + Comparator.naturalOrder()))) + .thenComparing(OwsCode::getValue)) + .thenComparing(ProcessDescription::getVersion, + Comparator.nullsLast(Comparator.naturalOrder()))); String getVersion(); @@ -49,7 +55,9 @@ default int compareTo(ProcessDescription o) { return COMPARATOR.compare(this, o); } - interface Builder<T extends ProcessDescription, B extends Builder<T, B>> + interface Builder< + T extends ProcessDescription, + B extends Builder<T, B>> extends ProcessInputDescriptionContainer.Builder<T, B>, ProcessOutputDescriptionContainer.Builder<T, B> { B statusSupported(boolean statusSupported); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessDescriptionBuilderFactory.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessDescriptionBuilderFactory.java index a67137926..44ca1e910 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessDescriptionBuilderFactory.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessDescriptionBuilderFactory.java @@ -17,16 +17,16 @@ @SuppressWarnings("checkstyle:interfacetypeparametername") public interface ProcessDescriptionBuilderFactory< - PD extends ProcessDescription, - GID extends GroupInputDescription, - GOD extends GroupOutputDescription, - LID extends LiteralInputDescription, - LOD extends LiteralOutputDescription, - CID extends ComplexInputDescription, - COD extends ComplexOutputDescription, - BID extends BoundingBoxInputDescription, - BOD extends BoundingBoxOutputDescription, - LDD extends LiteralDataDomain> { + PD extends ProcessDescription, + GID extends GroupInputDescription, + GOD extends GroupOutputDescription, + LID extends LiteralInputDescription, + LOD extends LiteralOutputDescription, + CID extends ComplexInputDescription, + COD extends ComplexOutputDescription, + BID extends BoundingBoxInputDescription, + BOD extends BoundingBoxOutputDescription, + LDD extends LiteralDataDomain> { ProcessDescription.Builder<? extends PD, ?> process(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessInputDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessInputDescription.java index fdbf93964..22441c377 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessInputDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessInputDescription.java @@ -15,11 +15,11 @@ */ package org.n52.shetland.ogc.wps.description; -import org.n52.shetland.ogc.wps.InputOccurence; - import java.math.BigInteger; import java.util.Objects; +import org.n52.shetland.ogc.wps.InputOccurence; + /** * TODO JavaDoc * @@ -45,7 +45,8 @@ default GroupInputDescription asGroup() { InputOccurence getOccurence(); - <T> T visit(ReturningVisitor<T> visitor); + < + T> T visit(ReturningVisitor<T> visitor); default void visit(Visitor visitor) { Objects.requireNonNull(visitor); @@ -76,7 +77,8 @@ public Void visit(GroupInputDescription input) { }); } - default <X extends Exception> void visit(ThrowingVisitor<X> visitor) throws X { + default < + X extends Exception> void visit(ThrowingVisitor<X> visitor) throws X { visit(new ThrowingReturningVisitor<Void, X>() { @Override public Void visit(BoundingBoxInputDescription output) throws X { @@ -104,7 +106,9 @@ public Void visit(GroupInputDescription output) throws X { }); } - <T, X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X; + < + T, + X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X; interface Visitor { void visit(BoundingBoxInputDescription input); @@ -116,7 +120,8 @@ interface Visitor { void visit(GroupInputDescription input); } - interface ThrowingVisitor<X extends Exception> { + interface ThrowingVisitor< + X extends Exception> { void visit(BoundingBoxInputDescription input) throws X; void visit(ComplexInputDescription input) throws X; @@ -126,7 +131,8 @@ interface ThrowingVisitor<X extends Exception> { void visit(GroupInputDescription input) throws X; } - interface ReturningVisitor<T> { + interface ReturningVisitor< + T> { T visit(BoundingBoxInputDescription input); T visit(ComplexInputDescription input); @@ -136,7 +142,9 @@ interface ReturningVisitor<T> { T visit(GroupInputDescription input); } - interface ThrowingReturningVisitor<T, X extends Exception> { + interface ThrowingReturningVisitor< + T, + X extends Exception> { T visit(BoundingBoxInputDescription input) throws X; T visit(ComplexInputDescription input) throws X; @@ -146,8 +154,9 @@ interface ThrowingReturningVisitor<T, X extends Exception> { T visit(GroupInputDescription input) throws X; } - interface Builder<T extends ProcessInputDescription, B extends Builder<T, B>> - extends DataDescription.Builder<T, B> { + interface Builder< + T extends ProcessInputDescription, + B extends Builder<T, B>> extends DataDescription.Builder<T, B> { B withMaximalOccurence(BigInteger max); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessInputDescriptionContainer.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessInputDescriptionContainer.java index 41036c985..aa3663e82 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessInputDescriptionContainer.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessInputDescriptionContainer.java @@ -15,14 +15,14 @@ */ package org.n52.shetland.ogc.wps.description; -import org.n52.janmayen.stream.Streams; -import org.n52.shetland.ogc.ows.OwsCode; - import java.util.Arrays; import java.util.Collection; import java.util.Set; import java.util.stream.Stream; +import org.n52.janmayen.stream.Streams; +import org.n52.shetland.ogc.ows.OwsCode; + /** * @author Christian Autermann */ @@ -38,9 +38,9 @@ default ProcessInputDescription getInput(String id) { Set<OwsCode> getInputs(); - interface Builder<T extends ProcessInputDescriptionContainer, - B extends ProcessInputDescriptionContainer.Builder<T, B>> - extends Description.Builder<T, B> { + interface Builder< + T extends ProcessInputDescriptionContainer, + B extends ProcessInputDescriptionContainer.Builder<T, B>> extends Description.Builder<T, B> { B withInput(ProcessInputDescription input); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessOutputDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessOutputDescription.java index bdcbfbb76..5c7a8ad52 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessOutputDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessOutputDescription.java @@ -38,7 +38,8 @@ default GroupOutputDescription asGroup() { throw new UnsupportedOperationException(); } - <T> T visit(ReturningVisitor<T> visitor); + < + T> T visit(ReturningVisitor<T> visitor); default void visit(Visitor visitor) { visit(new ReturningVisitor<Void>() { @@ -68,9 +69,12 @@ public Void visit(GroupOutputDescription output) { }); } - <T, X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X; + < + T, + X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X; - default <X extends Exception> void visit(ThrowingVisitor<X> visitor) throws X { + default < + X extends Exception> void visit(ThrowingVisitor<X> visitor) throws X { visit(new ThrowingReturningVisitor<Void, X>() { @Override public Void visit(BoundingBoxOutputDescription output) throws X { @@ -108,7 +112,9 @@ interface Visitor { void visit(GroupOutputDescription output); } - interface ThrowingReturningVisitor<T, X extends Exception> { + interface ThrowingReturningVisitor< + T, + X extends Exception> { T visit(BoundingBoxOutputDescription output) throws X; T visit(ComplexOutputDescription output) throws X; @@ -118,7 +124,8 @@ interface ThrowingReturningVisitor<T, X extends Exception> { T visit(GroupOutputDescription output) throws X; } - interface ReturningVisitor<T> { + interface ReturningVisitor< + T> { T visit(BoundingBoxOutputDescription output); T visit(ComplexOutputDescription output); @@ -129,7 +136,8 @@ interface ReturningVisitor<T> { } - interface ThrowingVisitor<X extends Exception> { + interface ThrowingVisitor< + X extends Exception> { void visit(BoundingBoxOutputDescription output) throws X; void visit(ComplexOutputDescription output) throws X; @@ -139,8 +147,9 @@ interface ThrowingVisitor<X extends Exception> { void visit(GroupOutputDescription output) throws X; } - interface Builder<T extends ProcessOutputDescription, B extends Builder<T, B>> - extends DataDescription.Builder<T, B> { + interface Builder< + T extends ProcessOutputDescription, + B extends Builder<T, B>> extends DataDescription.Builder<T, B> { } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessOutputDescriptionContainer.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessOutputDescriptionContainer.java index 032c86ed8..5b618384b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessOutputDescriptionContainer.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/ProcessOutputDescriptionContainer.java @@ -15,14 +15,14 @@ */ package org.n52.shetland.ogc.wps.description; -import org.n52.janmayen.stream.Streams; -import org.n52.shetland.ogc.ows.OwsCode; - import java.util.Arrays; import java.util.Collection; import java.util.Set; import java.util.stream.Stream; +import org.n52.janmayen.stream.Streams; +import org.n52.shetland.ogc.ows.OwsCode; + /** * @author Christian Autermann */ @@ -38,8 +38,9 @@ default ProcessOutputDescription getOutput(String id) { Set<OwsCode> getOutputs(); - interface Builder<T extends ProcessOutputDescriptionContainer, B extends Builder<T, B>> - extends Description.Builder<T, B> { + interface Builder< + T extends ProcessOutputDescriptionContainer, + B extends Builder<T, B>> extends Description.Builder<T, B> { B withOutput(ProcessOutputDescription output); default B withOutput(ProcessOutputDescription.Builder<?, ?> output) { diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractDataDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractDataDescription.java index d5725cdf6..b7a0d2286 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractDataDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractDataDescription.java @@ -27,11 +27,12 @@ protected AbstractDataDescription(AbstractBuilder<?, ?> builder) { super(builder); } - public abstract static class AbstractBuilder<T extends DataDescription, B extends AbstractBuilder<T, B>> - extends AbstractDescription.AbstractBuilder<T, B> + public abstract static class AbstractBuilder< + T extends DataDescription, + B extends AbstractBuilder<T, B>> extends AbstractDescription.AbstractBuilder<T, B> implements DataDescription.Builder<T, B> { protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - DataDescription entity) { + DataDescription entity) { super(factory, entity); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractDescription.java index d4f7e4673..f07752346 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractDescription.java @@ -15,7 +15,11 @@ */ package org.n52.shetland.ogc.wps.description.impl; -import com.google.common.collect.ImmutableSet; +import java.util.Collections; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; + import org.n52.janmayen.AbstractBuildable; import org.n52.shetland.ogc.ows.OwsCode; import org.n52.shetland.ogc.ows.OwsKeyword; @@ -24,19 +28,15 @@ import org.n52.shetland.ogc.wps.description.Description; import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; -import java.util.Collections; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * TODO JavaDoc * * @author Christian Autermann */ -public abstract class AbstractDescription - extends AbstractBuildable<ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> - implements Description { +public abstract class AbstractDescription extends + AbstractBuildable<ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> implements Description { private final OwsCode id; private final OwsLanguageString title; @@ -78,8 +78,9 @@ public Set<OwsMetadata> getMetadata() { return Collections.unmodifiableSet(this.metadata); } - protected abstract static class AbstractBuilder<T extends Description, B extends AbstractBuilder<T, B>> - extends + protected abstract static class AbstractBuilder< + T extends Description, + B extends AbstractBuilder<T, B>> extends AbstractBuildable.AbstractBuilder<ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>, T, B> implements Description.Builder<T, B> { private OwsCode id; @@ -89,7 +90,7 @@ protected abstract static class AbstractBuilder<T extends Description, B extends private final ImmutableSet.Builder<OwsMetadata> metadata = ImmutableSet.builder(); protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - Description entity) { + Description entity) { super(factory); this.id = entity.getId(); this.title = entity.getTitle(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractProcessInputDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractProcessInputDescription.java index 7dd6f829b..e9609ec13 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractProcessInputDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractProcessInputDescription.java @@ -15,12 +15,13 @@ */ package org.n52.shetland.ogc.wps.description.impl; -import com.google.common.base.Preconditions; +import java.math.BigInteger; + import org.n52.shetland.ogc.wps.InputOccurence; import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; import org.n52.shetland.ogc.wps.description.ProcessInputDescription; -import java.math.BigInteger; +import com.google.common.base.Preconditions; /** * TODO JavaDoc @@ -42,15 +43,16 @@ public InputOccurence getOccurence() { return this.occurence; } - protected abstract static class AbstractBuilder<T extends ProcessInputDescription, B extends AbstractBuilder<T, B>> - extends AbstractDataDescription.AbstractBuilder<T, B> + protected abstract static class AbstractBuilder< + T extends ProcessInputDescription, + B extends AbstractBuilder<T, B>> extends AbstractDataDescription.AbstractBuilder<T, B> implements ProcessInputDescription.Builder<T, B> { private BigInteger minimalOccurence = BigInteger.ONE; private BigInteger maximalOccurence = BigInteger.ONE; protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - ProcessInputDescription entity) { + ProcessInputDescription entity) { super(factory, entity); this.minimalOccurence = entity.getOccurence().getMin(); this.maximalOccurence = entity.getOccurence().getMax().orElse(null); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractProcessOutputDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractProcessOutputDescription.java index 984cf05aa..34fef66f4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractProcessOutputDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/AbstractProcessOutputDescription.java @@ -30,15 +30,16 @@ protected AbstractProcessOutputDescription(AbstractBuilder<?, ?> builder) { super(builder); } - protected abstract static class AbstractBuilder<T extends ProcessOutputDescription, B extends AbstractBuilder<T, B>> - extends AbstractDataDescription.AbstractBuilder<T, B> + protected abstract static class AbstractBuilder< + T extends ProcessOutputDescription, + B extends AbstractBuilder<T, B>> extends AbstractDataDescription.AbstractBuilder<T, B> implements ProcessOutputDescription.Builder<T, B> { protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory) { super(factory); } protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - ProcessOutputDescription entity) { + ProcessOutputDescription entity) { super(factory, entity); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/BoundingBoxInputDescriptionImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/BoundingBoxInputDescriptionImpl.java index 5df58a108..c18c3dce9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/BoundingBoxInputDescriptionImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/BoundingBoxInputDescriptionImpl.java @@ -15,14 +15,15 @@ */ package org.n52.shetland.ogc.wps.description.impl; -import com.google.common.collect.ImmutableSet; +import java.util.Collections; +import java.util.Objects; +import java.util.Set; + import org.n52.shetland.ogc.ows.OwsCRS; import org.n52.shetland.ogc.wps.description.BoundingBoxInputDescription; import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; -import java.util.Collections; -import java.util.Objects; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * TODO JavaDoc @@ -56,15 +57,16 @@ public OwsCRS getDefaultCRS() { return getFactory().boundingBoxInput(this); } - public abstract static class AbstractBuilder<T extends BoundingBoxInputDescription, B extends AbstractBuilder<T, B>> - extends AbstractProcessInputDescription.AbstractBuilder<T, B> + public abstract static class AbstractBuilder< + T extends BoundingBoxInputDescription, + B extends AbstractBuilder<T, B>> extends AbstractProcessInputDescription.AbstractBuilder<T, B> implements BoundingBoxInputDescription.Builder<T, B> { private OwsCRS defaultCRS; private final ImmutableSet.Builder<OwsCRS> supportedCRS = ImmutableSet.builder(); protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - BoundingBoxInputDescription entity) { + BoundingBoxInputDescription entity) { super(factory, entity); this.defaultCRS = entity.getDefaultCRS(); this.supportedCRS.addAll(entity.getSupportedCRS()); @@ -103,7 +105,7 @@ protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> } protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - BoundingBoxInputDescription entity) { + BoundingBoxInputDescription entity) { super(factory, entity); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/BoundingBoxOutputDescriptionImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/BoundingBoxOutputDescriptionImpl.java index b74b09d27..ac974eb42 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/BoundingBoxOutputDescriptionImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/BoundingBoxOutputDescriptionImpl.java @@ -15,14 +15,15 @@ */ package org.n52.shetland.ogc.wps.description.impl; -import com.google.common.collect.ImmutableSet; +import java.util.Collections; +import java.util.Objects; +import java.util.Set; + import org.n52.shetland.ogc.ows.OwsCRS; import org.n52.shetland.ogc.wps.description.BoundingBoxOutputDescription; import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; -import java.util.Collections; -import java.util.Objects; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * TODO JavaDoc @@ -56,9 +57,9 @@ public OwsCRS getDefaultCRS() { return this.defaultCRS; } - public abstract static class AbstractBuilder<T extends BoundingBoxOutputDescription, - B extends AbstractBuilder<T, B>> - extends AbstractProcessOutputDescription.AbstractBuilder<T, B> + public abstract static class AbstractBuilder< + T extends BoundingBoxOutputDescription, + B extends AbstractBuilder<T, B>> extends AbstractProcessOutputDescription.AbstractBuilder<T, B> implements BoundingBoxOutputDescription.Builder<T, B> { private OwsCRS defaultCRS; @@ -69,7 +70,7 @@ protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, } protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - BoundingBoxOutputDescription entity) { + BoundingBoxOutputDescription entity) { super(factory, entity); this.defaultCRS = entity.getDefaultCRS(); this.supportedCRS.addAll(entity.getSupportedCRS()); @@ -105,7 +106,7 @@ protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> } protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - BoundingBoxOutputDescription entity) { + BoundingBoxOutputDescription entity) { super(factory, entity); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexInputDescriptionImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexInputDescriptionImpl.java index f3e36470e..997890534 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexInputDescriptionImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexInputDescriptionImpl.java @@ -15,27 +15,26 @@ */ package org.n52.shetland.ogc.wps.description.impl; -import com.google.common.collect.ImmutableSet; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -import org.n52.shetland.ogc.wps.Format; -import org.n52.shetland.ogc.wps.description.ComplexInputDescription; -import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; - import java.math.BigInteger; import java.util.Collections; import java.util.Objects; import java.util.Optional; import java.util.Set; +import org.n52.shetland.ogc.wps.Format; +import org.n52.shetland.ogc.wps.description.ComplexInputDescription; +import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; + +import com.google.common.collect.ImmutableSet; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * * @author Christian Autermann */ -public class ComplexInputDescriptionImpl extends AbstractProcessInputDescription - implements ComplexInputDescription { +public class ComplexInputDescriptionImpl extends AbstractProcessInputDescription implements ComplexInputDescription { private final Format defaultFormat; private final Set<Format> supportedFormats; @@ -69,8 +68,9 @@ public Optional<BigInteger> getMaximumMegabytes() { return getFactory().complexInput(this); } - public abstract static class AbstractBuilder<T extends ComplexInputDescription, B extends AbstractBuilder<T, B>> - extends AbstractProcessInputDescription.AbstractBuilder<T, B> + public abstract static class AbstractBuilder< + T extends ComplexInputDescription, + B extends AbstractBuilder<T, B>> extends AbstractProcessInputDescription.AbstractBuilder<T, B> implements ComplexInputDescription.Builder<T, B> { private final ImmutableSet.Builder<Format> supportedFormats = ImmutableSet.builder(); @@ -78,7 +78,7 @@ public abstract static class AbstractBuilder<T extends ComplexInputDescription, private BigInteger maximumMegabytes; protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - ComplexInputDescription entity) { + ComplexInputDescription entity) { super(factory, entity); this.defaultFormat = entity.getDefaultFormat(); this.supportedFormats.addAll(entity.getSupportedFormats()); @@ -91,8 +91,7 @@ protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, @Override public B withMaximumMegabytes(BigInteger maximumMegabytes) { - if (maximumMegabytes == null || - maximumMegabytes.compareTo(BigInteger.ZERO) > 0) { + if (maximumMegabytes == null || maximumMegabytes.compareTo(BigInteger.ZERO) > 0) { this.maximumMegabytes = maximumMegabytes; } return self(); @@ -135,7 +134,7 @@ protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> } protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - ComplexInputDescription entity) { + ComplexInputDescription entity) { super(factory, entity); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexOutputDescriptionImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexOutputDescriptionImpl.java index d3ff9669a..d322f030d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexOutputDescriptionImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ComplexOutputDescriptionImpl.java @@ -15,21 +15,21 @@ */ package org.n52.shetland.ogc.wps.description.impl; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableSet; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -import org.n52.shetland.ogc.wps.Format; -import org.n52.shetland.ogc.wps.description.ComplexOutputDescription; -import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; - import java.math.BigInteger; import java.util.Collections; import java.util.Objects; import java.util.Optional; import java.util.Set; +import org.n52.shetland.ogc.wps.Format; +import org.n52.shetland.ogc.wps.description.ComplexOutputDescription; +import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * TODO JavaDoc * @@ -70,8 +70,9 @@ public Optional<BigInteger> getMaximumMegabytes() { return getFactory().complexOutput(this); } - public abstract static class AbstractBuilder<T extends ComplexOutputDescription, B extends AbstractBuilder<T, B>> - extends AbstractProcessOutputDescription.AbstractBuilder<T, B> + public abstract static class AbstractBuilder< + T extends ComplexOutputDescription, + B extends AbstractBuilder<T, B>> extends AbstractProcessOutputDescription.AbstractBuilder<T, B> implements ComplexOutputDescription.Builder<T, B> { private final ImmutableSet.Builder<Format> supportedFormats = ImmutableSet.builder(); @@ -79,7 +80,7 @@ public abstract static class AbstractBuilder<T extends ComplexOutputDescription, private BigInteger maximumMegabytes; protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - ComplexOutputDescription entity) { + ComplexOutputDescription entity) { super(factory, entity); this.defaultFormat = entity.getDefaultFormat(); this.supportedFormats.addAll(entity.getSupportedFormats()); @@ -92,8 +93,7 @@ protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, @Override public B withMaximumMegabytes(BigInteger maximumMegabytes) { - Preconditions.checkArgument(maximumMegabytes == null || - maximumMegabytes.compareTo(BigInteger.ZERO) > 0); + Preconditions.checkArgument(maximumMegabytes == null || maximumMegabytes.compareTo(BigInteger.ZERO) > 0); this.maximumMegabytes = maximumMegabytes; return self(); } @@ -136,7 +136,7 @@ protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> } protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - ComplexOutputDescription entity) { + ComplexOutputDescription entity) { super(factory, entity); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/GroupInputDescriptionImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/GroupInputDescriptionImpl.java index df4331261..aee63fca0 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/GroupInputDescriptionImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/GroupInputDescriptionImpl.java @@ -15,7 +15,12 @@ */ package org.n52.shetland.ogc.wps.description.impl; -import com.google.common.collect.ImmutableSet; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import org.n52.janmayen.stream.MoreCollectors; import org.n52.shetland.ogc.ows.OwsCode; import org.n52.shetland.ogc.wps.description.Description; @@ -23,11 +28,7 @@ import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; import org.n52.shetland.ogc.wps.description.ProcessInputDescription; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; +import com.google.common.collect.ImmutableSet; public class GroupInputDescriptionImpl extends AbstractProcessInputDescription implements GroupInputDescription { @@ -36,16 +37,19 @@ public class GroupInputDescriptionImpl extends AbstractProcessInputDescription i protected GroupInputDescriptionImpl(AbstractBuilder<?, ?> builder) { super(builder); this.inputs = builder.getInputs().stream() - .collect(Collectors.groupingBy(Description::getId, MoreCollectors.toSingleResult())); + .collect(Collectors.groupingBy(Description::getId, MoreCollectors.toSingleResult())); } @Override - public <T> T visit(ReturningVisitor<T> visitor) { + public < + T> T visit(ReturningVisitor<T> visitor) { return visitor.visit(this); } @Override - public <T, X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { + public < + T, + X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { return visitor.visit(this); } @@ -69,8 +73,9 @@ public Set<OwsCode> getInputs() { return getFactory().groupInput(this); } - public abstract static class AbstractBuilder<T extends GroupInputDescription, B extends AbstractBuilder<T, B>> - extends AbstractProcessInputDescription.AbstractBuilder<T, B> + public abstract static class AbstractBuilder< + T extends GroupInputDescription, + B extends AbstractBuilder<T, B>> extends AbstractProcessInputDescription.AbstractBuilder<T, B> implements GroupInputDescription.Builder<T, B> { private final ImmutableSet.Builder<ProcessInputDescription> inputs = ImmutableSet.builder(); @@ -80,7 +85,7 @@ protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, } protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - GroupInputDescription entity) { + GroupInputDescription entity) { super(factory, entity); this.inputs.addAll(entity.getInputDescriptions()); } @@ -105,7 +110,7 @@ protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> } public Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - GroupInputDescription entity) { + GroupInputDescription entity) { super(factory, entity); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/GroupOutputDescriptionImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/GroupOutputDescriptionImpl.java index 763dc4ead..08e92d517 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/GroupOutputDescriptionImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/GroupOutputDescriptionImpl.java @@ -15,7 +15,12 @@ */ package org.n52.shetland.ogc.wps.description.impl; -import com.google.common.collect.ImmutableSet; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import org.n52.janmayen.stream.MoreCollectors; import org.n52.shetland.ogc.ows.OwsCode; import org.n52.shetland.ogc.wps.description.Description; @@ -23,11 +28,7 @@ import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; import org.n52.shetland.ogc.wps.description.ProcessOutputDescription; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; +import com.google.common.collect.ImmutableSet; /** * TODO JavaDoc @@ -41,18 +42,19 @@ public class GroupOutputDescriptionImpl extends AbstractProcessOutputDescription protected GroupOutputDescriptionImpl(AbstractBuilder<?, ?> builder) { super(builder); this.outputs = builder.getOutputs().stream() - .collect(Collectors.groupingBy(Description::getId, MoreCollectors.toSingleResult())); + .collect(Collectors.groupingBy(Description::getId, MoreCollectors.toSingleResult())); } @Override - public <T> T visit(ReturningVisitor<T> visitor) { + public < + T> T visit(ReturningVisitor<T> visitor) { return visitor.visit(this); } @Override - public <T, X extends Exception> T visit( - ThrowingReturningVisitor<T, X> visitor) - throws X { + public < + T, + X extends Exception> T visit(ThrowingReturningVisitor<T, X> visitor) throws X { return visitor.visit(this); } @@ -76,8 +78,9 @@ public Set<OwsCode> getOutputs() { return getFactory().groupOutput(this); } - public abstract static class AbstractBuilder<T extends GroupOutputDescription, B extends AbstractBuilder<T, B>> - extends AbstractProcessOutputDescription.AbstractBuilder<T, B> + public abstract static class AbstractBuilder< + T extends GroupOutputDescription, + B extends AbstractBuilder<T, B>> extends AbstractProcessOutputDescription.AbstractBuilder<T, B> implements GroupOutputDescription.Builder<T, B> { private final ImmutableSet.Builder<ProcessOutputDescription> inputs = ImmutableSet.builder(); @@ -87,7 +90,7 @@ protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, } protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - GroupOutputDescription entity) { + GroupOutputDescription entity) { super(factory, entity); this.inputs.addAll(entity.getOutputDescriptions()); } @@ -112,7 +115,7 @@ protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> } protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - GroupOutputDescription entity) { + GroupOutputDescription entity) { super(factory, entity); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/LiteralDataDomainImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/LiteralDataDomainImpl.java index a866a90a0..b0e9d64e1 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/LiteralDataDomainImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/LiteralDataDomainImpl.java @@ -15,6 +15,9 @@ */ package org.n52.shetland.ogc.wps.description.impl; +import java.util.Objects; +import java.util.Optional; + import org.n52.janmayen.AbstractBuildable; import org.n52.shetland.ogc.ows.OwsAnyValue; import org.n52.shetland.ogc.ows.OwsDomainMetadata; @@ -23,9 +26,6 @@ import org.n52.shetland.ogc.wps.description.LiteralDataDomain; import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; -import java.util.Objects; -import java.util.Optional; - public class LiteralDataDomainImpl extends AbstractBuildable<ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> implements LiteralDataDomain { @@ -67,8 +67,9 @@ public Optional<OwsValue> getDefaultValue() { return getFactory().literalDataDomain(this); } - public abstract static class AbstractBuilder<T extends LiteralDataDomain, B extends AbstractBuilder<T, B>> - extends + public abstract static class AbstractBuilder< + T extends LiteralDataDomain, + B extends AbstractBuilder<T, B>> extends AbstractBuildable.AbstractBuilder<ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?>, T, B> implements LiteralDataDomain.Builder<T, B> { private OwsPossibleValues possibleValues = OwsAnyValue.instance(); @@ -81,7 +82,7 @@ protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, } protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - LiteralDataDomain entity) { + LiteralDataDomain entity) { super(factory); this.possibleValues = entity.getPossibleValues(); this.dataType = entity.getDataType().orElse(null); @@ -142,7 +143,7 @@ protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> } protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - LiteralDataDomain entity) { + LiteralDataDomain entity) { super(factory, entity); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/LiteralInputDescriptionImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/LiteralInputDescriptionImpl.java index 3720ff04a..62b58fcb1 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/LiteralInputDescriptionImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/LiteralInputDescriptionImpl.java @@ -15,14 +15,15 @@ */ package org.n52.shetland.ogc.wps.description.impl; -import com.google.common.collect.ImmutableSet; +import java.util.Collections; +import java.util.Objects; +import java.util.Set; + import org.n52.shetland.ogc.wps.description.LiteralDataDomain; import org.n52.shetland.ogc.wps.description.LiteralInputDescription; import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; -import java.util.Collections; -import java.util.Objects; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * TODO JavaDoc @@ -36,10 +37,10 @@ public class LiteralInputDescriptionImpl extends AbstractProcessInputDescription protected LiteralInputDescriptionImpl(AbstractBuilder<?, ?> builder) { super(builder); - this.defaultLiteralDataDomain = Objects.requireNonNull(builder.getDefaultLiteralDataDomain(), - "defaultLiteralDataDomain"); - this.supportedLiteralDataDomains = Objects.requireNonNull(builder.getSupportedLiteralDataDomains(), - "supportedLiteralDataDomains"); + this.defaultLiteralDataDomain = + Objects.requireNonNull(builder.getDefaultLiteralDataDomain(), "defaultLiteralDataDomain"); + this.supportedLiteralDataDomains = + Objects.requireNonNull(builder.getSupportedLiteralDataDomains(), "supportedLiteralDataDomains"); } @Override @@ -57,8 +58,9 @@ public Set<LiteralDataDomain> getSupportedLiteralDataDomains() { return getFactory().literalInput(this); } - public abstract static class AbstractBuilder<T extends LiteralInputDescription, B extends AbstractBuilder<T, B>> - extends AbstractProcessInputDescription.AbstractBuilder<T, B> + public abstract static class AbstractBuilder< + T extends LiteralInputDescription, + B extends AbstractBuilder<T, B>> extends AbstractProcessInputDescription.AbstractBuilder<T, B> implements LiteralInputDescription.Builder<T, B> { private LiteralDataDomain defaultLiteralDataDomain; @@ -69,7 +71,7 @@ protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, } protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - LiteralInputDescription entity) { + LiteralInputDescription entity) { super(factory, entity); this.defaultLiteralDataDomain = entity.getDefaultLiteralDataDomain(); this.supportedLiteralDataDomains.addAll(entity.getSupportedLiteralDataDomains()); @@ -105,7 +107,7 @@ protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> } protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - LiteralInputDescription entity) { + LiteralInputDescription entity) { super(factory, entity); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/LiteralOutputDescriptionImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/LiteralOutputDescriptionImpl.java index eb4d1618f..ebaf414b9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/LiteralOutputDescriptionImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/LiteralOutputDescriptionImpl.java @@ -15,31 +15,33 @@ */ package org.n52.shetland.ogc.wps.description.impl; -import com.google.common.collect.ImmutableSet; +import java.util.Collections; +import java.util.Objects; +import java.util.Set; + import org.n52.shetland.ogc.wps.description.LiteralDataDomain; import org.n52.shetland.ogc.wps.description.LiteralOutputDescription; import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; -import java.util.Collections; -import java.util.Objects; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * TODO JavaDoc * * @author Christian Autermann */ -public class LiteralOutputDescriptionImpl extends AbstractProcessOutputDescription implements LiteralOutputDescription { +public class LiteralOutputDescriptionImpl extends AbstractProcessOutputDescription + implements LiteralOutputDescription { private final LiteralDataDomain defaultLiteralDataDomain; private final Set<LiteralDataDomain> supportedLiteralDataDomains; protected LiteralOutputDescriptionImpl(AbstractBuilder<?, ?> builder) { super(builder); - this.defaultLiteralDataDomain = Objects.requireNonNull(builder.getDefaultLiteralDataDomain(), - "defaultLiteralDataDomain"); - this.supportedLiteralDataDomains = Objects.requireNonNull(builder.getSupportedLiteralDataDomains(), - "supportedLiteralDataDomains"); + this.defaultLiteralDataDomain = + Objects.requireNonNull(builder.getDefaultLiteralDataDomain(), "defaultLiteralDataDomain"); + this.supportedLiteralDataDomains = + Objects.requireNonNull(builder.getSupportedLiteralDataDomains(), "supportedLiteralDataDomains"); } @Override @@ -57,8 +59,9 @@ public LiteralDataDomain getDefaultLiteralDataDomain() { return getFactory().literalOutput(this); } - public abstract static class AbstractBuilder<T extends LiteralOutputDescription, B extends AbstractBuilder<T, B>> - extends AbstractProcessOutputDescription.AbstractBuilder<T, B> + public abstract static class AbstractBuilder< + T extends LiteralOutputDescription, + B extends AbstractBuilder<T, B>> extends AbstractProcessOutputDescription.AbstractBuilder<T, B> implements LiteralOutputDescription.Builder<T, B> { private LiteralDataDomain defaultLiteralDataDomain; @@ -69,7 +72,7 @@ protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, } protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - LiteralOutputDescription entity) { + LiteralOutputDescription entity) { super(factory, entity); this.defaultLiteralDataDomain = entity.getDefaultLiteralDataDomain(); this.supportedLiteralDataDomains.addAll(entity.getSupportedLiteralDataDomains()); @@ -104,7 +107,7 @@ protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> } protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - LiteralOutputDescription entity) { + LiteralOutputDescription entity) { super(factory, entity); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ProcessDescriptionFactory.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ProcessDescriptionFactory.java index 9aa4cfac6..07587c61a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ProcessDescriptionFactory.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ProcessDescriptionFactory.java @@ -27,19 +27,10 @@ import org.n52.shetland.ogc.wps.description.ProcessDescription; import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory; -public class ProcessDescriptionFactory - implements ProcessDescriptionBuilderFactory< - ProcessDescription, - GroupInputDescription, - GroupOutputDescription, - LiteralInputDescription, - LiteralOutputDescription, - ComplexInputDescription, - ComplexOutputDescription, - BoundingBoxInputDescription, - BoundingBoxOutputDescription, - LiteralDataDomain - > { +public class ProcessDescriptionFactory implements + ProcessDescriptionBuilderFactory<ProcessDescription, GroupInputDescription, GroupOutputDescription, + LiteralInputDescription, LiteralOutputDescription, ComplexInputDescription, ComplexOutputDescription, + BoundingBoxInputDescription, BoundingBoxOutputDescription, LiteralDataDomain> { private static final ProcessDescriptionFactory INSTANCE = new ProcessDescriptionFactory(); diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ProcessDescriptionImpl.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ProcessDescriptionImpl.java index f49439046..8764f195f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ProcessDescriptionImpl.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/description/impl/ProcessDescriptionImpl.java @@ -15,8 +15,13 @@ */ package org.n52.shetland.ogc.wps.description.impl; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableSet; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + import org.n52.janmayen.stream.MoreCollectors; import org.n52.shetland.ogc.ows.OwsCode; import org.n52.shetland.ogc.wps.description.Description; @@ -25,12 +30,8 @@ import org.n52.shetland.ogc.wps.description.ProcessInputDescription; import org.n52.shetland.ogc.wps.description.ProcessOutputDescription; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; /** * TODO JavaDoc @@ -48,9 +49,9 @@ public class ProcessDescriptionImpl extends AbstractDescription implements Proce protected ProcessDescriptionImpl(AbstractBuilder<?, ?> builder) { super(builder); this.inputs = builder.getInputs().stream() - .collect(Collectors.groupingBy(Description::getId, MoreCollectors.toSingleResult())); + .collect(Collectors.groupingBy(Description::getId, MoreCollectors.toSingleResult())); this.outputs = builder.getOutputs().stream() - .collect(Collectors.groupingBy(Description::getId, MoreCollectors.toSingleResult())); + .collect(Collectors.groupingBy(Description::getId, MoreCollectors.toSingleResult())); this.storeSupported = builder.isStoreSupported(); this.statusSupported = builder.isStatusSupported(); this.version = Objects.requireNonNull(builder.getVersion(), "version"); @@ -130,15 +131,14 @@ public boolean equals(Object obj) { } final ProcessDescriptionImpl other = (ProcessDescriptionImpl) obj; - return this.storeSupported != other.storeSupported && - this.statusSupported != other.statusSupported && - Objects.equals(this.version, other.version) && - Objects.equals(this.inputs, other.inputs) && - Objects.equals(this.outputs, other.outputs); + return this.storeSupported != other.storeSupported && this.statusSupported != other.statusSupported + && Objects.equals(this.version, other.version) && Objects.equals(this.inputs, other.inputs) + && Objects.equals(this.outputs, other.outputs); } - public abstract static class AbstractBuilder<T extends ProcessDescription, B extends AbstractBuilder<T, B>> - extends AbstractDescription.AbstractBuilder<T, B> + public abstract static class AbstractBuilder< + T extends ProcessDescription, + B extends AbstractBuilder<T, B>> extends AbstractDescription.AbstractBuilder<T, B> implements ProcessDescription.Builder<T, B> { private final ImmutableSet.Builder<ProcessInputDescription> inputs = ImmutableSet.builder(); @@ -148,7 +148,7 @@ public abstract static class AbstractBuilder<T extends ProcessDescription, B ext private String version; protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - ProcessDescription entity) { + ProcessDescription entity) { super(factory, entity); this.inputs.addAll(entity.getInputDescriptions()); this.outputs.addAll(entity.getOutputDescriptions()); @@ -221,7 +221,7 @@ public String getVersion() { public static class Builder extends AbstractBuilder<ProcessDescription, Builder> { protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory, - ProcessDescription entity) { + ProcessDescription entity) { super(factory, entity); } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/exception/NoSuchJobException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/exception/NoSuchJobException.java index b518276db..19a8621d8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/exception/NoSuchJobException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/exception/NoSuchJobException.java @@ -20,12 +20,10 @@ /** * Implementation of {@link CodedWpsException} to be used if * <p> - * <i>The JobID from the request does not match any of the Jobs running on this - * server.</i> + * <i>The JobID from the request does not match any of the Jobs running on this server.</i> * - * @see <a href="http://docs.opengeospatial.org/is/14-065/14-065.html#65">OGC - * WPS 2.0.2 Interface Standard, Table 48 — Additional exception codes for - * the GetStatus operation</a> + * @see <a href="http://docs.opengeospatial.org/is/14-065/14-065.html#65">OGC WPS 2.0.2 Interface Standard, + * Table 48 — Additional exception codes for the GetStatus operation</a> * @author <a href="mailto:b.pross@52north.org">Benjamin Pross</a> * * @since 5.3.0 diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/exception/ResultNotReadyException.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/exception/ResultNotReadyException.java index 309698b05..56a271e1f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/exception/ResultNotReadyException.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/exception/ResultNotReadyException.java @@ -22,9 +22,8 @@ * <p> * <i>The result for the requested JobID has not yet been generated</i> * - * @see <a href="http://docs.opengeospatial.org/is/14-065/14-065.html#69">OGC - * WPS 2.0.2 Interface Standard, Table 50 — Additional exception codes for - * the GetResult operation</a> + * @see <a href="http://docs.opengeospatial.org/is/14-065/14-065.html#69">OGC WPS 2.0.2 Interface Standard, + * Table 50 — Additional exception codes for the GetResult operation</a> * @author <a href="mailto:b.pross@52north.org">Benjamin Pross</a> * * @since 5.3.0 diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/request/GetResultRequest.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/request/GetResultRequest.java index 17603b94c..f5ddf4216 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/request/GetResultRequest.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/request/GetResultRequest.java @@ -15,7 +15,6 @@ */ package org.n52.shetland.ogc.wps.request; - import org.n52.shetland.ogc.wps.WPSConstants; /** diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/DescribeProcessResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/DescribeProcessResponse.java index cbd6a61b0..8c9fab09a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/DescribeProcessResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/DescribeProcessResponse.java @@ -33,8 +33,7 @@ public DescribeProcessResponse(String service, String version) { this(service, version, null); } - public DescribeProcessResponse(String service, String version, - ProcessOfferings offerings) { + public DescribeProcessResponse(String service, String version, ProcessOfferings offerings) { super(service, version); this.offerings = offerings; } diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/ExecuteResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/ExecuteResponse.java index 1c4b2ade4..8a9b47c60 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/ExecuteResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/wps/response/ExecuteResponse.java @@ -42,8 +42,7 @@ public ExecuteResponse(String service, String version, StatusInfo status) { this(service, version, null, status); } - private ExecuteResponse(String service, String version, Result result, - StatusInfo status) { + private ExecuteResponse(String service, String version, Result result, StatusInfo status) { super(service, version); this.result = Optional.ofNullable(result); this.status = Optional.ofNullable(status); diff --git a/shetland/core/src/main/java/org/n52/shetland/util/AqdHelper.java b/shetland/core/src/main/java/org/n52/shetland/util/AqdHelper.java index c6c323864..b3cd16cd6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/AqdHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/AqdHelper.java @@ -36,7 +36,8 @@ public Set<Integer> getValidityFlags() { } /** - * @param validityFlags the validityFlags to set + * @param validityFlags + * the validityFlags to set */ @Setting(value = EReportingSetting.EREPORTING_VALIDITY_FLAGS, required = false) public void setValidityFlags(String validityFlags) { @@ -58,7 +59,8 @@ public Set<Integer> getVerificationFlags() { } /** - * @param verificationFlags the verificationFlags to set + * @param verificationFlags + * the verificationFlags to set */ @Setting(value = EReportingSetting.EREPORTING_VERIFICATION_FLAGS, required = false) public void setVerificationFlags(String verificationFlags) { diff --git a/shetland/core/src/main/java/org/n52/shetland/util/CRSHelper.java b/shetland/core/src/main/java/org/n52/shetland/util/CRSHelper.java index 769379651..33aecb26d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/CRSHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/CRSHelper.java @@ -40,7 +40,7 @@ public static String asUrnPrefix(String prefix) { * Parse the srsName to integer value * * @param srsName - * the srsName to parse + * the srsName to parse * * @return srsName integer value * diff --git a/shetland/core/src/main/java/org/n52/shetland/util/CollectionHelper.java b/shetland/core/src/main/java/org/n52/shetland/util/CollectionHelper.java index 74183c424..24411b645 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/CollectionHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/CollectionHelper.java @@ -15,12 +15,11 @@ */ package org.n52.shetland.util; -import java.util.Comparator; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; @@ -58,257 +57,316 @@ private CollectionHelper() { /** * @param entries - * the <i>final</i> set of entries to add to the newly created - * <i>unmodifiable</i> map - * @param <K> the key type - * @param <V> the value type + * the <i>final</i> set of entries to add to the newly created <i>unmodifiable</i> map + * @param <K> + * the key type + * @param <V> + * the value type * * @return an <i>unmodifiable</i> map with all given entries */ @SafeVarargs @SuppressWarnings("varargs") - public static <K, V> Map<K, V> map(Entry<K, V>... entries) { - return Collections.unmodifiableMap(Arrays.stream(entries) - .collect(Collectors.toMap(Entry::getKey, Entry::getValue))); + public static < + K, + V> Map<K, V> map(Entry<K, V>... entries) { + return Collections + .unmodifiableMap(Arrays.stream(entries).collect(Collectors.toMap(Entry::getKey, Entry::getValue))); } /** - * @param <T> the element type - * @param elements the elements + * @param <T> + * the element type + * @param elements + * the elements * * @return an <b>UNMODIFIABLE</b> Set<T> */ @SafeVarargs @SuppressWarnings("varargs") - public static <T> Set<T> set(T... elements) { + public static < + T> Set<T> set(T... elements) { return Collections.unmodifiableSet(new HashSet<>(Arrays.asList(elements))); } /** - * @param <T> the element type - * @param elements the elements + * @param <T> + * the element type + * @param elements + * the elements * * @return an <b>UNMODIFIABLE</b> List<T> */ @SafeVarargs @SuppressWarnings("varargs") - public static <T> List<T> list(T... elements) { + public static < + T> List<T> list(T... elements) { return Collections.unmodifiableList(Arrays.asList(elements)); } @SafeVarargs @SuppressWarnings("varargs") - public static <T> Set<T> union(Set<T>... elements) { + public static < + T> Set<T> union(Set<T>... elements) { return Arrays.stream(elements).flatMap(Set::stream).collect(Collectors.toSet()); } - public static <T> Set<T> union(Iterable<Set<T>> elements) { + public static < + T> Set<T> union(Iterable<Set<T>> elements) { return Streams.stream(elements).flatMap(Set<T>::stream).collect(Collectors.toSet()); } @SafeVarargs @SuppressWarnings("varargs") - public static <T> Set<T> intersection(Set<T>... elements) { + public static < + T> Set<T> intersection(Set<T>... elements) { return intersection(Arrays.asList(elements)); } - public static <T> Set<T> intersection(Iterable<Set<T>> sets) { + public static < + T> Set<T> intersection(Iterable<Set<T>> sets) { Function<Set<T>, Predicate<T>> f = set -> set::contains; Predicate<T> predicate = Streams.stream(sets).map(f).reduce(Predicates.alwaysTrue(), Predicate::and); return Streams.stream(sets).flatMap(Set::stream).filter(predicate).collect(Collectors.toSet()); } /** - * @param <T> the element type - * @param s the set + * @param <T> + * the element type + * @param s + * the set * * @return an <b>UNMODIFIABLE</b> Set<T> */ - public static <T> Set<? extends T> unmodifiableSet(Set<? extends T> s) { + public static < + T> Set<? extends T> unmodifiableSet(Set<? extends T> s) { return Optional.ofNullable(s).map(Collections::unmodifiableSet).orElseGet(Collections::emptySet); } /** - * @param <K> the key type - * @param <V> the value type - * @param m the map + * @param <K> + * the key type + * @param <V> + * the value type + * @param m + * the map * * @return an <b>UNMODIFIABLE</b> Map<K, V> */ - public static <K, V> Map<? extends K, ? extends V> unmodifiableMap(Map<? extends K, ? extends V> m) { + public static < + K, + V> Map<? extends K, ? extends V> unmodifiableMap(Map<? extends K, ? extends V> m) { return Optional.ofNullable(m).map(Collections::unmodifiableMap).orElseGet(Collections::emptyMap); } /** - * @param <T> the element type - * @param c the collection + * @param <T> + * the element type + * @param c + * the collection * * @return an <b>UNMODIFIABLE</b> Collection<T> */ - public static <T> Collection<? extends T> unmodifiableCollection(Collection<? extends T> c) { + public static < + T> Collection<? extends T> unmodifiableCollection(Collection<? extends T> c) { return Optional.ofNullable(c).map(Collections::unmodifiableCollection).orElseGet(Collections::emptyList); } /** - * @param <T> the element type - * @param l the list + * @param <T> + * the element type + * @param l + * the list * * @return an <b>UNMODIFIABLE</b> List<T> */ - public static <T> List<? extends T> unmodifiableList(List<? extends T> l) { + public static < + T> List<? extends T> unmodifiableList(List<? extends T> l) { return Optional.ofNullable(l).map(Collections::unmodifiableList).orElseGet(Collections::emptyList); } - public static <T> List<T> conjunctCollections(Collection<T> list1, Collection<T> list2) { + public static < + T> List<T> conjunctCollections(Collection<T> list1, Collection<T> list2) { Set<T> set = new HashSet<>(list2); return list1.stream().filter(set::contains).collect(Collectors.toList()); } - public static <T> Set<T> conjunctCollectionsToSet(Collection<T> list1, Collection<T> list2) { + public static < + T> Set<T> conjunctCollectionsToSet(Collection<T> list1, Collection<T> list2) { Set<T> set = new HashSet<>(list2); return list1.stream().filter(set::contains).collect(Collectors.toSet()); } - public static <K, V> Map<K, V> synchronizedInitialSizeMapWithLoadFactor1(int capacity) { + public static < + K, + V> Map<K, V> synchronizedInitialSizeMapWithLoadFactor1(int capacity) { return CollectionHelper.synchronizedMap(capacity, 1.0F); } - public static <K, V> Map<K, V> synchronizedMap() { - return Collections.synchronizedMap(Maps.<K, V>newHashMap()); + public static < + K, + V> Map<K, V> synchronizedMap() { + return Collections.synchronizedMap(Maps.< + K, + V> newHashMap()); } - public static <K, V> Map<K, V> synchronizedMap(int initialCapacity) { + public static < + K, + V> Map<K, V> synchronizedMap(int initialCapacity) { return Collections.synchronizedMap(new HashMap<>(initialCapacity)); } - public static <K, V> Map<K, V> synchronizedMap(int initialCapacity, float loadFactor) { + public static < + K, + V> Map<K, V> synchronizedMap(int initialCapacity, float loadFactor) { return Collections.synchronizedMap(new HashMap<>(initialCapacity, loadFactor)); } /** * Constructs a new synchronized {@code Set} based on a {@link HashSet}. * - * @param <T> the element type + * @param <T> + * the element type * * @return a synchronized Set */ - public static <T> Set<T> synchronizedSet() { - return Collections.synchronizedSet(Sets.<T>newHashSet()); + public static < + T> Set<T> synchronizedSet() { + return Collections.synchronizedSet(Sets.< + T> newHashSet()); } /** - * Constructs a new synchronized {@code Set} based on a {@link HashSet} with - * the specified {@code initialCapacity}. + * Constructs a new synchronized {@code Set} based on a {@link HashSet} with the specified + * {@code initialCapacity}. * * @param initialCapacity - * the initial capacity of the set - * @param <T> the element type + * the initial capacity of the set + * @param <T> + * the element type * * @return a synchronized Set */ - public static <T> Set<T> synchronizedSet(int initialCapacity) { + public static < + T> Set<T> synchronizedSet(int initialCapacity) { return Collections.synchronizedSet(new HashSet<>(initialCapacity)); } /** * Constructs a new synchronized {@code List} based on a {@link LinkedList}. * - * @param <E> the element type + * @param <E> + * the element type * * @return a synchronized List */ - public static <E> List<E> synchronizedList() { - return Collections.synchronizedList(Lists.<E>newLinkedList()); + public static < + E> List<E> synchronizedList() { + return Collections.synchronizedList(Lists.< + E> newLinkedList()); } /** - * Constructs a new synchronized {@code List} based on a {@link ArrayList} - * with the specified {@code initialCapacity}. + * Constructs a new synchronized {@code List} based on a {@link ArrayList} with the specified + * {@code initialCapacity}. * - * @param <E> the element type + * @param <E> + * the element type * @param initialCapacity - * the initial capacity of the array list + * the initial capacity of the array list * * @return a synchronized List */ - public static <E> List<E> synchronizedList(int initialCapacity) { - return Collections.synchronizedList(Lists.<E>newArrayListWithCapacity(initialCapacity)); + public static < + E> List<E> synchronizedList(int initialCapacity) { + return Collections.synchronizedList(Lists.< + E> newArrayListWithCapacity(initialCapacity)); } /** * @param collectionOfCollection - * a {@code Collection<Collection<T>>} - * @param <T> the element type + * a {@code Collection<Collection<T>>} + * @param <T> + * the element type * - * @return a Set<T> containing all values of all Collections<T> - * without any duplicates + * @return a Set<T> containing all values of all Collections<T> without any duplicates */ - public static <T> Set<T> unionOfListOfLists(Collection<? extends Collection<? extends T>> collectionOfCollection) { - return Optional.ofNullable(collectionOfCollection) - .map(Collection::stream) - .orElseGet(Stream::empty) - .filter(Objects::nonNull) - .flatMap(c -> c.stream()) - .filter(Objects::nonNull) + public static < + T> Set<T> unionOfListOfLists(Collection<? extends Collection<? extends T>> collectionOfCollection) { + return Optional.ofNullable(collectionOfCollection).map(Collection::stream).orElseGet(Stream::empty) + .filter(Objects::nonNull).flatMap(c -> c.stream()).filter(Objects::nonNull) .collect(Collectors.toSet()); } /** * Check if collection is not null and not empty * - * @param <T> the element type - * @param collection Collection to check + * @param <T> + * the element type + * @param collection + * Collection to check * * @return empty or not */ - public static <T> boolean isNotEmpty(Collection<T> collection) { + public static < + T> boolean isNotEmpty(Collection<T> collection) { return !isEmptyOrNull(collection); } /** * Check if collection is not null and not empty * - * @param <K> the key type - * @param <V> the value type + * @param <K> + * the key type + * @param <V> + * the value type * @param map * Map to check * - * @return <tt>false</tt>, if map is <tt>null</tt> or empty, else - * <tt>true</tt>. + * @return <tt>false</tt>, if map is <tt>null</tt> or empty, else <tt>true</tt>. */ - public static <K, V> boolean isNotEmpty(Map<K, V> map) { + public static < + K, + V> boolean isNotEmpty(Map<K, V> map) { return map != null && !map.isEmpty(); } - public static <T> boolean isEmptyOrNull(Collection<T> collection) { + public static < + T> boolean isEmptyOrNull(Collection<T> collection) { return collection == null || collection.isEmpty(); } /** * Check if collection is not <tt>null</tt> and empty * - * @param <T> the element type + * @param <T> + * the element type * @param collection - * Collection to check + * Collection to check * - * @return <tt>true</tt>, if collection is not null and empty, else - * <tt>false</tt> + * @return <tt>true</tt>, if collection is not null and empty, else <tt>false</tt> */ - public static <T> boolean isEmpty(Collection<T> collection) { + public static < + T> boolean isEmpty(Collection<T> collection) { return collection != null && collection.isEmpty(); } /** * Check if map is not <tt>null</tt> and empty * - * @param <K> the key type - * @param <V> the value type + * @param <K> + * the key type + * @param <V> + * the value type * @param map * map to check * * @return <tt>true</tt>, if map is not null and empty, else <tt>false</tt> */ - public static <K, V> boolean isEmpty(Map<K, V> map) { + public static < + K, + V> boolean isEmpty(Map<K, V> map) { return map != null && map.isEmpty(); } @@ -324,23 +382,22 @@ public static <K, V> boolean isEmpty(Map<K, V> map) { * * @return the reversed map */ - public static <K, V> Map<V, K> reverse(Map<K, V> map) { + public static < + K, + V> Map<V, K> reverse(Map<K, V> map) { return map.entrySet().stream().collect(MoreCollectors.toValueMap()); } /** - * Examine a collection and determines if it is null, empty, or contains - * only null values + * Examine a collection and determines if it is null, empty, or contains only null values * * @param collection - * Collection to examine + * Collection to examine * * @return whether the collection is null, empty, or contains only nulls */ public static boolean nullEmptyOrContainsOnlyNulls(Collection<? extends Object> collection) { - return Optional.ofNullable(collection) - .map(Collection::stream) - .orElseGet(Stream::empty) + return Optional.ofNullable(collection).map(Collection::stream).orElseGet(Stream::empty) .allMatch(Objects::isNull); } @@ -348,7 +405,7 @@ public static boolean nullEmptyOrContainsOnlyNulls(Collection<? extends Object> * Check if array is not null and not empty * * @param array - * Array to check + * Array to check * * @return <code>true</code>, if array is not null and not empty */ @@ -360,7 +417,7 @@ public static boolean isNotNullOrEmpty(Object[] array) { * Check if array is not null or not empty * * @param array - * Array to check + * Array to check * * @return <code>true</code>, if array is null or empty */ @@ -369,28 +426,35 @@ public static boolean isNullOrEmpty(Object[] array) { } public static String collectionToString(Collection<?> collection) { - return collection.stream().map(String::valueOf) - .collect(Collectors.joining(",", "(", ")")); + return collection.stream().map(String::valueOf).collect(Collectors.joining(",", "(", ")")); } /** * Add a value to a map collection, initializing the key's collection if needed * - * @param <K> the key type - * @param <V> the value type - * @param key Key whose value collection should be added to - * @param valueToAdd Vale to add to the key's collection - * @param map Map holding collections + * @param <K> + * the key type + * @param <V> + * the value type + * @param key + * Key whose value collection should be added to + * @param valueToAdd + * Vale to add to the key's collection + * @param map + * Map holding collections */ - public static <K, V> void addToCollectionMap(K key, V valueToAdd, Map<K, Collection<V>> map) { + public static < + K, + V> void addToCollectionMap(K key, V valueToAdd, Map<K, Collection<V>> map) { if (key != null && valueToAdd != null && map != null) { map.computeIfAbsent(key, Suppliers.asFunction(ArrayList::new)).add(valueToAdd); } } - public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map) { - return map.entrySet().stream() - .sorted(Comparator.comparing(Map.Entry::getValue)) + public static < + K, + V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map) { + return map.entrySet().stream().sorted(Comparator.comparing(Map.Entry::getValue)) .collect(MoreCollectors.toLinkedHashMap()); } @@ -410,9 +474,9 @@ public static List<String> csvStringToList(String csv) { * Parse separated value string to {@link List} * * @param sv - * Separated value string + * Separated value string * @param separator - * Separator character + * Separator character * * @return {@link List} with separated values */ @@ -436,9 +500,9 @@ public static Set<String> csvStringToSet(String csv) { * Parse separated value string to {@link Set} * * @param sv - * Separated value string + * Separated value string * @param separator - * Seperator character + * Seperator character * * @return {@link Set} with separated values */ @@ -450,9 +514,9 @@ public static Set<String> svStringToSet(String sv, String separator) { * Parse separated value string to array with trimmed values * * @param sv - * Separated value string + * Separated value string * @param separator - * Separator character + * Separator character * * @return Array with separated values */ @@ -464,7 +528,8 @@ public static String[] svStringToArray(String sv, String separator) { return split; } - public static <T extends Comparable<? super T>> SortedSet<T> newSortedSet(Collection<? extends T> set) { + public static < + T extends Comparable<? super T>> SortedSet<T> newSortedSet(Collection<? extends T> set) { return Optional.ofNullable(set).map(TreeSet<T>::new).orElseGet(TreeSet::new); } diff --git a/shetland/core/src/main/java/org/n52/shetland/util/DateTimeFormatException.java b/shetland/core/src/main/java/org/n52/shetland/util/DateTimeFormatException.java index 1c842efba..d8bc35e15 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/DateTimeFormatException.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/DateTimeFormatException.java @@ -24,7 +24,6 @@ public class DateTimeFormatException extends DateTimeException { private static final long serialVersionUID = 4594521785170898431L; - public DateTimeFormatException(Object value) { this(value, null); } diff --git a/shetland/core/src/main/java/org/n52/shetland/util/DateTimeHelper.java b/shetland/core/src/main/java/org/n52/shetland/util/DateTimeHelper.java index 197255650..d256ed8cf 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/DateTimeHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/DateTimeHelper.java @@ -122,8 +122,7 @@ public static DateTime parseString2DateTime(final String timeString, final Strin } /** - * Parses the given ISO 8601 String to a {@link Time} including - * {@link TimeInstant} and {@link TimePeriod} + * Parses the given ISO 8601 String to a {@link Time} including {@link TimeInstant} and {@link TimePeriod} * * @param timeString * a ISO 8601 formatted time string @@ -159,8 +158,7 @@ private static boolean checkOffset(String timeString) { * an {@link Time} object to be formatted * @return an ISO 8601 conform {@link String}. * @throws IllegalArgumentException - * in the case of receiving <tt>null</tt> or not supported - * types. + * in the case of receiving <tt>null</tt> or not supported types. * @see #formatDateTime2IsoString(DateTime) */ public static String format(Time time) { @@ -368,8 +366,8 @@ public static int getTimeLengthBeforeTimeZone(String time) { } /** - * Set the time object to the end values (seconds, minutes, hours, days,..) - * if the time Object has not all values + * Set the time object to the end values (seconds, minutes, hours, days,..) if the time Object has not all + * values * * @param dateTime * Time object diff --git a/shetland/core/src/main/java/org/n52/shetland/util/DateTimeParseException.java b/shetland/core/src/main/java/org/n52/shetland/util/DateTimeParseException.java index e4c1b4eb2..c0f9fd629 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/DateTimeParseException.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/DateTimeParseException.java @@ -17,8 +17,7 @@ /** * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ diff --git a/shetland/core/src/main/java/org/n52/shetland/util/GeometryTransformer.java b/shetland/core/src/main/java/org/n52/shetland/util/GeometryTransformer.java index a53c40c43..f7b5b22e5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/GeometryTransformer.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/GeometryTransformer.java @@ -18,9 +18,8 @@ */ package org.n52.shetland.util; -import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; - import org.locationtech.jts.geom.Geometry; +import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; /** * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> diff --git a/shetland/core/src/main/java/org/n52/shetland/util/HTTP.java b/shetland/core/src/main/java/org/n52/shetland/util/HTTP.java index 58975030d..e905f6eaf 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/HTTP.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/HTTP.java @@ -47,54 +47,45 @@ */ @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE", justification = "spotbugs false positive") public final class HTTP { - private static final CloseableHttpClient CLIENT = HttpClientBuilder.create() - .useSystemProperties() - .setUserAgent("shetland-1.0.0") - .build(); + private static final CloseableHttpClient CLIENT = + HttpClientBuilder.create().useSystemProperties().setUserAgent("shetland-1.0.0").build(); private HTTP() { } - public static String getAsString(URI uri) - throws IOException { + public static String getAsString(URI uri) throws IOException { try (CloseableHttpResponse response = CLIENT.execute(new HttpGet(uri))) { HttpEntity entity = response.getEntity(); - String encoding = Optional.ofNullable(entity.getContentEncoding()) - .map(Header::getValue).orElse(StandardCharsets.UTF_8.name()); + String encoding = Optional.ofNullable(entity.getContentEncoding()).map(Header::getValue) + .orElse(StandardCharsets.UTF_8.name()); Charset charset = Charset.forName(encoding); - try (InputStream is = entity.getContent(); - Reader reader = new InputStreamReader(is, charset)) { + try (InputStream is = entity.getContent(); Reader reader = new InputStreamReader(is, charset)) { return CharStreams.toString(reader); } } } - public static byte[] get(URI uri) - throws IOException { + public static byte[] get(URI uri) throws IOException { return execute(new HttpGet(uri)); } - public static void get(URI uri, OutputStream out) - throws IOException { + public static void get(URI uri, OutputStream out) throws IOException { execute(new HttpGet(uri), out); } - public static byte[] post(URI uri, byte[] bytes) - throws IOException { + public static byte[] post(URI uri, byte[] bytes) throws IOException { HttpPost request = new HttpPost(uri); request.setEntity(new ByteArrayEntity(bytes)); return execute(request); } - public static void post(URI uri, byte[] bytes, OutputStream out) - throws IOException { + public static void post(URI uri, byte[] bytes, OutputStream out) throws IOException { HttpPost request = new HttpPost(uri); request.setEntity(new ByteArrayEntity(bytes)); execute(request, out); } - private static byte[] execute(HttpUriRequest request) - throws IOException { + private static byte[] execute(HttpUriRequest request) throws IOException { try (CloseableHttpResponse response = CLIENT.execute(request)) { try (InputStream is = response.getEntity().getContent()) { return ByteStreams.toByteArray(is); @@ -102,8 +93,7 @@ private static byte[] execute(HttpUriRequest request) } } - private static void execute(HttpUriRequest request, OutputStream out) - throws IOException { + private static void execute(HttpUriRequest request, OutputStream out) throws IOException { try (CloseableHttpResponse response = CLIENT.execute(request)) { response.getEntity().writeTo(out); } diff --git a/shetland/core/src/main/java/org/n52/shetland/util/IdGenerator.java b/shetland/core/src/main/java/org/n52/shetland/util/IdGenerator.java index e0261c2c6..ffb36f1ea 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/IdGenerator.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/IdGenerator.java @@ -52,7 +52,7 @@ public class IdGenerator { * Generates a sensor id from description and current time as long. * * @param message - * sensor description + * sensor description * * @return generated sensor id as hex SHA-256. */ @@ -66,7 +66,7 @@ public static String generate(String message) { * Transforms byte to hex representation * * @param bytes - * bytes + * bytes * * @return hex */ diff --git a/shetland/core/src/main/java/org/n52/shetland/util/JTSHelper.java b/shetland/core/src/main/java/org/n52/shetland/util/JTSHelper.java index ef72562ee..9c9086265 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/JTSHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/JTSHelper.java @@ -62,8 +62,7 @@ protected JTSHelper() { } /** - * Creates a JTS Geometry from an WKT representation. Switches the - * coordinate order if needed. + * Creates a JTS Geometry from an WKT representation. Switches the coordinate order if needed. * * @param wkt * WKT representation of the geometry @@ -172,7 +171,7 @@ public static Geometry createPolygonFromEnvelope(double[] envelope, int srid) { public static Geometry createPolygonFromEnvelope(double minx, double miny, double maxx, double maxy, int srid) { GeometryFactory fac = getGeometryFactoryForSRID(srid); return fac.createPolygon(new Coordinate[] { new Coordinate(minx, miny), new Coordinate(minx, maxy), - new Coordinate(maxx, maxy), new Coordinate(maxx, miny), new Coordinate(minx, miny) }); + new Coordinate(maxx, maxy), new Coordinate(maxx, miny), new Coordinate(minx, miny) }); } /** @@ -184,7 +183,8 @@ public static Geometry createPolygonFromEnvelope(double minx, double miny, doubl * Geometry to switch coordinates. * @return Geometry with switched coordinates */ - public static <G extends Geometry> G switchCoordinateAxisOrder(G geometry) { + public static < + G extends Geometry> G switchCoordinateAxisOrder(G geometry) { if (geometry == null) { return null; } @@ -230,10 +230,9 @@ public static boolean isNotEmpty(Geometry geometry) { } /** - * Fix for Binary-Incompatible-Change in JTS 1.17.0 Polygon getExteriorRing() which - * returns LinearRing instead of a LineString. This changes occurs - * errors in the SOS with Hinernate/Geolatte until the 3rd party - * libraries have not updated to JTS 1.17.0. + * Fix for Binary-Incompatible-Change in JTS 1.17.0 Polygon getExteriorRing() which returns LinearRing + * instead of a LineString. This changes occurs errors in the SOS with Hinernate/Geolatte until the 3rd + * party libraries have not updated to JTS 1.17.0. * * @param polygon * polygon to get exterior ring from @@ -242,8 +241,7 @@ public static boolean isNotEmpty(Geometry geometry) { public static Coordinate[] getExteriorRingCoordinatesFromPolygon(Polygon polygon) { int interiorNumPoints = 0; for (int i = 0; i < polygon.getNumInteriorRing(); i++) { - interiorNumPoints += polygon.getInteriorRingN(i) - .getNumPoints(); + interiorNumPoints += polygon.getInteriorRingN(i).getNumPoints(); } return interiorNumPoints == 0 ? polygon.getCoordinates() : Arrays.copyOfRange(polygon.getCoordinates(), 0, polygon.getCoordinates().length - interiorNumPoints); @@ -295,12 +293,10 @@ public Geometry convertSequence(Geometry geometry) { return geometry; } - /** - * Fix for Binary-Incompatible-Change in JTS 1.17.0 Polygon getExteriorRing() which - * returns LinearRing instead of a LineString. This changes occurs - * errors in the SOS with Hinernate/Geolatte until the 3rd party - * libraries have not updated to JTS 1.17.0. + * Fix for Binary-Incompatible-Change in JTS 1.17.0 Polygon getExteriorRing() which returns LinearRing + * instead of a LineString. This changes occurs errors in the SOS with Hinernate/Geolatte until the + * 3rd party libraries have not updated to JTS 1.17.0. * * @param polygon * polygon to get exterior ring from diff --git a/shetland/core/src/main/java/org/n52/shetland/util/JavaHelper.java b/shetland/core/src/main/java/org/n52/shetland/util/JavaHelper.java index 068be08a0..7843f2773 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/JavaHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/JavaHelper.java @@ -37,7 +37,7 @@ private JavaHelper() { * Generates a sensor id from description and current time as long. * * @param message - * sensor description + * sensor description * * @return generated sensor id as hex SHA-256. * @deprecated See {@link IdGenerator#generate(String)} @@ -51,7 +51,7 @@ public static String generateID(String message) { * return Object value as String * * @param object - * to get as String + * to get as String * * @return String value */ @@ -73,7 +73,7 @@ public static String asString(final Object object) { * return Object value as Double * * @param object - * to get as Double + * to get as Double * * @return Double value */ @@ -90,7 +90,7 @@ public static Double asDouble(final Object object) { * return Object value as Integer * * @param object - * to get as Integer + * to get as Integer * * @return Integer value */ @@ -109,7 +109,7 @@ public static Integer asInteger(Object object) { * return Object value as Boolean * * @param object - * to get as Boolean + * to get as Boolean * * @return Boolean value */ diff --git a/shetland/core/src/main/java/org/n52/shetland/util/MinMax.java b/shetland/core/src/main/java/org/n52/shetland/util/MinMax.java index 41cdf435e..ccc8a79a6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/MinMax.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/MinMax.java @@ -18,14 +18,16 @@ import java.util.Comparator; /** - * @param <T> the type + * @param <T> + * the type * * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> * @since 1.0.0 * */ -//TODO move to janmayen -public class MinMax<T> { +// TODO move to janmayen +public class MinMax< + T> { private T minimum; private T maximum; @@ -55,7 +57,8 @@ public T getMinimum() { /** * Set the value of minimum * - * @param minimum new value of minimum + * @param minimum + * new value of minimum * * @return this */ @@ -79,7 +82,8 @@ public T getMaximum() { /** * Set the value of maximum * - * @param maximum new value of maximum + * @param maximum + * new value of maximum * * @return this */ @@ -94,8 +98,10 @@ public MinMax<T> setMaximum(T maximum) { /** * Extend this {@code MinMax} to include {@code t}. * - * @param t the object to include - * @param c the comparator used to compare the values + * @param t + * the object to include + * @param c + * the comparator used to compare the values * * @return this */ @@ -112,11 +118,12 @@ public MinMax<T> extend(T t, Comparator<? super T> c) { } /** - * * - * Extend this {@code MinMax} to include {@code minmax}. + * * Extend this {@code MinMax} to include {@code minmax}. * - * @param minmax the {@code MinMax} to include - * @param c the comparator + * @param minmax + * the {@code MinMax} to include + * @param c + * the comparator * * @return this */ @@ -138,8 +145,8 @@ public boolean isEmpty() { public boolean equals(Object obj) { if (obj != null && obj.getClass() == getClass()) { final MinMax<T> other = (MinMax<T>) obj; - return (getMinimum() == null ? other.getMinimum() == null : other.getMinimum().equals(getMinimum())) && - (getMaximum() == null ? other.getMaximum() == null : other.getMaximum().equals(getMaximum())); + return (getMinimum() == null ? other.getMinimum() == null : other.getMinimum().equals(getMinimum())) + && (getMaximum() == null ? other.getMaximum() == null : other.getMaximum().equals(getMaximum())); } return false; } diff --git a/shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java b/shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java index e478e9a94..96847084f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/OMHelper.java @@ -21,9 +21,6 @@ import javax.xml.namespace.QName; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.janmayen.http.HTTPStatus; import org.n52.shetland.ogc.om.OmConstants; import org.n52.shetland.ogc.om.features.SfConstants; @@ -62,6 +59,8 @@ import org.n52.shetland.ogc.swe.simpleType.SweCount; import org.n52.shetland.ogc.swe.simpleType.SweQuantity; import org.n52.shetland.ogc.swe.simpleType.SweText; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Utility class for Observation and Measurement @@ -83,8 +82,7 @@ public static String getNamespaceForFeatureType(final String featureType) { || SfConstants.SAMPLING_FEAT_TYPE_SF_SAMPLING_CURVE.equals(featureType) || SfConstants.SAMPLING_FEAT_TYPE_SF_SAMPLING_SURFACE.equals(featureType)) { return SfConstants.NS_SAMS; - } else if (SfConstants.FT_SAMPLINGPOINT.equals(featureType) - || SfConstants.FT_SAMPLINGCURVE.equals(featureType) + } else if (SfConstants.FT_SAMPLINGPOINT.equals(featureType) || SfConstants.FT_SAMPLINGCURVE.equals(featureType) || SfConstants.FT_SAMPLINGSURFACE.equals(featureType)) { return SfConstants.NS_SA; } else if (SfConstants.SAMPLING_FEAT_TYPE_SF_SPECIMEN.equals(featureType)) { @@ -295,7 +293,7 @@ public String visit(TimeRangeValue value) { @Override public String visit(TimeValue value) throws RuntimeException { - return OmConstants.OBS_TYPE_TEMPORAL_OBSERVATION; + return OmConstants.OBS_TYPE_TEMPORAL_OBSERVATION; } @Override diff --git a/shetland/core/src/main/java/org/n52/shetland/util/OwsQueryBuilder.java b/shetland/core/src/main/java/org/n52/shetland/util/OwsQueryBuilder.java index 86a1a4ec9..e6f1295c4 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/OwsQueryBuilder.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/OwsQueryBuilder.java @@ -22,8 +22,6 @@ import org.n52.janmayen.http.QueryBuilder; import org.n52.shetland.ogc.ows.OWSConstants; - - public class OwsQueryBuilder extends QueryBuilder { public OwsQueryBuilder(URL url) { diff --git a/shetland/core/src/main/java/org/n52/shetland/util/ReferencedEnvelope.java b/shetland/core/src/main/java/org/n52/shetland/util/ReferencedEnvelope.java index 6f5cfb137..2fda0563c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/ReferencedEnvelope.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/ReferencedEnvelope.java @@ -18,24 +18,21 @@ import java.io.Serializable; import java.util.Objects; -import com.google.common.base.Joiner; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; +import com.google.common.base.Joiner; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** - * Class for internal Envelope representation TODO should this class offer - * merging capabilities like SosEnvelope.expandTo(SosEnvelope) considering - * coordinate transformations? + * Class for internal Envelope representation TODO should this class offer merging capabilities like + * SosEnvelope.expandTo(SosEnvelope) considering coordinate transformations? * * @since 1.0.0 */ -public class ReferencedEnvelope - implements - Serializable { +public class ReferencedEnvelope implements Serializable { private static final long serialVersionUID = 6525679408878064331L; /** @@ -125,8 +122,7 @@ public ReferencedEnvelope setEnvelope(Envelope envelope) { } /** - * Creates the minimum and maximum values of this envelope in the default - * EPSG. + * Creates the minimum and maximum values of this envelope in the default EPSG. * * @return the {@code MinMax} describing the envelope */ diff --git a/shetland/core/src/main/java/org/n52/shetland/util/StringHelper.java b/shetland/core/src/main/java/org/n52/shetland/util/StringHelper.java index 670ddbe13..0299663b6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/util/StringHelper.java +++ b/shetland/core/src/main/java/org/n52/shetland/util/StringHelper.java @@ -38,8 +38,8 @@ import com.google.common.io.CharStreams; /** - * Helper class for String objects. Contains methods to join Strings, convert streams to Strings or to check for null - * and emptiness. + * Helper class for String objects. Contains methods to join Strings, convert streams to Strings or to check + * for null and emptiness. * * @since 1.0.0 * @@ -51,10 +51,11 @@ private StringHelper() { } /** - * @param toNormalize the string to normalize + * @param toNormalize + * the string to normalize * - * @return a normalized String for use in a file path, i.e. all [\,/,:,*,?,",<,>,;] characters are replaced by - * '_'. + * @return a normalized String for use in a file path, i.e. all [\,/,:,*,?,",<,>,;] characters are + * replaced by '_'. */ public static String normalize(String toNormalize) { // toNormalize = toNormalize.replaceAll("ä", "ae"); @@ -113,12 +114,7 @@ public static int getCharacterCount(String s, char character) { } public static Stream<String> splitToStream(String string, String separator) { - return Optional.ofNullable(string) - .map(s -> s.split(separator)) - .map(Arrays::stream) - .orElseGet(Stream::empty) - .map(String::trim) - .map(Strings::emptyToNull) - .filter(Objects::nonNull); + return Optional.ofNullable(string).map(s -> s.split(separator)).map(Arrays::stream).orElseGet(Stream::empty) + .map(String::trim).map(Strings::emptyToNull).filter(Objects::nonNull); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/uvf/UVFConstants.java b/shetland/core/src/main/java/org/n52/shetland/uvf/UVFConstants.java index f76939cf5..cfd7a2492 100644 --- a/shetland/core/src/main/java/org/n52/shetland/uvf/UVFConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/uvf/UVFConstants.java @@ -34,8 +34,8 @@ public interface UVFConstants { MediaType CONTENT_TYPE_UVF_MAC = CONTENT_TYPE_UVF.withParameter(LINE_ENDING, "Mac"); /** - * Time format to be used in UVF encoded data: <code>yyMMddHHmm</code>, - * e.g. <code>7001011230</code> is 01.01.1970 12:30 UTC + * Time format to be used in UVF encoded data: <code>yyMMddHHmm</code>, e.g. <code>7001011230</code> is + * 01.01.1970 12:30 UTC */ String TIME_FORMAT = "yyMMddHHmm"; @@ -45,8 +45,8 @@ public interface UVFConstants { int MAX_IDENTIFIER_LENGTH = 15; /** - * The maximum length of a value string is limited to 10 characters. Hence, the values are shortened, - * e.g. <code>52.1234567890</code> will be cut to <code>52.1234567</code> + * The maximum length of a value string is limited to 10 characters. Hence, the values are shortened, e.g. + * <code>52.1234567890</code> will be cut to <code>52.1234567</code> */ int MAX_VALUE_LENGTH = 10; @@ -64,8 +64,7 @@ public interface UVFConstants { * <li>31469</li> * </ul> */ - List<String> ALLOWED_CRS = Collections.unmodifiableList(CollectionHelper.list("31466", "31467", "31468", - "31469")); + List<String> ALLOWED_CRS = Collections.unmodifiableList(CollectionHelper.list("31466", "31467", "31468", "31469")); int MINIMUM_EPSG_CODE = 31466; @@ -78,11 +77,15 @@ public interface UVFConstants { String LINE_ENDING_MAC = "\r"; enum LineEnding { - Windows, Unix, Mac; + Windows, + Unix, + Mac; } enum FunktionInterpretation { - Linie, Blockanfang, Blockende, Summenlinie; + Linie, + Blockanfang, + Blockende, + Summenlinie; } } - diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/Nillable.java b/shetland/core/src/main/java/org/n52/shetland/w3c/Nillable.java index 94a1d165e..658ba6007 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/Nillable.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/Nillable.java @@ -24,9 +24,11 @@ * {@link #isNil()}, {@link #isAbsent()} and {@link #isPresent()} are mutually exclusive {@code true}. * * @author Christian Autermann - * @param <T> the instance type + * @param <T> + * the instance type */ -public abstract class Nillable<T> { +public abstract class Nillable< + T> { private static final String INSTANCE_ABSENT = "instance is absent"; @@ -67,12 +69,15 @@ private Nillable() { /** * Transforms this {@code Nillable} to the target type. * - * @param <X> the target type - * @param fun the transformation function + * @param <X> + * the target type + * @param fun + * the transformation function * * @return the {@code Nillable} */ - public abstract <X> Nillable<X> map(Function<? super T, X> fun); + public abstract < + X> Nillable<X> map(Function<? super T, X> fun); /** * Checks if this {@code Nillable} is {@code null}. @@ -99,7 +104,8 @@ public boolean isPresentOrNil() { * * @return the object * - * @throws UnsupportedOperationException if this instance is not present + * @throws UnsupportedOperationException + * if this instance is not present * @see #isPresent() */ public abstract T get(); @@ -118,7 +124,8 @@ public boolean hasReason() { * * @return the nil reason * - * @throws UnsupportedOperationException if this instance is not nil + * @throws UnsupportedOperationException + * if this instance is not nil * @see #isNil() */ public abstract Optional<String> getNilReason(); @@ -126,114 +133,138 @@ public boolean hasReason() { /** * Creates a new {@code Nillable} from a present instance. * - * @param <T> the type - * @param t the object + * @param <T> + * the type + * @param t + * the object * - * @throws NullPointerException if {@code t} is {@code null} + * @throws NullPointerException + * if {@code t} is {@code null} * @return the present {@code Nillable} */ - public static <T> Nillable<T> present(T t) { + public static < + T> Nillable<T> present(T t) { return new Present<>(t); } /** * Creates a {@code Nillable} for a absent instance. * - * @param <T> the type + * @param <T> + * the type * * @return the absent {@code Nillable} */ - public static <T> Nillable<T> absent() { + public static < + T> Nillable<T> absent() { return Absent.INSTANCE.cast(); } /** * Creates a new {@code Nillable} that is {@code nil} because of optionally supplied reason. * - * @param <T> the type - * @param reason the reason (may be {@code null}) + * @param <T> + * the type + * @param reason + * the reason (may be {@code null}) * * @return the nil {@code Nillable} */ - public static <T> Nillable<T> nil(String reason) { + public static < + T> Nillable<T> nil(String reason) { return new Nil(reason).cast(); } /** * Creates a new {@code Nillable} that is {@code nil}. * - * @param <T> the type + * @param <T> + * the type * * @return the nil {@code Nillable} */ - public static <T> Nillable<T> nil() { + public static < + T> Nillable<T> nil() { return nil(null); } /** * Creates a new {@code Nillable}, that is nil because it is inapplicable. * - * @param <T> the type + * @param <T> + * the type * * @return the nil {@code Nillable} */ - public static <T> Nillable<T> inapplicable() { + public static < + T> Nillable<T> inapplicable() { return Nil.INAPPLICABLE.cast(); } /** * Creates a new {@code Nillable}, that is nil because it is missing. * - * @param <T> the type + * @param <T> + * the type * * @return the nil {@code Nillable} */ - public static <T> Nillable<T> missing() { + public static < + T> Nillable<T> missing() { return Nil.MISSING.cast(); } /** * Creates a new {@code Nillable}, that is nil because it is a template value. * - * @param <T> the type + * @param <T> + * the type * * @return the nil {@code Nillable} */ - public static <T> Nillable<T> template() { + public static < + T> Nillable<T> template() { return Nil.TEMPLATE.cast(); } /** * Creates a new {@code Nillable}, that is nil because it is unknown. * - * @param <T> the type + * @param <T> + * the type * * @return the nil {@code Nillable} */ - public static <T> Nillable<T> unknown() { + public static < + T> Nillable<T> unknown() { return Nil.UNKNOWN.cast(); } /** * Creates a new {@code Nillable}, that is nil because it is withheld. * - * @param <T> the type + * @param <T> + * the type * * @return the nil {@code Nillable} */ - public static <T> Nillable<T> withheld() { + public static < + T> Nillable<T> withheld() { return Nil.WITHHELD.cast(); } /** * Creates a new {@code Nillable} that is either present (if {@code obj} is not {@code null}), or absent. * - * @param <T> the type - * @param obj the object (may be {@code null}) + * @param <T> + * the type + * @param obj + * the object (may be {@code null}) * * @return the {@code Nillable} */ - public static <T> Nillable<T> of(T obj) { + public static < + T> Nillable<T> of(T obj) { return of(obj, null); } @@ -241,13 +272,17 @@ public static <T> Nillable<T> of(T obj) { * Creates a new {@code Nillable} that is either present (if {@code obj} is not {@code null}), nil (if * {@code reason} is not {@code null}) or absent. * - * @param <T> the type - * @param obj the object (may be {@code null}) - * @param reason the nil reason (may be {@code null}) + * @param <T> + * the type + * @param obj + * the object (may be {@code null}) + * @param reason + * the nil reason (may be {@code null}) * * @return the {@code Nillable} */ - public static <T> Nillable<T> of(T obj, String reason) { + public static < + T> Nillable<T> of(T obj, String reason) { if (obj == null) { if (reason == null) { return absent(); @@ -257,7 +292,8 @@ public static <T> Nillable<T> of(T obj, String reason) { return present(obj); } - private static class Present<T> extends Nillable<T> { + private static class Present< + T> extends Nillable<T> { private final T obj; Present(T obj) { @@ -290,7 +326,8 @@ public T get() { } @Override - public <X> Nillable<X> map(Function<? super T, X> fun) { + public < + X> Nillable<X> map(Function<? super T, X> fun) { return new Present<>(fun.apply(get())); } @@ -301,8 +338,7 @@ public int hashCode() { @Override public boolean equals(Object obj) { - return obj instanceof Present && Objects - .equals(get(), ((Present) obj).get()); + return obj instanceof Present && Objects.equals(get(), ((Present) obj).get()); } @Override @@ -349,7 +385,8 @@ public Object get() { } @Override - public <X> Nillable<X> map(Function<? super Object, X> fun) { + public < + X> Nillable<X> map(Function<? super Object, X> fun) { return this.cast(); } @@ -360,12 +397,12 @@ public int hashCode() { @Override public boolean equals(Object obj) { - return obj instanceof Nil && Objects - .equals(getNilReason(), ((Nil) obj).getNilReason()); + return obj instanceof Nil && Objects.equals(getNilReason(), ((Nil) obj).getNilReason()); } @SuppressWarnings("unchecked") - <T> Nillable<T> cast() { + < + T> Nillable<T> cast() { return (Nillable<T>) this; } @@ -409,7 +446,8 @@ public boolean isPresent() { } @Override - public <X> Nillable<X> map(Function<? super Object, X> fun) { + public < + X> Nillable<X> map(Function<? super Object, X> fun) { return this.cast(); } @@ -424,7 +462,8 @@ public boolean equals(Object obj) { } @SuppressWarnings("unchecked") - <T> Nillable<T> cast() { + < + T> Nillable<T> cast() { return (Nillable<T>) this; } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/SchemaLocation.java b/shetland/core/src/main/java/org/n52/shetland/w3c/SchemaLocation.java index a0936f3fc..e51630a69 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/SchemaLocation.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/SchemaLocation.java @@ -26,9 +26,8 @@ * @since 1.0.0 */ public class SchemaLocation implements Comparable<SchemaLocation> { - private static final Comparator<SchemaLocation> COMPARATOR - = Comparator.comparing(SchemaLocation::getNamespace) - .thenComparing(SchemaLocation::getSchemaFileUrl); + private static final Comparator<SchemaLocation> COMPARATOR = + Comparator.comparing(SchemaLocation::getNamespace).thenComparing(SchemaLocation::getSchemaFileUrl); private final String namespace; private final String schemaFileUrl; private final String schemaLocationString; @@ -36,8 +35,10 @@ public class SchemaLocation implements Comparable<SchemaLocation> { /** * Constructor * - * @param namespace Namespace - * @param schemaFileUrl Schema file URL + * @param namespace + * Namespace + * @param schemaFileUrl + * Schema file URL */ public SchemaLocation(String namespace, String schemaFileUrl) { this.namespace = namespace; @@ -84,8 +85,8 @@ public int hashCode() { public boolean equals(Object obj) { if (obj != null && obj.getClass() == getClass()) { SchemaLocation other = (SchemaLocation) obj; - return Objects.equal(getNamespace(), other.getNamespace()) && - Objects.equal(getSchemaFileUrl(), other.getSchemaFileUrl()); + return Objects.equal(getNamespace(), other.getNamespace()) + && Objects.equal(getSchemaFileUrl(), other.getSchemaFileUrl()); } return false; } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/W3CConstants.java b/shetland/core/src/main/java/org/n52/shetland/w3c/W3CConstants.java index d130a9aec..d0dc5f487 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/W3CConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/W3CConstants.java @@ -17,7 +17,6 @@ import javax.xml.namespace.QName; - /** * Constants class for W3C * diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/soap/AbstractSoap.java b/shetland/core/src/main/java/org/n52/shetland/w3c/soap/AbstractSoap.java index 6930c0320..287d384db 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/soap/AbstractSoap.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/soap/AbstractSoap.java @@ -23,7 +23,8 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -public abstract class AbstractSoap<T extends OwsServiceCommunicationObject> { +public abstract class AbstractSoap< + T extends OwsServiceCommunicationObject> { private String soapNamespace; private String soapVersion; private String soapAction; diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsa/WsaRelatesToHeader.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsa/WsaRelatesToHeader.java index c68582c0f..3fc0bc812 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsa/WsaRelatesToHeader.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsa/WsaRelatesToHeader.java @@ -34,5 +34,4 @@ public WsaRelatesToHeader(String value) { super(value); } - } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/AbstractWsdl.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/AbstractWsdl.java index 4db10a0a5..43bf34e17 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/AbstractWsdl.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/AbstractWsdl.java @@ -61,7 +61,8 @@ public String getName() { } /** - * @param name the name to set + * @param name + * the name to set */ public void setName(String name) { this.name = name; @@ -79,7 +80,8 @@ public QName getQName() { } /** - * @param qName the qName to set + * @param qName + * the qName to set */ public void setQName(QName qName) { this.qName = qName; diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/BindingOperation.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/BindingOperation.java index 599f288ab..9141728f8 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/BindingOperation.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/BindingOperation.java @@ -49,7 +49,8 @@ public BindingInput getInput() { } /** - * @param input the input to set + * @param input + * the input to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setInput(BindingInput input) { @@ -69,7 +70,8 @@ public BindingOutput getOutput() { } /** - * @param output the output to set + * @param output + * the output to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setOutput(BindingOutput output) { diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Fault.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Fault.java index 854b2127b..09d5329b5 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Fault.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Fault.java @@ -32,32 +32,31 @@ */ public class Fault extends AbstractWsdl { - public static final Fault EXCEPTION_MESSAGE = new Fault("ExceptionMessage", - WSDLConstants.OWS_EXCEPTION_ACTION); + public static final Fault EXCEPTION_MESSAGE = new Fault("ExceptionMessage", WSDLConstants.OWS_EXCEPTION_ACTION); - public static final Fault REQUEST_EXTENSION_NOT_SUPPORTED_EXCEPTION = new Fault( - "RequestExtensionNotSupportedException", WSDLConstants.SWES_EXCEPTION_ACTION); + public static final Fault REQUEST_EXTENSION_NOT_SUPPORTED_EXCEPTION = + new Fault("RequestExtensionNotSupportedException", WSDLConstants.SWES_EXCEPTION_ACTION); - public static final Fault INVALID_REQUEST_EXCEPTION = new Fault("InvalidRequestException", - WSDLConstants.SWES_EXCEPTION_ACTION); + public static final Fault INVALID_REQUEST_EXCEPTION = + new Fault("InvalidRequestException", WSDLConstants.SWES_EXCEPTION_ACTION); - public static final Fault NO_APPLICABLE_CODE_EXCEPTION = new Fault("NoApplicableCodeException", - WSDLConstants.OWS_EXCEPTION_ACTION); + public static final Fault NO_APPLICABLE_CODE_EXCEPTION = + new Fault("NoApplicableCodeException", WSDLConstants.OWS_EXCEPTION_ACTION); - public static final Fault INVALID_UPDATE_SEQUENCE_EXCEPTION = new Fault("InvalidUpdateSequenceException", - WSDLConstants.OWS_EXCEPTION_ACTION); + public static final Fault INVALID_UPDATE_SEQUENCE_EXCEPTION = + new Fault("InvalidUpdateSequenceException", WSDLConstants.OWS_EXCEPTION_ACTION); - public static final Fault VERSION_NEGOTIATION_FAILED_EXCEPTION = new Fault( - "VersionNegotiationFailedException", WSDLConstants.OWS_EXCEPTION_ACTION); + public static final Fault VERSION_NEGOTIATION_FAILED_EXCEPTION = + new Fault("VersionNegotiationFailedException", WSDLConstants.OWS_EXCEPTION_ACTION); - public static final Fault MISSING_PARAMETER_VALUE_EXCEPTION = new Fault("MissingParameterValueException", - WSDLConstants.OWS_EXCEPTION_ACTION); + public static final Fault MISSING_PARAMETER_VALUE_EXCEPTION = + new Fault("MissingParameterValueException", WSDLConstants.OWS_EXCEPTION_ACTION); - public static final Fault INVALID_PARAMETER_VALUE_EXCEPTION = new Fault("InvalidParameterValueException", - WSDLConstants.OWS_EXCEPTION_ACTION); + public static final Fault INVALID_PARAMETER_VALUE_EXCEPTION = + new Fault("InvalidParameterValueException", WSDLConstants.OWS_EXCEPTION_ACTION); - public static final Fault OPERATION_NOT_SUPPORTED_EXCEPTION = new Fault("OperationNotSupportedException", - WSDLConstants.OWS_EXCEPTION_ACTION); + public static final Fault OPERATION_NOT_SUPPORTED_EXCEPTION = + new Fault("OperationNotSupportedException", WSDLConstants.OWS_EXCEPTION_ACTION); // public static final Collection<WSDLFault> DEFAULT_FAULTS = // ImmutableList.of(MISSING_PARAMETER_VALUE_EXCEPTION, diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Operation.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Operation.java index dc5f3b820..550d70f7a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Operation.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Operation.java @@ -54,7 +54,8 @@ public Input getInput() { } /** - * @param input the input to set + * @param input + * the input to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setInput(Input input) { @@ -74,7 +75,8 @@ public Output getOutput() { } /** - * @param output the output to set + * @param output + * the output to set */ @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setOutput(Output output) { diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Param.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Param.java index d1aa72fc4..c417fd6e7 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Param.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Param.java @@ -50,7 +50,8 @@ public QName getMessage() { } /** - * @param message the message to set + * @param message + * the message to set */ public void setMessage(QName message) { this.message = message; @@ -68,7 +69,8 @@ public URI getAction() { } /** - * @param action the action to set + * @param action + * the action to set */ public void setAction(URI action) { this.action = action; diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Part.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Part.java index 41fe8b21c..b11ac0f5b 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Part.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Part.java @@ -40,7 +40,8 @@ public QName getElement() { } /** - * @param element the element to set + * @param element + * the element to set */ public void setElement(QName element) { this.element = element; diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Port.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Port.java index aa7a4bad4..080bc5c08 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Port.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Port.java @@ -31,7 +31,8 @@ public QName getBinding() { } /** - * @param binding the binding to set + * @param binding + * the binding to set */ public void setBinding(QName binding) { this.binding = binding; diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/PortType.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/PortType.java index 0ff8e5ed1..7fa2c1941 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/PortType.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/PortType.java @@ -33,7 +33,7 @@ public PortType(String name) { @Override public QName getQName() { - return WSDLQNames.QN_WSDL_PORT_TYPE; + return WSDLQNames.QN_WSDL_PORT_TYPE; } public PortType addOperation(Operation operation) { @@ -67,14 +67,8 @@ public boolean isSetOperations() { public Operation getOperation(String name, String request, String response) { for (Operation operation : operations) { - if (operation.getName() - .equals(name) - && operation.getInput() - .getName() - .equals(request) - && operation.getOutput() - .getName() - .equals(response)) { + if (operation.getName().equals(name) && operation.getInput().getName().equals(request) + && operation.getOutput().getName().equals(response)) { return operation; } } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Schema.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Schema.java index 201e6707c..4067c2892 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Schema.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/Schema.java @@ -79,14 +79,11 @@ public int hashCode() { public int compareTo(ExtensibilityElement o) { Objects.requireNonNull(o); if (o instanceof Schema) { - return ComparisonChain.start() - .compare(this.getTargetNamespace(), ((Schema) o).getTargetNamespace()) + return ComparisonChain.start().compare(this.getTargetNamespace(), ((Schema) o).getTargetNamespace()) .compare(this.getElementFormDefault(), ((Schema) o).getElementFormDefault()) - .compare(this.getInclude(), ((Schema) o).getInclude()) - .result(); + .compare(this.getInclude(), ((Schema) o).getInclude()).result(); } - return Comparables.compare(getQName().getNamespaceURI(), o.getQName() - .getNamespaceURI()); + return Comparables.compare(getQName().getNamespaceURI(), o.getQName().getNamespaceURI()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/WSDLConstants.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/WSDLConstants.java index bbd84061d..fe74fc52f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/WSDLConstants.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/WSDLConstants.java @@ -234,7 +234,7 @@ interface WSDLQNames extends WSDLElements { QName QN_WSDL_FAULT = new QName(NS_WSDL, EN_WSDL_FAULT, NS_WSDL_PREFIX); - QName QN_WSDL_SERVICE = new QName(NS_WSDL, EN_WSDL_SERVICE, NS_WSDL_PREFIX); + QName QN_WSDL_SERVICE = new QName(NS_WSDL, EN_WSDL_SERVICE, NS_WSDL_PREFIX); } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/http/HttpBinding.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/http/HttpBinding.java index 9f9835195..97619c29c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/http/HttpBinding.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/http/HttpBinding.java @@ -38,7 +38,8 @@ public String getVerb() { } /** - * @param verb the verb to set + * @param verb + * the verb to set */ public void setVerb(String verb) { this.verb = verb; diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/http/HttpOperation.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/http/HttpOperation.java index 02635f340..ec851e7e9 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/http/HttpOperation.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/http/HttpOperation.java @@ -38,7 +38,8 @@ public String getLocation() { } /** - * @param location the location to set + * @param location + * the location to set */ public void setLocation(String location) { this.location = location; diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapBinding.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapBinding.java index 70e446fb4..40077aae2 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapBinding.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapBinding.java @@ -76,9 +76,9 @@ public boolean equals(Object obj) { return false; } final SoapBinding other = (SoapBinding) obj; - return (getStyle() != null && other.getStyle() != null && getStyle().equals(other.getStyle())) - && (getTransport() != null && other.getTransport() != null - && getTransport().equals(other.getTransport())); + return getStyle() != null && other.getStyle() != null && getStyle().equals(other.getStyle()) + && getTransport() != null && other.getTransport() != null + && getTransport().equals(other.getTransport()); } @Override @@ -90,13 +90,10 @@ public int hashCode() { public int compareTo(ExtensibilityElement o) { Objects.requireNonNull(o); if (o instanceof SoapBinding) { - return ComparisonChain.start() - .compare(this.getStyle(), ((SoapBinding) o).getStyle()) - .compare(this.getTransport(), ((SoapBinding) o).getTransport()) - .result(); + return ComparisonChain.start().compare(this.getStyle(), ((SoapBinding) o).getStyle()) + .compare(this.getTransport(), ((SoapBinding) o).getTransport()).result(); } - return Comparables.compare(getQName().getNamespaceURI(), o.getQName() - .getNamespaceURI()); + return Comparables.compare(getQName().getNamespaceURI(), o.getQName().getNamespaceURI()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapBody.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapBody.java index dc5217d7b..bbd6d5a89 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapBody.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapBody.java @@ -38,7 +38,8 @@ public String getUse() { } /** - * @param use the use to set + * @param use + * the use to set */ public void setUse(String use) { this.use = use; @@ -73,5 +74,4 @@ public int compareTo(ExtensibilityElement o) { return Comparables.compare(getQName().getNamespaceURI(), o.getQName().getNamespaceURI()); } - } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapFault.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapFault.java index f9addffe1..22a2e74ce 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapFault.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapFault.java @@ -77,8 +77,8 @@ public boolean equals(Object obj) { return false; } final SoapFault other = (SoapFault) obj; - return (getUse() != null && other.getUse() != null && getUse().equals(other.getUse())) - && (getName() != null && other.getName() != null && getName().equals(other.getName())); + return getUse() != null && other.getUse() != null && getUse().equals(other.getUse()) && getName() != null + && other.getName() != null && getName().equals(other.getName()); } @Override @@ -90,13 +90,10 @@ public int hashCode() { public int compareTo(ExtensibilityElement o) { Objects.requireNonNull(o); if (o instanceof SoapFault) { - return ComparisonChain.start() - .compare(this.getUse(), ((SoapFault) o).getUse()) - .compare(this.getName(), ((SoapFault) o).getName()) - .result(); + return ComparisonChain.start().compare(this.getUse(), ((SoapFault) o).getUse()) + .compare(this.getName(), ((SoapFault) o).getName()).result(); } - return Comparables.compare(getQName().getNamespaceURI(), o.getQName() - .getNamespaceURI()); + return Comparables.compare(getQName().getNamespaceURI(), o.getQName().getNamespaceURI()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapOperation.java b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapOperation.java index 97c661c19..1749e8062 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapOperation.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/wsdl/soap/SoapOperation.java @@ -43,7 +43,8 @@ public String getStyle() { } /** - * @param style the style to set + * @param style + * the style to set */ public void setStyle(String style) { this.style = style; @@ -57,7 +58,8 @@ public URI getAction() { } /** - * @param action the action to set + * @param action + * the action to set */ public void setAction(URI action) { this.action = action; @@ -75,8 +77,8 @@ public boolean equals(Object obj) { return false; } final SoapOperation other = (SoapOperation) obj; - return (getAction() != null && other.getAction() != null && getAction().equals(other.getAction())) - && (getStyle() != null && other.getStyle() != null && getStyle().equals(other.getStyle())); + return getAction() != null && other.getAction() != null && getAction().equals(other.getAction()) + && getStyle() != null && other.getStyle() != null && getStyle().equals(other.getStyle()); } @Override @@ -88,13 +90,10 @@ public int hashCode() { public int compareTo(ExtensibilityElement o) { Objects.requireNonNull(o); if (o instanceof SoapOperation) { - return ComparisonChain.start() - .compare(this.getAction(), ((SoapOperation) o).getAction()) - .compare(this.getStyle(), ((SoapOperation) o).getStyle()) - .result(); + return ComparisonChain.start().compare(this.getAction(), ((SoapOperation) o).getAction()) + .compare(this.getStyle(), ((SoapOperation) o).getStyle()).result(); } - return Comparables.compare(getQName().getNamespaceURI(), o.getQName() - .getNamespaceURI()); + return Comparables.compare(getQName().getNamespaceURI(), o.getQName().getNamespaceURI()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Actuate.java b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Actuate.java index 471fadb82..ddb6e3fe1 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Actuate.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Actuate.java @@ -15,11 +15,11 @@ */ package org.n52.shetland.w3c.xlink; +import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import java.util.Arrays; - /** * TODO JavaDoc * diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Link.java b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Link.java index ebb50d791..84ee54934 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Link.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Link.java @@ -15,16 +15,18 @@ */ package org.n52.shetland.w3c.xlink; +import java.net.URI; +import java.util.Objects; +import java.util.Optional; + +import javax.annotation.Nullable; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Strings; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import javax.annotation.Nullable; -import java.net.URI; -import java.util.Objects; -import java.util.Optional; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * TODO JavaDoc @@ -56,12 +58,9 @@ public Link(@Nullable URI href, @Nullable String title) { @SuppressFBWarnings(value = "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE") @JsonCreator - public Link(@JsonProperty(HREF) @Nullable URI href, - @JsonProperty(ROLE) @Nullable URI role, - @JsonProperty(ARCROLE) @Nullable URI arcrole, - @JsonProperty(TITLE) @Nullable String title, - @JsonProperty(SHOW) @Nullable Show show, - @JsonProperty(ACTUATE) @Nullable Actuate actuate) { + public Link(@JsonProperty(HREF) @Nullable URI href, @JsonProperty(ROLE) @Nullable URI role, + @JsonProperty(ARCROLE) @Nullable URI arcrole, @JsonProperty(TITLE) @Nullable String title, + @JsonProperty(SHOW) @Nullable Show show, @JsonProperty(ACTUATE) @Nullable Actuate actuate) { this.href = Optional.ofNullable(href); this.role = Optional.ofNullable(role); this.arcrole = Optional.ofNullable(arcrole); @@ -102,8 +101,7 @@ public Optional<Actuate> getActuate() { @Override public int hashCode() { - return Objects.hash(getHref(), getRole(), getArcrole(), - getTitle(), getShow(), getActuate()); + return Objects.hash(getHref(), getRole(), getArcrole(), getTitle(), getShow(), getActuate()); } @Override @@ -118,12 +116,10 @@ public boolean equals(Object obj) { return false; } final Link other = (Link) obj; - return Objects.equals(this.getHref(), other.getHref()) && - Objects.equals(this.getRole(), other.getRole()) && - Objects.equals(this.getArcrole(), other.getArcrole()) && - Objects.equals(this.getTitle(), other.getTitle()) && - Objects.equals(this.getShow(), other.getShow()) && - Objects.equals(this.getActuate(), other.getActuate()); + return Objects.equals(this.getHref(), other.getHref()) && Objects.equals(this.getRole(), other.getRole()) + && Objects.equals(this.getArcrole(), other.getArcrole()) + && Objects.equals(this.getTitle(), other.getTitle()) && Objects.equals(this.getShow(), other.getShow()) + && Objects.equals(this.getActuate(), other.getActuate()); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Reference.java b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Reference.java index a0a650333..e1e12f37c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Reference.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Reference.java @@ -125,39 +125,30 @@ public Reference setRemoteSchema(String remoteSchema) { @Override public int hashCode() { - return Objects.hash(getActuate(), getArcrole(), getHref(), - getRemoteSchema(), getRole(), getShow(), getTitle(), getType()); + return Objects.hash(getActuate(), getArcrole(), getHref(), getRemoteSchema(), getRole(), getShow(), getTitle(), + getType()); } @Override public boolean equals(Object obj) { if (obj instanceof Reference) { Reference that = (Reference) obj; - return Objects.equals(getActuate(), that.getActuate()) && - Objects.equals(getArcrole(), that.getArcrole()) && - Objects.equals(getHref(), that.getHref()) && - Objects.equals(getRemoteSchema(), that.getRemoteSchema()) && - Objects.equals(getRole(), that.getRole()) && - Objects.equals(getShow(), that.getShow()) && - Objects.equals(getTitle(), that.getTitle()) && - Objects.equals(getType(), that.getType()); + return Objects.equals(getActuate(), that.getActuate()) && Objects.equals(getArcrole(), that.getArcrole()) + && Objects.equals(getHref(), that.getHref()) + && Objects.equals(getRemoteSchema(), that.getRemoteSchema()) + && Objects.equals(getRole(), that.getRole()) && Objects.equals(getShow(), that.getShow()) + && Objects.equals(getTitle(), that.getTitle()) && Objects.equals(getType(), that.getType()); } return false; } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .omitNullValues() - .add("actuate", getActuate().orElse(null)) - .add("arcrole", getArcrole().orElse(null)) - .add("href", getHref().orElse(null)) - .add("remoteSchema", getRemoteSchema().orElse(null)) - .add("role", getRole().orElse(null)) - .add("show", getShow().orElse(null)) - .add("title", getTitle().orElse(null)) - .add("type", getType().orElse(null)) - .toString(); + return MoreObjects.toStringHelper(this).omitNullValues().add("actuate", getActuate().orElse(null)) + .add("arcrole", getArcrole().orElse(null)).add("href", getHref().orElse(null)) + .add("remoteSchema", getRemoteSchema().orElse(null)).add("role", getRole().orElse(null)) + .add("show", getShow().orElse(null)).add("title", getTitle().orElse(null)) + .add("type", getType().orElse(null)).toString(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Referenceable.java b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Referenceable.java index e98defe7e..d5e08136d 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Referenceable.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Referenceable.java @@ -21,7 +21,8 @@ import org.n52.shetland.w3c.Nillable; -public abstract class Referenceable<T> { +public abstract class Referenceable< + T> { public abstract Reference getReference(); @@ -33,7 +34,8 @@ public abstract class Referenceable<T> { public abstract boolean isAbsent(); - public abstract <X> Referenceable<X> map(Function<T, X> fun); + public abstract < + X> Referenceable<X> map(Function<T, X> fun); @Override public abstract int hashCode(); @@ -41,23 +43,28 @@ public abstract class Referenceable<T> { @Override public abstract boolean equals(Object obj); - public static <T> Referenceable<T> of(URI reference) { + public static < + T> Referenceable<T> of(URI reference) { return new Ref(new Reference().setHref(reference)).cast(); } - public static <T> Referenceable<T> of(Reference reference) { + public static < + T> Referenceable<T> of(Reference reference) { return new Ref(reference).cast(); } - public static <T> Referenceable<T> of(T obj) { + public static < + T> Referenceable<T> of(T obj) { return of(Nillable.of(obj)); } - public static <T> Referenceable<T> of(Nillable<T> obj) { + public static < + T> Referenceable<T> of(Nillable<T> obj) { return new Instance<>(obj); } - private static class Instance<T> extends Referenceable<T> { + private static class Instance< + T> extends Referenceable<T> { private final Nillable<T> obj; Instance(Nillable<T> obj) { @@ -91,8 +98,7 @@ public int hashCode() { @Override public boolean equals(Object obj) { - return obj instanceof Instance && Objects - .equals(this.getInstance(), ((Instance) obj).getInstance()); + return obj instanceof Instance && Objects.equals(this.getInstance(), ((Instance) obj).getInstance()); } @Override @@ -106,7 +112,8 @@ public String toString() { } @Override - public <X> Referenceable<X> map(Function<T, X> fun) { + public < + X> Referenceable<X> map(Function<T, X> fun) { return Referenceable.of(getInstance().map(fun)); } } @@ -145,8 +152,7 @@ public int hashCode() { @Override public boolean equals(Object obj) { - return obj instanceof Ref && Objects - .equals(getReference(), ((Ref) obj).getReference()); + return obj instanceof Ref && Objects.equals(getReference(), ((Ref) obj).getReference()); } @Override @@ -160,12 +166,14 @@ public String toString() { } @SuppressWarnings("unchecked") - <T> Referenceable<T> cast() { + < + T> Referenceable<T> cast() { return (Referenceable<T>) this; } @Override - public <X> Referenceable<X> map(Function<Object, X> fun) { + public < + X> Referenceable<X> map(Function<Object, X> fun) { return cast(); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Show.java b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Show.java index 0a4bedbb1..3ec6ed333 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Show.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Show.java @@ -15,11 +15,11 @@ */ package org.n52.shetland.w3c.xlink; +import java.util.Arrays; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import java.util.Arrays; - /** * TODO JavaDoc * @@ -44,9 +44,7 @@ public static Show fromString(String str) { return null; } - return Arrays.stream(values()) - .filter(show -> show.name().equalsIgnoreCase(str)) - .findAny().orElse(null); + return Arrays.stream(values()).filter(show -> show.name().equalsIgnoreCase(str)).findAny().orElse(null); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Type.java b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Type.java index 9dd9e8f92..f34a2311f 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Type.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/Type.java @@ -41,8 +41,6 @@ public static Type fromString(String str) { return null; } - return Arrays.stream(values()) - .filter(type -> type.name().equalsIgnoreCase(str)) - .findAny().orElse(null); + return Arrays.stream(values()).filter(type -> type.name().equalsIgnoreCase(str)).findAny().orElse(null); } } diff --git a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/W3CHrefAttribute.java b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/W3CHrefAttribute.java index 59f4758c7..b4f7e0d8a 100644 --- a/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/W3CHrefAttribute.java +++ b/shetland/core/src/main/java/org/n52/shetland/w3c/xlink/W3CHrefAttribute.java @@ -36,7 +36,7 @@ public W3CHrefAttribute() { * Constructor * * @param href - * value to set + * value to set */ public W3CHrefAttribute(String href) { setHref(href); @@ -51,7 +51,7 @@ public String getHref() { /** * @param href - * value to set + * value to set * * @return this */ diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/gml/TimeTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/gml/TimeTest.java index 319ebaa4f..a74dcd9f6 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/gml/TimeTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/gml/TimeTest.java @@ -15,10 +15,10 @@ */ package org.n52.shetland.ogc.gml; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.hamcrest.MatcherAssert.assertThat; import java.util.NoSuchElementException; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/gml/time/TimeInstantTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/gml/time/TimeInstantTest.java index c41720897..0e6801c68 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/gml/time/TimeInstantTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/gml/time/TimeInstantTest.java @@ -15,7 +15,8 @@ */ package org.n52.shetland.ogc.gml.time; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Date; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/gml/time/TimePeriodTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/gml/time/TimePeriodTest.java index 74963b8d2..bb4d63916 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/gml/time/TimePeriodTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/gml/time/TimePeriodTest.java @@ -15,7 +15,9 @@ */ package org.n52.shetland.ogc.gml.time; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.joda.time.DateTime; import org.junit.jupiter.api.Test; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/om/OmObservationConstellationTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/om/OmObservationConstellationTest.java index cff9ee7eb..b120276f3 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/om/OmObservationConstellationTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/om/OmObservationConstellationTest.java @@ -15,12 +15,11 @@ */ package org.n52.shetland.ogc.om; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.jupiter.api.Test; - import org.n52.shetland.ogc.gml.CodeWithAuthority; import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeature; import org.n52.shetland.ogc.sensorML.AbstractSensorML; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/om/OmObservationTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/om/OmObservationTest.java index cdde0a6e2..6ce4b176d 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/om/OmObservationTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/om/OmObservationTest.java @@ -15,22 +15,22 @@ */ package org.n52.shetland.ogc.om; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.Is.is; -import static org.junit.jupiter.api.Assertions.*; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; - +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.PrecisionModel; import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.om.values.GeometryValue; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; import com.google.common.io.BaseEncoding.DecodingException; -import org.locationtech.jts.geom.Coordinate; -import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.geom.GeometryFactory; -import org.locationtech.jts.geom.PrecisionModel; /** * @since 1.0.0 diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/om/features/FeatureCollectionTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/om/features/FeatureCollectionTest.java index 856a2d8a6..454a14bf0 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/om/features/FeatureCollectionTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/om/features/FeatureCollectionTest.java @@ -17,12 +17,11 @@ import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.Is.is; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.jupiter.api.Test; - import org.n52.shetland.ogc.gml.CodeWithAuthority; import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeature; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureComplexTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureComplexTest.java index 05a87268b..21ad18d91 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureComplexTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureComplexTest.java @@ -15,14 +15,12 @@ */ package org.n52.shetland.ogc.om.features.samplingFeatures; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; import org.n52.shetland.ogc.gml.CodeWithAuthority; -import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeature; -import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeatureComplex; /** * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureTest.java index 2651b0cd8..bd3ddfd5d 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/om/features/samplingFeatures/SamplingFeatureTest.java @@ -17,24 +17,18 @@ import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.core.Is.is; -import static org.hamcrest.MatcherAssert.assertThat; import java.util.List; import org.junit.jupiter.api.Test; - import org.n52.shetland.ogc.gml.CodeWithAuthority; -import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeature; -import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeatureComplex; import com.google.common.collect.Lists; -import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeature; -import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeatureComplex; - /** * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk * Jürrens</a> diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/om/values/ProfileLevelTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/om/values/ProfileLevelTest.java index ec3edbf40..8807f3359 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/om/values/ProfileLevelTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/om/values/ProfileLevelTest.java @@ -16,12 +16,11 @@ package org.n52.shetland.ogc.om.values; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import java.util.LinkedList; -import static org.hamcrest.Matchers.equalTo; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.n52.shetland.ogc.swe.SweDataRecord; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/om/values/ProfileValueTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/om/values/ProfileValueTest.java index dd17e1670..2e85ea739 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/om/values/ProfileValueTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/om/values/ProfileValueTest.java @@ -15,19 +15,14 @@ */ package org.n52.shetland.ogc.om.values; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import java.math.BigDecimal; import java.util.List; import org.junit.jupiter.api.Test; import org.n52.shetland.ogc.gml.CodeType; -import org.n52.shetland.ogc.om.values.CategoryValue; -import org.n52.shetland.ogc.om.values.ProfileLevel; -import org.n52.shetland.ogc.om.values.ProfileValue; -import org.n52.shetland.ogc.om.values.QuantityValue; -import org.n52.shetland.ogc.om.values.Value; import com.google.common.collect.Lists; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/ows/service/RequestContextTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/ows/service/RequestContextTest.java index 80849ca2b..e8322a84e 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/ows/service/RequestContextTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/ows/service/RequestContextTest.java @@ -16,6 +16,7 @@ package org.n52.shetland.ogc.ows.service; import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.Test; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/AbstractSensorMLTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/AbstractSensorMLTest.java index 0f90c186c..24e65f249 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/AbstractSensorMLTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/AbstractSensorMLTest.java @@ -15,11 +15,10 @@ */ package org.n52.shetland.ogc.sensorML; -import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasItems; import org.junit.jupiter.api.Test; - import org.n52.shetland.ogc.sensorML.v20.PhysicalComponent; import com.google.common.collect.Lists; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/elements/SmlClassifierTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/elements/SmlClassifierTest.java index 60319efc8..443121d5a 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/elements/SmlClassifierTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/elements/SmlClassifierTest.java @@ -20,8 +20,6 @@ import org.junit.jupiter.api.Test; -import org.n52.shetland.ogc.sensorML.elements.SmlClassifier; - public class SmlClassifierTest { @Test public void diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/elements/SmlIdentifierTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/elements/SmlIdentifierTest.java index f8fe3b791..f14214d93 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/elements/SmlIdentifierTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/elements/SmlIdentifierTest.java @@ -17,8 +17,8 @@ import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import org.junit.jupiter.api.Test; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/elements/SmlIoTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/elements/SmlIoTest.java index e074a5dec..db3e6c930 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/elements/SmlIoTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/sensorML/elements/SmlIoTest.java @@ -17,11 +17,10 @@ import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import org.junit.jupiter.api.Test; - import org.n52.shetland.ogc.swe.simpleType.SweBoolean; /** diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/sos/ObjectWithXmlTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/sos/ObjectWithXmlTest.java index b8d1b05b7..3fb7fcd7b 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/sos/ObjectWithXmlTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/sos/ObjectWithXmlTest.java @@ -20,7 +20,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.n52.janmayen.http.MediaType; public class ObjectWithXmlTest { diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/sos/request/GetObservationRequestTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/sos/request/GetObservationRequestTest.java index b4619d22d..bc192bfea 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/sos/request/GetObservationRequestTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/sos/request/GetObservationRequestTest.java @@ -15,9 +15,8 @@ */ package org.n52.shetland.ogc.sos.request; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNot.not; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import org.junit.jupiter.api.Test; import org.n52.shetland.ogc.filter.FilterConstants; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/swe/SweDataRecordTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/swe/SweDataRecordTest.java index dc21f415e..63f81026b 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/swe/SweDataRecordTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/swe/SweDataRecordTest.java @@ -15,11 +15,10 @@ */ package org.n52.shetland.ogc.swe; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import org.junit.jupiter.api.Test; - import org.n52.shetland.ogc.swe.simpleType.SweBoolean; /** diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/swe/SweEnvelopeTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/swe/SweEnvelopeTest.java index 4556a49ac..756e4f51a 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/swe/SweEnvelopeTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/swe/SweEnvelopeTest.java @@ -15,20 +15,18 @@ */ package org.n52.shetland.ogc.swe; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import java.math.BigDecimal; import java.util.List; import org.junit.jupiter.api.Test; - +import org.locationtech.jts.geom.Envelope; import org.n52.shetland.ogc.swe.SweConstants.SweCoordinateNames; import org.n52.shetland.ogc.swe.simpleType.SweQuantity; import org.n52.shetland.util.ReferencedEnvelope; -import org.locationtech.jts.geom.Envelope; - /** * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk * Jürrens</a> diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/swe/simpleType/SosSweCategoryTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/swe/simpleType/SosSweCategoryTest.java index 3036349f3..aeee2af10 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/swe/simpleType/SosSweCategoryTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/swe/simpleType/SosSweCategoryTest.java @@ -17,8 +17,8 @@ import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import org.junit.jupiter.api.Test; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/swes/ExtensionsTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/swes/ExtensionsTest.java index 7f0466bc9..b73228eca 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/swes/ExtensionsTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/swes/ExtensionsTest.java @@ -17,12 +17,11 @@ import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.jupiter.api.Test; - import org.n52.shetland.ogc.ows.extension.Extensions; import org.n52.shetland.ogc.swe.simpleType.SweBoolean; import org.n52.shetland.ogc.swe.simpleType.SweCount; diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/wps/FormatTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/wps/FormatTest.java index c9908694b..062d4cbb1 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/wps/FormatTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/wps/FormatTest.java @@ -15,10 +15,8 @@ */ package org.n52.shetland.ogc.wps; -import org.n52.shetland.ogc.wps.Format; - -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import java.nio.charset.StandardCharsets; diff --git a/shetland/core/src/test/java/org/n52/shetland/util/CollectionHelperTest.java b/shetland/core/src/test/java/org/n52/shetland/util/CollectionHelperTest.java index bb8c5844a..d2229bef5 100644 --- a/shetland/core/src/test/java/org/n52/shetland/util/CollectionHelperTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/util/CollectionHelperTest.java @@ -17,8 +17,8 @@ import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.fail; import static org.n52.shetland.util.CollectionHelper.unionOfListOfLists; @@ -33,8 +33,6 @@ import org.junit.jupiter.api.Test; -import org.n52.shetland.util.CollectionHelper; - import com.google.common.collect.Sets; /** diff --git a/shetland/core/src/test/java/org/n52/shetland/util/DateTimeHelperTest.java b/shetland/core/src/test/java/org/n52/shetland/util/DateTimeHelperTest.java index 4890b67ce..ec6200206 100644 --- a/shetland/core/src/test/java/org/n52/shetland/util/DateTimeHelperTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/util/DateTimeHelperTest.java @@ -15,15 +15,13 @@ */ package org.n52.shetland.util; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.jupiter.api.Test; -import org.n52.shetland.util.DateTimeHelper; - public class DateTimeHelperTest { private final String testTimePositiveTimeZone = "2014-01-28T10:16:35.945+02:00"; diff --git a/shetland/core/src/test/java/org/n52/shetland/util/IdGeneratorTest.java b/shetland/core/src/test/java/org/n52/shetland/util/IdGeneratorTest.java index f5794f149..ce6674fb3 100644 --- a/shetland/core/src/test/java/org/n52/shetland/util/IdGeneratorTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/util/IdGeneratorTest.java @@ -15,8 +15,8 @@ */ package org.n52.shetland.util; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import org.junit.jupiter.api.Test; diff --git a/shetland/core/src/test/java/org/n52/shetland/util/JTSHelperTest.java b/shetland/core/src/test/java/org/n52/shetland/util/JTSHelperTest.java index b3853be77..27f855835 100644 --- a/shetland/core/src/test/java/org/n52/shetland/util/JTSHelperTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/util/JTSHelperTest.java @@ -15,6 +15,18 @@ */ package org.n52.shetland.util; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.CoreMatchers.sameInstance; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.n52.shetland.util.JTSHelperForTesting.randomCoordinate; +import static org.n52.shetland.util.JTSHelperForTesting.randomCoordinateRing; +import static org.n52.shetland.util.JTSHelperForTesting.randomCoordinates; + import org.geolatte.geom.G2D; import org.geolatte.geom.Point; import org.geolatte.geom.crs.CoordinateReferenceSystems; @@ -29,18 +41,6 @@ import org.locationtech.jts.io.ParseException; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.CoreMatchers.sameInstance; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.n52.shetland.util.JTSHelperForTesting.randomCoordinate; -import static org.n52.shetland.util.JTSHelperForTesting.randomCoordinateRing; -import static org.n52.shetland.util.JTSHelperForTesting.randomCoordinates; - /** * TODO JavaDoc * diff --git a/shetland/core/src/test/java/org/n52/shetland/util/ReferencedEnvelopeTest.java b/shetland/core/src/test/java/org/n52/shetland/util/ReferencedEnvelopeTest.java index f71795bfa..81e21fb48 100644 --- a/shetland/core/src/test/java/org/n52/shetland/util/ReferencedEnvelopeTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/util/ReferencedEnvelopeTest.java @@ -15,15 +15,12 @@ */ package org.n52.shetland.util; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - -import org.n52.shetland.util.ReferencedEnvelope; - import org.locationtech.jts.geom.Envelope; /** diff --git a/shetland/core/src/test/java/org/n52/shetland/util/StringHelperTest.java b/shetland/core/src/test/java/org/n52/shetland/util/StringHelperTest.java index d143f0345..388b0ee25 100644 --- a/shetland/core/src/test/java/org/n52/shetland/util/StringHelperTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/util/StringHelperTest.java @@ -15,8 +15,8 @@ */ package org.n52.shetland.util; -import static org.hamcrest.core.Is.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import org.junit.jupiter.api.Test; diff --git a/shetland/core/src/test/java/org/n52/shetland/util/http/MediaTypeTest.java b/shetland/core/src/test/java/org/n52/shetland/util/http/MediaTypeTest.java index ea5d531db..ebbecd46b 100644 --- a/shetland/core/src/test/java/org/n52/shetland/util/http/MediaTypeTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/util/http/MediaTypeTest.java @@ -15,13 +15,11 @@ */ package org.n52.shetland.util.http; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; - -import static org.hamcrest.MatcherAssert.assertThat; - import org.n52.janmayen.http.MediaType; import org.n52.shetland.ogc.OGCConstants; import org.n52.shetland.ogc.sensorML.SensorMLConstants; diff --git a/svalbard/core/src/main/java/org/n52/svalbard/encode/UVFEncoder.java b/svalbard/core/src/main/java/org/n52/svalbard/encode/UVFEncoder.java index 1d8ec1254..0b0fc7312 100644 --- a/svalbard/core/src/main/java/org/n52/svalbard/encode/UVFEncoder.java +++ b/svalbard/core/src/main/java/org/n52/svalbard/encode/UVFEncoder.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 26267f499..29fcf793e 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -109,6 +109,12 @@ <dependency> <artifactId>jackson-core</artifactId> <groupId>com.fasterxml.jackson.core</groupId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-annotations</artifactId> + <scope>provided</scope> </dependency> </dependencies> <build> diff --git a/svalbard/json-common/src/main/java/org/n52/svalbard/decode/json/JSONDecoder.java b/svalbard/json-common/src/main/java/org/n52/svalbard/decode/json/JSONDecoder.java index 411242b86..13f2aaeeb 100644 --- a/svalbard/json-common/src/main/java/org/n52/svalbard/decode/json/JSONDecoder.java +++ b/svalbard/json-common/src/main/java/org/n52/svalbard/decode/json/JSONDecoder.java @@ -15,8 +15,18 @@ */ package org.n52.svalbard.decode.json; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; +import static java.util.stream.Collectors.toList; +import static java.util.stream.Collectors.toSet; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; + import org.joda.time.DateTime; import org.n52.janmayen.exception.CompositeException; import org.n52.janmayen.stream.Streams; @@ -39,15 +49,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.Set; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ArrayNode; -import static java.util.stream.Collectors.toList; -import static java.util.stream.Collectors.toSet; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * TODO JavaDoc @@ -58,7 +63,7 @@ public abstract class JSONDecoder<T> extends AbstractDelegatingDecoder<T, JsonNode> { private static final Logger LOGGER = LoggerFactory.getLogger(JSONDecoder.class); - private final Set<DecoderKey> decoderKeys; + private final Set<DecoderKey> decoderKeys = new LinkedHashSet<>(); public JSONDecoder(Class<T> type) { this(Collections.singleton(new JsonDecoderKey(type))); @@ -68,8 +73,11 @@ public JSONDecoder(DecoderKey... keys) { this(Streams.stream(keys).collect(toSet())); } - public JSONDecoder(Set<DecoderKey> keys) { - this.decoderKeys = keys; + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) + public JSONDecoder(Collection<DecoderKey> keys) { + if (keys != null) { + this.decoderKeys.addAll(keys); + } } private <T> Decoder<T, JsonNode> getDecoder(Class<T> type) diff --git a/svalbard/json-common/src/main/java/org/n52/svalbard/encode/json/JSONEncoder.java b/svalbard/json-common/src/main/java/org/n52/svalbard/encode/json/JSONEncoder.java index ebc4ca46d..c6a9afe49 100644 --- a/svalbard/json-common/src/main/java/org/n52/svalbard/encode/json/JSONEncoder.java +++ b/svalbard/json-common/src/main/java/org/n52/svalbard/encode/json/JSONEncoder.java @@ -15,13 +15,19 @@ */ package org.n52.svalbard.encode.json; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSet.Builder; +import java.net.URI; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collector; + +import javax.inject.Inject; + import org.n52.janmayen.Json; import org.n52.janmayen.exception.CompositeException; import org.n52.janmayen.function.ThrowingFunction; @@ -38,17 +44,15 @@ import org.n52.svalbard.encode.exception.EncodingException; import org.n52.svalbard.encode.exception.NoEncoderForKeyException; -import javax.inject.Inject; -import java.net.URI; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collector; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet.Builder; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * TODO JavaDoc @@ -76,6 +80,7 @@ public JSONEncoder(Class<? super T> type, EncoderKey... additionalKeys) { } @Inject + @SuppressFBWarnings({ "EI_EXPOSE_REP2" }) public void setEncoderRepository(EncoderRepository encoderRepository) { this.encoderRepository = Objects.requireNonNull(encoderRepository); } diff --git a/svalbard/json/src/test/java/org/n52/svalbard/decode/json/InsertSensorRequestDecoderTest.java b/svalbard/json/src/test/java/org/n52/svalbard/decode/json/InsertSensorRequestDecoderTest.java index d77ea7b9c..0466b2a32 100644 --- a/svalbard/json/src/test/java/org/n52/svalbard/decode/json/InsertSensorRequestDecoderTest.java +++ b/svalbard/json/src/test/java/org/n52/svalbard/decode/json/InsertSensorRequestDecoderTest.java @@ -19,6 +19,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.empty; import static org.hamcrest.MatcherAssert.assertThat; import java.io.IOException; @@ -32,7 +33,6 @@ import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; import org.n52.shetland.ogc.sos.request.InsertSensorRequest; import org.n52.svalbard.decode.exception.DecodingException; -import org.n52.svalbard.decode.json.InsertSensorRequestDecoder; import com.fasterxml.jackson.databind.JsonNode; import com.github.fge.jackson.JsonLoader; @@ -130,8 +130,7 @@ public void testObservableProperties() @Test public void testRelatedFeatures() throws OwsExceptionReport, IOException { - - assertThat(req.getRelatedFeatures(), is(nullValue())); + assertThat(req.getRelatedFeatures(), is(empty())); } @Test diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractCapabilitiesBaseTypeDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractCapabilitiesBaseTypeDecoder.java index 2688e65b5..cdd77c07d 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractCapabilitiesBaseTypeDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractCapabilitiesBaseTypeDecoder.java @@ -29,34 +29,7 @@ import java.util.function.BiFunction; import java.util.stream.Stream; -import net.opengis.ows.x11.AddressType; -import net.opengis.ows.x11.AllowedValuesDocument.AllowedValues; -import net.opengis.ows.x11.AnyValueDocument.AnyValue; -import net.opengis.ows.x11.CapabilitiesBaseType; -import net.opengis.ows.x11.CodeType; -import net.opengis.ows.x11.ContactType; -import net.opengis.ows.x11.DCPDocument.DCP; -import net.opengis.ows.x11.DomainMetadataType; -import net.opengis.ows.x11.DomainType; -import net.opengis.ows.x11.HTTPDocument.HTTP; -import net.opengis.ows.x11.KeywordsType; -import net.opengis.ows.x11.LanguageStringType; -import net.opengis.ows.x11.MetadataType; -import net.opengis.ows.x11.NoValuesDocument.NoValues; -import net.opengis.ows.x11.OnlineResourceType; -import net.opengis.ows.x11.OperationDocument.Operation; -import net.opengis.ows.x11.OperationsMetadataDocument.OperationsMetadata; -import net.opengis.ows.x11.RangeType; -import net.opengis.ows.x11.RequestMethodType; -import net.opengis.ows.x11.ResponsiblePartySubsetType; -import net.opengis.ows.x11.ServiceIdentificationDocument.ServiceIdentification; -import net.opengis.ows.x11.ServiceProviderDocument.ServiceProvider; -import net.opengis.ows.x11.TelephoneType; -import net.opengis.ows.x11.ValueType; -import net.opengis.ows.x11.ValuesReferenceDocument.ValuesReference; - import org.apache.xmlbeans.XmlObject; - import org.n52.janmayen.http.HTTPMethods; import org.n52.janmayen.i18n.LocaleHelper; import org.n52.janmayen.i18n.LocalizedString; @@ -98,6 +71,32 @@ import com.google.common.base.Strings; +import net.opengis.ows.x11.AddressType; +import net.opengis.ows.x11.AllowedValuesDocument.AllowedValues; +import net.opengis.ows.x11.AnyValueDocument.AnyValue; +import net.opengis.ows.x11.CapabilitiesBaseType; +import net.opengis.ows.x11.CodeType; +import net.opengis.ows.x11.ContactType; +import net.opengis.ows.x11.DCPDocument.DCP; +import net.opengis.ows.x11.DomainMetadataType; +import net.opengis.ows.x11.DomainType; +import net.opengis.ows.x11.HTTPDocument.HTTP; +import net.opengis.ows.x11.KeywordsType; +import net.opengis.ows.x11.LanguageStringType; +import net.opengis.ows.x11.MetadataType; +import net.opengis.ows.x11.NoValuesDocument.NoValues; +import net.opengis.ows.x11.OnlineResourceType; +import net.opengis.ows.x11.OperationDocument.Operation; +import net.opengis.ows.x11.OperationsMetadataDocument.OperationsMetadata; +import net.opengis.ows.x11.RangeType; +import net.opengis.ows.x11.RequestMethodType; +import net.opengis.ows.x11.ResponsiblePartySubsetType; +import net.opengis.ows.x11.ServiceIdentificationDocument.ServiceIdentification; +import net.opengis.ows.x11.ServiceProviderDocument.ServiceProvider; +import net.opengis.ows.x11.TelephoneType; +import net.opengis.ows.x11.ValueType; +import net.opengis.ows.x11.ValuesReferenceDocument.ValuesReference; + public abstract class AbstractCapabilitiesBaseTypeDecoder<T, S> extends AbstractXmlDecoder<T, S> { protected OwsCapabilities parseCapabilitiesBaseType(String service, CapabilitiesBaseType cbt) diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGetDataAvailabilityXmlDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGetDataAvailabilityXmlDecoder.java index 8a796e64d..db0212041 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGetDataAvailabilityXmlDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGetDataAvailabilityXmlDecoder.java @@ -19,7 +19,6 @@ import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlString; import org.apache.xmlbeans.impl.values.XmlAnyTypeImpl; - import org.n52.shetland.ogc.sos.gda.GetDataAvailabilityRequest; import org.n52.shetland.ogc.swe.SweAbstractDataComponent; import org.n52.svalbard.decode.exception.DecodingException; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java index 3e4783108..e45aa62e7 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java @@ -29,6 +29,7 @@ import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlString; import org.apache.xmlbeans.impl.values.XmlAnyTypeImpl; +import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.gml.AbstractGML; import org.n52.shetland.ogc.gml.AbstractGeometry; @@ -59,7 +60,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.locationtech.jts.geom.Geometry; import net.opengis.gml.x32.AbstractFeatureType; import net.opengis.gml.x32.AbstractGMLType; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractProcessDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractProcessDecoder.java index 31363d8d3..b2d81c8bc 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractProcessDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractProcessDecoder.java @@ -19,10 +19,10 @@ import java.util.Set; import org.n52.shetland.inspire.ompr.InspireOMPRConstants; +import org.n52.shetland.inspire.ompr.Process; import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.gml.CodeWithAuthority; import org.n52.shetland.ogc.sos.ProcedureDescriptionFormat; -import org.n52.shetland.inspire.ompr.Process; import com.google.common.collect.Sets; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSoapStringDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSoapStringDecoder.java index c5fe022cf..a3c16aa82 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSoapStringDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSoapStringDecoder.java @@ -22,7 +22,6 @@ import org.n52.shetland.w3c.soap.SoapConstants; import org.n52.shetland.w3c.soap.SoapRequest; import org.n52.svalbard.decode.exception.DecodingException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractStringRequestDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractStringRequestDecoder.java index 7f33b4e3f..292358e06 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractStringRequestDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractStringRequestDecoder.java @@ -18,7 +18,6 @@ import javax.inject.Inject; import org.apache.xmlbeans.XmlObject; - import org.n52.shetland.ogc.ows.service.OwsServiceCommunicationObject; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.NoDecoderForKeyException; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java index 9dd1c9c81..3b3f9ffb1 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java @@ -15,8 +15,6 @@ */ package org.n52.svalbard.decode; -import net.opengis.swes.x20.ExtensibleRequestType; - import org.apache.xmlbeans.XmlObject; import org.n52.shetland.ogc.ows.extension.Extension; import org.n52.shetland.ogc.ows.extension.Extensions; @@ -27,6 +25,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import net.opengis.swes.x20.ExtensibleRequestType; + public abstract class AbstractSwesDecoderv20<S> extends AbstractXmlDecoder<XmlObject, S> { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java index 885dabf82..152d864f7 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java @@ -21,13 +21,11 @@ import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; -import org.w3c.dom.Node; - - import org.n52.janmayen.Producer; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.NoDecoderForKeyException; import org.n52.svalbard.decode.exception.XmlDecodingException; +import org.w3c.dom.Node; /** * TODO JavaDoc diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java index edee91171..2230e0d24 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import org.apache.xmlbeans.XmlObject; - import org.n52.shetland.aqd.AqdConstants; import org.n52.shetland.ogc.ows.service.OwsServiceCommunicationObject; import org.n52.svalbard.decode.exception.DecodingException; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesBaseTypeDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesBaseTypeDecoder.java index d05f89859..190e65041 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesBaseTypeDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesBaseTypeDecoder.java @@ -18,18 +18,17 @@ import java.util.Collections; import java.util.Set; -import net.opengis.ows.x11.CapabilitiesBaseType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.ows.OWSConstants; import org.n52.shetland.ogc.ows.OwsCapabilities; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; +import net.opengis.ows.x11.CapabilitiesBaseType; + /** * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 5.0.0 diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDecoder.java index b6dab28b6..2675a5ace 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDecoder.java @@ -26,16 +26,6 @@ import java.util.Set; import java.util.stream.Stream; -import net.opengis.gml.ReferenceType; -import net.opengis.sos.x10.CapabilitiesDocument.Capabilities; -import net.opengis.sos.x10.ContentsDocument; -import net.opengis.sos.x10.FilterCapabilitiesDocument; -import net.opengis.sos.x10.ObservationOfferingType; -import net.opengis.swe.x101.PhenomenonPropertyType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.filter.FilterCapabilities; import org.n52.shetland.ogc.gml.time.Time; import org.n52.shetland.ogc.ows.OwsCapabilities; @@ -47,10 +37,18 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import net.opengis.gml.ReferenceType; +import net.opengis.sos.x10.CapabilitiesDocument.Capabilities; +import net.opengis.sos.x10.ContentsDocument; +import net.opengis.sos.x10.FilterCapabilitiesDocument; +import net.opengis.sos.x10.ObservationOfferingType; +import net.opengis.swe.x101.PhenomenonPropertyType; /** * @author <a href="mailto:j.schulte@52north.org">Jan Schulte</a> diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDocumentDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDocumentDecoder.java index d80e6c2a7..f23c2b884 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDocumentDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDocumentDecoder.java @@ -24,14 +24,12 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import net.opengis.sos.x20.CapabilitiesDocument; public class CapabilitiesDocumentDecoder extends AbstractXmlDecoder<CapabilitiesDocument, GetCapabilitiesResponse> { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesTypeDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesTypeDecoder.java index 82176dcc0..cf6d33523 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesTypeDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesTypeDecoder.java @@ -28,22 +28,8 @@ import java.util.Set; import java.util.stream.Stream; -import net.opengis.fes.x20.FilterCapabilitiesDocument; -import net.opengis.gml.x32.EnvelopeType; -import net.opengis.sos.x20.CapabilitiesType; -import net.opengis.sos.x20.CapabilitiesType.Contents; -import net.opengis.sos.x20.ContentsType; -import net.opengis.sos.x20.ObservationOfferingPropertyType; -import net.opengis.sos.x20.ObservationOfferingType; -import net.opengis.swes.x20.AbstractContentsType; -import net.opengis.swes.x20.AbstractOfferingType.RelatedFeature; - import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.w3c.dom.Node; - import org.n52.shetland.ogc.filter.FilterCapabilities; import org.n52.shetland.ogc.gml.CodeType; import org.n52.shetland.ogc.gml.time.Time; @@ -60,10 +46,22 @@ import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; import org.n52.svalbard.util.XmlHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.w3c.dom.Node; import com.google.common.base.Joiner; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import net.opengis.fes.x20.FilterCapabilitiesDocument; +import net.opengis.gml.x32.EnvelopeType; +import net.opengis.sos.x20.CapabilitiesType; +import net.opengis.sos.x20.CapabilitiesType.Contents; +import net.opengis.sos.x20.ContentsType; +import net.opengis.sos.x20.ObservationOfferingPropertyType; +import net.opengis.sos.x20.ObservationOfferingType; +import net.opengis.swes.x20.AbstractContentsType; +import net.opengis.swes.x20.AbstractOfferingType.RelatedFeature; /** * @author <a href="mailto:j.schulte@52north.org">Jan Schulte</a> diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesV1DocumentDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesV1DocumentDecoder.java index 7d4366968..2cc62a68a 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesV1DocumentDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesV1DocumentDecoder.java @@ -15,11 +15,9 @@ */ package org.n52.svalbard.decode; -import com.google.common.base.Joiner; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collections; import java.util.Set; -import net.opengis.sos.x10.CapabilitiesDocument; + import org.n52.shetland.ogc.ows.OwsCapabilities; import org.n52.shetland.ogc.ows.service.GetCapabilitiesResponse; import org.n52.shetland.ogc.sos.Sos1Constants; @@ -29,6 +27,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Joiner; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import net.opengis.sos.x10.CapabilitiesDocument; + /** * @author <a href="mailto:j.schulte@52north.org">Jan Schulte</a> */ diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/DeleteObservationV20Decoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/DeleteObservationV20Decoder.java index 1a0ecb676..75e85a6e4 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/DeleteObservationV20Decoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/DeleteObservationV20Decoder.java @@ -18,13 +18,7 @@ import java.util.Collections; import java.util.Set; -import net.opengis.sosdo.x20.DeleteObservationDocument; -import net.opengis.sosdo.x20.DeleteObservationType; - import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.filter.TemporalFilter; import org.n52.shetland.ogc.sos.Sos2Constants; @@ -34,10 +28,15 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.collect.Sets; +import net.opengis.sosdo.x20.DeleteObservationDocument; +import net.opengis.sosdo.x20.DeleteObservationType; + /** * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk * Jürrens</a> diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityResponseDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityResponseDecoder.java index f5ecae788..254e91860 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityResponseDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityResponseDecoder.java @@ -21,17 +21,7 @@ import java.util.Map; import java.util.Set; -import net.opengis.gml.x32.AbstractTimeObjectType; -import net.opengis.sosgda.x10.DataAvailabilityMemberType; -import net.opengis.sosgda.x10.GetDataAvailabilityResponseDocument; -import net.opengis.sosgda.x10.GetDataAvailabilityResponseType; -import net.opengis.sosgda.x20.FormatDescriptorType; -import net.opengis.sosgda.x20.ObservationFormatDescriptorType; - import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.gml.time.TimePeriod; import org.n52.shetland.ogc.sos.gda.GetDataAvailabilityConstants; @@ -44,12 +34,21 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import net.opengis.gml.x32.AbstractTimeObjectType; +import net.opengis.sosgda.x10.DataAvailabilityMemberType; +import net.opengis.sosgda.x10.GetDataAvailabilityResponseDocument; +import net.opengis.sosgda.x10.GetDataAvailabilityResponseType; +import net.opengis.sosgda.x20.FormatDescriptorType; +import net.opengis.sosgda.x20.ObservationFormatDescriptorType; + /** * XML {@link Decoder} for {@link GetDataAvailabilityResponse} * diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityStringDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityStringDecoder.java index e588a04ba..fa4d55d47 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityStringDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityStringDecoder.java @@ -18,13 +18,12 @@ import java.util.Collections; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.ogc.sos.gda.GetDataAvailabilityConstants; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityXmlDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityXmlDecoder.java index 31a3023af..4b75b1eee 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityXmlDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityXmlDecoder.java @@ -18,13 +18,7 @@ import java.util.Collections; import java.util.Set; -import net.opengis.sosgda.x10.GetDataAvailabilityDocument; -import net.opengis.sosgda.x10.GetDataAvailabilityType; - import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.ogc.sos.gda.GetDataAvailabilityConstants; @@ -34,9 +28,14 @@ import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; import org.n52.svalbard.util.XmlHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; +import net.opengis.sosgda.x10.GetDataAvailabilityDocument; +import net.opengis.sosgda.x10.GetDataAvailabilityType; + /** * {@code Decoder} to handle {@link GetDataAvailabilityRequest}s. * diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetFeatureOfInterestResponseDocumentDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetFeatureOfInterestResponseDocumentDecoder.java index 246444a60..b69a9b052 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetFeatureOfInterestResponseDocumentDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetFeatureOfInterestResponseDocumentDecoder.java @@ -18,13 +18,6 @@ import java.util.Collections; import java.util.Set; -import net.opengis.gml.x32.FeaturePropertyType; -import net.opengis.sos.x20.GetFeatureOfInterestResponseDocument; -import net.opengis.sos.x20.GetFeatureOfInterestResponseType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.om.features.FeatureCollection; import org.n52.shetland.ogc.sos.Sos2Constants; @@ -33,10 +26,15 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import net.opengis.gml.x32.FeaturePropertyType; +import net.opengis.sos.x20.GetFeatureOfInterestResponseDocument; +import net.opengis.sos.x20.GetFeatureOfInterestResponseType; /** * XML {@link Decoder} for {@link GetFeatureOfInterestResponse} diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationByIdResponseDocumentDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationByIdResponseDocumentDecoder.java index be5ae8172..1017a0b23 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationByIdResponseDocumentDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationByIdResponseDocumentDecoder.java @@ -19,12 +19,6 @@ import java.util.List; import java.util.Set; -import net.opengis.sos.x20.GetObservationByIdResponseDocument; -import net.opengis.sos.x20.GetObservationByIdResponseType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.om.ObservationStream; import org.n52.shetland.ogc.om.OmObservation; import org.n52.shetland.ogc.sos.Sos2Constants; @@ -33,11 +27,15 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import net.opengis.sos.x20.GetObservationByIdResponseDocument; +import net.opengis.sos.x20.GetObservationByIdResponseType; public class GetObservationByIdResponseDocumentDecoder extends AbstractXmlDecoder<GetObservationByIdResponseDocument, GetObservationByIdResponse> diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationResponseDocumentDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationResponseDocumentDecoder.java index ef514859f..4d20ea010 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationResponseDocumentDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationResponseDocumentDecoder.java @@ -19,13 +19,7 @@ import java.util.List; import java.util.Set; -import net.opengis.sos.x20.GetObservationResponseDocument; -import net.opengis.sos.x20.GetObservationResponseType; -import net.opengis.sos.x20.GetObservationResponseType.ObservationData; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import org.n52.shetland.ogc.om.ObservationStream; import org.n52.shetland.ogc.om.OmObservation; import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.response.GetObservationResponse; @@ -33,13 +27,16 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -import org.n52.shetland.ogc.om.ObservationStream; +import net.opengis.sos.x20.GetObservationResponseDocument; +import net.opengis.sos.x20.GetObservationResponseType; +import net.opengis.sos.x20.GetObservationResponseType.ObservationData; public class GetObservationResponseDocumentDecoder extends AbstractXmlDecoder<GetObservationResponseDocument, GetObservationResponse> implements SosResponseDecoder { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv311.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv311.java index 4106bef4d..2fffdbd72 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv311.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv311.java @@ -20,25 +20,10 @@ import java.util.Collections; import java.util.Set; -import net.opengis.gml.CodeType; -import net.opengis.gml.CoordinatesType; -import net.opengis.gml.DirectPositionType; -import net.opengis.gml.EnvelopeDocument; -import net.opengis.gml.EnvelopeType; -import net.opengis.gml.PointType; -import net.opengis.gml.TimeInstantDocument; -import net.opengis.gml.TimeInstantType; -import net.opengis.gml.TimePeriodDocument; -import net.opengis.gml.TimePeriodType; -import net.opengis.gml.TimePositionType; - import org.apache.xmlbeans.XmlObject; import org.joda.time.DateTime; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.io.ParseException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.gml.GmlConstants; import org.n52.shetland.ogc.gml.time.IndeterminateValue; import org.n52.shetland.ogc.gml.time.TimeInstant; @@ -50,9 +35,23 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; +import net.opengis.gml.CodeType; +import net.opengis.gml.CoordinatesType; +import net.opengis.gml.DirectPositionType; +import net.opengis.gml.EnvelopeDocument; +import net.opengis.gml.EnvelopeType; +import net.opengis.gml.PointType; +import net.opengis.gml.TimeInstantDocument; +import net.opengis.gml.TimeInstantType; +import net.opengis.gml.TimePeriodDocument; +import net.opengis.gml.TimePeriodType; +import net.opengis.gml.TimePositionType; + /** * @since 1.0.0 * diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java index 32ab6d13a..a95aa569d 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java @@ -21,6 +21,41 @@ import java.util.List; import java.util.Set; +import org.apache.xmlbeans.XmlException; +import org.apache.xmlbeans.XmlObject; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.Polygon; +import org.locationtech.jts.io.ParseException; +import org.n52.janmayen.NcName; +import org.n52.shetland.ogc.gml.AbstractFeature; +import org.n52.shetland.ogc.gml.AbstractGeometry; +import org.n52.shetland.ogc.gml.CodeWithAuthority; +import org.n52.shetland.ogc.gml.GmlConstants; +import org.n52.shetland.ogc.gml.GmlMeasureType; +import org.n52.shetland.ogc.gml.time.IndeterminateValue; +import org.n52.shetland.ogc.gml.time.TimeInstant; +import org.n52.shetland.ogc.gml.time.TimePeriod; +import org.n52.shetland.ogc.om.features.FeatureCollection; +import org.n52.shetland.ogc.om.features.samplingFeatures.AbstractSamplingFeature; +import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeature; +import org.n52.shetland.ogc.sos.Sos2Constants; +import org.n52.shetland.util.CRSHelper; +import org.n52.shetland.util.CollectionHelper; +import org.n52.shetland.util.DateTimeHelper; +import org.n52.shetland.util.DateTimeParseException; +import org.n52.shetland.util.JTSHelper; +import org.n52.shetland.util.ReferencedEnvelope; +import org.n52.svalbard.decode.exception.DecodingException; +import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; +import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; +import org.n52.svalbard.util.CodingHelper; +import org.n52.svalbard.util.XmlHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.base.Joiner; + import net.opengis.gml.x32.AbstractCurveType; import net.opengis.gml.x32.AbstractGeometryType; import net.opengis.gml.x32.AbstractRingPropertyType; @@ -58,41 +93,6 @@ import net.opengis.gml.x32.TimePositionType; import net.opengis.gml.x32.VerticalDatumPropertyType; -import org.apache.xmlbeans.XmlException; -import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.n52.janmayen.NcName; -import org.n52.shetland.ogc.gml.AbstractFeature; -import org.n52.shetland.ogc.gml.AbstractGeometry; -import org.n52.shetland.ogc.gml.CodeWithAuthority; -import org.n52.shetland.ogc.gml.GmlConstants; -import org.n52.shetland.ogc.gml.GmlMeasureType; -import org.n52.shetland.ogc.gml.time.IndeterminateValue; -import org.n52.shetland.ogc.gml.time.TimeInstant; -import org.n52.shetland.ogc.gml.time.TimePeriod; -import org.n52.shetland.ogc.om.features.FeatureCollection; -import org.n52.shetland.ogc.om.features.samplingFeatures.AbstractSamplingFeature; -import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeature; -import org.n52.shetland.ogc.sos.Sos2Constants; -import org.n52.shetland.util.CRSHelper; -import org.n52.shetland.util.CollectionHelper; -import org.n52.shetland.util.DateTimeHelper; -import org.n52.shetland.util.DateTimeParseException; -import org.n52.shetland.util.JTSHelper; -import org.n52.shetland.util.ReferencedEnvelope; -import org.n52.svalbard.decode.exception.DecodingException; -import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; -import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; -import org.n52.svalbard.util.CodingHelper; -import org.n52.svalbard.util.XmlHelper; - -import com.google.common.base.Joiner; -import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.geom.GeometryFactory; -import org.locationtech.jts.geom.Polygon; -import org.locationtech.jts.io.ParseException; - /** * @since 1.0.0 * diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/InsertSensorResponseDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/InsertSensorResponseDecoder.java index aaee9a0c9..d24fe9e9b 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/InsertSensorResponseDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/InsertSensorResponseDecoder.java @@ -18,13 +18,7 @@ import java.util.Collections; import java.util.Set; -import net.opengis.swes.x20.InsertSensorResponseDocument; -import net.opengis.swes.x20.InsertSensorResponseType; - import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.ogc.sos.response.InsertSensorResponse; @@ -33,9 +27,14 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; +import net.opengis.swes.x20.InsertSensorResponseDocument; +import net.opengis.swes.x20.InsertSensorResponseType; + /** * @author <a href="mailto:e.h.juerrens@52north.org">Jürrens, Eike Hinderk</a> */ diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GcoDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GcoDecoder.java index 8adb144b3..7da81bc67 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GcoDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GcoDecoder.java @@ -20,13 +20,11 @@ import org.apache.xmlbeans.XmlObject; import org.isotc211.x2005.gco.CodeListValueType; - import org.n52.shetland.iso.GcoConstants; import org.n52.shetland.ogc.sensorML.Role; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GmdDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GmdDecoder.java index 5700c51b2..3056cba7a 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GmdDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GmdDecoder.java @@ -43,7 +43,6 @@ import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OmDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OmDecoderv20.java index 1742a2fa4..cc9aa63e2 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OmDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OmDecoderv20.java @@ -19,20 +19,13 @@ import java.util.Map; import java.util.Set; -import net.opengis.om.x20.NamedValuePropertyType; -import net.opengis.om.x20.OMObservationDocument; -import net.opengis.om.x20.OMObservationType; -import net.opengis.om.x20.TimeObjectPropertyType; - import org.apache.xmlbeans.XmlBoolean; import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlInteger; import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlString; import org.apache.xmlbeans.impl.values.XmlAnyTypeImpl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.gml.AbstractGeometry; @@ -69,11 +62,17 @@ import org.n52.svalbard.ConformanceClasses; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import org.locationtech.jts.geom.Geometry; + +import net.opengis.om.x20.NamedValuePropertyType; +import net.opengis.om.x20.OMObservationDocument; +import net.opengis.om.x20.OMObservationType; +import net.opengis.om.x20.TimeObjectPropertyType; /** * @since 1.0.0 diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OwsExceptionReportDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OwsExceptionReportDecoder.java index ca8609ca9..aba0bb2b5 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OwsExceptionReportDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OwsExceptionReportDecoder.java @@ -22,10 +22,6 @@ import java.util.Objects; import java.util.Set; -import net.opengis.ows.x11.ExceptionReportDocument; -import net.opengis.ows.x11.ExceptionReportDocument.ExceptionReport; -import net.opengis.ows.x11.ExceptionType; - import org.n52.janmayen.stream.Streams; import org.n52.shetland.ogc.ows.OWSConstants; import org.n52.shetland.ogc.ows.exception.CodedException; @@ -34,6 +30,10 @@ import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; import org.n52.svalbard.decode.exception.DecodingException; +import net.opengis.ows.x11.ExceptionReportDocument; +import net.opengis.ows.x11.ExceptionReportDocument.ExceptionReport; +import net.opengis.ows.x11.ExceptionType; + /** * Decoder for OWS v1.1.0 Exception Reports. * diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/RelatedOfferingTypeDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/RelatedOfferingTypeDecoder.java index 89049bcb4..e0fcea58d 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/RelatedOfferingTypeDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/RelatedOfferingTypeDecoder.java @@ -18,21 +18,20 @@ import java.util.Collections; import java.util.Set; -import net.opengis.sosro.x10.RelatedOfferingsPropertyType; -import net.opengis.sosro.x10.RelatedOfferingsType.RelatedOffering; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.sos.ro.OfferingContext; import org.n52.shetland.ogc.sos.ro.RelatedOfferingConstants; import org.n52.shetland.ogc.sos.ro.RelatedOfferings; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; +import net.opengis.sosro.x10.RelatedOfferingsPropertyType; +import net.opengis.sosro.x10.RelatedOfferingsType.RelatedOffering; + /** * @author Jan Schulte */ diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SamplingDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SamplingDecoderv20.java index 62f81684c..0e22eb5a5 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SamplingDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SamplingDecoderv20.java @@ -20,17 +20,15 @@ import java.util.List; import java.util.Set; -import net.opengis.gml.x32.FeaturePropertyType; -import net.opengis.gml.x32.ReferenceType; -import net.opengis.samplingSpatial.x20.SFSpatialSamplingFeatureDocument; -import net.opengis.samplingSpatial.x20.SFSpatialSamplingFeatureType; -import net.opengis.samplingSpatial.x20.ShapeType; - import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.MultiLineString; +import org.locationtech.jts.geom.MultiPoint; +import org.locationtech.jts.geom.MultiPolygon; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.geom.Polygon; import org.n52.shetland.ogc.OGCConstants; import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.gml.AbstractFeature; @@ -48,18 +46,19 @@ import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; import org.n52.svalbard.util.XmlHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.geom.LineString; -import org.locationtech.jts.geom.MultiLineString; -import org.locationtech.jts.geom.MultiPoint; -import org.locationtech.jts.geom.MultiPolygon; -import org.locationtech.jts.geom.Point; -import org.locationtech.jts.geom.Polygon; + +import net.opengis.gml.x32.FeaturePropertyType; +import net.opengis.gml.x32.ReferenceType; +import net.opengis.samplingSpatial.x20.SFSpatialSamplingFeatureDocument; +import net.opengis.samplingSpatial.x20.SFSpatialSamplingFeatureType; +import net.opengis.samplingSpatial.x20.ShapeType; /** * @since 1.0.0 diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv100.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv100.java index 2526b01bd..4cbfd6a5a 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv100.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv100.java @@ -21,7 +21,6 @@ import org.n52.shetland.ogc.sos.Sos1Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv20.java index a226cd42e..ea76555a2 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv20.java @@ -22,7 +22,6 @@ import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.util.CollectionHelper; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SpecimenDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SpecimenDecoderv20.java index 878667a63..45ce9e690 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SpecimenDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SpecimenDecoderv20.java @@ -22,6 +22,7 @@ import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; +import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.OGCConstants; import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.gml.AbstractFeature; @@ -45,7 +46,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.locationtech.jts.geom.Geometry; import net.opengis.gml.x32.FeaturePropertyType; import net.opengis.samplingSpecimen.x20.SFSpecimenDocument; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesExtensionDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesExtensionDecoderv20.java index 076116cfa..111cf3490 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesExtensionDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesExtensionDecoderv20.java @@ -30,7 +30,6 @@ import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Node; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesStringDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesStringDecoderv20.java index 6087c66df..c8d34e0b6 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesStringDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesStringDecoderv20.java @@ -21,7 +21,6 @@ import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/TsmlObservationProcessDecoderv10.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/TsmlObservationProcessDecoderv10.java index 729db8440..05e3ea87d 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/TsmlObservationProcessDecoderv10.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/TsmlObservationProcessDecoderv10.java @@ -19,13 +19,6 @@ import java.util.Map; import java.util.Set; -import net.opengis.tsml.x10.ObservationProcessDocument; -import net.opengis.tsml.x10.ObservationProcessPropertyType; -import net.opengis.tsml.x10.ObservationProcessType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.om.series.tsml.ObservationProcess; @@ -36,12 +29,19 @@ import org.n52.shetland.util.CollectionHelper; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.google.common.base.Joiner; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import net.opengis.tsml.x10.ObservationProcessDocument; +import net.opengis.tsml.x10.ObservationProcessPropertyType; +import net.opengis.tsml.x10.ObservationProcessType; + public class TsmlObservationProcessDecoderv10 extends AbstractOmDecoderv20 diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/WmlObservationProcessDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/WmlObservationProcessDecoderv20.java index c02a7eb99..a54587418 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/WmlObservationProcessDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/WmlObservationProcessDecoderv20.java @@ -19,13 +19,6 @@ import java.util.Map; import java.util.Set; -import net.opengis.waterml.x20.ObservationProcessDocument; -import net.opengis.waterml.x20.ObservationProcessPropertyType; -import net.opengis.waterml.x20.ObservationProcessType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.om.series.wml.ObservationProcess; @@ -36,11 +29,18 @@ import org.n52.shetland.util.CollectionHelper; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import net.opengis.waterml.x20.ObservationProcessDocument; +import net.opengis.waterml.x20.ObservationProcessPropertyType; +import net.opengis.waterml.x20.ObservationProcessType; + public class WmlObservationProcessDecoderv20 extends AbstractWmlDecoderv20 implements ProcedureDecoder<Object, Object> { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/XlinkDecoderv1999.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/XlinkDecoderv1999.java index a8279b9f5..5f130e852 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/XlinkDecoderv1999.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/XlinkDecoderv1999.java @@ -19,13 +19,11 @@ import java.util.Set; import org.apache.xmlbeans.XmlObject; - import org.n52.shetland.w3c.W3CConstants; import org.n52.shetland.w3c.xlink.W3CHrefAttribute; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3.x1999.xlink.HrefAttribute; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/exception/UnsupportedDecoderXmlInputException.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/exception/UnsupportedDecoderXmlInputException.java index 399cfdd4a..410f8af63 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/exception/UnsupportedDecoderXmlInputException.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/exception/UnsupportedDecoderXmlInputException.java @@ -16,9 +16,8 @@ package org.n52.svalbard.decode.exception; import org.apache.xmlbeans.XmlObject; -import org.w3c.dom.Node; - import org.n52.svalbard.decode.Decoder; +import org.w3c.dom.Node; public class UnsupportedDecoderXmlInputException extends UnsupportedDecoderInputException { private static final long serialVersionUID = -7244575661954080973L; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java index d6c48592d..17ee96aa4 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java @@ -44,9 +44,9 @@ import org.n52.shetland.ogc.om.values.TLVTValue; import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; +import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.TrajectoryValue; -import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; import org.n52.shetland.ogc.om.values.XmlValue; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java index 58e70f2a5..47327cd90 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java @@ -62,9 +62,9 @@ import org.n52.shetland.ogc.om.values.TLVTValue; import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; +import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.TrajectoryValue; -import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; import org.n52.shetland.ogc.om.values.XmlValue; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSoapEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSoapEncoder.java index f0085d390..9df202873 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSoapEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSoapEncoder.java @@ -15,7 +15,9 @@ */ package org.n52.svalbard.encode; -import com.google.common.collect.ImmutableSet; +import java.util.Collections; +import java.util.Set; + import org.apache.xmlbeans.XmlObject; import org.n52.janmayen.http.MediaType; import org.n52.janmayen.http.MediaTypes; @@ -35,8 +37,7 @@ import org.n52.svalbard.encode.exception.EncodingException; import org.n52.svalbard.encode.exception.NoEncoderForKeyException; -import java.util.Collections; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSwesRequestEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSwesRequestEncoder.java index 1e92ea8c2..4a3672bcf 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSwesRequestEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSwesRequestEncoder.java @@ -21,7 +21,6 @@ import org.n52.shetland.ogc.ows.service.OwsServiceRequest; import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; -import org.n52.shetland.ogc.sos.request.InsertSensorRequest; import org.n52.shetland.ogc.swes.SwesConstants; import org.n52.shetland.util.CollectionHelper; import org.n52.shetland.w3c.SchemaLocation; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractXmlResponseEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractXmlResponseEncoder.java index 905808e13..e380a440e 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractXmlResponseEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractXmlResponseEncoder.java @@ -15,6 +15,18 @@ */ package org.n52.svalbard.encode; +import static java.util.stream.Collectors.toMap; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Stream; + +import javax.inject.Inject; + import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; import org.n52.faroe.annotation.Configurable; @@ -30,17 +42,6 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import javax.inject.Inject; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Stream; - -import static java.util.stream.Collectors.toMap; - /** * @param <T> the response type * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java index 2d3481c8d..8fe60e667 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java @@ -62,9 +62,9 @@ import org.n52.shetland.ogc.om.values.TLVTValue; import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; +import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.TrajectoryValue; -import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.XmlValue; import org.n52.shetland.ogc.om.values.visitor.ValueVisitor; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/exception/UnsupportedEncoderXmlInputException.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/exception/UnsupportedEncoderXmlInputException.java index 8fe30b435..bbe65741e 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/exception/UnsupportedEncoderXmlInputException.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/exception/UnsupportedEncoderXmlInputException.java @@ -16,9 +16,7 @@ package org.n52.svalbard.encode.exception; import org.apache.xmlbeans.XmlObject; - import org.n52.svalbard.encode.Encoder; - import org.w3c.dom.Node; public class UnsupportedEncoderXmlInputException extends UnsupportedEncoderInputException { From de77c6595d5b4c13b25e9b3bb945c277c8956589 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 21 Apr 2022 10:19:46 +0200 Subject: [PATCH 276/456] organize imports to fix build --- .../org/n52/bjornoya/schedule/JobFactory.java | 12 ++-- .../AbstractCapabilitiesBaseTypeDecoder.java | 53 +++++++------- ...AbstractGetDataAvailabilityXmlDecoder.java | 1 - .../decode/AbstractGmlDecoderv321.java | 2 +- .../decode/AbstractProcessDecoder.java | 2 +- .../decode/AbstractSoapStringDecoder.java | 1 - .../decode/AbstractStringRequestDecoder.java | 1 - .../decode/AbstractSwesDecoderv20.java | 4 +- .../svalbard/decode/AbstractXmlDecoder.java | 4 +- .../n52/svalbard/decode/AqdDecoderv10.java | 1 - .../decode/CapabilitiesBaseTypeDecoder.java | 9 ++- .../svalbard/decode/CapabilitiesDecoder.java | 18 +++-- .../decode/CapabilitiesDocumentDecoder.java | 2 - .../decode/CapabilitiesTypeDecoder.java | 26 ++++--- .../decode/CapabilitiesV1DocumentDecoder.java | 9 ++- .../decode/DeleteObservationV20Decoder.java | 11 ++- .../GetDataAvailabilityResponseDecoder.java | 19 +++-- .../GetDataAvailabilityStringDecoder.java | 5 +- .../decode/GetDataAvailabilityXmlDecoder.java | 11 ++- ...tureOfInterestResponseDocumentDecoder.java | 12 ++-- ...bservationByIdResponseDocumentDecoder.java | 10 ++- ...GetObservationResponseDocumentDecoder.java | 15 ++-- .../n52/svalbard/decode/GmlDecoderv311.java | 29 ++++---- .../n52/svalbard/decode/GmlDecoderv321.java | 70 +++++++++---------- .../decode/InsertSensorResponseDecoder.java | 11 ++- .../svalbard/decode/Iso19139GcoDecoder.java | 2 - .../svalbard/decode/Iso19139GmdDecoder.java | 1 - .../org/n52/svalbard/decode/OmDecoderv20.java | 17 +++-- .../decode/OwsExceptionReportDecoder.java | 8 +-- .../decode/RelatedOfferingTypeDecoder.java | 11 ++- .../svalbard/decode/SamplingDecoderv20.java | 31 ++++---- .../svalbard/decode/SosStringDecoderv100.java | 1 - .../svalbard/decode/SosStringDecoderv20.java | 1 - .../svalbard/decode/SpecimenDecoderv20.java | 2 +- .../decode/SwesExtensionDecoderv20.java | 1 - .../svalbard/decode/SwesStringDecoderv20.java | 1 - .../TsmlObservationProcessDecoderv10.java | 14 ++-- .../WmlObservationProcessDecoderv20.java | 14 ++-- .../svalbard/decode/XlinkDecoderv1999.java | 2 - .../UnsupportedDecoderXmlInputException.java | 3 +- ...actCVDiscretePointCoverageTypeEncoder.java | 2 +- .../svalbard/encode/AbstractOmEncoderv20.java | 2 +- .../svalbard/encode/AbstractSoapEncoder.java | 7 +- .../encode/AbstractSwesRequestEncoder.java | 1 - .../encode/AbstractXmlResponseEncoder.java | 23 +++--- .../org/n52/svalbard/encode/OmEncoderv20.java | 2 +- .../UnsupportedEncoderXmlInputException.java | 2 - 47 files changed, 224 insertions(+), 262 deletions(-) diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java index 1cbf2cc24..55f53df78 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java @@ -75,15 +75,15 @@ public List<ScheduledJob> getScheduledJobs() { } /** - * @return the updateDefinition + * @return the cronFullExpression */ public String getFullCronExpression() { return cronFullExpression; } /** - * @param updateDefinition - * the updateDefinition to set + * @param cronFullExpression + * the cronFullExpression to set */ @Setting(FULL_HARVEST_UPDATE) @Value(FULL_HARVEST_UPDATE_VALUE) @@ -100,15 +100,15 @@ public void setFullCronExpression(String cronExpression) { } /** - * @return the updateDefinition + * @return the cronTemporalExpression */ public String getTemporalCronExpression() { return cronTemporalExpression; } /** - * @param updateDefinition - * the updateDefinition to set + * @param cronTemporalExpression + * the cronTemporalExpression to set */ @Setting(TEMPORAL_HARVEST_UPDATE) @Value(TEMPORAL_HARVEST_UPDATE_VALUE) diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractCapabilitiesBaseTypeDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractCapabilitiesBaseTypeDecoder.java index 2688e65b5..cdd77c07d 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractCapabilitiesBaseTypeDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractCapabilitiesBaseTypeDecoder.java @@ -29,34 +29,7 @@ import java.util.function.BiFunction; import java.util.stream.Stream; -import net.opengis.ows.x11.AddressType; -import net.opengis.ows.x11.AllowedValuesDocument.AllowedValues; -import net.opengis.ows.x11.AnyValueDocument.AnyValue; -import net.opengis.ows.x11.CapabilitiesBaseType; -import net.opengis.ows.x11.CodeType; -import net.opengis.ows.x11.ContactType; -import net.opengis.ows.x11.DCPDocument.DCP; -import net.opengis.ows.x11.DomainMetadataType; -import net.opengis.ows.x11.DomainType; -import net.opengis.ows.x11.HTTPDocument.HTTP; -import net.opengis.ows.x11.KeywordsType; -import net.opengis.ows.x11.LanguageStringType; -import net.opengis.ows.x11.MetadataType; -import net.opengis.ows.x11.NoValuesDocument.NoValues; -import net.opengis.ows.x11.OnlineResourceType; -import net.opengis.ows.x11.OperationDocument.Operation; -import net.opengis.ows.x11.OperationsMetadataDocument.OperationsMetadata; -import net.opengis.ows.x11.RangeType; -import net.opengis.ows.x11.RequestMethodType; -import net.opengis.ows.x11.ResponsiblePartySubsetType; -import net.opengis.ows.x11.ServiceIdentificationDocument.ServiceIdentification; -import net.opengis.ows.x11.ServiceProviderDocument.ServiceProvider; -import net.opengis.ows.x11.TelephoneType; -import net.opengis.ows.x11.ValueType; -import net.opengis.ows.x11.ValuesReferenceDocument.ValuesReference; - import org.apache.xmlbeans.XmlObject; - import org.n52.janmayen.http.HTTPMethods; import org.n52.janmayen.i18n.LocaleHelper; import org.n52.janmayen.i18n.LocalizedString; @@ -98,6 +71,32 @@ import com.google.common.base.Strings; +import net.opengis.ows.x11.AddressType; +import net.opengis.ows.x11.AllowedValuesDocument.AllowedValues; +import net.opengis.ows.x11.AnyValueDocument.AnyValue; +import net.opengis.ows.x11.CapabilitiesBaseType; +import net.opengis.ows.x11.CodeType; +import net.opengis.ows.x11.ContactType; +import net.opengis.ows.x11.DCPDocument.DCP; +import net.opengis.ows.x11.DomainMetadataType; +import net.opengis.ows.x11.DomainType; +import net.opengis.ows.x11.HTTPDocument.HTTP; +import net.opengis.ows.x11.KeywordsType; +import net.opengis.ows.x11.LanguageStringType; +import net.opengis.ows.x11.MetadataType; +import net.opengis.ows.x11.NoValuesDocument.NoValues; +import net.opengis.ows.x11.OnlineResourceType; +import net.opengis.ows.x11.OperationDocument.Operation; +import net.opengis.ows.x11.OperationsMetadataDocument.OperationsMetadata; +import net.opengis.ows.x11.RangeType; +import net.opengis.ows.x11.RequestMethodType; +import net.opengis.ows.x11.ResponsiblePartySubsetType; +import net.opengis.ows.x11.ServiceIdentificationDocument.ServiceIdentification; +import net.opengis.ows.x11.ServiceProviderDocument.ServiceProvider; +import net.opengis.ows.x11.TelephoneType; +import net.opengis.ows.x11.ValueType; +import net.opengis.ows.x11.ValuesReferenceDocument.ValuesReference; + public abstract class AbstractCapabilitiesBaseTypeDecoder<T, S> extends AbstractXmlDecoder<T, S> { protected OwsCapabilities parseCapabilitiesBaseType(String service, CapabilitiesBaseType cbt) diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGetDataAvailabilityXmlDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGetDataAvailabilityXmlDecoder.java index 8a796e64d..db0212041 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGetDataAvailabilityXmlDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGetDataAvailabilityXmlDecoder.java @@ -19,7 +19,6 @@ import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlString; import org.apache.xmlbeans.impl.values.XmlAnyTypeImpl; - import org.n52.shetland.ogc.sos.gda.GetDataAvailabilityRequest; import org.n52.shetland.ogc.swe.SweAbstractDataComponent; import org.n52.svalbard.decode.exception.DecodingException; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java index 3e4783108..e45aa62e7 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java @@ -29,6 +29,7 @@ import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlString; import org.apache.xmlbeans.impl.values.XmlAnyTypeImpl; +import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.gml.AbstractGML; import org.n52.shetland.ogc.gml.AbstractGeometry; @@ -59,7 +60,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.locationtech.jts.geom.Geometry; import net.opengis.gml.x32.AbstractFeatureType; import net.opengis.gml.x32.AbstractGMLType; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractProcessDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractProcessDecoder.java index 31363d8d3..b2d81c8bc 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractProcessDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractProcessDecoder.java @@ -19,10 +19,10 @@ import java.util.Set; import org.n52.shetland.inspire.ompr.InspireOMPRConstants; +import org.n52.shetland.inspire.ompr.Process; import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.gml.CodeWithAuthority; import org.n52.shetland.ogc.sos.ProcedureDescriptionFormat; -import org.n52.shetland.inspire.ompr.Process; import com.google.common.collect.Sets; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSoapStringDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSoapStringDecoder.java index c5fe022cf..a3c16aa82 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSoapStringDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSoapStringDecoder.java @@ -22,7 +22,6 @@ import org.n52.shetland.w3c.soap.SoapConstants; import org.n52.shetland.w3c.soap.SoapRequest; import org.n52.svalbard.decode.exception.DecodingException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractStringRequestDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractStringRequestDecoder.java index 906784bf4..8c2395e8a 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractStringRequestDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractStringRequestDecoder.java @@ -18,7 +18,6 @@ import javax.inject.Inject; import org.apache.xmlbeans.XmlObject; - import org.n52.shetland.ogc.ows.service.OwsServiceCommunicationObject; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.NoDecoderForKeyException; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java index 9dd1c9c81..3b3f9ffb1 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractSwesDecoderv20.java @@ -15,8 +15,6 @@ */ package org.n52.svalbard.decode; -import net.opengis.swes.x20.ExtensibleRequestType; - import org.apache.xmlbeans.XmlObject; import org.n52.shetland.ogc.ows.extension.Extension; import org.n52.shetland.ogc.ows.extension.Extensions; @@ -27,6 +25,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import net.opengis.swes.x20.ExtensibleRequestType; + public abstract class AbstractSwesDecoderv20<S> extends AbstractXmlDecoder<XmlObject, S> { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java index 885dabf82..152d864f7 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractXmlDecoder.java @@ -21,13 +21,11 @@ import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; -import org.w3c.dom.Node; - - import org.n52.janmayen.Producer; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.NoDecoderForKeyException; import org.n52.svalbard.decode.exception.XmlDecodingException; +import org.w3c.dom.Node; /** * TODO JavaDoc diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java index 63d95079b..3031392ba 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AqdDecoderv10.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import org.apache.xmlbeans.XmlObject; - import org.n52.shetland.aqd.AqdConstants; import org.n52.shetland.ogc.ows.service.OwsServiceCommunicationObject; import org.n52.svalbard.decode.exception.DecodingException; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesBaseTypeDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesBaseTypeDecoder.java index d05f89859..190e65041 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesBaseTypeDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesBaseTypeDecoder.java @@ -18,18 +18,17 @@ import java.util.Collections; import java.util.Set; -import net.opengis.ows.x11.CapabilitiesBaseType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.ows.OWSConstants; import org.n52.shetland.ogc.ows.OwsCapabilities; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; +import net.opengis.ows.x11.CapabilitiesBaseType; + /** * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 5.0.0 diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDecoder.java index b6dab28b6..2675a5ace 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDecoder.java @@ -26,16 +26,6 @@ import java.util.Set; import java.util.stream.Stream; -import net.opengis.gml.ReferenceType; -import net.opengis.sos.x10.CapabilitiesDocument.Capabilities; -import net.opengis.sos.x10.ContentsDocument; -import net.opengis.sos.x10.FilterCapabilitiesDocument; -import net.opengis.sos.x10.ObservationOfferingType; -import net.opengis.swe.x101.PhenomenonPropertyType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.filter.FilterCapabilities; import org.n52.shetland.ogc.gml.time.Time; import org.n52.shetland.ogc.ows.OwsCapabilities; @@ -47,10 +37,18 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import net.opengis.gml.ReferenceType; +import net.opengis.sos.x10.CapabilitiesDocument.Capabilities; +import net.opengis.sos.x10.ContentsDocument; +import net.opengis.sos.x10.FilterCapabilitiesDocument; +import net.opengis.sos.x10.ObservationOfferingType; +import net.opengis.swe.x101.PhenomenonPropertyType; /** * @author <a href="mailto:j.schulte@52north.org">Jan Schulte</a> diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDocumentDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDocumentDecoder.java index d80e6c2a7..f23c2b884 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDocumentDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesDocumentDecoder.java @@ -24,14 +24,12 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import net.opengis.sos.x20.CapabilitiesDocument; public class CapabilitiesDocumentDecoder extends AbstractXmlDecoder<CapabilitiesDocument, GetCapabilitiesResponse> { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesTypeDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesTypeDecoder.java index 82176dcc0..cf6d33523 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesTypeDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesTypeDecoder.java @@ -28,22 +28,8 @@ import java.util.Set; import java.util.stream.Stream; -import net.opengis.fes.x20.FilterCapabilitiesDocument; -import net.opengis.gml.x32.EnvelopeType; -import net.opengis.sos.x20.CapabilitiesType; -import net.opengis.sos.x20.CapabilitiesType.Contents; -import net.opengis.sos.x20.ContentsType; -import net.opengis.sos.x20.ObservationOfferingPropertyType; -import net.opengis.sos.x20.ObservationOfferingType; -import net.opengis.swes.x20.AbstractContentsType; -import net.opengis.swes.x20.AbstractOfferingType.RelatedFeature; - import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.w3c.dom.Node; - import org.n52.shetland.ogc.filter.FilterCapabilities; import org.n52.shetland.ogc.gml.CodeType; import org.n52.shetland.ogc.gml.time.Time; @@ -60,10 +46,22 @@ import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; import org.n52.svalbard.util.XmlHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.w3c.dom.Node; import com.google.common.base.Joiner; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import net.opengis.fes.x20.FilterCapabilitiesDocument; +import net.opengis.gml.x32.EnvelopeType; +import net.opengis.sos.x20.CapabilitiesType; +import net.opengis.sos.x20.CapabilitiesType.Contents; +import net.opengis.sos.x20.ContentsType; +import net.opengis.sos.x20.ObservationOfferingPropertyType; +import net.opengis.sos.x20.ObservationOfferingType; +import net.opengis.swes.x20.AbstractContentsType; +import net.opengis.swes.x20.AbstractOfferingType.RelatedFeature; /** * @author <a href="mailto:j.schulte@52north.org">Jan Schulte</a> diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesV1DocumentDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesV1DocumentDecoder.java index 7d4366968..2cc62a68a 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesV1DocumentDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/CapabilitiesV1DocumentDecoder.java @@ -15,11 +15,9 @@ */ package org.n52.svalbard.decode; -import com.google.common.base.Joiner; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collections; import java.util.Set; -import net.opengis.sos.x10.CapabilitiesDocument; + import org.n52.shetland.ogc.ows.OwsCapabilities; import org.n52.shetland.ogc.ows.service.GetCapabilitiesResponse; import org.n52.shetland.ogc.sos.Sos1Constants; @@ -29,6 +27,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Joiner; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import net.opengis.sos.x10.CapabilitiesDocument; + /** * @author <a href="mailto:j.schulte@52north.org">Jan Schulte</a> */ diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/DeleteObservationV20Decoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/DeleteObservationV20Decoder.java index 1a0ecb676..75e85a6e4 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/DeleteObservationV20Decoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/DeleteObservationV20Decoder.java @@ -18,13 +18,7 @@ import java.util.Collections; import java.util.Set; -import net.opengis.sosdo.x20.DeleteObservationDocument; -import net.opengis.sosdo.x20.DeleteObservationType; - import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.filter.TemporalFilter; import org.n52.shetland.ogc.sos.Sos2Constants; @@ -34,10 +28,15 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.collect.Sets; +import net.opengis.sosdo.x20.DeleteObservationDocument; +import net.opengis.sosdo.x20.DeleteObservationType; + /** * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk * Jürrens</a> diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityResponseDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityResponseDecoder.java index f5ecae788..254e91860 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityResponseDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityResponseDecoder.java @@ -21,17 +21,7 @@ import java.util.Map; import java.util.Set; -import net.opengis.gml.x32.AbstractTimeObjectType; -import net.opengis.sosgda.x10.DataAvailabilityMemberType; -import net.opengis.sosgda.x10.GetDataAvailabilityResponseDocument; -import net.opengis.sosgda.x10.GetDataAvailabilityResponseType; -import net.opengis.sosgda.x20.FormatDescriptorType; -import net.opengis.sosgda.x20.ObservationFormatDescriptorType; - import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.gml.time.TimePeriod; import org.n52.shetland.ogc.sos.gda.GetDataAvailabilityConstants; @@ -44,12 +34,21 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import net.opengis.gml.x32.AbstractTimeObjectType; +import net.opengis.sosgda.x10.DataAvailabilityMemberType; +import net.opengis.sosgda.x10.GetDataAvailabilityResponseDocument; +import net.opengis.sosgda.x10.GetDataAvailabilityResponseType; +import net.opengis.sosgda.x20.FormatDescriptorType; +import net.opengis.sosgda.x20.ObservationFormatDescriptorType; + /** * XML {@link Decoder} for {@link GetDataAvailabilityResponse} * diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityStringDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityStringDecoder.java index e588a04ba..fa4d55d47 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityStringDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityStringDecoder.java @@ -18,13 +18,12 @@ import java.util.Collections; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.ogc.sos.gda.GetDataAvailabilityConstants; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityXmlDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityXmlDecoder.java index 31a3023af..4b75b1eee 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityXmlDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetDataAvailabilityXmlDecoder.java @@ -18,13 +18,7 @@ import java.util.Collections; import java.util.Set; -import net.opengis.sosgda.x10.GetDataAvailabilityDocument; -import net.opengis.sosgda.x10.GetDataAvailabilityType; - import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.ogc.sos.gda.GetDataAvailabilityConstants; @@ -34,9 +28,14 @@ import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; import org.n52.svalbard.util.XmlHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; +import net.opengis.sosgda.x10.GetDataAvailabilityDocument; +import net.opengis.sosgda.x10.GetDataAvailabilityType; + /** * {@code Decoder} to handle {@link GetDataAvailabilityRequest}s. * diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetFeatureOfInterestResponseDocumentDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetFeatureOfInterestResponseDocumentDecoder.java index 246444a60..b69a9b052 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetFeatureOfInterestResponseDocumentDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetFeatureOfInterestResponseDocumentDecoder.java @@ -18,13 +18,6 @@ import java.util.Collections; import java.util.Set; -import net.opengis.gml.x32.FeaturePropertyType; -import net.opengis.sos.x20.GetFeatureOfInterestResponseDocument; -import net.opengis.sos.x20.GetFeatureOfInterestResponseType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.om.features.FeatureCollection; import org.n52.shetland.ogc.sos.Sos2Constants; @@ -33,10 +26,15 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import net.opengis.gml.x32.FeaturePropertyType; +import net.opengis.sos.x20.GetFeatureOfInterestResponseDocument; +import net.opengis.sos.x20.GetFeatureOfInterestResponseType; /** * XML {@link Decoder} for {@link GetFeatureOfInterestResponse} diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationByIdResponseDocumentDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationByIdResponseDocumentDecoder.java index be5ae8172..1017a0b23 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationByIdResponseDocumentDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationByIdResponseDocumentDecoder.java @@ -19,12 +19,6 @@ import java.util.List; import java.util.Set; -import net.opengis.sos.x20.GetObservationByIdResponseDocument; -import net.opengis.sos.x20.GetObservationByIdResponseType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.om.ObservationStream; import org.n52.shetland.ogc.om.OmObservation; import org.n52.shetland.ogc.sos.Sos2Constants; @@ -33,11 +27,15 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import net.opengis.sos.x20.GetObservationByIdResponseDocument; +import net.opengis.sos.x20.GetObservationByIdResponseType; public class GetObservationByIdResponseDocumentDecoder extends AbstractXmlDecoder<GetObservationByIdResponseDocument, GetObservationByIdResponse> diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationResponseDocumentDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationResponseDocumentDecoder.java index ef514859f..4d20ea010 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationResponseDocumentDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GetObservationResponseDocumentDecoder.java @@ -19,13 +19,7 @@ import java.util.List; import java.util.Set; -import net.opengis.sos.x20.GetObservationResponseDocument; -import net.opengis.sos.x20.GetObservationResponseType; -import net.opengis.sos.x20.GetObservationResponseType.ObservationData; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import org.n52.shetland.ogc.om.ObservationStream; import org.n52.shetland.ogc.om.OmObservation; import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.response.GetObservationResponse; @@ -33,13 +27,16 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -import org.n52.shetland.ogc.om.ObservationStream; +import net.opengis.sos.x20.GetObservationResponseDocument; +import net.opengis.sos.x20.GetObservationResponseType; +import net.opengis.sos.x20.GetObservationResponseType.ObservationData; public class GetObservationResponseDocumentDecoder extends AbstractXmlDecoder<GetObservationResponseDocument, GetObservationResponse> implements SosResponseDecoder { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv311.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv311.java index 4106bef4d..2fffdbd72 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv311.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv311.java @@ -20,25 +20,10 @@ import java.util.Collections; import java.util.Set; -import net.opengis.gml.CodeType; -import net.opengis.gml.CoordinatesType; -import net.opengis.gml.DirectPositionType; -import net.opengis.gml.EnvelopeDocument; -import net.opengis.gml.EnvelopeType; -import net.opengis.gml.PointType; -import net.opengis.gml.TimeInstantDocument; -import net.opengis.gml.TimeInstantType; -import net.opengis.gml.TimePeriodDocument; -import net.opengis.gml.TimePeriodType; -import net.opengis.gml.TimePositionType; - import org.apache.xmlbeans.XmlObject; import org.joda.time.DateTime; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.io.ParseException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.gml.GmlConstants; import org.n52.shetland.ogc.gml.time.IndeterminateValue; import org.n52.shetland.ogc.gml.time.TimeInstant; @@ -50,9 +35,23 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; +import net.opengis.gml.CodeType; +import net.opengis.gml.CoordinatesType; +import net.opengis.gml.DirectPositionType; +import net.opengis.gml.EnvelopeDocument; +import net.opengis.gml.EnvelopeType; +import net.opengis.gml.PointType; +import net.opengis.gml.TimeInstantDocument; +import net.opengis.gml.TimeInstantType; +import net.opengis.gml.TimePeriodDocument; +import net.opengis.gml.TimePeriodType; +import net.opengis.gml.TimePositionType; + /** * @since 1.0.0 * diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java index 32ab6d13a..a95aa569d 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java @@ -21,6 +21,41 @@ import java.util.List; import java.util.Set; +import org.apache.xmlbeans.XmlException; +import org.apache.xmlbeans.XmlObject; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.Polygon; +import org.locationtech.jts.io.ParseException; +import org.n52.janmayen.NcName; +import org.n52.shetland.ogc.gml.AbstractFeature; +import org.n52.shetland.ogc.gml.AbstractGeometry; +import org.n52.shetland.ogc.gml.CodeWithAuthority; +import org.n52.shetland.ogc.gml.GmlConstants; +import org.n52.shetland.ogc.gml.GmlMeasureType; +import org.n52.shetland.ogc.gml.time.IndeterminateValue; +import org.n52.shetland.ogc.gml.time.TimeInstant; +import org.n52.shetland.ogc.gml.time.TimePeriod; +import org.n52.shetland.ogc.om.features.FeatureCollection; +import org.n52.shetland.ogc.om.features.samplingFeatures.AbstractSamplingFeature; +import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeature; +import org.n52.shetland.ogc.sos.Sos2Constants; +import org.n52.shetland.util.CRSHelper; +import org.n52.shetland.util.CollectionHelper; +import org.n52.shetland.util.DateTimeHelper; +import org.n52.shetland.util.DateTimeParseException; +import org.n52.shetland.util.JTSHelper; +import org.n52.shetland.util.ReferencedEnvelope; +import org.n52.svalbard.decode.exception.DecodingException; +import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; +import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; +import org.n52.svalbard.util.CodingHelper; +import org.n52.svalbard.util.XmlHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.base.Joiner; + import net.opengis.gml.x32.AbstractCurveType; import net.opengis.gml.x32.AbstractGeometryType; import net.opengis.gml.x32.AbstractRingPropertyType; @@ -58,41 +93,6 @@ import net.opengis.gml.x32.TimePositionType; import net.opengis.gml.x32.VerticalDatumPropertyType; -import org.apache.xmlbeans.XmlException; -import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.n52.janmayen.NcName; -import org.n52.shetland.ogc.gml.AbstractFeature; -import org.n52.shetland.ogc.gml.AbstractGeometry; -import org.n52.shetland.ogc.gml.CodeWithAuthority; -import org.n52.shetland.ogc.gml.GmlConstants; -import org.n52.shetland.ogc.gml.GmlMeasureType; -import org.n52.shetland.ogc.gml.time.IndeterminateValue; -import org.n52.shetland.ogc.gml.time.TimeInstant; -import org.n52.shetland.ogc.gml.time.TimePeriod; -import org.n52.shetland.ogc.om.features.FeatureCollection; -import org.n52.shetland.ogc.om.features.samplingFeatures.AbstractSamplingFeature; -import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeature; -import org.n52.shetland.ogc.sos.Sos2Constants; -import org.n52.shetland.util.CRSHelper; -import org.n52.shetland.util.CollectionHelper; -import org.n52.shetland.util.DateTimeHelper; -import org.n52.shetland.util.DateTimeParseException; -import org.n52.shetland.util.JTSHelper; -import org.n52.shetland.util.ReferencedEnvelope; -import org.n52.svalbard.decode.exception.DecodingException; -import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; -import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; -import org.n52.svalbard.util.CodingHelper; -import org.n52.svalbard.util.XmlHelper; - -import com.google.common.base.Joiner; -import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.geom.GeometryFactory; -import org.locationtech.jts.geom.Polygon; -import org.locationtech.jts.io.ParseException; - /** * @since 1.0.0 * diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/InsertSensorResponseDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/InsertSensorResponseDecoder.java index aaee9a0c9..d24fe9e9b 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/InsertSensorResponseDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/InsertSensorResponseDecoder.java @@ -18,13 +18,7 @@ import java.util.Collections; import java.util.Set; -import net.opengis.swes.x20.InsertSensorResponseDocument; -import net.opengis.swes.x20.InsertSensorResponseType; - import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.ogc.sos.response.InsertSensorResponse; @@ -33,9 +27,14 @@ import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; +import net.opengis.swes.x20.InsertSensorResponseDocument; +import net.opengis.swes.x20.InsertSensorResponseType; + /** * @author <a href="mailto:e.h.juerrens@52north.org">Jürrens, Eike Hinderk</a> */ diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GcoDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GcoDecoder.java index 8adb144b3..7da81bc67 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GcoDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GcoDecoder.java @@ -20,13 +20,11 @@ import org.apache.xmlbeans.XmlObject; import org.isotc211.x2005.gco.CodeListValueType; - import org.n52.shetland.iso.GcoConstants; import org.n52.shetland.ogc.sensorML.Role; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GmdDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GmdDecoder.java index 5700c51b2..3056cba7a 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GmdDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/Iso19139GmdDecoder.java @@ -43,7 +43,6 @@ import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OmDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OmDecoderv20.java index 1742a2fa4..cc9aa63e2 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OmDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OmDecoderv20.java @@ -19,20 +19,13 @@ import java.util.Map; import java.util.Set; -import net.opengis.om.x20.NamedValuePropertyType; -import net.opengis.om.x20.OMObservationDocument; -import net.opengis.om.x20.OMObservationType; -import net.opengis.om.x20.TimeObjectPropertyType; - import org.apache.xmlbeans.XmlBoolean; import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlInteger; import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlString; import org.apache.xmlbeans.impl.values.XmlAnyTypeImpl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.gml.AbstractGeometry; @@ -69,11 +62,17 @@ import org.n52.svalbard.ConformanceClasses; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import org.locationtech.jts.geom.Geometry; + +import net.opengis.om.x20.NamedValuePropertyType; +import net.opengis.om.x20.OMObservationDocument; +import net.opengis.om.x20.OMObservationType; +import net.opengis.om.x20.TimeObjectPropertyType; /** * @since 1.0.0 diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OwsExceptionReportDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OwsExceptionReportDecoder.java index ca8609ca9..aba0bb2b5 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OwsExceptionReportDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/OwsExceptionReportDecoder.java @@ -22,10 +22,6 @@ import java.util.Objects; import java.util.Set; -import net.opengis.ows.x11.ExceptionReportDocument; -import net.opengis.ows.x11.ExceptionReportDocument.ExceptionReport; -import net.opengis.ows.x11.ExceptionType; - import org.n52.janmayen.stream.Streams; import org.n52.shetland.ogc.ows.OWSConstants; import org.n52.shetland.ogc.ows.exception.CodedException; @@ -34,6 +30,10 @@ import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; import org.n52.svalbard.decode.exception.DecodingException; +import net.opengis.ows.x11.ExceptionReportDocument; +import net.opengis.ows.x11.ExceptionReportDocument.ExceptionReport; +import net.opengis.ows.x11.ExceptionType; + /** * Decoder for OWS v1.1.0 Exception Reports. * diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/RelatedOfferingTypeDecoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/RelatedOfferingTypeDecoder.java index 89049bcb4..e0fcea58d 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/RelatedOfferingTypeDecoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/RelatedOfferingTypeDecoder.java @@ -18,21 +18,20 @@ import java.util.Collections; import java.util.Set; -import net.opengis.sosro.x10.RelatedOfferingsPropertyType; -import net.opengis.sosro.x10.RelatedOfferingsType.RelatedOffering; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.sos.ro.OfferingContext; import org.n52.shetland.ogc.sos.ro.RelatedOfferingConstants; import org.n52.shetland.ogc.sos.ro.RelatedOfferings; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; +import net.opengis.sosro.x10.RelatedOfferingsPropertyType; +import net.opengis.sosro.x10.RelatedOfferingsType.RelatedOffering; + /** * @author Jan Schulte */ diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SamplingDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SamplingDecoderv20.java index 62f81684c..0e22eb5a5 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SamplingDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SamplingDecoderv20.java @@ -20,17 +20,15 @@ import java.util.List; import java.util.Set; -import net.opengis.gml.x32.FeaturePropertyType; -import net.opengis.gml.x32.ReferenceType; -import net.opengis.samplingSpatial.x20.SFSpatialSamplingFeatureDocument; -import net.opengis.samplingSpatial.x20.SFSpatialSamplingFeatureType; -import net.opengis.samplingSpatial.x20.ShapeType; - import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.MultiLineString; +import org.locationtech.jts.geom.MultiPoint; +import org.locationtech.jts.geom.MultiPolygon; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.geom.Polygon; import org.n52.shetland.ogc.OGCConstants; import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.gml.AbstractFeature; @@ -48,18 +46,19 @@ import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; import org.n52.svalbard.util.XmlHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.geom.LineString; -import org.locationtech.jts.geom.MultiLineString; -import org.locationtech.jts.geom.MultiPoint; -import org.locationtech.jts.geom.MultiPolygon; -import org.locationtech.jts.geom.Point; -import org.locationtech.jts.geom.Polygon; + +import net.opengis.gml.x32.FeaturePropertyType; +import net.opengis.gml.x32.ReferenceType; +import net.opengis.samplingSpatial.x20.SFSpatialSamplingFeatureDocument; +import net.opengis.samplingSpatial.x20.SFSpatialSamplingFeatureType; +import net.opengis.samplingSpatial.x20.ShapeType; /** * @since 1.0.0 diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv100.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv100.java index 2526b01bd..4cbfd6a5a 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv100.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv100.java @@ -21,7 +21,6 @@ import org.n52.shetland.ogc.sos.Sos1Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv20.java index a226cd42e..ea76555a2 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosStringDecoderv20.java @@ -22,7 +22,6 @@ import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.util.CollectionHelper; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SpecimenDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SpecimenDecoderv20.java index 878667a63..45ce9e690 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SpecimenDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SpecimenDecoderv20.java @@ -22,6 +22,7 @@ import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; +import org.locationtech.jts.geom.Geometry; import org.n52.shetland.ogc.OGCConstants; import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.gml.AbstractFeature; @@ -45,7 +46,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.locationtech.jts.geom.Geometry; import net.opengis.gml.x32.FeaturePropertyType; import net.opengis.samplingSpecimen.x20.SFSpecimenDocument; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesExtensionDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesExtensionDecoderv20.java index 076116cfa..111cf3490 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesExtensionDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesExtensionDecoderv20.java @@ -30,7 +30,6 @@ import org.n52.svalbard.decode.exception.UnsupportedDecoderInputException; import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Node; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesStringDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesStringDecoderv20.java index 6087c66df..c8d34e0b6 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesStringDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SwesStringDecoderv20.java @@ -21,7 +21,6 @@ import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/TsmlObservationProcessDecoderv10.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/TsmlObservationProcessDecoderv10.java index 729db8440..05e3ea87d 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/TsmlObservationProcessDecoderv10.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/TsmlObservationProcessDecoderv10.java @@ -19,13 +19,6 @@ import java.util.Map; import java.util.Set; -import net.opengis.tsml.x10.ObservationProcessDocument; -import net.opengis.tsml.x10.ObservationProcessPropertyType; -import net.opengis.tsml.x10.ObservationProcessType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.om.series.tsml.ObservationProcess; @@ -36,12 +29,19 @@ import org.n52.shetland.util.CollectionHelper; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.google.common.base.Joiner; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import net.opengis.tsml.x10.ObservationProcessDocument; +import net.opengis.tsml.x10.ObservationProcessPropertyType; +import net.opengis.tsml.x10.ObservationProcessType; + public class TsmlObservationProcessDecoderv10 extends AbstractOmDecoderv20 diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/WmlObservationProcessDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/WmlObservationProcessDecoderv20.java index c02a7eb99..a54587418 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/WmlObservationProcessDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/WmlObservationProcessDecoderv20.java @@ -19,13 +19,6 @@ import java.util.Map; import java.util.Set; -import net.opengis.waterml.x20.ObservationProcessDocument; -import net.opengis.waterml.x20.ObservationProcessPropertyType; -import net.opengis.waterml.x20.ObservationProcessType; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.shetland.ogc.SupportedType; import org.n52.shetland.ogc.gml.ReferenceType; import org.n52.shetland.ogc.om.series.wml.ObservationProcess; @@ -36,11 +29,18 @@ import org.n52.shetland.util.CollectionHelper; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.util.CodingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import net.opengis.waterml.x20.ObservationProcessDocument; +import net.opengis.waterml.x20.ObservationProcessPropertyType; +import net.opengis.waterml.x20.ObservationProcessType; + public class WmlObservationProcessDecoderv20 extends AbstractWmlDecoderv20 implements ProcedureDecoder<Object, Object> { diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/XlinkDecoderv1999.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/XlinkDecoderv1999.java index a8279b9f5..5f130e852 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/XlinkDecoderv1999.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/XlinkDecoderv1999.java @@ -19,13 +19,11 @@ import java.util.Set; import org.apache.xmlbeans.XmlObject; - import org.n52.shetland.w3c.W3CConstants; import org.n52.shetland.w3c.xlink.W3CHrefAttribute; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.decode.exception.UnsupportedDecoderXmlInputException; import org.n52.svalbard.util.CodingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3.x1999.xlink.HrefAttribute; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/exception/UnsupportedDecoderXmlInputException.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/exception/UnsupportedDecoderXmlInputException.java index 399cfdd4a..410f8af63 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/exception/UnsupportedDecoderXmlInputException.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/exception/UnsupportedDecoderXmlInputException.java @@ -16,9 +16,8 @@ package org.n52.svalbard.decode.exception; import org.apache.xmlbeans.XmlObject; -import org.w3c.dom.Node; - import org.n52.svalbard.decode.Decoder; +import org.w3c.dom.Node; public class UnsupportedDecoderXmlInputException extends UnsupportedDecoderInputException { private static final long serialVersionUID = -7244575661954080973L; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java index d6c48592d..17ee96aa4 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractCVDiscretePointCoverageTypeEncoder.java @@ -44,9 +44,9 @@ import org.n52.shetland.ogc.om.values.TLVTValue; import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; +import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.TrajectoryValue; -import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; import org.n52.shetland.ogc.om.values.XmlValue; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java index 58e70f2a5..47327cd90 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractOmEncoderv20.java @@ -62,9 +62,9 @@ import org.n52.shetland.ogc.om.values.TLVTValue; import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; +import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.TrajectoryValue; -import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.Value; import org.n52.shetland.ogc.om.values.XmlValue; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSoapEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSoapEncoder.java index f0085d390..9df202873 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSoapEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSoapEncoder.java @@ -15,7 +15,9 @@ */ package org.n52.svalbard.encode; -import com.google.common.collect.ImmutableSet; +import java.util.Collections; +import java.util.Set; + import org.apache.xmlbeans.XmlObject; import org.n52.janmayen.http.MediaType; import org.n52.janmayen.http.MediaTypes; @@ -35,8 +37,7 @@ import org.n52.svalbard.encode.exception.EncodingException; import org.n52.svalbard.encode.exception.NoEncoderForKeyException; -import java.util.Collections; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * @author <a href="mailto:c.autermann@52north.org">Christian Autermann</a> diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSwesRequestEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSwesRequestEncoder.java index 1e92ea8c2..4a3672bcf 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSwesRequestEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractSwesRequestEncoder.java @@ -21,7 +21,6 @@ import org.n52.shetland.ogc.ows.service.OwsServiceRequest; import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; -import org.n52.shetland.ogc.sos.request.InsertSensorRequest; import org.n52.shetland.ogc.swes.SwesConstants; import org.n52.shetland.util.CollectionHelper; import org.n52.shetland.w3c.SchemaLocation; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractXmlResponseEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractXmlResponseEncoder.java index df687c7f8..82e7cd51a 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractXmlResponseEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/AbstractXmlResponseEncoder.java @@ -15,6 +15,18 @@ */ package org.n52.svalbard.encode; +import static java.util.stream.Collectors.toMap; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Stream; + +import javax.inject.Inject; + import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; import org.n52.faroe.annotation.Configurable; @@ -28,17 +40,6 @@ import org.n52.svalbard.util.N52XmlHelper; import org.n52.svalbard.util.XmlHelper; -import javax.inject.Inject; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Stream; - -import static java.util.stream.Collectors.toMap; - /** * @param <T> the response type * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java index 30c11ca91..28d7f5d67 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/OmEncoderv20.java @@ -62,9 +62,9 @@ import org.n52.shetland.ogc.om.values.TLVTValue; import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.om.values.TextValue; +import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.TimeValue; import org.n52.shetland.ogc.om.values.TrajectoryValue; -import org.n52.shetland.ogc.om.values.TimeRangeValue; import org.n52.shetland.ogc.om.values.UnknownValue; import org.n52.shetland.ogc.om.values.XmlValue; import org.n52.shetland.ogc.om.values.visitor.ValueVisitor; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/exception/UnsupportedEncoderXmlInputException.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/exception/UnsupportedEncoderXmlInputException.java index 8fe30b435..bbe65741e 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/exception/UnsupportedEncoderXmlInputException.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/exception/UnsupportedEncoderXmlInputException.java @@ -16,9 +16,7 @@ package org.n52.svalbard.encode.exception; import org.apache.xmlbeans.XmlObject; - import org.n52.svalbard.encode.Encoder; - import org.w3c.dom.Node; public class UnsupportedEncoderXmlInputException extends UnsupportedEncoderInputException { From d04777ddf13888cb2a0cc4c8d56c2ebd73389da9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Apr 2022 08:20:54 +0000 Subject: [PATCH 277/456] Bump kotlin-stdlib from 1.6.20 to 1.6.21 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.6.20 to 1.6.21. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 294565391..8710d8e2a 100644 --- a/pom.xml +++ b/pom.xml @@ -1065,7 +1065,7 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib</artifactId> - <version>1.6.20</version> + <version>1.6.21</version> <scope>runtime</scope> </dependency> <dependency> From 74888ad072c091d0d2362fb1e5943b9fe4725ce6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Apr 2022 08:21:16 +0000 Subject: [PATCH 278/456] Bump maven-javadoc-plugin from 3.3.2 to 3.4.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.2 to 3.4.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.2...maven-javadoc-plugin-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 294565391..d2aaa8cbd 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.1</version.elastic> <version.antlr4>4.9.3</version.antlr4> - <version.maven-javadoc-plugin>3.3.2</version.maven-javadoc-plugin> + <version.maven-javadoc-plugin>3.4.0</version.maven-javadoc-plugin> </properties> <dependencyManagement> From b5bab32de8610298eded2d05be04d3e4a49ac455 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Apr 2022 08:21:16 +0000 Subject: [PATCH 279/456] Bump version.mockito from 4.4.0 to 4.5.0 Bumps `version.mockito` from 4.4.0 to 4.5.0. Updates `mockito-core` from 4.4.0 to 4.5.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.4.0...v4.5.0) Updates `mockito-junit-jupiter` from 4.4.0 to 4.5.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.4.0...v4.5.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 294565391..5f2469076 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <version.jena>3.17.0</version.jena> <version.jackson>2.13.2.20220328</version.jackson> <version.junit>5.8.2</version.junit> - <version.mockito>4.4.0</version.mockito> + <version.mockito>4.5.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.1</version.elastic> From 4cff7e106248e48badd37f06587a9f2a5027eef1 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 21 Apr 2022 10:55:02 +0200 Subject: [PATCH 280/456] Create codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 70 +++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 000000000..d6dcc4ebf --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,70 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ master ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ master ] + schedule: + - cron: '40 6 * * 6' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'java' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Learn more about CodeQL language support at https://git.io/codeql-language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹ️ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 From 494f85cd9d84075adbb6e0fe98ee19befad7eb07 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 21 Apr 2022 11:28:41 +0200 Subject: [PATCH 281/456] Bump parent from 23 to 24 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e38e8acd..aa9980614 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52</groupId> <artifactId>parent</artifactId> - <version>23</version> + <version>24</version> </parent> <groupId>org.n52.arctic-sea</groupId> From 60a486dbe6e733491574504ca3c6db3510ff49e4 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 21 Apr 2022 13:36:21 +0200 Subject: [PATCH 282/456] fix build --- svalbard/json/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index d64276d40..193322901 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -149,7 +149,7 @@ <dependency> <groupId>com.github.fge</groupId> <artifactId>json-schema-core</artifactId> - <scope>test</scope> + <scope>provided</scope> </dependency> </dependencies> </project> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 93acb4237..8ee7456f7 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -34,6 +34,7 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>janmayen</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -66,6 +67,7 @@ <dependency> <groupId>org.apache.jena</groupId> <artifactId>jena-core</artifactId> + <scope>provided</scope> </dependency> <!-- Testing dependencies --> <dependency> @@ -108,10 +110,12 @@ <dependency> <groupId>org.n52.sensorweb</groupId> <artifactId>52n-xml-swes-v20</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.n52.sensorweb</groupId> <artifactId>52n-xml-om-v20</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.xmlbeans</groupId> @@ -145,6 +149,7 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> From 527aa6940ea8e386d397c660e850f18781070ca4 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 21 Apr 2022 15:01:25 +0200 Subject: [PATCH 283/456] [maven-release-plugin] prepare release v9.5.0 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 1750b9fd7..fc927de8f 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 6cd35fd9c..586283302 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index bcc49b7c5..673636630 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 9895f3fa2..bd19df0b2 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index b974fd9e1..2bee75e2a 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index cbfc95aa1..4b8899178 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index f70f7935e..dbdbd92f9 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index cd20a84ab..84b2934ef 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 2dda3b92c..03056376b 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index ce618e3ce..0a288137e 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 4c454dd68..ff5342b67 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 304a41bf3..4a91084d0 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 273c97aeb..d8d6b01b5 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index aa9980614..4a799e7f4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>HEAD</tag> + <tag>v9.5.0</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index d2f1a09ea..eb3d417ad 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index ad81582a3..4f2f27d4d 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index d6e44a5b2..2247891e2 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 005e8ff95..be07bcf9a 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 45e30965a..3233159e9 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 29fcf793e..4673dc3c0 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 193322901..d7d2f37fb 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index cb4c6a8c6..ccd21f830 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 085f7821b..772bcc096 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index cd92c3775..95e874545 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 8ee7456f7..14991e63d 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0-SNAPSHOT</version> + <version>9.5.0</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From b5370d3ff275f5e724cd588551f5ea915f295228 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 21 Apr 2022 15:01:29 +0200 Subject: [PATCH 284/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index fc927de8f..d6e695e6d 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 586283302..5153c435a 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 673636630..c152e54ce 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index bd19df0b2..654379ca8 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 2bee75e2a..99bdf7ec7 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 4b8899178..f8c7bda3d 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index dbdbd92f9..173a53c0f 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 84b2934ef..86c1bdfb6 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 03056376b..03d1c4f8c 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 0a288137e..354433466 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index ff5342b67..4ff04307c 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 4a91084d0..42c806f11 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index d8d6b01b5..7c3c0be85 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 4a799e7f4..5a0ea4236 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>v9.5.0</tag> + <tag>HEAD</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index eb3d417ad..50a1b08b0 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 4f2f27d4d..846ff1334 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 2247891e2..26904cd87 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index be07bcf9a..2f645876e 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 3233159e9..ac32576a7 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 4673dc3c0..ad184fb2b 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index d7d2f37fb..92e741435 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index ccd21f830..9e4a9640c 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 772bcc096..e3048fdf8 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 95e874545..7c7d3739b 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 14991e63d..a089402e6 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.0</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 7fc420c4ac36d31ecc5ff296342933340a5b21f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 04:00:34 +0000 Subject: [PATCH 285/456] Bump version.mockito from 4.5.0 to 4.5.1 Bumps `version.mockito` from 4.5.0 to 4.5.1. Updates `mockito-core` from 4.5.0 to 4.5.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.5.0...v4.5.1) Updates `mockito-junit-jupiter` from 4.5.0 to 4.5.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.5.0...v4.5.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a0ea4236..5bfbd54f4 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <version.jena>3.17.0</version.jena> <version.jackson>2.13.2.20220328</version.jackson> <version.junit>5.8.2</version.junit> - <version.mockito>4.5.0</version.mockito> + <version.mockito>4.5.1</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.1</version.elastic> From 1fa6a8087fa4595e840701819ff1383fece4c089 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 22 Apr 2022 09:02:07 +0200 Subject: [PATCH 286/456] fix NPE in OmObservationConstellation and add test --- .../ogc/om/OmObservationConstellation.java | 4 +++- .../ogc/om/OmObservationConstellationTest.java | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java index 9eac256e5..7aba893cf 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/OmObservationConstellation.java @@ -134,7 +134,9 @@ public OmObservationConstellation(AbstractFeature procedure, AbstractPhenomenon super(""); this.procedure = Nillable.of(procedure); this.observableProperty = observableProperty; - this.offerings = offerings; + if (offerings != null) { + this.offerings.addAll(offerings); + } this.featureOfInterest = Nillable.of(featureOfInterest); this.observationType = observationType; } diff --git a/shetland/core/src/test/java/org/n52/shetland/ogc/om/OmObservationConstellationTest.java b/shetland/core/src/test/java/org/n52/shetland/ogc/om/OmObservationConstellationTest.java index b120276f3..92935ec87 100644 --- a/shetland/core/src/test/java/org/n52/shetland/ogc/om/OmObservationConstellationTest.java +++ b/shetland/core/src/test/java/org/n52/shetland/ogc/om/OmObservationConstellationTest.java @@ -18,6 +18,9 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.util.List; import org.junit.jupiter.api.Test; import org.n52.shetland.ogc.gml.CodeWithAuthority; @@ -85,4 +88,17 @@ public void testChecheckObservationTypeForMerging() { } + @Test + public void testNotNullOffering() { + OmObservationConstellation ooc = new OmObservationConstellation(PROCEDURE, + new OmObservableProperty(OBSERVABLE_PROPERTY_1), new OmObservableProperty(OBSERVABLE_PROPERTY_1)); + assertNotNull(ooc.getOfferings()); + assertThat(ooc.getOfferings().size(), is(0)); + List<String> offerings = null; + ooc = new OmObservationConstellation(PROCEDURE, new OmObservableProperty(OBSERVABLE_PROPERTY_1), + new OmObservableProperty(OBSERVABLE_PROPERTY_1), offerings); + assertNotNull(ooc.getOfferings()); + assertThat(ooc.getOfferings().size(), is(0)); + } + } From b38b565d6fb17db03ba5a03d7c2d1cfbac4cf3b5 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 22 Apr 2022 09:16:47 +0200 Subject: [PATCH 287/456] [maven-release-plugin] prepare release v9.5.1 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index d6e695e6d..82e7a9632 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 5153c435a..6a02a339f 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index c152e54ce..65a61a1de 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 654379ca8..048c825d2 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 99bdf7ec7..4dd1f6f6b 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index f8c7bda3d..cc4b043d4 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 173a53c0f..2e0b4ef28 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 86c1bdfb6..e2af2536b 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 03d1c4f8c..1a418dc86 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 354433466..8311ec7c0 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 4ff04307c..cf6a4b320 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 42c806f11..ff2b7842b 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 7c3c0be85..0d85d4383 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 5bfbd54f4..ebc8fa156 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>HEAD</tag> + <tag>v9.5.1</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 50a1b08b0..83f9b50b9 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 846ff1334..bec9a9eda 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 26904cd87..6e83a3629 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 2f645876e..6886875bf 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index ac32576a7..c6781fd3d 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index ad184fb2b..025535319 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 92e741435..96266b5c3 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 9e4a9640c..74340f269 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index e3048fdf8..37106cd9f 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 7c7d3739b..0267fe882 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index a089402e6..2d3eb2fff 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.1</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 99d08f6a6032f91d0f37a6d3b138d3b939e2b1e9 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 22 Apr 2022 09:16:50 +0200 Subject: [PATCH 288/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 82e7a9632..d6e695e6d 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 6a02a339f..5153c435a 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 65a61a1de..c152e54ce 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 048c825d2..654379ca8 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 4dd1f6f6b..99bdf7ec7 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index cc4b043d4..f8c7bda3d 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 2e0b4ef28..173a53c0f 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index e2af2536b..86c1bdfb6 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 1a418dc86..03d1c4f8c 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 8311ec7c0..354433466 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index cf6a4b320..4ff04307c 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index ff2b7842b..42c806f11 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 0d85d4383..7c3c0be85 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index ebc8fa156..5bfbd54f4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>v9.5.1</tag> + <tag>HEAD</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 83f9b50b9..50a1b08b0 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index bec9a9eda..846ff1334 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 6e83a3629..26904cd87 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 6886875bf..2f645876e 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index c6781fd3d..ac32576a7 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 025535319..ad184fb2b 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 96266b5c3..92e741435 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 74340f269..9e4a9640c 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 37106cd9f..e3048fdf8 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 0267fe882..7c7d3739b 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 2d3eb2fff..a089402e6 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.1</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 0e98d94acaf9731cccbd9b5b998c1a808e8e6472 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 29 Apr 2022 10:46:13 +0200 Subject: [PATCH 289/456] Fix map issue of phenomenon in SosProcedureDescription --- .../java/org/n52/shetland/ogc/sos/SosProcedureDescription.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java index 1c11ec37f..3bcabbcaf 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java @@ -215,7 +215,7 @@ public boolean isSetFeatures() { } public SosProcedureDescription<T> addPhenomenon(AbstractPhenomenon phenomenon) { - getPhenomenon().put(phenomenon.getIdentifier(), phenomenon); + phenomenonMap.put(phenomenon.getIdentifier(), phenomenon); return this; } From 6662db8b94b6b9e4cf267c0455a00d715536223e Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 29 Apr 2022 11:04:05 +0200 Subject: [PATCH 290/456] [maven-release-plugin] prepare release v9.5.2 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index d6e695e6d..3fe389640 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 5153c435a..819de0762 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index c152e54ce..94c75e7b6 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 654379ca8..33453eb4c 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 99bdf7ec7..1b6ebce25 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index f8c7bda3d..5ab178824 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 173a53c0f..169b7fa4f 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 86c1bdfb6..6aabd9ba8 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 03d1c4f8c..074750f0f 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 354433466..52f89870c 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 4ff04307c..7aede3b9d 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 42c806f11..e8e6e422a 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 7c3c0be85..e3123e202 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 5bfbd54f4..d09b47f57 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>HEAD</tag> + <tag>v9.5.2</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 50a1b08b0..bde72549e 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 846ff1334..56daebd7c 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 26904cd87..5ee8ec50d 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 2f645876e..cd4fecb6c 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index ac32576a7..5057327ac 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index ad184fb2b..b91711a6b 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 92e741435..07e474d80 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 9e4a9640c..ea9dfce6f 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index e3048fdf8..b42703bb3 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 7c7d3739b..9029b1277 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index a089402e6..1e77c91fc 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.2</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From b3a0bb9ede9dcfb05ed85f6fffd91fa7c6082fbc Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 29 Apr 2022 11:04:09 +0200 Subject: [PATCH 291/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 3fe389640..d6e695e6d 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 819de0762..5153c435a 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 94c75e7b6..c152e54ce 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 33453eb4c..654379ca8 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 1b6ebce25..99bdf7ec7 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 5ab178824..f8c7bda3d 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 169b7fa4f..173a53c0f 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 6aabd9ba8..86c1bdfb6 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 074750f0f..03d1c4f8c 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 52f89870c..354433466 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 7aede3b9d..4ff04307c 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index e8e6e422a..42c806f11 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index e3123e202..7c3c0be85 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index d09b47f57..5bfbd54f4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>v9.5.2</tag> + <tag>HEAD</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index bde72549e..50a1b08b0 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 56daebd7c..846ff1334 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 5ee8ec50d..26904cd87 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index cd4fecb6c..2f645876e 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 5057327ac..ac32576a7 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index b91711a6b..ad184fb2b 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 07e474d80..92e741435 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index ea9dfce6f..9e4a9640c 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index b42703bb3..e3048fdf8 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 9029b1277..7c7d3739b 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 1e77c91fc..a089402e6 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.2</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 9985d3369e098eca670140a68c0275f86530646d Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 29 Apr 2022 12:50:51 +0200 Subject: [PATCH 292/456] Further fix for adding phenomeon to map in SosProcedureDescription --- .../java/org/n52/shetland/ogc/sos/SosProcedureDescription.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java index 3bcabbcaf..4ba3698d7 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java @@ -220,7 +220,7 @@ public SosProcedureDescription<T> addPhenomenon(AbstractPhenomenon phenomenon) { } public SosProcedureDescription<T> addPhenomenon(Map<String, AbstractPhenomenon> phenomenons) { - phenomenons.forEach(phenomenons::put); + phenomenons.forEach(phenomenonMap::put); return this; } From 3679fed4d4dd2a4b833f5d669b74c135449e5541 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 29 Apr 2022 13:12:44 +0200 Subject: [PATCH 293/456] [maven-release-plugin] prepare release v9.5.3 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index d6e695e6d..04066c1c8 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 5153c435a..bfa56bdb3 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index c152e54ce..c496757de 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 654379ca8..1790334b8 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 99bdf7ec7..557f3d323 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index f8c7bda3d..86c8d703c 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 173a53c0f..df74381a4 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 86c1bdfb6..7062e9818 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 03d1c4f8c..9c9fdffed 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 354433466..c11e0e5a6 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 4ff04307c..dfe5e9480 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 42c806f11..dcf60c332 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 7c3c0be85..2d9d00c05 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 5bfbd54f4..d27f3d470 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>HEAD</tag> + <tag>v9.5.3</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 50a1b08b0..42151cb96 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 846ff1334..005a221ea 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 26904cd87..dc2fa86c3 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 2f645876e..afe8b81c9 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index ac32576a7..9bcb05cbf 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index ad184fb2b..8a07ad902 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 92e741435..3d14f88db 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 9e4a9640c..17d62fd69 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index e3048fdf8..4a053e8ef 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 7c7d3739b..ddd70317f 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index a089402e6..2fc959247 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.5.3</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From cc4c42162014e3710356d37d6bd65af5936abbab Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 29 Apr 2022 13:12:48 +0200 Subject: [PATCH 294/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 04066c1c8..d6e695e6d 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index bfa56bdb3..5153c435a 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index c496757de..c152e54ce 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 1790334b8..654379ca8 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 557f3d323..99bdf7ec7 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 86c8d703c..f8c7bda3d 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index df74381a4..173a53c0f 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 7062e9818..86c1bdfb6 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 9c9fdffed..03d1c4f8c 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index c11e0e5a6..354433466 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index dfe5e9480..4ff04307c 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index dcf60c332..42c806f11 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 2d9d00c05..7c3c0be85 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index d27f3d470..5bfbd54f4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>v9.5.3</tag> + <tag>HEAD</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 42151cb96..50a1b08b0 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 005a221ea..846ff1334 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index dc2fa86c3..26904cd87 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index afe8b81c9..2f645876e 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 9bcb05cbf..ac32576a7 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 8a07ad902..ad184fb2b 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 3d14f88db..92e741435 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 17d62fd69..9e4a9640c 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 4a053e8ef..e3048fdf8 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index ddd70317f..7c7d3739b 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 2fc959247..a089402e6 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.5.3</version> + <version>9.6.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 64d08942173bfc62fa4b6eed932c5f2bcabe2b83 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 29 Apr 2022 14:09:39 +0200 Subject: [PATCH 295/456] Update README.md --- README.md | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index f060d1fbb..5847102d1 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ ## Description -### 52°North's backbone for OGC services, clients and middleware +### 52°North's backbone for OGC services, clients and middleware **A framework for developing OGC services, clients and middleware sharing concepts for encoding and decoding of different formats and encodings, workflows and configuration.** -Arctic Sea is a stack of projects that eases the development of OGC related services such as the 52°North implementation of the OGC [SOS](https://github.com/52North/SOS) and [WPS](https://github.com/52North/javaPS), as well as clients and middleware. It compromises the following modules. +Arctic Sea is a stack of projects that eases the development of OGC related services such as the 52°North implementation of the OGC [SOS](https://github.com/52North/SOS) and [WPS](https://github.com/52North/javaPS), as well as clients and middleware. It compromises the following modules. ![Overview](https://github.com/52North/arctic-sea/raw/master/etc/overview.jpg) @@ -16,7 +16,7 @@ Iceland is a service framework that enables the development of OGC RPC based ser #### Svalbard [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/svalbard.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea%20and%20a:svalbard*%20and%20p:jar) -Svalbard consists of various decoders and encoders for OGC models (e.g. [SensorML](http://www.opengeospatial.org/standards/sensorml), [O&M](http://www.opengeospatial.org/standards/om) and [SWE Common](http://www.opengeospatial.org/standards/swecommon), service interfaces (like [SOS](http://www.opengeospatial.org/standards/sos) and [WPS](http://www.opengeospatial.org/standards/wps)) and a framework for developing these. This enables the creation of decoupled and reusable encoders and decoders for various encodings (e.g. XML, JSON or NetCDF). The object models used are found in 52°North Shetland and are shared across 52°North components. +Svalbard consists of various decoders and encoders for OGC models (e.g. [SensorML](http://www.opengeospatial.org/standards/sensorml), [O&M](http://www.opengeospatial.org/standards/om) and [SWE Common](http://www.opengeospatial.org/standards/swecommon), service interfaces (like [SOS](http://www.opengeospatial.org/standards/sos) and [WPS](http://www.opengeospatial.org/standards/wps)) and a framework for developing these. This enables the creation of decoupled and reusable encoders and decoders for various encodings (e.g. XML, JSON or NetCDF). The object models used are found in 52°North Shetland and are shared across 52°North components. #### Faroe [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/faroe.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea%20and%20a:faroe*%20and%20p:jar) @@ -28,9 +28,9 @@ Shetland consists of classes for OGC models like [SensorML](http://www.opengeosp #### Jan Mayen [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/janmayen.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea%20and%20a:janmayen*%20and%20p:jar) -#### Bjrnya (Bjornoya) [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/bjornoya.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea%20and%20a:bjornoya*%20and%20p:jar) +#### Bjørnøya (Bjornoya) [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/bjornoya.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea%20and%20a:bjornoya*%20and%20p:jar) -Bjrnya contains various classes for scheduling [![Quartz](http://www.quartz-scheduler.org/)] shared across Arctic Sea. +Bjørnøya contains various classes for scheduling [![Quartz](http://www.quartz-scheduler.org/)] shared across Arctic Sea. ### Key Technologies @@ -64,7 +64,7 @@ All projects are available on Maven Central. ```xml <properties> - <version.arctic-sea>8.1.0</version.arctic-sea> + <version.arctic-sea>8.5.3</version.arctic-sea> </properties> <dependencies> <dependency> @@ -170,7 +170,7 @@ All projects are available on Maven Central. </dependencies> ``` -For convenience the [52°North Maven parent](https://github.com/52North/maven-parents) can be used: +For convenience the [52°North Maven parent](https://github.com/52North/maven-parents) can be used: ```xml <parent> @@ -212,7 +212,7 @@ You can get support in the [community mailing list and forums](https://52north.o ## Contribute -Are you interested in contributing to the 52°North Arctic Sea and you would like to pull your changes to the 52N repository to have them available to all? +Are you interested in contributing to the 52°North Arctic Sea and you would like to pull your changes to the 52N repository to have them available to all? In that case we need your official permission and for this purpose we have a so-called contributors license agreement (CLA) in place. With this agreement you grant us the rights to use and publish your code under an open source license. @@ -220,19 +220,19 @@ A link to the contributors license agreement and further explanations are availa ## References -The development of the 52°North Arctic Sea implementation was supported by several organizations and projects. Among other we would like to thank the following organizations and project +The development of the 52°North Arctic Sea implementation was supported by several organizations and projects. Among other we would like to thank the following organizations and project | Project/Logo | Description | | :-------------: | :------------- | -| [![Cos4Cloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](https://cos4cloud-eosc.eu/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [Cos4Cloud](https://cos4cloud-eosc.eu/) (co-funded by the European Commission under the grant agreement n°863463) | -| [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-geotechnologien-logo.png)](https://www.bmbf.de/)[![TaMIS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/TaMIS_Logo_small.png)](http://tamis.kn.e-technik.tu-dortmund.de/) | The development of this version 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [TaMIS](https://colabis.de/) (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0854) | -| [![JERICO-S3](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](https://www.jerico-ri.eu) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [JERICO-S3](https://www.jerico-ri.eu) (co-funded by the European Commission under the grant agreement n°871153) | -| [![NeXOS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](http://www.nexosproject.eu/) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [NeXOS](http://www.nexosproject.eu/) (co-funded by the European Commission under the grant agreement n°614102) | -| [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-geotechnologien-logo.png)](https://www.bmbf.de/)[![COLABIS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png)](https://colabis.de/) | The development of this version 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [COLABIS](https://colabis.de/) (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0852A) | -| [![SeaDataCloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/seadatacloud-logo.png)](https://www.seadatanet.org/About-us/SeaDataCloud/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [SeaDataCloud](https://www.seadatanet.org/About-us/SeaDataCloud/) (co-funded by the European Commission under the grant agreement n°730960) | -| [![ODIP II](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/odip-ii-logo.png)](http://www.odip.org/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [ODIP II](http://www.odip.org/) (co-funded by the European Commission under the grant agreement n°654310) | -| [![ConnectinGEO](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/connectingeo-logo.png)](http://www.connectingeo.net/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [ConnectinGEO](http://www.connectingeo.net/) (co-funded by the European Commission under the grant agreement n°641538) | -| [![GeoViQua](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/geoviqua-logo.png)](https://cordis.europa.eu/project/id/265178) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [GeoViQua](https://cordis.europa.eu/project/id/265178) (co-funded by the European Commission under the grant agreement n°265178) | -| [![BMVI](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmvi-logo.png)](https://www.bmvi.de/)[![mFund](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/mfund-logo.jpg)](https://www.bmvi.de/DE/Themen/Digitales/mFund/Ueberblick/ueberblick.html)[![WaCoDis](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/wacodis-logo.png)](http://wacodis.fbg-hsbo.de/) | The development of this version of 52°North Arctic Sea was supported by the [German Federal Ministry of of Transport and Digital Infrastructure](https://www.bmvi.de/) research project [WaCoDis](http://wacodis.fbg-hsbo.de/) (co-funded by the German Federal Ministry of Transport and Digital Infrastructure, programme mFund) | -| [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-logo.png)](https://www.bmbf.de/)[![fona](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/fona-logo.png)](https://www.fona.de/)[![MuDak-WRM](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/mudak-wrm-logo.png)](http://www.mudak-wrm.kit.edu/) | The development of this version of 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [MuDak-WRM](http://www.mudak-wrm.kit.edu/) (co-funded by the German Federal Ministry of Education and Research, programme [fona](https://www.fona.de/)) | -| [![BRIDGES](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bridges-logo.jpg)](http://www.bridges-h2020.eu/)| The development of this version of the 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [BRIDGES](http://www.bridges-h2020.eu/) (co-funded by the European Commission under the grant agreement n°635359) +| [![Cos4Cloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](https://cos4cloud-eosc.eu/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [Cos4Cloud](https://cos4cloud-eosc.eu/) (co-funded by the European Commission under the grant agreement n°863463) | +| [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-geotechnologien-logo.png)](https://www.bmbf.de/)[![TaMIS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/TaMIS_Logo_small.png)](http://tamis.kn.e-technik.tu-dortmund.de/) | The development of this version 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [TaMIS](https://colabis.de/) (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0854) | +| [![JERICO-S3](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](https://www.jerico-ri.eu) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [JERICO-S3](https://www.jerico-ri.eu) (co-funded by the European Commission under the grant agreement n°871153) | +| [![NeXOS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](http://www.nexosproject.eu/) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [NeXOS](http://www.nexosproject.eu/) (co-funded by the European Commission under the grant agreement n°614102) | +| [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-geotechnologien-logo.png)](https://www.bmbf.de/)[![COLABIS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png)](https://colabis.de/) | The development of this version 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [COLABIS](https://colabis.de/) (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0852A) | +| [![SeaDataCloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/seadatacloud-logo.png)](https://www.seadatanet.org/About-us/SeaDataCloud/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [SeaDataCloud](https://www.seadatanet.org/About-us/SeaDataCloud/) (co-funded by the European Commission under the grant agreement n°730960) | +| [![ODIP II](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/odip-ii-logo.png)](http://www.odip.org/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [ODIP II](http://www.odip.org/) (co-funded by the European Commission under the grant agreement n°654310) | +| [![ConnectinGEO](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/connectingeo-logo.png)](http://www.connectingeo.net/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [ConnectinGEO](http://www.connectingeo.net/) (co-funded by the European Commission under the grant agreement n°641538) | +| [![GeoViQua](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/geoviqua-logo.png)](https://cordis.europa.eu/project/id/265178) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [GeoViQua](https://cordis.europa.eu/project/id/265178) (co-funded by the European Commission under the grant agreement n°265178) | +| [![BMVI](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmvi-logo.png)](https://www.bmvi.de/)[![mFund](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/mfund-logo.jpg)](https://www.bmvi.de/DE/Themen/Digitales/mFund/Ueberblick/ueberblick.html)[![WaCoDis](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/wacodis-logo.png)](http://wacodis.fbg-hsbo.de/) | The development of this version of 52°North Arctic Sea was supported by the [German Federal Ministry of of Transport and Digital Infrastructure](https://www.bmvi.de/) research project [WaCoDis](http://wacodis.fbg-hsbo.de/) (co-funded by the German Federal Ministry of Transport and Digital Infrastructure, programme mFund) | +| [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-logo.png)](https://www.bmbf.de/)[![fona](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/fona-logo.png)](https://www.fona.de/)[![MuDak-WRM](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/mudak-wrm-logo.png)](http://www.mudak-wrm.kit.edu/) | The development of this version of 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [MuDak-WRM](http://www.mudak-wrm.kit.edu/) (co-funded by the German Federal Ministry of Education and Research, programme [fona](https://www.fona.de/)) | +| [![BRIDGES](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bridges-logo.jpg)](http://www.bridges-h2020.eu/)| The development of this version of the 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [BRIDGES](http://www.bridges-h2020.eu/) (co-funded by the European Commission under the grant agreement n°635359) From 1e2f091ff2ae49d56f3841f9f7ef8cd761eebbc1 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 29 Apr 2022 14:09:58 +0200 Subject: [PATCH 296/456] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5847102d1..022193f18 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ All projects are available on Maven Central. ```xml <properties> - <version.arctic-sea>8.5.3</version.arctic-sea> + <version.arctic-sea>9.5.3</version.arctic-sea> </properties> <dependencies> <dependency> From 907548dba7ec69a799b15bca689c213e00c002f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 May 2022 04:00:48 +0000 Subject: [PATCH 297/456] Bump spotbugs-annotations from 4.6.0 to 4.7.0 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.6.0 to 4.7.0. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.6.0...4.7.0) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bfbd54f4..0cb27b84b 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ <version.n52CommonXML>2.7.0</version.n52CommonXML> <version.olingo>4.9.0</version.olingo> <version.findbugs>3.0.2</version.findbugs> - <version.spotbugs>4.6.0</version.spotbugs> + <version.spotbugs>4.7.0</version.spotbugs> <version.javax-annotation-api>1.3.2</version.javax-annotation-api> <version.jena>3.17.0</version.jena> <version.jackson>2.13.2.20220328</version.jackson> From c091b0e14a94ff8ba624ce9aaaafe679ccf2aa87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 04:01:00 +0000 Subject: [PATCH 298/456] Bump version.spring from 5.3.19 to 5.3.20 Bumps `version.spring` from 5.3.19 to 5.3.20. Updates `spring-test` from 5.3.19 to 5.3.20 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.19...v5.3.20) Updates `spring-web` from 5.3.19 to 5.3.20 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.19...v5.3.20) Updates `spring-beans` from 5.3.19 to 5.3.20 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.19...v5.3.20) Updates `spring-core` from 5.3.19 to 5.3.20 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.19...v5.3.20) Updates `spring-context` from 5.3.19 to 5.3.20 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.19...v5.3.20) Updates `spring-context-support` from 5.3.19 to 5.3.20 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.19...v5.3.20) --- updated-dependencies: - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bfbd54f4..540d6dfd6 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> - <version.spring>5.3.19</version.spring> + <version.spring>5.3.20</version.spring> <version.slf4j>1.7.36</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> From 91f9b3c9941cb3f2f80f0905c766f241253fca67 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 13 May 2022 15:25:09 +0200 Subject: [PATCH 299/456] update java version for action to 8, 11, 17 --- .github/workflows/pull.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 4b1b05072..163262bde 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - java: [ 8, 11, 16 ] + java: [ 8, 11, 17 ] runs-on: ubuntu-latest name: Java ${{ matrix.java }} compile diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 6ac3143b2..3d326e468 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - java: [ 8, 11, 16 ] + java: [ 8, 11, 17 ] runs-on: ubuntu-latest name: Java ${{ matrix.java }} compile From 164be058066fb01c5fa777d01a300e306b3a7e2a Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 13 May 2022 15:28:17 +0200 Subject: [PATCH 300/456] add workflow_dispatch --- .github/workflows/push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 3d326e468..9cd86a596 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,6 +4,7 @@ on: push: branches: - master + workflow_dispatch: jobs: build: From 785890a0de61b926a5b844d7f45cd4a69ba44b6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 04:01:09 +0000 Subject: [PATCH 301/456] Bump jackson-bom from 2.13.2.20220328 to 2.13.3 Bumps [jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.13.2.20220328 to 2.13.3. - [Release notes](https://github.com/FasterXML/jackson-bom/releases) - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.13.2.20220328...jackson-bom-2.13.3) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bfbd54f4..e24d70f12 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ <version.spotbugs>4.6.0</version.spotbugs> <version.javax-annotation-api>1.3.2</version.javax-annotation-api> <version.jena>3.17.0</version.jena> - <version.jackson>2.13.2.20220328</version.jackson> + <version.jackson>2.13.3</version.jackson> <version.junit>5.8.2</version.junit> <version.mockito>4.5.1</version.mockito> <version.hamcrest>2.2</version.hamcrest> From c7126054634d8e7b7c4c8f7206e74d9d6d921a33 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Mon, 16 May 2022 11:48:35 +0200 Subject: [PATCH 302/456] add dependabot for actions --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b77674ad0..2377f59bf 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,3 +19,7 @@ updates: - dependency-name: org.elasticsearch:elasticsearch versions: - 7.11.0 +- package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" \ No newline at end of file From 1a740791e5361229f4d7347dcfca0efbfb141161 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 10:41:46 +0000 Subject: [PATCH 303/456] Bump actions/setup-java from 2 to 3 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2 to 3. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/daily.yml | 4 ++-- .github/workflows/pull.yml | 2 +- .github/workflows/push.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index b432313f1..40ce2c996 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 8 @@ -26,7 +26,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up settings.xml for GitHub Packages - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 8 diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 163262bde..42126f448 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 9cd86a596..19746d8dc 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -31,7 +31,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up settings.xml for GitHub Packages - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 8 From 4870e1a4cfe21a8862bb049690b9a49f6a6639ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 May 2022 04:01:27 +0000 Subject: [PATCH 304/456] Bump version.elastic from 7.17.1 to 7.17.4 Bumps `version.elastic` from 7.17.1 to 7.17.4. Updates `elasticsearch` from 7.17.1 to 7.17.4 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.1...v7.17.4) Updates `elasticsearch-rest-client` from 7.17.1 to 7.17.4 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.1...v7.17.4) Updates `elasticsearch-rest-high-level-client` from 7.17.1 to 7.17.4 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.1...v7.17.4) --- updated-dependencies: - dependency-name: org.elasticsearch:elasticsearch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 31884fbac..a59a8a640 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ <version.mockito>4.5.1</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> - <version.elastic>7.17.1</version.elastic> + <version.elastic>7.17.4</version.elastic> <version.antlr4>4.9.3</version.antlr4> <version.maven-javadoc-plugin>3.4.0</version.maven-javadoc-plugin> </properties> From 020fb6fcd9fbe4c15d46866f6b2f2195ad6a81fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 04:01:34 +0000 Subject: [PATCH 305/456] Bump version.mockito from 4.5.1 to 4.6.0 Bumps `version.mockito` from 4.5.1 to 4.6.0. Updates `mockito-core` from 4.5.1 to 4.6.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.5.1...v4.6.0) Updates `mockito-junit-jupiter` from 4.5.1 to 4.6.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.5.1...v4.6.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 31884fbac..c12457922 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <version.jena>3.17.0</version.jena> <version.jackson>2.13.3</version.jackson> <version.junit>5.8.2</version.junit> - <version.mockito>4.5.1</version.mockito> + <version.mockito>4.6.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.1</version.elastic> From 75224a42a2bfce1a6c6e2e7a1e47224d9418423a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jun 2022 06:51:13 +0000 Subject: [PATCH 306/456] Bump version.mockito from 4.6.0 to 4.6.1 Bumps `version.mockito` from 4.6.0 to 4.6.1. Updates `mockito-core` from 4.6.0 to 4.6.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.0...v4.6.1) Updates `mockito-junit-jupiter` from 4.6.0 to 4.6.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.0...v4.6.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84a0c25e5..cd35c3a8b 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <version.jena>3.17.0</version.jena> <version.jackson>2.13.3</version.jackson> <version.junit>5.8.2</version.junit> - <version.mockito>4.6.0</version.mockito> + <version.mockito>4.6.1</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.4</version.elastic> From b4c88696f7228abb40ba6e149cf4acdfd0c99a4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jun 2022 04:02:10 +0000 Subject: [PATCH 307/456] Bump kotlin-stdlib from 1.6.21 to 1.7.0 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.6.21 to 1.7.0. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cd35c3a8b..71081b693 100644 --- a/pom.xml +++ b/pom.xml @@ -1071,7 +1071,7 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib</artifactId> - <version>1.6.21</version> + <version>1.7.0</version> <scope>runtime</scope> </dependency> <dependency> From dea43d92066634c469c793fafadba2b88e5ec299 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 9 Jun 2022 11:02:01 +0200 Subject: [PATCH 308/456] return abstrctGML and not null --- .../java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java index e45aa62e7..8bd161d8b 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/AbstractGmlDecoderv321.java @@ -81,7 +81,7 @@ protected AbstractGML parseAbstractGMLType(AbstractGMLType agmlt, AbstractGML ab parseNames(agmlt, abstractGML); paresDescription(agmlt, abstractGML); // parseMetaDataProperty(agmlt, abstractGML); - return null; + return abstractGML; } protected AbstractFeature parseAbstractFeatureType(AbstractFeatureType aft, AbstractFeature abstractFeature) From 87cc4c39a9663dbd4c833100b7bb6f58b13a596d Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 9 Jun 2022 11:04:24 +0200 Subject: [PATCH 309/456] do not remove # from gmlid of a feature to support detection of document internal referencing and add test --- .../n52/svalbard/decode/GmlDecoderv321.java | 3 +- .../svalbard/decode/SosDecoderv20Test.java | 65 +++++++++-- .../resources/InsertObservation_Multiple.xml | 106 ++++++++++++++++++ 3 files changed, 166 insertions(+), 8 deletions(-) create mode 100644 svalbard/xmlbeans/src/test/resources/InsertObservation_Multiple.xml diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java index a95aa569d..fc265611b 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/GmlDecoderv321.java @@ -205,13 +205,14 @@ private Object parseFeaturePropertyType(FeaturePropertyType featurePropertyType) if (featurePropertyType.getHref() != null) { if (featurePropertyType.getHref().startsWith("#")) { feature = new SamplingFeature(null, featurePropertyType.getHref().replace("#", "")); + feature.setGmlId(featurePropertyType.getHref()); } else { feature = new SamplingFeature(new CodeWithAuthority(featurePropertyType.getHref())); if (featurePropertyType.getTitle() != null && !featurePropertyType.getTitle().isEmpty()) { feature.addName(new org.n52.shetland.ogc.gml.CodeType(featurePropertyType.getTitle())); } + feature.setGmlId("ssf_" + NcName.makeValid(featurePropertyType.getHref())); } - feature.setGmlId("ssf_" + NcName.makeValid(featurePropertyType.getHref())); } else { // if feature is encoded XmlObject abstractFeature = null; diff --git a/svalbard/xmlbeans/src/test/java/org/n52/svalbard/decode/SosDecoderv20Test.java b/svalbard/xmlbeans/src/test/java/org/n52/svalbard/decode/SosDecoderv20Test.java index 87e3f1985..90186f976 100644 --- a/svalbard/xmlbeans/src/test/java/org/n52/svalbard/decode/SosDecoderv20Test.java +++ b/svalbard/xmlbeans/src/test/java/org/n52/svalbard/decode/SosDecoderv20Test.java @@ -20,25 +20,36 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; +import java.io.IOException; import java.util.Arrays; import org.apache.xmlbeans.XmlException; +import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; +import org.joda.time.DateTime; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.io.ParseException; import org.n52.janmayen.Producer; +import org.n52.shetland.ogc.gml.AbstractFeature; +import org.n52.shetland.ogc.gml.time.TimeInstant; +import org.n52.shetland.ogc.om.OmObservation; +import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeature; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; import org.n52.shetland.ogc.ows.service.OwsServiceCommunicationObject; import org.n52.shetland.ogc.sos.request.GetObservationRequest; +import org.n52.shetland.ogc.sos.request.InsertObservationRequest; import org.n52.shetland.ogc.swe.simpleType.SweText; +import org.n52.shetland.util.DateTimeHelper; +import org.n52.shetland.util.JTSHelper; import org.n52.svalbard.decode.exception.DecodingException; import net.opengis.sos.x20.GetObservationDocument; /** - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * * @since 1.0.0 */ @@ -63,7 +74,20 @@ public void initDecoder() { sweCommonDecoderV20.setDecoderRepository(decoderRepository); sweCommonDecoderV20.setXmlOptions(options); - decoderRepository.setDecoders(Arrays.asList(sweCommonDecoderV20, swesExtensionDecoderv20, sosDecoderv20)); + GmlDecoderv321 gmlDecoderv321 = new GmlDecoderv321(); + gmlDecoderv321.setDecoderRepository(decoderRepository); + gmlDecoderv321.setXmlOptions(XmlOptions::new); + + OmDecoderv20 omDecoderv20 = new OmDecoderv20(); + omDecoderv20.setDecoderRepository(decoderRepository); + omDecoderv20.setXmlOptions(XmlOptions::new); + + SamplingDecoderv20 samplingDecoderv20 = new SamplingDecoderv20(); + samplingDecoderv20.setDecoderRepository(decoderRepository); + samplingDecoderv20.setXmlOptions(XmlOptions::new); + + decoderRepository.setDecoders(Arrays.asList(sweCommonDecoderV20, swesExtensionDecoderv20, sosDecoderv20, + gmlDecoderv321, omDecoderv20, samplingDecoderv20)); decoderRepository.init(); @@ -76,8 +100,7 @@ public void nullDecoder() { } @Test - public void should_decode_boolean_swesExtensions() - throws XmlException, OwsExceptionReport, DecodingException { + public void should_decode_boolean_swesExtensions() throws XmlException, OwsExceptionReport, DecodingException { final GetObservationDocument doc = GetObservationDocument.Factory.parse("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<sos:GetObservation service=\"SOS\" version=\"2.0.0\"\n" @@ -97,8 +120,7 @@ public void should_decode_boolean_swesExtensions() } @Test - public void should_decode_text_swesExtensions() - throws XmlException, OwsExceptionReport, DecodingException { + public void should_decode_text_swesExtensions() throws XmlException, OwsExceptionReport, DecodingException { final GetObservationDocument doc = GetObservationDocument.Factory.parse("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<sos:GetObservation service=\"SOS\" version=\"2.0.0\"\n" @@ -121,4 +143,33 @@ public void should_decode_text_swesExtensions() } + @Test + public void should_add_references_insertObservation() throws XmlException, IOException, DecodingException, ParseException { + XmlObject xml = XmlObject.Factory.parse(getClass().getResourceAsStream("/InsertObservation_Multiple.xml")); + OwsServiceCommunicationObject decodedObject = decoder.decode(xml); + assertThat(decodedObject, instanceOf(InsertObservationRequest.class)); + InsertObservationRequest request = (InsertObservationRequest) decodedObject; + DateTime phenomenonTime = DateTimeHelper.parseIsoString2DateTime("2019-11-19T17:42:15.000+00:00"); + String identifier = "http://www.52north.org/test/featureOfInterest/9"; + String name = "52°North"; + Geometry geom = JTSHelper.createGeometryFromWKT("Point(51.935101100104916 7.651968812254194)", 4326); + for (OmObservation observation : request.getObservations()) { + assertThat(observation.isSetPhenomenonTime(), is(true)); + assertThat(observation.getPhenomenonTime(), instanceOf(TimeInstant.class)); + TimeInstant pt = (TimeInstant) observation.getPhenomenonTime(); + assertThat(pt.getValue(), is(phenomenonTime)); + assertThat(observation.isSetResultTime(), is(true)); + assertThat(observation.getResultTime().getValue(), is(phenomenonTime)); + assertThat(observation.getObservationConstellation().isSetFeatureOfInterest(), is(true)); + AbstractFeature featureOfInterest = observation.getObservationConstellation().getFeatureOfInterest(); + assertThat(featureOfInterest.getIdentifier(), is(identifier)); + assertThat(featureOfInterest.getFirstName().getValue(), is(name)); + assertThat(featureOfInterest, instanceOf(SamplingFeature.class)); + SamplingFeature foi = (SamplingFeature) featureOfInterest; + assertThat(foi.isSetGeometry(), is(true)); + assertThat(foi.getGeometry().getGeometryType(), is("Point")); + assertThat(foi.getGeometry().equals(geom), is(true)); + } + } + } \ No newline at end of file diff --git a/svalbard/xmlbeans/src/test/resources/InsertObservation_Multiple.xml b/svalbard/xmlbeans/src/test/resources/InsertObservation_Multiple.xml new file mode 100644 index 000000000..6d5c5de25 --- /dev/null +++ b/svalbard/xmlbeans/src/test/resources/InsertObservation_Multiple.xml @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright (C) 2015-2022 52°North Spatial Information Research GmbH + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<sos:InsertObservation service="SOS" version="2.0.0" + xmlns:sos="http://www.opengis.net/sos/2.0" + xmlns:swes="http://www.opengis.net/swes/2.0" + xmlns:swe="http://www.opengis.net/swe/2.0" + xmlns:sml="http://www.opengis.net/sensorML/1.0.1" + xmlns:gml="http://www.opengis.net/gml/3.2" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:om="http://www.opengis.net/om/2.0" + xmlns:sams="http://www.opengis.net/samplingSpatial/2.0" + xmlns:sf="http://www.opengis.net/sampling/2.0" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.opengis.net/sos/2.0 http://schemas.opengis.net/sos/2.0/sos.xsd + http://www.opengis.net/samplingSpatial/2.0 http://schemas.opengis.net/samplingSpatial/2.0/spatialSamplingFeature.xsd"> + <!-- multiple offerings are possible --> + <sos:offering>http://www.52north.org/test/offering/9</sos:offering> + <sos:observation> + <om:OM_Observation gml:id="o1"> + <om:type xlink:href="http://www.opengis.net/def/observationType/OGC-OM/2.0/OM_CategoryObservation"/> + <om:phenomenonTime> + <gml:TimeInstant gml:id="phenomenonTime"> + <gml:timePosition>2019-11-19T17:42:15.000+00:00</gml:timePosition> + </gml:TimeInstant> + </om:phenomenonTime> + <om:resultTime xlink:href="#phenomenonTime"/> + <om:procedure xlink:href="http://www.52north.org/test/procedure/9"/> + <om:observedProperty xlink:href="http://www.52north.org/test/observableProperty/9_1"/> + <om:featureOfInterest> + <sams:SF_SpatialSamplingFeature gml:id="ssf_test_feature"> + <gml:identifier codeSpace="">http://www.52north.org/test/featureOfInterest/9</gml:identifier> + <gml:name>52°North</gml:name> + <sf:type xlink:href="http://www.opengis.net/def/samplingFeatureType/OGC-OM/2.0/SF_SamplingPoint"/> + <sf:sampledFeature xlink:href="http://www.52north.org/test/featureOfInterest/1"/> + <sams:shape> + <gml:Point gml:id="test_feature_9"> + <gml:pos srsName="http://www.opengis.net/def/crs/EPSG/0/4326">51.935101100104916 7.651968812254194</gml:pos> + </gml:Point> + </sams:shape> + </sams:SF_SpatialSamplingFeature> + </om:featureOfInterest> + <om:result xsi:type="gml:ReferenceType" xlink:href="test_category_9_2" /> + </om:OM_Observation> + </sos:observation> + <sos:observation> + <om:OM_Observation gml:id="o2"> + <om:type xlink:href="http://www.opengis.net/def/observationType/OGC-OM/2.0/OM_CountObservation"/> + <om:phenomenonTime xlink:href="#phenomenonTime" /> + <om:resultTime xlink:href="#phenomenonTime"/> + <om:procedure xlink:href="http://www.52north.org/test/procedure/9"/> + <om:observedProperty xlink:href="http://www.52north.org/test/observableProperty/9_2"/> + <om:featureOfInterest xlink:href="#ssf_test_feature" /> + <om:result xsi:type="xs:integer">4</om:result> + </om:OM_Observation> + </sos:observation> + <sos:observation> + <om:OM_Observation gml:id="o3"> + <om:type xlink:href="http://www.opengis.net/def/observationType/OGC-OM/2.0/OM_Measurement"/> + <om:phenomenonTime xlink:href="#phenomenonTime" /> + <om:resultTime xlink:href="#phenomenonTime"/> + <om:procedure xlink:href="http://www.52north.org/test/procedure/9"/> + <om:observedProperty xlink:href="http://www.52north.org/test/observableProperty/9_3"/> + <om:featureOfInterest xlink:href="#ssf_test_feature" /> + <om:result xsi:type="gml:MeasureType" uom="test_unit_9_3">0.29</om:result> + </om:OM_Observation> + </sos:observation> + <sos:observation> + <om:OM_Observation gml:id="o4"> + <om:type xlink:href="http://www.opengis.net/def/observationType/OGC-OM/2.0/OM_TextObservation"/> + <om:phenomenonTime xlink:href="#phenomenonTime" /> + <om:resultTime xlink:href="#phenomenonTime"/> + <om:procedure xlink:href="http://www.52north.org/test/procedure/9"/> + <om:observedProperty xlink:href="http://www.52north.org/test/observableProperty/9_4"/> + <om:featureOfInterest xlink:href="#ssf_test_feature" /> + <om:result xsi:type="xs:string">text_value_2</om:result> + </om:OM_Observation> + </sos:observation> + <sos:observation> + <om:OM_Observation gml:id="o5"> + <om:type xlink:href="http://www.opengis.net/def/observationType/OGC-OM/2.0/OM_TruthObservation"/> + <om:phenomenonTime xlink:href="#phenomenonTime" /> + <om:resultTime xlink:href="#phenomenonTime"/> + <om:procedure xlink:href="http://www.52north.org/test/procedure/9"/> + <om:observedProperty xlink:href="http://www.52north.org/test/observableProperty/9_5"/> + <om:featureOfInterest xlink:href="#ssf_test_feature" /> + <om:result xsi:type="xs:boolean">false</om:result> + </om:OM_Observation> + </sos:observation> +</sos:InsertObservation> From 8acd56d709741ad56f5ef069752bb5eb09452c33 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 9 Jun 2022 11:05:12 +0200 Subject: [PATCH 310/456] remove obsolete/duplicate reference detection which is also implemented in the InsertObservationRequest class --- .../n52/svalbard/decode/SosDecoderv20.java | 75 +------------------ 1 file changed, 1 insertion(+), 74 deletions(-) diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosDecoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosDecoderv20.java index 54eb754e7..ec57f94de 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosDecoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/decode/SosDecoderv20.java @@ -20,9 +20,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.xmlbeans.XmlCursor; @@ -32,10 +30,6 @@ import org.n52.janmayen.exception.CompositeException; import org.n52.shetland.ogc.filter.SpatialFilter; import org.n52.shetland.ogc.filter.TemporalFilter; -import org.n52.shetland.ogc.gml.AbstractFeature; -import org.n52.shetland.ogc.gml.time.Time; -import org.n52.shetland.ogc.gml.time.TimeInstant; -import org.n52.shetland.ogc.gml.time.TimePeriod; import org.n52.shetland.ogc.om.OmObservation; import org.n52.shetland.ogc.om.OmObservationConstellation; import org.n52.shetland.ogc.ows.service.GetCapabilitiesRequest; @@ -299,28 +293,17 @@ private OwsServiceRequest parseInsertObservation(final InsertObservationDocument insertObservationRequest.setExtensions(parseExtensibleRequest(insertObservationType)); if (insertObservationType.getObservationArray() != null) { - final int length = insertObservationType.getObservationArray().length; - final Map<String, Time> phenomenonTimes = new HashMap<>(length); - final Map<String, TimeInstant> resultTimes = new HashMap<>(length); - final Map<String, AbstractFeature> features = new HashMap<>(length); - CompositeException exceptions = new CompositeException(); for (final Observation observation : insertObservationType.getObservationArray()) { final Object decodedObject = decodeXmlElement(observation.getOMObservation()); if (decodedObject instanceof OmObservation) { - final OmObservation sosObservation = (OmObservation) decodedObject; - checkAndAddPhenomenonTime(sosObservation.getPhenomenonTime(), phenomenonTimes); - checkAndAddResultTime(sosObservation.getResultTime(), resultTimes); - checkAndAddFeatures(sosObservation.getObservationConstellation().getFeatureOfInterest(), features); - insertObservationRequest.addObservation(sosObservation); + insertObservationRequest.addObservation((OmObservation) decodedObject); } else { exceptions.add(new DecodingException(Sos2Constants.InsertObservationParams.observation, "The requested observation type (%s) is not supported by this server!", observation.getOMObservation().getDomNode().getNodeName())); } } - checkReferencedElements(insertObservationRequest.getObservations(), phenomenonTimes, resultTimes, - features); try { exceptions.throwIfNotEmpty(); } catch (CompositeException ex) { @@ -588,60 +571,4 @@ private String parseResultValues(final XmlObject resultValues) } } - private void checkAndAddPhenomenonTime(final Time phenomenonTime, final Map<String, Time> phenomenonTimes) { - if (!phenomenonTime.isReferenced()) { - phenomenonTimes.put(phenomenonTime.getGmlId(), phenomenonTime); - } - } - - private void checkAndAddResultTime(final TimeInstant resultTime, final Map<String, TimeInstant> resultTimes) { - if (!resultTime.isReferenced()) { - resultTimes.put(resultTime.getGmlId(), resultTime); - } - } - - private void checkAndAddFeatures(final AbstractFeature featureOfInterest, - final Map<String, AbstractFeature> features) { - if (!featureOfInterest.isReferenced()) { - features.put(featureOfInterest.getGmlId(), featureOfInterest); - } - } - - private void checkReferencedElements(final List<OmObservation> observations, - final Map<String, Time> phenomenonTimes, final Map<String, TimeInstant> resultTimes, - final Map<String, AbstractFeature> features) - throws DecodingException { - for (final OmObservation observation : observations) { - // phenomenonTime - final Time phenomenonTime = observation.getPhenomenonTime(); - if (phenomenonTime.isReferenced()) { - observation.getValue().setPhenomenonTime(phenomenonTimes.get(phenomenonTime.getGmlId())); - } - // resultTime - final TimeInstant resultTime = observation.getResultTime(); - if (resultTime.isReferenced()) { - if (resultTimes.containsKey(resultTime.getGmlId())) { - observation.setResultTime(resultTimes.get(resultTime.getGmlId())); - } else if (phenomenonTimes.containsKey(resultTime.getGmlId())) { - final Time iTime = phenomenonTimes.get(resultTime.getGmlId()); - if (iTime instanceof TimeInstant) { - observation.setResultTime((TimeInstant) iTime); - } else if (iTime instanceof TimePeriod) { - final TimePeriod timePeriod = (TimePeriod) iTime; - observation.setResultTime(new TimeInstant(timePeriod.getEnd())); - } else { - throw new DecodingException("observation.resultTime", "The time value type is not supported"); - } - - } - } - // featureOfInterest - final AbstractFeature featureOfInterest = observation.getObservationConstellation().getFeatureOfInterest(); - if (featureOfInterest.isReferenced()) { - observation.getObservationConstellation() - .setFeatureOfInterest(features.get(featureOfInterest.getGmlId())); - } - - } - } } From 7c247276b5761440e064f571e80702fde3bfb03f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 04:00:59 +0000 Subject: [PATCH 311/456] Bump version.spring from 5.3.20 to 5.3.21 Bumps `version.spring` from 5.3.20 to 5.3.21. Updates `spring-test` from 5.3.20 to 5.3.21 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.20...v5.3.21) Updates `spring-web` from 5.3.20 to 5.3.21 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.20...v5.3.21) Updates `spring-beans` from 5.3.20 to 5.3.21 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.20...v5.3.21) Updates `spring-core` from 5.3.20 to 5.3.21 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.20...v5.3.21) Updates `spring-context` from 5.3.20 to 5.3.21 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.20...v5.3.21) Updates `spring-context-support` from 5.3.20 to 5.3.21 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.20...v5.3.21) --- updated-dependencies: - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71081b693..31bc58469 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> - <version.spring>5.3.20</version.spring> + <version.spring>5.3.21</version.spring> <version.slf4j>1.7.36</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> From 643b2edc7231f5cb0e7251229c06c4b17697ff31 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 21 Jun 2022 13:55:15 +0200 Subject: [PATCH 312/456] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 022193f18..85b873764 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Arctic Sea [![Build Status](https://travis-ci.org/52North/arctic-sea.svg)](https://travis-ci.org/52North/arctic-sea) [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/arctic-sea.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea) [![Join the chat at https://gitter.im/52North/arctic-sea](https://badges.gitter.im/52North/arctic-sea.svg)](https://gitter.im/52North/arctic-sea) [![Total alerts](https://img.shields.io/lgtm/alerts/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/alerts/) [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/context:java) +# Arctic Sea [![Build Status](https://travis-ci.org/52North/arctic-sea.svg)](https://travis-ci.org/52North/arctic-sea) [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/arctic-sea.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea) [![Join the chat at https://gitter.im/52North/arctic-sea](https://badges.gitter.im/52North/arctic-sea.svg)](https://gitter.im/52North/arctic-sea) [![Total alerts](https://img.shields.io/lgtm/alerts/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/alerts/) [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/context:java) [![Open Source Love](https://badges.frapsoft.com/os/v3/open-source.png?v=103)](https://github.com/ellerbrock/open-source-badges/) ## Description From 4efb00d7dda2f2d7f2c8d436a2436305707cf266 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 21 Jun 2022 13:55:45 +0200 Subject: [PATCH 313/456] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 85b873764..3d4750cb2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -# Arctic Sea [![Build Status](https://travis-ci.org/52North/arctic-sea.svg)](https://travis-ci.org/52North/arctic-sea) [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/arctic-sea.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea) [![Join the chat at https://gitter.im/52North/arctic-sea](https://badges.gitter.im/52North/arctic-sea.svg)](https://gitter.im/52North/arctic-sea) [![Total alerts](https://img.shields.io/lgtm/alerts/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/alerts/) [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/context:java) [![Open Source Love](https://badges.frapsoft.com/os/v3/open-source.png?v=103)](https://github.com/ellerbrock/open-source-badges/) +# Arctic Sea +[![Build Status](https://travis-ci.org/52North/arctic-sea.svg)](https://travis-ci.org/52North/arctic-sea) [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/arctic-sea.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea) [![Join the chat at https://gitter.im/52North/arctic-sea](https://badges.gitter.im/52North/arctic-sea.svg)](https://gitter.im/52North/arctic-sea) [![Total alerts](https://img.shields.io/lgtm/alerts/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/alerts/) [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/context:java) [![Open Source Love](https://badges.frapsoft.com/os/v3/open-source.png?v=103)](https://github.com/ellerbrock/open-source-badges/) ## Description From c035d023f22dc0b96fd1abbaac00fc0df96e00e9 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 21 Jun 2022 13:57:16 +0200 Subject: [PATCH 314/456] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d4750cb2..aee5793c4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Arctic Sea -[![Build Status](https://travis-ci.org/52North/arctic-sea.svg)](https://travis-ci.org/52North/arctic-sea) [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/arctic-sea.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea) [![Join the chat at https://gitter.im/52North/arctic-sea](https://badges.gitter.im/52North/arctic-sea.svg)](https://gitter.im/52North/arctic-sea) [![Total alerts](https://img.shields.io/lgtm/alerts/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/alerts/) [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/context:java) [![Open Source Love](https://badges.frapsoft.com/os/v3/open-source.png?v=103)](https://github.com/ellerbrock/open-source-badges/) +[![Build Status](https://travis-ci.org/52North/arctic-sea.svg)](https://travis-ci.org/52North/arctic-sea) [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/arctic-sea.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea) [![Join the chat at https://gitter.im/52North/arctic-sea](https://badges.gitter.im/52North/arctic-sea.svg)](https://gitter.im/52North/arctic-sea) [![Total alerts](https://img.shields.io/lgtm/alerts/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/alerts/) [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/context:java) [![Open Source](https://badges.frapsoft.com/os/v3/open-source.png?v=103)](https://opensource.org/) ## Description From a1964bc2fe3c7677fc0b84e02f0e831e50ac729c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 04:00:33 +0000 Subject: [PATCH 315/456] Bump jts-core from 1.18.2 to 1.19.0 Bumps jts-core from 1.18.2 to 1.19.0. --- updated-dependencies: - dependency-name: org.locationtech.jts:jts-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 31bc58469..4343cc944 100644 --- a/pom.xml +++ b/pom.xml @@ -322,7 +322,7 @@ <dependency> <groupId>org.locationtech.jts</groupId> <artifactId>jts-core</artifactId> - <version>1.18.2</version> + <version>1.19.0</version> </dependency> <dependency> <groupId>org.geolatte</groupId> From fdec2830ffb11444fc225391a9f8e4b33a58188e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jun 2022 04:01:09 +0000 Subject: [PATCH 316/456] Bump spotbugs-annotations from 4.7.0 to 4.7.1 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.7.0 to 4.7.1. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.7.0...4.7.1) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4343cc944..8a66e8b0c 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ <version.n52CommonXML>2.7.0</version.n52CommonXML> <version.olingo>4.9.0</version.olingo> <version.findbugs>3.0.2</version.findbugs> - <version.spotbugs>4.7.0</version.spotbugs> + <version.spotbugs>4.7.1</version.spotbugs> <version.javax-annotation-api>1.3.2</version.javax-annotation-api> <version.jena>3.17.0</version.jena> <version.jackson>2.13.3</version.jackson> From e825558d14d1dbe2c6c2be7bf5cb3386d042a25a Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 28 Jun 2022 08:49:01 +0200 Subject: [PATCH 317/456] [maven-release-plugin] prepare release v9.6.0 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index d6e695e6d..7b13c8866 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 5153c435a..d56913759 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index c152e54ce..ff8e226e8 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 654379ca8..8865b53c0 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 99bdf7ec7..36c08944c 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index f8c7bda3d..44f406f41 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 173a53c0f..75156e648 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 86c1bdfb6..355dbf757 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 03d1c4f8c..731a4a189 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 354433466..3387aa962 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 4ff04307c..6dc0b0ea6 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 42c806f11..596933c88 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 7c3c0be85..dd3eb57c1 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 8a66e8b0c..79807ab47 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>HEAD</tag> + <tag>v9.6.0</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 50a1b08b0..7f4e56621 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 846ff1334..c1d2c922c 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 26904cd87..97a362375 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 2f645876e..05a1a7889 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index ac32576a7..135cddf42 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index ad184fb2b..b2669d9d9 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 92e741435..494b54f5c 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 9e4a9640c..d5c2bd9f5 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index e3048fdf8..bdacbffa4 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 7c7d3739b..4d8d09e9b 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index a089402e6..73b8e58a3 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0-SNAPSHOT</version> + <version>9.6.0</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 25ceef0eca7f2837d518253c94be4e3aae2bf6d2 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 28 Jun 2022 08:49:05 +0200 Subject: [PATCH 318/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 7b13c8866..1a8d50305 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index d56913759..cad99de72 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index ff8e226e8..37e3b6a4e 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 8865b53c0..bca1fa530 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 36c08944c..7739dd66d 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 44f406f41..8a3eb7f9c 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 75156e648..f3f1cdde1 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 355dbf757..fd0987038 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 731a4a189..a6d383dd5 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 3387aa962..ded31825a 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 6dc0b0ea6..b9282095c 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 596933c88..df6365b70 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index dd3eb57c1..52ad0fbec 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 79807ab47..20fcab91b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>v9.6.0</tag> + <tag>HEAD</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 7f4e56621..a1477f175 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index c1d2c922c..096f9abaa 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 97a362375..ec7440457 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 05a1a7889..ac34615c0 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 135cddf42..bd5e05333 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index b2669d9d9..d6a282dbb 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 494b54f5c..db815d73c 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index d5c2bd9f5..786567589 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index bdacbffa4..e85cd7740 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 4d8d09e9b..fec8e61d7 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 73b8e58a3..44f7db2c7 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.0</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From af6a85ac08e3d7ebefd2b39715fb64317f0fdb38 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 28 Jun 2022 10:41:27 +0200 Subject: [PATCH 319/456] Update to version 10.0.0 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 2 +- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 1a8d50305..c2108c565 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index cad99de72..70d09eca5 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 37e3b6a4e..22325d13b 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index bca1fa530..5358e1e15 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 7739dd66d..2dde5e3b2 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 8a3eb7f9c..f28c067ea 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index f3f1cdde1..acd91ccd7 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index fd0987038..20dc134d9 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index a6d383dd5..b4a71241a 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index ded31825a..fc0ac2aa1 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index b9282095c..39d915f0f 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index df6365b70..ce0ffc79e 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 52ad0fbec..e67c812e1 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 20fcab91b..e1b21eff4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index a1477f175..cd333a6f5 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 096f9abaa..688fb7ead 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index ec7440457..74a836f14 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index ac34615c0..b62c79d0f 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index bd5e05333..8083e17b7 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index d6a282dbb..779793464 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index db815d73c..d9e98ecfc 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 786567589..0c7cc2669 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index e85cd7740..260673aa3 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index fec8e61d7..722a99f1c 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 44f7db2c7..50f54483e 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From d88589df5ae4131649a5699617b492eb5e2ede57 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 28 Jun 2022 10:41:45 +0200 Subject: [PATCH 320/456] Set java version to 11 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index e1b21eff4..d4dcd190a 100644 --- a/pom.xml +++ b/pom.xml @@ -158,6 +158,7 @@ <version.elastic>7.17.4</version.elastic> <version.antlr4>4.9.3</version.antlr4> <version.maven-javadoc-plugin>3.4.0</version.maven-javadoc-plugin> + <version.java>11</version.java> </properties> <dependencyManagement> From 67cba88b1d8836cc2f10af52da0f8300f51d9f9e Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 28 Jun 2022 11:31:16 +0200 Subject: [PATCH 321/456] update version in example --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aee5793c4..42eaa8a0f 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ All projects are available on Maven Central. ```xml <properties> - <version.arctic-sea>9.5.3</version.arctic-sea> + <version.arctic-sea>9.6.0</version.arctic-sea> </properties> <dependencies> <dependency> From 782f0feb4e91d133182c2c8349649941d57e430e Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 28 Jun 2022 15:34:39 +0200 Subject: [PATCH 322/456] First build with java 11 --- janmayen/pom.xml | 4 ++++ .../java/org/n52/janmayen/lifecycle/Constructable.java | 2 +- .../java/org/n52/janmayen/lifecycle/Destroyable.java | 2 +- pom.xml | 9 +++++---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/janmayen/pom.xml b/janmayen/pom.xml index e67c812e1..f94c8b3c6 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -43,6 +43,10 @@ <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> diff --git a/janmayen/src/main/java/org/n52/janmayen/lifecycle/Constructable.java b/janmayen/src/main/java/org/n52/janmayen/lifecycle/Constructable.java index 222593566..b20bd3dfc 100644 --- a/janmayen/src/main/java/org/n52/janmayen/lifecycle/Constructable.java +++ b/janmayen/src/main/java/org/n52/janmayen/lifecycle/Constructable.java @@ -15,7 +15,7 @@ */ package org.n52.janmayen.lifecycle; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * diff --git a/janmayen/src/main/java/org/n52/janmayen/lifecycle/Destroyable.java b/janmayen/src/main/java/org/n52/janmayen/lifecycle/Destroyable.java index dbf5b831f..9d3990bc7 100644 --- a/janmayen/src/main/java/org/n52/janmayen/lifecycle/Destroyable.java +++ b/janmayen/src/main/java/org/n52/janmayen/lifecycle/Destroyable.java @@ -15,7 +15,7 @@ */ package org.n52.janmayen.lifecycle; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; /** * @see PreDestroy diff --git a/pom.xml b/pom.xml index d4dcd190a..c50ae021b 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ <version.olingo>4.9.0</version.olingo> <version.findbugs>3.0.2</version.findbugs> <version.spotbugs>4.7.1</version.spotbugs> - <version.javax-annotation-api>1.3.2</version.javax-annotation-api> + <version.jakarta-annotation-api>2.1.1</version.jakarta-annotation-api> <version.jena>3.17.0</version.jena> <version.jackson>2.13.3</version.jackson> <version.junit>5.8.2</version.junit> @@ -285,9 +285,10 @@ <version>1</version> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>${version.javax-annotation-api}</version> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>${version.jakarta-annotation-api}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.xml.soap</groupId> From bfdf3a9b3cce8cc3e9f1a4f202dad3f33c6fe3d4 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 28 Jun 2022 15:45:25 +0200 Subject: [PATCH 323/456] Update dependabot.yml --- .github/dependabot.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2377f59bf..7cd0dd8b8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,7 +19,14 @@ updates: - dependency-name: org.elasticsearch:elasticsearch versions: - 7.11.0 +- package-ecosystem: maven + directory: "/" + schedule: + interval: daily + time: "04:15" + open-pull-requests-limit: 10 + target-branch: "version/v10.0" - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "daily" \ No newline at end of file + interval: "daily" From 3eb3d4f96e8e560b032bf6ffe07d562d7369474a Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 28 Jun 2022 15:47:15 +0200 Subject: [PATCH 324/456] Update dependabot.yml --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7cd0dd8b8..c7a3b4043 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,6 +26,10 @@ updates: time: "04:15" open-pull-requests-limit: 10 target-branch: "version/v10.0" + ignore: + - dependency-name: xml-apis:xml-apis + versions: + - ">= 2.a, < 3" - package-ecosystem: "github-actions" directory: "/" schedule: From de1a5957bd2a47534818e6c2dc8945aafa7333b6 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 28 Jun 2022 15:53:19 +0200 Subject: [PATCH 325/456] Update push.yml --- .github/workflows/push.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 19746d8dc..33ae7cba1 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,6 +4,8 @@ on: push: branches: - master + - 'maintenance/*' + - 'version/*' workflow_dispatch: jobs: From 803f29a12b04202d5f0939b1089675faa7f00524 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 28 Jun 2022 15:53:36 +0200 Subject: [PATCH 326/456] Update pull.yml --- .github/workflows/pull.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 42126f448..de3696e5b 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -4,6 +4,8 @@ on: pull_request: branches: - master + - 'maintenance/*' + - 'version/*' jobs: build: From a9ce7a5573cadb73f8ce27cd39e2ccecb7862991 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 28 Jun 2022 15:54:34 +0200 Subject: [PATCH 327/456] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d6dcc4ebf..8d5743c20 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ master, 'maintenance/*', 'version/*' ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ master, 'maintenance/*', 'version/*' ] schedule: - cron: '40 6 * * 6' From 633a44e1b35f3b9b8d6eaa3ce61e3bb79c5fcca7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 04:01:36 +0000 Subject: [PATCH 328/456] Bump version.elastic from 7.17.4 to 7.17.5 Bumps `version.elastic` from 7.17.4 to 7.17.5. Updates `elasticsearch` from 7.17.4 to 7.17.5 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.4...v7.17.5) Updates `elasticsearch-rest-client` from 7.17.4 to 7.17.5 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.4...v7.17.5) Updates `elasticsearch-rest-high-level-client` from 7.17.4 to 7.17.5 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/master/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.4...v7.17.5) --- updated-dependencies: - dependency-name: org.elasticsearch:elasticsearch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 20fcab91b..348b81ec9 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ <version.mockito>4.6.1</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> - <version.elastic>7.17.4</version.elastic> + <version.elastic>7.17.5</version.elastic> <version.antlr4>4.9.3</version.antlr4> <version.maven-javadoc-plugin>3.4.0</version.maven-javadoc-plugin> </properties> From ddf3b96e085e1e7e445802298b6c2d400315ac40 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 29 Jun 2022 08:18:37 +0200 Subject: [PATCH 329/456] fixes for jena update --- .../src/main/java/org/n52/svalbard/write/RdfStreamWriter.java | 4 ++-- .../test/java/org/n52/svalbard/write/RdfStreamWriterTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/RdfStreamWriter.java b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/RdfStreamWriter.java index 77674333a..8889ad8a5 100644 --- a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/RdfStreamWriter.java +++ b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/RdfStreamWriter.java @@ -21,7 +21,7 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdf.model.RDFWriter; +import org.apache.jena.rdf.model.RDFWriterI; import org.n52.shetland.rdf.RDF; import org.n52.svalbard.encode.EncodingContext; import org.n52.svalbard.encode.exception.EncodingException; @@ -36,7 +36,7 @@ public RdfStreamWriter(EncodingContext context, OutputStream outputStream, RDF e public void write() throws XMLStreamException, EncodingException { Model model = ModelFactory.createDefaultModel(); getElement().addToModel(model); - RDFWriter w = model.getWriter("RDF/XML-ABBREV"); + RDFWriterI w = model.getWriter("RDF/XML-ABBREV"); w.setProperty("showXMLDeclaration", "true"); w.setProperty("tab", "4"); w.write(model, getOutputStream(), null); diff --git a/svalbard/xmlstream/src/test/java/org/n52/svalbard/write/RdfStreamWriterTest.java b/svalbard/xmlstream/src/test/java/org/n52/svalbard/write/RdfStreamWriterTest.java index d75fae478..d059cc7b9 100644 --- a/svalbard/xmlstream/src/test/java/org/n52/svalbard/write/RdfStreamWriterTest.java +++ b/svalbard/xmlstream/src/test/java/org/n52/svalbard/write/RdfStreamWriterTest.java @@ -23,7 +23,7 @@ import org.apache.jena.datatypes.xsd.XSDDatatype; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdf.model.RDFWriter; +import org.apache.jena.rdf.model.RDFWriterI; import org.junit.jupiter.api.Test; import org.n52.shetland.rdf.RDF; import org.n52.shetland.rdf.RDFDataTypes; @@ -99,7 +99,7 @@ public void testModelCreation() throws XMLStreamException, IOException { Model model = ModelFactory.createDefaultModel(); rdf.addToModel(model); - RDFWriter w = model.getWriter("RDF/XML-ABBREV"); + RDFWriterI w = model.getWriter("RDF/XML-ABBREV"); w.setProperty("showXMLDeclaration", "true"); w.setProperty("tab", "4"); try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { From 3e8c1f94f62fe7c3878284fc46367de7bfbee72b Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 29 Jun 2022 08:36:41 +0200 Subject: [PATCH 330/456] update actions --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/pull.yml | 1 - .github/workflows/pull_10.yml | 25 +++++++++++++++++++++++++ .github/workflows/push.yml | 1 - 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/pull_10.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8d5743c20..fcf3854f9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master, 'maintenance/*', 'version/*' ] + branches: [ master, 'maintenance/*' ] pull_request: # The branches below must be a subset of the branches above - branches: [ master, 'maintenance/*', 'version/*' ] + branches: [ master, 'maintenance/*' ] schedule: - cron: '40 6 * * 6' diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index de3696e5b..6ff0c0927 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -5,7 +5,6 @@ on: branches: - master - 'maintenance/*' - - 'version/*' jobs: build: diff --git a/.github/workflows/pull_10.yml b/.github/workflows/pull_10.yml new file mode 100644 index 000000000..b03fd580c --- /dev/null +++ b/.github/workflows/pull_10.yml @@ -0,0 +1,25 @@ +name: Java CI on Pull Request + +on: + pull_request: + branches: + - 'version/v10.0' + +jobs: + build: + strategy: + matrix: + java: [ 11, 17 ] + runs-on: ubuntu-latest + name: Java ${{ matrix.java }} compile + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: ${{ matrix.java }} + cache: 'maven' + - name: Build with Maven + run: mvn -U -B clean install diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 33ae7cba1..1ab34c481 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -5,7 +5,6 @@ on: branches: - master - 'maintenance/*' - - 'version/*' workflow_dispatch: jobs: From 953b440d74ac8174b6dd23ee2095f4b978b72a25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 06:37:48 +0000 Subject: [PATCH 331/456] Bump version.jena from 3.17.0 to 4.5.0 Bumps `version.jena` from 3.17.0 to 4.5.0. Updates `jena-core` from 3.17.0 to 4.5.0 Updates `jena-arq` from 3.17.0 to 4.5.0 --- updated-dependencies: - dependency-name: org.apache.jena:jena-core dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.apache.jena:jena-arq dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c50ae021b..fe127e54d 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ <version.findbugs>3.0.2</version.findbugs> <version.spotbugs>4.7.1</version.spotbugs> <version.jakarta-annotation-api>2.1.1</version.jakarta-annotation-api> - <version.jena>3.17.0</version.jena> + <version.jena>4.5.0</version.jena> <version.jackson>2.13.3</version.jackson> <version.junit>5.8.2</version.junit> <version.mockito>4.6.1</version.mockito> From 7ff14bd5e1de35a6bc7f4622800c531adeaa1f31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 06:50:03 +0000 Subject: [PATCH 332/456] Bump geoip2 from 2.16.1 to 3.0.1 Bumps [geoip2](https://github.com/maxmind/GeoIP2-java) from 2.16.1 to 3.0.1. - [Release notes](https://github.com/maxmind/GeoIP2-java/releases) - [Changelog](https://github.com/maxmind/GeoIP2-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/maxmind/GeoIP2-java/compare/v2.16.1...v3.0.1) --- updated-dependencies: - dependency-name: com.maxmind.geoip2:geoip2 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c1bdba76..fafbf6f74 100644 --- a/pom.xml +++ b/pom.xml @@ -648,7 +648,7 @@ <dependency> <groupId>com.maxmind.geoip2</groupId> <artifactId>geoip2</artifactId> - <version>2.16.1</version> + <version>3.0.1</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> From 6d10adaa51b7e43391a1cf236c513804e74c78c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 06:50:28 +0000 Subject: [PATCH 333/456] Bump lucene-core from 8.11.1 to 9.2.0 Bumps lucene-core from 8.11.1 to 9.2.0. --- updated-dependencies: - dependency-name: org.apache.lucene:lucene-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c1bdba76..b26f76c36 100644 --- a/pom.xml +++ b/pom.xml @@ -638,7 +638,7 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>8.11.1</version> + <version>9.2.0</version> </dependency> <dependency> <groupId>com.maxmind.db</groupId> From 052c585ef9a7f4be7bd1782df20e2ef5e978c522 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 06:50:32 +0000 Subject: [PATCH 334/456] Bump version.antlr4 from 4.9.3 to 4.10.1 Bumps `version.antlr4` from 4.9.3 to 4.10.1. Updates `antlr4` from 4.9.3 to 4.10.1 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.9.3...4.10.1) Updates `antlr4-runtime` from 4.9.3 to 4.10.1 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.9.3...4.10.1) Updates `antlr4-maven-plugin` from 4.9.3 to 4.10.1 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.9.3...4.10.1) --- updated-dependencies: - dependency-name: org.antlr:antlr4 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.antlr:antlr4-runtime dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.antlr:antlr4-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c1bdba76..47c9c88e2 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.5</version.elastic> - <version.antlr4>4.9.3</version.antlr4> + <version.antlr4>4.10.1</version.antlr4> <version.maven-javadoc-plugin>3.4.0</version.maven-javadoc-plugin> <version.java>11</version.java> </properties> From 0ca682808cdc7aa6cc28d3c0cdf17757505adf4b Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 29 Jun 2022 08:54:55 +0200 Subject: [PATCH 335/456] remove travis and add lgtm yml --- .lgtm.yml | 9 +++++++++ .travis.yml | 22 ---------------------- 2 files changed, 9 insertions(+), 22 deletions(-) create mode 100644 .lgtm.yml delete mode 100644 .travis.yml diff --git a/.lgtm.yml b/.lgtm.yml new file mode 100644 index 000000000..45b8bd248 --- /dev/null +++ b/.lgtm.yml @@ -0,0 +1,9 @@ +# LGTM Settings (https://lgtm.com/) +# For reference, see https://lgtm.com/help/lgtm/lgtm.yml-configuration-file +# or template at https://lgtm.com/static/downloads/lgtm.template.yml + +extraction: + java: + index: + # Specify the Java version required to build the project + java_version: 11 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a2ebbd87c..000000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -language: java -dist: xenial -jdk: -- openjdk8 -- openjdk11 -matrix: - include: - # https://www.deps.co/guides/travis-ci-latest-java/#certificate-issues - - jdk: openjdk15 - before_install: - - rm "${JAVA_HOME}/lib/security/cacerts" - - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts" - -install: true -script: ./mvnw -fae -U -B clean install -P check -after_success: -- curl -Ls https://git.io/deploy-maven-snapshot | bash -- curl -Ls https://git.io/trigger-build | bash -s -- 52North/SOS -- curl -Ls https://git.io/trigger-build | bash -s -- 52North/javaPS -cache: - directories: - - "$HOME/.m2" From d5a2d5229e4a018e73779a848985810be7e1a9fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Jul 2022 04:01:16 +0000 Subject: [PATCH 336/456] Bump kotlin-stdlib from 1.7.0 to 1.7.10 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.7.0 to 1.7.10. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 348b81ec9..07c7ef7b4 100644 --- a/pom.xml +++ b/pom.xml @@ -1071,7 +1071,7 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib</artifactId> - <version>1.7.0</version> + <version>1.7.10</version> <scope>runtime</scope> </dependency> <dependency> From af623875d31377b0bd347e757406d4e8fc21bd38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Jul 2022 04:48:45 +0000 Subject: [PATCH 337/456] Bump kotlin-stdlib from 1.7.0 to 1.7.10 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.7.0 to 1.7.10. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2f7a6e22..238e5022a 100644 --- a/pom.xml +++ b/pom.xml @@ -1073,7 +1073,7 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib</artifactId> - <version>1.7.0</version> + <version>1.7.10</version> <scope>runtime</scope> </dependency> <dependency> From 9dc468b5addf2d1adcd164d51eb2b54f66999846 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 13 Jul 2022 14:12:02 +0200 Subject: [PATCH 338/456] add support for encoding quality in wml/tsml if value is not missing and support further quality values and add tests --- .../org/n52/shetland/ogc/om/values/Value.java | 3 +- .../svalbard/encode/TsmlTVPEncoderv10.java | 252 +++++++----------- .../n52/svalbard/encode/WmlTVPEncoderv20.java | 44 ++- .../encode/TsmlTVPEncoderv10Test.java | 204 +++++++++++--- .../svalbard/encode/WmlTVPEncoderv20Test.java | 218 +++++++++++++-- .../TsmlTVPEncoderv10XmlStreamWriter.java | 155 +++++------ .../WmlTVPEncoderv20XmlStreamWriter.java | 130 ++++----- 7 files changed, 627 insertions(+), 379 deletions(-) diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/Value.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/Value.java index 304e93357..94a58bbf6 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/Value.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/Value.java @@ -26,8 +26,7 @@ * @param <T> * specific value type */ -public interface Value< - T> { +public interface Value<T> { /** * Set the measurment value diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/TsmlTVPEncoderv10.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/TsmlTVPEncoderv10.java index 484fd8d7d..7d32dc9b1 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/TsmlTVPEncoderv10.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/TsmlTVPEncoderv10.java @@ -54,9 +54,12 @@ import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.ogc.sos.response.GetObservationResponse; +import org.n52.shetland.ogc.swe.simpleType.SweCategory; import org.n52.shetland.ogc.swe.simpleType.SweQuality; import org.n52.shetland.ogc.swe.simpleType.SweQualityHolder; import org.n52.shetland.ogc.swe.simpleType.SweQuantity; +import org.n52.shetland.ogc.swe.simpleType.SweQuantityRange; +import org.n52.shetland.ogc.swe.simpleType.SweText; import org.n52.shetland.util.CollectionHelper; import org.n52.shetland.w3c.SchemaLocation; import org.n52.svalbard.encode.exception.EncodingException; @@ -97,8 +100,8 @@ public class TsmlTVPEncoderv10 extends AbstractTsmlEncoderv10 implements WmlTmlH ConformanceClassesTSML.XSD_TIMESERIES_OBSERVATION, ConformanceClassesTSML.XSD_TIMESERIES_TVP_OBSERVATION, ConformanceClassesTSML.XSD_MEASUREMENT_TIMESERIES_TVP); - private static final ImmutableSet<SupportedType> SUPPORTED_TYPES = ImmutableSet.<SupportedType> builder() - .add(new ObservationType(TimeseriesMLConstants.OBSERVATION_TYPE_MEASURMENT_TVP)) + private static final ImmutableSet<SupportedType> SUPPORTED_TYPES = ImmutableSet.< + SupportedType> builder().add(new ObservationType(TimeseriesMLConstants.OBSERVATION_TYPE_MEASURMENT_TVP)) .build(); private static final Set<EncoderKey> ENCODER_KEYS = CollectionHelper.union(getDefaultEncoderKeys(), @@ -112,8 +115,8 @@ public class TsmlTVPEncoderv10 extends AbstractTsmlEncoderv10 implements WmlTmlH private static final String TIMESERIES_ID_PREFIX = "timeseries."; public TsmlTVPEncoderv10() { - LOGGER.debug("Encoder for the following keys initialized successfully: {}!", Joiner.on(", ") - .join(ENCODER_KEYS)); + LOGGER.debug("Encoder for the following keys initialized successfully: {}!", + Joiner.on(", ").join(ENCODER_KEYS)); } @Override @@ -141,8 +144,8 @@ public Set<String> getConformanceClasses(String service, String version) { @Override public Set<String> getSupportedResponseFormats(String service, String version) { - return SUPPORTED_RESPONSE_FORMATS.getOrDefault(service, Collections.emptyMap()) - .getOrDefault(version, Collections.emptySet()); + return SUPPORTED_RESPONSE_FORMATS.getOrDefault(service, Collections.emptyMap()).getOrDefault(version, + Collections.emptySet()); } @Override @@ -171,9 +174,10 @@ public void encode(Object objectToEncode, OutputStream outputStream, EncodingCon throws EncodingException { if (objectToEncode instanceof OmObservation) { try { - new TsmlTVPEncoderv10XmlStreamWriter(ctx.with(EncoderFlags.ENCODER_REPOSITORY, getEncoderRepository()) - .with(XmlEncoderFlags.XML_OPTIONS, (Supplier<XmlOptions>) this::getXmlOptions), outputStream, - (OmObservation) objectToEncode).write(); + new TsmlTVPEncoderv10XmlStreamWriter( + ctx.with(EncoderFlags.ENCODER_REPOSITORY, getEncoderRepository()) + .with(XmlEncoderFlags.XML_OPTIONS, (Supplier<XmlOptions>) this::getXmlOptions), + outputStream, (OmObservation) objectToEncode).write(); } catch (XMLStreamException xmlse) { throw new EncodingException("Error while writing element to stream!", xmlse); } @@ -206,12 +210,10 @@ protected void addObservationType(OMObservationType xbObservation, String observ if (!Strings.isNullOrEmpty(observationType)) { if (observationType.equals(OmConstants.OBS_TYPE_MEASUREMENT) || observationType.equals(TimeseriesMLConstants.OBSERVATION_TYPE_MEASURMENT_TVP)) { - xbObservation.addNewType() - .setHref(TimeseriesMLConstants.OBSERVATION_TYPE_MEASURMENT_TVP); + xbObservation.addNewType().setHref(TimeseriesMLConstants.OBSERVATION_TYPE_MEASURMENT_TVP); } else if (observationType.equals(OmConstants.OBS_TYPE_CATEGORY_OBSERVATION) || observationType.equals(TimeseriesMLConstants.OBSERVATION_TYPE_CATEGORICAL_TVP)) { - xbObservation.addNewType() - .setHref(TimeseriesMLConstants.OBSERVATION_TYPE_CATEGORICAL_TVP); + xbObservation.addNewType().setHref(TimeseriesMLConstants.OBSERVATION_TYPE_CATEGORICAL_TVP); } } } @@ -219,13 +221,10 @@ protected void addObservationType(OMObservationType xbObservation, String observ @Override protected OMObservationType createOmObservationType() { return OMObservationType.Factory.newInstance(getXmlOptions()); - // TODO Auto-generated method stub - // return null; } /** - * Create a XML MeasurementTimeseries object from SOS observation for - * om:result + * Create a XML MeasurementTimeseries object from SOS observation for om:result * * @param sosObservation * SOS observation @@ -244,23 +243,14 @@ private XmlObject createMeasurementTimeseries(OmObservation sosObservation) // Default value TimeseriesMetadata timeseriesMetadata = new MeasurementTimeseriesMetadata().setCumulative(false); - if (sosObservation.isSetValue() && sosObservation.getValue() - .isSetValue() - && sosObservation.getValue() - .getValue() - .getClass() - .isAssignableFrom(TVPValue.class) - && sosObservation.getObservationConstellation() - .isSetMetadata() - && sosObservation.getObservationConstellation() - .getMetadata() - .isSetTimeseriesMetadata()) { - timeseriesMetadata = sosObservation.getObservationConstellation() - .getMetadata() - .getTimeseriesmetadata(); + if (sosObservation.isSetValue() && sosObservation.getValue().isSetValue() + && sosObservation.getValue().getValue().getClass().isAssignableFrom(TVPValue.class) + && sosObservation.getObservationConstellation().isSetMetadata() + && sosObservation.getObservationConstellation().getMetadata().isSetTimeseriesMetadata()) { + timeseriesMetadata = sosObservation.getObservationConstellation().getMetadata().getTimeseriesmetadata(); } - addTimeseriesMetadata(measurementTimeseries, sosObservation.getPhenomenonTime() - .getGmlId(), timeseriesMetadata); + addTimeseriesMetadata(measurementTimeseries, sosObservation.getPhenomenonTime().getGmlId(), + timeseriesMetadata); TimeseriesTVPType.DefaultPointMetadata xbMetaComponent = measurementTimeseries.addNewDefaultPointMetadata(); @@ -269,58 +259,37 @@ private XmlObject createMeasurementTimeseries(OmObservation sosObservation) // Default value InterpolationType interpolationType = InterpolationType.Continuous; - if (sosObservation.isSetValue() && sosObservation.getValue() - .isSetValue() - && sosObservation.getValue() - .getValue() - .getClass() - .isAssignableFrom(TVPValue.class) - && sosObservation.getObservationConstellation() - .isSetDefaultPointMetadata() - && sosObservation.getObservationConstellation() - .getDefaultPointMetadata() + if (sosObservation.isSetValue() && sosObservation.getValue().isSetValue() + && sosObservation.getValue().getValue().getClass().isAssignableFrom(TVPValue.class) + && sosObservation.getObservationConstellation().isSetDefaultPointMetadata() + && sosObservation.getObservationConstellation().getDefaultPointMetadata() .isSetDefaultTVPMeasurementMetadata() - && sosObservation.getObservationConstellation() - .getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .isSetInterpolationType()) { + && sosObservation.getObservationConstellation().getDefaultPointMetadata() + .getDefaultTVPMeasurementMetadata().isSetInterpolationType()) { interpolationType = (InterpolationType) sosObservation.getObservationConstellation() - .getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .getInterpolationtype(); + .getDefaultPointMetadata().getDefaultTVPMeasurementMetadata().getInterpolationtype(); } - defaultTVPMeasurementMetadata.addNewInterpolationType() - .setHref(interpolationType.getIdentifier()); - xbDefMeasureMetaComponent.getPointMetadata() - .getInterpolationType() - .setTitle(interpolationType.getTitle()); + defaultTVPMeasurementMetadata.addNewInterpolationType().setHref(interpolationType.getIdentifier()); + xbDefMeasureMetaComponent.getPointMetadata().getInterpolationType().setTitle(interpolationType.getTitle()); // set aggregationDuration - if (sosObservation.getObservationConstellation() - .getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() + if (sosObservation.getObservationConstellation().getDefaultPointMetadata().getDefaultTVPMeasurementMetadata() .isSetAggregationDuration()) { GDurationBuilder gDurationBuilder = new GDurationBuilder(sosObservation.getObservationConstellation() - .getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .getAggregationDuration()); - xbDefMeasureMetaComponent.getPointMetadata() - .setAggregationDuration(gDurationBuilder.toGDuration()); + .getDefaultPointMetadata().getDefaultTVPMeasurementMetadata().getAggregationDuration()); + xbDefMeasureMetaComponent.getPointMetadata().setAggregationDuration(gDurationBuilder.toGDuration()); } String unit = addValues(measurementTimeseries, sosObservation.getValue()); // set uom if (unit != null && !unit.isEmpty()) { - defaultTVPMeasurementMetadata.addNewUom() - .setCode(unit); + defaultTVPMeasurementMetadata.addNewUom().setCode(unit); } else { OmObservableProperty observableProperty = - (OmObservableProperty) sosObservation.getObservationConstellation() - .getObservableProperty(); + (OmObservableProperty) sosObservation.getObservationConstellation().getObservableProperty(); if (observableProperty.isSetUnit()) { - defaultTVPMeasurementMetadata.addNewUom() - .setCode(observableProperty.getUnit()); + defaultTVPMeasurementMetadata.addNewUom().setCode(observableProperty.getUnit()); } } @@ -336,13 +305,12 @@ private XmlObject createMeasurementTimeseries(AbstractObservationValue<?> observ // Default value TimeseriesMetadata timeseriesMetadata = new MeasurementTimeseriesMetadata().setCumulative(false); - if (observationValue.isSetValue() && observationValue.isSetMetadata() && observationValue.getMetadata() - .isSetTimeseriesMetadata()) { - timeseriesMetadata = observationValue.getMetadata() - .getTimeseriesmetadata(); + if (observationValue.isSetValue() && observationValue.isSetMetadata() + && observationValue.getMetadata().isSetTimeseriesMetadata()) { + timeseriesMetadata = observationValue.getMetadata().getTimeseriesmetadata(); } - addTimeseriesMetadata(measurementTimeseries, observationValue.getPhenomenonTime() - .getGmlId(), timeseriesMetadata); + addTimeseriesMetadata(measurementTimeseries, observationValue.getPhenomenonTime().getGmlId(), + timeseriesMetadata); TimeseriesTVPType.DefaultPointMetadata xbMetaComponent = measurementTimeseries.addNewDefaultPointMetadata(); @@ -352,26 +320,18 @@ private XmlObject createMeasurementTimeseries(AbstractObservationValue<?> observ // Default value InterpolationType interpolationType = InterpolationType.Continuous; if (observationValue.isSetValue() && observationValue.isSetDefaultPointMetadata() - && observationValue.getDefaultPointMetadata() - .isSetDefaultTVPMeasurementMetadata() - && observationValue.getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .isSetInterpolationType()) { + && observationValue.getDefaultPointMetadata().isSetDefaultTVPMeasurementMetadata() && observationValue + .getDefaultPointMetadata().getDefaultTVPMeasurementMetadata().isSetInterpolationType()) { interpolationType = (InterpolationType) observationValue.getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .getInterpolationtype(); + .getDefaultTVPMeasurementMetadata().getInterpolationtype(); } - defaultTVPMeasurementMetadata.addNewInterpolationType() - .setHref(interpolationType.getIdentifier()); - xbDefMeasureMetaComponent.getPointMetadata() - .getInterpolationType() - .setTitle(interpolationType.getTitle()); + defaultTVPMeasurementMetadata.addNewInterpolationType().setHref(interpolationType.getIdentifier()); + xbDefMeasureMetaComponent.getPointMetadata().getInterpolationType().setTitle(interpolationType.getTitle()); String unit = addValues(measurementTimeseries, observationValue); // set uom if (unit != null && !unit.isEmpty()) { - defaultTVPMeasurementMetadata.addNewUom() - .setCode(unit); + defaultTVPMeasurementMetadata.addNewUom().setCode(unit); // } else { // OmObservableProperty observableProperty = // (OmObservableProperty) @@ -391,35 +351,25 @@ private String addValues(TimeseriesTVPType measurementTimeseries, ObservationVal if (observationValue instanceof SingleObservationValue) { SingleObservationValue<?> singleObservationValue = (SingleObservationValue<?>) observationValue; String time = getTimeString(singleObservationValue.getPhenomenonTime()); - unit = singleObservationValue.getValue() - .getUnit(); + unit = singleObservationValue.getValue().getUnit(); if (singleObservationValue.getValue() instanceof QuantityValue) { QuantityValue quantityValue = (QuantityValue) singleObservationValue.getValue(); - measurementTimeseries.addNewPoint() - .set(addValuesToMeasurementTVP(time, quantityValue)); + measurementTimeseries.addNewPoint().set(addValuesToMeasurementTVP(time, quantityValue)); } else if (singleObservationValue.getValue() instanceof CountValue) { CountValue countValue = (CountValue) singleObservationValue.getValue(); - measurementTimeseries.addNewPoint() - .set(addValuesToMeasurementTVP(time, countValue)); + measurementTimeseries.addNewPoint().set(addValuesToMeasurementTVP(time, countValue)); } else if (singleObservationValue.getValue() instanceof ProfileValue) { ProfileValue profileValue = (ProfileValue) singleObservationValue.getValue(); if (profileValue.isSetValue()) { - if (profileValue.getValue() - .iterator() - .next() - .getSimpleValue() instanceof QuantityValue) { - QuantityValue quantityValue = (QuantityValue) profileValue.getValue() - .iterator() - .next() - .getSimpleValue(); - measurementTimeseries.addNewPoint() - .set(addValuesToMeasurementTVP(time, quantityValue)); + if (profileValue.getValue().iterator().next().getSimpleValue() instanceof QuantityValue) { + QuantityValue quantityValue = + (QuantityValue) profileValue.getValue().iterator().next().getSimpleValue(); + measurementTimeseries.addNewPoint().set(addValuesToMeasurementTVP(time, quantityValue)); } } } else if (checkSweDataArray(observationValue.getValue())) { SweDataArrayValue sweDataArrayValue = (SweDataArrayValue) observationValue.getValue(); - for (List<String> list : sweDataArrayValue.getValue() - .getValues()) { + for (List<String> list : sweDataArrayValue.getValue().getValues()) { for (int i = 0; i < list.size(); i = i + 2) { measurementTimeseries.addNewPoint() .set(addValuesToMeasurementTVP(list.get(i), list.get(i + 1))); @@ -435,32 +385,22 @@ private String addValues(TimeseriesTVPType measurementTimeseries, ObservationVal String time = getTimeString(timeValuePair.getTime()); if (timeValuePair.getValue() instanceof QuantityValue) { QuantityValue quantityValue = (QuantityValue) timeValuePair.getValue(); - measurementTimeseries.addNewPoint() - .set(addValuesToMeasurementTVP(time, quantityValue)); + measurementTimeseries.addNewPoint().set(addValuesToMeasurementTVP(time, quantityValue)); } else if (timeValuePair.getValue() instanceof ProfileValue) { ProfileValue profileValue = (ProfileValue) timeValuePair.getValue(); if (profileValue.isSetValue()) { - if (profileValue.getValue() - .iterator() - .next() - .getSimpleValue() instanceof QuantityValue) { - QuantityValue quantityValue = (QuantityValue) profileValue.getValue() - .iterator() - .next() - .getSimpleValue(); - measurementTimeseries.addNewPoint() - .set(addValuesToMeasurementTVP(time, quantityValue)); + if (profileValue.getValue().iterator().next().getSimpleValue() instanceof QuantityValue) { + QuantityValue quantityValue = + (QuantityValue) profileValue.getValue().iterator().next().getSimpleValue(); + measurementTimeseries.addNewPoint().set(addValuesToMeasurementTVP(time, quantityValue)); } } } else if (timeValuePair.getValue() instanceof CountValue) { CountValue countValue = (CountValue) timeValuePair.getValue(); - measurementTimeseries.addNewPoint() - .set(addValuesToMeasurementTVP(time, countValue)); + measurementTimeseries.addNewPoint().set(addValuesToMeasurementTVP(time, countValue)); } else { throw new NoApplicableCodeException().withMessage("The types of values '%s' is not yet supported", - mov.getValue() - .getClass() - .getSimpleName()); + mov.getValue().getClass().getSimpleName()); } } } @@ -504,63 +444,61 @@ private MeasurementTVPPropertyType addValuesToMeasurementTVP(String time, CountV * value as string */ private void addValuesToMeasurementTVP(MeasurementTVPType measurementTVP, String time, String value) { - measurementTVP.addNewTime() - .setStringValue(time); + measurementTVP.addNewTime().setStringValue(time); if (value == null || value.isEmpty()) { - measurementTVP.addNewValue() - .setNil(); - addMeasurmentMetadataMissing(measurementTVP.addNewMetadata() - .addNewPointMetadata()); + measurementTVP.addNewValue().setNil(); + addMeasurmentMetadataMissing(measurementTVP.addNewMetadata().addNewPointMetadata()); } else { - measurementTVP.addNewValue() - .setStringValue(value); + measurementTVP.addNewValue().setStringValue(value); } } private void addValuesToMeasurementTVP(MeasurementTVPType measurementTVP, String time, QuantityValue value) throws EncodingException { - measurementTVP.addNewTime() - .setStringValue(time); + measurementTVP.addNewTime().setStringValue(time); if (value.isSetValue()) { - measurementTVP.addNewValue() - .setStringValue(value.getValue() - .toPlainString()); + measurementTVP.addNewValue().setStringValue(value.getValue().toPlainString()); + if (value.isSetQuality() && checkQuality(value.getQuality())) { + addMeasurmentMetadata(measurementTVP.addNewMetadata().addNewPointMetadata(), + value.getQuality()); + } } else { - measurementTVP.addNewValue() - .setNil(); + measurementTVP.addNewValue().setNil(); if (value.isSetQuality()) { - addMeasurmentMetadata(measurementTVP.addNewMetadata() - .addNewPointMetadata(), value.getQuality()); + addMeasurmentMetadata(measurementTVP.addNewMetadata().addNewPointMetadata(), value.getQuality()); } else { - addMeasurmentMetadataMissing(measurementTVP.addNewMetadata() - .addNewPointMetadata()); + addMeasurmentMetadataMissing(measurementTVP.addNewMetadata().addNewPointMetadata()); } } } + private boolean checkQuality(SweQualityHolder quality) { + if (quality.isSetQuality()) { + return quality.getQuality().stream().filter(q -> q instanceof SweQuantity).findFirst().isPresent(); + } + return false; + } + private void addValuesToMeasurementTVP(MeasurementTVPType measurementTVPType, String time, CountValue value) { addValuesToMeasurementTVP(measurementTVPType, time, value.isSetValue() ? Integer.toString(value.getValue()) : null); } private void addMeasurmentMetadataMissing(PointMetadataType metadata) { - metadata.addNewNilReason() - .setNilReason("missing"); + metadata.addNewNilReason().setNilReason("missing"); } private void addMeasurmentMetadata(PointMetadataType metadata, SweQualityHolder quality) throws EncodingException { - if (quality.isSetReferences() && quality.getReferences() - .containsKey(TimeseriesMLConstants.EN_CENSORED_REASON)) { - ReferenceType reference = quality.getReferences() - .get(TimeseriesMLConstants.EN_CENSORED_REASON); + if (quality.isSetReferences() + && quality.getReferences().containsKey(TimeseriesMLConstants.EN_CENSORED_REASON)) { + ReferenceType reference = quality.getReferences().get(TimeseriesMLConstants.EN_CENSORED_REASON); XmlObject xmlReferenceType = encodeGML(reference); - metadata.addNewCensoredReason() - .set(xmlReferenceType); + metadata.addNewCensoredReason().set(xmlReferenceType); } if (quality.isSetQuality()) { for (SweQuality qualifier : quality.getQuality()) { if (qualifier instanceof SweQuantity) { - XmlObject xmlQuality = encodeSweCommon(quality); + XmlObject xmlQuality = encodeSweCommon(qualifier); metadata.addNewQualifier() .addNewQuantity() .set(xmlQuality); @@ -570,19 +508,17 @@ private void addMeasurmentMetadata(PointMetadataType metadata, SweQualityHolder } private void addTimeseriesMetadata(TimeseriesTVPType mtt, String gmlId, TimeseriesMetadata timeseriesMetadata) { - TimeseriesMetadataType mtmt = (TimeseriesMetadataType) mtt.addNewMetadata() - .addNewTimeseriesMetadata() + TimeseriesMetadataType mtmt = (TimeseriesMetadataType) mtt.addNewMetadata().addNewTimeseriesMetadata() .substitute(TimeseriesMLConstants.QN_MEASUREMENT_TIMESERIES_METADATA, TimeseriesMetadataType.type); createMeasurementTimeseriesMetadataType(mtmt, gmlId); - if (timeseriesMetadata != null && timeseriesMetadata.getClass() - .isAssignableFrom(MeasurementTimeseriesMetadata.class)) { + if (timeseriesMetadata != null + && timeseriesMetadata.getClass().isAssignableFrom(MeasurementTimeseriesMetadata.class)) { mtmt.setCumulative(((MeasurementTimeseriesMetadata) timeseriesMetadata).isCumulative()); } } private TimeseriesMetadataType createMeasurementTimeseriesMetadataType(TimeseriesMetadataType mtmt, String gmlId) { - mtmt.addNewTemporalExtent() - .setHref("#" + gmlId); + mtmt.addNewTemporalExtent().setHref("#" + gmlId); return mtmt; } } diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/WmlTVPEncoderv20.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/WmlTVPEncoderv20.java index 39680ea1b..8c9632a91 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/WmlTVPEncoderv20.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/WmlTVPEncoderv20.java @@ -54,9 +54,12 @@ import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.ogc.sos.response.GetObservationResponse; +import org.n52.shetland.ogc.swe.simpleType.SweCategory; import org.n52.shetland.ogc.swe.simpleType.SweQuality; import org.n52.shetland.ogc.swe.simpleType.SweQualityHolder; import org.n52.shetland.ogc.swe.simpleType.SweQuantity; +import org.n52.shetland.ogc.swe.simpleType.SweQuantityRange; +import org.n52.shetland.ogc.swe.simpleType.SweText; import org.n52.shetland.util.CollectionHelper; import org.n52.shetland.w3c.SchemaLocation; import org.n52.svalbard.encode.exception.EncodingException; @@ -219,8 +222,7 @@ protected void addObservationType(OMObservationType xbObservation, String observ @Override protected OMObservationType createOmObservationType() { - // TODO Auto-generated method stub - return null; + return OMObservationType.Factory.newInstance(getXmlOptions()); } /** @@ -492,21 +494,20 @@ private void addValuesToMeasurementTVP(MeasureTVPType measurementTVP, String tim private void addValuesToMeasurementTVP(MeasureTVPType measurementTVP, String time, QuantityValue value) throws EncodingException { - measurementTVP.addNewTime() - .setStringValue(time); + measurementTVP.addNewTime().setStringValue(time); if (value.isSetValue()) { - measurementTVP.addNewValue() - .setStringValue(value.getValue() - .toPlainString()); + measurementTVP.addNewValue().setStringValue(value.getValue().toPlainString()); + if (value.isSetQuality()) { + addMeasurmentMetadata(measurementTVP.addNewMetadata().addNewTVPMeasurementMetadata(), + value.getQuality()); + } } else { - measurementTVP.addNewValue() - .setNil(); + measurementTVP.addNewValue().setNil(); if (value.isSetQuality()) { - addMeasurmentMetadata(measurementTVP.addNewMetadata() - .addNewTVPMeasurementMetadata(), value.getQuality()); + addMeasurmentMetadata(measurementTVP.addNewMetadata().addNewTVPMeasurementMetadata(), + value.getQuality()); } else { - addMeasurmentMetadataMissing(measurementTVP.addNewMetadata() - .addNewTVPMeasurementMetadata()); + addMeasurmentMetadataMissing(measurementTVP.addNewMetadata().addNewTVPMeasurementMetadata()); } } } @@ -534,10 +535,25 @@ private void addMeasurmentMetadata(TVPMeasurementMetadataType metadata, SweQuali if (quality.isSetQuality()) { for (SweQuality qualifier : quality.getQuality()) { if (qualifier instanceof SweQuantity) { - XmlObject xmlQuality = encodeSweCommon(quality); + XmlObject xmlQuality = encodeSweCommon(qualifier); metadata.addNewQualifier() .addNewQuantity() .set(xmlQuality); + } else if (qualifier instanceof SweText) { + XmlObject xmlQuality = encodeSweCommon(qualifier); + metadata.addNewQualifier() + .addNewText() + .set(xmlQuality); + } else if (qualifier instanceof SweCategory) { + XmlObject xmlQuality = encodeSweCommon(qualifier); + metadata.addNewQualifier() + .addNewCategory() + .set(xmlQuality); + } else if (qualifier instanceof SweQuantityRange) { + XmlObject xmlQuality = encodeSweCommon(qualifier); + metadata.addNewQualifier() + .addNewQuantityRange() + .set(xmlQuality); } } } diff --git a/svalbard/xmlbeans/src/test/java/org/n52/svalbard/encode/TsmlTVPEncoderv10Test.java b/svalbard/xmlbeans/src/test/java/org/n52/svalbard/encode/TsmlTVPEncoderv10Test.java index 47cb0e5b9..754808976 100644 --- a/svalbard/xmlbeans/src/test/java/org/n52/svalbard/encode/TsmlTVPEncoderv10Test.java +++ b/svalbard/xmlbeans/src/test/java/org/n52/svalbard/encode/TsmlTVPEncoderv10Test.java @@ -15,10 +15,14 @@ */ package org.n52.svalbard.encode; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigDecimal; import java.util.Arrays; import java.util.Date; import java.util.List; +import org.apache.xmlbeans.XmlBeans; import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; @@ -29,6 +33,7 @@ import org.joda.time.DateTimeZone; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.n52.shetland.ogc.OGCConstants; import org.n52.shetland.ogc.gml.AbstractFeature; import org.n52.shetland.ogc.gml.CodeWithAuthority; import org.n52.shetland.ogc.gml.time.TimeInstant; @@ -39,6 +44,7 @@ import org.n52.shetland.ogc.om.OmObservableProperty; import org.n52.shetland.ogc.om.OmObservation; import org.n52.shetland.ogc.om.OmObservationConstellation; +import org.n52.shetland.ogc.om.SingleObservationValue; import org.n52.shetland.ogc.om.TimeValuePair; import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeature; import org.n52.shetland.ogc.om.series.DefaultPointMetadata; @@ -47,10 +53,15 @@ import org.n52.shetland.ogc.om.series.tsml.DefaultTVPMeasurementMetadata; import org.n52.shetland.ogc.om.series.tsml.TimeseriesMLConstants; import org.n52.shetland.ogc.om.series.tsml.TimeseriesMLConstants.InterpolationType; +import org.n52.shetland.ogc.om.series.wml.WaterMLConstants; import org.n52.shetland.ogc.om.values.MultiValue; import org.n52.shetland.ogc.om.values.QuantityValue; import org.n52.shetland.ogc.om.values.TVPValue; import org.n52.shetland.ogc.sos.SosProcedureDescriptionUnknownType; +import org.n52.shetland.ogc.swe.simpleType.SweQuality; +import org.n52.shetland.ogc.swe.simpleType.SweQualityHolder; +import org.n52.shetland.ogc.swe.simpleType.SweQuantity; +import org.n52.shetland.ogc.swe.simpleType.SweText; import org.n52.shetland.util.CollectionHelper; import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.encode.exception.EncodingException; @@ -73,16 +84,18 @@ public class TsmlTVPEncoderv10Test { private ObservationValue<MultiValue<List<TimeValuePair>>> mv; - private static final String PROCEDURE = "proceduretest"; - - private static final String OFFERING = "offeringtest"; - - private static final String CODE_SPACE = "codespacetest"; + private static final String PROCEDURE = "phttp://example.tld/rocedure"; + private static final String OFFERING = "http://example.tld/offering"; + private static final String FEATURE = "http://example.tld/feature"; + private static final String OBSERVABLE_PROPERTY = "http://example.tld/phenomenon"; + private static final String CODE_SPACE = "http://example.tld/codespace"; + private static final DateTime DATE_TIME = new DateTime(UTC_TIMESTAMP); private static final String TOKEN_SEPERATOR = "##"; - private static final String TUPLE_SEPERATOR = "@@"; + private static final String RECREATIONAL = "Recreational"; + @BeforeEach public void initObjects() { encoder = new TsmlTVPEncoderv10(); @@ -108,8 +121,7 @@ public void initObjects() { samsEncoderv20, sweEncoderv20)); encoderRepository.init(); - encoderRepository.getEncoders() - .stream() + encoderRepository.getEncoders().stream() .forEach(e -> ((AbstractDelegatingEncoder<?, ?>) e).setEncoderRepository(encoderRepository)); MultiValue<List<TimeValuePair>> value = new TVPValue(); @@ -133,14 +145,11 @@ public void shouldSetDefaultCumulativeProperty() throws EncodingException { MatcherAssert.assertThat(encodedElement, CoreMatchers.instanceOf(TimeseriesTVPDocument.class)); final TimeseriesTVPDocument timeseriesDocument = (TimeseriesTVPDocument) encodedElement; - MatcherAssert.assertThat(timeseriesDocument.getTimeseriesTVP() - .isSetMetadata(), Is.is(true)); - MatcherAssert.assertThat(timeseriesDocument.getTimeseriesTVP() - .getMetadata() - .getTimeseriesMetadata(), CoreMatchers.instanceOf(TimeseriesMetadataType.class)); - final TimeseriesMetadataType measurementTimeseriesMetadataType = timeseriesDocument.getTimeseriesTVP() - .getMetadata() - .getTimeseriesMetadata(); + MatcherAssert.assertThat(timeseriesDocument.getTimeseriesTVP().isSetMetadata(), Is.is(true)); + MatcherAssert.assertThat(timeseriesDocument.getTimeseriesTVP().getMetadata().getTimeseriesMetadata(), + CoreMatchers.instanceOf(TimeseriesMetadataType.class)); + final TimeseriesMetadataType measurementTimeseriesMetadataType = + timeseriesDocument.getTimeseriesTVP().getMetadata().getTimeseriesMetadata(); MatcherAssert.assertThat(measurementTimeseriesMetadataType.isSetCumulative(), Is.is(true)); MatcherAssert.assertThat(measurementTimeseriesMetadataType.getCumulative(), Is.is(false)); } @@ -151,10 +160,8 @@ public void shouldEncodeCumulativeProperty() throws EncodingException { XmlObject encodedElement = encoder.encode(mv); - MatcherAssert.assertThat(((TimeseriesTVPDocument) encodedElement).getTimeseriesTVP() - .getMetadata() - .getTimeseriesMetadata() - .getCumulative(), Is.is(true)); + MatcherAssert.assertThat(((TimeseriesTVPDocument) encodedElement).getTimeseriesTVP().getMetadata() + .getTimeseriesMetadata().getCumulative(), Is.is(true)); } @Test @@ -167,12 +174,10 @@ public void shouldEncodeInterpolationType() throws EncodingException, XmlExcepti XmlObject encodedElement = encoder.encode(mv); TimeseriesTVPType.DefaultPointMetadata defaultPointMetadata = - ((TimeseriesTVPDocument) encodedElement).getTimeseriesTVP() - .getDefaultPointMetadata(); + ((TimeseriesTVPDocument) encodedElement).getTimeseriesTVP().getDefaultPointMetadata(); PointMetadataDocument tvpMeasurementMetadataDocument = PointMetadataDocument.Factory.parse(defaultPointMetadata.xmlText()); - ReferenceType interpolationType = tvpMeasurementMetadataDocument.getPointMetadata() - .getInterpolationType(); + ReferenceType interpolationType = tvpMeasurementMetadataDocument.getPointMetadata().getInterpolationType(); MatcherAssert.assertThat(interpolationType.getHref(), Is.is(TimeseriesMLConstants.InterpolationType.MinPrec.getIdentifier())); MatcherAssert.assertThat(interpolationType.getTitle(), @@ -184,12 +189,10 @@ public void shouldEncodeInterpolationTypeContinuousAsDefault() throws EncodingEx XmlObject encodedElement = encoder.encode(mv); TimeseriesTVPType.DefaultPointMetadata defaultPointMetadata = - ((TimeseriesTVPDocument) encodedElement).getTimeseriesTVP() - .getDefaultPointMetadata(); + ((TimeseriesTVPDocument) encodedElement).getTimeseriesTVP().getDefaultPointMetadata(); PointMetadataDocument tvpMeasurementMetadataDocument = PointMetadataDocument.Factory.parse(defaultPointMetadata.xmlText()); - ReferenceType interpolationType = tvpMeasurementMetadataDocument.getPointMetadata() - .getInterpolationType(); + ReferenceType interpolationType = tvpMeasurementMetadataDocument.getPointMetadata().getInterpolationType(); MatcherAssert.assertThat(interpolationType.getHref(), Is.is(TimeseriesMLConstants.InterpolationType.Continuous.getIdentifier())); MatcherAssert.assertThat(interpolationType.getTitle(), @@ -199,11 +202,58 @@ public void shouldEncodeInterpolationTypeContinuousAsDefault() throws EncodingEx @Test public void shouldEncodeOMObservation() throws EncodingException, XmlException, DecodingException { XmlObject encodedElement = - encoder.encode(createObservation(), EncodingContext.of(XmlBeansEncodingFlags.DOCUMENT)); + encoder.encode(createComplexObservation(), EncodingContext.of(XmlBeansEncodingFlags.DOCUMENT)); MatcherAssert.assertThat(XmlHelper.validateDocument(encodedElement), Is.is(true)); } - private OmObservation createObservation() { + @Test + public void shouldEncodeQualifier() throws EncodingException, XmlException, DecodingException { + XmlObject encodedElement = encoder.encode(createQualifierObservation()); + MatcherAssert.assertThat(XmlHelper.validateDocument(encodedElement), Is.is(true)); + } + + @Test + public void shouldEncodeQualifierStream() throws EncodingException, XmlException, IOException, DecodingException { + try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) { + encoder.encode(createQualifierObservation(), baos, EncodingContext.empty()); + XmlObject encodedElement = XmlObject.Factory.parse(baos.toString()); + MatcherAssert.assertThat(XmlHelper.validateDocument(encodedElement), Is.is(true)); + } + } + + @Test + public void shouldEncodeQualifierQuantity() throws EncodingException, XmlException, DecodingException { + XmlObject encodedElement = encoder.encode(createQualifierQuantityObservation()); + MatcherAssert.assertThat(XmlHelper.validateDocument(encodedElement), Is.is(true)); + } + + @Test + public void shouldEncodeQualifierQuantityStream() + throws EncodingException, XmlException, IOException, DecodingException { + try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) { + encoder.encode(createQualifierQuantityObservation(), baos, EncodingContext.empty()); + XmlObject encodedElement = XmlObject.Factory.parse(baos.toString()); + MatcherAssert.assertThat(XmlHelper.validateDocument(encodedElement), Is.is(true)); + } + } + + @Test + public void shouldEncodeDetectionLimit() throws EncodingException, XmlException, DecodingException { + XmlObject encodedElement = encoder.encode(createDetectionLimitObservation()); + MatcherAssert.assertThat(XmlHelper.validateDocument(encodedElement), Is.is(true)); + } + + @Test + public void shouldEncodeDetectionLimitStream() + throws EncodingException, XmlException, IOException, DecodingException { + try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) { + encoder.encode(createDetectionLimitObservation(), baos, EncodingContext.empty()); + XmlObject encodedElement = XmlObject.Factory.parse(baos.toString()); + MatcherAssert.assertThat(XmlHelper.validateDocument(encodedElement), Is.is(true)); + } + } + + private OmObservation createComplexObservation() { final InterpolationType type = TimeseriesMLConstants.InterpolationType.InstantTotal; DateTime now = new DateTime(DateTimeZone.UTC); TimeInstant resultTime = new TimeInstant(now); @@ -228,4 +278,98 @@ private OmObservation createObservation() { observation.setValue(mv); return observation; } + + private OmObservation createDetectionLimitObservation() { + TimeInstant phenomenonTime = new TimeInstant(DATE_TIME); + OmObservation observation = createObservation(); + QuantityValue value = new QuantityValue(); + value.setUom("unit"); + SweQualityHolder holder = new SweQualityHolder(); + holder.addReference(WaterMLConstants.EN_CENSORED_REASON, createCensoredReference()); + holder.addQuality(createDetectionLimit()); + value.setQuality(holder); + observation.setValue(new SingleObservationValue<>(phenomenonTime, value)); + return observation; + } + + private OmObservation createQualifierObservation() { + TimeInstant phenomenonTime = new TimeInstant(DATE_TIME); + OmObservation observation = createObservation(); + QuantityValue value = new QuantityValue(); + value.setUom("unit"); + value.setValue(42.0); + SweQualityHolder holder = new SweQualityHolder(); + holder.addQuality(createQualifier()); + holder.addQuality(createGrade()); + value.setQuality(holder); + observation.setValue(new SingleObservationValue<>(phenomenonTime, value)); + return observation; + } + + private OmObservation createQualifierQuantityObservation() { + TimeInstant phenomenonTime = new TimeInstant(DATE_TIME); + OmObservation observation = createObservation(); + QuantityValue value = new QuantityValue(); + value.setUom("unit"); + value.setValue(42.0); + SweQualityHolder holder = new SweQualityHolder(); + holder.addQuality(createDetectionLimit()); + value.setQuality(holder); + observation.setValue(new SingleObservationValue<>(phenomenonTime, value)); + return observation; + } + + private OmObservation createObservation() { + TimeInstant resultTime = new TimeInstant(DATE_TIME); + TimePeriod validTime = new TimePeriod(DATE_TIME.minusMinutes(5), DATE_TIME.plusMinutes(5)); + OmObservation observation = new OmObservation(); + OmObservationConstellation observationConstellation = new OmObservationConstellation(); + observationConstellation.setFeatureOfInterest(new SamplingFeature(new CodeWithAuthority(FEATURE, CODE_SPACE))); + OmObservableProperty observableProperty = new OmObservableProperty(OBSERVABLE_PROPERTY); + observationConstellation.setObservableProperty(observableProperty); + observationConstellation.setObservationType(OmConstants.OBS_TYPE_MEASUREMENT); + observationConstellation.addOffering(OFFERING); + AbstractFeature procedure = new SosProcedureDescriptionUnknownType(PROCEDURE); + observationConstellation.setProcedure(procedure); + observationConstellation.setDefaultPointMetadata(new DefaultPointMetadata()); + observationConstellation.getDefaultPointMetadata() + .setDefaultTVPMeasurementMetadata(new DefaultTVPMeasurementMetadata()); + observation.setObservationConstellation(observationConstellation); + observation.setParameter(null); + observation.setResultTime(resultTime); + observation.setTokenSeparator(TOKEN_SEPERATOR); + observation.setTupleSeparator(TUPLE_SEPERATOR); + observation.setValidTime(validTime); + return observation; + } + + private org.n52.shetland.ogc.gml.ReferenceType createCensoredReference() { + return new org.n52.shetland.ogc.gml.ReferenceType(OGCConstants.BELOW_DETECTION_RANGE, + "Below threshold of sensor"); + } + + private SweQuality createDetectionLimit() { + SweQuantity quantity = new SweQuantity(); + quantity.setDefinition("http://www.example.com/sensors/lower_threshold"); + quantity.setDescription("Lower limit for sensor"); + quantity.setUom("m"); + quantity.setValue(new BigDecimal("1.0")); + return quantity; + } + + private SweQuality createQualifier() { + return createText("No Quality or Non-Verifies (NEMS)", "NON-VERIFIED", "200"); + } + + private SweQuality createGrade() { + return createText(RECREATIONAL, RECREATIONAL, RECREATIONAL); + } + + private SweText createText(String description, String label, String value) { + SweText text = new SweText(); + text.setLabel(label); + text.setDescription(description); + text.setValue(value); + return text; + } } diff --git a/svalbard/xmlbeans/src/test/java/org/n52/svalbard/encode/WmlTVPEncoderv20Test.java b/svalbard/xmlbeans/src/test/java/org/n52/svalbard/encode/WmlTVPEncoderv20Test.java index 77a89db6b..a09d7505a 100644 --- a/svalbard/xmlbeans/src/test/java/org/n52/svalbard/encode/WmlTVPEncoderv20Test.java +++ b/svalbard/xmlbeans/src/test/java/org/n52/svalbard/encode/WmlTVPEncoderv20Test.java @@ -17,30 +17,63 @@ import static org.hamcrest.MatcherAssert.assertThat; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigDecimal; +import java.util.Arrays; import java.util.Date; import java.util.List; import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; +import org.apache.xmlbeans.XmlOptions; import org.hamcrest.CoreMatchers; +import org.hamcrest.MatcherAssert; import org.hamcrest.core.Is; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.n52.shetland.ogc.OGCConstants; +import org.n52.shetland.ogc.gml.AbstractFeature; +import org.n52.shetland.ogc.gml.CodeWithAuthority; import org.n52.shetland.ogc.gml.time.TimeInstant; +import org.n52.shetland.ogc.gml.time.TimePeriod; import org.n52.shetland.ogc.om.MultiObservationValues; import org.n52.shetland.ogc.om.ObservationValue; +import org.n52.shetland.ogc.om.OmCompositePhenomenon; +import org.n52.shetland.ogc.om.OmConstants; +import org.n52.shetland.ogc.om.OmObservableProperty; +import org.n52.shetland.ogc.om.OmObservation; +import org.n52.shetland.ogc.om.OmObservationConstellation; +import org.n52.shetland.ogc.om.SingleObservationValue; import org.n52.shetland.ogc.om.TimeValuePair; +import org.n52.shetland.ogc.om.features.samplingFeatures.SamplingFeature; import org.n52.shetland.ogc.om.series.DefaultPointMetadata; import org.n52.shetland.ogc.om.series.MeasurementTimeseriesMetadata; import org.n52.shetland.ogc.om.series.Metadata; import org.n52.shetland.ogc.om.series.wml.DefaultTVPMeasurementMetadata; import org.n52.shetland.ogc.om.series.wml.WaterMLConstants; import org.n52.shetland.ogc.om.series.wml.WaterMLConstants.InterpolationType; +import org.n52.shetland.ogc.om.values.ComplexValue; import org.n52.shetland.ogc.om.values.MultiValue; import org.n52.shetland.ogc.om.values.QuantityValue; import org.n52.shetland.ogc.om.values.TVPValue; +import org.n52.shetland.ogc.sos.SosProcedureDescriptionUnknownType; +import org.n52.shetland.ogc.swe.SweDataRecord; +import org.n52.shetland.ogc.swe.SweField; +import org.n52.shetland.ogc.swe.simpleType.SweBoolean; +import org.n52.shetland.ogc.swe.simpleType.SweCategory; +import org.n52.shetland.ogc.swe.simpleType.SweCount; +import org.n52.shetland.ogc.swe.simpleType.SweQuality; +import org.n52.shetland.ogc.swe.simpleType.SweQualityHolder; +import org.n52.shetland.ogc.swe.simpleType.SweQuantity; +import org.n52.shetland.ogc.swe.simpleType.SweText; import org.n52.shetland.util.CollectionHelper; +import org.n52.svalbard.decode.exception.DecodingException; import org.n52.svalbard.encode.exception.EncodingException; +import org.n52.svalbard.util.XmlHelper; import net.opengis.gml.x32.ReferenceType; import net.opengis.waterml.x20.DefaultTVPMeasurementMetadataDocument; @@ -49,13 +82,23 @@ import net.opengis.waterml.x20.TVPDefaultMetadataPropertyType; /** - * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk - * Jürrens</a> + * @author <a href="mailto:e.h.juerrens@52north.org">Eike Hinderk Jürrens</a> * @since 1.0.0 */ public class WmlTVPEncoderv20Test { private static final long UTC_TIMESTAMP = 43200l; + private static final String PROCEDURE = "phttp://example.tld/rocedure"; + private static final String OFFERING = "http://example.tld/offering"; + private static final String FEATURE = "http://example.tld/feature"; + private static final String OBSERVABLE_PROPERTY = "http://example.tld/phenomenon"; + private static final String CODE_SPACE = "http://example.tld/codespace"; + private static final DateTime DATE_TIME = new DateTime(UTC_TIMESTAMP); + + private static final String TOKEN_SEPERATOR = "##"; + private static final String TUPLE_SEPERATOR = "@@"; + + private static final String RECREATIONAL = "Recreational"; private WmlTVPEncoderv20 encoder; @@ -64,6 +107,33 @@ public class WmlTVPEncoderv20Test { @BeforeEach public void initObjects() { encoder = new WmlTVPEncoderv20(); + encoder.setXmlOptions(XmlOptions::new); + + OmEncoderv20 omEncoderv20 = new OmEncoderv20(); + omEncoderv20.setXmlOptions(XmlOptions::new); + + GmlEncoderv321 gmlEncoderv321 = new GmlEncoderv321(); + gmlEncoderv321.setXmlOptions(XmlOptions::new); + + SensorMLEncoderv20 sensorMLEncoderv20 = new SensorMLEncoderv20(); + sensorMLEncoderv20.setXmlOptions(XmlOptions::new); + + SweCommonEncoderv20 sweCommonEncoderv20 = new SweCommonEncoderv20(); + sweCommonEncoderv20.setXmlOptions(XmlOptions::new); + + SamplingEncoderv20 samsEncoderv20 = new SamplingEncoderv20(); + samsEncoderv20.setXmlOptions(XmlOptions::new); + + SweCommonEncoderv20 sweEncoderv20 = new SweCommonEncoderv20(); + sweEncoderv20.setXmlOptions(XmlOptions::new); + + EncoderRepository encoderRepository = new EncoderRepository(); + encoderRepository.setEncoders(Arrays.asList(encoder, omEncoderv20, gmlEncoderv321, sensorMLEncoderv20, + sweCommonEncoderv20, samsEncoderv20, sweEncoderv20)); + encoderRepository.init(); + + encoderRepository.getEncoders().stream() + .forEach(e -> ((AbstractDelegatingEncoder<?, ?>) e).setEncoderRepository(encoderRepository)); MultiValue<List<TimeValuePair>> value = new TVPValue(); String unit = "test-unit"; @@ -84,14 +154,11 @@ public void shouldSetDefaultCumulativeProperty() throws EncodingException { assertThat(encodedElement, CoreMatchers.instanceOf(MeasurementTimeseriesDocument.class)); final MeasurementTimeseriesDocument measurementTimeseriesDocument = (MeasurementTimeseriesDocument) encodedElement; - assertThat(measurementTimeseriesDocument.getTimeseries() - .isSetMetadata(), Is.is(true)); - assertThat(measurementTimeseriesDocument.getTimeseries() - .getMetadata() - .getTimeseriesMetadata(), CoreMatchers.instanceOf(MeasurementTimeseriesMetadataType.class)); + assertThat(measurementTimeseriesDocument.getTimeseries().isSetMetadata(), Is.is(true)); + assertThat(measurementTimeseriesDocument.getTimeseries().getMetadata().getTimeseriesMetadata(), + CoreMatchers.instanceOf(MeasurementTimeseriesMetadataType.class)); final MeasurementTimeseriesMetadataType measurementTimeseriesMetadataType = - (MeasurementTimeseriesMetadataType) measurementTimeseriesDocument.getTimeseries() - .getMetadata() + (MeasurementTimeseriesMetadataType) measurementTimeseriesDocument.getTimeseries().getMetadata() .getTimeseriesMetadata(); assertThat(measurementTimeseriesMetadataType.isSetCumulative(), Is.is(true)); assertThat(measurementTimeseriesMetadataType.getCumulative(), Is.is(false)); @@ -103,11 +170,8 @@ public void shouldEncodeCumulativeProperty() throws EncodingException { XmlObject encodedElement = encoder.encode(mv); - assertThat( - ((MeasurementTimeseriesMetadataType) ((MeasurementTimeseriesDocument) encodedElement).getTimeseries() - .getMetadata() - .getTimeseriesMetadata()).getCumulative(), - Is.is(true)); + assertThat(((MeasurementTimeseriesMetadataType) ((MeasurementTimeseriesDocument) encodedElement) + .getTimeseries().getMetadata().getTimeseriesMetadata()).getCumulative(), Is.is(true)); } @Test @@ -120,12 +184,11 @@ public void shouldEncodeInterpolationType() throws EncodingException, XmlExcepti XmlObject encodedElement = encoder.encode(mv); TVPDefaultMetadataPropertyType defaultPointMetadata = - ((MeasurementTimeseriesDocument) encodedElement).getTimeseries() - .getDefaultPointMetadataArray(0); + ((MeasurementTimeseriesDocument) encodedElement).getTimeseries().getDefaultPointMetadataArray(0); DefaultTVPMeasurementMetadataDocument tvpMeasurementMetadataDocument = DefaultTVPMeasurementMetadataDocument.Factory.parse(defaultPointMetadata.xmlText()); - ReferenceType interpolationType = tvpMeasurementMetadataDocument.getDefaultTVPMeasurementMetadata() - .getInterpolationType(); + ReferenceType interpolationType = + tvpMeasurementMetadataDocument.getDefaultTVPMeasurementMetadata().getInterpolationType(); assertThat(interpolationType.getHref(), Is.is(WaterMLConstants.InterpolationType.MinPrec.getIdentifier())); assertThat(interpolationType.getTitle(), Is.is(WaterMLConstants.InterpolationType.MinPrec.getTitle())); } @@ -135,16 +198,127 @@ public void shouldEncodeInterpolationTypeContinuousAsDefault() throws EncodingEx XmlObject encodedElement = encoder.encode(mv); TVPDefaultMetadataPropertyType defaultPointMetadata = - ((MeasurementTimeseriesDocument) encodedElement).getTimeseries() - .getDefaultPointMetadataArray(0); + ((MeasurementTimeseriesDocument) encodedElement).getTimeseries().getDefaultPointMetadataArray(0); DefaultTVPMeasurementMetadataDocument tvpMeasurementMetadataDocument = DefaultTVPMeasurementMetadataDocument.Factory.parse(defaultPointMetadata.xmlText()); - ReferenceType interpolationType = tvpMeasurementMetadataDocument.getDefaultTVPMeasurementMetadata() - .getInterpolationType(); + ReferenceType interpolationType = + tvpMeasurementMetadataDocument.getDefaultTVPMeasurementMetadata().getInterpolationType(); assertThat(interpolationType.getHref(), Is.is(WaterMLConstants.InterpolationType.Continuous.getIdentifier())); assertThat(interpolationType.getTitle(), Is.is(WaterMLConstants.InterpolationType.Continuous.getTitle())); } + @Test + public void shouldEncodeQualifier() throws EncodingException, XmlException, DecodingException { + XmlObject encodedElement = encoder.encode(createQualifierObservation()); + MatcherAssert.assertThat(XmlHelper.validateDocument(encodedElement), Is.is(true)); + } + + @Test + public void shouldEncodeQualifierStream() throws EncodingException, XmlException, IOException, DecodingException { + try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) { + encoder.encode(createQualifierObservation(), baos, EncodingContext.empty()); + XmlObject encodedElement = XmlObject.Factory.parse(baos.toString()); + MatcherAssert.assertThat(XmlHelper.validateDocument(encodedElement), Is.is(true)); + } + } + + @Test + public void shouldEncodeDetectionLimit() throws EncodingException, XmlException, DecodingException { + XmlObject encodedElement = encoder.encode(createDetectionLimitObservation()); + MatcherAssert.assertThat(XmlHelper.validateDocument(encodedElement), Is.is(true)); + } + + @Test + public void shouldEncodeDetectionLimitStream() + throws EncodingException, XmlException, IOException, DecodingException { + try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) { + encoder.encode(createDetectionLimitObservation(), baos, EncodingContext.empty()); + XmlObject encodedElement = XmlObject.Factory.parse(baos.toString()); + MatcherAssert.assertThat(XmlHelper.validateDocument(encodedElement), Is.is(true)); + } + } + + private OmObservation createDetectionLimitObservation() { + TimeInstant phenomenonTime = new TimeInstant(DATE_TIME); + OmObservation observation = createObservation(); + QuantityValue value = new QuantityValue(); + value.setUom("unit"); + SweQualityHolder holder = new SweQualityHolder(); + holder.addReference(WaterMLConstants.EN_CENSORED_REASON, createCensoredReference()); + holder.addQuality(createDetectionLimit()); + value.setQuality(holder); + observation.setValue(new SingleObservationValue<>(phenomenonTime, value)); + return observation; + } + + private OmObservation createQualifierObservation() { + TimeInstant phenomenonTime = new TimeInstant(DATE_TIME); + OmObservation observation = createObservation(); + QuantityValue value = new QuantityValue(); + value.setUom("unit"); + value.setValue(42.0); + SweQualityHolder holder = new SweQualityHolder(); + holder.addQuality(createQualifier()); + holder.addQuality(createGrade()); + value.setQuality(holder); + observation.setValue(new SingleObservationValue<>(phenomenonTime, value)); + return observation; + } + + private OmObservation createObservation() { + TimeInstant resultTime = new TimeInstant(DATE_TIME); + TimePeriod validTime = new TimePeriod(DATE_TIME.minusMinutes(5), DATE_TIME.plusMinutes(5)); + OmObservation observation = new OmObservation(); + OmObservationConstellation observationConstellation = new OmObservationConstellation(); + observationConstellation.setFeatureOfInterest(new SamplingFeature(new CodeWithAuthority(FEATURE, CODE_SPACE))); + OmObservableProperty observableProperty = new OmObservableProperty(OBSERVABLE_PROPERTY); + observationConstellation.setObservableProperty(observableProperty); + observationConstellation.setObservationType(OmConstants.OBS_TYPE_MEASUREMENT); + observationConstellation.addOffering(OFFERING); + AbstractFeature procedure = new SosProcedureDescriptionUnknownType(PROCEDURE); + observationConstellation.setProcedure(procedure); + observationConstellation.setDefaultPointMetadata(new DefaultPointMetadata()); + observationConstellation.getDefaultPointMetadata() + .setDefaultTVPMeasurementMetadata(new DefaultTVPMeasurementMetadata()); + observation.setObservationConstellation(observationConstellation); + observation.setParameter(null); + observation.setResultTime(resultTime); + observation.setTokenSeparator(TOKEN_SEPERATOR); + observation.setTupleSeparator(TUPLE_SEPERATOR); + observation.setValidTime(validTime); + return observation; + } + + private org.n52.shetland.ogc.gml.ReferenceType createCensoredReference() { + return new org.n52.shetland.ogc.gml.ReferenceType(OGCConstants.BELOW_DETECTION_RANGE, + "Below threshold of sensor"); + } + + private SweQuality createDetectionLimit() { + SweQuantity quantity = new SweQuantity(); + quantity.setDefinition("http://www.example.com/sensors/lower_threshold"); + quantity.setDescription("Lower limit for sensor"); + quantity.setUom("m"); + quantity.setValue(new BigDecimal("1.0")); + return quantity; + } + + private SweQuality createQualifier() { + return createText("No Quality or Non-Verifies (NEMS)", "NON-VERIFIED", "200"); + } + + private SweQuality createGrade() { + return createText(RECREATIONAL, RECREATIONAL, RECREATIONAL); + } + + private SweText createText(String description, String label, String value) { + SweText text = new SweText(); + text.setLabel(label); + text.setDescription(description); + text.setValue(value); + return text; + } + // TODO add tests für sosObservation or remove duplicate code in // WmlTVPEncoderv20 diff --git a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/TsmlTVPEncoderv10XmlStreamWriter.java b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/TsmlTVPEncoderv10XmlStreamWriter.java index c75d934c0..ca3f7e235 100644 --- a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/TsmlTVPEncoderv10XmlStreamWriter.java +++ b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/TsmlTVPEncoderv10XmlStreamWriter.java @@ -49,6 +49,7 @@ import org.n52.shetland.ogc.swe.SweConstants; import org.n52.shetland.ogc.swe.simpleType.SweQuality; import org.n52.shetland.ogc.swe.simpleType.SweQualityHolder; +import org.n52.shetland.ogc.swe.simpleType.SweQuantity; import org.n52.shetland.util.DateTimeFormatException; import org.n52.shetland.w3c.W3CConstants; import org.n52.svalbard.encode.EncodingContext; @@ -59,9 +60,8 @@ import com.google.common.base.Strings; /** - * TODO(specki): update javadoc Implementation of - * {@link AbstractOmV20XmlStreamWriter} to write WaterML 2.0 encoded - * {@link OmObservation}s to stream + * TODO(specki): update javadoc Implementation of {@link AbstractOmV20XmlStreamWriter} to write WaterML 2.0 + * encoded {@link OmObservation}s to stream * * @since 1.0.0 * @@ -82,12 +82,10 @@ protected void writeResult() throws XMLStreamException, EncodingException { writeMeasurementTimeseriesMLMetadata(observation); if (observation.getValue() instanceof SingleObservationValue) { SingleObservationValue<?> observationValue = (SingleObservationValue<?>) observation.getValue(); - writeDefaultPointMetadata(observationValue, observationValue.getValue() - .getUnit()); + writeDefaultPointMetadata(observationValue, observationValue.getValue().getUnit()); if (checkSweDataArray(observationValue.getValue())) { SweDataArrayValue sweDataArrayValue = (SweDataArrayValue) observationValue.getValue(); - for (List<String> list : sweDataArrayValue.getValue() - .getValues()) { + for (List<String> list : sweDataArrayValue.getValue().getValues()) { for (int i = 0; i < list.size(); i = i + 2) { writePoint(list.get(i), list.get(i + 1)); close(); @@ -95,15 +93,13 @@ protected void writeResult() throws XMLStreamException, EncodingException { } } else { String time = getTimeString(observationValue.getPhenomenonTime()); - writePoint(time, observation.getValue() - .getValue()); + writePoint(time, observation.getValue().getValue()); close(); } } else if (observation.getValue() instanceof MultiObservationValues) { // XML streaming to client MultiObservationValues<?> observationValue = (MultiObservationValues<?>) observation.getValue(); - writeDefaultPointMetadata(observationValue, observationValue.getValue() - .getUnit()); + writeDefaultPointMetadata(observationValue, observationValue.getValue().getUnit()); TVPValue tvpValue = (TVPValue) observationValue.getValue(); List<TimeValuePair> timeValuePairs = tvpValue.getValue(); for (TimeValuePair timeValuePair : timeValuePairs) { @@ -119,11 +115,11 @@ protected void writeResult() throws XMLStreamException, EncodingException { writeDefaultPointMetadata(observationValue, observationValue.getUnit()); } else if (observation.getObservationConstellation() .getObservableProperty() instanceof OmObservableProperty - && ((OmObservableProperty) observation.getObservationConstellation() - .getObservableProperty()).isSetUnit()) { + && ((OmObservableProperty) observation.getObservationConstellation().getObservableProperty()) + .isSetUnit()) { writeDefaultPointMetadata(observationValue, - ((OmObservableProperty) observation.getObservationConstellation() - .getObservableProperty()).getUnit()); + ((OmObservableProperty) observation.getObservationConstellation().getObservableProperty()) + .getUnit()); } else { writeDefaultPointMetadata(observationValue, null); } @@ -150,10 +146,8 @@ protected void writeAddtitionalNamespaces() throws XMLStreamException { @Override protected void checkAndWriteIdentifier() throws EncodingException, XMLStreamException { - if (getElement().getObservationConstellation() - .isSetIdentifier()) { - writeIdentifier(getElement().getObservationConstellation() - .getIdentifierCodeWithAuthority()); + if (getElement().getObservationConstellation().isSetIdentifier()) { + writeIdentifier(getElement().getObservationConstellation().getIdentifierCodeWithAuthority()); } else { super.checkAndWriteIdentifier(); } @@ -161,10 +155,8 @@ protected void checkAndWriteIdentifier() throws EncodingException, XMLStreamExce @Override protected void checkAndWriteName() throws EncodingException, XMLStreamException { - if (getElement().getObservationConstellation() - .isSetName()) { - for (CodeType name : getElement().getObservationConstellation() - .getName()) { + if (getElement().getObservationConstellation().isSetName()) { + for (CodeType name : getElement().getObservationConstellation().getName()) { writeName(name); } } else { @@ -174,10 +166,8 @@ protected void checkAndWriteName() throws EncodingException, XMLStreamException @Override protected void checkAndWriteDescription() throws XMLStreamException { - if (getElement().getObservationConstellation() - .isSetDescription()) { - writeDescription(getElement().getObservationConstellation() - .getDescription()); + if (getElement().getObservationConstellation().isSetDescription()) { + writeDescription(getElement().getObservationConstellation().getDescription()); } else { super.checkAndWriteDescription(); } @@ -207,20 +197,12 @@ private void writeMeasurementTimeseriesMLMetadata(OmObservation o) throws XMLStr start(TimeseriesMLConstants.QN_METADATA); start(TimeseriesMLConstants.QN_MEASUREMENT_TIMESERIES_METADATA); empty(TimeseriesMLConstants.QN_TEMPORAL_EXTENT); - addXlinkHrefAttr("#" + o.getPhenomenonTime() - .getGmlId()); - if (o.isSetValue() && o.getValue() - .isSetMetadata() - && o.getValue() - .getMetadata() - .isSetTimeseriesMetadata() - && o.getValue() - .getMetadata() - .getTimeseriesmetadata() instanceof MeasurementTimeseriesMetadata) { + addXlinkHrefAttr("#" + o.getPhenomenonTime().getGmlId()); + if (o.isSetValue() && o.getValue().isSetMetadata() && o.getValue().getMetadata().isSetTimeseriesMetadata() + && o.getValue().getMetadata().getTimeseriesmetadata() instanceof MeasurementTimeseriesMetadata) { start(TimeseriesMLConstants.QN_CUMULATIVE); - chars(Boolean.toString(((MeasurementTimeseriesMetadata) o.getValue() - .getMetadata() - .getTimeseriesmetadata()).isCumulative())); + chars(Boolean.toString(((MeasurementTimeseriesMetadata) o.getValue().getMetadata().getTimeseriesmetadata()) + .isCumulative())); endInline(TimeseriesMLConstants.QN_CUMULATIVE); } end(TimeseriesMLConstants.QN_MEASUREMENT_TIMESERIES_METADATA); @@ -276,13 +258,11 @@ private void writeUOM(@Nullable String code) throws XMLStreamException { */ private void writeInterpolationType(@Nullable ObservationValue<?> value) throws XMLStreamException { empty(TimeseriesMLConstants.QN_INTERPOLATION_TYPE); - if (value != null && value.isSetMetadata() && value.getDefaultPointMetadata() - .isSetDefaultTVPMeasurementMetadata() && value.getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .isSetInterpolationType()) { + if (value != null && value.isSetMetadata() + && value.getDefaultPointMetadata().isSetDefaultTVPMeasurementMetadata() + && value.getDefaultPointMetadata().getDefaultTVPMeasurementMetadata().isSetInterpolationType()) { InterpolationType interpolationtype = (InterpolationType) value.getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .getInterpolationtype(); + .getDefaultTVPMeasurementMetadata().getInterpolationtype(); addXlinkHrefAttr(interpolationtype.getIdentifier()); addXlinkTitleAttr(interpolationtype.getTitle()); } else { @@ -292,14 +272,11 @@ private void writeInterpolationType(@Nullable ObservationValue<?> value) throws } private void writeAggregationDuration(ObservationValue<?> value) throws XMLStreamException { - if (value != null && value.isSetMetadata() && value.getDefaultPointMetadata() - .isSetDefaultTVPMeasurementMetadata() && value.getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .isSetAggregationDuration()) { + if (value != null && value.isSetMetadata() + && value.getDefaultPointMetadata().isSetDefaultTVPMeasurementMetadata() + && value.getDefaultPointMetadata().getDefaultTVPMeasurementMetadata().isSetAggregationDuration()) { start(TimeseriesMLConstants.QN_AGGREGATION_DURATION); - chars(value.getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .getAggregationDuration()); + chars(value.getDefaultPointMetadata().getDefaultTVPMeasurementMetadata().getAggregationDuration()); end(TimeseriesMLConstants.QN_AGGREGATION_DURATION); } } @@ -312,10 +289,7 @@ private void writePoint(String time, Value<?> value) throws XMLStreamException, } else if (value instanceof ProfileValue) { ProfileValue gwglcValue = (ProfileValue) value; if (gwglcValue.isSetValue()) { - writePoint(time, gwglcValue.getValue() - .iterator() - .next() - .getSimpleValue()); + writePoint(time, gwglcValue.getValue().iterator().next().getSimpleValue()); } } else if (value instanceof CountValue) { CountValue countValue = (CountValue) value; @@ -323,7 +297,7 @@ private void writePoint(String time, Value<?> value) throws XMLStreamException, } else if (value instanceof TextValue) { TextValue textValue = (TextValue) value; String nonXmlEscapedText = textValue.getValue(); - writePoint(time, StringEscapeUtils.escapeXml(nonXmlEscapedText)); + writePoint(time, StringEscapeUtils.escapeXml(nonXmlEscapedText), textValue.getQuality()); } } else { writePoint(time, ""); @@ -332,19 +306,22 @@ private void writePoint(String time, Value<?> value) throws XMLStreamException, private void writePoint(String time, QuantityValue value) throws XMLStreamException, EncodingException { if (value.isSetValue()) { - writePoint(time, value.getValue() - .toPlainString()); + writePoint(time, value.getValue().toPlainString(), value.getQuality()); } else { if (value.isSetQuality()) { - writePointWithQuality(time, value.getQuality()); + writePointEmptyValueWithQuality(time, value.getQuality()); } else { writePoint(time, ""); } } } - private void writePoint(String time, CountValue value) throws XMLStreamException { - writePoint(time, value.isSetValue() ? Integer.toString(value.getValue()) : ""); + private void writePoint(String time, CountValue value) throws XMLStreamException, EncodingException { + writePoint(time, value.isSetValue() ? Integer.toString(value.getValue()) : "", value.getQuality()); + } + + private void writePoint(String time, String string) throws XMLStreamException, EncodingException { + writePoint(time, string, null); } /** @@ -354,14 +331,17 @@ private void writePoint(String time, CountValue value) throws XMLStreamException * time as {@link String} * @param value * value as {@link String} - * + * @param sweQualityHolder + * quality data * @throws XMLStreamException * If an error occurs when writing to stream + * @throws EncodingException */ - private void writePoint(String time, String value) throws XMLStreamException { + private void writePoint(String time, String value, SweQualityHolder qualityHolder) + throws XMLStreamException, EncodingException { if (!Strings.isNullOrEmpty(time)) { start(TimeseriesMLConstants.QN_POINT); - writeMeasurementTVP(time, value); + writeMeasurementTVP(time, value, qualityHolder); end(TimeseriesMLConstants.QN_POINT); } } @@ -373,16 +353,28 @@ private void writePoint(String time, String value) throws XMLStreamException { * time as {@link String} * @param value * value as {@link String} - * + * @param sweQualityHolder + * quality data * @throws XMLStreamException * If an error occurs when writing to stream */ - private void writeMeasurementTVP(String time, String value) throws XMLStreamException { + private void writeMeasurementTVP(String time, String value, SweQualityHolder qualityHolder) + throws XMLStreamException, EncodingException { start(TimeseriesMLConstants.QN_MEASUREMENT_TVP); + if (qualityHolder != null && qualityHolder.isSetQuality() && checkQuality(qualityHolder)) { + writeValueMetadata(qualityHolder); + } writeTime(time); writeValue(value); end(TimeseriesMLConstants.QN_MEASUREMENT_TVP); } + + private boolean checkQuality(SweQualityHolder quality) { + if (quality.isSetQuality()) { + return quality.getQuality().stream().filter(q -> q instanceof SweQuantity).findFirst().isPresent(); + } + return false; + } /** * Write wml:time to stream @@ -419,13 +411,13 @@ private void writeValue(String value) throws XMLStreamException { } } - private void writePointWithQuality(String time, SweQualityHolder qualityHolder) + private void writePointEmptyValueWithQuality(String time, SweQualityHolder qualityHolder) throws XMLStreamException, EncodingException { start(TimeseriesMLConstants.QN_POINT); start(TimeseriesMLConstants.QN_MEASUREMENT_TVP); + writeValueMetadata(qualityHolder); writeTime(time); writeEmptyValue(); - writeValueMetadata(qualityHolder); end(TimeseriesMLConstants.QN_MEASUREMENT_TVP); end(TimeseriesMLConstants.QN_POINT); } @@ -444,8 +436,8 @@ private void writeEmptyValue() throws XMLStreamException { private void writeValueMetadata(SweQualityHolder qualityHolder) throws XMLStreamException, EncodingException { start(TimeseriesMLConstants.QN_METADATA); start(TimeseriesMLConstants.QN_TVP_MEASUREMENT_METADATA); - writeQualifier(qualityHolder); writeCensoredReason(qualityHolder); + writeQualifier(qualityHolder); endInline(TimeseriesMLConstants.QN_TVP_MEASUREMENT_METADATA); endInline(TimeseriesMLConstants.QN_METADATA); @@ -454,22 +446,23 @@ private void writeValueMetadata(SweQualityHolder qualityHolder) throws XMLStream private void writeQualifier(SweQualityHolder qualityHolder) throws EncodingException, XMLStreamException { if (qualityHolder.isSetQuality()) { for (SweQuality quality : qualityHolder.getQuality()) { - XmlObject createdQuality = (XmlObject) getEncoder(SweConstants.NS_SWE_20, quality).encode(quality, - EncodingContext.of(XmlBeansEncodingFlags.DOCUMENT, true)); - if (createdQuality != null) { - start(TimeseriesMLConstants.QN_QUALIFIER); - writeXmlObject(createdQuality); - end(TimeseriesMLConstants.QN_QUALIFIER); + if (quality instanceof SweQuantity) { + XmlObject createdQuality = (XmlObject) getEncoder(SweConstants.NS_SWE_20, quality).encode(quality, + EncodingContext.of(XmlBeansEncodingFlags.DOCUMENT, true)); + if (createdQuality != null) { + start(TimeseriesMLConstants.QN_QUALIFIER); + writeXmlObject(createdQuality); + end(TimeseriesMLConstants.QN_QUALIFIER); + } } } } } private void writeCensoredReason(SweQualityHolder qualityHolder) throws XMLStreamException { - if (qualityHolder.isSetReferences() && qualityHolder.getReferences() - .containsKey(TimeseriesMLConstants.EN_CENSORED_REASON)) { - ReferenceType reference = qualityHolder.getReferences() - .get(TimeseriesMLConstants.EN_CENSORED_REASON); + if (qualityHolder.isSetReferences() + && qualityHolder.getReferences().containsKey(TimeseriesMLConstants.EN_CENSORED_REASON)) { + ReferenceType reference = qualityHolder.getReferences().get(TimeseriesMLConstants.EN_CENSORED_REASON); empty(TimeseriesMLConstants.QN_CENSORED_REASON); if (reference.isSetHref()) { attr(W3CConstants.QN_XLINK_HREF, reference.getHref()); diff --git a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/WmlTVPEncoderv20XmlStreamWriter.java b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/WmlTVPEncoderv20XmlStreamWriter.java index be3a81014..eb246d955 100644 --- a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/WmlTVPEncoderv20XmlStreamWriter.java +++ b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/WmlTVPEncoderv20XmlStreamWriter.java @@ -59,8 +59,8 @@ import com.google.common.base.Strings; /** - * Implementation of {@link AbstractOmV20XmlStreamWriter} to write WaterML 2.0 - * encoded {@link OmObservation}s to stream + * Implementation of {@link AbstractOmV20XmlStreamWriter} to write WaterML 2.0 encoded {@link OmObservation}s + * to stream * * @author <a href="mailto:c.hollmann@52north.org">Carsten Hollmann</a> * @since 1.0.0 @@ -82,12 +82,10 @@ protected void writeResult() throws XMLStreamException, EncodingException { writeMeasurementTimeseriesMetadata(observation); if (observation.getValue() instanceof SingleObservationValue) { SingleObservationValue<?> observationValue = (SingleObservationValue<?>) observation.getValue(); - writeDefaultPointMetadata(observationValue, observationValue.getValue() - .getUnit()); + writeDefaultPointMetadata(observationValue, observationValue.getValue().getUnit()); if (checkSweDataArray(observationValue.getValue())) { SweDataArrayValue sweDataArrayValue = (SweDataArrayValue) observationValue.getValue(); - for (List<String> list : sweDataArrayValue.getValue() - .getValues()) { + for (List<String> list : sweDataArrayValue.getValue().getValues()) { for (int i = 0; i < list.size(); i = i + 2) { writePoint(list.get(i), list.get(i + 1)); close(); @@ -95,15 +93,13 @@ protected void writeResult() throws XMLStreamException, EncodingException { } } else { String time = getTimeString(observationValue.getPhenomenonTime()); - writePoint(time, observation.getValue() - .getValue()); + writePoint(time, observation.getValue().getValue()); close(); } } else if (observation.getValue() instanceof MultiObservationValues) { // XML streaming to client MultiObservationValues<?> observationValue = (MultiObservationValues<?>) observation.getValue(); - writeDefaultPointMetadata(observationValue, observationValue.getValue() - .getUnit()); + writeDefaultPointMetadata(observationValue, observationValue.getValue().getUnit()); TVPValue tvpValue = (TVPValue) observationValue.getValue(); List<TimeValuePair> timeValuePairs = tvpValue.getValue(); for (TimeValuePair timeValuePair : timeValuePairs) { @@ -119,11 +115,11 @@ protected void writeResult() throws XMLStreamException, EncodingException { writeDefaultPointMetadata(observationValue, observationValue.getUnit()); } else if (observation.getObservationConstellation() .getObservableProperty() instanceof OmObservableProperty - && ((OmObservableProperty) observation.getObservationConstellation() - .getObservableProperty()).isSetUnit()) { + && ((OmObservableProperty) observation.getObservationConstellation().getObservableProperty()) + .isSetUnit()) { writeDefaultPointMetadata(observationValue, - ((OmObservableProperty) observation.getObservationConstellation() - .getObservableProperty()).getUnit()); + ((OmObservableProperty) observation.getObservationConstellation().getObservableProperty()) + .getUnit()); } else { writeDefaultPointMetadata(observationValue, null); } @@ -150,10 +146,8 @@ protected void writeAddtitionalNamespaces() throws XMLStreamException { @Override protected void checkAndWriteIdentifier() throws EncodingException, XMLStreamException { - if (getElement().getObservationConstellation() - .isSetIdentifier()) { - writeIdentifier(getElement().getObservationConstellation() - .getIdentifierCodeWithAuthority()); + if (getElement().getObservationConstellation().isSetIdentifier()) { + writeIdentifier(getElement().getObservationConstellation().getIdentifierCodeWithAuthority()); } else { super.checkAndWriteIdentifier(); } @@ -161,10 +155,8 @@ protected void checkAndWriteIdentifier() throws EncodingException, XMLStreamExce @Override protected void checkAndWriteName() throws EncodingException, XMLStreamException { - if (getElement().getObservationConstellation() - .isSetName()) { - for (CodeType name : getElement().getObservationConstellation() - .getName()) { + if (getElement().getObservationConstellation().isSetName()) { + for (CodeType name : getElement().getObservationConstellation().getName()) { writeName(name); } } else { @@ -174,10 +166,8 @@ protected void checkAndWriteName() throws EncodingException, XMLStreamException @Override protected void checkAndWriteDescription() throws XMLStreamException { - if (getElement().getObservationConstellation() - .isSetDescription()) { - writeDescription(getElement().getObservationConstellation() - .getDescription()); + if (getElement().getObservationConstellation().isSetDescription()) { + writeDescription(getElement().getObservationConstellation().getDescription()); } else { super.checkAndWriteDescription(); } @@ -207,20 +197,12 @@ private void writeMeasurementTimeseriesMetadata(OmObservation o) throws XMLStrea start(WaterMLConstants.QN_METADATA); start(WaterMLConstants.QN_MEASUREMENT_TIMESERIES_METADATA); empty(WaterMLConstants.QN_TEMPORAL_EXTENT); - addXlinkHrefAttr("#" + o.getPhenomenonTime() - .getGmlId()); - if (o.isSetValue() && o.getValue() - .isSetMetadata() - && o.getValue() - .getMetadata() - .isSetTimeseriesMetadata() - && o.getValue() - .getMetadata() - .getTimeseriesmetadata() instanceof MeasurementTimeseriesMetadata) { + addXlinkHrefAttr("#" + o.getPhenomenonTime().getGmlId()); + if (o.isSetValue() && o.getValue().isSetMetadata() && o.getValue().getMetadata().isSetTimeseriesMetadata() + && o.getValue().getMetadata().getTimeseriesmetadata() instanceof MeasurementTimeseriesMetadata) { start(WaterMLConstants.QN_CUMULATIVE); - chars(Boolean.toString(((MeasurementTimeseriesMetadata) o.getValue() - .getMetadata() - .getTimeseriesmetadata()).isCumulative())); + chars(Boolean.toString(((MeasurementTimeseriesMetadata) o.getValue().getMetadata().getTimeseriesmetadata()) + .isCumulative())); endInline(WaterMLConstants.QN_CUMULATIVE); } end(WaterMLConstants.QN_MEASUREMENT_TIMESERIES_METADATA); @@ -276,13 +258,11 @@ private void writeUOM(@Nullable String code) throws XMLStreamException { */ private void writeInterpolationType(@Nullable ObservationValue<?> value) throws XMLStreamException { empty(WaterMLConstants.QN_INTERPOLATION_TYPE); - if (value != null && value.isSetMetadata() && value.getDefaultPointMetadata() - .isSetDefaultTVPMeasurementMetadata() && value.getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .isSetInterpolationType()) { + if (value != null && value.isSetMetadata() + && value.getDefaultPointMetadata().isSetDefaultTVPMeasurementMetadata() + && value.getDefaultPointMetadata().getDefaultTVPMeasurementMetadata().isSetInterpolationType()) { InterpolationType interpolationtype = (InterpolationType) value.getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .getInterpolationtype(); + .getDefaultTVPMeasurementMetadata().getInterpolationtype(); addXlinkHrefAttr(interpolationtype.getIdentifier()); addXlinkTitleAttr(interpolationtype.getTitle()); } else { @@ -292,14 +272,11 @@ private void writeInterpolationType(@Nullable ObservationValue<?> value) throws } private void writeAggregationDuration(ObservationValue<?> value) throws XMLStreamException { - if (value != null && value.isSetMetadata() && value.getDefaultPointMetadata() - .isSetDefaultTVPMeasurementMetadata() && value.getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .isSetAggregationDuration()) { + if (value != null && value.isSetMetadata() + && value.getDefaultPointMetadata().isSetDefaultTVPMeasurementMetadata() + && value.getDefaultPointMetadata().getDefaultTVPMeasurementMetadata().isSetAggregationDuration()) { start(WaterMLConstants.QN_AGGREGATION_DURATION); - chars(value.getDefaultPointMetadata() - .getDefaultTVPMeasurementMetadata() - .getAggregationDuration()); + chars(value.getDefaultPointMetadata().getDefaultTVPMeasurementMetadata().getAggregationDuration()); end(WaterMLConstants.QN_AGGREGATION_DURATION); } } @@ -312,10 +289,7 @@ private void writePoint(String time, Value<?> value) throws XMLStreamException, } else if (value instanceof ProfileValue) { ProfileValue gwglcValue = (ProfileValue) value; if (gwglcValue.isSetValue()) { - writePoint(time, gwglcValue.getValue() - .iterator() - .next() - .getSimpleValue()); + writePoint(time, gwglcValue.getValue().iterator().next().getSimpleValue()); } } else if (value instanceof CountValue) { CountValue countValue = (CountValue) value; @@ -323,7 +297,7 @@ private void writePoint(String time, Value<?> value) throws XMLStreamException, } else if (value instanceof TextValue) { TextValue textValue = (TextValue) value; String nonXmlEscapedText = textValue.getValue(); - writePoint(time, StringEscapeUtils.escapeXml(nonXmlEscapedText)); + writePoint(time, StringEscapeUtils.escapeXml(nonXmlEscapedText), textValue.getQuality()); } } else { writePoint(time, ""); @@ -332,19 +306,22 @@ private void writePoint(String time, Value<?> value) throws XMLStreamException, private void writePoint(String time, QuantityValue value) throws XMLStreamException, EncodingException { if (value.isSetValue()) { - writePoint(time, value.getValue() - .toPlainString()); + writePoint(time, value.getValue().toPlainString(), value.getQuality()); } else { if (value.isSetQuality()) { - writePointWithQuality(time, value.getQuality()); + writePointEmptyValueWithQuality(time, value.getQuality()); } else { writePoint(time, ""); } } } - private void writePoint(String time, CountValue value) throws XMLStreamException { - writePoint(time, value.isSetValue() ? Integer.toString(value.getValue()) : ""); + private void writePoint(String time, CountValue value) throws XMLStreamException, EncodingException { + writePoint(time, value.isSetValue() ? Integer.toString(value.getValue()) : "", value.getQuality()); + } + + private void writePoint(String time, String string) throws XMLStreamException, EncodingException { + writePoint(time, string, null); } /** @@ -354,14 +331,17 @@ private void writePoint(String time, CountValue value) throws XMLStreamException * time as {@link String} * @param value * value as {@link String} - * + * @param sweQualityHolder + * quality data * @throws XMLStreamException * If an error occurs when writing to stream + * @throws EncodingException */ - private void writePoint(String time, String value) throws XMLStreamException { + private void writePoint(String time, String value, SweQualityHolder qualityHolder) + throws XMLStreamException, EncodingException { if (!Strings.isNullOrEmpty(time)) { start(WaterMLConstants.QN_POINT); - writeMeasurementTVP(time, value); + writeMeasurementTVP(time, value, qualityHolder); end(WaterMLConstants.QN_POINT); } } @@ -373,17 +353,24 @@ private void writePoint(String time, String value) throws XMLStreamException { * time as {@link String} * @param value * value as {@link String} - * + * @param sweQualityHolder + * quality data * @throws XMLStreamException * If an error occurs when writing to stream */ - private void writeMeasurementTVP(String time, String value) throws XMLStreamException { + private void writeMeasurementTVP(String time, String value, SweQualityHolder qualityHolder) + throws XMLStreamException, EncodingException { start(WaterMLConstants.QN_MEASUREMENT_TVP); writeTime(time); writeValue(value); + if (qualityHolder != null && qualityHolder.isSetQuality()) { + writeValueMetadata(qualityHolder); + } end(WaterMLConstants.QN_MEASUREMENT_TVP); } + + /** * Write wml:time to stream * @@ -419,7 +406,7 @@ private void writeValue(String value) throws XMLStreamException { } } - private void writePointWithQuality(String time, SweQualityHolder qualityHolder) + private void writePointEmptyValueWithQuality(String time, SweQualityHolder qualityHolder) throws XMLStreamException, EncodingException { start(WaterMLConstants.QN_POINT); start(WaterMLConstants.QN_MEASUREMENT_TVP); @@ -466,10 +453,9 @@ private void writeQualifier(SweQualityHolder qualityHolder) throws EncodingExcep } private void writeCensoredReason(SweQualityHolder qualityHolder) throws XMLStreamException { - if (qualityHolder.isSetReferences() && qualityHolder.getReferences() - .containsKey(WaterMLConstants.EN_CENSORED_REASON)) { - ReferenceType reference = qualityHolder.getReferences() - .get(WaterMLConstants.EN_CENSORED_REASON); + if (qualityHolder.isSetReferences() + && qualityHolder.getReferences().containsKey(WaterMLConstants.EN_CENSORED_REASON)) { + ReferenceType reference = qualityHolder.getReferences().get(WaterMLConstants.EN_CENSORED_REASON); empty(WaterMLConstants.QN_CENSORED_REASON); if (reference.isSetHref()) { attr(W3CConstants.QN_XLINK_HREF, reference.getHref()); From 83b28ecbf85fd38ce66bd436c1be355bf60ec76f Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 13 Jul 2022 16:07:46 +0200 Subject: [PATCH 339/456] fix build --- .../org/n52/svalbard/encode/TsmlTVPEncoderv10.java | 13 +++++-------- .../write/TsmlTVPEncoderv10XmlStreamWriter.java | 3 ++- .../write/WmlTVPEncoderv20XmlStreamWriter.java | 1 + 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/TsmlTVPEncoderv10.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/TsmlTVPEncoderv10.java index 7d32dc9b1..9022abdc2 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/TsmlTVPEncoderv10.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/TsmlTVPEncoderv10.java @@ -54,12 +54,9 @@ import org.n52.shetland.ogc.sos.Sos2Constants; import org.n52.shetland.ogc.sos.SosConstants; import org.n52.shetland.ogc.sos.response.GetObservationResponse; -import org.n52.shetland.ogc.swe.simpleType.SweCategory; import org.n52.shetland.ogc.swe.simpleType.SweQuality; import org.n52.shetland.ogc.swe.simpleType.SweQualityHolder; import org.n52.shetland.ogc.swe.simpleType.SweQuantity; -import org.n52.shetland.ogc.swe.simpleType.SweQuantityRange; -import org.n52.shetland.ogc.swe.simpleType.SweText; import org.n52.shetland.util.CollectionHelper; import org.n52.shetland.w3c.SchemaLocation; import org.n52.svalbard.encode.exception.EncodingException; @@ -472,6 +469,11 @@ private void addValuesToMeasurementTVP(MeasurementTVPType measurementTVP, String } } + private void addValuesToMeasurementTVP(MeasurementTVPType measurementTVPType, String time, CountValue value) { + addValuesToMeasurementTVP(measurementTVPType, time, + value.isSetValue() ? Integer.toString(value.getValue()) : null); + } + private boolean checkQuality(SweQualityHolder quality) { if (quality.isSetQuality()) { return quality.getQuality().stream().filter(q -> q instanceof SweQuantity).findFirst().isPresent(); @@ -479,11 +481,6 @@ private boolean checkQuality(SweQualityHolder quality) { return false; } - private void addValuesToMeasurementTVP(MeasurementTVPType measurementTVPType, String time, CountValue value) { - addValuesToMeasurementTVP(measurementTVPType, time, - value.isSetValue() ? Integer.toString(value.getValue()) : null); - } - private void addMeasurmentMetadataMissing(PointMetadataType metadata) { metadata.addNewNilReason().setNilReason("missing"); } diff --git a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/TsmlTVPEncoderv10XmlStreamWriter.java b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/TsmlTVPEncoderv10XmlStreamWriter.java index ca3f7e235..daac3714a 100644 --- a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/TsmlTVPEncoderv10XmlStreamWriter.java +++ b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/TsmlTVPEncoderv10XmlStreamWriter.java @@ -336,6 +336,7 @@ private void writePoint(String time, String string) throws XMLStreamException, E * @throws XMLStreamException * If an error occurs when writing to stream * @throws EncodingException + * If an error occurs when encoding quality */ private void writePoint(String time, String value, SweQualityHolder qualityHolder) throws XMLStreamException, EncodingException { @@ -368,7 +369,7 @@ private void writeMeasurementTVP(String time, String value, SweQualityHolder qua writeValue(value); end(TimeseriesMLConstants.QN_MEASUREMENT_TVP); } - + private boolean checkQuality(SweQualityHolder quality) { if (quality.isSetQuality()) { return quality.getQuality().stream().filter(q -> q instanceof SweQuantity).findFirst().isPresent(); diff --git a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/WmlTVPEncoderv20XmlStreamWriter.java b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/WmlTVPEncoderv20XmlStreamWriter.java index eb246d955..7674567bd 100644 --- a/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/WmlTVPEncoderv20XmlStreamWriter.java +++ b/svalbard/xmlstream/src/main/java/org/n52/svalbard/write/WmlTVPEncoderv20XmlStreamWriter.java @@ -336,6 +336,7 @@ private void writePoint(String time, String string) throws XMLStreamException, E * @throws XMLStreamException * If an error occurs when writing to stream * @throws EncodingException + * If an error occurs when encoding quality */ private void writePoint(String time, String value, SweQualityHolder qualityHolder) throws XMLStreamException, EncodingException { From 92d4746d520c4e90fa72bd991f2ca527938fa6ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jul 2022 04:00:59 +0000 Subject: [PATCH 340/456] Bump version.spring from 5.3.21 to 5.3.22 Bumps `version.spring` from 5.3.21 to 5.3.22. Updates `spring-test` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-web` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-beans` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-core` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-context` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-context-support` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) --- updated-dependencies: - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 07c7ef7b4..032090b16 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> - <version.spring>5.3.21</version.spring> + <version.spring>5.3.22</version.spring> <version.slf4j>1.7.36</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> From e2864476dfe8cce0ae8aafd0fb387d20d133b594 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jul 2022 04:48:13 +0000 Subject: [PATCH 341/456] Bump version.spring from 5.3.21 to 5.3.22 Bumps `version.spring` from 5.3.21 to 5.3.22. Updates `spring-test` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-web` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-beans` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-core` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-context` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-context-support` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) --- updated-dependencies: - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 238e5022a..293681746 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> - <version.spring>5.3.21</version.spring> + <version.spring>5.3.22</version.spring> <version.slf4j>1.7.36</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> From 107246069946a264a12a70e5b392641fe43631ce Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Mon, 18 Jul 2022 12:23:21 +0200 Subject: [PATCH 342/456] update images in credits --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 42eaa8a0f..bd482f266 100644 --- a/README.md +++ b/README.md @@ -225,9 +225,9 @@ The development of the 52°North Arctic Sea implementation was supported by se | Project/Logo | Description | | :-------------: | :------------- | -| [![Cos4Cloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](https://cos4cloud-eosc.eu/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [Cos4Cloud](https://cos4cloud-eosc.eu/) (co-funded by the European Commission under the grant agreement n°863463) | +| [![Cos4Cloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/cos4cloud.png)](https://cos4cloud-eosc.eu/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [Cos4Cloud](https://cos4cloud-eosc.eu/) (co-funded by the European Commission under the grant agreement n°863463) | | [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-geotechnologien-logo.png)](https://www.bmbf.de/)[![TaMIS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/TaMIS_Logo_small.png)](http://tamis.kn.e-technik.tu-dortmund.de/) | The development of this version 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [TaMIS](https://colabis.de/) (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0854) | -| [![JERICO-S3](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](https://www.jerico-ri.eu) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [JERICO-S3](https://www.jerico-ri.eu) (co-funded by the European Commission under the grant agreement n°871153) | +| [![JERICO-S3](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/jerico_s3.png)](https://www.jerico-ri.eu) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [JERICO-S3](https://www.jerico-ri.eu) (co-funded by the European Commission under the grant agreement n°871153) | | [![NeXOS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/nexos-logo.png)](http://www.nexosproject.eu/) | The development of this version of 52°North Arctic Sea was supported by the [European FP7](https://ec.europa.eu/research/fp7/index_en.cfm) research project [NeXOS](http://www.nexosproject.eu/) (co-funded by the European Commission under the grant agreement n°614102) | | [![BMBF](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/bmbf-geotechnologien-logo.png)](https://www.bmbf.de/)[![COLABIS](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/colabis-logo.png)](https://colabis.de/) | The development of this version 52°North Arctic Sea was supported by the [German Federal Ministry of Education and Research](https://www.bmbf.de/) research project [COLABIS](https://colabis.de/) (co-funded by the German Federal Ministry of Education and Research, programme Geotechnologien, under grant agreement no. 03G0852A) | | [![SeaDataCloud](https://raw.githubusercontent.com/52North/arctic-sea/master/etc/images/seadatacloud-logo.png)](https://www.seadatanet.org/About-us/SeaDataCloud/) | The development of this version of 52°North Arctic Sea was supported by the [Horizon 2020](https://ec.europa.eu/programmes/horizon2020/) research project [SeaDataCloud](https://www.seadatanet.org/About-us/SeaDataCloud/) (co-funded by the European Commission under the grant agreement n°730960) | From 17f8af8f8f004fa69b565b10533877b80d2897d0 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Mon, 18 Jul 2022 12:25:49 +0200 Subject: [PATCH 343/456] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bd482f266..2bef8a8ee 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,11 @@ ## Description -### 52°North's backbone for OGC services, clients and middleware +### 52°North's backbone for OGC services, clients and middleware **A framework for developing OGC services, clients and middleware sharing concepts for encoding and decoding of different formats and encodings, workflows and configuration.** -Arctic Sea is a stack of projects that eases the development of OGC related services such as the 52°North implementation of the OGC [SOS](https://github.com/52North/SOS) and [WPS](https://github.com/52North/javaPS), as well as clients and middleware. It compromises the following modules. +Arctic Sea is a stack of projects that eases the development of OGC related services such as the 52°North implementation of the OGC [SOS](https://github.com/52North/SOS) and [WPS](https://github.com/52North/javaPS), as well as clients and middleware. It compromises the following modules. ![Overview](https://github.com/52North/arctic-sea/raw/master/etc/overview.jpg) From 228332db61ceedcc5249235c84971c53e3f9a2bb Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 19 Jul 2022 08:56:44 +0200 Subject: [PATCH 344/456] init definition map/set by default and clear before adding set --- .../main/java/org/n52/faroe/SettingsServiceImpl.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java b/faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java index eb4a676fb..279735810 100644 --- a/faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java +++ b/faroe/core/src/main/java/org/n52/faroe/SettingsServiceImpl.java @@ -31,6 +31,7 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.TreeMap; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -65,8 +66,8 @@ public class SettingsServiceImpl implements SettingsService { private static final Logger LOG = LoggerFactory.getLogger(SettingsServiceImpl.class); private final Map<String, Set<ConfigurableObject>> configurableObjects = new HashMap<>(); private final ReadWriteLock configurableObjectsLock = new ReentrantReadWriteLock(); - private Set<SettingDefinition<?>> definitions; - private Map<String, SettingDefinition<?>> definitionByKey; + private Set<SettingDefinition<?>> definitions = new HashSet<>(); + private Map<String, SettingDefinition<?>> definitionByKey = new TreeMap<>(); private SettingsDao settingsManagerDao; private SettingValueFactory settingValueFactory; private EventBus serviceEventBus; @@ -90,14 +91,11 @@ public void setSettingsManagerDao(SettingsDao settingsManagerDao) { @Inject public void setSettingDefinitions(Optional<Collection<SettingDefinition<?>>> def) { + this.definitions.clear(); + this.definitionByKey.clear(); if (def.isPresent()) { Collection<SettingDefinition<?>> defs = def.get(); - this.definitions = new HashSet<>(defs.size()); - this.definitionByKey = new HashMap<>(defs.size()); addSettings(defs); - } else { - this.definitions = new HashSet<>(0); - this.definitionByKey = new HashMap<>(0); } } From bf9b0340c57b8fded3b08ca62b47cd311506f755 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 19 Jul 2022 08:57:12 +0200 Subject: [PATCH 345/456] Fix issue with symlinks --- .../n52/iceland/util/ServletContextPropertyFileHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iceland/core/src/main/java/org/n52/iceland/util/ServletContextPropertyFileHandler.java b/iceland/core/src/main/java/org/n52/iceland/util/ServletContextPropertyFileHandler.java index b1e74a115..a6a7c6274 100644 --- a/iceland/core/src/main/java/org/n52/iceland/util/ServletContextPropertyFileHandler.java +++ b/iceland/core/src/main/java/org/n52/iceland/util/ServletContextPropertyFileHandler.java @@ -15,6 +15,8 @@ */ package org.n52.iceland.util; +import java.nio.file.Paths; + import javax.servlet.ServletContext; /** @@ -27,7 +29,8 @@ public class ServletContextPropertyFileHandler extends PropertyFileHandlerImpl { public ServletContextPropertyFileHandler(ServletContext ctx, String name) { - super(ctx.getRealPath(name)); + super(ctx.getRealPath(name) != null ? ctx.getRealPath(name) + : Paths.get(ctx.getRealPath("/"), name).toString()); } } From 7e49a370dcb2f60baf3fa67d26f5385dfc5c49a8 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 19 Jul 2022 11:02:15 +0200 Subject: [PATCH 346/456] [maven-release-plugin] prepare release v9.6.1 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 1a8d50305..653ac81a6 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index cad99de72..a1896d2e5 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 37e3b6a4e..86f1ea71a 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index bca1fa530..d0b1afadc 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 7739dd66d..c328379ce 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 8a3eb7f9c..775e82583 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index f3f1cdde1..ed4639b45 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index fd0987038..124ef9cda 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index a6d383dd5..cb573ec34 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index ded31825a..477bba84f 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index b9282095c..8f27157a3 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index df6365b70..5bda295b9 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 52ad0fbec..e4d8aea0f 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 032090b16..ed35a5843 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>HEAD</tag> + <tag>v9.6.1</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index a1477f175..8ac9b4b2a 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 096f9abaa..bc23062f6 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index ec7440457..dfc3fbebc 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index ac34615c0..fa3cba717 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index bd5e05333..c7975235b 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index d6a282dbb..8281a7470 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index db815d73c..47a14271f 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 786567589..f3ff4eb97 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index e85cd7740..346d5c7da 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index fec8e61d7..0e223400c 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 44f7db2c7..dca8e1268 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.6.1</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 50da2abae8e207331920207a69d3a43fcb876ebf Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 19 Jul 2022 11:02:26 +0200 Subject: [PATCH 347/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 653ac81a6..a48a01830 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index a1896d2e5..4c35f7455 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 86f1ea71a..220273a3e 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index d0b1afadc..24f400f08 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index c328379ce..1f146ffb4 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 775e82583..87bdc73eb 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index ed4639b45..f8006be1e 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 124ef9cda..50608353d 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index cb573ec34..2a57244a9 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 477bba84f..450139678 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 8f27157a3..3feb968de 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 5bda295b9..50d8e1143 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index e4d8aea0f..e77b6055c 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index ed35a5843..5e3693a6c 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>v9.6.1</tag> + <tag>HEAD</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 8ac9b4b2a..eddfad433 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index bc23062f6..7280f1291 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index dfc3fbebc..9e7778d14 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index fa3cba717..99f38c713 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index c7975235b..5fe898abd 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 8281a7470..f08ddf85e 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 47a14271f..b8da44fb7 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index f3ff4eb97..2fe75b65a 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 346d5c7da..74fd9a400 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 0e223400c..eddf9e9ec 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index dca8e1268..2cb15db27 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.1</version> + <version>9.6.2-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 574d38f1d4e2c95e45c757fe1084cde32de3cb4c Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 22 Jul 2022 14:22:05 +0200 Subject: [PATCH 348/456] some refactoring for scheduler --- .../schedule/CronExpressionValidator.java | 35 ++++++ ...tory.java => DefaultJobConfiguration.java} | 107 +++-------------- .../bjornoya/schedule/JobConfiguration.java | 61 ++++++++++ .../org/n52/bjornoya/schedule/JobHandler.java | 110 ++++++++++++++++++ .../n52/bjornoya/schedule/ScheduledJob.java | 50 ++++---- 5 files changed, 255 insertions(+), 108 deletions(-) create mode 100644 bjornoya/src/main/java/org/n52/bjornoya/schedule/CronExpressionValidator.java rename bjornoya/src/main/java/org/n52/bjornoya/schedule/{JobFactory.java => DefaultJobConfiguration.java} (51%) create mode 100644 bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java create mode 100644 bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/CronExpressionValidator.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/CronExpressionValidator.java new file mode 100644 index 000000000..6eb07e87e --- /dev/null +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/CronExpressionValidator.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2015-2022 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.bjornoya.schedule; + +import java.text.ParseException; + +import org.n52.faroe.ConfigurationError; +import org.quartz.CronExpression; + +public interface CronExpressionValidator { + + default void validate(String cronExpression) { + try { + CronExpression.validateExpression(cronExpression); + } catch (ParseException e) { + throw new ConfigurationError(String.format( + "%s is invalid! Please check http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials" + + "/tutorial-lesson-06.html", + cronExpression)); + } + } +} diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/DefaultJobConfiguration.java similarity index 51% rename from bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java rename to bjornoya/src/main/java/org/n52/bjornoya/schedule/DefaultJobConfiguration.java index 73709c465..502bfdb1c 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobFactory.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/DefaultJobConfiguration.java @@ -15,23 +15,9 @@ */ package org.n52.bjornoya.schedule; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Optional; -import java.util.Set; - -import javax.inject.Inject; - -import org.n52.faroe.ConfigurationError; import org.n52.faroe.Validation; import org.n52.faroe.annotation.Configurable; import org.n52.faroe.annotation.Setting; -import org.n52.janmayen.lifecycle.Constructable; -import org.quartz.CronExpression; -import org.quartz.SchedulerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -39,10 +25,13 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @Configurable -public class JobFactory implements Constructable { +@SuppressFBWarnings({"EI_EXPOSE_REP", "EI_EXPOSE_REP2"}) +public class DefaultJobConfiguration implements CronExpressionValidator { public static final String FULL_HARVEST_UPDATE = "harvest.full"; public static final String TEMPORAL_HARVEST_UPDATE = "harvest.temporal"; + public static final String DEFUALT_FULL_HARVEST_JOB_NAME = "Default full harvest job"; + public static final String DEFUALT_TEMPORAL_HARVEST_JOB_NAME = "Default temporal harvest job"; private static final String DOLLAR_BRACE = "${"; private static final String BRACE = "}"; private static final String COLON = ":"; @@ -52,31 +41,10 @@ public class JobFactory implements Constructable { DOLLAR_BRACE + FULL_HARVEST_UPDATE + COLON + DEFAULT_FULL + BRACE; private static final String TEMPORAL_HARVEST_UPDATE_VALUE = DOLLAR_BRACE + TEMPORAL_HARVEST_UPDATE + COLON + DEFAULT_TEMPORAL + BRACE; - private static final Logger LOGGER = LoggerFactory.getLogger(JobFactory.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultJobConfiguration.class); private String cronFullExpression = DEFAULT_FULL; private String cronTemporalExpression = DEFAULT_TEMPORAL; - private Scheduler scheduler; - private Set<String> jobs = new HashSet<>(); - private List<ScheduledJob> scheduledJobs = new ArrayList<>(); - private boolean initialized; - - @Inject - @SuppressFBWarnings("EI_EXPOSE_REP2") - public void setScheduler(Scheduler scheduler) { - this.scheduler = scheduler; - } - - @Inject - public void setScheduledJobs(Optional<List<ScheduledJob>> scheduledJobs) { - this.scheduledJobs.clear(); - if (scheduledJobs.isPresent()) { - this.scheduledJobs.addAll(scheduledJobs.get()); - } - } - - public List<ScheduledJob> getScheduledJobs() { - return new LinkedList<>(scheduledJobs); - } + private JobHandler jobHandler; /** * @return the cronFullExpression @@ -101,6 +69,7 @@ public void setFullCronExpression(String cronExpression) { this.cronFullExpression = cronExpression; reschedule(); } + } /** @@ -128,63 +97,25 @@ public void setTemporalCronExpression(String cronExpression) { } } - private void reschedule() { - reschedule(true); + public DefaultJobConfiguration setJobHandler(JobHandler jobHandler) { + this.jobHandler = jobHandler; + return this; } - private void reschedule(boolean update) { - if (!initialized && !update || initialized && update) { - for (ScheduledJob job : getScheduledJobs()) { - if (jobs.contains(job.getJobName())) { - boolean updateJob = false; - if (job instanceof FullHarvesterJob) { - updateJob = checkCronExpression(job, getFullCronExpression()); - } else if (job instanceof TemporalHarvesterJob) { - updateJob = checkCronExpression(job, getTemporalCronExpression()); - } - if (updateJob) { - try { - scheduler.updateJob(job); - } catch (SchedulerException e) { - LOGGER.error("Error while updating a job!", e); - } - } - } else { - if (job instanceof FullHarvesterJob) { - job.setCronExpression(getFullCronExpression()); - } else if (job instanceof TemporalHarvesterJob) { - job.setCronExpression(getTemporalCronExpression()); - } - scheduler.scheduleJob(job); - } - jobs.add(job.getJobName()); - } + private void reschedule() { + if (jobHandler != null) { + jobHandler.reschedule(); } } - private boolean checkCronExpression(ScheduledJob job, String cronExpression) { - if (job.getCronExpression() == null || job.getCronExpression() != null && !job.getCronExpression().isEmpty() - && !job.getCronExpression().equals(cronExpression)) { - job.setCronExpression(cronExpression); - return true; - } - return false; + public JobConfiguration getFullJobConfiguration() { + return new JobConfiguration().setEnabled(true).setTriggerAtStartup(true) + .setCronExpression(getFullCronExpression()).setName(DEFUALT_FULL_HARVEST_JOB_NAME); } - private void validate(String cronExpression) { - try { - CronExpression.validateExpression(cronExpression); - } catch (ParseException e) { - throw new ConfigurationError(String.format( - "%s is invalid! Please check http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials" - + "/tutorial-lesson-06.html", - cronExpression)); - } + public JobConfiguration getTemporalJobConfiguration() { + return new JobConfiguration().setEnabled(true).setTriggerAtStartup(true) + .setCronExpression(getTemporalCronExpression()).setName(DEFUALT_TEMPORAL_HARVEST_JOB_NAME); } - @Override - public void init() { - reschedule(false); - this.initialized = true; - } } diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java new file mode 100644 index 000000000..7de2ac295 --- /dev/null +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2015-2022 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.bjornoya.schedule; + +public class JobConfiguration { + + private String cronExpression; + private boolean enabled; + private boolean triggerAtStartup; + private String name = "default"; + + public String getCronExpression() { + return cronExpression; + } + + public JobConfiguration setCronExpression(String cronExpression) { + this.cronExpression = cronExpression; + return this; + } + + public boolean isEnabled() { + return enabled; + } + + public JobConfiguration setEnabled(boolean enabled) { + this.enabled = enabled; + return this; + } + + public boolean isTriggerAtStartup() { + return triggerAtStartup; + } + + public JobConfiguration setTriggerAtStartup(boolean triggerAtStartup) { + this.triggerAtStartup = triggerAtStartup; + return this; + } + + public String getName() { + return name; + } + + public JobConfiguration setName(String name) { + this.name = name; + return this; + } + +} diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java new file mode 100644 index 000000000..d5c2fa09f --- /dev/null +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2015-2022 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.bjornoya.schedule; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; +import java.util.Set; + +import javax.inject.Inject; + +import org.n52.faroe.annotation.Configurable; +import org.n52.janmayen.lifecycle.Constructable; +import org.quartz.SchedulerException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + +@Configurable +public class JobHandler implements Constructable, CronExpressionValidator { + + private static final Logger LOGGER = LoggerFactory.getLogger(JobHandler.class); + private Scheduler scheduler; + private Set<String> jobs = new HashSet<>(); + private List<ScheduledJob> scheduledJobs = new ArrayList<>(); + private DefaultJobConfiguration defaultJobConfiguration; + + @Inject + @SuppressFBWarnings("EI_EXPOSE_REP2") + public void setScheduler(Scheduler scheduler) { + this.scheduler = scheduler; + } + + @Inject + public void setDefaultJobConfiguration(DefaultJobConfiguration defaultJobConfiguration) { + this.defaultJobConfiguration = defaultJobConfiguration.setJobHandler(this); + } + + @Inject + public void setScheduledJobs(Optional<List<ScheduledJob>> scheduledJobs) { + this.scheduledJobs.clear(); + if (scheduledJobs.isPresent()) { + this.scheduledJobs.addAll(scheduledJobs.get()); + } + } + + public void addScheduledJobs(List<ScheduledJob> scheduledJobs) { + if (scheduledJobs != null) { + this.scheduledJobs.addAll(scheduledJobs); + } + reschedule(); + } + + public void addScheduledJob(ScheduledJob scheduledJob) { + if (scheduledJob != null) { + this.scheduledJobs.add(scheduledJob); + } + reschedule(); + } + + public List<ScheduledJob> getScheduledJobs() { + return new LinkedList<>(scheduledJobs); + } + + public void reschedule() { + for (ScheduledJob job : getScheduledJobs()) { + if (jobs.contains(job.getJobName())) { + if (job instanceof FullHarvesterJob && job.getJobConfigurationName() + .equalsIgnoreCase(DefaultJobConfiguration.DEFUALT_FULL_HARVEST_JOB_NAME)) { + job.setCronExpression(defaultJobConfiguration.getFullCronExpression()); + } else if (job instanceof TemporalHarvesterJob && job.getJobConfigurationName() + .equalsIgnoreCase(DefaultJobConfiguration.DEFUALT_TEMPORAL_HARVEST_JOB_NAME)) { + job.setCronExpression(defaultJobConfiguration.getTemporalCronExpression()); + } + if (job.isModified()) { + try { + scheduler.updateJob(job); + } catch (SchedulerException e) { + LOGGER.error("Error while updating a job!", e); + } + } + } else { + scheduler.scheduleJob(job); + } + jobs.add(job.getJobName()); + job.setModified(false); + } + } + + @Override + public void init() { + reschedule(); + } +} diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java index 82660bfc1..63d1755f3 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java @@ -26,7 +26,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -public abstract class ScheduledJob extends QuartzJobBean { +public abstract class ScheduledJob extends QuartzJobBean implements CronExpressionValidator { private boolean enabled = true; private String jobName; @@ -35,21 +35,26 @@ public abstract class ScheduledJob extends QuartzJobBean { private String jobDescription; - private String cronExpression; - - private boolean triggerAtStartup; + private final JobConfiguration jobConfiguration; private DateTime startUpDelay; private boolean modified; + public ScheduledJob(JobConfiguration jobConfiguration) { + this.jobConfiguration = jobConfiguration; + this.modified = true; + } + // XXX job details create a job instance! snake biting tail public abstract JobDetail createJobDetails(); + public String getJobConfigurationName() { + return jobConfiguration.getName(); + } + public String getJobName() { - return jobName == null || jobName.isEmpty() - ? getClass().getSimpleName() - : jobName; + return jobName == null || jobName.isEmpty() ? getClass().getSimpleName() : jobName; } public void setJobName(String jobName) { @@ -57,9 +62,7 @@ public void setJobName(String jobName) { } public String getTriggerName() { - return triggerName == null || triggerName.isEmpty() - ? "trigger_" + getJobName() - : triggerName; + return triggerName == null || triggerName.isEmpty() ? "trigger_" + getJobName() : triggerName; } public void setTriggerName(String triggerName) { @@ -75,19 +78,19 @@ public void setJobDescription(String jobDescription) { } public String getCronExpression() { - return cronExpression; + return jobConfiguration.getCronExpression(); } public void setCronExpression(String cronExpresssion) { - this.cronExpression = cronExpresssion; + validate(cronExpresssion); + if (checkCronExpression(cronExpresssion)) { + jobConfiguration.setCronExpression(cronExpresssion); + setModified(true); + } } public boolean isTriggerAtStartup() { - return triggerAtStartup || isStartUpDelay(); - } - - public void setTriggerAtStartup(boolean triggerAtStartup) { - this.triggerAtStartup = triggerAtStartup; + return jobConfiguration.isTriggerAtStartup() || isStartUpDelay(); } public boolean isStartUpDelay() { @@ -95,9 +98,7 @@ public boolean isStartUpDelay() { } public Trigger createTrigger(JobKey jobKey) { - TriggerBuilder<Trigger> tb = TriggerBuilder.newTrigger() - .forJob(jobKey) - .withIdentity(getTriggerName()); + TriggerBuilder<Trigger> tb = TriggerBuilder.newTrigger().forJob(jobKey).withIdentity(getTriggerName()); if (getCronExpression() != null) { tb.withSchedule(CronScheduleBuilder.cronSchedule(getCronExpression())); } @@ -134,4 +135,13 @@ public DateTime getStartUpDelay() { public void setStartUpDelay(DateTime startUpDelay) { this.startUpDelay = startUpDelay; } + + private boolean checkCronExpression(String cronExpression) { + if (getCronExpression() == null || getCronExpression() != null && !getCronExpression().isEmpty() + && !getCronExpression().equals(cronExpression)) { + setCronExpression(cronExpression); + return true; + } + return false; + } } From f267c0b1cb4ac1c1d33806ee73e8f9f51e18f059 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 22 Jul 2022 14:22:28 +0200 Subject: [PATCH 349/456] update version to 9.7.0-SNAPSHOT --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 2 +- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index a48a01830..1a8d50305 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 4c35f7455..cad99de72 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 220273a3e..37e3b6a4e 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 24f400f08..bca1fa530 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 1f146ffb4..7739dd66d 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 87bdc73eb..8a3eb7f9c 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index f8006be1e..f3f1cdde1 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 50608353d..fd0987038 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 2a57244a9..a6d383dd5 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 450139678..ded31825a 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 3feb968de..b9282095c 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 50d8e1143..df6365b70 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index e77b6055c..52ad0fbec 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 5e3693a6c..032090b16 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index eddfad433..a1477f175 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 7280f1291..096f9abaa 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 9e7778d14..ec7440457 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 99f38c713..ac34615c0 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 5fe898abd..bd5e05333 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index f08ddf85e..d6a282dbb 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index b8da44fb7..db815d73c 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 2fe75b65a..786567589 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 74fd9a400..e85cd7740 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index eddf9e9ec..fec8e61d7 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 2cb15db27..44f7db2c7 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.6.2-SNAPSHOT</version> + <version>9.7.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From b0ba9cc90a8363b112a9d07e1fc7b22691e0c7df Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Mon, 25 Jul 2022 14:29:59 +0200 Subject: [PATCH 350/456] some refactoring for bjonoya --- .../bjornoya/schedule/JobConfiguration.java | 10 +++ .../org/n52/bjornoya/schedule/JobHandler.java | 12 ++-- .../n52/bjornoya/schedule/ScheduledJob.java | 69 ++++++++++++++++--- 3 files changed, 77 insertions(+), 14 deletions(-) diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java index 7de2ac295..3643a4ab8 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java @@ -21,6 +21,7 @@ public class JobConfiguration { private boolean enabled; private boolean triggerAtStartup; private String name = "default"; + private boolean modified; public String getCronExpression() { return cronExpression; @@ -49,6 +50,15 @@ public JobConfiguration setTriggerAtStartup(boolean triggerAtStartup) { return this; } + public boolean isModified() { + return modified; + } + + public JobConfiguration setModified(boolean modified) { + this.modified = modified; + return this; + } + public String getName() { return name; } diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java index d5c2fa09f..1345d946b 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java @@ -16,11 +16,13 @@ package org.n52.bjornoya.schedule; import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Optional; import java.util.Set; +import java.util.TreeSet; import javax.inject.Inject; @@ -38,7 +40,7 @@ public class JobHandler implements Constructable, CronExpressionValidator { private static final Logger LOGGER = LoggerFactory.getLogger(JobHandler.class); private Scheduler scheduler; private Set<String> jobs = new HashSet<>(); - private List<ScheduledJob> scheduledJobs = new ArrayList<>(); + private Set<ScheduledJob> scheduledJobs = new TreeSet<>(); private DefaultJobConfiguration defaultJobConfiguration; @Inject @@ -53,14 +55,14 @@ public void setDefaultJobConfiguration(DefaultJobConfiguration defaultJobConfigu } @Inject - public void setScheduledJobs(Optional<List<ScheduledJob>> scheduledJobs) { + public void setScheduledJobs(Optional<Collection<ScheduledJob>> scheduledJobs) { this.scheduledJobs.clear(); if (scheduledJobs.isPresent()) { this.scheduledJobs.addAll(scheduledJobs.get()); } } - public void addScheduledJobs(List<ScheduledJob> scheduledJobs) { + public void addScheduledJobs(Collection<ScheduledJob> scheduledJobs) { if (scheduledJobs != null) { this.scheduledJobs.addAll(scheduledJobs); } @@ -81,10 +83,10 @@ public List<ScheduledJob> getScheduledJobs() { public void reschedule() { for (ScheduledJob job : getScheduledJobs()) { if (jobs.contains(job.getJobName())) { - if (job instanceof FullHarvesterJob && job.getJobConfigurationName() + if (job instanceof FullHarvesterJob && job.getJobName() .equalsIgnoreCase(DefaultJobConfiguration.DEFUALT_FULL_HARVEST_JOB_NAME)) { job.setCronExpression(defaultJobConfiguration.getFullCronExpression()); - } else if (job instanceof TemporalHarvesterJob && job.getJobConfigurationName() + } else if (job instanceof TemporalHarvesterJob && job.getJobName() .equalsIgnoreCase(DefaultJobConfiguration.DEFUALT_TEMPORAL_HARVEST_JOB_NAME)) { job.setCronExpression(defaultJobConfiguration.getTemporalCronExpression()); } diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java index 63d1755f3..617dbd66f 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java @@ -18,15 +18,22 @@ import org.joda.time.DateTime; import org.quartz.CronScheduleBuilder; import org.quartz.DateBuilder; +import org.quartz.JobDataMap; import org.quartz.JobDetail; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; import org.quartz.JobKey; import org.quartz.Trigger; import org.quartz.TriggerBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.scheduling.quartz.QuartzJobBean; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -public abstract class ScheduledJob extends QuartzJobBean implements CronExpressionValidator { +public abstract class ScheduledJob extends QuartzJobBean implements CronExpressionValidator, Comparable<ScheduledJob> { + protected static final String JOB_CONFIG = "config"; + private static final Logger LOGGER = LoggerFactory.getLogger(ScheduledJob.class); private boolean enabled = true; private String jobName; @@ -35,22 +42,61 @@ public abstract class ScheduledJob extends QuartzJobBean implements CronExpressi private String jobDescription; - private final JobConfiguration jobConfiguration; + private JobConfiguration jobConfiguration; private DateTime startUpDelay; - private boolean modified; + public ScheduledJob() { + this.jobConfiguration = jobConfiguration.setModified(true); + } + + @Override + protected void executeInternal(JobExecutionContext context) throws JobExecutionException { + Long start = System.currentTimeMillis(); + try { + LOGGER.debug(context.getJobDetail().getKey() + " execution starts."); + setJobConfig(context); + process(context); + } catch (Exception ex) { + LOGGER.error("Error while harvesting data!", ex); + } finally { + LOGGER.debug(context.getJobDetail().getKey() + " execution finished in {} ms.", + System.currentTimeMillis() - start); + } + } - public ScheduledJob(JobConfiguration jobConfiguration) { - this.jobConfiguration = jobConfiguration; - this.modified = true; + private void setJobConfig(JobExecutionContext context) { + if (this.jobConfiguration == null) { + this.jobConfiguration = (JobConfiguration) context.getJobDetail().getJobDataMap().get(JOB_CONFIG); + } } + protected abstract void process(JobExecutionContext context) throws JobExecutionException; + // XXX job details create a job instance! snake biting tail public abstract JobDetail createJobDetails(); + protected JobDataMap getJobDataMap() { + JobDataMap dataMap = new JobDataMap(); + dataMap.put(JOB_CONFIG, jobConfiguration); + return dataMap; + } + public String getJobConfigurationName() { - return jobConfiguration.getName(); + return getJobConfiguration().getName(); + } + + public void init(JobConfiguration initConfig) { + setJobConfiguration(initConfig); + setJobName(initConfig.getName()); + } + + public void setJobConfiguration(JobConfiguration jobConfiguration) { + this.jobConfiguration = jobConfiguration; + } + + public JobConfiguration getJobConfiguration() { + return jobConfiguration; } public String getJobName() { @@ -119,11 +165,11 @@ public void setEnabled(boolean enabled) { } public boolean isModified() { - return modified; + return getJobConfiguration().isModified(); } public void setModified(boolean modified) { - this.modified = modified; + getJobConfiguration().setModified(modified); } @SuppressFBWarnings("EI_EXPOSE_REP") @@ -144,4 +190,9 @@ private boolean checkCronExpression(String cronExpression) { } return false; } + + @Override + public int compareTo(ScheduledJob o) { + return o == null ? -1 : getJobName().compareTo(o.getJobName()); + } } From 0ace2057b3c7379ff81186f28840c5940663fd49 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Mon, 25 Jul 2022 15:51:51 +0200 Subject: [PATCH 351/456] fix build --- .../org/n52/bjornoya/schedule/JobHandler.java | 1 - .../n52/bjornoya/schedule/ScheduledJob.java | 47 ++++++++++++------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java index 1345d946b..f9ef0659c 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java @@ -15,7 +15,6 @@ */ package org.n52.bjornoya.schedule; -import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.LinkedList; diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java index 617dbd66f..34c4a23d1 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java @@ -46,10 +46,6 @@ public abstract class ScheduledJob extends QuartzJobBean implements CronExpressi private DateTime startUpDelay; - public ScheduledJob() { - this.jobConfiguration = jobConfiguration.setModified(true); - } - @Override protected void executeInternal(JobExecutionContext context) throws JobExecutionException { Long start = System.currentTimeMillis(); @@ -66,7 +62,7 @@ protected void executeInternal(JobExecutionContext context) throws JobExecutionE } private void setJobConfig(JobExecutionContext context) { - if (this.jobConfiguration == null) { + if (this.getJobConfiguration() == null) { this.jobConfiguration = (JobConfiguration) context.getJobDetail().getJobDataMap().get(JOB_CONFIG); } } @@ -78,21 +74,23 @@ private void setJobConfig(JobExecutionContext context) { protected JobDataMap getJobDataMap() { JobDataMap dataMap = new JobDataMap(); - dataMap.put(JOB_CONFIG, jobConfiguration); + dataMap.put(JOB_CONFIG, getJobConfiguration()); return dataMap; } public String getJobConfigurationName() { - return getJobConfiguration().getName(); + return isSetJobConfiguration() ? getJobConfiguration().getName() : null; } - public void init(JobConfiguration initConfig) { + public ScheduledJob init(JobConfiguration initConfig) { setJobConfiguration(initConfig); setJobName(initConfig.getName()); + return this; } - public void setJobConfiguration(JobConfiguration jobConfiguration) { + public ScheduledJob setJobConfiguration(JobConfiguration jobConfiguration) { this.jobConfiguration = jobConfiguration; + return this; } public JobConfiguration getJobConfiguration() { @@ -103,40 +101,47 @@ public String getJobName() { return jobName == null || jobName.isEmpty() ? getClass().getSimpleName() : jobName; } - public void setJobName(String jobName) { + public ScheduledJob setJobName(String jobName) { this.jobName = jobName; + return this; } public String getTriggerName() { return triggerName == null || triggerName.isEmpty() ? "trigger_" + getJobName() : triggerName; } - public void setTriggerName(String triggerName) { + public ScheduledJob setTriggerName(String triggerName) { this.triggerName = triggerName; + return this; } public String getJobDescription() { return jobDescription; } - public void setJobDescription(String jobDescription) { + public ScheduledJob setJobDescription(String jobDescription) { this.jobDescription = jobDescription; + return this; } public String getCronExpression() { - return jobConfiguration.getCronExpression(); + return isSetJobConfiguration() ? getJobConfiguration().getCronExpression() : null; } - public void setCronExpression(String cronExpresssion) { + public ScheduledJob setCronExpression(String cronExpresssion) { validate(cronExpresssion); if (checkCronExpression(cronExpresssion)) { - jobConfiguration.setCronExpression(cronExpresssion); + if (!isSetJobConfiguration()) { + setJobConfiguration(new JobConfiguration()); + } + getJobConfiguration().setCronExpression(cronExpresssion); setModified(true); } + return this; } public boolean isTriggerAtStartup() { - return jobConfiguration.isTriggerAtStartup() || isStartUpDelay(); + return isSetJobConfiguration() && getJobConfiguration().isTriggerAtStartup() || isStartUpDelay(); } public boolean isStartUpDelay() { @@ -165,11 +170,13 @@ public void setEnabled(boolean enabled) { } public boolean isModified() { - return getJobConfiguration().isModified(); + return isSetJobConfiguration() ? getJobConfiguration().isModified() : false; } public void setModified(boolean modified) { - getJobConfiguration().setModified(modified); + if (isSetJobConfiguration()) { + getJobConfiguration().setModified(modified); + } } @SuppressFBWarnings("EI_EXPOSE_REP") @@ -182,6 +189,10 @@ public void setStartUpDelay(DateTime startUpDelay) { this.startUpDelay = startUpDelay; } + private boolean isSetJobConfiguration() { + return getJobConfiguration() != null; + } + private boolean checkCronExpression(String cronExpression) { if (getCronExpression() == null || getCronExpression() != null && !getCronExpression().isEmpty() && !getCronExpression().equals(cronExpression)) { From ef867b2d93dabdd78af3499f0b8e7402962e4c95 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 26 Jul 2022 13:52:22 +0200 Subject: [PATCH 352/456] add setter for name and add jobtype (full, temporal --- .../bjornoya/schedule/JobConfiguration.java | 24 +++++++++++++++---- .../n52/bjornoya/schedule/ScheduledJob.java | 19 +++++++++++---- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java index 3643a4ab8..5735af262 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java @@ -20,8 +20,9 @@ public class JobConfiguration { private String cronExpression; private boolean enabled; private boolean triggerAtStartup; - private String name = "default"; + private JobType jobType = JobType.full; private boolean modified; + private String name = "default" + jobType.name(); public String getCronExpression() { return cronExpression; @@ -42,7 +43,7 @@ public JobConfiguration setEnabled(boolean enabled) { } public boolean isTriggerAtStartup() { - return triggerAtStartup; + return this.jobType.equals(JobType.temporal) ? false : triggerAtStartup; } public JobConfiguration setTriggerAtStartup(boolean triggerAtStartup) { @@ -59,13 +60,28 @@ public JobConfiguration setModified(boolean modified) { return this; } + public JobConfiguration setName(String name) { + this.name = name; + return this; + } + public String getName() { return name; } - public JobConfiguration setName(String name) { - this.name = name; + public String getJobType() { + return jobType.name(); + } + + public JobConfiguration setJobType(String jobType) { + if (jobType != null && !jobType.isEmpty()) + this.jobType = JobType.valueOf(jobType); return this; } + public enum JobType { + full, + temporal; + } + } diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java index 34c4a23d1..d88037b13 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java @@ -18,6 +18,8 @@ import org.joda.time.DateTime; import org.quartz.CronScheduleBuilder; import org.quartz.DateBuilder; +import org.quartz.Job; +import org.quartz.JobBuilder; import org.quartz.JobDataMap; import org.quartz.JobDetail; import org.quartz.JobExecutionContext; @@ -51,7 +53,7 @@ protected void executeInternal(JobExecutionContext context) throws JobExecutionE Long start = System.currentTimeMillis(); try { LOGGER.debug(context.getJobDetail().getKey() + " execution starts."); - setJobConfig(context); + recreateConfig(context); process(context); } catch (Exception ex) { LOGGER.error("Error while harvesting data!", ex); @@ -61,16 +63,23 @@ protected void executeInternal(JobExecutionContext context) throws JobExecutionE } } - private void setJobConfig(JobExecutionContext context) { - if (this.getJobConfiguration() == null) { + private void recreateConfig(JobExecutionContext context) { + if (this.getJobConfiguration() == null && context != null && context.getJobDetail() != null + && context.getJobDetail().getJobDataMap() != null + && context.getJobDetail().getJobDataMap().get(JOB_CONFIG) != null + && context.getJobDetail().getJobDataMap().get(JOB_CONFIG) instanceof JobConfiguration) { this.jobConfiguration = (JobConfiguration) context.getJobDetail().getJobDataMap().get(JOB_CONFIG); } } protected abstract void process(JobExecutionContext context) throws JobExecutionException; - // XXX job details create a job instance! snake biting tail - public abstract JobDetail createJobDetails(); + protected abstract Class<? extends Job> getClazz(); + + public JobDetail createJobDetails() { + return JobBuilder.newJob(getClazz()).withIdentity(getJobName()).usingJobData(getJobDataMap()) + .build(); + } protected JobDataMap getJobDataMap() { JobDataMap dataMap = new JobDataMap(); From 92a6e1c30a13719e74484a00c38dff9d9a6e7bb6 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 26 Jul 2022 14:20:10 +0200 Subject: [PATCH 353/456] fix checkstyle --- .../java/org/n52/bjornoya/schedule/JobConfiguration.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java index 5735af262..6a6d0d1fe 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java @@ -20,7 +20,7 @@ public class JobConfiguration { private String cronExpression; private boolean enabled; private boolean triggerAtStartup; - private JobType jobType = JobType.full; + private JobType jobType = JobType.full; private boolean modified; private String name = "default" + jobType.name(); @@ -74,8 +74,9 @@ public String getJobType() { } public JobConfiguration setJobType(String jobType) { - if (jobType != null && !jobType.isEmpty()) - this.jobType = JobType.valueOf(jobType); + if (jobType != null && !jobType.isEmpty()) { + this.jobType = JobType.valueOf(jobType); + } return this; } From 4b76305137a882ffda8dc19d8ea613d1d86a8359 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Jul 2022 04:01:03 +0000 Subject: [PATCH 354/456] Bump version.junit from 5.8.2 to 5.9.0 Bumps `version.junit` from 5.8.2 to 5.9.0. Updates `junit-jupiter-api` from 5.8.2 to 5.9.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0) Updates `junit-jupiter-engine` from 5.8.2 to 5.9.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0) Updates `junit-jupiter-params` from 5.8.2 to 5.9.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 032090b16..e37f0a94c 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ <version.javax-annotation-api>1.3.2</version.javax-annotation-api> <version.jena>3.17.0</version.jena> <version.jackson>2.13.3</version.jackson> - <version.junit>5.8.2</version.junit> + <version.junit>5.9.0</version.junit> <version.mockito>4.6.1</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> From bc4afae4221a8e7d3c29b5ae33b110b40d97eace Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Jul 2022 04:46:55 +0000 Subject: [PATCH 355/456] Bump version.junit from 5.8.2 to 5.9.0 Bumps `version.junit` from 5.8.2 to 5.9.0. Updates `junit-jupiter-api` from 5.8.2 to 5.9.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0) Updates `junit-jupiter-engine` from 5.8.2 to 5.9.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0) Updates `junit-jupiter-params` from 5.8.2 to 5.9.0 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 293681746..c16d5ae94 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ <version.jakarta-annotation-api>2.1.1</version.jakarta-annotation-api> <version.jena>4.5.0</version.jena> <version.jackson>2.13.3</version.jackson> - <version.junit>5.8.2</version.junit> + <version.junit>5.9.0</version.junit> <version.mockito>4.6.1</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> From d99715d453c7ba8c521f652a43f13b2fdec039de Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 27 Jul 2022 13:45:42 +0200 Subject: [PATCH 356/456] add constant --- .../java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java index 784090781..537bd94ef 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java @@ -26,6 +26,8 @@ @DisallowConcurrentExecution public interface TemporalHarvesterJob extends Job { + String LAST_UPDATE_TIME = "LAST_UPDATE_TIME"; + default DateTime getLastUpdateTime(JobExecutionContext context) { if (context.getPreviousFireTime() != null) { return new DateTime(context.getPreviousFireTime()); From 0f937801f8ecf0ec8644af1ee9f92767b934639f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Jul 2022 04:03:17 +0000 Subject: [PATCH 357/456] Bump Saxon-HE from 11.3 to 11.4 Bumps Saxon-HE from 11.3 to 11.4. --- updated-dependencies: - dependency-name: net.sf.saxon:Saxon-HE dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 032090b16..93a3e6552 100644 --- a/pom.xml +++ b/pom.xml @@ -556,7 +556,7 @@ <dependency> <groupId>net.sf.saxon</groupId> <artifactId>Saxon-HE</artifactId> - <version>11.3</version> + <version>11.4</version> </dependency> From 089657cec91448c8b30db87115ab1c721250b690 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Jul 2022 04:45:43 +0000 Subject: [PATCH 358/456] Bump lucene-core from 9.2.0 to 9.3.0 Bumps lucene-core from 9.2.0 to 9.3.0. --- updated-dependencies: - dependency-name: org.apache.lucene:lucene-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 293681746..c3e2f56b9 100644 --- a/pom.xml +++ b/pom.xml @@ -638,7 +638,7 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>9.2.0</version> + <version>9.3.0</version> </dependency> <dependency> <groupId>com.maxmind.db</groupId> From 288d806a6c33ef9b579867d1999762a5e6036740 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Jul 2022 04:45:52 +0000 Subject: [PATCH 359/456] Bump Saxon-HE from 11.3 to 11.4 Bumps Saxon-HE from 11.3 to 11.4. --- updated-dependencies: - dependency-name: net.sf.saxon:Saxon-HE dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 293681746..40cd91893 100644 --- a/pom.xml +++ b/pom.xml @@ -558,7 +558,7 @@ <dependency> <groupId>net.sf.saxon</groupId> <artifactId>Saxon-HE</artifactId> - <version>11.3</version> + <version>11.4</version> </dependency> From 5044ec48bc27669ac6f8186fd2488af611215b89 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 29 Jul 2022 14:03:34 +0200 Subject: [PATCH 360/456] some enhancements --- .../schedule/DefaultJobConfiguration.java | 47 +++++++++++++++++-- .../bjornoya/schedule/JobConfiguration.java | 19 +++++++- .../org/n52/bjornoya/schedule/JobHandler.java | 10 ++-- .../n52/bjornoya/schedule/ScheduledJob.java | 32 ++++++++++++- .../schedule/TemporalHarvesterJob.java | 7 +++ 5 files changed, 106 insertions(+), 9 deletions(-) diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/DefaultJobConfiguration.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/DefaultJobConfiguration.java index 502bfdb1c..c1245dc6e 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/DefaultJobConfiguration.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/DefaultJobConfiguration.java @@ -15,6 +15,11 @@ */ package org.n52.bjornoya.schedule; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.Set; + +import org.n52.bjornoya.schedule.JobConfiguration.JobType; import org.n52.faroe.Validation; import org.n52.faroe.annotation.Configurable; import org.n52.faroe.annotation.Setting; @@ -25,7 +30,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @Configurable -@SuppressFBWarnings({"EI_EXPOSE_REP", "EI_EXPOSE_REP2"}) +@SuppressFBWarnings({ "EI_EXPOSE_REP", "EI_EXPOSE_REP2" }) public class DefaultJobConfiguration implements CronExpressionValidator { public static final String FULL_HARVEST_UPDATE = "harvest.full"; @@ -45,6 +50,7 @@ public class DefaultJobConfiguration implements CronExpressionValidator { private String cronFullExpression = DEFAULT_FULL; private String cronTemporalExpression = DEFAULT_TEMPORAL; private JobHandler jobHandler; + private Set<String> defaultJobNames = new LinkedHashSet<>(); /** * @return the cronFullExpression @@ -109,13 +115,48 @@ private void reschedule() { } public JobConfiguration getFullJobConfiguration() { + return getFullJobConfiguration(DEFUALT_FULL_HARVEST_JOB_NAME); + } + + public JobConfiguration getFullJobConfiguration(String name) { + addDefaultJobName(name); return new JobConfiguration().setEnabled(true).setTriggerAtStartup(true) - .setCronExpression(getFullCronExpression()).setName(DEFUALT_FULL_HARVEST_JOB_NAME); + .setCronExpression(getFullCronExpression()).setJobType(JobType.full).setName(name); } public JobConfiguration getTemporalJobConfiguration() { + return getTemporalJobConfiguration(DEFUALT_TEMPORAL_HARVEST_JOB_NAME); + } + + public JobConfiguration getTemporalJobConfiguration(String name) { + addDefaultJobName(name); return new JobConfiguration().setEnabled(true).setTriggerAtStartup(true) - .setCronExpression(getTemporalCronExpression()).setName(DEFUALT_TEMPORAL_HARVEST_JOB_NAME); + .setCronExpression(getTemporalCronExpression()).setJobType(JobType.temporal).setName(name); + } + + public DefaultJobConfiguration addDefaultJobNames(Collection<String> names) { + if (names != null) { + names.forEach(this::addDefaultJobName); + } + return this; + } + + public DefaultJobConfiguration addDefaultJobName(String name) { + if (name != null && !name.isEmpty()) { + this.defaultJobNames.add(name); + } + return this; + } + + public DefaultJobConfiguration removeDefaultJobName(String name) { + if (name != null && !name.isEmpty()) { + this.defaultJobNames.remove(name); + } + return this; + } + + public Collection<String> getDefaultJobNames() { + return defaultJobNames; } } diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java index 6a6d0d1fe..fd865cd49 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobConfiguration.java @@ -22,7 +22,8 @@ public class JobConfiguration { private boolean triggerAtStartup; private JobType jobType = JobType.full; private boolean modified; - private String name = "default" + jobType.name(); + private String name = "default - " + jobType.name(); + private String group = "group"; public String getCronExpression() { return cronExpression; @@ -69,6 +70,15 @@ public String getName() { return name; } + public String getGroup() { + return group; + } + + public JobConfiguration setGroup(String group) { + this.group = group; + return this; + } + public String getJobType() { return jobType.name(); } @@ -80,6 +90,13 @@ public JobConfiguration setJobType(String jobType) { return this; } + public JobConfiguration setJobType(JobType jobType) { + if (jobType != null) { + this.jobType = jobType; + } + return this; + } + public enum JobType { full, temporal; diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java index f9ef0659c..03c3450e0 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/JobHandler.java @@ -80,13 +80,15 @@ public List<ScheduledJob> getScheduledJobs() { } public void reschedule() { + reschedule(defaultJobConfiguration.getDefaultJobNames()); + } + + public void reschedule(Collection<String> defaultJobNames) { for (ScheduledJob job : getScheduledJobs()) { if (jobs.contains(job.getJobName())) { - if (job instanceof FullHarvesterJob && job.getJobName() - .equalsIgnoreCase(DefaultJobConfiguration.DEFUALT_FULL_HARVEST_JOB_NAME)) { + if (job instanceof FullHarvesterJob && defaultJobNames.contains(job.getJobName())) { job.setCronExpression(defaultJobConfiguration.getFullCronExpression()); - } else if (job instanceof TemporalHarvesterJob && job.getJobName() - .equalsIgnoreCase(DefaultJobConfiguration.DEFUALT_TEMPORAL_HARVEST_JOB_NAME)) { + } else if (job instanceof TemporalHarvesterJob && defaultJobNames.contains(job.getJobName())) { job.setCronExpression(defaultJobConfiguration.getTemporalCronExpression()); } if (job.isModified()) { diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java index d88037b13..1b377a0fd 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java @@ -15,7 +15,13 @@ */ package org.n52.bjornoya.schedule; +import java.util.Optional; + +import javax.inject.Inject; + import org.joda.time.DateTime; +import org.n52.janmayen.event.Event; +import org.n52.janmayen.event.EventBus; import org.quartz.CronScheduleBuilder; import org.quartz.DateBuilder; import org.quartz.Job; @@ -40,6 +46,7 @@ public abstract class ScheduledJob extends QuartzJobBean implements CronExpressi private String jobName; + private String jobGroup; private String triggerName; private String jobDescription; @@ -48,6 +55,9 @@ public abstract class ScheduledJob extends QuartzJobBean implements CronExpressi private DateTime startUpDelay; + @Inject + private Optional<EventBus> eventBus; + @Override protected void executeInternal(JobExecutionContext context) throws JobExecutionException { Long start = System.currentTimeMillis(); @@ -77,7 +87,7 @@ private void recreateConfig(JobExecutionContext context) { protected abstract Class<? extends Job> getClazz(); public JobDetail createJobDetails() { - return JobBuilder.newJob(getClazz()).withIdentity(getJobName()).usingJobData(getJobDataMap()) + return JobBuilder.newJob(getClazz()).withIdentity(getJobName(), getJobGroup()).usingJobData(getJobDataMap()) .build(); } @@ -94,6 +104,7 @@ public String getJobConfigurationName() { public ScheduledJob init(JobConfiguration initConfig) { setJobConfiguration(initConfig); setJobName(initConfig.getName()); + setJobGroup(initConfig.getGroup()); return this; } @@ -115,6 +126,15 @@ public ScheduledJob setJobName(String jobName) { return this; } + public String getJobGroup() { + return jobGroup; + } + + public ScheduledJob setJobGroup(String jobGroup) { + this.jobGroup = jobGroup; + return this; + } + public String getTriggerName() { return triggerName == null || triggerName.isEmpty() ? "trigger_" + getJobName() : triggerName; } @@ -211,6 +231,16 @@ private boolean checkCronExpression(String cronExpression) { return false; } + protected EventBus getEventBus() { + return eventBus.isPresent() ? eventBus.get() : null; + } + + protected void submitEvent(Event event) { + if (getEventBus() != null && event != null) { + getEventBus().submit(event); + } + } + @Override public int compareTo(ScheduledJob o) { return o == null ? -1 : getJobName().compareTo(o.getJobName()); diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java index 537bd94ef..ddb4476a4 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/TemporalHarvesterJob.java @@ -37,4 +37,11 @@ default DateTime getLastUpdateTime(JobExecutionContext context) { new DateTime(context.getNextFireTime()))); } + default DateTime getNextTime(String nextToken, DateTime now) { + if (nextToken != null && !nextToken.isEmpty()) { + return new DateTime(nextToken); + } + return now; + } + } From 67092ca7add31cebcae86c35379226b7059e0577 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 2 Aug 2022 13:23:49 +0200 Subject: [PATCH 361/456] Fix cron update --- .../java/org/n52/bjornoya/schedule/ScheduledJob.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java index 1b377a0fd..ffaa23f05 100644 --- a/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java +++ b/bjornoya/src/main/java/org/n52/bjornoya/schedule/ScheduledJob.java @@ -68,8 +68,8 @@ protected void executeInternal(JobExecutionContext context) throws JobExecutionE } catch (Exception ex) { LOGGER.error("Error while harvesting data!", ex); } finally { - LOGGER.debug(context.getJobDetail().getKey() + " execution finished in {} ms.", - System.currentTimeMillis() - start); + LOGGER.debug(context.getJobDetail().getKey() + " execution finished in {} ms. Next execution: {}", + System.currentTimeMillis() - start, new DateTime(context.getNextFireTime())); } } @@ -223,12 +223,8 @@ private boolean isSetJobConfiguration() { } private boolean checkCronExpression(String cronExpression) { - if (getCronExpression() == null || getCronExpression() != null && !getCronExpression().isEmpty() - && !getCronExpression().equals(cronExpression)) { - setCronExpression(cronExpression); - return true; - } - return false; + return getCronExpression() == null || getCronExpression() != null && !getCronExpression().isEmpty() + && !getCronExpression().equals(cronExpression); } protected EventBus getEventBus() { From 899c1493e9f873d4e612d8a80e13994dd039ccf0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 04:00:25 +0000 Subject: [PATCH 362/456] Bump maven-javadoc-plugin from 3.4.0 to 3.4.1 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.4.0...maven-javadoc-plugin-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 69aff8758..98410e52e 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.5</version.elastic> <version.antlr4>4.9.3</version.antlr4> - <version.maven-javadoc-plugin>3.4.0</version.maven-javadoc-plugin> + <version.maven-javadoc-plugin>3.4.1</version.maven-javadoc-plugin> </properties> <dependencyManagement> From df154c5a656287bbc967ad6ab22debd880225314 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 04:00:44 +0000 Subject: [PATCH 363/456] Bump version.mockito from 4.6.1 to 4.7.0 Bumps `version.mockito` from 4.6.1 to 4.7.0. Updates `mockito-core` from 4.6.1 to 4.7.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.7.0) Updates `mockito-junit-jupiter` from 4.6.1 to 4.7.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.7.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 69aff8758..e6e941228 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <version.jena>3.17.0</version.jena> <version.jackson>2.13.3</version.jackson> <version.junit>5.9.0</version.junit> - <version.mockito>4.6.1</version.mockito> + <version.mockito>4.7.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.5</version.elastic> From 524f7e7762ba6434662585005d66e9461e4ea627 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 04:02:08 +0000 Subject: [PATCH 364/456] Bump joda-time from 2.10.14 to 2.11.0 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.14 to 2.11.0. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.14...v2.11.0) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 69aff8758..94b060ca8 100644 --- a/pom.xml +++ b/pom.xml @@ -317,7 +317,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.10.14</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>org.locationtech.jts</groupId> From ce3080394bc07666ab4a6a89b60a9921e304d220 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 04:49:33 +0000 Subject: [PATCH 365/456] Bump joda-time from 2.10.14 to 2.11.0 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.14 to 2.11.0. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.14...v2.11.0) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f0fe14894..ef9e74cbc 100644 --- a/pom.xml +++ b/pom.xml @@ -319,7 +319,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.10.14</version> + <version>2.11.0</version> </dependency> <dependency> <groupId>org.locationtech.jts</groupId> From b2c82c3ef61b39c7b6d5f5c46e5d97db99fc638a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 04:49:47 +0000 Subject: [PATCH 366/456] Bump maven-javadoc-plugin from 3.4.0 to 3.4.1 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.4.0...maven-javadoc-plugin-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f0fe14894..f40476be6 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.5</version.elastic> <version.antlr4>4.10.1</version.antlr4> - <version.maven-javadoc-plugin>3.4.0</version.maven-javadoc-plugin> + <version.maven-javadoc-plugin>3.4.1</version.maven-javadoc-plugin> <version.java>11</version.java> </properties> From b9b2858f8040a688bbfcd042935be77fa39a81bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 04:50:22 +0000 Subject: [PATCH 367/456] Bump version.mockito from 4.6.1 to 4.7.0 Bumps `version.mockito` from 4.6.1 to 4.7.0. Updates `mockito-core` from 4.6.1 to 4.7.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.7.0) Updates `mockito-junit-jupiter` from 4.6.1 to 4.7.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.7.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f0fe14894..fcb0866d6 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <version.jena>4.5.0</version.jena> <version.jackson>2.13.3</version.jackson> <version.junit>5.9.0</version.junit> - <version.mockito>4.6.1</version.mockito> + <version.mockito>4.7.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.5</version.elastic> From 62771c5f1d6518588630853abd2ff9667c4c40a3 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 16 Aug 2022 08:43:10 +0200 Subject: [PATCH 368/456] update notice --- NOTICE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NOTICE b/NOTICE index e99ae3610..e3f6c976c 100644 --- a/NOTICE +++ b/NOTICE @@ -49,6 +49,8 @@ This project includes: Apache HttpAsyncClient under Apache License, Version 2.0 Apache HttpClient under Apache License, Version 2.0 Apache HttpClient Cache under Apache License, Version 2.0 + Apache HttpComponents Core HTTP/1.1 under Apache License, Version 2.0 + Apache HttpComponents Core HTTP/2 under Apache License, Version 2.0 Apache HttpCore under Apache License, Version 2.0 Apache HttpCore NIO under Apache License, Version 2.0 Apache Jena - ARQ (SPARQL 1.1 Query Engine) under The Apache Software License, Version 2.0 From 200ff2f631bad9e67b9122b0119a8556f9271b43 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 16 Aug 2022 08:51:38 +0200 Subject: [PATCH 369/456] [maven-release-plugin] prepare release v9.7.0 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 1a8d50305..73ab5105b 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index cad99de72..59b5ff6c3 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 37e3b6a4e..502b89513 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index bca1fa530..93183d20e 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 7739dd66d..ce74d7375 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 8a3eb7f9c..1f086ef8f 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index f3f1cdde1..d8fa375fa 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index fd0987038..e5ff60ef8 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index a6d383dd5..88df38fd5 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index ded31825a..dba25f7a6 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index b9282095c..2148190f9 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index df6365b70..3757087b4 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 52ad0fbec..91e8a56c5 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 853c94243..caed4c504 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>HEAD</tag> + <tag>v9.7.0</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index a1477f175..c4264b9e6 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 096f9abaa..5bee169b2 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index ec7440457..9ecd16c92 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index ac34615c0..d76d41571 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index bd5e05333..a71ff70b1 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index d6a282dbb..90624fd79 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index db815d73c..d6f57a09c 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 786567589..a77cf368d 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index e85cd7740..b948d7a0f 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index fec8e61d7..e645e0bdb 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 44f7db2c7..bf999d036 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0-SNAPSHOT</version> + <version>9.7.0</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From aa5bc559a6826a5a1a78ab0cfe5681a20aa90ebc Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 16 Aug 2022 08:51:49 +0200 Subject: [PATCH 370/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 73ab5105b..f25da6b38 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 59b5ff6c3..4ed9daecf 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 502b89513..49fb218dd 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 93183d20e..83327801e 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index ce74d7375..29f688111 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 1f086ef8f..e99c77404 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index d8fa375fa..baabc9495 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index e5ff60ef8..5bc30bb84 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 88df38fd5..f6975259a 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index dba25f7a6..7a0cb1a5a 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 2148190f9..d0d96f06e 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 3757087b4..378d3f853 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 91e8a56c5..8947b9d2a 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index caed4c504..97a6d150c 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>v9.7.0</tag> + <tag>HEAD</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index c4264b9e6..8a75c7230 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 5bee169b2..089309902 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 9ecd16c92..59f6f7aee 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index d76d41571..02bfe3aed 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index a71ff70b1..7dd328ecd 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 90624fd79..448d06dc7 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index d6f57a09c..2369710dc 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index a77cf368d..23209e15d 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index b948d7a0f..c7050cf3d 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index e645e0bdb..818fa87aa 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index bf999d036..d437be273 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.7.0</version> + <version>9.8.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From b0127f85d9ce9b31e62c1374b251208bcc7dddd4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 04:00:36 +0000 Subject: [PATCH 371/456] Bump version.slf4j from 1.7.36 to 2.0.0 Bumps `version.slf4j` from 1.7.36 to 2.0.0. Updates `slf4j-api` from 1.7.36 to 2.0.0 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.36...v_2.0.0) Updates `slf4j-simple` from 1.7.36 to 2.0.0 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.36...v_2.0.0) Updates `jcl-over-slf4j` from 1.7.36 to 2.0.0 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.36...v_2.0.0) Updates `slf4j-nop` from 1.7.36 to 2.0.0 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.36...v_2.0.0) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.slf4j:slf4j-nop dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97a6d150c..f57626b4f 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> <version.spring>5.3.22</version.spring> - <version.slf4j>1.7.36</version.slf4j> + <version.slf4j>2.0.0</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> <version.jaxb>2.3.0</version.jaxb> From b001583b4a4fc652f217bcdda27c367ea5fae82d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 04:37:00 +0000 Subject: [PATCH 372/456] Bump version.slf4j from 1.7.36 to 2.0.0 Bumps `version.slf4j` from 1.7.36 to 2.0.0. Updates `slf4j-api` from 1.7.36 to 2.0.0 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.36...v_2.0.0) Updates `slf4j-simple` from 1.7.36 to 2.0.0 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.36...v_2.0.0) Updates `jcl-over-slf4j` from 1.7.36 to 2.0.0 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.36...v_2.0.0) Updates `slf4j-nop` from 1.7.36 to 2.0.0 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.36...v_2.0.0) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.slf4j:slf4j-nop dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9b522ba0c..6ea1ac536 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> <version.spring>5.3.22</version.spring> - <version.slf4j>1.7.36</version.slf4j> + <version.slf4j>2.0.0</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> <version.jaxb>2.3.0</version.jaxb> From a9fb025d470f596089a2ec63189ac37af9750547 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 04:01:45 +0000 Subject: [PATCH 373/456] Bump version.elastic from 7.17.5 to 7.17.6 Bumps `version.elastic` from 7.17.5 to 7.17.6. Updates `elasticsearch` from 7.17.5 to 7.17.6 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.5...v7.17.6) Updates `elasticsearch-rest-client` from 7.17.5 to 7.17.6 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.5...v7.17.6) Updates `elasticsearch-rest-high-level-client` from 7.17.5 to 7.17.6 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.5...v7.17.6) --- updated-dependencies: - dependency-name: org.elasticsearch:elasticsearch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f57626b4f..78b3f72a7 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ <version.mockito>4.7.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> - <version.elastic>7.17.5</version.elastic> + <version.elastic>7.17.6</version.elastic> <version.antlr4>4.9.3</version.antlr4> <version.maven-javadoc-plugin>3.4.1</version.maven-javadoc-plugin> </properties> From 353ba684a4a606876418b1d528ad79e38f0cbac8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 04:40:04 +0000 Subject: [PATCH 374/456] Bump version.elastic from 7.17.5 to 7.17.6 Bumps `version.elastic` from 7.17.5 to 7.17.6. Updates `elasticsearch` from 7.17.5 to 7.17.6 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.5...v7.17.6) Updates `elasticsearch-rest-client` from 7.17.5 to 7.17.6 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.5...v7.17.6) Updates `elasticsearch-rest-high-level-client` from 7.17.5 to 7.17.6 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.5...v7.17.6) --- updated-dependencies: - dependency-name: org.elasticsearch:elasticsearch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ea1ac536..73e1ae973 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ <version.mockito>4.7.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> - <version.elastic>7.17.5</version.elastic> + <version.elastic>7.17.6</version.elastic> <version.antlr4>4.10.1</version.antlr4> <version.maven-javadoc-plugin>3.4.1</version.maven-javadoc-plugin> <version.java>11</version.java> From bc5743879affabe5cdf9262c143cfdb61618ea10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 04:01:28 +0000 Subject: [PATCH 375/456] Bump joda-time from 2.11.0 to 2.11.1 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.11.0 to 2.11.1. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.11.0...v2.11.1) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f57626b4f..93a3ce078 100644 --- a/pom.xml +++ b/pom.xml @@ -317,7 +317,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.11.0</version> + <version>2.11.1</version> </dependency> <dependency> <groupId>org.locationtech.jts</groupId> From ca217c62d013aada24448f0c90743f323e7dda9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 04:52:36 +0000 Subject: [PATCH 376/456] Bump joda-time from 2.11.0 to 2.11.1 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.11.0 to 2.11.1. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.11.0...v2.11.1) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ea1ac536..10c2ba3cc 100644 --- a/pom.xml +++ b/pom.xml @@ -319,7 +319,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.11.0</version> + <version>2.11.1</version> </dependency> <dependency> <groupId>org.locationtech.jts</groupId> From 1b0b5e08072b8b11586102949b004984e264387b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 04:55:10 +0000 Subject: [PATCH 377/456] Bump version.jena from 4.5.0 to 4.6.0 Bumps `version.jena` from 4.5.0 to 4.6.0. Updates `jena-core` from 4.5.0 to 4.6.0 Updates `jena-arq` from 4.5.0 to 4.6.0 --- updated-dependencies: - dependency-name: org.apache.jena:jena-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.jena:jena-arq dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ea1ac536..31b0213eb 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ <version.findbugs>3.0.2</version.findbugs> <version.spotbugs>4.7.1</version.spotbugs> <version.jakarta-annotation-api>2.1.1</version.jakarta-annotation-api> - <version.jena>4.5.0</version.jena> + <version.jena>4.6.0</version.jena> <version.jackson>2.13.3</version.jackson> <version.junit>5.9.0</version.junit> <version.mockito>4.7.0</version.mockito> From c2e359acc257ce7cb0d3d0d18fe7f7dc970c068d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 13:29:33 +0000 Subject: [PATCH 378/456] Bump spotbugs-annotations from 4.7.1 to 4.7.2 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.7.1 to 4.7.2. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.7.1...4.7.2) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 571eba5bf..d912955f9 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ <version.n52CommonXML>2.7.0</version.n52CommonXML> <version.olingo>4.9.0</version.olingo> <version.findbugs>3.0.2</version.findbugs> - <version.spotbugs>4.7.1</version.spotbugs> + <version.spotbugs>4.7.2</version.spotbugs> <version.javax-annotation-api>1.3.2</version.javax-annotation-api> <version.jena>3.17.0</version.jena> <version.jackson>2.13.3</version.jackson> From dd3b45c9d7184c4c65437956918fb911ac85ea9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 13:30:43 +0000 Subject: [PATCH 379/456] Bump jackson-bom from 2.13.3 to 2.13.4 Bumps [jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.13.3 to 2.13.4. - [Release notes](https://github.com/FasterXML/jackson-bom/releases) - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.13.3...jackson-bom-2.13.4) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 571eba5bf..432111495 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ <version.spotbugs>4.7.1</version.spotbugs> <version.javax-annotation-api>1.3.2</version.javax-annotation-api> <version.jena>3.17.0</version.jena> - <version.jackson>2.13.3</version.jackson> + <version.jackson>2.13.4</version.jackson> <version.junit>5.9.0</version.junit> <version.mockito>4.7.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> From 03a84b1c583c243967a89ca3dde548748861d01a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 13:49:23 +0000 Subject: [PATCH 380/456] Bump version.antlr4 from 4.10.1 to 4.11.1 Bumps `version.antlr4` from 4.10.1 to 4.11.1. Updates `antlr4` from 4.10.1 to 4.11.1 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.10.1...4.11.1) Updates `antlr4-runtime` from 4.10.1 to 4.11.1 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.10.1...4.11.1) Updates `antlr4-maven-plugin` from 4.10.1 to 4.11.1 - [Release notes](https://github.com/antlr/antlr4/releases) - [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt) - [Commits](https://github.com/antlr/antlr4/compare/4.10.1...4.11.1) --- updated-dependencies: - dependency-name: org.antlr:antlr4 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.antlr:antlr4-runtime dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.antlr:antlr4-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83526b6ec..ea574e3b7 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.6</version.elastic> - <version.antlr4>4.10.1</version.antlr4> + <version.antlr4>4.11.1</version.antlr4> <version.maven-javadoc-plugin>3.4.1</version.maven-javadoc-plugin> <version.java>11</version.java> </properties> From 044a2a5e5fb6fecde9e3fb4a79765c0f2e61149a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 13:49:55 +0000 Subject: [PATCH 381/456] Bump spotbugs-annotations from 4.7.1 to 4.7.2 Bumps [spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.7.1 to 4.7.2. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.7.1...4.7.2) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83526b6ec..bbf77cd5c 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ <version.n52CommonXML>2.7.0</version.n52CommonXML> <version.olingo>4.9.0</version.olingo> <version.findbugs>3.0.2</version.findbugs> - <version.spotbugs>4.7.1</version.spotbugs> + <version.spotbugs>4.7.2</version.spotbugs> <version.jakarta-annotation-api>2.1.1</version.jakarta-annotation-api> <version.jena>4.6.0</version.jena> <version.jackson>2.13.3</version.jackson> From a2795f6d844d956e11b91c38c18926b3c1281402 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 13:50:16 +0000 Subject: [PATCH 382/456] Bump jackson-bom from 2.13.3 to 2.13.4 Bumps [jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.13.3 to 2.13.4. - [Release notes](https://github.com/FasterXML/jackson-bom/releases) - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.13.3...jackson-bom-2.13.4) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83526b6ec..1b11f6eda 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ <version.spotbugs>4.7.1</version.spotbugs> <version.jakarta-annotation-api>2.1.1</version.jakarta-annotation-api> <version.jena>4.6.0</version.jena> - <version.jackson>2.13.3</version.jackson> + <version.jackson>2.13.4</version.jackson> <version.junit>5.9.0</version.junit> <version.mockito>4.7.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> From 80489bb03a280e00cb80ee5e35ee9a10447f6107 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 6 Sep 2022 10:47:20 +0200 Subject: [PATCH 383/456] add write method without responseproxy --- .../n52/iceland/coding/encode/ResponseWriter.java | 13 +++++++++++++ .../org/n52/iceland/response/EXIResponseWriter.java | 5 +++++ .../n52/iceland/response/JSONResponseWriter.java | 5 +++++ .../org/n52/iceland/response/ServiceResponse.java | 5 ++--- .../iceland/response/SoapChainResponseWriter.java | 3 ++- .../org/n52/iceland/response/XmlResponseWriter.java | 5 +++++ .../iceland/response/XmlResponseWriterFactory.java | 1 - 7 files changed, 32 insertions(+), 5 deletions(-) diff --git a/iceland/core/src/main/java/org/n52/iceland/coding/encode/ResponseWriter.java b/iceland/core/src/main/java/org/n52/iceland/coding/encode/ResponseWriter.java index 2d1d3f509..c2cf6aedd 100644 --- a/iceland/core/src/main/java/org/n52/iceland/coding/encode/ResponseWriter.java +++ b/iceland/core/src/main/java/org/n52/iceland/coding/encode/ResponseWriter.java @@ -72,6 +72,19 @@ default boolean isSetContentType() { */ void write(T t, OutputStream out, ResponseProxy responseProxy) throws IOException, EncodingException; + /** + * Write object t to {@link OutputStream} out + * + * @param t Object to write + * @param out {@link OutputStream} to be written to + + * + * @throws IOException If an error occurs during writing + * @throws EncodingException if an errors occurs during encoding + * + */ + void write(T t, OutputStream out) throws IOException, EncodingException; + /** * Check if GZip is supported by this writer * diff --git a/iceland/core/src/main/java/org/n52/iceland/response/EXIResponseWriter.java b/iceland/core/src/main/java/org/n52/iceland/response/EXIResponseWriter.java index 54dbdf43f..0aa577635 100644 --- a/iceland/core/src/main/java/org/n52/iceland/response/EXIResponseWriter.java +++ b/iceland/core/src/main/java/org/n52/iceland/response/EXIResponseWriter.java @@ -78,6 +78,11 @@ public Set<ResponseWriterKey> getKeys() { @Override public void write(EXIObject<XmlObject> exiObject, OutputStream out, ResponseProxy responseProxy) throws IOException, EncodingException { + write(exiObject, out); + } + + @Override + public void write(EXIObject<XmlObject> exiObject, OutputStream out) throws IOException, EncodingException { byte[] bytes = getBytes(exiObject); try (InputStream is = new ByteArrayInputStream(bytes)) { EXIResult result = new EXIResult(this.exiFactory.get()); diff --git a/iceland/core/src/main/java/org/n52/iceland/response/JSONResponseWriter.java b/iceland/core/src/main/java/org/n52/iceland/response/JSONResponseWriter.java index 87fea4673..eedd97d7b 100644 --- a/iceland/core/src/main/java/org/n52/iceland/response/JSONResponseWriter.java +++ b/iceland/core/src/main/java/org/n52/iceland/response/JSONResponseWriter.java @@ -54,6 +54,11 @@ public Set<ResponseWriterKey> getKeys() { @Override public void write(JsonNode t, OutputStream out, ResponseProxy responseProxy) throws IOException { + write(t, out); + } + + @Override + public void write(JsonNode t, OutputStream out) throws IOException { Json.print(out, t); } diff --git a/iceland/core/src/main/java/org/n52/iceland/response/ServiceResponse.java b/iceland/core/src/main/java/org/n52/iceland/response/ServiceResponse.java index 0852a91ec..0dc3f1cc6 100644 --- a/iceland/core/src/main/java/org/n52/iceland/response/ServiceResponse.java +++ b/iceland/core/src/main/java/org/n52/iceland/response/ServiceResponse.java @@ -24,13 +24,12 @@ import javax.servlet.http.HttpServletResponse; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.n52.iceland.service.CommunicationObjectWithSoapHeader; import org.n52.janmayen.http.HTTPStatus; import org.n52.janmayen.http.MediaType; import org.n52.shetland.w3c.soap.SoapHeader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/iceland/core/src/main/java/org/n52/iceland/response/SoapChainResponseWriter.java b/iceland/core/src/main/java/org/n52/iceland/response/SoapChainResponseWriter.java index 72adaab60..39124955f 100644 --- a/iceland/core/src/main/java/org/n52/iceland/response/SoapChainResponseWriter.java +++ b/iceland/core/src/main/java/org/n52/iceland/response/SoapChainResponseWriter.java @@ -72,7 +72,8 @@ public void write(SoapChain chain, OutputStream out, ResponseProxy responseProxy } } - private void write(SoapChain chain, OutputStream out) throws EncodingException, IOException { + @Override + public void write(SoapChain chain, OutputStream out) throws EncodingException, IOException { String namespace = chain.getSoapResponse().getSoapNamespace(); EncoderKey key = CodingHelper.getEncoderKey(namespace, chain.getSoapResponse()); Encoder<?, SoapResponse> encoder = getEncoder(key); diff --git a/iceland/core/src/main/java/org/n52/iceland/response/XmlResponseWriter.java b/iceland/core/src/main/java/org/n52/iceland/response/XmlResponseWriter.java index 60b324633..632193c60 100644 --- a/iceland/core/src/main/java/org/n52/iceland/response/XmlResponseWriter.java +++ b/iceland/core/src/main/java/org/n52/iceland/response/XmlResponseWriter.java @@ -55,6 +55,11 @@ public Set<ResponseWriterKey> getKeys() { @Override public void write(XmlObject xml, OutputStream out, ResponseProxy responseProxy) throws IOException { + write(xml, out); + } + + @Override + public void write(XmlObject xml, OutputStream out) throws IOException { xml.save(out, this.xmlOptions.get()); } diff --git a/iceland/core/src/main/java/org/n52/iceland/response/XmlResponseWriterFactory.java b/iceland/core/src/main/java/org/n52/iceland/response/XmlResponseWriterFactory.java index 8a2d5206e..da2fae99b 100644 --- a/iceland/core/src/main/java/org/n52/iceland/response/XmlResponseWriterFactory.java +++ b/iceland/core/src/main/java/org/n52/iceland/response/XmlResponseWriterFactory.java @@ -19,7 +19,6 @@ import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; - import org.n52.iceland.coding.encode.ResponseWriter; import org.n52.iceland.coding.encode.ResponseWriterFactory; import org.n52.iceland.coding.encode.ResponseWriterKey; From 193bc1477dc4be080312318a99235d5d4d66373d Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 6 Sep 2022 10:48:01 +0200 Subject: [PATCH 384/456] add staticstring to replace xmlstring for reusing in capabilities --- .../ogc/ows/service/GetCapabilitiesResponse.java | 16 ++++++++++++---- .../encode/GetCapabilitiesResponseEncoder.java | 2 +- .../GetCapabilitiesResponseEncoderTest.java | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java index 6b16a8e6d..f42d4690c 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/ows/service/GetCapabilitiesResponse.java @@ -28,7 +28,7 @@ */ public class GetCapabilitiesResponse extends OwsServiceResponse { private OwsCapabilities capabilities; - private String xmlString; + private String staticString; public GetCapabilitiesResponse() { super(null, null, OWSConstants.Operations.GetCapabilities.name()); @@ -65,15 +65,23 @@ public GetCapabilitiesResponse setCapabilities(OwsCapabilities capabilities) { } public String getXmlString() { - return xmlString; + return getStaticString(); } public GetCapabilitiesResponse setXmlString(String xmlString) { - this.xmlString = xmlString; + return setStaticString(xmlString); + } + + public String getStaticString() { + return staticString; + } + + public GetCapabilitiesResponse setStaticString(String staticString) { + this.staticString = staticString; return this; } public boolean isStatic() { - return getXmlString() != null && !getXmlString().isEmpty(); + return getStaticString() != null && !getStaticString().isEmpty(); } } diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/GetCapabilitiesResponseEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/GetCapabilitiesResponseEncoder.java index 8e54730b2..42933eed4 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/GetCapabilitiesResponseEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/GetCapabilitiesResponseEncoder.java @@ -82,7 +82,7 @@ protected XmlObject create(GetCapabilitiesResponse response) throws EncodingExce createExtension(xbCaps, response.getExtensions()); } if (response.isStatic()) { - String xml = response.getXmlString(); + String xml = response.getStaticString(); LOGGER.trace("Response is static. XML-String:\n{}\n", xml); try { doc.set(XmlObject.Factory.parse(xml)); diff --git a/svalbard/xmlbeans/src/test/java/org/n52/svalbard/encode/GetCapabilitiesResponseEncoderTest.java b/svalbard/xmlbeans/src/test/java/org/n52/svalbard/encode/GetCapabilitiesResponseEncoderTest.java index b8fdda877..b10d577c3 100644 --- a/svalbard/xmlbeans/src/test/java/org/n52/svalbard/encode/GetCapabilitiesResponseEncoderTest.java +++ b/svalbard/xmlbeans/src/test/java/org/n52/svalbard/encode/GetCapabilitiesResponseEncoderTest.java @@ -54,7 +54,7 @@ public void setUp() { public void should_create_static_capabilities() throws Exception { XmlObject encodedResponse = encoder.encode(minimalCapabilities()); - Diff d = new Diff(encodedResponse.xmlText(), minimalCapabilities().getXmlString()); + Diff d = new Diff(encodedResponse.xmlText(), minimalCapabilities().getStaticString()); assertThat(d.identical(), is(true)); assertThat(d.similar(), is(true)); From eaf6ef9cd20b7f215566f78d55c6760028bbafc5 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 6 Sep 2022 10:48:55 +0200 Subject: [PATCH 385/456] add static capabilites provider for creating and providing static capabilities (generated by the service) instead of dynamic --- ...tractSchedulingContentCacheController.java | 30 ++++++++++------ .../ctrl/StaticCapabilitiesProvider.java | 34 +++++++++++++++++++ 2 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 iceland/core/src/main/java/org/n52/iceland/cache/ctrl/StaticCapabilitiesProvider.java diff --git a/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/AbstractSchedulingContentCacheController.java b/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/AbstractSchedulingContentCacheController.java index f9c30ce9f..dfa289e5c 100644 --- a/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/AbstractSchedulingContentCacheController.java +++ b/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/AbstractSchedulingContentCacheController.java @@ -17,9 +17,12 @@ import java.text.ParseException; import java.util.Date; +import java.util.Optional; import java.util.Timer; import java.util.TimerTask; +import javax.inject.Inject; + import org.joda.time.DateTime; import org.n52.faroe.ConfigurationError; import org.n52.faroe.Validation; @@ -44,9 +47,11 @@ public abstract class AbstractSchedulingContentCacheController implements Conten private static final Logger LOGGER = LoggerFactory.getLogger(AbstractSchedulingContentCacheController.class); private boolean initialized; - private long updateInterval; + private long updateInterval = 120; private final Timer timer = new Timer("52n-iceland-capabilities-cache-controller", true); private TimerTask current; + private Optional<StaticCapabilitiesProvider> staticCapabilitiesProvider; + /** * Starts a new timer task @@ -74,20 +79,20 @@ public void setCronExpression(String cronExpression) { Validation.notNullOrEmpty("Cron expression for cache update", cronExpression); try { DateTime now = DateTime.now(); - Date next = new CronExpression(cronExpression).getNextInvalidTimeAfter(DateTime.now().toDate()); - setUpdateInterval(DateTimeHelper.getMinutesSince(now, new DateTime(next))); + CronExpression cronExp = new CronExpression(cronExpression); + Date first = cronExp.getNextValidTimeAfter(now.toDate()); + Date next = cronExp.getNextValidTimeAfter(first); + setUpdateInterval(DateTimeHelper.getMinutesSince(new DateTime(first), new DateTime(next))); } catch (ParseException e) { + throw new ConfigurationError(String.format("The defined cron expression '%s' is invalid!", cronExpression), e); } - // for later usage! -// if (this.cronExpression == null) { -// this.cronExpression = cronExpression; -// reschedule(); -// } else if (!this.cronExpression.equalsIgnoreCase(cronExpression)) { -// this.cronExpression = cronExpression; -// reschedule(); -// } + } + + @Inject + public void setStaticCapabilitiesProvider(Optional<StaticCapabilitiesProvider> staticCapabilitiesProvider) { + this.staticCapabilitiesProvider = staticCapabilitiesProvider; } public void setUpdateInterval(int interval) throws ConfigurationError { @@ -151,6 +156,9 @@ public void run() { update(); LOGGER.info("Timertask: capabilities cache update successful!"); schedule(); + if (staticCapabilitiesProvider.isPresent()) { + staticCapabilitiesProvider.get().create(); + } } catch (OwsExceptionReport e) { LOGGER.error("Fatal error: Timertask couldn't update capabilities cache! " + "Switch log level to DEBUG to get more details."); diff --git a/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/StaticCapabilitiesProvider.java b/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/StaticCapabilitiesProvider.java new file mode 100644 index 000000000..7bb27b636 --- /dev/null +++ b/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/StaticCapabilitiesProvider.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2015-2022 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.iceland.cache.ctrl; + +import org.n52.shetland.ogc.ows.service.GetCapabilitiesResponse; + +public interface StaticCapabilitiesProvider { + + String PROVIDE_STATIC_CAPABILITIES = "service.capabilities.provide.static"; + + default boolean isProvideStaticCapabilities() { + return false; + } + + void create(); + + String get(GetCapabilitiesResponse response); + + String get(String identifier); + +} From 9d7d351a3c4e96a71d5f7b59344871360eb78a7a Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 6 Sep 2022 15:27:49 +0200 Subject: [PATCH 386/456] check for initialized when run and redo default interval value --- ...tractSchedulingContentCacheController.java | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/AbstractSchedulingContentCacheController.java b/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/AbstractSchedulingContentCacheController.java index dfa289e5c..a8a6d9b93 100644 --- a/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/AbstractSchedulingContentCacheController.java +++ b/iceland/core/src/main/java/org/n52/iceland/cache/ctrl/AbstractSchedulingContentCacheController.java @@ -47,33 +47,12 @@ public abstract class AbstractSchedulingContentCacheController implements Conten private static final Logger LOGGER = LoggerFactory.getLogger(AbstractSchedulingContentCacheController.class); private boolean initialized; - private long updateInterval = 120; + private long updateInterval; private final Timer timer = new Timer("52n-iceland-capabilities-cache-controller", true); private TimerTask current; - private Optional<StaticCapabilitiesProvider> staticCapabilitiesProvider; + private Optional<StaticCapabilitiesProvider> staticCapabilitiesProvider = Optional.empty(); - /** - * Starts a new timer task - */ - private void schedule() { - /* - * Timers can not be rescheduled. To make the interval changeable - * reschedule a new timer. - */ - current = new UpdateTimerTask(); - long delay = getUpdateInterval(); - if (!isInitialized()) { - delay = 1; - setInitialized(true); - } - if (delay > 0) { - LOGGER.info("Next CapabilitiesCacheUpdate in {}m: {}", delay / 60000, - new DateTime(System.currentTimeMillis() + delay)); - timer.schedule(current, delay); - } - } - @Setting(ScheduledContentCacheControllerSettings.CAPABILITIES_CACHE_UPDATE) public void setCronExpression(String cronExpression) { Validation.notNullOrEmpty("Cron expression for cache update", cronExpression); @@ -84,7 +63,7 @@ public void setCronExpression(String cronExpression) { Date next = cronExp.getNextValidTimeAfter(first); setUpdateInterval(DateTimeHelper.getMinutesSince(new DateTime(first), new DateTime(next))); } catch (ParseException e) { - + throw new ConfigurationError(String.format("The defined cron expression '%s' is invalid!", cronExpression), e); } @@ -107,6 +86,26 @@ private long getUpdateInterval() { return this.updateInterval * 60000; } + /** + * Starts a new timer task + */ + private void schedule() { + /* + * Timers can not be rescheduled. To make the interval changeable + * reschedule a new timer. + */ + current = new UpdateTimerTask(); + long delay = getUpdateInterval(); + if (!isInitialized()) { + delay = 1; + } + if (delay > 0) { + LOGGER.info("Next CapabilitiesCacheUpdate in {}m: {}", delay / 60000, + new DateTime(System.currentTimeMillis() + delay)); + timer.schedule(current, delay); + } + } + /** * Stops the current task, if available and starts a new {@link TimerTask}. * @@ -153,11 +152,13 @@ private class UpdateTimerTask extends TimerTask { @Override public void run() { try { - update(); - LOGGER.info("Timertask: capabilities cache update successful!"); - schedule(); - if (staticCapabilitiesProvider.isPresent()) { - staticCapabilitiesProvider.get().create(); + if (isInitialized()) { + update(); + LOGGER.info("Timertask: capabilities cache update successful!"); + schedule(); + if (staticCapabilitiesProvider != null && staticCapabilitiesProvider.isPresent()) { + staticCapabilitiesProvider.get().create(); + } } } catch (OwsExceptionReport e) { LOGGER.error("Fatal error: Timertask couldn't update capabilities cache! " + From 35dd8d219b4d9cce28028ee02c7e66964e4c7fb0 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 6 Sep 2022 15:43:49 +0200 Subject: [PATCH 387/456] [maven-release-plugin] prepare release v9.8.0 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index f25da6b38..b5ff5abe1 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 4ed9daecf..1dc1b7925 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 49fb218dd..44b834b32 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 83327801e..60ee81d8d 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 29f688111..01389836d 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index e99c77404..05d573ba1 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index baabc9495..c2cdc2181 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 5bc30bb84..9c8dc8caf 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index f6975259a..4de742112 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 7a0cb1a5a..e528f67a7 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index d0d96f06e..5ea030f4d 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 378d3f853..0ff6c6f68 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 8947b9d2a..b2867bcc9 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 2112d30e5..f7c21c72e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>HEAD</tag> + <tag>v9.8.0</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 8a75c7230..3bf948cea 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 089309902..f608e2082 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 59f6f7aee..3503815b5 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 02bfe3aed..b2062a801 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 7dd328ecd..2e751b69b 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 448d06dc7..b18f99eb1 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 2369710dc..8e9678d05 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 23209e15d..887a3211c 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index c7050cf3d..cc3e66907 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 818fa87aa..b9091274a 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index d437be273..cbab331cf 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0-SNAPSHOT</version> + <version>9.8.0</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 85a55955c04b4176e660f1993ade0c91af396540 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 6 Sep 2022 15:43:59 +0200 Subject: [PATCH 388/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index b5ff5abe1..1e1ac4c58 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 1dc1b7925..8e26d9b28 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 44b834b32..6914ca183 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 60ee81d8d..4d01dcefc 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 01389836d..4ea397c84 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 05d573ba1..14c9a939e 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index c2cdc2181..1526e5714 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 9c8dc8caf..8ce44ba75 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 4de742112..ce1eef027 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index e528f67a7..0f8ceb162 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 5ea030f4d..2cfac4487 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 0ff6c6f68..901a74abd 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index b2867bcc9..6ab64c5bd 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index f7c21c72e..4b9f4ae15 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>v9.8.0</tag> + <tag>HEAD</tag> </scm> <issueManagement> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 3bf948cea..5504ee1f3 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index f608e2082..370b47076 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 3503815b5..2a68bc05d 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index b2062a801..40acc1d66 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 2e751b69b..1939c7982 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index b18f99eb1..58b0f6e9b 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 8e9678d05..a7b1f4e00 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 887a3211c..5675b772e 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index cc3e66907..ae6acab9d 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index b9091274a..1f203dd39 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index cbab331cf..9c4767ffc 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>9.8.0</version> + <version>9.9.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 6d9ae7a892a62370bc9c927afdeb1bd147562194 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Sep 2022 14:36:08 +0000 Subject: [PATCH 389/456] Bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/daily.yml | 4 ++-- .github/workflows/pull.yml | 2 +- .github/workflows/pull_10.yml | 2 +- .github/workflows/push.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 40ce2c996..9323181a5 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -10,7 +10,7 @@ jobs: name: Java 8 compile steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 8 uses: actions/setup-java@v3 with: @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up settings.xml for GitHub Packages uses: actions/setup-java@v3 with: diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 6ff0c0927..c84b1be31 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -15,7 +15,7 @@ jobs: name: Java ${{ matrix.java }} compile steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v3 with: diff --git a/.github/workflows/pull_10.yml b/.github/workflows/pull_10.yml index b03fd580c..d683b3026 100644 --- a/.github/workflows/pull_10.yml +++ b/.github/workflows/pull_10.yml @@ -14,7 +14,7 @@ jobs: name: Java ${{ matrix.java }} compile steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v3 with: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 1ab34c481..09835df8e 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -16,7 +16,7 @@ jobs: name: Java ${{ matrix.java }} compile steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v3 with: @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up settings.xml for GitHub Packages uses: actions/setup-java@v3 with: From 5262025a1098dcd1e887dddd7f8a5bf73d6d78cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 04:00:50 +0000 Subject: [PATCH 390/456] Bump version.mockito from 4.7.0 to 4.8.0 Bumps `version.mockito` from 4.7.0 to 4.8.0. Updates `mockito-core` from 4.7.0 to 4.8.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0) Updates `mockito-junit-jupiter` from 4.7.0 to 4.8.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b9f4ae15..1271b6d39 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <version.jena>3.17.0</version.jena> <version.jackson>2.13.4</version.jackson> <version.junit>5.9.0</version.junit> - <version.mockito>4.7.0</version.mockito> + <version.mockito>4.8.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.6</version.elastic> From e5b3bf6670221ba31136e9c67df3d267547510b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 05:15:25 +0000 Subject: [PATCH 391/456] Bump version.mockito from 4.7.0 to 4.8.0 Bumps `version.mockito` from 4.7.0 to 4.8.0. Updates `mockito-core` from 4.7.0 to 4.8.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0) Updates `mockito-junit-jupiter` from 4.7.0 to 4.8.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc27006d6..8a261d15e 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <version.jena>4.6.0</version.jena> <version.jackson>2.13.4</version.jackson> <version.junit>5.9.0</version.junit> - <version.mockito>4.7.0</version.mockito> + <version.mockito>4.8.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.6</version.elastic> From 1c0502f03c0a5cd603fa42fd9b6d776e6a83c0c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 05:17:52 +0000 Subject: [PATCH 392/456] Bump version.jena from 4.6.0 to 4.6.1 Bumps `version.jena` from 4.6.0 to 4.6.1. Updates `jena-core` from 4.6.0 to 4.6.1 Updates `jena-arq` from 4.6.0 to 4.6.1 --- updated-dependencies: - dependency-name: org.apache.jena:jena-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.jena:jena-arq dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc27006d6..5af93052d 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ <version.findbugs>3.0.2</version.findbugs> <version.spotbugs>4.7.2</version.spotbugs> <version.jakarta-annotation-api>2.1.1</version.jakarta-annotation-api> - <version.jena>4.6.0</version.jena> + <version.jena>4.6.1</version.jena> <version.jackson>2.13.4</version.jackson> <version.junit>5.9.0</version.junit> <version.mockito>4.7.0</version.mockito> From b7f07fc8cb18b8546952f0ef52174d50e83aa11d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Sep 2022 04:01:18 +0000 Subject: [PATCH 393/456] Bump version.spring from 5.3.22 to 5.3.23 Bumps `version.spring` from 5.3.22 to 5.3.23. Updates `spring-test` from 5.3.22 to 5.3.23 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23) Updates `spring-web` from 5.3.22 to 5.3.23 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23) Updates `spring-beans` from 5.3.22 to 5.3.23 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23) Updates `spring-core` from 5.3.22 to 5.3.23 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23) Updates `spring-context` from 5.3.22 to 5.3.23 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23) Updates `spring-context-support` from 5.3.22 to 5.3.23 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23) --- updated-dependencies: - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1271b6d39..90a3f886f 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> - <version.spring>5.3.22</version.spring> + <version.spring>5.3.23</version.spring> <version.slf4j>2.0.0</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> From f7e841690f8bef8e9db746c6eed3a696c9acc260 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Sep 2022 04:37:13 +0000 Subject: [PATCH 394/456] Bump version.spring from 5.3.22 to 5.3.23 Bumps `version.spring` from 5.3.22 to 5.3.23. Updates `spring-test` from 5.3.22 to 5.3.23 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23) Updates `spring-web` from 5.3.22 to 5.3.23 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23) Updates `spring-beans` from 5.3.22 to 5.3.23 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23) Updates `spring-core` from 5.3.22 to 5.3.23 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23) Updates `spring-context` from 5.3.22 to 5.3.23 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23) Updates `spring-context-support` from 5.3.22 to 5.3.23 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23) --- updated-dependencies: - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d0c40e0d..d2d86369d 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> - <version.spring>5.3.22</version.spring> + <version.spring>5.3.23</version.spring> <version.slf4j>2.0.0</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> From a370520a34816477e21d3f51367dcea0550e9da7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 04:01:18 +0000 Subject: [PATCH 395/456] Bump version.junit from 5.9.0 to 5.9.1 Bumps `version.junit` from 5.9.0 to 5.9.1. Updates `junit-jupiter-api` from 5.9.0 to 5.9.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1) Updates `junit-jupiter-engine` from 5.9.0 to 5.9.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1) Updates `junit-jupiter-params` from 5.9.0 to 5.9.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1271b6d39..8a9385644 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ <version.javax-annotation-api>1.3.2</version.javax-annotation-api> <version.jena>3.17.0</version.jena> <version.jackson>2.13.4</version.jackson> - <version.junit>5.9.0</version.junit> + <version.junit>5.9.1</version.junit> <version.mockito>4.8.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> From 3efd05d6033316d4ecff7871257aa9cc83e5102f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 04:48:24 +0000 Subject: [PATCH 396/456] Bump version.junit from 5.9.0 to 5.9.1 Bumps `version.junit` from 5.9.0 to 5.9.1. Updates `junit-jupiter-api` from 5.9.0 to 5.9.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1) Updates `junit-jupiter-engine` from 5.9.0 to 5.9.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1) Updates `junit-jupiter-params` from 5.9.0 to 5.9.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d0c40e0d..5c080329e 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ <version.jakarta-annotation-api>2.1.1</version.jakarta-annotation-api> <version.jena>4.6.1</version.jena> <version.jackson>2.13.4</version.jackson> - <version.junit>5.9.0</version.junit> + <version.junit>5.9.1</version.junit> <version.mockito>4.8.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> From 4e5264059a408e9edf692a73a9675f91ee1eaeee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 04:00:27 +0000 Subject: [PATCH 397/456] Bump joda-time from 2.11.1 to 2.11.2 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.11.1 to 2.11.2. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.11.1...v2.11.2) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1271b6d39..b718786b2 100644 --- a/pom.xml +++ b/pom.xml @@ -317,7 +317,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.11.1</version> + <version>2.11.2</version> </dependency> <dependency> <groupId>org.locationtech.jts</groupId> From 694b7a2c43923187fa35a592310875ecc71548c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 04:47:21 +0000 Subject: [PATCH 398/456] Bump joda-time from 2.11.1 to 2.11.2 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.11.1 to 2.11.2. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.11.1...v2.11.2) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d0c40e0d..1cb7970d8 100644 --- a/pom.xml +++ b/pom.xml @@ -319,7 +319,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.11.1</version> + <version>2.11.2</version> </dependency> <dependency> <groupId>org.locationtech.jts</groupId> From 2741a50995c44214a17413ac3c449e4ea2cc6c5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 08:30:11 +0000 Subject: [PATCH 399/456] Bump version.slf4j from 2.0.0 to 2.0.2 Bumps `version.slf4j` from 2.0.0 to 2.0.2. Updates `slf4j-api` from 2.0.0 to 2.0.2 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) Updates `slf4j-simple` from 2.0.0 to 2.0.2 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) Updates `jcl-over-slf4j` from 2.0.0 to 2.0.2 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) Updates `slf4j-nop` from 2.0.0 to 2.0.2 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-nop dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 45feac0ac..d353ed10d 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> <version.spring>5.3.23</version.spring> - <version.slf4j>2.0.0</version.slf4j> + <version.slf4j>2.0.2</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> <version.jaxb>2.3.0</version.jaxb> From 0001b8c126dddf67465f0b7e30daa6c03dc860a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 08:33:04 +0000 Subject: [PATCH 400/456] Bump version.slf4j from 2.0.0 to 2.0.2 Bumps `version.slf4j` from 2.0.0 to 2.0.2. Updates `slf4j-api` from 2.0.0 to 2.0.2 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) Updates `slf4j-simple` from 2.0.0 to 2.0.2 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) Updates `jcl-over-slf4j` from 2.0.0 to 2.0.2 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) Updates `slf4j-nop` from 2.0.0 to 2.0.2 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-nop dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d490f9841..df5b4c16f 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> <version.spring>5.3.23</version.spring> - <version.slf4j>2.0.0</version.slf4j> + <version.slf4j>2.0.2</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> <version.jaxb>2.3.0</version.jaxb> From b753f3dee51589d1b0f06c172c4f64a3eafd1434 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 04:00:50 +0000 Subject: [PATCH 401/456] Bump version.slf4j from 2.0.2 to 2.0.3 Bumps `version.slf4j` from 2.0.2 to 2.0.3. Updates `slf4j-api` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3) Updates `slf4j-simple` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3) Updates `jcl-over-slf4j` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3) Updates `slf4j-nop` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-nop dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d353ed10d..02f946058 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> <version.spring>5.3.23</version.spring> - <version.slf4j>2.0.2</version.slf4j> + <version.slf4j>2.0.3</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> <version.jaxb>2.3.0</version.jaxb> From 2de3485093c9769b5dc320e426adaea6d9c53abb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 04:31:48 +0000 Subject: [PATCH 402/456] Bump version.slf4j from 2.0.2 to 2.0.3 Bumps `version.slf4j` from 2.0.2 to 2.0.3. Updates `slf4j-api` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3) Updates `slf4j-simple` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3) Updates `jcl-over-slf4j` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3) Updates `slf4j-nop` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-nop dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index df5b4c16f..7146214c7 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> <version.spring>5.3.23</version.spring> - <version.slf4j>2.0.2</version.slf4j> + <version.slf4j>2.0.3</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> <version.jaxb>2.3.0</version.jaxb> From f2e5baf55bcac41b9cb96c752ed0eb3ac6b98196 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Sep 2022 04:01:49 +0000 Subject: [PATCH 403/456] Bump kotlin-stdlib from 1.7.10 to 1.7.20 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.7.10 to 1.7.20. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d353ed10d..c77a14afb 100644 --- a/pom.xml +++ b/pom.xml @@ -1071,7 +1071,7 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib</artifactId> - <version>1.7.10</version> + <version>1.7.20</version> <scope>runtime</scope> </dependency> <dependency> From 28bcce2eac3bc5df65dc9c3bb53f5e778ebed664 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Sep 2022 04:44:01 +0000 Subject: [PATCH 404/456] Bump kotlin-stdlib from 1.7.10 to 1.7.20 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.7.10 to 1.7.20. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index df5b4c16f..9fe8b8c5a 100644 --- a/pom.xml +++ b/pom.xml @@ -1073,7 +1073,7 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib</artifactId> - <version>1.7.10</version> + <version>1.7.20</version> <scope>runtime</scope> </dependency> <dependency> From c0061386fe50b60f66b0fd8a7f0c91d5843ef5fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 04:49:03 +0000 Subject: [PATCH 405/456] Bump lucene-core from 9.3.0 to 9.4.0 Bumps lucene-core from 9.3.0 to 9.4.0. --- updated-dependencies: - dependency-name: org.apache.lucene:lucene-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index df5b4c16f..f2c4b3557 100644 --- a/pom.xml +++ b/pom.xml @@ -638,7 +638,7 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>9.3.0</version> + <version>9.4.0</version> </dependency> <dependency> <groupId>com.maxmind.db</groupId> From 79a132b0a6df53505a2a8570ab21b2260e60c135 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 6 Oct 2022 10:27:55 +0200 Subject: [PATCH 406/456] update json-schema-... dependencies which have now the <groupId>com.github.java-json-tools</groupId> (before <groupId>com.github.fge</groupId>) --- NOTICE | 5 +++-- pom.xml | 18 ++++++++++++------ svalbard/json-common/pom.xml | 6 +++--- svalbard/json/pom.xml | 4 ++-- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/NOTICE b/NOTICE index e3f6c976c..4ad1f24ce 100644 --- a/NOTICE +++ b/NOTICE @@ -102,17 +102,19 @@ This project includes: Jackson dataformat: Smile under The Apache Software License, Version 2.0 Jackson-annotations under The Apache Software License, Version 2.0 Jackson-core under The Apache Software License, Version 2.0 + jackson-coreutils-equivalence under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0 jackson-databind under The Apache Software License, Version 2.0 Jackson-dataformat-YAML under The Apache Software License, Version 2.0 Java archiving library under Apache 2 JavaBeans(TM) Activation Framework under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 - JavaMail API jar under CDDL or GPLv2+CE + JavaMail API (no providers) under CDDL/GPLv2+CE javax.annotation API under CDDL + GPLv2 with classpath exception javax.inject under The Apache Software License, Version 2.0 jaxb-api under CDDL 1.1 or GPL2 w/ CPE JCL 1.2 implemented over SLF4J under Apache License, Version 2.0 Joda-Time under Apache License, Version 2.0 JOpt Simple under The MIT License + json-schema-validator under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0 JSONLD Java :: Core under Revised BSD License lang-mustache under Elastic License 2.0 or Server Side Public License, v 1 libphonenumber under The Apache Software License, Version 2.0 @@ -141,7 +143,6 @@ This project includes: Netty/Resolver under Apache License, Version 2.0 Netty/TomcatNative [OpenSSL - Classes] under The Apache Software License, Version 2.0 Netty/Transport under Apache License, Version 2.0 - null under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0 OASIS WS-N specification schemas - including WS-BrokeredNotification (v1.3) under The Apache Software License, Version 2.0 OASIS WS-Resources specification schemas v1.2 under The Apache Software License, Version 2.0 odata-commons-api under The Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index fdfeba490..b90d0678d 100644 --- a/pom.xml +++ b/pom.xml @@ -383,6 +383,12 @@ <version>${version.junit}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-commons</artifactId> + <version>1.9.1</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest</artifactId> @@ -731,9 +737,9 @@ <type>pom</type> </dependency> <dependency> - <groupId>com.github.fge</groupId> + <groupId>com.github.java-json-tools</groupId> <artifactId>json-schema-validator</artifactId> - <version>2.2.6</version> + <version>2.2.14</version> <exclusions> <exclusion> <groupId>javax.activation</groupId> @@ -750,9 +756,9 @@ </exclusions> </dependency> <dependency> - <groupId>com.github.fge</groupId> + <groupId>com.github.java-json-tools</groupId> <artifactId>json-schema-core</artifactId> - <version>1.2.5</version> + <version>1.2.14</version> <exclusions> <exclusion> <groupId>com.google.code</groupId> @@ -769,9 +775,9 @@ </exclusions> </dependency> <dependency> - <groupId>com.github.fge</groupId> + <groupId>com.github.java-json-tools</groupId> <artifactId>jackson-coreutils</artifactId> - <version>1.8</version> + <version>2.0</version> <exclusions> <exclusion> <groupId>com.google.guava</groupId> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 58b0f6e9b..3316e8d1b 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -59,7 +59,7 @@ <artifactId>jackson-databind</artifactId> </dependency> <dependency> - <groupId>com.github.fge</groupId> + <groupId>com.github.java-json-tools</groupId> <artifactId>jackson-coreutils</artifactId> <scope>test</scope> </dependency> @@ -89,7 +89,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.github.fge</groupId> + <groupId>com.github.java-json-tools</groupId> <artifactId>json-schema-validator</artifactId> </dependency> <dependency> @@ -98,7 +98,7 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>com.github.fge</groupId> + <groupId>com.github.java-json-tools</groupId> <artifactId>json-schema-core</artifactId> </dependency> <dependency> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index a7b1f4e00..764a70cd8 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -83,7 +83,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.github.fge</groupId> + <groupId>com.github.java-json-tools</groupId> <artifactId>jackson-coreutils</artifactId> <scope>test</scope> </dependency> @@ -147,7 +147,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.github.fge</groupId> + <groupId>com.github.java-json-tools</groupId> <artifactId>json-schema-core</artifactId> <scope>provided</scope> </dependency> From 07365b2c05baedcacc4eec8423fea0ce9debfddf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 04:00:37 +0000 Subject: [PATCH 407/456] Bump geolatte-geom from 1.8.2 to 1.9.0 Bumps [geolatte-geom](https://github.com/geolatte/geolatte-geom) from 1.8.2 to 1.9.0. - [Release notes](https://github.com/geolatte/geolatte-geom/releases) - [Commits](https://github.com/geolatte/geolatte-geom/compare/v1.8.2...v1.9.0) --- updated-dependencies: - dependency-name: org.geolatte:geolatte-geom dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b90d0678d..93c5780c4 100644 --- a/pom.xml +++ b/pom.xml @@ -327,7 +327,7 @@ <dependency> <groupId>org.geolatte</groupId> <artifactId>geolatte-geom</artifactId> - <version>1.8.2</version> + <version>1.9.0</version> <exclusions> <exclusion> <groupId>org.locationtech.jts</groupId> From cf48dadca54dd224ab9b00b3c604572f64e7c57f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 04:52:32 +0000 Subject: [PATCH 408/456] Bump geolatte-geom from 1.8.2 to 1.9.0 Bumps [geolatte-geom](https://github.com/geolatte/geolatte-geom) from 1.8.2 to 1.9.0. - [Release notes](https://github.com/geolatte/geolatte-geom/releases) - [Commits](https://github.com/geolatte/geolatte-geom/compare/v1.8.2...v1.9.0) --- updated-dependencies: - dependency-name: org.geolatte:geolatte-geom dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f068686c3..663960966 100644 --- a/pom.xml +++ b/pom.xml @@ -329,7 +329,7 @@ <dependency> <groupId>org.geolatte</groupId> <artifactId>geolatte-geom</artifactId> - <version>1.8.2</version> + <version>1.9.0</version> <exclusions> <exclusion> <groupId>org.locationtech.jts</groupId> From d571f0f2ad0ce9cecab2e19e45695b418f78e629 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 12 Oct 2022 13:27:47 +0200 Subject: [PATCH 409/456] Add shetland arcgis module and constans for FeatureService --- NOTICE | 1 + pom.xml | 5 + shetland/arcgis/pom.xml | 36 +++++ .../feature/FeatureServiceConstants.java | 142 ++++++++++++++++++ shetland/pom.xml | 1 + 5 files changed, 185 insertions(+) create mode 100644 shetland/arcgis/pom.xml create mode 100644 shetland/arcgis/src/main/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstants.java diff --git a/NOTICE b/NOTICE index 4ad1f24ce..a7b991687 100644 --- a/NOTICE +++ b/NOTICE @@ -29,6 +29,7 @@ This project includes: 52°North Iceland Statistics Kibana Exporter Tool under The Apache Software License, Version 2.0 52°North Jan Mayen under The Apache Software License, Version 2.0 52°North Shetland under The Apache Software License, Version 2.0 + 52°North Shetland ArcGIS under The Apache Software License, Version 2.0 52°North Shetland Parent under The Apache Software License, Version 2.0 52°North Shetland RDF under The Apache Software License, Version 2.0 52°North Svalbard Core under The Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index 93c5780c4..7d5542a61 100644 --- a/pom.xml +++ b/pom.xml @@ -178,6 +178,11 @@ <groupId>${project.groupId}</groupId> <artifactId>shetland-rdf</artifactId> <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>shetland-arcgis</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/shetland/arcgis/pom.xml b/shetland/arcgis/pom.xml new file mode 100644 index 000000000..1ba874a7d --- /dev/null +++ b/shetland/arcgis/pom.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright (C) 2015-2022 52°North Spatial Information Research GmbH + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.n52.arctic-sea</groupId> + <artifactId>shetland-parent</artifactId> + <version>9.9.0-SNAPSHOT</version> + </parent> + <artifactId>shetland-arcgis</artifactId> + <name>52°North Shetland ArcGIS</name> + <description>52°North ArcGIS Framework</description> + <dependencies> + <dependency> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-annotations</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> +</project> diff --git a/shetland/arcgis/src/main/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstants.java b/shetland/arcgis/src/main/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstants.java new file mode 100644 index 000000000..6647220bd --- /dev/null +++ b/shetland/arcgis/src/main/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstants.java @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2015-2022 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.shetland.arcgis.service.feature; + +public interface FeatureServiceConstants { + + interface Parameter { + String QUERY = "query"; + String WHERE = "where"; + String FORMAT = "f"; + String OBJECT_IDS = "objectIds"; + String TIME = "time"; + String GEOMETRY = "geometry"; + String GEOMETRY_TYPE = "geometryType"; + String INTPUT_SPATIAL_REFERENCE = "inSR"; + String SPATIAL_RELATIONSHIP = "spatialRel"; + String DISTANCE = "distance"; + String UNITS = "units"; + String RELATION_PARAM = "relationParam"; + String OUT_FIELDS = "outFields"; + String RETURN_GEOMETRY = "returnGeometry"; + String MAX_ALLOWABLE_OFFSET = "maxAllowableOffset"; + String GEOMETRY_PRECISION = "geometryPrecision"; + String OUTPUT_SPATIAL_REFERENCE = "outSR"; + String HAVING_CLAUSE = "havingClause"; + String GEODATABASE_VERSION = "gdbVersion"; + String HISTORIC_MOMENT = "historicMoment"; + String RETURN_DISTINCT_VALUES = "returnDistinctValues"; + String RETURN_IDS_ONLY = "returnIdsOnly"; + String RETURN_COUNT_ONLY = "returnCountOnly"; + String RETURN_EXTENT_ONLY = "returnExtentOnly"; + String ORDER_BY_FIELDS = "orderByFields"; + String GROUP_FIELDS_FOR_STATISTICS = "groupByFieldsForStatistics"; + String OUTPUT_STATISTICS = "outStatistics"; + String RETURN_Z = "returnZ"; + String RETURN_M = "returnM"; + String MULTIPATCH_OPTIONS = "multipatchOption"; + String RESULT_OFFSET = "resultOffset"; + String RESULT_RECORD_COUNT = "resultRecordCount"; + String RETURN_TRUE_CURVES = "returnTrueCurves"; + String RETURN_CENTROID = "returnCentroid"; + String TIME_REFERENCE_UNKNOWN_CLIENT = "timeReferenceUnknownClient"; + String SQL_FORMAT = "sqlFormat"; + String RESULT_TYPE = "resultType"; + String DATUM_TRANSFORMATION = "datumTransformation"; + String LOD_TYPE = "lodType"; + String LOD_LEVEL = "lod"; + String LOD_SPATIAL_REFERENCE = "lodSR"; + } + + interface Values { + String WILDCARD = "*"; + String DEFAULT_WHERE_VALUE = "1=1"; + } + + interface GeometryTypes { + String POINT = "esriGeometryPoint"; + String MULTIPOINT = "esriGeometryMultipoint"; + String POLYLINE = "esriGeometryPolyline"; + String POLYGON = "esriGeometryPolygon"; + String ENVELOPE = "esriGeometryEnvelope"; + } + + interface SpatialRelations { + String INTERSECTS = "esriSpatialRelIntersects"; + String CONTAINS = "esriSpatialRelContains"; + String CROSSES = "esriSpatialRelCrosses"; + String ENVELOPE_INTERSECTS = "esriSpatialRelEnvelopeIntersects"; + String INDEX_INTERSECTS = "esriSpatialRelIndexIntersects"; + String OVERLAPS = "esriSpatialRelOverlaps"; + String TOUCHES = "esriSpatialRelTouches"; + String WITHIN = "esriSpatialRelWithin"; + } + + interface Units { + String METER = "esriSRUnit_Meter"; + String MILE = "esriSRUnit_StatuteMile"; + String FEET = "esriSRUnit_Foot"; + String KILOMETER = "esriSRUnit_Kilometer"; + String NAUTICAL_MILE = "esriSRUnit_NauticalMile"; + String US_NAUTICAL_MILE = "esriSRUnit_USNauticalMile"; + } + + interface MultipatchOptions { + String EMBED_MATERIALS = "embedMaterials"; + String XY_FOOTPRINT = "xyFootprint"; + String EXTERNALIZE_TEXTURES = "externalizeTextures"; + String STRIP_MATERIALS = "stripMaterials"; + String EXTENT = "extent"; + } + + interface LodTypes { + String GEOHASH = "geohash"; + String FLAT_HEXAGON = "flatHexagon"; + String POINTY_HEXAGON = "pointyHexagon"; + String SQUARE = "square"; + } + + interface Defaults { + String NONE = "none"; + String STANDARD = "standard"; + } + + interface SqlFormats extends Defaults { + String NATIVE = "native"; + } + + interface ResultTypes extends Defaults { + String TILE = "tile"; + } + + interface HavingCLauses { + String AVG = "AVG"; + String COUNT = "COUNT"; + String SUM = "SUM"; + String STDDEV = "STDDEV"; + String MIN = "MIN"; + String MAX = "MAX"; + String VAR = "VAR"; + } + + interface Formats { + String HTML = "html"; + String GEO_JSON = "geojson"; + String JSON = "json"; + String PROTOBUF = "pbf"; + } + +} diff --git a/shetland/pom.xml b/shetland/pom.xml index 370b47076..dcf567cbe 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -30,5 +30,6 @@ <modules> <module>core</module> <module>rdf</module> + <module>arcgis</module> </modules> </project> From 7c80e13642125d751b969580fc374e2f27877d96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Oct 2022 04:01:06 +0000 Subject: [PATCH 410/456] Bump joda-time from 2.11.2 to 2.12.0 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.11.2 to 2.12.0. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.11.2...v2.12.0) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d5542a61..d5fac1ee2 100644 --- a/pom.xml +++ b/pom.xml @@ -322,7 +322,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.11.2</version> + <version>2.12.0</version> </dependency> <dependency> <groupId>org.locationtech.jts</groupId> From cf1801a9dbf6d2ed388c6749a2d69ffd2a3d3830 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Oct 2022 04:39:32 +0000 Subject: [PATCH 411/456] Bump joda-time from 2.11.2 to 2.12.0 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.11.2 to 2.12.0. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.11.2...v2.12.0) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb3dc46f1..712409cc5 100644 --- a/pom.xml +++ b/pom.xml @@ -324,7 +324,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.11.2</version> + <version>2.12.0</version> </dependency> <dependency> <groupId>org.locationtech.jts</groupId> From 18b7544088d9ec931b1ed91b24f856b60480d719 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 18 Oct 2022 13:35:39 +0200 Subject: [PATCH 412/456] fix build --- shetland/arcgis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shetland/arcgis/pom.xml b/shetland/arcgis/pom.xml index 1ba874a7d..7e62bb965 100644 --- a/shetland/arcgis/pom.xml +++ b/shetland/arcgis/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>9.9.0-SNAPSHOT</version> + <version>10.0.0-SNAPSHOT</version> </parent> <artifactId>shetland-arcgis</artifactId> <name>52°North Shetland ArcGIS</name> From a093ae0392e166c85e2e648bcc59d136a381bf6f Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 19 Oct 2022 10:06:29 +0200 Subject: [PATCH 413/456] Create snapshot_10.yml --- .github/workflows/snapshot_10.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/snapshot_10.yml diff --git a/.github/workflows/snapshot_10.yml b/.github/workflows/snapshot_10.yml new file mode 100644 index 000000000..cc7cdfad9 --- /dev/null +++ b/.github/workflows/snapshot_10.yml @@ -0,0 +1,27 @@ +name: Java CI on Pull Request + +on: + workflow_dispatch: + branches: + - 'version/v10.0' + +jobs: + publish-snapshot: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up settings.xml for GitHub Packages + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 11 + cache: 'maven' + server-id: sonatype-nexus-snapshots + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: Publish SNAPSHOT version Maven Central + run: mvn -B --no-transfer-progress deploy -DskipTests + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} From 9b4877e4ec4be5d7507be7639a6de3e7791d4fc5 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 19 Oct 2022 10:10:28 +0200 Subject: [PATCH 414/456] Update snapshot_10.yml --- .github/workflows/snapshot_10.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snapshot_10.yml b/.github/workflows/snapshot_10.yml index cc7cdfad9..9c7df486f 100644 --- a/.github/workflows/snapshot_10.yml +++ b/.github/workflows/snapshot_10.yml @@ -1,4 +1,4 @@ -name: Java CI on Pull Request +name: Create SNAPSHOT with Java 11 on: workflow_dispatch: From ac716a44ec8cf277d8a3d70af49147f8a7fb9580 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 19 Oct 2022 10:12:10 +0200 Subject: [PATCH 415/456] Update snapshot_10.yml --- .github/workflows/snapshot_10.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/snapshot_10.yml b/.github/workflows/snapshot_10.yml index 9c7df486f..013db7506 100644 --- a/.github/workflows/snapshot_10.yml +++ b/.github/workflows/snapshot_10.yml @@ -2,12 +2,9 @@ name: Create SNAPSHOT with Java 11 on: workflow_dispatch: - branches: - - 'version/v10.0' jobs: publish-snapshot: - needs: build runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 541c7e809ccd351f1cf78186024fa7d318735cf1 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 19 Oct 2022 12:41:13 +0200 Subject: [PATCH 416/456] Update maven-parent to 26 --- NOTICE | 8 ++++++-- pom.xml | 4 ++-- .../java/org/n52/shetland/ogc/om/ParameterHolder.java | 3 ++- .../n52/shetland/ogc/om/features/FeatureCollection.java | 2 +- .../n52/shetland/ogc/om/values/RectifiedGridCoverage.java | 3 ++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/NOTICE b/NOTICE index a7b991687..75188d307 100644 --- a/NOTICE +++ b/NOTICE @@ -41,7 +41,7 @@ This project includes: 52°North Svalbard XML Stream under The Apache Software License, Version 2.0 52°North Svalbard XmlBeans under The Apache Software License, Version 2.0 aggs-matrix-stats under Elastic License 2.0 or Server Side Public License, v 1 - ANTLR 4 Runtime under The BSD License + ANTLR 4 Runtime under BSD-3-Clause Apache Commons CLI under Apache License, Version 2.0 Apache Commons Codec under Apache License, Version 2.0 Apache Commons Compress under Apache License, Version 2.0 @@ -54,7 +54,7 @@ This project includes: Apache HttpComponents Core HTTP/2 under Apache License, Version 2.0 Apache HttpCore under Apache License, Version 2.0 Apache HttpCore NIO under Apache License, Version 2.0 - Apache Jena - ARQ (SPARQL 1.1 Query Engine) under The Apache Software License, Version 2.0 + Apache Jena - ARQ under The Apache Software License, Version 2.0 Apache Jena - Base Common Environment under The Apache Software License, Version 2.0 Apache Jena - Core under The Apache Software License, Version 2.0 Apache Jena - IRI under The Apache Software License, Version 2.0 @@ -78,6 +78,7 @@ This project includes: FindBugs-jsr305 under The Apache Software License, Version 2.0 Geographic Common (GCO) schema (version 2012-07-13) under The Apache Software License, Version 2.0 Geographic MetaData (GMD) schema (version 2012-07-13) under The Apache Software License, Version 2.0 + Gson under Apache-2.0 Guava InternalFutureFailureAccess and InternalFutures under The Apache Software License, Version 2.0 Guava ListenableFuture only under The Apache Software License, Version 2.0 Guava: Google Core Libraries for Java under Apache License, Version 2.0 @@ -115,6 +116,7 @@ This project includes: JCL 1.2 implemented over SLF4J under Apache License, Version 2.0 Joda-Time under Apache License, Version 2.0 JOpt Simple under The MIT License + JSON-P Default Provider under Eclipse Public License 2.0 or GNU General Public License, version 2 with the GNU Classpath Exception json-schema-validator under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0 JSONLD Java :: Core under Revised BSD License lang-mustache under Elastic License 2.0 or Server Side Public License, v 1 @@ -187,6 +189,7 @@ This project includes: org.locationtech.jts:jts-core under Eclipse Public License, Version 2.0 or Eclipse Distribution License - v 1.0 parent-join under Elastic License 2.0 or Server Side Public License, v 1 Portele Schape Change schema (spec. v3.0) under The Apache Software License, Version 2.0 + Protocol Buffers [Core] under BSD-3-Clause quartz under The Apache Software License, Version 2.0 rank-eval under Elastic License 2.0 or Server Side Public License, v 1 rest under The Apache Software License, Version 2.0 @@ -204,6 +207,7 @@ This project includes: Spring Expression Language (SpEL) under Apache License, Version 2.0 Spring Web under Apache License, Version 2.0 T-Digest under The Apache Software License, Version 2.0 + Titanium JSON-LD 1.1 (JRE11) under Apache License, Version 2.0 W3C SOAP specification recommondation (v1.1) under The Apache Software License, Version 2.0 W3C SOAP specification recommondation (v1.2 part 1) under The Apache Software License, Version 2.0 W3C WS-Addressing specification schemas (v1.0) under The Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index 712409cc5..817e1dd2a 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52</groupId> <artifactId>parent</artifactId> - <version>24</version> + <version>26</version> </parent> <groupId>org.n52.arctic-sea</groupId> @@ -1176,7 +1176,7 @@ </plugin> <plugin> <groupId>org.jasig.maven</groupId> - <artifactId>maven-notice-plugin</artifactId> + <artifactId>notice-maven-plugin</artifactId> <inherited>false</inherited> <configuration> <noticeTemplate>etc/notice-template.txt</noticeTemplate> diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java index 3e9756e06..2ae4d2421 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/ParameterHolder.java @@ -17,6 +17,7 @@ import java.math.BigDecimal; import java.util.Collection; +import java.util.Collections; import java.util.Optional; import java.util.SortedSet; import java.util.TreeSet; @@ -33,7 +34,7 @@ public class ParameterHolder { private final SortedSet<NamedValue<?>> parameter = new TreeSet<>(); public SortedSet<NamedValue<?>> getParameter() { - return parameter; + return Collections.unmodifiableSortedSet(parameter); } @SuppressWarnings("unchecked") diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/FeatureCollection.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/FeatureCollection.java index 224f55508..062f177ab 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/FeatureCollection.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/features/FeatureCollection.java @@ -66,7 +66,7 @@ public FeatureCollection(final Map<String, AbstractFeature> members) { * @return the members */ public Map<String, AbstractFeature> getMembers() { - return members; + return Collections.unmodifiableSortedMap(members); } /** diff --git a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/RectifiedGridCoverage.java b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/RectifiedGridCoverage.java index 7e06ca4f6..4a45d9d15 100644 --- a/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/RectifiedGridCoverage.java +++ b/shetland/core/src/main/java/org/n52/shetland/ogc/om/values/RectifiedGridCoverage.java @@ -17,6 +17,7 @@ import java.math.BigDecimal; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.SortedMap; @@ -88,7 +89,7 @@ public void addValue(BigDecimal from, BigDecimal to, Value<?> value) { @Override public SortedMap<ComparableValue<?, ?>, Value<?>> getValue() { - return value; + return Collections.unmodifiableSortedMap(value); } @Override From 835ca1df5b7b922619ae8a659e9f7a10036dd5b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 04:00:52 +0000 Subject: [PATCH 417/456] Bump version.mockito from 4.8.0 to 4.8.1 Bumps `version.mockito` from 4.8.0 to 4.8.1. Updates `mockito-core` from 4.8.0 to 4.8.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.8.0...v4.8.1) Updates `mockito-junit-jupiter` from 4.8.0 to 4.8.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.8.0...v4.8.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d5fac1ee2..208224389 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <version.jena>3.17.0</version.jena> <version.jackson>2.13.4</version.jackson> <version.junit>5.9.1</version.junit> - <version.mockito>4.8.0</version.mockito> + <version.mockito>4.8.1</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.6</version.elastic> From a171b26c61eac70dc3d27fce86defb779f82c2d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 04:55:19 +0000 Subject: [PATCH 418/456] Bump version.mockito from 4.8.0 to 4.8.1 Bumps `version.mockito` from 4.8.0 to 4.8.1. Updates `mockito-core` from 4.8.0 to 4.8.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.8.0...v4.8.1) Updates `mockito-junit-jupiter` from 4.8.0 to 4.8.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.8.0...v4.8.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 817e1dd2a..1929e6e1f 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <version.jena>4.6.1</version.jena> <version.jackson>2.13.4</version.jackson> <version.junit>5.9.1</version.junit> - <version.mockito>4.8.0</version.mockito> + <version.mockito>4.8.1</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.6</version.elastic> From b32375d7c0605df2723407bcfd8a4d89226a5d0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Oct 2022 04:55:29 +0000 Subject: [PATCH 419/456] Bump lucene-core from 9.4.0 to 9.4.1 Bumps lucene-core from 9.4.0 to 9.4.1. --- updated-dependencies: - dependency-name: org.apache.lucene:lucene-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 817e1dd2a..af4e86d77 100644 --- a/pom.xml +++ b/pom.xml @@ -649,7 +649,7 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>9.4.0</version> + <version>9.4.1</version> </dependency> <dependency> <groupId>com.maxmind.db</groupId> From 23d43a49a7377da9e33f16a33c03fcb191fbf8c7 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 25 Oct 2022 12:05:03 +0200 Subject: [PATCH 420/456] support writing static capabilities string directly to output stream instead of creating xml object --- .../encode/GetCapabilitiesResponseEncoder.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/GetCapabilitiesResponseEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/GetCapabilitiesResponseEncoder.java index 42933eed4..80e28b5e1 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/GetCapabilitiesResponseEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/GetCapabilitiesResponseEncoder.java @@ -15,6 +15,9 @@ */ package org.n52.svalbard.encode; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; import java.util.Collection; import java.util.Set; @@ -74,6 +77,20 @@ public GetCapabilitiesResponseEncoder() { super(SosConstants.Operations.GetCapabilities.name(), GetCapabilitiesResponse.class); } + @Override + protected void create(GetCapabilitiesResponse response, OutputStream outputStream, EncodingContext encodingValues) + throws EncodingException { + if (response.isStatic()) { + try { + outputStream.write(response.getStaticString().getBytes(StandardCharsets.UTF_8)); + } catch (IOException ioe) { + throw new EncodingException("Error while writing element to stream!", ioe); + } + } else { + super.create(response, outputStream, encodingValues); + } + } + @Override protected XmlObject create(GetCapabilitiesResponse response) throws EncodingException { CapabilitiesDocument doc = CapabilitiesDocument.Factory.newInstance(getXmlOptions()); From 4645048ccfc985b6506d7c2fea504ca27586d12b Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 25 Oct 2022 12:55:59 +0200 Subject: [PATCH 421/456] update actions --- .github/workflows/daily.yml | 46 ++++++++++++++++++++++++++-- .github/workflows/pull.yml | 26 +++++++++++++--- .github/workflows/pull_10.yml | 25 --------------- .github/workflows/push.yml | 51 +++++++++++++++++++++++++++---- .github/workflows/snapshot_10.yml | 24 --------------- 5 files changed, 110 insertions(+), 62 deletions(-) delete mode 100644 .github/workflows/pull_10.yml delete mode 100644 .github/workflows/snapshot_10.yml diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 9323181a5..df7870d1a 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -3,9 +3,11 @@ name: Daily Snapshot build on: schedule: - cron: '0 1 * * *' + workflow_dispatch: jobs: - build: + build-java-8: + if: github.ref != 'refs/heads/version/v10.0' runs-on: ubuntu-latest name: Java 8 compile @@ -19,8 +21,25 @@ jobs: cache: 'maven' - name: Build with Maven run: mvn -U -B clean install - publish-snapshot: - needs: build + build-java-11: + if: github.ref == 'refs/heads/version/v10.0' + runs-on: ubuntu-latest + name: Java 11 compile + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 11 + cache: 'maven' + - name: Build with Maven + run: mvn -U -B clean install + + publish-snapshot-java-8: + if: github.ref != 'refs/heads/version/v10.0' + needs: build-java-8 runs-on: ubuntu-latest steps: @@ -39,3 +58,24 @@ jobs: env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + publish-snapshot-java-11: + if: github.ref == 'refs/heads/version/v10.0' + needs: build-java-11 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up settings.xml for GitHub Packages + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 11 + cache: 'maven' + server-id: sonatype-nexus-snapshots + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: Publish SNAPSHOT version Maven Central + run: mvn -B --no-transfer-progress deploy -DskipTests + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index c84b1be31..3c394325d 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -2,18 +2,36 @@ name: Java CI on Pull Request on: pull_request: - branches: - - master - - 'maintenance/*' + workflow_dispatch: + jobs: - build: + build-java-8: + if: github.ref != 'refs/heads/version/v10.0' strategy: matrix: java: [ 8, 11, 17 ] runs-on: ubuntu-latest name: Java ${{ matrix.java }} compile + steps: + - uses: actions/checkout@v3 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: ${{ matrix.java }} + cache: 'maven' + - name: Build with Maven + run: mvn -U -B clean install + build-java-8: + if: github.ref == 'refs/heads/version/v10.0' + strategy: + matrix: + java: [ 11, 17 ] + runs-on: ubuntu-latest + name: Java ${{ matrix.java }} compile + steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java }} diff --git a/.github/workflows/pull_10.yml b/.github/workflows/pull_10.yml deleted file mode 100644 index d683b3026..000000000 --- a/.github/workflows/pull_10.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Java CI on Pull Request - -on: - pull_request: - branches: - - 'version/v10.0' - -jobs: - build: - strategy: - matrix: - java: [ 11, 17 ] - runs-on: ubuntu-latest - name: Java ${{ matrix.java }} compile - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - name: Build with Maven - run: mvn -U -B clean install diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 09835df8e..57f285fff 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -2,13 +2,11 @@ name: Java CI on Push on: push: - branches: - - master - - 'maintenance/*' workflow_dispatch: jobs: - build: + build-java-8: + if: github.ref != 'refs/heads/version/v10.0' strategy: matrix: java: [ 8, 11, 17 ] @@ -25,8 +23,28 @@ jobs: cache: 'maven' - name: Build with Maven run: mvn -fae -U -B clean install -P check - publish-snapshot: - needs: build + build-java-11: + if: github.ref == 'refs/heads/version/v10.0' + strategy: + matrix: + java: [ 11, 17 ] + runs-on: ubuntu-latest + name: Java ${{ matrix.java }} compile + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: ${{ matrix.java }} + cache: 'maven' + - name: Build with Maven + run: mvn -fae -U -B clean install -P check + + publish-snapshot-java-8: + if: github.ref != 'refs/heads/version/v10.0' + needs: build-java-8 runs-on: ubuntu-latest steps: @@ -45,3 +63,24 @@ jobs: env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + publish-snapshot-java-11: + if: github.ref == 'refs/heads/version/v10.0' + needs: build-java-11 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up settings.xml for GitHub Packages + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 11 + cache: 'maven' + server-id: sonatype-nexus-snapshots + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: Publish SNAPSHOT version Maven Central + run: mvn -B --no-transfer-progress deploy -DskipTests + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} diff --git a/.github/workflows/snapshot_10.yml b/.github/workflows/snapshot_10.yml deleted file mode 100644 index 013db7506..000000000 --- a/.github/workflows/snapshot_10.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Create SNAPSHOT with Java 11 - -on: - workflow_dispatch: - -jobs: - publish-snapshot: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up settings.xml for GitHub Packages - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 11 - cache: 'maven' - server-id: sonatype-nexus-snapshots - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - - name: Publish SNAPSHOT version Maven Central - run: mvn -B --no-transfer-progress deploy -DskipTests - env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} From e7e0b7e467a67aec6732b340c9b65e4a9788601d Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 25 Oct 2022 12:57:36 +0200 Subject: [PATCH 422/456] fix --- .github/workflows/pull.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 3c394325d..0d26d3045 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -24,7 +24,7 @@ jobs: cache: 'maven' - name: Build with Maven run: mvn -U -B clean install - build-java-8: + build-java-11: if: github.ref == 'refs/heads/version/v10.0' strategy: matrix: From 65997e484d3ef0a9aac1e1bb86a5f6ed35ce44a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Oct 2022 04:00:58 +0000 Subject: [PATCH 423/456] Bump lucene-core from 8.11.1 to 8.11.2 Bumps lucene-core from 8.11.1 to 8.11.2. --- updated-dependencies: - dependency-name: org.apache.lucene:lucene-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 208224389..28f56b28a 100644 --- a/pom.xml +++ b/pom.xml @@ -647,7 +647,7 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>8.11.1</version> + <version>8.11.2</version> </dependency> <dependency> <groupId>com.maxmind.db</groupId> From fa9d33a161b939aa71cd445ae51eb75b28326484 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 26 Oct 2022 08:31:02 +0200 Subject: [PATCH 424/456] Bump maven-parents from 26 to 27 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 120fe039d..06041d0ff 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52</groupId> <artifactId>parent</artifactId> - <version>26</version> + <version>27</version> </parent> <groupId>org.n52.arctic-sea</groupId> From 2bc328b79b4480cdf89a1337946e0323b5a164d4 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 26 Oct 2022 08:36:43 +0200 Subject: [PATCH 425/456] update actions to merge v10 into master and v9 into maintenance --- .github/dependabot.yml | 11 +---------- .github/workflows/daily.yml | 8 ++++---- .github/workflows/pull.yml | 4 ++-- .github/workflows/push.yml | 8 ++++---- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c7a3b4043..fc7617329 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,22 +10,13 @@ updates: - dependency-name: xml-apis:xml-apis versions: - ">= 2.a, < 3" - - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client - versions: - - 7.11.0 - - dependency-name: org.elasticsearch.client:elasticsearch-rest-client - versions: - - 7.11.0 - - dependency-name: org.elasticsearch:elasticsearch - versions: - - 7.11.0 - package-ecosystem: maven directory: "/" schedule: interval: daily time: "04:15" open-pull-requests-limit: 10 - target-branch: "version/v10.0" + target-branch: "maintenance/9.x" ignore: - dependency-name: xml-apis:xml-apis versions: diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index df7870d1a..e0d2c9f73 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -7,7 +7,7 @@ on: jobs: build-java-8: - if: github.ref != 'refs/heads/version/v10.0' + if: github.ref == 'refs/heads/maintenance/*' runs-on: ubuntu-latest name: Java 8 compile @@ -22,7 +22,7 @@ jobs: - name: Build with Maven run: mvn -U -B clean install build-java-11: - if: github.ref == 'refs/heads/version/v10.0' + if: github.ref != 'refs/heads/maintenance/*' runs-on: ubuntu-latest name: Java 11 compile @@ -38,7 +38,7 @@ jobs: run: mvn -U -B clean install publish-snapshot-java-8: - if: github.ref != 'refs/heads/version/v10.0' + if: github.ref == 'refs/heads/maintenance/*' needs: build-java-8 runs-on: ubuntu-latest @@ -59,7 +59,7 @@ jobs: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} publish-snapshot-java-11: - if: github.ref == 'refs/heads/version/v10.0' + if: github.ref != 'refs/heads/maintenance/*' needs: build-java-11 runs-on: ubuntu-latest diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 0d26d3045..4387fa89e 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -7,7 +7,7 @@ on: jobs: build-java-8: - if: github.ref != 'refs/heads/version/v10.0' + if: github.ref == 'refs/heads/maintenance/*' strategy: matrix: java: [ 8, 11, 17 ] @@ -25,7 +25,7 @@ jobs: - name: Build with Maven run: mvn -U -B clean install build-java-11: - if: github.ref == 'refs/heads/version/v10.0' + if: github.ref != 'refs/heads/version/v10.0' strategy: matrix: java: [ 11, 17 ] diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 57f285fff..17973d602 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -6,7 +6,7 @@ on: jobs: build-java-8: - if: github.ref != 'refs/heads/version/v10.0' + if: github.ref == 'refs/heads/maintenance/*' strategy: matrix: java: [ 8, 11, 17 ] @@ -24,7 +24,7 @@ jobs: - name: Build with Maven run: mvn -fae -U -B clean install -P check build-java-11: - if: github.ref == 'refs/heads/version/v10.0' + if: github.ref != 'refs/heads/maintenance/*' strategy: matrix: java: [ 11, 17 ] @@ -43,7 +43,7 @@ jobs: run: mvn -fae -U -B clean install -P check publish-snapshot-java-8: - if: github.ref != 'refs/heads/version/v10.0' + if: github.ref == 'refs/heads/maintenance/*' needs: build-java-8 runs-on: ubuntu-latest @@ -64,7 +64,7 @@ jobs: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} publish-snapshot-java-11: - if: github.ref == 'refs/heads/version/v10.0' + if: github.ref != 'refs/heads/maintenance/*' needs: build-java-11 runs-on: ubuntu-latest From f5d651d098f6b0dabb21971b650e4619dae8b606 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 26 Oct 2022 10:15:59 +0200 Subject: [PATCH 426/456] [maven-release-plugin] prepare release v10.0.0 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/arcgis/pom.xml | 2 +- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index c2108c565..876cd5136 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 70d09eca5..6e953ed30 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 22325d13b..957f61542 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 5358e1e15..4d76f81e4 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 2dde5e3b2..483ca9e0b 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index f28c067ea..faa7eaef9 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index acd91ccd7..a613a05f0 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 20dc134d9..7bed01c9c 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index b4a71241a..c997e26f8 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index fc0ac2aa1..b1e45c186 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 39d915f0f..b2c17b502 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index ce0ffc79e..d3d4764a1 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index f94c8b3c6..90e144ab2 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 06041d0ff..abcb5b18c 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>HEAD</tag> + <tag>v10.0.0</tag> </scm> <issueManagement> diff --git a/shetland/arcgis/pom.xml b/shetland/arcgis/pom.xml index 7e62bb965..d2ccce5cc 100644 --- a/shetland/arcgis/pom.xml +++ b/shetland/arcgis/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>shetland-arcgis</artifactId> <name>52°North Shetland ArcGIS</name> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index cd333a6f5..a05c95894 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 8ed79aecd..0d21a2be4 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 74a836f14..54a0ea9b0 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index b62c79d0f..4f1022f7c 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 8083e17b7..2d58be7bf 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index a6b3918fd..26b213b5e 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 914566f09..21f152687 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 0c7cc2669..579cbeaf5 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 260673aa3..ba457fc8c 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 722a99f1c..c56503029 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 50f54483e..b8c411c92 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0-SNAPSHOT</version> + <version>10.0.0</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 7e496566bd9a90a487bb1bd9753c77df3690d7f7 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 26 Oct 2022 10:16:08 +0200 Subject: [PATCH 427/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/arcgis/pom.xml | 2 +- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index 876cd5136..f9e97babe 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 6e953ed30..5df127afb 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 957f61542..42c19a0e2 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 4d76f81e4..ea245978a 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 483ca9e0b..8d453a900 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index faa7eaef9..3c7ca980a 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index a613a05f0..3532773df 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 7bed01c9c..5ffb0dec5 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index c997e26f8..16be8f7eb 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index b1e45c186..25a14e86a 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index b2c17b502..e5ecd5018 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index d3d4764a1..27756a8c8 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 90e144ab2..37e852ba3 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index abcb5b18c..4abf68790 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>v10.0.0</tag> + <tag>HEAD</tag> </scm> <issueManagement> diff --git a/shetland/arcgis/pom.xml b/shetland/arcgis/pom.xml index d2ccce5cc..4e55d064b 100644 --- a/shetland/arcgis/pom.xml +++ b/shetland/arcgis/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>shetland-arcgis</artifactId> <name>52°North Shetland ArcGIS</name> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index a05c95894..55e15d628 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 0d21a2be4..c069fda15 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 54a0ea9b0..ad3603ad7 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 4f1022f7c..7df0d52a0 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 2d58be7bf..1514de109 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 26b213b5e..e01751f3e 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 21f152687..0ee74939b 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 579cbeaf5..57541ae05 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index ba457fc8c..45e07c0b4 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index c56503029..f1275b4e8 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index b8c411c92..1c6b4d57c 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.0</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From a4a83b79f1df65f3aa9e2ae27cb826429ce2e637 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 27 Oct 2022 11:11:33 +0200 Subject: [PATCH 428/456] update license header config --- pom.xml | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 4abf68790..b8ad29b74 100644 --- a/pom.xml +++ b/pom.xml @@ -1148,21 +1148,25 @@ <inherited>false</inherited> <configuration> <aggregate>true</aggregate> - <header>etc/license-header.txt</header> - <includes> - <include>**/*.java</include> - <include>**/*.xml</include> - </includes> - <excludes> - <exclude>.mvn/wrapper/*.java</exclude> - </excludes> <strictCheck>true</strictCheck> - <properties> - <year>${project.inceptionYear}-${currentYear}</year> - </properties> <mapping> <java>SLASHSTAR_STYLE</java> </mapping> + <licenseSets> + <licenseSet> + <header>etc/license-header.txt</header> + <includes> + <include>**/*.java</include> + <include>**/*.xml</include> + </includes> + <excludes> + <exclude>.mvn/wrapper/*.java</exclude> + </excludes> + <properties> + <year>${project.inceptionYear}-${currentYear}</year> + </properties> + </licenseSet> + </licenseSets> </configuration> <executions> <execution> From 65dd67453447e33083bf1edd5661de20932b41f2 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 27 Oct 2022 13:42:55 +0200 Subject: [PATCH 429/456] update current year creation --- pom.xml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index b8ad29b74..41532b855 100644 --- a/pom.xml +++ b/pom.xml @@ -139,6 +139,8 @@ <properties> <timestamp>${maven.build.timestamp}</timestamp> + <maven.build.timestamp.format>yyyy</maven.build.timestamp.format> + <currentYear>${maven.build.timestamp}</currentYear> <version.spring>5.3.23</version.spring> <version.slf4j>2.0.3</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> @@ -1127,21 +1129,6 @@ <additionalJOption>-Xdoclint:none</additionalJOption> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> - <executions> - <execution> - <phase>initialize</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source>project.properties['currentYear'] = java.time.Year.now().toString()</source> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> From 56b992be00e4813190336f9b3539b91118f36716 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 27 Oct 2022 13:50:26 +0200 Subject: [PATCH 430/456] update actions --- .github/workflows/daily.yml | 44 ++------------------------- .github/workflows/pull.yml | 23 ++------------ .github/workflows/pull_java_8.yml | 27 +++++++++++++++++ .github/workflows/push.yml | 50 ++++--------------------------- .github/workflows/push_java_8.yml | 47 +++++++++++++++++++++++++++++ 5 files changed, 86 insertions(+), 105 deletions(-) create mode 100644 .github/workflows/pull_java_8.yml create mode 100644 .github/workflows/push_java_8.yml diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index e0d2c9f73..83851e04b 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -6,23 +6,7 @@ on: workflow_dispatch: jobs: - build-java-8: - if: github.ref == 'refs/heads/maintenance/*' - runs-on: ubuntu-latest - name: Java 8 compile - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 8 - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 8 - cache: 'maven' - - name: Build with Maven - run: mvn -U -B clean install - build-java-11: - if: github.ref != 'refs/heads/maintenance/*' + build: runs-on: ubuntu-latest name: Java 11 compile @@ -36,31 +20,9 @@ jobs: cache: 'maven' - name: Build with Maven run: mvn -U -B clean install - - publish-snapshot-java-8: - if: github.ref == 'refs/heads/maintenance/*' - needs: build-java-8 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up settings.xml for GitHub Packages - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 8 - cache: 'maven' - server-id: sonatype-nexus-snapshots - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - - name: Publish SNAPSHOT version Maven Central - run: mvn -B --no-transfer-progress deploy -DskipTests - env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - publish-snapshot-java-11: - if: github.ref != 'refs/heads/maintenance/*' - needs: build-java-11 + publish-snapshot-: + needs: build runs-on: ubuntu-latest steps: diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 4387fa89e..b7bebee6c 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -2,30 +2,13 @@ name: Java CI on Pull Request on: pull_request: + branches: + - develop workflow_dispatch: jobs: - build-java-8: - if: github.ref == 'refs/heads/maintenance/*' - strategy: - matrix: - java: [ 8, 11, 17 ] - runs-on: ubuntu-latest - name: Java ${{ matrix.java }} compile - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - name: Build with Maven - run: mvn -U -B clean install - build-java-11: - if: github.ref != 'refs/heads/version/v10.0' + build: strategy: matrix: java: [ 11, 17 ] diff --git a/.github/workflows/pull_java_8.yml b/.github/workflows/pull_java_8.yml new file mode 100644 index 000000000..9f035ff41 --- /dev/null +++ b/.github/workflows/pull_java_8.yml @@ -0,0 +1,27 @@ +name: Java CI on Pull Request + +on: + pull_request: + branches: + - 'maintenance/*' + workflow_dispatch: + + +jobs: + build: + strategy: + matrix: + java: [ 8, 11, 17 ] + runs-on: ubuntu-latest + name: Java ${{ matrix.java }} compile + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: ${{ matrix.java }} + cache: 'maven' + - name: Build with Maven + run: mvn -U -B clean instal \ No newline at end of file diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 17973d602..871f839ec 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -2,29 +2,13 @@ name: Java CI on Push on: push: + branches: + - master + - develop workflow_dispatch: jobs: - build-java-8: - if: github.ref == 'refs/heads/maintenance/*' - strategy: - matrix: - java: [ 8, 11, 17 ] - runs-on: ubuntu-latest - name: Java ${{ matrix.java }} compile - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - name: Build with Maven - run: mvn -fae -U -B clean install -P check - build-java-11: - if: github.ref != 'refs/heads/maintenance/*' + build: strategy: matrix: java: [ 11, 17 ] @@ -42,30 +26,8 @@ jobs: - name: Build with Maven run: mvn -fae -U -B clean install -P check - publish-snapshot-java-8: - if: github.ref == 'refs/heads/maintenance/*' - needs: build-java-8 - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up settings.xml for GitHub Packages - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 8 - cache: 'maven' - server-id: sonatype-nexus-snapshots - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - - name: Publish SNAPSHOT version Maven Central - run: mvn -B --no-transfer-progress deploy -DskipTests - env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - publish-snapshot-java-11: - if: github.ref != 'refs/heads/maintenance/*' - needs: build-java-11 + publish-snapshot: + needs: build runs-on: ubuntu-latest steps: diff --git a/.github/workflows/push_java_8.yml b/.github/workflows/push_java_8.yml new file mode 100644 index 000000000..2de0349ba --- /dev/null +++ b/.github/workflows/push_java_8.yml @@ -0,0 +1,47 @@ +name: Java CI on Push + +on: + push: + branches: + - 'maintenance/*' + workflow_dispatch: + +jobs: + build: + strategy: + matrix: + java: [ 8, 11, 17 ] + runs-on: ubuntu-latest + name: Java ${{ matrix.java }} compile + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: ${{ matrix.java }} + cache: 'maven' + - name: Build with Maven + run: mvn -fae -U -B clean install -P check + + publish-snapshot: + needs: build + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up settings.xml for GitHub Packages + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 8 + cache: 'maven' + server-id: sonatype-nexus-snapshots + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: Publish SNAPSHOT version Maven Central + run: mvn -B --no-transfer-progress deploy -DskipTests + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} From 1f9cf10a24cb0251a32ecbebd5e1c64479624142 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 27 Oct 2022 14:34:54 +0200 Subject: [PATCH 431/456] Update readme --- README.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2bef8a8ee..d99ea6c2a 100644 --- a/README.md +++ b/README.md @@ -65,9 +65,14 @@ All projects are available on Maven Central. ```xml <properties> - <version.arctic-sea>9.6.0</version.arctic-sea> + <version.arctic-sea>10.0.0</version.arctic-sea> </properties> <dependencies> + <dependency> + <groupId>org.n52.arctic-sea</groupId> + <artifactId>bjornoya</artifactId> + <version>${version.arctic-sea}</version> + </dependency> <dependency> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe</artifactId> @@ -128,6 +133,11 @@ All projects are available on Maven Central. <artifactId>shetland-rdf</artifactId> <version>${version.arctic-sea}</version> </dependency> + <dependency> + <groupId>org.n52.arctic-sea</groupId> + <artifactId>shetland-arcgis</artifactId> + <version>${version.arctic-sea}</version> + </dependency> <dependency> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard</artifactId> @@ -163,11 +173,6 @@ All projects are available on Maven Central. <artifactId>svalbard-xmlstream</artifactId> <version>${version.arctic-sea}</version> </dependency> - <dependency> - <groupId>org.n52.arctic-sea</groupId> - <artifactId></artifactId> - <version>${version.arctic-sea}</version> - </dependency> </dependencies> ``` @@ -177,7 +182,7 @@ For convenience the [52°North Maven parent](https://github.com/52North/maven- <parent> <groupId>org.n52</groupId> <artifactId>parent</artifactId> - <version>16</version> + <version>27</version> </parent> ``` From 2d65e5353e32a23c11593f9155cfcf5929ce8064 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 27 Oct 2022 15:33:54 +0200 Subject: [PATCH 432/456] Add where operations and tests --- shetland/arcgis/pom.xml | 20 ++ .../feature/FeatureServiceConstants.java | 161 ++++++++++++++++ .../feature/FeatureServiceConstantsTest.java | 173 ++++++++++++++++++ 3 files changed, 354 insertions(+) create mode 100644 shetland/arcgis/src/test/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstantsTest.java diff --git a/shetland/arcgis/pom.xml b/shetland/arcgis/pom.xml index 4e55d064b..eabd92e24 100644 --- a/shetland/arcgis/pom.xml +++ b/shetland/arcgis/pom.xml @@ -32,5 +32,25 @@ <artifactId>spotbugs-annotations</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/shetland/arcgis/src/main/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstants.java b/shetland/arcgis/src/main/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstants.java index 6647220bd..0008ca3ed 100644 --- a/shetland/arcgis/src/main/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstants.java +++ b/shetland/arcgis/src/main/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstants.java @@ -15,6 +15,10 @@ */ package org.n52.shetland.arcgis.service.feature; +import java.util.Arrays; +import java.util.TreeSet; +import java.util.stream.Collectors; + public interface FeatureServiceConstants { interface Parameter { @@ -139,4 +143,161 @@ interface Formats { String PROTOBUF = "pbf"; } + interface WhereOperators { + + String GREATER_THAN = ">="; + String LESS_THAN = "<="; + String GREATER = ">"; + String LESS = "<"; + String EQUAL = "="; + String NOT_EQUAL = "<>"; + String LIKE = "LIKE"; + String AND = "AND"; + String OR = "OR"; + String IS = "IS"; + String IS_NOT = "IS_NOT"; + String IN = "IN"; + String NOT_IN = "NOT_IN"; + String BETWEEEN = "BETWEEN"; + + default String create(String operator, String field, String value) { + return create(operator, field, value, "'"); + } + + default String create(String operator, String field, String value, String quote) { + return new StringBuffer().append(field).append(" ").append(operator).append(" ").append(quote) + .append(value).append(quote).toString(); + } + + default String create(String operator, String field, Number value) { + return new StringBuffer().append(field).append(" ").append(operator).append(" ").append(value).toString(); + } + + default String createIn(String... values) { + return new StringBuffer().append("(") + .append(String.join(",", + Arrays.stream(values).map(v -> new StringBuffer("'").append(v.toString()).append("'")) + .collect(Collectors.toCollection(TreeSet::new)))) + .append(")").toString(); + } + + default String createIn(Number... values) { + return new StringBuffer().append("(").append(String.join(",", + Arrays.stream(values).map(v -> v.toString()).collect(Collectors.toCollection(TreeSet::new)))) + .append(")").toString(); + } + + default String greaterThan(String field, String value) { + return create(GREATER_THAN, field, value); + } + + default String greaterThan(String field, Number value) { + return create(GREATER_THAN, field, value); + } + + default String lessThan(String field, String value) { + return create(LESS_THAN, field, value); + } + + default String lessThan(String field, Number value) { + return create(LESS_THAN, field, value); + } + + default String greater(String field, String value) { + return create(GREATER, field, value); + } + + default String greater(String field, Number value) { + return create(GREATER, field, value); + } + + default String less(String field, String value) { + return create(LESS, field, value); + } + + default String less(String field, Number value) { + return create(LESS, field, value); + } + + default String equal(String field, String value) { + return create(EQUAL, field, value); + } + + default String equal(String field, Number value) { + return create(EQUAL, field, value); + } + + default String notEqual(String field, String value) { + return create(NOT_EQUAL, field, value); + } + + default String notEqual(String field, Number value) { + return create(NOT_EQUAL, field, value); + } + + default String like(String field, String value) { + return create(LIKE, field, value); + } + + default String like(String field, Number value) { + return create(LIKE, field, value); + } + + default String and(String field, String value) { + return create(AND, field, value, ""); + } + + default String and(String field, Number value) { + return create(AND, field, value); + } + + default String or(String field, String value) { + return create(OR, field, value, ""); + } + + default String or(String field, Number value) { + return create(OR, field, value); + } + + default String is(String field, String value) { + return create(IS, field, value); + } + + default String is(String field, Number value) { + return create(IS, field, value); + } + + default String isNot(String field, String value) { + return create(IS_NOT, field, value); + } + + default String isNot(String field, Number value) { + return create(IS_NOT, field, value); + } + + default String in(String field, String... values) { + return create(IN, field, createIn(values), ""); + } + + default String in(String field, Number... values) { + return create(IN, field, createIn(values), ""); + } + + default String notIn(String field, String... values) { + return create(NOT_IN, field, createIn(values), ""); + } + + default String notIn(String field, Number... values) { + return create(NOT_IN, field, createIn(values), ""); + } + + default String between(String field, String value1, String value2) { + return create(AND, create(BETWEEEN, field, value1), value2); + } + + default String between(String field, Number value1, Number value2) { + return and(create(BETWEEEN, field, value1), value2); + } + } + } diff --git a/shetland/arcgis/src/test/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstantsTest.java b/shetland/arcgis/src/test/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstantsTest.java new file mode 100644 index 000000000..16341b651 --- /dev/null +++ b/shetland/arcgis/src/test/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstantsTest.java @@ -0,0 +1,173 @@ +package org.n52.shetland.arcgis.service.feature; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + +public class FeatureServiceConstantsTest implements FeatureServiceConstants.WhereOperators { + + private static final String FIELD = "field"; + private static final String VALUE = "value"; + private static final String VALUE_2 = "value2"; + private static final Double VALUE_DOUBLE = 1.2; + private static final Double VALUE_2_DOUBLE = 2.1; + + @Test + public void greaterThanString() { + assertEquals("field >= 'value'", greaterThan(FIELD, VALUE)); + } + + @Test + public void greaterThanDouble() { + assertEquals("field >= 1.2", greaterThan(FIELD, VALUE_DOUBLE)); + } + + @Test + public void lesThanString() { + assertEquals("field <= 'value'", lessThan(FIELD, VALUE)); + } + + @Test + public void lessThanDouble() { + assertEquals("field <= 1.2", lessThan(FIELD, VALUE_DOUBLE)); + } + + @Test + public void greaterString() { + assertEquals("field > 'value'", greater(FIELD, VALUE)); + } + + @Test + public void greaterDouble() { + assertEquals("field > 1.2", greater(FIELD, VALUE_DOUBLE)); + } + + @Test + public void lessString() { + assertEquals("field < 'value'", less(FIELD, VALUE)); + } + + @Test + public void lessDouble() { + assertEquals("field < 1.2", less(FIELD, VALUE_DOUBLE)); + } + + @Test + public void equalString() { + assertEquals("field = 'value'", equal(FIELD, VALUE)); + } + + @Test + public void equalDouble() { + assertEquals("field = 1.2", equal(FIELD, VALUE_DOUBLE)); + } + + @Test + public void notEqualString() { + assertEquals("field <> 'value'", notEqual(FIELD, VALUE)); + } + + @Test + public void notEqualDouble() { + assertEquals("field <> 1.2", notEqual(FIELD, VALUE_DOUBLE)); + } + + @Test + public void likeString() { + assertEquals("field LIKE 'value'", like(FIELD, VALUE)); + } + + @Test + public void likeDouble() { + assertEquals("field LIKE 1.2", like(FIELD, VALUE_DOUBLE)); + } + + @Test + public void andString() { + assertEquals("field AND value", and(FIELD, VALUE)); + } + + @Test + public void andDouble() { + assertEquals("field AND 1.2", and(FIELD, VALUE_DOUBLE)); + } + + @Test + public void orString() { + assertEquals("field OR value", or(FIELD, VALUE)); + } + + @Test + public void orDouble() { + assertEquals("field OR 1.2", or(FIELD, VALUE_DOUBLE)); + } + + @Test + public void isString() { + assertEquals("field IS 'value'", is(FIELD, VALUE)); + } + + @Test + public void isDouble() { + assertEquals("field IS 1.2", is(FIELD, VALUE_DOUBLE)); + } + + @Test + public void isNotString() { + assertEquals("field IS_NOT 'value'", isNot(FIELD, VALUE)); + } + + @Test + public void isNotDouble() { + assertEquals("field IS_NOT 1.2", isNot(FIELD, VALUE_DOUBLE)); + } + + @Test + public void inString() { + assertEquals("field IN ('value')", in(FIELD, VALUE)); + } + + @Test + public void inDouble() { + assertEquals("field IN (1.2)", in(FIELD, VALUE_DOUBLE)); + } + + @Test + public void inStringMulti() { + assertEquals("field IN ('value','value2')", in(FIELD, VALUE, VALUE_2)); + } + + @Test + public void inDoubleMulti() { + assertEquals("field IN (1.2,2.1)", in(FIELD, VALUE_DOUBLE, VALUE_2_DOUBLE)); + } + + @Test + public void notInString() { + assertEquals("field NOT_IN ('value')", notIn(FIELD, VALUE)); + } + + @Test + public void notInDouble() { + assertEquals("field NOT_IN (1.2)", notIn(FIELD, VALUE_DOUBLE)); + } + + @Test + public void notInStringMulti() { + assertEquals("field NOT_IN ('value','value2')", notIn(FIELD, VALUE, VALUE_2)); + } + + @Test + public void notInDoubleMulti() { + assertEquals("field NOT_IN (1.2,2.1)", notIn(FIELD, VALUE_DOUBLE, VALUE_2_DOUBLE)); + } + + @Test + public void betweenString() { + assertEquals("field BETWEEN 'value' AND 'value2'", between(FIELD, VALUE, VALUE_2)); + } + + @Test + public void betweenDouble() { + assertEquals("field BETWEEN 1.2 AND 2.1", between(FIELD, VALUE_DOUBLE, VALUE_2_DOUBLE)); + } +} From b3b4a17a2c9057abc0a25967e441caa493904924 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 27 Oct 2022 15:41:22 +0200 Subject: [PATCH 433/456] Update push.yml --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 871f839ec..681e4aa66 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -2,7 +2,7 @@ name: Java CI on Push on: push: - branches: + branches: - master - develop workflow_dispatch: From 85a021000b223673384ec9c87e957fba5fbbf5f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 04:01:38 +0000 Subject: [PATCH 434/456] Bump joda-time from 2.12.0 to 2.12.1 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.12.0 to 2.12.1. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.12.0...v2.12.1) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41532b855..adc29e2c9 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.12.0</version> + <version>2.12.1</version> </dependency> <dependency> <groupId>org.locationtech.jts</groupId> From 2f1f4ae66230c99d2b2050926dcb8c59c6c9b8f1 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Mon, 31 Oct 2022 08:04:02 +0100 Subject: [PATCH 435/456] update action names --- .github/workflows/pull_java_8.yml | 2 +- .github/workflows/push_java_8.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull_java_8.yml b/.github/workflows/pull_java_8.yml index 9f035ff41..c3d9bc2f1 100644 --- a/.github/workflows/pull_java_8.yml +++ b/.github/workflows/pull_java_8.yml @@ -1,4 +1,4 @@ -name: Java CI on Pull Request +name: Java CI on Pull Request Java 8 on: pull_request: diff --git a/.github/workflows/push_java_8.yml b/.github/workflows/push_java_8.yml index 2de0349ba..4c4308ec6 100644 --- a/.github/workflows/push_java_8.yml +++ b/.github/workflows/push_java_8.yml @@ -1,5 +1,5 @@ -name: Java CI on Push - +name: Java CI on Push Java 8 + on: push: branches: From cb61e72899bab8d2b5b9b2488458d2012ce865a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 04:03:53 +0000 Subject: [PATCH 436/456] Bump commons-compress from 1.21 to 1.22 Bumps commons-compress from 1.21 to 1.22. --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index adc29e2c9..85cd0bb8a 100644 --- a/pom.xml +++ b/pom.xml @@ -487,7 +487,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.21</version> + <version>1.22</version> </dependency> From 41a6253624c3ed8ae118913dda1f7f156e3b3ba1 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 2 Nov 2022 09:13:55 +0100 Subject: [PATCH 437/456] fix maven command --- .github/workflows/pull_java_8.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_java_8.yml b/.github/workflows/pull_java_8.yml index c3d9bc2f1..296f7b27d 100644 --- a/.github/workflows/pull_java_8.yml +++ b/.github/workflows/pull_java_8.yml @@ -24,4 +24,4 @@ jobs: java-version: ${{ matrix.java }} cache: 'maven' - name: Build with Maven - run: mvn -U -B clean instal \ No newline at end of file + run: mvn -U -B clean install From 9691926106e71e95738c8025762570a8b329febc Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 8 Nov 2022 11:12:47 +0100 Subject: [PATCH 438/456] Remove lgtm and add CodeQL badget --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d99ea6c2a..fa4675e91 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Arctic Sea -[![Build Status](https://travis-ci.org/52North/arctic-sea.svg)](https://travis-ci.org/52North/arctic-sea) [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/arctic-sea.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea) [![Join the chat at https://gitter.im/52North/arctic-sea](https://badges.gitter.im/52North/arctic-sea.svg)](https://gitter.im/52North/arctic-sea) [![Total alerts](https://img.shields.io/lgtm/alerts/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/alerts/) [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/52North/arctic-sea.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/52North/arctic-sea/context:java) [![Open Source](https://badges.frapsoft.com/os/v3/open-source.png?v=103)](https://opensource.org/) +[![Build Status](https://travis-ci.org/52North/arctic-sea.svg)](https://travis-ci.org/52North/arctic-sea) [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/arctic-sea.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea) [![Join the chat at https://gitter.im/52North/arctic-sea](https://badges.gitter.im/52North/arctic-sea.svg)](https://gitter.im/52North/arctic-sea) [![CodeAQL analysis](https://github.com/52North/arctic-sea/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/52North/arctic-sea/actions/workflows/codeql-analysis.yml) [![Open Source](https://badges.frapsoft.com/os/v3/open-source.png?v=103)](https://opensource.org/) ## Description From a780cdc9fe641ccdf6f17176dbbbfac073af3c38 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Mon, 14 Nov 2022 08:39:30 +0100 Subject: [PATCH 439/456] Update actions to check for repo owner to not execute snapshot build on forks --- .github/workflows/daily.yml | 2 ++ .github/workflows/push.yml | 1 + .github/workflows/push_java_8.yml | 1 + 3 files changed, 4 insertions(+) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 83851e04b..fd2af95e4 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -10,6 +10,7 @@ jobs: runs-on: ubuntu-latest name: Java 11 compile + if: github.repository_owner == '52North' steps: - uses: actions/checkout@v3 - name: Set up JDK 11 @@ -25,6 +26,7 @@ jobs: needs: build runs-on: ubuntu-latest + if: github.repository_owner == '52North' steps: - uses: actions/checkout@v3 - name: Set up settings.xml for GitHub Packages diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 681e4aa66..ef458afeb 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -30,6 +30,7 @@ jobs: needs: build runs-on: ubuntu-latest + if: github.repository_owner == '52North' steps: - uses: actions/checkout@v3 - name: Set up settings.xml for GitHub Packages diff --git a/.github/workflows/push_java_8.yml b/.github/workflows/push_java_8.yml index 4c4308ec6..1da739aa3 100644 --- a/.github/workflows/push_java_8.yml +++ b/.github/workflows/push_java_8.yml @@ -29,6 +29,7 @@ jobs: needs: build runs-on: ubuntu-latest + if: github.repository_owner == '52North' steps: - uses: actions/checkout@v3 - name: Set up settings.xml for GitHub Packages From 3d597a27203b0fcb2142766d99c13510e6296af4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Nov 2022 04:00:55 +0000 Subject: [PATCH 440/456] Bump version.mockito from 4.8.1 to 4.9.0 Bumps `version.mockito` from 4.8.1 to 4.9.0. Updates `mockito-core` from 4.8.1 to 4.9.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.8.1...v4.9.0) Updates `mockito-junit-jupiter` from 4.8.1 to 4.9.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.8.1...v4.9.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 85cd0bb8a..1e9f9b64e 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ <version.jena>4.6.1</version.jena> <version.jackson>2.13.4</version.jackson> <version.junit>5.9.1</version.junit> - <version.mockito>4.8.1</version.mockito> + <version.mockito>4.9.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> <version.httpcore>4.4.15</version.httpcore> <version.elastic>7.17.6</version.elastic> From 41c695c84f4f7721e2c2d81169dcda4a32c2b7a6 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Tue, 15 Nov 2022 10:45:53 +0100 Subject: [PATCH 441/456] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa4675e91..b1fe4aa2f 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Shetland consists of classes for OGC models like [SensorML](http://www.opengeosp #### Bjørnøya (Bjornoya) [![Maven Central](https://img.shields.io/maven-central/v/org.n52.arctic-sea/bjornoya.svg)](https://search.maven.org/search?q=g:org.n52.arctic-sea%20and%20a:bjornoya*%20and%20p:jar) -Bjørnøya contains various classes for scheduling [![Quartz](http://www.quartz-scheduler.org/)] shared across Arctic Sea. +Bjørnøya contains various classes for scheduling using [![Quartz](http://www.quartz-scheduler.org/)] shared across Arctic Sea. This includes configurations to define the execution of jobs. ### Key Technologies From a699482ceefc3d911a04ff282440bab16b4d1fa6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 04:00:57 +0000 Subject: [PATCH 442/456] Bump version.slf4j from 2.0.3 to 2.0.4 Bumps `version.slf4j` from 2.0.3 to 2.0.4. Updates `slf4j-api` from 2.0.3 to 2.0.4 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.3...v_2.0.4) Updates `slf4j-simple` from 2.0.3 to 2.0.4 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.3...v_2.0.4) Updates `jcl-over-slf4j` from 2.0.3 to 2.0.4 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.3...v_2.0.4) Updates `slf4j-nop` from 2.0.3 to 2.0.4 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.3...v_2.0.4) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-nop dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1e9f9b64e..283a64424 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ <maven.build.timestamp.format>yyyy</maven.build.timestamp.format> <currentYear>${maven.build.timestamp}</currentYear> <version.spring>5.3.23</version.spring> - <version.slf4j>2.0.3</version.slf4j> + <version.slf4j>2.0.4</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> <version.jaxb>2.3.0</version.jaxb> From bc733504fadc99747fd7879eea9da1a4b1c17da5 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 18 Nov 2022 11:26:29 +0100 Subject: [PATCH 443/456] Fix encoding of Inspire observations for streaming --- .../feature/FeatureServiceConstantsTest.java | 15 +++++++ .../encode/InspireOmObservationEncoder.java | 13 +++--- .../InspireOmObservationXmlStreamWriter.java | 45 +++++++++++++++++++ 3 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InspireOmObservationXmlStreamWriter.java diff --git a/shetland/arcgis/src/test/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstantsTest.java b/shetland/arcgis/src/test/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstantsTest.java index 16341b651..e17e898ea 100644 --- a/shetland/arcgis/src/test/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstantsTest.java +++ b/shetland/arcgis/src/test/java/org/n52/shetland/arcgis/service/feature/FeatureServiceConstantsTest.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2015-2022 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.n52.shetland.arcgis.service.feature; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InspireOmObservationEncoder.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InspireOmObservationEncoder.java index db8693fe1..d0dccf66e 100644 --- a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InspireOmObservationEncoder.java +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InspireOmObservationEncoder.java @@ -15,7 +15,6 @@ */ package org.n52.svalbard.encode; -import java.io.IOException; import java.io.OutputStream; import java.util.Collections; import java.util.HashSet; @@ -48,8 +47,7 @@ * @since 1.0.0 * */ -public class InspireOmObservationEncoder - extends AbstractXmlEncoder<XmlObject, Object> +public class InspireOmObservationEncoder extends AbstractXmlEncoder<XmlObject, Object> implements ObservationEncoder<XmlObject, Object>, StreamingEncoder<XmlObject, Object> { private static final Set<EncoderKey> ENCODER_KEYS = @@ -87,10 +85,13 @@ public void encode(Object element, OutputStream outputStream, EncodingContext ct .with(XmlEncoderFlags.XML_OPTIONS, (Supplier<XmlOptions>) this::getXmlOptions), outputStream, (OmObservation) element).write(); } else { - // writeIndent(encodingValues.getIndent(), outputStream); - encode(element, ctx).save(outputStream, getXmlOptions()); + new InspireOmObservationXmlStreamWriter( + ctx.with(EncoderFlags.ENCODER_REPOSITORY, getEncoderRepository()) + .with(XmlEncoderFlags.XML_OPTIONS, (Supplier<XmlOptions>) this::getXmlOptions), + outputStream, (OmObservation) element, this).write(); + } - } catch (IOException | XMLStreamException e) { + } catch (XMLStreamException e) { throw new EncodingException("Error while writing element to stream!", e); } } diff --git a/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InspireOmObservationXmlStreamWriter.java b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InspireOmObservationXmlStreamWriter.java new file mode 100644 index 000000000..3d9377ef1 --- /dev/null +++ b/svalbard/xmlbeans/src/main/java/org/n52/svalbard/encode/InspireOmObservationXmlStreamWriter.java @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2015-2022 52°North Spatial Information Research GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.n52.svalbard.encode; + +import java.io.OutputStream; + +import javax.xml.stream.XMLStreamException; + +import org.n52.shetland.ogc.om.OmObservation; +import org.n52.svalbard.encode.exception.EncodingException; +import org.n52.svalbard.write.XmlStreamWriter; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + +@SuppressFBWarnings({"EI_EXPOSE_REP2"}) +public class InspireOmObservationXmlStreamWriter extends XmlStreamWriter<OmObservation> { + + + private InspireOmObservationEncoder encoder; + + public InspireOmObservationXmlStreamWriter(EncodingContext context, OutputStream outputStream, + OmObservation element, InspireOmObservationEncoder encoder) throws XMLStreamException { + super(context, outputStream, element); + this.encoder = encoder; + } + + @Override + public void write() throws XMLStreamException, EncodingException { + rawText(encoder.encode(getElement(), getContext()).xmlText(getXmlOptions().setSaveNoXmlDecl())); + } + +} From d530e40bfcb73b4e6dec06f7a1d0f9014f4842ed Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 18 Nov 2022 13:06:06 +0100 Subject: [PATCH 444/456] [maven-release-plugin] prepare release v10.0.1 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/arcgis/pom.xml | 2 +- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index f9e97babe..cc44b5a56 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 5df127afb..8a660312a 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 42c19a0e2..a335832f3 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index ea245978a..e58371f48 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 8d453a900..cec59b139 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 3c7ca980a..b395eb621 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 3532773df..13d3ce712 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 5ffb0dec5..f755efe1d 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 16be8f7eb..07dafbbe1 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 25a14e86a..357f614b4 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index e5ecd5018..bc47b650a 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 27756a8c8..4e28843d7 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 37e852ba3..1129554b8 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 283a64424..02ce9c5ca 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>HEAD</tag> + <tag>v10.0.1</tag> </scm> <issueManagement> diff --git a/shetland/arcgis/pom.xml b/shetland/arcgis/pom.xml index eabd92e24..0a3353800 100644 --- a/shetland/arcgis/pom.xml +++ b/shetland/arcgis/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>shetland-arcgis</artifactId> <name>52°North Shetland ArcGIS</name> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 55e15d628..6ed40cd3d 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index c069fda15..5423415c1 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index ad3603ad7..419108416 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 7df0d52a0..c7722ecb7 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 1514de109..518944823 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index e01751f3e..ec6eac9f5 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 0ee74939b..b61f2f952 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 57541ae05..258c548a9 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 45e07c0b4..726c77660 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index f1275b4e8..22436f9d3 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 1c6b4d57c..1d9535e4e 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.1</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From d208ce349b698c5e02942a44cc8cb28a6c811762 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 18 Nov 2022 13:06:13 +0100 Subject: [PATCH 445/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/arcgis/pom.xml | 2 +- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index cc44b5a56..f9e97babe 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 8a660312a..5df127afb 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index a335832f3..42c19a0e2 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index e58371f48..ea245978a 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index cec59b139..8d453a900 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index b395eb621..3c7ca980a 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 13d3ce712..3532773df 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index f755efe1d..5ffb0dec5 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 07dafbbe1..16be8f7eb 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 357f614b4..25a14e86a 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index bc47b650a..e5ecd5018 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 4e28843d7..27756a8c8 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 1129554b8..37e852ba3 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 02ce9c5ca..283a64424 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>v10.0.1</tag> + <tag>HEAD</tag> </scm> <issueManagement> diff --git a/shetland/arcgis/pom.xml b/shetland/arcgis/pom.xml index 0a3353800..eabd92e24 100644 --- a/shetland/arcgis/pom.xml +++ b/shetland/arcgis/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>shetland-arcgis</artifactId> <name>52°North Shetland ArcGIS</name> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 6ed40cd3d..55e15d628 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 5423415c1..c069fda15 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index 419108416..ad3603ad7 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index c7722ecb7..7df0d52a0 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 518944823..1514de109 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index ec6eac9f5..e01751f3e 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index b61f2f952..0ee74939b 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 258c548a9..57541ae05 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 726c77660..45e07c0b4 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 22436f9d3..f1275b4e8 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 1d9535e4e..1c6b4d57c 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.1</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From c43cc976d1a1b32ba52909a3579344f66169732c Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 18 Nov 2022 14:01:30 +0100 Subject: [PATCH 446/456] Bump jackson-bom from 2.13.4 to 2.14.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 283a64424..7e3ae6302 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <version.spotbugs>4.7.2</version.spotbugs> <version.jakarta-annotation-api>2.1.1</version.jakarta-annotation-api> <version.jena>4.6.1</version.jena> - <version.jackson>2.13.4</version.jackson> + <version.jackson>2.14.0</version.jackson> <version.junit>5.9.1</version.junit> <version.mockito>4.9.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> From e23fab18f4f80537325037536eb5dea85bc6f8e2 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 18 Nov 2022 14:01:58 +0100 Subject: [PATCH 447/456] Bump version.spring from 5.3.23 to 5.3.24 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e3ae6302..95cd70b50 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ <timestamp>${maven.build.timestamp}</timestamp> <maven.build.timestamp.format>yyyy</maven.build.timestamp.format> <currentYear>${maven.build.timestamp}</currentYear> - <version.spring>5.3.23</version.spring> + <version.spring>5.3.24</version.spring> <version.slf4j>2.0.4</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> From f072dd6b4b05e88fad9c3b53f360cf239467fd10 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 18 Nov 2022 14:11:21 +0100 Subject: [PATCH 448/456] [maven-release-plugin] prepare release v10.0.2 --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/arcgis/pom.xml | 2 +- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index f9e97babe..f61e3d65e 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 5df127afb..3b49d86ad 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index 42c19a0e2..f8b8c2a1f 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index ea245978a..2021efe7d 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 8d453a900..5ec530b91 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index 3c7ca980a..b6356fcc2 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index 3532773df..d1b72520c 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index 5ffb0dec5..b6b78002c 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 16be8f7eb..6e647fa04 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index 25a14e86a..c63bae7c8 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index e5ecd5018..483cef849 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index 27756a8c8..ee5d0ccc9 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 37e852ba3..83e90a612 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 95cd70b50..172c2f875 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>HEAD</tag> + <tag>v10.0.2</tag> </scm> <issueManagement> diff --git a/shetland/arcgis/pom.xml b/shetland/arcgis/pom.xml index eabd92e24..57f36cc89 100644 --- a/shetland/arcgis/pom.xml +++ b/shetland/arcgis/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>shetland-arcgis</artifactId> <name>52°North Shetland ArcGIS</name> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 55e15d628..30ed87615 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index c069fda15..5a62f4d3a 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index ad3603ad7..abc9648fc 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 7df0d52a0..7542dd318 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 1514de109..93a5b2dea 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index e01751f3e..821ea2a3b 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 0ee74939b..5cd63f268 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index 57541ae05..ea6077da8 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index 45e07c0b4..d5f4ed694 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index f1275b4e8..20d5517dd 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index 1c6b4d57c..b1203fc7e 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.1.0-SNAPSHOT</version> + <version>10.0.2</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 2d2912729a01d4c87c2cc6b60c4aaf386ae3c2b8 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Fri, 18 Nov 2022 14:11:29 +0100 Subject: [PATCH 449/456] [maven-release-plugin] prepare for next development iteration --- bjornoya/pom.xml | 2 +- faroe/annotations/pom.xml | 2 +- faroe/core/pom.xml | 2 +- faroe/json/pom.xml | 2 +- faroe/pom.xml | 2 +- faroe/utils/pom.xml | 2 +- iceland/core/pom.xml | 2 +- iceland/pom.xml | 2 +- iceland/statistics/core/pom.xml | 2 +- iceland/statistics/generator/pom.xml | 2 +- iceland/statistics/geolocation/pom.xml | 2 +- iceland/statistics/kibana/pom.xml | 2 +- janmayen/pom.xml | 2 +- pom.xml | 4 ++-- shetland/arcgis/pom.xml | 2 +- shetland/core/pom.xml | 2 +- shetland/pom.xml | 2 +- shetland/rdf/pom.xml | 2 +- svalbard/core/pom.xml | 2 +- svalbard/exi/pom.xml | 2 +- svalbard/json-common/pom.xml | 2 +- svalbard/json/pom.xml | 2 +- svalbard/odata/pom.xml | 2 +- svalbard/pom.xml | 2 +- svalbard/xmlbeans/pom.xml | 2 +- svalbard/xmlstream/pom.xml | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/bjornoya/pom.xml b/bjornoya/pom.xml index f61e3d65e..f9e97babe 100644 --- a/bjornoya/pom.xml +++ b/bjornoya/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>bjornoya</artifactId> diff --git a/faroe/annotations/pom.xml b/faroe/annotations/pom.xml index 3b49d86ad..5df127afb 100644 --- a/faroe/annotations/pom.xml +++ b/faroe/annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe-annotations</artifactId> <name>52°North Faroe Annotations</name> diff --git a/faroe/core/pom.xml b/faroe/core/pom.xml index f8b8c2a1f..42c19a0e2 100644 --- a/faroe/core/pom.xml +++ b/faroe/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe</artifactId> <name>52°North Faroe</name> diff --git a/faroe/json/pom.xml b/faroe/json/pom.xml index 2021efe7d..ea245978a 100644 --- a/faroe/json/pom.xml +++ b/faroe/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe-json</artifactId> <packaging>jar</packaging> diff --git a/faroe/pom.xml b/faroe/pom.xml index 5ec530b91..8d453a900 100644 --- a/faroe/pom.xml +++ b/faroe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe-parent</artifactId> <packaging>pom</packaging> diff --git a/faroe/utils/pom.xml b/faroe/utils/pom.xml index b6356fcc2..3c7ca980a 100644 --- a/faroe/utils/pom.xml +++ b/faroe/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>faroe-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>faroe-utils</artifactId> <name>52°North Faroe Utilities</name> diff --git a/iceland/core/pom.xml b/iceland/core/pom.xml index d1b72520c..3532773df 100644 --- a/iceland/core/pom.xml +++ b/iceland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>iceland</artifactId> diff --git a/iceland/pom.xml b/iceland/pom.xml index b6b78002c..5ffb0dec5 100644 --- a/iceland/pom.xml +++ b/iceland/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>iceland-parent</artifactId> diff --git a/iceland/statistics/core/pom.xml b/iceland/statistics/core/pom.xml index 6e647fa04..16be8f7eb 100644 --- a/iceland/statistics/core/pom.xml +++ b/iceland/statistics/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/generator/pom.xml b/iceland/statistics/generator/pom.xml index c63bae7c8..25a14e86a 100644 --- a/iceland/statistics/generator/pom.xml +++ b/iceland/statistics/generator/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/geolocation/pom.xml b/iceland/statistics/geolocation/pom.xml index 483cef849..e5ecd5018 100644 --- a/iceland/statistics/geolocation/pom.xml +++ b/iceland/statistics/geolocation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/iceland/statistics/kibana/pom.xml b/iceland/statistics/kibana/pom.xml index ee5d0ccc9..27756a8c8 100644 --- a/iceland/statistics/kibana/pom.xml +++ b/iceland/statistics/kibana/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>iceland-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/janmayen/pom.xml b/janmayen/pom.xml index 83e90a612..37e852ba3 100644 --- a/janmayen/pom.xml +++ b/janmayen/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>janmayen</artifactId> diff --git a/pom.xml b/pom.xml index 172c2f875..95cd70b50 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>52°North Arctic Sea</name> @@ -87,7 +87,7 @@ <url>https://github.com/52North/arctic-sea</url> <connection>scm:git:https://github.com/52North/arctic-sea.git</connection> <developerConnection>scm:git:https://github.com/52North/arctic-sea.git</developerConnection> - <tag>v10.0.2</tag> + <tag>HEAD</tag> </scm> <issueManagement> diff --git a/shetland/arcgis/pom.xml b/shetland/arcgis/pom.xml index 57f36cc89..eabd92e24 100644 --- a/shetland/arcgis/pom.xml +++ b/shetland/arcgis/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>shetland-arcgis</artifactId> <name>52°North Shetland ArcGIS</name> diff --git a/shetland/core/pom.xml b/shetland/core/pom.xml index 30ed87615..55e15d628 100644 --- a/shetland/core/pom.xml +++ b/shetland/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>shetland</artifactId> diff --git a/shetland/pom.xml b/shetland/pom.xml index 5a62f4d3a..c069fda15 100644 --- a/shetland/pom.xml +++ b/shetland/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>shetland-parent</artifactId> <packaging>pom</packaging> diff --git a/shetland/rdf/pom.xml b/shetland/rdf/pom.xml index abc9648fc..ad3603ad7 100644 --- a/shetland/rdf/pom.xml +++ b/shetland/rdf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>shetland-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>shetland-rdf</artifactId> <name>52°North Shetland RDF</name> diff --git a/svalbard/core/pom.xml b/svalbard/core/pom.xml index 7542dd318..7df0d52a0 100644 --- a/svalbard/core/pom.xml +++ b/svalbard/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard</artifactId> <name>52°North Svalbard Core</name> diff --git a/svalbard/exi/pom.xml b/svalbard/exi/pom.xml index 93a5b2dea..1514de109 100644 --- a/svalbard/exi/pom.xml +++ b/svalbard/exi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-exi</artifactId> <name>52°North Svalbard Exi</name> diff --git a/svalbard/json-common/pom.xml b/svalbard/json-common/pom.xml index 821ea2a3b..e01751f3e 100644 --- a/svalbard/json-common/pom.xml +++ b/svalbard/json-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json-common</artifactId> <name>52°North Svalbard JSON Common</name> diff --git a/svalbard/json/pom.xml b/svalbard/json/pom.xml index 5cd63f268..0ee74939b 100644 --- a/svalbard/json/pom.xml +++ b/svalbard/json/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-json</artifactId> <name>52°North Svalbard JSON encoding</name> diff --git a/svalbard/odata/pom.xml b/svalbard/odata/pom.xml index ea6077da8..57541ae05 100644 --- a/svalbard/odata/pom.xml +++ b/svalbard/odata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-odata</artifactId> <name>52°North Svalbard OData</name> diff --git a/svalbard/pom.xml b/svalbard/pom.xml index d5f4ed694..45e07c0b4 100644 --- a/svalbard/pom.xml +++ b/svalbard/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>arctic-sea</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-parent</artifactId> <packaging>pom</packaging> diff --git a/svalbard/xmlbeans/pom.xml b/svalbard/xmlbeans/pom.xml index 20d5517dd..f1275b4e8 100644 --- a/svalbard/xmlbeans/pom.xml +++ b/svalbard/xmlbeans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlbeans</artifactId> <name>52°North Svalbard XmlBeans</name> diff --git a/svalbard/xmlstream/pom.xml b/svalbard/xmlstream/pom.xml index b1203fc7e..1c6b4d57c 100644 --- a/svalbard/xmlstream/pom.xml +++ b/svalbard/xmlstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.n52.arctic-sea</groupId> <artifactId>svalbard-parent</artifactId> - <version>10.0.2</version> + <version>10.1.0-SNAPSHOT</version> </parent> <artifactId>svalbard-xmlstream</artifactId> <name>52°North Svalbard XML Stream</name> From 9b8b6a0832cb5671f0f3a45691e0d6e58fa23c53 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 24 Nov 2022 08:13:41 +0100 Subject: [PATCH 450/456] Add ignore spring >= 6.x and xmlbeans <= 4.x from dependabot --- .github/dependabot.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fc7617329..679a119eb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,26 +1,33 @@ version: 2 updates: -- package-ecosystem: maven +- package-ecosystem: "maven" directory: "/" schedule: - interval: daily + interval: "daily" time: "04:00" open-pull-requests-limit: 10 ignore: - - dependency-name: xml-apis:xml-apis - versions: - - ">= 2.a, < 3" -- package-ecosystem: maven + - dependency-name: "xml-apis:xml-apis" + versions: ">= 2.a, < 3" + - dependency-name: "org.apache.xmlbeans:xmlbeans" + versions: ">= 4.x" + - dependency-name: "org.springframework:*" + versions: ">= 6.x" +- package-ecosystem: "maven" directory: "/" schedule: - interval: daily + interval: "daily" time: "04:15" open-pull-requests-limit: 10 target-branch: "maintenance/9.x" ignore: - - dependency-name: xml-apis:xml-apis + - dependency-name: "xml-apis:xml-apis" versions: - ">= 2.a, < 3" + - dependency-name: "org.apache.xmlbeans:xmlbeans" + versions: ">= 4.x" + - dependency-name: "org.springframework:*" + versions: ">= 6.x" - package-ecosystem: "github-actions" directory: "/" schedule: From c416501315884631baae4d6cf1d9f7951e06a359 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Thu, 24 Nov 2022 14:16:41 +0100 Subject: [PATCH 451/456] make all method static --- .github/dependabot.yml | 3 +-- .../n52/svalbard/odata/core/QueryOptionsFactory.java | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 679a119eb..d307f8831 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -22,8 +22,7 @@ updates: target-branch: "maintenance/9.x" ignore: - dependency-name: "xml-apis:xml-apis" - versions: - - ">= 2.a, < 3" + versions: ">= 2.a, < 3" - dependency-name: "org.apache.xmlbeans:xmlbeans" versions: ">= 4.x" - dependency-name: "org.springframework:*" diff --git a/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java b/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java index 616b3c841..c2a4f221e 100644 --- a/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java +++ b/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java @@ -34,33 +34,33 @@ @SuppressWarnings("unchecked") public class QueryOptionsFactory { - public STAQueryOptionsLexer createLexer(String query) { + public static STAQueryOptionsLexer createLexer(String query) { STAQueryOptionsLexer staQueryOptionsLexer = new STAQueryOptionsLexer(CharStreams.fromString(query.trim())); staQueryOptionsLexer.removeErrorListeners(); staQueryOptionsLexer.addErrorListener(new CustomErrorListener(staQueryOptionsLexer.getVocabulary())); return staQueryOptionsLexer; } - public STAQueryOptionsGrammar createGrammar(String query) { + public static STAQueryOptionsGrammar createGrammar(String query) { return createGrammar(createLexer(query)); } - private STAQueryOptionsGrammar createGrammar(STAQueryOptionsLexer lexer) { + private static STAQueryOptionsGrammar createGrammar(STAQueryOptionsLexer lexer) { STAQueryOptionsGrammar parser = new STAQueryOptionsGrammar(new CommonTokenStream(lexer)); parser.removeErrorListeners(); parser.addErrorListener(new CustomErrorListener(lexer.getVocabulary())); return parser; } - public QueryOptions createQueryOptions(String query) { + public static QueryOptions createQueryOptions(String query) { return createGrammar(query).queryOptions().<QueryOptions>accept(new STAQueryOptionVisitor()); } - public QueryOptions createQueryOptions(Set<FilterClause> filters) { + public static QueryOptions createQueryOptions(Set<FilterClause> filters) { return new QueryOptions("", filters); } - public QueryOptions createDummy() { + public static QueryOptions createDummy() { return new QueryOptions("", null); } From 3dc48b49122da36bc6519af46e60299b7853aed2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Nov 2022 04:01:06 +0000 Subject: [PATCH 452/456] Bump version.slf4j from 2.0.4 to 2.0.5 Bumps `version.slf4j` from 2.0.4 to 2.0.5. Updates `slf4j-api` from 2.0.4 to 2.0.5 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.4...v_2.0.5) Updates `slf4j-simple` from 2.0.4 to 2.0.5 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.4...v_2.0.5) Updates `jcl-over-slf4j` from 2.0.4 to 2.0.5 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.4...v_2.0.5) Updates `slf4j-nop` from 2.0.4 to 2.0.5 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.4...v_2.0.5) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-nop dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95cd70b50..1300e90f3 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ <maven.build.timestamp.format>yyyy</maven.build.timestamp.format> <currentYear>${maven.build.timestamp}</currentYear> <version.spring>5.3.24</version.spring> - <version.slf4j>2.0.4</version.slf4j> + <version.slf4j>2.0.5</version.slf4j> <version.xmlbeans>3.1.0</version.xmlbeans> <version.exificient>1.0.4</version.exificient> <version.jaxb>2.3.0</version.jaxb> From e53d4fe5bdc2d4b00547c38dd6339071b91c2493 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 04:00:37 +0000 Subject: [PATCH 453/456] Bump version.httpcore from 4.4.15 to 4.4.16 Bumps `version.httpcore` from 4.4.15 to 4.4.16. Updates `httpcore` from 4.4.15 to 4.4.16 Updates `httpcore-nio` from 4.4.15 to 4.4.16 --- updated-dependencies: - dependency-name: org.apache.httpcomponents:httpcore dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.httpcomponents:httpcore-nio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1300e90f3..c2e4b4816 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ <version.junit>5.9.1</version.junit> <version.mockito>4.9.0</version.mockito> <version.hamcrest>2.2</version.hamcrest> - <version.httpcore>4.4.15</version.httpcore> + <version.httpcore>4.4.16</version.httpcore> <version.elastic>7.17.6</version.elastic> <version.antlr4>4.11.1</version.antlr4> <version.maven-javadoc-plugin>3.4.1</version.maven-javadoc-plugin> From dadb396b8a6517a61a3e436722557b46a10a0bea Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 30 Nov 2022 08:13:48 +0100 Subject: [PATCH 454/456] add private constructor --- .../java/org/n52/svalbard/odata/core/QueryOptionsFactory.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java b/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java index c2a4f221e..f0b9b272c 100644 --- a/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java +++ b/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java @@ -33,6 +33,10 @@ */ @SuppressWarnings("unchecked") public class QueryOptionsFactory { + + private QueryOptionsFactory() { + + } public static STAQueryOptionsLexer createLexer(String query) { STAQueryOptionsLexer staQueryOptionsLexer = new STAQueryOptionsLexer(CharStreams.fromString(query.trim())); From 0416b300ce459dafd4dc52864f575236453a81cf Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 30 Nov 2022 08:57:06 +0100 Subject: [PATCH 455/456] fix build --- .../java/org/n52/svalbard/odata/core/QueryOptionsFactory.java | 4 ++-- .../java/org/n52/svalbard/odata/core/QueryOptionTests.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java b/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java index f0b9b272c..fa10a49a3 100644 --- a/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java +++ b/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java @@ -32,8 +32,8 @@ * @author <a href="mailto:j.speckamp@52north.org">Jan Speckamp</a> */ @SuppressWarnings("unchecked") -public class QueryOptionsFactory { - +public final class QueryOptionsFactory { + private QueryOptionsFactory() { } diff --git a/svalbard/odata/src/test/java/org/n52/svalbard/odata/core/QueryOptionTests.java b/svalbard/odata/src/test/java/org/n52/svalbard/odata/core/QueryOptionTests.java index 2092561d6..3446a3228 100644 --- a/svalbard/odata/src/test/java/org/n52/svalbard/odata/core/QueryOptionTests.java +++ b/svalbard/odata/src/test/java/org/n52/svalbard/odata/core/QueryOptionTests.java @@ -27,6 +27,6 @@ public abstract class QueryOptionTests { protected STAQueryOptionsGrammar parser; protected void init(String query) { - parser = new QueryOptionsFactory().createGrammar(query); + parser = QueryOptionsFactory.createGrammar(query); } } From 690093878aff31deb743a00aa1a682854ab34fc3 Mon Sep 17 00:00:00 2001 From: CarstenHollmann <c.hollmann@52north.org> Date: Wed, 30 Nov 2022 15:11:30 +0100 Subject: [PATCH 456/456] change createDummy to createEmpty --- .../java/org/n52/svalbard/odata/core/QueryOptionsFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java b/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java index fa10a49a3..2d4621401 100644 --- a/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java +++ b/svalbard/odata/src/main/java/org/n52/svalbard/odata/core/QueryOptionsFactory.java @@ -64,7 +64,7 @@ public static QueryOptions createQueryOptions(Set<FilterClause> filters) { return new QueryOptions("", filters); } - public static QueryOptions createDummy() { + public static QueryOptions createEmpty() { return new QueryOptions("", null); }