enable term aggregation for nested text attributes

indexer-core/src/main/java/org/opengroup/osdu/indexer/util/TypeMapper.java

@@ -106,13 +106,15 @@ public class TypeMapper {
             return Records.Type.builder().type(getArrayMemberType(indexerType.toString())).build();
         }
 
-        if(isMap(indexerType)){
-            Map<String,Object> type = (Map<String, Object>) indexerType;
+        if (isMap(indexerType)) {
+            Map<String, Object> type = (Map<String, Object>) indexerType;
             Map<String, Object> propertiesMap = (Map<String, Object>) type.get(Constants.PROPERTIES);
-            for (Map.Entry<String,Object> entry : propertiesMap.entrySet()){
-                if(isMap(entry.getValue())){
+            for (Map.Entry<String, Object> entry : propertiesMap.entrySet()) {
+                if (isMap(entry.getValue())) {
                     entry.setValue(getDataAttributeIndexerMapping(entry.getValue()));
-                }else {
+                } else if(ElasticType.TEXT.getValue().equalsIgnoreCase(String.valueOf(entry.getValue()))) {
+                    entry.setValue(getTextIndexerMapping());
+                } else {
                     entry.setValue(Records.Type.builder().type(entry.getValue().toString()).build());
                 }
             }

testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java

@@ -300,7 +300,7 @@ public class ElasticUtils {
             SearchRequest searchRequest = new SearchRequest(index);
 
             SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-            searchSourceBuilder.query(nestedQuery(path,boolQuery().must(matchQuery(firstNestedField,firstNestedValue)).must(matchQuery(secondNestedField,secondNestedValue)), ScoreMode.Avg));
+            searchSourceBuilder.query(nestedQuery(path,boolQuery().must(matchQuery(firstNestedField,firstNestedValue)).must(termQuery(secondNestedField + ".keyword",secondNestedValue)), ScoreMode.Avg));
 
             searchRequest.source(searchSourceBuilder);