diff --git a/digiwf-connector/digiwf-camunda-connector-service/pom.xml b/digiwf-connector/digiwf-camunda-connector-service/pom.xml index 3b798cfaca..52685c5653 100644 --- a/digiwf-connector/digiwf-camunda-connector-service/pom.xml +++ b/digiwf-connector/digiwf-camunda-connector-service/pom.xml @@ -13,7 +13,7 @@ io.muenchendigital.digiwf digiwf-connector - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-connector/digiwf-camunda-connector-starter/pom.xml b/digiwf-connector/digiwf-camunda-connector-starter/pom.xml index 8fc05c9b0c..01243fa507 100644 --- a/digiwf-connector/digiwf-camunda-connector-starter/pom.xml +++ b/digiwf-connector/digiwf-camunda-connector-starter/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-connector - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-connector/digiwf-camunda-connector/pom.xml b/digiwf-connector/digiwf-camunda-connector/pom.xml index 6f4dd369d0..0e97a46949 100644 --- a/digiwf-connector/digiwf-camunda-connector/pom.xml +++ b/digiwf-connector/digiwf-camunda-connector/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-connector - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-connector/digiwf-connector-api/pom.xml b/digiwf-connector/digiwf-connector-api/pom.xml index 7e9d15fdf9..d056edabf6 100644 --- a/digiwf-connector/digiwf-connector-api/pom.xml +++ b/digiwf-connector/digiwf-connector-api/pom.xml @@ -5,7 +5,7 @@ digiwf-connector io.muenchendigital.digiwf - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT 4.0.0 diff --git a/digiwf-connector/digiwf-connector-core/pom.xml b/digiwf-connector/digiwf-connector-core/pom.xml index df94df525d..4cf64a8254 100644 --- a/digiwf-connector/digiwf-connector-core/pom.xml +++ b/digiwf-connector/digiwf-connector-core/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-connector - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-connector/digiwf-connector-starter-rest/pom.xml b/digiwf-connector/digiwf-connector-starter-rest/pom.xml index 5f4c363deb..57632feba7 100644 --- a/digiwf-connector/digiwf-connector-starter-rest/pom.xml +++ b/digiwf-connector/digiwf-connector-starter-rest/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-connector - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-connector/digiwf-connector-starter/pom.xml b/digiwf-connector/digiwf-connector-starter/pom.xml index a88b176a9d..12cb3919c8 100644 --- a/digiwf-connector/digiwf-connector-starter/pom.xml +++ b/digiwf-connector/digiwf-connector-starter/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-connector - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-connector/pom.xml b/digiwf-connector/pom.xml index e6fa080fb8..45b2bcd80b 100644 --- a/digiwf-connector/pom.xml +++ b/digiwf-connector/pom.xml @@ -11,7 +11,7 @@ io.muenchendigital.digiwf digiwf-core - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-engine/digiwf-engine-service/pom.xml b/digiwf-engine/digiwf-engine-service/pom.xml index da16335ebe..23f814cb79 100644 --- a/digiwf-engine/digiwf-engine-service/pom.xml +++ b/digiwf-engine/digiwf-engine-service/pom.xml @@ -13,7 +13,7 @@ io.muenchendigital.digiwf digiwf-engine - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-engine/digiwf-engine-task-starter/pom.xml b/digiwf-engine/digiwf-engine-task-starter/pom.xml index 6efa79ee40..c5e687ec23 100644 --- a/digiwf-engine/digiwf-engine-task-starter/pom.xml +++ b/digiwf-engine/digiwf-engine-task-starter/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-engine - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-engine/digiwf-engine-task/pom.xml b/digiwf-engine/digiwf-engine-task/pom.xml index c4dae9497b..27625a01a2 100644 --- a/digiwf-engine/digiwf-engine-task/pom.xml +++ b/digiwf-engine/digiwf-engine-task/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-engine - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-engine/pom.xml b/digiwf-engine/pom.xml index 002fbab655..53e1a5f450 100644 --- a/digiwf-engine/pom.xml +++ b/digiwf-engine/pom.xml @@ -11,7 +11,7 @@ io.muenchendigital.digiwf digiwf-core - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml index ab84ad74f8..7018eb9b74 100644 --- a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml +++ b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-json-serialization - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/src/main/java/io/muenchendigital/digiwf/json/serialization/serializer/JsonSerializerImpl.java b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/src/main/java/io/muenchendigital/digiwf/json/serialization/serializer/JsonSerializerImpl.java index d63de42696..85bc90f4ef 100644 --- a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/src/main/java/io/muenchendigital/digiwf/json/serialization/serializer/JsonSerializerImpl.java +++ b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/src/main/java/io/muenchendigital/digiwf/json/serialization/serializer/JsonSerializerImpl.java @@ -78,6 +78,13 @@ public Map merge(final JSONObject source, final JSONObject targe return this.deepMerge(source, target).toMap(); } + /** + * Returns all root keys that are in the json schema. + * + * @param schema + * @param filterReadOnly + * @return + */ @Override public Set extractRootKeys(final Schema schema, final Boolean filterReadOnly) { if (schema instanceof ObjectSchema) { @@ -99,7 +106,7 @@ public Set extractRootKeys(final Schema schema, final Boolean filterRead if (schema instanceof CombinedSchema) { final CombinedSchema combinedSchema = (CombinedSchema) schema; return combinedSchema.getSubschemas().stream() - .map(this::extractRootKeys) + .map(obj -> this.extractRootKeys(obj, filterReadOnly)) .flatMap(Set::stream) .collect(Collectors.toSet()); } diff --git a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml index bc2ba62288..a27c878236 100644 --- a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml +++ b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-json-serialization - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml b/digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml index 524f900e1c..246d2d897d 100644 --- a/digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml +++ b/digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml @@ -9,7 +9,7 @@ io.muenchendigital.digiwf digiwf-json-serialization - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-libs/digiwf-json-serialization/pom.xml b/digiwf-libs/digiwf-json-serialization/pom.xml index 421363aaf3..e664903d64 100644 --- a/digiwf-libs/digiwf-json-serialization/pom.xml +++ b/digiwf-libs/digiwf-json-serialization/pom.xml @@ -11,7 +11,7 @@ io.muenchendigital.digiwf digiwf-libs - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml b/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml index 07d29b26d0..3907744b10 100644 --- a/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml +++ b/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml @@ -8,7 +8,7 @@ digiwf-spring-cloudstream-utils io.muenchendigital.digiwf - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml b/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml index c713cd9058..2742be7c69 100644 --- a/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml +++ b/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml @@ -10,7 +10,7 @@ digiwf-spring-cloudstream-utils io.muenchendigital.digiwf - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml b/digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml index 0937400043..46a3291f70 100644 --- a/digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml +++ b/digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml @@ -9,7 +9,7 @@ digiwf-spring-cloudstream-utils io.muenchendigital.digiwf - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml b/digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml index a0c348af04..1ea92a16fc 100644 --- a/digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml +++ b/digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml @@ -5,14 +5,14 @@ 4.0.0 digiwf-spring-cloudstream-utils pom - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT digiwf-spring-cloudstream-utils Cloudstream Utils used by DigiWF io.muenchendigital.digiwf digiwf-libs - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-libs/pom.xml b/digiwf-libs/pom.xml index 41bd159838..9251282439 100644 --- a/digiwf-libs/pom.xml +++ b/digiwf-libs/pom.xml @@ -11,7 +11,7 @@ io.muenchendigital.digiwf digiwf-core - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-process/digiwf-process-api/pom.xml b/digiwf-process/digiwf-process-api/pom.xml index 2ef1ec7d07..67685c0d0c 100644 --- a/digiwf-process/digiwf-process-api/pom.xml +++ b/digiwf-process/digiwf-process-api/pom.xml @@ -8,7 +8,7 @@ digiwf-process io.muenchendigital.digiwf - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-process/pom.xml b/digiwf-process/pom.xml index 72b7682a6d..21fa99dbfa 100644 --- a/digiwf-process/pom.xml +++ b/digiwf-process/pom.xml @@ -11,7 +11,7 @@ digiwf-core io.muenchendigital.digiwf - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-schema-registry/digiwf-schema-registry-client-example/pom.xml b/digiwf-schema-registry/digiwf-schema-registry-client-example/pom.xml index 2961de8912..e03f66d219 100644 --- a/digiwf-schema-registry/digiwf-schema-registry-client-example/pom.xml +++ b/digiwf-schema-registry/digiwf-schema-registry-client-example/pom.xml @@ -13,7 +13,7 @@ io.muenchendigital.digiwf digiwf-schema-registry - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-schema-registry/digiwf-schema-registry-client-starter/pom.xml b/digiwf-schema-registry/digiwf-schema-registry-client-starter/pom.xml index c2a8b137c1..704074cade 100644 --- a/digiwf-schema-registry/digiwf-schema-registry-client-starter/pom.xml +++ b/digiwf-schema-registry/digiwf-schema-registry-client-starter/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-schema-registry - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-schema-registry/digiwf-schema-registry-client/pom.xml b/digiwf-schema-registry/digiwf-schema-registry-client/pom.xml index 8d77db622e..3ba920a1dd 100644 --- a/digiwf-schema-registry/digiwf-schema-registry-client/pom.xml +++ b/digiwf-schema-registry/digiwf-schema-registry-client/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-schema-registry - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-schema-registry/digiwf-schema-registry-service/pom.xml b/digiwf-schema-registry/digiwf-schema-registry-service/pom.xml index 089abb2836..915c63ba7e 100644 --- a/digiwf-schema-registry/digiwf-schema-registry-service/pom.xml +++ b/digiwf-schema-registry/digiwf-schema-registry-service/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-schema-registry - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-schema-registry/pom.xml b/digiwf-schema-registry/pom.xml index e32a64f14d..8e33e6e3ac 100644 --- a/digiwf-schema-registry/pom.xml +++ b/digiwf-schema-registry/pom.xml @@ -11,7 +11,7 @@ io.muenchendigital.digiwf digiwf-core - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-task/digiwf-taskana-connector/digiwf-taskana-connector-core/pom.xml b/digiwf-task/digiwf-taskana-connector/digiwf-taskana-connector-core/pom.xml index 40cb004cc8..730d6ff75b 100644 --- a/digiwf-task/digiwf-taskana-connector/digiwf-taskana-connector-core/pom.xml +++ b/digiwf-task/digiwf-taskana-connector/digiwf-taskana-connector-core/pom.xml @@ -9,7 +9,7 @@ io.muenchendigital.digiwf digiwf-taskana-connector - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-task/digiwf-taskana-connector/digiwf-taskana-connector-starter/pom.xml b/digiwf-task/digiwf-taskana-connector/digiwf-taskana-connector-starter/pom.xml index 86b751e5b9..e523a44923 100644 --- a/digiwf-task/digiwf-taskana-connector/digiwf-taskana-connector-starter/pom.xml +++ b/digiwf-task/digiwf-taskana-connector/digiwf-taskana-connector-starter/pom.xml @@ -8,7 +8,7 @@ digiwf-taskana-connector io.muenchendigital.digiwf - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-task/digiwf-taskana-connector/pom.xml b/digiwf-task/digiwf-taskana-connector/pom.xml index 3cbe162474..b0267949e0 100644 --- a/digiwf-task/digiwf-taskana-connector/pom.xml +++ b/digiwf-task/digiwf-taskana-connector/pom.xml @@ -10,7 +10,7 @@ io.muenchendigital.digiwf digiwf-task - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/digiwf-task/pom.xml b/digiwf-task/pom.xml index 47f5bcdd03..2b7a3f6fad 100644 --- a/digiwf-task/pom.xml +++ b/digiwf-task/pom.xml @@ -11,7 +11,7 @@ io.muenchendigital.digiwf digiwf-core - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index 566cc93af5..ea83ee7b28 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 io.muenchendigital.digiwf digiwf-core - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT digiwf-core pom DigiWF Core Services