diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java index d87b38f6ed67482ac353b74ceb63be9d5008622a..45a13b37f6b127e064f4c0807b5f3f132f1acf9f 100644 --- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java +++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java @@ -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(); diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageIndexerPayloadMapper.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageIndexerPayloadMapper.java index e377d32da5ecf712c928a438f379ffced2e268fc..0469ded33dfff0b0a99912594dcb84ada57767e3 100644 --- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageIndexerPayloadMapper.java +++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageIndexerPayloadMapper.java @@ -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; } }