Skip to content

Commit

Permalink
fix: add combined schema logic for readonly filter in root key extrac…
Browse files Browse the repository at this point in the history 
…tion
  • Loading branch information
@dominikhorn93
dominikhorn93 committed Aug 24, 2022
1 parent 0720150 commit 33631d4
Show file tree
Hide file tree
Showing 34 changed files with 42 additions and 35 deletions.
2 changes: 1 addition & 1 deletion digiwf-connector/digiwf-camunda-connector-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-connector</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-connector/digiwf-camunda-connector-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-connector</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-connector/digiwf-camunda-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-connector</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-connector/digiwf-connector-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>digiwf-connector</artifactId>
<groupId>io.muenchendigital.digiwf</groupId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion digiwf-connector/digiwf-connector-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-connector</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion digiwf-connector/digiwf-connector-starter-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-connector</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-connector/digiwf-connector-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-connector</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-core</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-engine/digiwf-engine-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-engine</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-engine/digiwf-engine-task-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-engine</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-engine/digiwf-engine-task/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-engine</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion digiwf-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-core</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-json-serialization</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
9 changes: 8 additions & 1 deletion ...main/java/io/muenchendigital/digiwf/json/serialization/serializer/JsonSerializerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ public Map<String, Object> 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<String> extractRootKeys(final Schema schema, final Boolean filterReadOnly) {
if (schema instanceof ObjectSchema) {
Expand All @@ -99,7 +106,7 @@ public Set<String> 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());
}
Expand Down
2 changes: 1 addition & 1 deletion digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-json-serialization</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-json-serialization</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-libs/digiwf-json-serialization/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-libs</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>digiwf-spring-cloudstream-utils</artifactId>
<groupId>io.muenchendigital.digiwf</groupId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<artifactId>digiwf-spring-cloudstream-utils</artifactId>
<groupId>io.muenchendigital.digiwf</groupId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>digiwf-spring-cloudstream-utils</artifactId>
<groupId>io.muenchendigital.digiwf</groupId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>digiwf-spring-cloudstream-utils</artifactId>
<packaging>pom</packaging>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
<name>digiwf-spring-cloudstream-utils</name>
<description>Cloudstream Utils used by DigiWF</description>

<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-libs</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-libs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-core</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-process/digiwf-process-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>digiwf-process</artifactId>
<groupId>io.muenchendigital.digiwf</groupId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-process/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>digiwf-core</artifactId>
<groupId>io.muenchendigital.digiwf</groupId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-schema-registry/digiwf-schema-registry-client-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-schema-registry</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-schema-registry/digiwf-schema-registry-client-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-schema-registry</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-schema-registry/digiwf-schema-registry-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-schema-registry</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-schema-registry/digiwf-schema-registry-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-schema-registry</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-schema-registry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-core</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-task/digiwf-taskana-connector/digiwf-taskana-connector-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-taskana-connector</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-task/digiwf-taskana-connector/digiwf-taskana-connector-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>digiwf-taskana-connector</artifactId>
<groupId>io.muenchendigital.digiwf</groupId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-task/digiwf-taskana-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-task</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-task/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-core</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.muenchendigital.digiwf</groupId>
<artifactId>digiwf-core</artifactId>
<version>0.10.1-SNAPSHOT</version>
<version>0.10.2-SNAPSHOT</version>
<name>digiwf-core</name>
<packaging>pom</packaging>
<description>DigiWF Core Services</description>
Expand Down

0 comments on commit 33631d4

Please sign in to comment.