diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java
index 9e9026c815055600e3b2a58da8e2c82317e812cd..fae0b4e6f31cd18ad960b841b6d9723e0162cf29 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java
@@ -208,6 +208,16 @@ public class AttributeParsingServiceImpl implements IAttributeParsingService {
}
}
+ @Override
+ public void tryParseNested(String recordId, String name, Object value, Map<String, Object> dataMap) {
+ dataMap.put(name,value);
+ }
+
+ @Override
+ public void tryParseObject(String recordId, String name, Object value, Map<String, Object> dataMap) {
+ dataMap.put(name,value);
+ }
+
private List<String> isArrayType(Object attributeVal) {
try {
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IAttributeParsingService.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IAttributeParsingService.java
index 4050444a40b1bef8f184d8b09c80a078d9e73729..c4fb8ecf2966c3b354eb15e9fb32be8608554feb 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IAttributeParsingService.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IAttributeParsingService.java
@@ -1,7 +1,5 @@
package org.opengroup.osdu.indexer.service;
-import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
-
import java.util.Map;
public interface IAttributeParsingService {
@@ -26,4 +24,8 @@ public interface IAttributeParsingService {
void tryParseGeopoint(String recordId, String attributeName, Map<String, Object> storageRecordData, Map<String, Object> dataMap);
void tryParseGeojson(String recordId, String attributeName, Object attributeVal, Map<String, Object> dataMap);
+
+ void tryParseNested(String recordId, String name, Object value, Map<String, Object> dataMap);
+
+ void tryParseObject(String recordId, String name, Object value, Map<String, Object> dataMap);
}
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java
index e4bfe381d65dd26b5c8fee673d7adb6c57943485..a63848140947c2a425c69458671733c3beaae684 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java
@@ -23,6 +23,7 @@ import org.elasticsearch.client.RestHighLevelClient;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.AppException;
import org.opengroup.osdu.core.common.model.http.RequestStatus;
+import org.opengroup.osdu.core.common.model.indexer.ElasticType;
import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
import org.opengroup.osdu.core.common.model.indexer.OperationType;
import org.opengroup.osdu.core.common.model.indexer.StorageType;
@@ -47,6 +48,10 @@ import java.util.Map;
public class IndexSchemaServiceImpl implements IndexSchemaService {
private static final String FLATTENED_SCHEMA = "_flattened";
+ private static final String WELLBORE_MARKER_SET = "WellboreMarkerSet";
+ private static final String MARKERS = "Markers";
+ private static final String WELL_LOG = "WellLog";
+ private static final String CURVES = "Curves";
private final Gson gson = new Gson();
@@ -229,6 +234,14 @@ public class IndexSchemaServiceImpl implements IndexSchemaService {
String kind = schemaObj.getKind();
String type = kind.split(":")[2];
+ //TODO temporary fix for https://community.opengroup.org/osdu/platform/system/indexer-service/-/issues/1
+ if(data.get(MARKERS) != null){
+ data.put(MARKERS, ElasticType.NESTED.getValue());
+ }
+ if(data.get(CURVES) != null){
+ data.put(CURVES, ElasticType.NESTED.getValue());
+ }
+
return IndexSchema.builder().dataSchema(data).metaSchema(meta).kind(kind).type(type).build();
} catch (Exception e) {
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 7ac887012e9e8218c65696457369c95981e43f59..6d9d8b8cde2bf7664b1a84e2bc7a14c7551e0db3 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
@@ -91,7 +91,11 @@ public class StorageIndexerPayloadMapper {
this.attributeParsingService.tryParseGeojson(recordId, name, value, dataMap);
break;
case NESTED:
+ this.attributeParsingService.tryParseNested(recordId, name, value, dataMap);
+ break;
case OBJECT:
+ this.attributeParsingService.tryParseObject(recordId, name, value, dataMap);
+ break;
case UNDEFINED:
// don't do anything for now
break;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/TypeMapper.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/TypeMapper.java
index a372a1b20cd9f8a2684e5a537cd8eaf43085117e..9e3150abc4006549f51f8ed4b2375ff522c4184a 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/TypeMapper.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/TypeMapper.java
@@ -32,6 +32,8 @@ public class TypeMapper {
private static final Map<String, Object> metaAttributeIndexerType = new HashMap<>();
+ private static final String STORAGE_TYPE_OBJECTS = "[]object";
+
static {
metaAttributeIndexerType.put(RecordMetaAttribute.KIND.getValue(), ElasticType.KEYWORD.getValue());
@@ -64,6 +66,9 @@ public class TypeMapper {
storageToIndexerType.put(StorageType.DATETIME_ARRAY.getValue(), ElasticType.DATE_ARRAY.getValue());
storageToIndexerType.put(StorageType.GEO_POINT.getValue(), ElasticType.GEO_POINT.getValue());
storageToIndexerType.put(StorageType.GEO_SHAPE.getValue(), ElasticType.GEO_SHAPE.getValue());
+
+ //TODO temporary fix for https://community.opengroup.org/osdu/platform/system/indexer-service/-/issues/1
+ storageToIndexerType.put(STORAGE_TYPE_OBJECTS, ElasticType.OBJECT.getValue());
}
public static String getIndexerType(String storageType) {
diff --git a/provider/indexer-gcp/src/main/resources/application.properties b/provider/indexer-gcp/src/main/resources/application.properties
index c2c74189250e40afae31e9f8c0174370a877c569..08ee586c371bc8fecc4e21227ef2b4f1c8b76c5e 100644
--- a/provider/indexer-gcp/src/main/resources/application.properties
+++ b/provider/indexer-gcp/src/main/resources/application.properties
@@ -43,3 +43,4 @@ indexer.que.service.mail=default@iam.gserviceaccount.com
SCHEMA_HOST=${HOST}/api/schema-service/v1/schema
storage-query-kinds-host=https://${STORAGE_HOSTNAME}/api/storage/v2/query/kinds
+schema.converter.supported-array-types=boolean,integer,number,string,object