[Refactor] generation of abstract DTO and POCO; fixes #14

Author: samatrhea

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Connector.cs

@@ -449,7 +449,7 @@ public List<FeatureMembership> QueryOwnedFeatureMembership()
         /// <summary>
         /// Queries the derived property OwnedImport
         /// </summary>
-        public List<Import> QueryOwnedImport()
+        public List<IImport> QueryOwnedImport()
         {
             throw new NotImplementedException("Derived property OwnedImport not yet supported");
         }

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Feature.cs

@@ -435,7 +435,7 @@ public List<FeatureMembership> QueryOwnedFeatureMembership()
         /// <summary>
         /// Queries the derived property OwnedImport
         /// </summary>
-        public List<Import> QueryOwnedImport()
+        public List<IImport> QueryOwnedImport()
         {
             throw new NotImplementedException("Derived property OwnedImport not yet supported");
         }

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/LiteralInteger.cs

@@ -434,7 +434,7 @@ public List<FeatureMembership> QueryOwnedFeatureMembership()
         /// <summary>
         /// Queries the derived property OwnedImport
         /// </summary>
-        public List<Import> QueryOwnedImport()
+        public List<IImport> QueryOwnedImport()
         {
             throw new NotImplementedException("Derived property OwnedImport not yet supported");
         }

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/LiteralRational.cs

@@ -432,7 +432,7 @@ public List<FeatureMembership> QueryOwnedFeatureMembership()
         /// <summary>
         /// Queries the derived property OwnedImport
         /// </summary>
-        public List<Import> QueryOwnedImport()
+        public List<IImport> QueryOwnedImport()
         {
             throw new NotImplementedException("Derived property OwnedImport not yet supported");
         }

SysML2.NET.CodeGenerator/Generators/HandleBarsGenerators/DtoGenerator.cs

@@ -1,7 +1,7 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="DtoGenerator.cs" company="RHEA System S.A.">
 //
-//   Copyright 2022 RHEA System S.A.
+//   Copyright 2022-2023 RHEA System S.A.
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 namespace SysML2.NET.CodeGenerator.Generators.HandleBarsGenerators
 {
+    using System;
     using System.Linq;
     using System.Threading.Tasks;
 
@@ -90,8 +91,8 @@ public async Task<string> GenerateInterface(EPackage package, DirectoryInfo outp
         public async Task GenerateClasses(EPackage package, DirectoryInfo outputDirectory)
         {
             var template = this.Templates["dto-class-template"];
-
-            foreach (var eClass in package.EClassifiers.OfType<EClass>())
+            
+            foreach (var eClass in package.EClassifiers.OfType<EClass>().Where(x => !x.Abstract))
             {
                 var generatedClass = template(eClass);
 
@@ -108,7 +109,12 @@ public async Task<string> GenerateClass(EPackage package, DirectoryInfo outputDi
             var template = this.Templates["dto-class-template"];
 
             var eClass = package.EClassifiers.OfType<EClass>().Single(x => x.Name == className);
-            
+
+            if (eClass.Abstract)
+            {
+                throw new InvalidOperationException("DTO should not be abstract");
+            }
+
             var generatedClass = template(eClass);
 
             generatedClass = CodeCleanup(generatedClass);

SysML2.NET.CodeGenerator/Generators/HandleBarsGenerators/PocoGenerator.cs

@@ -1,7 +1,7 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="PocoGenerator.cs" company="RHEA System S.A.">
 // 
-//   Copyright 2022 RHEA System S.A.
+//   Copyright 2022-2023 RHEA System S.A.
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@ namespace SysML2.NET.CodeGenerator.Generators.HandleBarsGenerators
 
     using SysML2.NET.CodeGenerator.Extensions;
     using SysML2.NET.CodeGenerator.HandleBarHelpers;
+    using System;
 
     /// <summary>
     /// A Handlebars based POCO code generator
@@ -127,7 +128,7 @@ public async Task GenerateClasses(EPackage package, DirectoryInfo outputDirector
         {
             var template = this.Templates["poco-class-template"];
 
-            foreach (var eClass in package.EClassifiers.OfType<EClass>())
+            foreach (var eClass in package.EClassifiers.OfType<EClass>().Where(x => !x.Abstract))
             {
                 var generatedCode = template(eClass);
 
@@ -156,7 +157,12 @@ public async Task<string> GenerateClass(EPackage package, DirectoryInfo outputDi
             var template = this.Templates["poco-class-template"];
 
             var eClass = package.EClassifiers.OfType<EClass>().Single(x => x.Name == className);
-            
+
+            if (eClass.Abstract)
+            {
+                throw new InvalidOperationException("POCO should not be abstract");
+            }
+
             var generatedCode = template(eClass);
 
             generatedCode = CodeCleanup(generatedCode);

SysML2.NET.CodeGenerator/HandleBarHelpers/TypeNameHelper.cs

@@ -18,6 +18,8 @@
 // </copyright>
 // ------------------------------------------------------------------------------------------------
 
+using Microsoft.CodeAnalysis.VisualBasic.Syntax;
+
 namespace SysML2.NET.CodeGenerator.HandleBarHelpers
 {
     using System;
@@ -113,6 +115,13 @@ public static void RegisterTypeNameHelper(this IHandlebars handlebars)
                 }
                 else if (eStructuralFeature is EReference)
                 {
+                    var @class = eStructuralFeature.QueryClass();
+                    
+                    if (@class.Abstract)
+                    {
+                        typeName = $"I{typeName}";
+                    }
+
                     if (enumerable)
                     {
                         writer.WriteSafeString($"List<{typeName}>");

SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj

@@ -19,7 +19,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ECoreNetto.HandleBars" Version="0.3.1" />
+		<PackageReference Include="ECoreNetto.HandleBars" Version="0.4.0" />
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
 		<PackageReference Include="RazorLight" Version="2.3.0" />
 		<PackageReference Include="Microsoft.CodeAnalysis" Version="4.4.0" />

SysML2.NET.CodeGenerator/Templates/dto-class-template.hbs

@@ -30,7 +30,7 @@ namespace SysML2.NET.Core.DTO
     using SysML2.NET.Core;
 
     {{ #Documentation this }}
-    public {{#if this.Abstract}}abstract {{/if}}partial class {{ this.Name }} : I{{ this.Name }}
+    public partial class {{ this.Name }} : I{{ this.Name }}
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="{{ this.Name }}"/> class.

SysML2.NET.CodeGenerator/Templates/poco-class-template.hbs

@@ -30,12 +30,12 @@ namespace SysML2.NET.Core.POCO
     using SysML2.NET.Core;
 
     {{ #Documentation this }}
-    public {{#if this.Abstract}}abstract {{/if}}partial class {{ this.Name }} : I{{ this.Name }}
+    public partial class {{ this.Name }} : I{{ this.Name }}
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="{{ this.Name }}"/> class.
         /// </summary>
-        {{#if this.Abstract}}protected {{else}}public{{/if}} {{ this.Name }}()
+        public {{ this.Name }}()
         {
             {{#each this.AllEStructuralFeaturesOrderByName as | structuralFeature |}}
             {{#unless structuralFeature.Derived }}