From f2d8532e46b57e2dfa79fd89fe4772f5ca3565ed Mon Sep 17 00:00:00 2001
From: "Michael A. Vickers" <mavickers@lightpathllc.com>
Date: Tue, 16 Aug 2022 15:11:10 -0400
Subject: [PATCH] Change package shape from new() to class.

---
 Cargo.Tests/Unit/Common/ContentModels.cs | 10 ++++++++
 Cargo.Tests/Unit/Package.cs              | 29 +++++++++++++++---------
 Cargo/Bus.cs                             |  8 +++----
 Cargo/Package.cs                         |  2 +-
 Cargo/Station.cs                         |  2 +-
 5 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/Cargo.Tests/Unit/Common/ContentModels.cs b/Cargo.Tests/Unit/Common/ContentModels.cs
index ee22a3e..c819197 100644
--- a/Cargo.Tests/Unit/Common/ContentModels.cs
+++ b/Cargo.Tests/Unit/Common/ContentModels.cs
@@ -27,4 +27,14 @@ public ContentModel1()
             Int1 = 0;
         }
     }
+
+    public class ContentModel2
+    {
+        public string String1 { get; set; }
+
+        public ContentModel2(string string1)
+        {
+            String1 = string1;
+        }
+    }
 }
diff --git a/Cargo.Tests/Unit/Package.cs b/Cargo.Tests/Unit/Package.cs
index ed912c2..3e30edb 100644
--- a/Cargo.Tests/Unit/Package.cs
+++ b/Cargo.Tests/Unit/Package.cs
@@ -9,21 +9,28 @@ public class Package
         [Fact]
         public void Instantiation()
         {
-            Package<ContentModel1> package;
+            Package<ContentModel1> package1;
+            Package<ContentModel2> package2;
 
-            var contents = new ContentModel1();
+            var contents1 = new ContentModel1();
 
-            Assert.Throws<ArgumentException>(() => package = Cargo.Package.New<ContentModel1>());
+            Assert.Throws<ArgumentException>(() => package1 = Cargo.Package.New<ContentModel1>());
 
-            package = Cargo.Package.New<ContentModel1>(contents);
+            package1 = Cargo.Package.New<ContentModel1>(contents1);
 
-            Assert.False(package.IsAborted);
-            Assert.False(package.IsErrored);
-            Assert.Null(package.LastStationResult);
-            Assert.NotNull(package.Results);
-            Assert.Empty(package.Results);
-            Assert.Equal(package.Contents, contents);
-            Assert.Null(package.AbortedWith);
+            Assert.False(package1.IsAborted);
+            Assert.False(package1.IsErrored);
+            Assert.Null(package1.LastStationResult);
+            Assert.NotNull(package1.Results);
+            Assert.Empty(package1.Results);
+            Assert.Equal(package1.Contents, contents1);
+            Assert.Null(package1.AbortedWith);
+
+            var contents2 = new ContentModel2("testing123");
+
+            package2 = Cargo.Package.New<ContentModel2>(contents2);
+
+            Assert.Equal("testing123", package2.Contents.String1);
         }
     }
 }
diff --git a/Cargo/Bus.cs b/Cargo/Bus.cs
index ed6ca8f..c1294b7 100644
--- a/Cargo/Bus.cs
+++ b/Cargo/Bus.cs
@@ -8,12 +8,12 @@ namespace LightPath.Cargo
 {
     public static class Bus
     {
-        public static Bus<TContent> New<TContent>() where TContent : new()
+        public static Bus<TContent> New<TContent>() where TContent : class
         {
             return Bus<TContent>.New();
         }
 
-        internal static Bus<TContent> SetAndReturn<TContent>(this Bus<TContent> bus, string propertyName, object value) where TContent : new()
+        internal static Bus<TContent> SetAndReturn<TContent>(this Bus<TContent> bus, string propertyName, object value) where TContent : class
         {
             var property = typeof(Bus<TContent>).GetProperty(propertyName, BindingFlags.NonPublic | BindingFlags.Instance);
 
@@ -25,7 +25,7 @@ public static class Bus
         }
     }
 
-    public class Bus<TContent> where TContent : new()
+    public class Bus<TContent> where TContent : class
     {
         private Type _finalStation { get; set; }
         private Package<TContent> _package { get; set; }
@@ -122,7 +122,7 @@ public Bus<TContent> WithService<TService>(TService service)
             return this;
         }
 
-        public Bus<TContent> WithStation<TStation>() where TStation : new()
+        public Bus<TContent> WithStation<TStation>() where TStation : class
         {
             _stations.Add(typeof(TStation));
 
diff --git a/Cargo/Package.cs b/Cargo/Package.cs
index 0c25c2d..1053d5d 100644
--- a/Cargo/Package.cs
+++ b/Cargo/Package.cs
@@ -6,7 +6,7 @@ namespace LightPath.Cargo
 {
     public static class Package
     {
-        public static Package<TContents> New<TContents>(params object[] parameters) where TContents : new()
+        public static Package<TContents> New<TContents>(params object[] parameters) where TContents : class
         {
             return Package<TContents>.New(parameters);
         }
diff --git a/Cargo/Station.cs b/Cargo/Station.cs
index 1a9464d..4d94d0f 100644
--- a/Cargo/Station.cs
+++ b/Cargo/Station.cs
@@ -24,7 +24,7 @@ public enum Output
 
         public static class Result
         {
-            public static Result<T> New<T>(Station<T> station, Output output, Exception exception = null) where T : new()
+            public static Result<T> New<T>(Station<T> station, Output output, Exception exception = null) where T : class
             {
                 return new Result<T>(station, output, exception);
             }