Made version 2.1 of ZUGFeRD obsolete, will be removed in the next major version

Author: stephanstapel

ZUGFeRD-Test/BasicTests.cs

@@ -103,7 +103,7 @@ public void TestGetVersion()
 
             path = @"..\..\..\..\demodata\zugferd21\zugferd_2p1_BASIC_Einfach-factur-x.xml";
             path = _makeSurePathIsCrossPlatformCompatible(path);
-            Assert.AreEqual(InvoiceDescriptor.GetVersion(path), ZUGFeRDVersion.Version21);
+            Assert.AreEqual(InvoiceDescriptor.GetVersion(path), ZUGFeRDVersion.Version22);
         } // !TestGetVersion()
     }
 }

ZUGFeRD-Test/ZUGFeRD21Tests.cs renamed to ZUGFeRD-Test/ZUGFeRD22Tests.cs

@@ -330,16 +330,16 @@ public static ZUGFeRDVersion GetVersion(string filename)
                 return ZUGFeRDVersion.Version1;
             }
 
-            reader = new InvoiceDescriptor21UblReader();
+            reader = new InvoiceDescriptor22UblReader();
             if (reader.IsReadableByThisReaderVersion(filename))
             {
-                return ZUGFeRDVersion.Version21;
+                return ZUGFeRDVersion.Version22;
             }
 
-            reader = new InvoiceDescriptor21Reader();
+            reader = new InvoiceDescriptor22Reader();
             if (reader.IsReadableByThisReaderVersion(filename))
             {
-                return ZUGFeRDVersion.Version21;
+                return ZUGFeRDVersion.Version22;
             }
 
             reader = new InvoiceDescriptor20Reader();
@@ -369,16 +369,16 @@ public static ZUGFeRDVersion GetVersion(Stream stream)
                 return ZUGFeRDVersion.Version1;
             }
 
-            reader = new InvoiceDescriptor21UblReader();
+            reader = new InvoiceDescriptor22UblReader();
             if (reader.IsReadableByThisReaderVersion(stream))
             {
-                return ZUGFeRDVersion.Version21;
+                return ZUGFeRDVersion.Version22;
             }
 
-            reader = new InvoiceDescriptor21Reader();
+            reader = new InvoiceDescriptor22Reader();
             if (reader.IsReadableByThisReaderVersion(stream))
             {
-                return ZUGFeRDVersion.Version21;
+                return ZUGFeRDVersion.Version22;
             }
 
             reader = new InvoiceDescriptor20Reader();
@@ -409,13 +409,13 @@ public static InvoiceDescriptor Load(Stream stream)
                 return reader.Load(stream);
             }
 
-            reader = new InvoiceDescriptor21UblReader();
+            reader = new InvoiceDescriptor22UblReader();
             if (reader.IsReadableByThisReaderVersion(stream))
             {
                 return reader.Load(stream);
             }
 
-            reader = new InvoiceDescriptor21Reader();
+            reader = new InvoiceDescriptor22Reader();
             if (reader.IsReadableByThisReaderVersion(stream))
             {
                 return reader.Load(stream);
@@ -448,13 +448,13 @@ public static InvoiceDescriptor Load(string filename)
                 return reader.Load(filename);
             }
 
-            reader = new InvoiceDescriptor21UblReader();
+            reader = new InvoiceDescriptor22UblReader();
             if (reader.IsReadableByThisReaderVersion(filename))
             {
                 return reader.Load(filename);
             }
 
-            reader = new InvoiceDescriptor21Reader();
+            reader = new InvoiceDescriptor22Reader();
             if (reader.IsReadableByThisReaderVersion(filename))
             {
                 return reader.Load(filename);
@@ -882,8 +882,8 @@ private IInvoiceDescriptorWriter _selectInvoiceDescriptorWriter(ZUGFeRDVersion v
                     return new InvoiceDescriptor1Writer();
                 case ZUGFeRDVersion.Version20:
                     return new InvoiceDescriptor20Writer();
-                case ZUGFeRDVersion.Version21:
-                    return new InvoiceDescriptor21Writer();
+                case ZUGFeRDVersion.Version22:
+                    return new InvoiceDescriptor22Writer();
                 default:
                     throw new UnsupportedException("New ZUGFeRDVersion '" + version + "' defined but not implemented!");
             }

ZUGFeRD/InvoiceDescriptor.cs

@@ -28,7 +28,7 @@
 
 namespace s2industries.ZUGFeRD
 {
-  internal class InvoiceDescriptor21Reader : IInvoiceDescriptorReader
+  internal class InvoiceDescriptor22Reader : IInvoiceDescriptorReader
   {
     /// <summary>
     /// Parses the ZUGFeRD invoice from the given stream.

ZUGFeRD/InvoiceDescriptor21Reader.cs renamed to ZUGFeRD/InvoiceDescriptor22Reader.cs

@@ -28,7 +28,7 @@
 
 namespace s2industries.ZUGFeRD
 {
-  internal class InvoiceDescriptor21UblReader : IInvoiceDescriptorReader
+  internal class InvoiceDescriptor22UblReader : IInvoiceDescriptorReader
   {
     /// <summary>
     /// Parses the ZUGFeRD invoice from the given stream.

ZUGFeRD/InvoiceDescriptor21UblReader.cs renamed to ZUGFeRD/InvoiceDescriptor22UblReader.cs

@@ -27,7 +27,7 @@
 
 namespace s2industries.ZUGFeRD
 {
-    internal class InvoiceDescriptor21Writer : IInvoiceDescriptorWriter
+    internal class InvoiceDescriptor22Writer : IInvoiceDescriptorWriter
     {
         private ProfileAwareXmlTextWriter Writer;
         private InvoiceDescriptor Descriptor;

ZUGFeRD/InvoiceDescriptor21Writer.cs renamed to ZUGFeRD/InvoiceDescriptor22Writer.cs

@@ -151,6 +151,7 @@ public static string EnumToString(this Profile profile, ZUGFeRDVersion version)
                         default: throw new Exception("Unsupported profile for ZUGFeRD version 20");
                     }
                 case ZUGFeRDVersion.Version21:
+                case ZUGFeRDVersion.Version22:
                     switch (profile)
                     {
                         case Profile.Minimum: return "urn:factur-x.eu:1p0:minimum";

ZUGFeRD/Profile.cs

@@ -31,13 +31,21 @@ public enum ZUGFeRDVersion
         /// Version 1.x - first public ZUGFeRD version
         /// </summary>
         Version1 = 100,
+        
         /// <summary>
         /// Version 2.0 - second major ZUGFeRD version 
         /// </summary>
         Version20 = 200,
+
         /// <summary>
         /// Version 2.1 - unified with french factur-x 1.0, supports XRechnung
         /// </summary>
-        Version21 = 210
+        [Obsolete("Will be removed in the next version")]
+        Version21 = 210,
+
+        /// <summary>
+        /// Version 2.2 - unified with french factur-x 1.0, supports XRechnung
+        /// </summary>
+        Version22 = 220
     }
 }