warnings

klee-contrib · Oct 25, 2023 · af144de · af144de
1 parent cd6ba6e
commit af144de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/TopModel.Generator.Core/GeneratorBase.cs b/TopModel.Generator.Core/GeneratorBase.cs
@@ -71,11 +71,6 @@ public void OnFilesChanged(IEnumerable<ModelFile> files, LoggingScope? storeConf
         HandleFiles(handledFiles);
     }
 
-    protected string GetBestClassTag(Class classe, string tag)
-    {
-        return classe.Tags.Contains(tag) ? tag : classe.Tags.Intersect(Config.Tags).FirstOrDefault() ?? tag;
-    }
-
     protected IEnumerable<ClassValue> GetAllValues(Class classe)
     {
         foreach (var value in classe.Values)
@@ -92,5 +87,10 @@ protected IEnumerable<ClassValue> GetAllValues(Class classe)
         }
     }
 
+    protected string GetBestClassTag(Class classe, string tag)
+    {
+        return classe.Tags.Contains(tag) ? tag : classe.Tags.Intersect(Config.Tags).FirstOrDefault() ?? tag;
+    }
+
     protected abstract void HandleFiles(IEnumerable<ModelFile> files);
 }
diff --git a/TopModel.Generator.Jpa/JpaDaoGenerator.cs b/TopModel.Generator.Jpa/JpaDaoGenerator.cs
@@ -51,7 +51,7 @@ protected override void HandleClass(string fileName, Class classe, string tag)
         fw.WriteLine();
         if (Config.CanClassUseEnums(classe))
         {
-            fw.AddImport($"{Config.GetEnumPackageName(classe, tag)}.{Config.GetType(classe.PrimaryKey.SingleOrDefault() ?? classe.Extends?.PrimaryKey.SingleOrDefault())}");
+            fw.AddImport($"{Config.GetEnumPackageName(classe, tag)}.{Config.GetType(classe.PrimaryKey.SingleOrDefault() ?? classe.Extends!.PrimaryKey.Single())}");
         }
 
         string pk;