Added typeId property to HiveType (#163)

example/lib/main.dart

@@ -4,7 +4,7 @@ import 'package:hive/hive.dart';
 
 part 'main.g.dart';
 
-@HiveType()
+@HiveType(typeId: 1)
 class Person {
   @HiveField(0)
   String name;
@@ -23,7 +23,9 @@ class Person {
 
 void main() async {
   var path = Directory.current.path;
-  Hive.init(path);
+  Hive
+    ..init(path)
+    ..registerAdapter(PersonAdapter());
 
   var box = await Hive.openBox('testBox');
 

lib/src/adapters/big_int_adapter.dart

@@ -1,6 +1,9 @@
 import 'package:hive/hive.dart';
 
 class BigIntAdapter extends TypeAdapter<BigInt> {
+  @override
+  int get typeId => 17;
+
   @override
   BigInt read(BinaryReader reader) {
     var len = reader.readByte();

lib/src/adapters/date_time_adapter.dart

@@ -1,6 +1,9 @@
 import 'package:hive/hive.dart';
 
 class DateTimeAdapter extends TypeAdapter<DateTime> {
+  @override
+  int get typeId => 16;
+
   @override
   DateTime read(BinaryReader reader) {
     var micros = reader.readInt();

lib/src/annotations/hive_type.dart

@@ -2,9 +2,11 @@ part of hive;
 
 /// Annotate classes with [HiveType] to generate a `TypeAdapter`.
 class HiveType {
+  final int typeId;
+
   /// The name of the generated adapter.
   final String adapterName;
 
   /// If [adapterName] is not set, it'll be `"YourClass" + "Adapter"`.
-  const HiveType({this.adapterName});
+  const HiveType({@required this.typeId, this.adapterName});
 }

lib/src/hive_impl.dart

@@ -32,8 +32,8 @@ class HiveImpl extends TypeRegistryImpl implements HiveInterface {
   }
 
   void _registerDefaultAdapters() {
-    registerInternal(DateTimeAdapter(), 16);
-    registerInternal(BigIntAdapter(), 17);
+    registerInternal(DateTimeAdapter());
+    registerInternal(BigIntAdapter());
   }
 
   @override

lib/src/registry/type_adapter.dart

@@ -3,6 +3,9 @@ part of hive;
 /// Type adapters can be implemented to support non primitive values.
 @immutable
 abstract class TypeAdapter<T> {
+  /// Called for type registration
+  int get typeId;
+
   /// Is called when a value has to be decoded.
   T read(BinaryReader reader);
 

lib/src/registry/type_registry.dart

@@ -7,5 +7,5 @@ abstract class TypeRegistry {
   /// Register a [TypeAdapter] to announce it to Hive.
   ///
   /// This is a necessary step before custom adapter can be used by Hive.
-  void registerAdapter<T>(TypeAdapter<T> adapter, int typeId);
+  void registerAdapter<T>(TypeAdapter<T> adapter, [int typeId]);
 }

lib/src/registry/type_registry_impl.dart

@@ -28,23 +28,23 @@ class TypeRegistryImpl implements TypeRegistry {
   }
 
   @override
-  void registerAdapter<T>(TypeAdapter<T> adapter, int typeId) {
-    if (typeId < 0 || typeId > 223) {
-      throw HiveError('TypeId $typeId not allowed.');
+  void registerAdapter<T>(TypeAdapter<T> adapter, [int typeId]) {
+    if (adapter.typeId < 0 || adapter.typeId > 223) {
+      throw HiveError('TypeId ${adapter.typeId} not allowed.');
     }
 
-    var updatedTypeId = typeId + reservedTypeIds;
+    var updatedTypeId = adapter.typeId + reservedTypeIds;
 
     if (findAdapterForTypeId(updatedTypeId) != null) {
       throw HiveError('There is already a TypeAdapter for typeId $typeId.');
     }
 
-    registerInternal(adapter, updatedTypeId);
+    registerInternal(adapter);
   }
 
-  void registerInternal<T>(TypeAdapter<T> adapter, int typeId) {
-    var resolved = _ResolvedAdapter<T>(adapter, typeId);
-    _typeAdapters[typeId] = resolved;
+  void registerInternal<T>(TypeAdapter<T> adapter) {
+    var resolved = _ResolvedAdapter<T>(adapter, adapter.typeId);
+    _typeAdapters[adapter.typeId] = resolved;
   }
 
   void resetAdapters() {

test/integration/hive_list_test.dart

@@ -18,6 +18,9 @@ class _TestObject extends HiveObject {
 }
 
 class _TestObjectAdapter extends TypeAdapter<_TestObject> {
+  @override
+  int get typeId => 0;
+
   @override
   _TestObject read(BinaryReader reader) {
     return _TestObject(reader.read() as String)

test/integration/hive_object_test.dart

@@ -14,6 +14,9 @@ class _TestObject extends HiveObject {
 }
 
 class _TestObjectAdapter extends TypeAdapter<_TestObject> {
+  @override
+  int get typeId => 0;
+
   @override
   _TestObject read(BinaryReader reader) {
     return _TestObject(reader.readString());

test/tests/registry/type_registry_impl_test.dart

@@ -5,6 +5,11 @@ import 'package:test/test.dart';
 import '../common.dart';
 
 class TestAdapter extends TypeAdapter<int> {
+  TestAdapter([this.typeId = 0]);
+
+  @override
+  final int typeId;
+
   @override
   int read(BinaryReader reader) {
     return 5;
@@ -15,6 +20,9 @@ class TestAdapter extends TypeAdapter<int> {
 }
 
 class TestAdapter2 extends TypeAdapter<int> {
+  @override
+  int get typeId => 1;
+
   @override
   int read(BinaryReader reader) {
     return 5;
@@ -39,9 +47,9 @@ void main() {
 
       test('unsupported typeId', () {
         var registry = TypeRegistryImpl();
-        expect(() => registry.registerAdapter(TestAdapter(), -1),
+        expect(() => registry.registerAdapter(TestAdapter(-1), -1),
             throwsHiveError('not allowed'));
-        expect(() => registry.registerAdapter(TestAdapter(), 224),
+        expect(() => registry.registerAdapter(TestAdapter(224), 224),
             throwsHiveError('not allowed'));
       });