external types: allow only external name #139

Author: greenrobot-team

generator/lib/src/entity_resolver.dart

@@ -203,10 +203,6 @@ class EntityResolver extends Builder {
         // @ExternalName
         String? externalName;
         _externalNameChecker.runIfMatches(annotated, (annotation) {
-          if (externalType == null) {
-            throw InvalidGenerationSourceError(
-                "@ExternalName annotation requires @ExternalType annotation to be present");
-          }
           externalName = _readExternalNameParams(annotation);
         });
 
@@ -265,12 +261,7 @@ class EntityResolver extends Builder {
 
         // @ExternalName
         _externalNameChecker.runIfMatches(annotated, (annotation) {
-          if (prop.externalType == null) {
-            throw InvalidGenerationSourceError(
-                "@ExternalName annotation requires @ExternalType annotation to be present");
-          }
-          final externalName = _readExternalNameParams(annotation);
-          prop.externalName = externalName;
+          prop.externalName = _readExternalNameParams(annotation);
         });
 
         // for code generation

generator/test/code_builder_test.dart

@@ -464,31 +464,6 @@ void main() {
       expect(relation2.externalName, "my-courses-rel");
     });
   });
-
-  test('Only ExternalName annotation fails', () async {
-    final source = r'''
-      library example;     
-      import 'package:objectbox/objectbox.dart';
-      
-      @Entity()
-      class Example {
-        @Id()
-        int id = 0;
-        
-        @ExternalName(name: 'my-mongo-uuid')
-        List<int>? mongoUuid;
-      }
-      ''';
-
-    final testEnv = GeneratorTestEnv();
-    await expectLater(
-        () async => await testEnv.run(source),
-        throwsA(isA<InvalidGenerationSourceError>().having(
-            (e) => e.message,
-            'message',
-            contains(
-                "@ExternalName annotation requires @ExternalType annotation to be present"))));
-  });
 }
 
 Future<PackageConfig> _unsupported() {

objectbox/lib/src/native/model.dart

@@ -144,13 +144,13 @@ class Model {
         _cModel, rel.id.id, rel.id.uid, rel.targetId.id, rel.targetId.uid));
     if (rel.externalType != null) {
       _check(C.model_relation_external_type(_cModel, rel.externalType!));
-      if (rel.externalName != null) {
-        final externalName = rel.externalName!.toNativeUtf8();
-        try {
-          _check(C.model_relation_external_name(_cModel, externalName.cast()));
-        } finally {
-          calloc.free(externalName);
-        }
+    }
+    final externalName = rel.externalName?.toNativeUtf8();
+    if (externalName != null) {
+      try {
+        _check(C.model_relation_external_name(_cModel, externalName.cast()));
+      } finally {
+        calloc.free(externalName);
       }
     }
   }