Update allowed mapping changes (#19)

Author: kusumaghoshdastidar

elastic-mapping-updater/src/main/java/com/github/cafdataprocessing/elastic/tools/ElasticMappingUpdater.java

@@ -65,10 +65,7 @@ public final class ElasticMappingUpdater
                     "fields",
                     "ignore_above",
                     "ignore_malformed",
-                    "index_options",
                     "meta",
-                    "null_value",
-                    "position_increment_gap",
                     "properties",
                     "search_analyzer",
                     "search_quote_analyzer")));

elastic-mapping-updater/src/test/java/com/github/cafdataprocessing/elastic/tools/test/ElasticMappingUpdaterIT.java

@@ -508,8 +508,8 @@ public void testUpdateIndexesOfUnSupportedChangesInTemplate() throws IOException
         final Map<String, Object> idPropMapping = (Map<String, Object>) props.get("ID");
         LOGGER.info("idPropMapping {} ", idPropMapping);
         final Object idPropValue = idPropMapping.get("ignore_malformed");
-        // Verify property mapping parameter was not removed (although mapping update was to remove the ignore_malformed parameter)
-        assertNotNull("testUpdateIndexesOfUnSupportedChangesInTemplate", idPropValue);
+        // Verify property mapping parameter was removed
+        assertNull("testUpdateIndexesOfUnSupportedChangesInTemplate", idPropValue);
 
         // Verify index mapping of unsupported field changes has not changed
         @SuppressWarnings("unchecked")
@@ -642,9 +642,9 @@ public void testUpdateIndexesWithNestedFieldChanges() throws IOException, GetInd
         @SuppressWarnings("unchecked")
         final Map<String, Object> gidMapping = (Map<String, Object>) entitiesProps.get("GRAMMAR_ID");
         assertNotNull("testUpdateIndexesOfUnSupportedChangesInTemplate", gidMapping);
-        // Verify change to nested property is applied, param added (allowed change)
+        // Verify change to nested property is applied, param not added (change not allowed)
         final Object gidProp1 = gidMapping.get("null_value");
-        assertNotNull("testUpdateIndexesOfUnSupportedChangesInTemplate", gidProp1);
+        assertNull("testUpdateIndexesOfUnSupportedChangesInTemplate", gidProp1);
 
         // Verify index mapping of unsupported field changes to nested property has not changed
         @SuppressWarnings("unchecked")
@@ -778,8 +778,8 @@ public void testAttemptRemoveUnchangeableProperty() throws Exception
         final Map<String, Object> processingProps = (Map<String, Object>) processingPropMapping.get("properties");
         @SuppressWarnings("unchecked")
         final Map<String, Object> propIdMapping = (Map<String, Object>) processingProps.get("ID");
-        // Verify param removed (allowed change)
-        assertFalse(propIdMapping.containsKey("null_value"));
+        // Verify param not removed (change not allowed)
+        assertTrue(propIdMapping.containsKey("null_value"));
         @SuppressWarnings("unchecked")
         final Map<String, Object> pTimeMapping = (Map<String, Object>) processingProps.get("P_TIME");
         assertNotNull("testUpdateIndexesOfUnSupportedChangesInTemplate", pTimeMapping);
@@ -789,9 +789,9 @@ public void testAttemptRemoveUnchangeableProperty() throws Exception
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> refMapping = (Map<String, Object>) processingProps.get("REF");
-        // Verify change to nested property is not applied, param not removed
+        // Verify change to nested property is applied, param removed
         final Object propIgnoreMalformed = refMapping.get("ignore_malformed");
