Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • osdu/platform/system/indexer-service
  • schundu/indexer-service
2 results
Show changes
Commits on Source (9)
Hide whitespace changes
Inline Side-by-side
Showing
with 339 additions and 14 deletions
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
View file @ 9beaecc9
...@@ -56,8 +56,10 @@ public class PropertiesProcessor { ...@@ -56,8 +56,10 @@ public class PropertiesProcessor {
public Stream<Map<String, Object>> processItem(AllOfItem allOfItem) { public Stream<Map<String, Object>> processItem(AllOfItem allOfItem) {
Preconditions.checkNotNull(allOfItem, "allOfItem cannot be null"); Preconditions.checkNotNull(allOfItem, "allOfItem cannot be null");
if (Objects.nonNull(allOfItem.getAllOf())) { Stream<Map<String, Object>> ofItems = processOfItems(allOfItem.getAllOf(), allOfItem.getAnyOf(), allOfItem.getOneOf());
return allOfItem.getAllOf().stream().flatMap(this::processItem);
if (Objects.nonNull(ofItems)) {
return ofItems;
} }
String ref = allOfItem.getRef(); String ref = allOfItem.getRef();
...@@ -89,13 +91,34 @@ public class PropertiesProcessor { ...@@ -89,13 +91,34 @@ public class PropertiesProcessor {
new AppException(HttpStatus.SC_NOT_FOUND, "Failed to find definition:" + definitionSubRef, new AppException(HttpStatus.SC_NOT_FOUND, "Failed to find definition:" + definitionSubRef,
"Unknown definition:" + definitionSubRef)); "Unknown definition:" + definitionSubRef));
if (Objects.nonNull(definition.getAllOf())) { Stream<Map<String, Object>> ofItems =
return definition.getAllOf().stream().flatMap(this::processItem); processOfItems(definition.getAllOf(), definition.getAnyOf(), definition.getOneOf());
if (Objects.nonNull(ofItems)) {
return ofItems;
} }
return processProperties(definition.getProperties()); return processProperties(definition.getProperties());
} }
private Stream<Map<String, Object>> processOfItems(List<AllOfItem> allOf, List<AllOfItem> anyOf, List<AllOfItem> oneOf) {
Stream<Map<String, Object>> ofItems = null;
if (Objects.nonNull(allOf)) {
ofItems = allOf.stream().flatMap(this::processItem);
}
if (Objects.nonNull(anyOf)) {
ofItems = Stream.concat(Optional.ofNullable(ofItems).orElseGet(Stream::empty), anyOf.stream().flatMap(this::processItem));
}
if (Objects.nonNull(oneOf)) {
ofItems = Stream.concat(Optional.ofNullable(ofItems).orElseGet(Stream::empty), oneOf.stream().flatMap(this::processItem));
}
return ofItems;
}
public Stream<Map<String, Object>> processProperties(Map<String, TypeProperty> properties){ public Stream<Map<String, Object>> processProperties(Map<String, TypeProperty> properties){
return properties.entrySet().stream().flatMap(this::processPropertyEntry); return properties.entrySet().stream().flatMap(this::processPropertyEntry);
} }
...@@ -118,11 +141,10 @@ public class PropertiesProcessor { ...@@ -118,11 +141,10 @@ public class PropertiesProcessor {
return Stream.empty(); return Stream.empty();
} }
if (Objects.nonNull(entry.getValue().getAllOf())) { Stream<Map<String, Object>> ofItems = processOfItems(entry);
PropertiesProcessor propertiesProcessor = new PropertiesProcessor(definitions, pathPrefixWithDot + entry.getKey()
, log, new SchemaConverterPropertiesConfig());
return entry.getValue().getAllOf().stream().flatMap(propertiesProcessor::processItem); if (Objects.nonNull(ofItems)) {
return ofItems;
} }
if (Objects.nonNull(entry.getValue().getProperties())) { if (Objects.nonNull(entry.getValue().getProperties())) {
...@@ -139,6 +161,35 @@ public class PropertiesProcessor { ...@@ -139,6 +161,35 @@ public class PropertiesProcessor {
return storageSchemaEntry(getTypeByDefinitionProperty(entry.getValue()), pathPrefixWithDot + entry.getKey()); return storageSchemaEntry(getTypeByDefinitionProperty(entry.getValue()), pathPrefixWithDot + entry.getKey());
} }
private Stream<Map<String, Object>> processOfItems(Map.Entry<String, TypeProperty> entry) {
Stream<Map<String, Object>> ofItems = null;
if (Objects.nonNull(entry.getValue().getAllOf())) {
PropertiesProcessor propertiesProcessor = new PropertiesProcessor(definitions, pathPrefixWithDot + entry.getKey()
, log, new SchemaConverterPropertiesConfig());
ofItems = entry.getValue().getAllOf().stream().flatMap(propertiesProcessor::processItem);
}
if (Objects.nonNull(entry.getValue().getAnyOf())) {
PropertiesProcessor propertiesProcessor = new PropertiesProcessor(definitions, pathPrefixWithDot + entry.getKey()
, log, new SchemaConverterPropertiesConfig());
ofItems = Stream.concat(Optional.ofNullable(ofItems).orElseGet(Stream::empty),
entry.getValue().getAnyOf().stream().flatMap(propertiesProcessor::processItem));
}
if (Objects.nonNull(entry.getValue().getOneOf())) {
PropertiesProcessor propertiesProcessor = new PropertiesProcessor(definitions, pathPrefixWithDot + entry.getKey()
, log, new SchemaConverterPropertiesConfig());
ofItems = Stream.concat(Optional.ofNullable(ofItems).orElseGet(Stream::empty),
entry.getValue().getOneOf().stream().flatMap(propertiesProcessor::processItem));
}
return ofItems;
}
private Stream<Map<String, Object>> storageSchemaEntry(String kind, String path) { private Stream<Map<String, Object>> storageSchemaEntry(String kind, String path) {
Preconditions.checkNotNullOrEmpty(kind, "kind cannot be null or empty"); Preconditions.checkNotNullOrEmpty(kind, "kind cannot be null or empty");
Preconditions.checkNotNullOrEmpty(path, "path cannot be null or empty"); Preconditions.checkNotNullOrEmpty(path, "path cannot be null or empty");
......
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java
View file @ 9beaecc9
...@@ -97,6 +97,18 @@ public class SchemaToStorageFormatImpl implements SchemaToStorageFormat { ...@@ -97,6 +97,18 @@ public class SchemaToStorageFormatImpl implements SchemaToStorageFormat {
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
if (schemaData.getAnyOf() != null) {
storageSchemaItems.addAll(schemaServiceSchema.getProperties().getData().getAnyOf().stream()
.flatMap(propertiesProcessor::processItem)
.collect(Collectors.toList()));
}
if (schemaData.getOneOf() != null) {
storageSchemaItems.addAll(schemaServiceSchema.getProperties().getData().getOneOf().stream()
.flatMap(propertiesProcessor::processItem)
.collect(Collectors.toList()));
}
if (schemaData.getRef() != null) { if (schemaData.getRef() != null) {
storageSchemaItems.addAll(propertiesProcessor.processRef(schemaData.getRef()) storageSchemaItems.addAll(propertiesProcessor.processRef(schemaData.getRef())
.collect(Collectors.toList())); .collect(Collectors.toList()));
......
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/readme.md
View file @ 9beaecc9
...@@ -299,4 +299,67 @@ Ignored for now (array of references) ...@@ -299,4 +299,67 @@ Ignored for now (array of references)
``` ```
\"kind\": \"long\" \"kind\": \"long\"
\ No newline at end of file
Processing specifics
----------------------------------------------------------------------------
allOf, anyOf and oneOf tags are processed at the same way. All internal data(properties) are included into converted schema.
For instance
```json
{
"definitions": {
"wellboreData1": {
"properties": {
"prop1": {
"type": "string"
}
}
},
"wellboreData2": {
"properties": {
"prop2": {
"type": "string"
}
}
}
},
"properties": {
"data": {
"allOf": [
{
"anyOf": [
{
"$ref": "#/definitions/wellboreData1"
} ],
"oneOf": [
{
"$ref": "#/definitions/wellboreData2"
}
]
}
]
}
}
}
```
is converted to
```json
{
"kind": "KIND_VAL",
"schema": [
{
"kind": "string",
"path": "prop1"
},
{
"kind": "string",
"path": "prop2"
}
]
}
```
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/AllOfItem.java
View file @ 9beaecc9
...@@ -27,4 +27,6 @@ public class AllOfItem { ...@@ -27,4 +27,6 @@ public class AllOfItem {
private String type; private String type;
private Map<String, TypeProperty> properties; private Map<String, TypeProperty> properties;
private List<AllOfItem> allOf; private List<AllOfItem> allOf;
private List<AllOfItem> oneOf;
private List<AllOfItem> anyOf;
} }
\ No newline at end of file
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/Definition.java
View file @ 9beaecc9
...@@ -23,4 +23,6 @@ import java.util.Map; ...@@ -23,4 +23,6 @@ import java.util.Map;
public class Definition { public class Definition {
private Map<String, TypeProperty> properties; private Map<String, TypeProperty> properties;
private List<AllOfItem> allOf; private List<AllOfItem> allOf;
private List<AllOfItem> oneOf;
private List<AllOfItem> anyOf;
} }
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/PropertiesData.java
View file @ 9beaecc9
...@@ -23,6 +23,8 @@ import java.util.Map; ...@@ -23,6 +23,8 @@ import java.util.Map;
@Data @Data
public class PropertiesData { public class PropertiesData {
private List<AllOfItem> allOf; private List<AllOfItem> allOf;
private List<AllOfItem> oneOf;
private List<AllOfItem> anyOf;
@JsonProperty("$ref") @JsonProperty("$ref")
private String ref; private String ref;
private Map<String, TypeProperty> properties; private Map<String, TypeProperty> properties;
......
indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/tags/TypeProperty.java
View file @ 9beaecc9
...@@ -30,4 +30,6 @@ public class TypeProperty { ...@@ -30,4 +30,6 @@ public class TypeProperty {
private Items items; private Items items;
private Map<String, TypeProperty> properties; private Map<String, TypeProperty> properties;
private List<AllOfItem> allOf; private List<AllOfItem> allOf;
private List<AllOfItem> oneOf;
private List<AllOfItem> anyOf;
} }
indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java
View file @ 9beaecc9
...@@ -94,6 +94,21 @@ public class SchemaToStorageFormatImplTest { ...@@ -94,6 +94,21 @@ public class SchemaToStorageFormatImplTest {
testSingleFile("/converter/tags/allOf/indefinitions.json", KIND); testSingleFile("/converter/tags/allOf/indefinitions.json", KIND);
} }
@Test
public void oneOfInDefinitions() {
testSingleFile("/converter/tags/oneOf/indefinitions.json", KIND);
}
@Test
public void anyOfInDefinitions() {
testSingleFile("/converter/tags/anyOf/indefinitions.json", KIND);
}
@Test
public void mixAllAnyOneOf() {
testSingleFile("/converter/tags/mixAllAnyOneOf/mix.json", KIND);
}
@Test @Test
public void folderPassed() throws URISyntaxException, IOException { public void folderPassed() throws URISyntaxException, IOException {
......
indexer-core/src/test/resources/converter/integration-tests/index_records_1.schema
View file @ 9beaecc9
...@@ -20,7 +20,11 @@ ...@@ -20,7 +20,11 @@
}, },
"County": { "County": {
"type": "string" "type": "string"
}, }}}],
"anyOf": [
{
"type": "object",
"properties": {
"State": { "State": {
"type": "string" "type": "string"
}, },
...@@ -41,7 +45,11 @@ ...@@ -41,7 +45,11 @@
}, },
"EmptyAttribute": { "EmptyAttribute": {
"type": "string" "type": "string"
}, }}}],
"oneOf": [
{
"type": "object",
"properties": {
"Rank": { "Rank": {
"type": "integer" "type": "integer"
}, },
......
indexer-core/src/test/resources/converter/tags/anyOf/indefinitions.json 0 → 100644
View file @ 9beaecc9
{
"definitions": {
"wellboreData1": {
"properties": {
"prop1": {
"type": "string"
}
}
},
"wellboreData2": {
"anyOf": [
{
"$ref": "#/definitions/wellboreData1"
}
]
}
},
"properties": {
"data": {
"type": "object",
"properties": {
"Field": {
"$ref": "#/definitions/wellboreData2"
}
}
}
}
}
indexer-core/src/test/resources/converter/tags/anyOf/indefinitions.json.res 0 → 100644
View file @ 9beaecc9
{
"kind": "KIND_VAL",
"schema": [
{
"kind": "string",
"path": "Field.prop1"
}
]
}
\ No newline at end of file
indexer-core/src/test/resources/converter/tags/mixAllAnyOneOf/mix.json 0 → 100644
View file @ 9beaecc9
{
"definitions": {
"wellboreData1": {
"properties": {
"prop1": {
"type": "string"
}
}
},
"wellboreData2": {
"properties": {
"prop2": {
"type": "string"
}
}
},
"wellboreData3": {
"properties": {
"prop3": {
"type": "string"
}
}
},
"wellboreData4": {
"properties": {
"prop4": {
"type": "string"
}
}
}
},
"properties": {
"data": {
"allOf": [
{
"anyOf": [
{
"$ref": "#/definitions/wellboreData1"
} ],
"oneOf": [
{
"$ref": "#/definitions/wellboreData2"
}
]
},
{
"$ref": "#/definitions/wellboreData3"
},
{
"$ref": "#/definitions/wellboreData4"
}
]
}
}
}
indexer-core/src/test/resources/converter/tags/mixAllAnyOneOf/mix.json.res 0 → 100644
View file @ 9beaecc9
{
"kind": "KIND_VAL",
"schema": [
{
"kind": "string",
"path": "prop1"
},
{
"kind": "string",
"path": "prop2"
},
{
"kind": "string",
"path": "prop3"
},
{
"kind": "string",
"path": "prop4"
}
]
}
\ No newline at end of file
indexer-core/src/test/resources/converter/tags/oneOf/indefinitions.json 0 → 100644
View file @ 9beaecc9
{
"definitions": {
"wellboreData1": {
"properties": {
"prop1": {
"type": "string"
}
}
},
"wellboreData2": {
"anyOf": [
{
"$ref": "#/definitions/wellboreData1"
}
]
}
},
"properties": {
"data": {
"type": "object",
"properties": {
"Field": {
"$ref": "#/definitions/wellboreData2"
}
}
}
}
}
indexer-core/src/test/resources/converter/tags/oneOf/indefinitions.json.res 0 → 100644
View file @ 9beaecc9
{
"kind": "KIND_VAL",
"schema": [
{
"kind": "string",
"path": "Field.prop1"
}
]
}
\ No newline at end of file
testing/indexer-test-core/src/main/resources/testData/index_records_1.schema.json
View file @ 9beaecc9
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"authority": "tenant1", "authority": "tenant1",
"source": "indexer-int-test", "source": "indexer-int-test",
"entityType": "sample-schema-1", "entityType": "sample-schema-1",
"schemaVersionMajor": "1", "schemaVersionMajor": "2",
"schemaVersionMinor": "0", "schemaVersionMinor": "0",
"schemaVersionPatch": "4" "schemaVersionPatch": "4"
}, },
...@@ -32,7 +32,14 @@ ...@@ -32,7 +32,14 @@
}, },
"County": { "County": {
"type": "string" "type": "string"
}, }
}
}
],
"anyOf": [
{
"type": "object",
"properties": {
"State": { "State": {
"type": "string" "type": "string"
}, },
...@@ -53,7 +60,14 @@ ...@@ -53,7 +60,14 @@
}, },
"EmptyAttribute": { "EmptyAttribute": {
"type": "string" "type": "string"
}, }
}
}
],
"oneOf": [
{
"type": "object",
"properties": {
"Rank": { "Rank": {
"type": "integer" "type": "integer"
}, },
......