Revert "Fixed DynamoDbEnhancedClient TableSchema::itemToMap to handle flattened members when ignoreNulls is false (#5832)

[joviegas]

This reverts commit cd04b47.

Reverting PR#5832
because of following concerns

1. For Nested Flatten Beans if any one is set to null explicitly then it ends in NPE
   Example

 
@DynamoDbBean
public class FlattenedImmutableBean {
    private String id;
    private LevelOneNestedClass levelOneNestedClass;
 
    @DynamoDbFlatten
    public LevelOneNestedClass getLevelOneNestedClass() {
        return levelOneNestedClass;
    }
 
    public void setLevelOneNestedClass(LevelOneNestedClass levelOneNestedClass) {
        this.levelOneNestedClass = levelOneNestedClass;
    }
 
    @DynamoDbPartitionKey
    public String getId() {
        return this.id;
    }
    public void setId(String id) {
        this.id = id;
    }
 
    @DynamoDbBean
    public static class LevelOneNestedClass {
        private LevelTwoNestedClass levelTwoNestedClass = null;
        private String idType;
 
        @DynamoDbFlatten
        public LevelTwoNestedClass getConversationState() {
            return levelTwoNestedClass;
        }
 
        public void setConversationState(LevelTwoNestedClass levelTwoNestedClass) {
            this.levelTwoNestedClass = levelTwoNestedClass;
        }
 
        public String getIdType() {
            return idType;
        }
 
        public void setIdType(String idType) {
            this.idType = idType;
        }
    }
 
    enum  LevelThreeBean {
        SUCCESS,
        FAILED
    }
 
    @DynamoDbBean
    public static class LevelTwoNestedClass {
        private LevelThreeBean levelThreeBean;
 
        public LevelTwoNestedClass() {
            this.levelThreeBean = LevelThreeBean.SUCCESS;
        }
 
        public LevelThreeBean getLevelThreeBean() {
            return levelThreeBean;
        }
 
        public void setLevelThreeBean(LevelThreeBean levelThreeBean) {
            this.levelThreeBean = levelThreeBean;
        }
    }
 
}

java.lang.NullPointerException
at software.amazon.awssdk.enhanced.dynamodb.mapper.StaticImmutableTableSchema$FlattenedMapper.itemToMap(StaticImmutableTableSchema.java:127)
at software.amazon.awssdk.enhanced.dynamodb.mapper.StaticImmutableTableSchema$FlattenedMapper.access$1400(StaticImmutableTableSchema.java:91)
at software.amazon.awssdk.enhanced.dynamodb.mapper.StaticImmutableTableSchema.lambda$itemToMap$6(StaticImmutableTableSchema.java:528)
at java.base/java.util.HashMap.forEach(HashMap.java:1421)
at java.base/java.util.Collections$UnmodifiableMap.forEach(Collections.java:1553)
at software.amazon.awssdk.enhanced.dynamodb.mapper.StaticImmutableTableSchema.itemToMap(StaticImmutableTableSchema.java:527)
at software.amazon.awssdk.enhanced.dynamodb.mapper.WrappedTableSchema.itemToMap(WrappedTableSchema.java:67)
at software.amazon.awssdk.enhanced.dynamodb.mapper.WrappedTableSchema.itemToMap(WrappedTableSchema.java:67)
at software.amazon.awssdk.enhanced.dynamodb.mapper.StaticImmutableTableSchema$FlattenedMapper.itemToMap(StaticImmutableTableSchema.java:133)
at software.amazon.awssdk.enhanced.dynamodb.mapper.StaticImmutableTableSchema$FlattenedMapper.access$1400(StaticImmutableTableSchema.java:91)
at software.amazon.awssdk.enhanced.dynamodb.mapper.StaticImmutableTableSchema.lambda$itemToMap$6(StaticImmutableTableSchema.java:528)
at java.base/java.util.HashMap.forEach(HashMap.java:1421)
at java.base/java.util.Collections$UnmodifiableMap.forEach(Collections.java:1553)
at software.amazon.awssdk.enhanced.dynamodb.mapper.StaticImmutableTableSchema.itemToMap(StaticImmutableTableSchema.java:527)
at software.amazon.awssdk.enhanced.dynamodb.mapper.WrappedTableSchema.itemToMap(WrappedTableSchema.java:67)
at software.amazon.awssdk.enhanced.dynamodb.mapper.WrappedTableSchema.itemToMap(WrappedTableSchema.java:67)

Future FIx

• Tried fixing it quickly by returning empty map if otherItem is null but that makes ignoreNull = false not work for Second level Nesting. I think problem relates to how FlattenedMapper objects are created and indexed in the StaticImmutableTableSchema class. So this will take more time to fix

Motivation and Context

Modifications

Testing

Screenshots (if appropriate)

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)

License

• I confirm that this pull request can be released under the Apache 2 license

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[joviegas]

Merged to stagging