From 75c794d2d5d40d89a6fbf8bf3061c1fd33a0ef6b Mon Sep 17 00:00:00 2001
From: Neelesh Thakur <NThakur4@slb.com>
Date: Mon, 6 Apr 2020 17:38:04 -0500
Subject: [PATCH] fetch nested shape using apache util
---
.../osdu/indexer/service/AttributeParsingServiceImpl.java | 4 ++--
.../osdu/indexer/service/IAttributeParsingService.java | 2 +-
.../opengroup/osdu/indexer/service/IndexerServiceImpl.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
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 3b4e34c2d..3188710f5 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
@@ -145,11 +145,11 @@ public class AttributeParsingServiceImpl implements IAttributeParsingService {
}
@Override
- public void tryParseGeojson(String recordId, String attributeName, Map<String, Object> storageRecordData, Map<String, Object> dataMap) {
+ public void tryParseGeojson(String recordId, String attributeName, Object attributeVal, Map<String, Object> dataMap) {
try {
Type type = new TypeToken<Map<String, Object>>() {}.getType();
- Map<String, Object> geoJsonMap = new Gson().fromJson(storageRecordData.get(attributeName).toString(), type);
+ Map<String, Object> geoJsonMap = new Gson().fromJson(attributeVal.toString(), type);
if (geoJsonMap == null || geoJsonMap.isEmpty()) return;
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 6d7c7d261..8d7647d31 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
@@ -24,5 +24,5 @@ public interface IAttributeParsingService {
void tryParseGeopoint(String recordId, String attributeName, Map<String, Object> storageRecordData, Map<String, Object> dataMap);
- void tryParseGeojson(String recordId, String attributeName, Map<String, Object> storageRecordData, Map<String, Object> dataMap);
+ void tryParseGeojson(String recordId, String attributeName, Object attributeVal, Map<String, Object> dataMap);
}
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
index e794af5fd..d346d5c36 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
@@ -347,7 +347,7 @@ public class IndexerServiceImpl implements IndexerService {
this.attributeParsingServiceImpl.tryParseGeopoint(recordId, name, storageRecordData, dataMap);
break;
case GEO_SHAPE:
- this.attributeParsingServiceImpl.tryParseGeojson(recordId, name, storageRecordData, dataMap);
+ this.attributeParsingServiceImpl.tryParseGeojson(recordId, name, value, dataMap);
break;
case NESTED:
case OBJECT:
--
GitLab