-        assertNotNull("testUpdateIndexesOfUnSupportedChangesInTemplate", propIgnoreMalformed);
+        assertNull("testUpdateIndexesOfUnSupportedChangesInTemplate", propIgnoreMalformed);
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> codeMapping = (Map<String, Object>) processingProps.get("CODE");
@@ -862,7 +862,7 @@ public void testRemoveParams() throws Exception
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop1Mapping = (Map<String, Object>) props.get("number_two");
-        assertTrue(prop1Mapping.containsKey("coerce"));
+        assertFalse(prop1Mapping.containsKey("coerce")); // has been removed, as expected
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop16Mapping = (Map<String, Object>) props.get("first_name");
@@ -886,19 +886,19 @@ public void testRemoveParams() throws Exception
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop4Mapping = (Map<String, Object>) props.get("number_one");
-        assertTrue(prop4Mapping.containsKey("ignore_malformed"));
+        assertFalse(prop4Mapping.containsKey("ignore_malformed")); // has been removed, as expected
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop20Mapping = (Map<String, Object>) props.get("dummy_message2");
-        assertFalse(prop20Mapping.containsKey("index_options")); // has been removed
+        assertTrue(prop20Mapping.containsKey("index_options")); // has not been removed, as expected
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop24Mapping = (Map<String, Object>) props.get("latency");
         assertTrue(prop24Mapping.containsKey("meta"));
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop5Mapping = (Map<String, Object>) props.get("status_code");
-        assertFalse(prop5Mapping.containsKey("null_value")); // has been removed
+        assertTrue(prop5Mapping.containsKey("null_value")); // not removed, as expected
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop27Mapping = (Map<String, Object>) props.get("names2");
@@ -1056,19 +1056,19 @@ public void testAddParams() throws Exception
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop20Mapping = (Map<String, Object>) props.get("dummy_message2");
-        assertTrue(prop20Mapping.containsKey("index_options"));
+        assertFalse(prop20Mapping.containsKey("index_options")); // has not been added, as expected
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop24Mapping = (Map<String, Object>) props.get("latency");
         assertFalse(prop24Mapping.containsKey("meta")); // has not been added
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop5Mapping = (Map<String, Object>) props.get("status_code");
-        assertTrue(prop5Mapping.containsKey("null_value"));
+        assertFalse(prop5Mapping.containsKey("null_value")); // not added, as expected
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop27Mapping = (Map<String, Object>) props.get("names2");
-        assertFalse(prop27Mapping.containsKey("position_increment_gap")); // has not been added
+        assertFalse(prop27Mapping.containsKey("position_increment_gap")); // not added, as expected
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop28Mapping = (Map<String, Object>) props.get("manager");
@@ -1201,25 +1201,25 @@ public void testAddRemoveParams() throws Exception
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop10Mapping = (Map<String, Object>) propOtherPropsMappings.get("status_code");
-        assertTrue(prop10Mapping.containsKey("null_value")); // added, as expected
+        assertFalse(prop10Mapping.containsKey("null_value")); // not added, as expected
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop11Mapping = (Map<String, Object>) propOtherPropsMappings.get("BODY_TEXT");
         assertTrue(prop11Mapping.containsKey("index_prefixes")); // not removed, as expected
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop12Mapping = (Map<String, Object>) propOtherPropsMappings.get("REF");
-        assertTrue(prop12Mapping.containsKey("ignore_malformed")); // not removed
+        assertFalse(prop12Mapping.containsKey("ignore_malformed")); // removed, as expected
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> prop13Mapping = (Map<String, Object>) propOtherPropsMappings.get("some_date");
         assertFalse(prop13Mapping.containsKey("format")); // not added, as expected
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> propId = (Map<String, Object>) propProcessingMappings.get("ID");
-        assertTrue(propId.containsKey("eager_global_ordinals")); // added, as expected
+        assertFalse(propId.containsKey("eager_global_ordinals")); // not added, unexpected (can be removed but not added?)
         assertTrue(propId.containsKey("ignore_above"));
-        assertFalse(propId.containsKey("null_value")); // removed, as expected
+        assertTrue(propId.containsKey("null_value")); // not removed, as expected
 
         @SuppressWarnings("unchecked")
         final Map<String, Object> propLang = (Map<String, Object>) props.get("LANGUAGE_CODES");