Merged PR 1212: fetch nested shape using apache util

fetch nested shape using apache util

Related work items: #1610

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;
 

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);
 }

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: