Skip to content
Snippets Groups Projects
Commit ea4610d7 authored by Zhibin Mai's avatar Zhibin Mai
Browse files

Rollback unncessary format changes

parent 796b9828
No related branches found
No related tags found
4 merge requests!545Draft: add env variables,!543Draft: az/sa-support-index-extended-properties,!540Draft: support index extended properties,!465Index extended properties defined in property configurations
Pipeline #160796 failed
......@@ -317,10 +317,10 @@ public class PropertiesProcessor {
Preconditions.checkNotNull(definitionProperty, "definitionProperty cannot be null");
return Stream.of(
getFromPattern(definitionProperty.getPattern()),
getFromItemsPattern(() -> definitionProperty.getItems() != null ? definitionProperty.getItems().getPattern() : null),
getFromFormat(definitionProperty::getFormat),
getFromItemsType(() -> definitionProperty.getItems() != null ? definitionProperty.getItems().getType() : null))
getFromPattern(definitionProperty.getPattern()),
getFromItemsPattern(() -> definitionProperty.getItems() != null ? definitionProperty.getItems().getPattern() : null),
getFromFormat(definitionProperty::getFormat),
getFromItemsType(() -> definitionProperty.getItems() != null ? definitionProperty.getItems().getType() : null))
.filter(x -> x.get() != null)
.findFirst()
.orElse(getFromType(definitionProperty::getType)).get();
......
......@@ -235,7 +235,7 @@ public class StorageIndexerPayloadMapper {
});
if(virtualPropertyPath.equals(VirtualPropertyUtil.VIRTUAL_DEFAULT_LOCATION) &&
dataCollectorMap.containsKey(VirtualPropertyUtil.VIRTUAL_DEFAULT_LOCATION_WGS84_PATH)) {
dataCollectorMap.containsKey(VirtualPropertyUtil.VIRTUAL_DEFAULT_LOCATION_WGS84_PATH)) {
originalGeoShapeProperty = originalPropertyPath + VirtualPropertyUtil.FIELD_WGS84_COORDINATES;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment