[sledge] Rename DataConverter to MapToKVListConverter.
TEST=dart_sledge_tests
Change-Id: I8942f7e44841937f8270a4226e8f1e108dff682e
diff --git a/public/dart/sledge/lib/src/document/values/converter.dart b/public/dart/sledge/lib/src/document/values/converter.dart
index b54145d..eb2600c 100644
--- a/public/dart/sledge/lib/src/document/values/converter.dart
+++ b/public/dart/sledge/lib/src/document/values/converter.dart
@@ -32,13 +32,13 @@
}
/// Class for converting Map<K, V> to List<KeyValue> and back.
-class DataConverter<K, V> {
+class MapToKVListConverter<K, V> {
final Converter<K> _keyConverter;
final Converter<V> _valueConverter;
final Compressor _compressor = new Compressor();
/// Constructor.
- DataConverter({Converter<K> keyConverter, Converter<V> valueConverter})
+ MapToKVListConverter({Converter<K> keyConverter, Converter<V> valueConverter})
: _keyConverter = keyConverter ?? new Converter<K>(),
_valueConverter = valueConverter ?? new Converter<V>();
diff --git a/public/dart/sledge/lib/src/document/values/last_one_wins_value.dart b/public/dart/sledge/lib/src/document/values/last_one_wins_value.dart
index 9573d98..c12df00 100644
--- a/public/dart/sledge/lib/src/document/values/last_one_wins_value.dart
+++ b/public/dart/sledge/lib/src/document/values/last_one_wins_value.dart
@@ -66,12 +66,12 @@
/// Sledge Last One Wins value.
class LastOneWinsValue<T> implements LeafValue {
final _LastOneWinsValue _value;
- final DataConverter<int, T> _converter;
+ final MapToKVListConverter<int, T> _converter;
ValueObserver _observer;
/// Default constructor.
LastOneWinsValue([Change init])
- : _converter = new DataConverter<int, T>(),
+ : _converter = new MapToKVListConverter<int, T>(),
_value = new _LastOneWinsValue<T>(new Converter<T>().defaultValue) {
applyChange(init ?? new Change());
}
diff --git a/public/dart/sledge/lib/src/document/values/map_value.dart b/public/dart/sledge/lib/src/document/values/map_value.dart
index 2418c75..f8aedac 100644
--- a/public/dart/sledge/lib/src/document/values/map_value.dart
+++ b/public/dart/sledge/lib/src/document/values/map_value.dart
@@ -19,11 +19,11 @@
final KeyValueStorage<K, V> _map;
final StreamController<MapChange<K, V>> _changeController =
new StreamController<MapChange<K, V>>.broadcast();
- final DataConverter _converter;
+ final MapToKVListConverter _converter;
/// Creates a MapValue with provided [equals] as equality.
MapValue({bool equals(K key1, K key2), int hashCode(K key)})
- : _converter = new DataConverter<K, V>(),
+ : _converter = new MapToKVListConverter<K, V>(),
_map = new KeyValueStorage<K, V>(equals: equals, hashCode: hashCode);
@override
diff --git a/public/dart/sledge/lib/src/document/values/ordered_list_value.dart b/public/dart/sledge/lib/src/document/values/ordered_list_value.dart
index 3f2a116..6651927 100644
--- a/public/dart/sledge/lib/src/document/values/ordered_list_value.dart
+++ b/public/dart/sledge/lib/src/document/values/ordered_list_value.dart
@@ -130,12 +130,12 @@
final OrderedListTreePath _root = new OrderedListTreePath.root();
final StreamController<OrderedListChange<E>> _changeController =
new StreamController<OrderedListChange<E>>.broadcast();
- final DataConverter _converter;
+ final MapToKVListConverter _converter;
final bool Function(E, E) _equals;
/// Default constructor.
OrderedListValue(this._instanceId, {bool equals(E element1, E element2)})
- : _converter = new DataConverter<OrderedListTreePath, E>(
+ : _converter = new MapToKVListConverter<OrderedListTreePath, E>(
keyConverter: orderedListTreePathConverter),
_storage = new KeyValueStorage<OrderedListTreePath, E>(),
_equals = equals ?? ((E element1, E element2) => element1 == element2);
diff --git a/public/dart/sledge/lib/src/document/values/pos_neg_counter_value.dart b/public/dart/sledge/lib/src/document/values/pos_neg_counter_value.dart
index b287480..fc4830c 100644
--- a/public/dart/sledge/lib/src/document/values/pos_neg_counter_value.dart
+++ b/public/dart/sledge/lib/src/document/values/pos_neg_counter_value.dart
@@ -31,12 +31,12 @@
final StreamController<T> _changeController =
new StreamController<T>.broadcast();
static final _listEquality = new ListEquality();
- final DataConverter<Uint8List, T> _converter;
+ final MapToKVListConverter<Uint8List, T> _converter;
/// Default constructor.
PosNegCounterValue(this._currentInstanceId)
: _defaultValue = new Converter<T>().defaultValue,
- _converter = new DataConverter<Uint8List, T>(),
+ _converter = new MapToKVListConverter<Uint8List, T>(),
_storage = new KeyValueStorage<Uint8List, T>(
equals: _listEquality.equals, hashCode: _listEquality.hash) {
_sum = _defaultValue;
diff --git a/public/dart/sledge/lib/src/document/values/set_value.dart b/public/dart/sledge/lib/src/document/values/set_value.dart
index 83d043a..94a8216 100644
--- a/public/dart/sledge/lib/src/document/values/set_value.dart
+++ b/public/dart/sledge/lib/src/document/values/set_value.dart
@@ -17,7 +17,7 @@
// Stores elements of [this]. Each element is stored both in a key and in a
// value. It's done to provide an appropriate [lookup] method.
final KeyValueStorage<E, E> _map;
- final DataConverter<E, bool> _converter;
+ final MapToKVListConverter<E, bool> _converter;
final StreamController<SetChange<E>> _changeController =
new StreamController<SetChange<E>>.broadcast();
@@ -26,7 +26,7 @@
/// It should be coherent with encoding of [E] done by Converter.
SetValue({bool equals(E entry1, E entry2), int hashCode(E entry)})
: _map = new KeyValueStorage<E, E>(equals: equals, hashCode: hashCode),
- _converter = new DataConverter<E, bool>();
+ _converter = new MapToKVListConverter<E, bool>();
@override
Change getChange() => _converter.serialize(_removeValue(_map.getChange()));
diff --git a/public/dart/sledge/test/values/converter_test.dart b/public/dart/sledge/test/values/converter_test.dart
index e2408dd..3e95c8f 100644
--- a/public/dart/sledge/test/values/converter_test.dart
+++ b/public/dart/sledge/test/values/converter_test.dart
@@ -64,7 +64,7 @@
});
test('data converter', () {
- final conv = new DataConverter<String, int>();
+ final conv = new MapToKVListConverter<String, int>();
final longBuffer = new StringBuffer();
for (int i = 0; i < 100; i++) {
longBuffer.write('$i');
diff --git a/public/dart/sledge/test/values/last_one_wins_values_test.dart b/public/dart/sledge/test/values/last_one_wins_values_test.dart
index c341c2a..64c9281 100644
--- a/public/dart/sledge/test/values/last_one_wins_values_test.dart
+++ b/public/dart/sledge/test/values/last_one_wins_values_test.dart
@@ -63,7 +63,7 @@
});
test('Integer oprations', () {
- final conv = new DataConverter<int, int>();
+ final conv = new MapToKVListConverter<int, int>();
final x = new LastOneWinsValue<int>(
conv.serialize(new ConvertedChange<int, int>({0: -3})));
expect(x.value, equals(-3));
@@ -80,7 +80,7 @@
});
test('Double operations', () {
- final conv = new DataConverter<int, double>();
+ final conv = new MapToKVListConverter<int, double>();
final x = new LastOneWinsValue<double>(
conv.serialize(new ConvertedChange<int, double>({0: -3.5})));
expect(x.value, equals(-3.5));
@@ -97,7 +97,7 @@
});
test('String operations', () {
- final conv = new DataConverter<int, String>();
+ final conv = new MapToKVListConverter<int, String>();
final x = new LastOneWinsValue<String>(
conv.serialize(new ConvertedChange<int, String>({0: 'bar'})));
expect(x.value, equals('bar'));
@@ -114,7 +114,7 @@
});
test('Boolean operations', () {
- final conv = new DataConverter<int, bool>();
+ final conv = new MapToKVListConverter<int, bool>();
final x = new LastOneWinsValue<bool>(
conv.serialize(new ConvertedChange<int, bool>({0: true})));
expect(x.value, equals(true));
@@ -129,7 +129,7 @@
});
test('onChange stream', () {
- final conv = new DataConverter<int, String>();
+ final conv = new MapToKVListConverter<int, String>();
final x = new LastOneWinsValue<String>(
conv.serialize(new ConvertedChange<int, String>({0: 'aba'})));
Stream<String> changeStream = x.onChange;
diff --git a/public/dart/sledge/test/values/pos_neg_counter_test.dart b/public/dart/sledge/test/values/pos_neg_counter_test.dart
index d1ba9d3..fcd359f 100644
--- a/public/dart/sledge/test/values/pos_neg_counter_test.dart
+++ b/public/dart/sledge/test/values/pos_neg_counter_test.dart
@@ -68,7 +68,7 @@
});
test('PosNegCounterValue construction', () {
- DataConverter conv = new DataConverter<Uint8List, int>();
+ final conv = new MapToKVListConverter<Uint8List, int>();
final cnt = new PosNegCounterValue<int>(id1)
..applyChange(conv.serialize(new ConvertedChange<Uint8List, int>(
_newIntMap()
@@ -78,7 +78,7 @@
});
test('PosNegCounterValue construction 2', () {
- DataConverter conv = new DataConverter<Uint8List, int>();
+ final conv = new MapToKVListConverter<Uint8List, int>();
final cnt = new PosNegCounterValue<int>(id1)
..applyChange(conv.serialize(new ConvertedChange<Uint8List, int>(
_newIntMap()
@@ -90,7 +90,7 @@
});
test('PosNegCounterValue construction double', () {
- DataConverter conv = new DataConverter<Uint8List, double>();
+ final conv = new MapToKVListConverter<Uint8List, double>();
final cnt = new PosNegCounterValue<double>(id1)
..applyChange(conv.serialize(new ConvertedChange<Uint8List, double>(
newUint8ListMap<double>()
@@ -102,7 +102,7 @@
});
test('PosNegCounterValue applyChange', () {
- DataConverter conv = new DataConverter<Uint8List, int>();
+ final conv = new MapToKVListConverter<Uint8List, int>();
final cnt = new PosNegCounterValue<int>(id1);
expect(cnt.value, equals(0));
cnt.applyChange(conv.serialize(new ConvertedChange<Uint8List, int>(
@@ -117,7 +117,7 @@
});
test('PosNegCounterValue onChange stream', () {
- DataConverter conv = new DataConverter<Uint8List, int>();
+ final conv = new MapToKVListConverter<Uint8List, int>();
final cnt = new PosNegCounterValue<int>(id1)
..applyChange(conv.serialize(new ConvertedChange<Uint8List, int>(
_newIntMap()
