fix update in transaction

Author: kuros

src/main/java/in/kuros/jfirebase/provider/firebase/AttributeValueHelper.java

@@ -7,7 +7,6 @@
 import in.kuros.jfirebase.metadata.AttributeValue;
 import in.kuros.jfirebase.metadata.MapAttributeValue;
 import in.kuros.jfirebase.metadata.ValuePath;
-import in.kuros.jfirebase.util.CustomCollectors;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -39,31 +38,6 @@ public <T> T createEntity(final List<AttributeValue<T, ?>> attributeValues) {
         }
     }
 
-    public <T> Map<String, Object> toFieldValueMap(final List<AttributeValue<T, ?>> attributeValues) {
-        return attributeValues
-                .stream()
-                .collect(CustomCollectors.toMap(
-                        attributeValue -> {
-                            if (MapAttributeValue.class.isAssignableFrom(attributeValue.getClass())) {
-                                final MapAttributeValue mapAttributeValue = (MapAttributeValue) attributeValue;
-                                if (mapAttributeValue.isKeyUpdate()) {
-                                    return mapAttributeValue.getAttribute().getName() + "." + mapAttributeValue.getKey();
-                                }
-                            }
-                            return attributeValue.getAttribute().getName();
-                        },
-
-                        attributeValue -> {
-                            if (MapAttributeValue.class.isAssignableFrom(attributeValue.getClass())) {
-                                final MapAttributeValue mapAttributeValue = (MapAttributeValue) attributeValue;
-                                if (mapAttributeValue.isKeyUpdate()) {
-                                    return mapAttributeValue.getMapValue().getValue();
-                                }
-                            }
-                            return attributeValue.getAttributeValue().getValue();
-                        }));
-    }
-
     public <T> List<FieldPath> getFieldPaths(final List<AttributeValue<T, ?>> attributeValues) {
         return attributeValues
                 .stream()

src/main/java/in/kuros/jfirebase/provider/firebase/WriteBatchImpl.java

@@ -92,7 +92,7 @@ public <T> void remove(final RemoveAttribute<T> removeAttribute) {
     @Override
     public <T> void update(final UpdateAttribute<T> updateAttribute) {
         final List<AttributeValue<T, ?>> attributeValues = UpdateAttribute.Helper.getAttributeValues(updateAttribute);
-        final Map<String, Object> valueMap = attributeValueHelper.toFieldValueMap(attributeValues);
+        final Map<String, Object> valueMap = attributeValueHelper.convertToObjectMap(attributeValues);
         attributeValueHelper.addValuePaths(valueMap, UpdateAttribute.Helper.getValuePaths(updateAttribute));
 
         final String documentPath = entityHelper.getDocumentPath(UpdateAttribute.Helper.getKeys(updateAttribute));

src/test/java/in/kuros/jfirebase/provider/firebase/AttributeValueHelperTest.java

@@ -60,41 +60,6 @@ void shouldThrowExceptionWhenCreateEntityForGivenAttributeValuesWithoutId() {
                 .build()));
     }
 
-    @Test
-    void shouldConvertToFieldValueMap() {
-        final String id = RandomStringUtils.randomAlphanumeric(3);
-        final String value = RandomStringUtils.randomAlphanumeric(5);
-        final String mapKey = RandomStringUtils.randomAlphanumeric(4);
-        final String mapValue = RandomStringUtils.randomAlphanumeric(4);
-        final List<AttributeValue<TestClass, ?>> attributeValues = AttributeValue
-                .with(TestClass_.testId, id)
-                .with(TestClass_.testValue, value)
-                .with(TestClass_.testMap, mapKey, mapValue)
-                .build();
-
-        final Map<String, Object> resultMap = attributeValueHelper.toFieldValueMap(attributeValues);
-
-        assertEquals(3, resultMap.size());
-        assertEquals(id,  resultMap.get("testId"));
-        assertEquals(value,  resultMap.get("testValue"));
-        assertEquals(mapValue,  resultMap.get("testMap." + mapKey));
-    }
-
-    @Test
-    void shouldConvertToFieldValueMapWithCompleteMapPath() {
-        final Map<String, String> map = new HashMap<>();
-        map.put(RandomStringUtils.randomAlphanumeric(4), RandomStringUtils.randomAlphanumeric(4));
-
-        final List<AttributeValue<TestClass, ?>> attributeValues = AttributeValue
-                .with(TestClass_.testMap, map)
-                .build();
-
-        final Map<String, Object> resultMap = attributeValueHelper.toFieldValueMap(attributeValues);
-
-        assertEquals(1, resultMap.size());
-        assertEquals(map,  resultMap.get("testMap"));
-    }
-
     @Test
     void shouldCreateFieldPathForAttributeValues() {
         final String id = RandomStringUtils.randomAlphanumeric(3);