fix merge semantic confilct

not-napoleon · not-napoleon · commit e1f595829e73 · 2025-05-27T13:52:42.000-04:00
diff --git a/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultMappingParametersHandler.java b/test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultMappingParametersHandler.java
@@ -103,7 +103,7 @@ private Supplier<Map<String, Object>> keywordMapping(DataSourceRequest.LeafMappi
                 mapping.put("null_value", ESTestCase.randomAlphaOfLengthBetween(0, 10));
             }
             // NOCOMMIT - randomize this
-            injected.put("normalizer", "lowercase");
+            mapping.put("normalizer", "lowercase");
             return mapping;
         };
     }

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ private Supplier<Map<String, Object>> keywordMapping(DataSourceRequest.LeafMappi`
`103`	`103`	`mapping.put("null_value", ESTestCase.randomAlphaOfLengthBetween(0, 10));`
`104`	`104`	`}`
`105`	`105`	`// NOCOMMIT - randomize this`
`106`		`- injected.put("normalizer", "lowercase");`
	`106`	`+ mapping.put("normalizer", "lowercase");`
`107`	`107`	`return mapping;`
`108`	`108`	`};`
`109`	`109`	`}`