Merge pull request #145 from ONSdigital/FWMT-1655

Removed root type and mapping workaround.
ONSdigital · Nov 27, 2019 · c4b444f · c4b444f
2 parents c784515 + f452d1c
commit c4b444f
Show file tree

Hide file tree

Showing 2 changed files with 810 additions and 815 deletions.
diff --git a/batch/src/main/scala/uk/gov/ons/addressindex/Main.scala b/batch/src/main/scala/uk/gov/ons/addressindex/Main.scala
@@ -80,15 +80,15 @@ For usage see below:
 
     if (nisra) {
       if (skinny) {
-        ElasticSearchWriter.saveSkinnyHybridNisraAddresses(s"$indexName/address", SqlHelper.aggregateHybridSkinnyNisraIndex(paf, nag, nisratxt, historical))
+        ElasticSearchWriter.saveSkinnyHybridNisraAddresses(s"$indexName", SqlHelper.aggregateHybridSkinnyNisraIndex(paf, nag, nisratxt, historical))
       } else {
-        ElasticSearchWriter.saveHybridNisraAddresses(s"$indexName/address", SqlHelper.aggregateHybridNisraIndex(paf, nag, nisratxt, historical))
+        ElasticSearchWriter.saveHybridNisraAddresses(s"$indexName", SqlHelper.aggregateHybridNisraIndex(paf, nag, nisratxt, historical))
       }
     } else {
       if (skinny) {
-        ElasticSearchWriter.saveSkinnyHybridAddresses(s"$indexName/address", SqlHelper.aggregateHybridSkinnyIndex(paf, nag, historical))
+        ElasticSearchWriter.saveSkinnyHybridAddresses(s"$indexName", SqlHelper.aggregateHybridSkinnyIndex(paf, nag, historical))
       } else {
-        ElasticSearchWriter.saveHybridAddresses(s"$indexName/address", SqlHelper.aggregateHybridIndex(paf, nag, historical))
+        ElasticSearchWriter.saveHybridAddresses(s"$indexName", SqlHelper.aggregateHybridIndex(paf, nag, historical))
       }
     }
   }
@@ -101,7 +101,6 @@ For usage see below:
         } else {
           Mappings.hybrid
         })
-      .param("include_type_name", "true")
       .header("Content-type", "application/json")
       .header("Authorization", authHeader)
       .asString