Miho/post spec conf ascii doc redo query test

src/AasCore.Aas3_0/DiaryData/ITaintedData.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AdminShellNS.DiaryData
+{
+    public interface ITaintedData
+    {
+        TaintedDataDef TaintedData { get; }
+    }
+}

src/AasCore.Aas3_0/DiaryData/TaintedDataDef.cs

@@ -0,0 +1,45 @@
+using AasCore.Aas3_0;
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using System.Xml.Serialization;
+
+namespace AdminShellNS.DiaryData
+{
+    public class TaintedDataDef
+    {
+        [XmlIgnore]
+        [JsonIgnore]
+        private DateTime? _tainted = null;
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public DateTime? Tainted
+        {
+            get { return _tainted; }
+            set { _tainted = value; }
+        }
+
+        public static void TaintIdentifiable(IReferable element)
+        {
+            // trivial
+            if (element == null)
+                return;
+
+            // find identifiable
+            var el = element;
+            while (el != null)
+            {
+                // found?
+                if (el is IIdentifiable && el is ITaintedData itd)
+                {
+                    itd.TaintedData.Tainted = DateTime.UtcNow;
+                    return;
+                }
+
+                // up
+                el = (el as IReferable)?.Parent as IReferable;
+            }
+        }
+    }
+}

src/AasCore.Aas3_0/types.cs

@@ -469,7 +469,7 @@ public interface IReferable : IHasExtensions, IDiaryData
     /// <summary>
     /// An element that has a globally unique identifier.
     /// </summary>
-    public interface IIdentifiable : IReferable
+    public interface IIdentifiable : IReferable, ITaintedData
     {
         /// <summary>
         /// Administrative information of an identifiable element.
@@ -1317,6 +1317,12 @@ public class AssetAdministrationShell : IAssetAdministrationShell
         [JsonIgnore]
         public DiaryDataDef DiaryData { get { return _diaryData; } }
 
+        [JsonIgnore]
+        private TaintedDataDef _taintedData = new TaintedDataDef();
+
+        [JsonIgnore]
+        public TaintedDataDef TaintedData { get { return _taintedData; } }
+
         #endregion
 
         /// <summary>
@@ -2460,6 +2466,12 @@ public class Submodel : ISubmodel
         [JsonIgnore]
         public DiaryDataDef DiaryData { get { return _diaryData; } }
 
+        [JsonIgnore]
+        private TaintedDataDef _taintedData = new TaintedDataDef();
+
+        [JsonIgnore]
+        public TaintedDataDef TaintedData { get { return _taintedData; } }
+
         #endregion
 
         /// <summary>
@@ -10741,6 +10753,12 @@ public class ConceptDescription : IConceptDescription
         [JsonIgnore]
         public DiaryDataDef DiaryData { get { return _diaryData; } }
 
+        [JsonIgnore]
+        private TaintedDataDef _taintedData = new TaintedDataDef();
+
+        [JsonIgnore]
+        public TaintedDataDef TaintedData { get { return _taintedData; } }
+
         #endregion
 
         /// <summary>
@@ -11910,17 +11928,17 @@ public interface IEnvironment : IClass, IDiaryData
         /// <summary>
         /// Asset administration shell
         /// </summary>
-        public List<IAssetAdministrationShell>? AssetAdministrationShells { get; set; }
+        public IList<IAssetAdministrationShell>? AssetAdministrationShells { get; set; }
 
         /// <summary>
         /// Submodel
         /// </summary>
-        public List<ISubmodel>? Submodels { get; set; }
+        public IList<ISubmodel>? Submodels { get; set; }
 
         /// <summary>
         /// Concept description
         /// </summary>
-        public List<IConceptDescription>? ConceptDescriptions { get; set; }
+        public IList<IConceptDescription>? ConceptDescriptions { get; set; }
 
         /// <summary>
         /// Iterate over AssetAdministrationShells, if set, and otherwise return an empty enumerable.
@@ -11951,17 +11969,17 @@ public class Environment : IEnvironment
         /// <summary>
         /// Asset administration shell
         /// </summary>
-        public List<IAssetAdministrationShell>? AssetAdministrationShells { get; set; }
+        public IList<IAssetAdministrationShell>? AssetAdministrationShells { get; set; }
 
         /// <summary>
         /// Submodel
         /// </summary>
-        public List<ISubmodel>? Submodels { get; set; }
+        public IList<ISubmodel>? Submodels { get; set; }
 
         /// <summary>
         /// Concept description
         /// </summary>
-        public List<IConceptDescription>? ConceptDescriptions { get; set; }
+        public IList<IConceptDescription>? ConceptDescriptions { get; set; }
 
         /// <summary>
         /// Iterate over AssetAdministrationShells, if set, and otherwise return an empty enumerable.
@@ -12116,9 +12134,9 @@ public T Transform<TContext, T>(
         }
 
         public Environment(
-            List<IAssetAdministrationShell>? assetAdministrationShells = null,
-            List<ISubmodel>? submodels = null,
-            List<IConceptDescription>? conceptDescriptions = null)
+            IList<IAssetAdministrationShell>? assetAdministrationShells = null,
+            IList<ISubmodel>? submodels = null,
+            IList<IConceptDescription>? conceptDescriptions = null)
         {
             AssetAdministrationShells = assetAdministrationShells;
             Submodels = submodels;

src/AasxAmlImExport/AmlExport.cs

@@ -1129,7 +1129,7 @@ private static void SetInternalLinks(
             }
         }
 
-        public static bool ExportTo(AdminShellPackageEnv package, string amlfn, bool tryUseCompactProperties = false)
+        public static bool ExportTo(AdminShellPackageEnvBase package, string amlfn, bool tryUseCompactProperties = false)
         {
             // start
             if (package == null || amlfn == null || package.AasEnv == null)

src/AasxAmlImExport/AmlImport.cs

@@ -38,7 +38,7 @@ public static string PrintSemantic(CAEXSequence<RefSemanticType> sem)
 
         public class AmlParser
         {
-            public AdminShellPackageEnv package = null;
+            public AdminShellPackageEnvBase package = null;
 
             private class TargetIdAction
             {
@@ -87,7 +87,7 @@ public IeViewAmlTarget(InternalElementType ie, CAEXObject amlTarget)
 
             public AmlParser() { }
 
-            public AmlParser(AdminShellPackageEnv package)
+            public AmlParser(AdminShellPackageEnvBase package)
             {
                 this.package = package;
             }
@@ -1634,7 +1634,7 @@ public void Start(CAEXFileType caex)
             }
         }
 
-        public static void ImportInto(AdminShellPackageEnv package, string amlfn)
+        public static void ImportInto(AdminShellPackageEnvBase package, string amlfn)
         {
             // try open file
             var doc = CAEXDocument.LoadFromFile(amlfn);

src/AasxBammRdfImExport/RDFimport.cs

@@ -24,13 +24,13 @@ namespace AasxBammRdfImExport
     public static class BAMMRDFimport
     {
 
-        public static AdminShellNS.AdminShellPackageEnv thePackageEnv;
+        public static AdminShellNS.AdminShellPackageEnvBase thePackageEnv;
 
         public static void ImportInto(
             string rdffn, Aas.IEnvironment env, Aas.ISubmodel sm,
             Aas.Reference smref)
         {
-            thePackageEnv = new AdminShellNS.AdminShellPackageEnv();
+            thePackageEnv = new AdminShellNS.AdminShellPackageFileBasedEnv();
             List<string> entity_subject = new List<string>();
             List<string> autos_list = new List<string>();
             List<string> set_list = new List<string>();

src/AasxCsharpLibrary/AasxCsharpLibrary.csproj

@@ -33,6 +33,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.0.2" />
     <PackageReference Include="Namotion.Reflection" Version="2.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NJsonSchema" Version="10.8.0" />

src/AasxCsharpLibrary/AdminShellBasicExtensions.cs

@@ -44,6 +44,14 @@ public static IEnumerable<T> ForEachSafe<T>(this List<T> list)
                 yield return x;
         }
 
+        public static void ForEach<T>(this IList<T> list, Action <T> action)
+        {
+            if (list == null)
+                return;
+            foreach (var x in list)
+                action?.Invoke(x);
+        }
+
         /// <summary>
         /// Multiple a string into a iterable list
         /// </summary>

src/AasxCsharpLibrary/AdminShellCollections.cs

@@ -33,12 +33,28 @@ public class MultiValueDictionary<K, V>
 
         public void Add(K key, V value)
         {
+            if (key == null)
+                return;
+
             if (dict.TryGetValue(key, out var list))
                 list.Add(value);
             else
                 dict.Add(key, new List<V> { value });
         }
 
+        public void AddIfValueIsNew(K key, V value)
+        {
+            if (key == null)
+                return;
+
+            if (dict.TryGetValue(key, out var list))
+            {
+                if (!list.Contains(value))
+                    list.Add(value);
+            }
+            else
+                dict.Add(key, new List<V> { value });
+        }
         public void Remove(K key)
         {
             if (dict.ContainsKey(key))

src/AasxCsharpLibrary/AdminShellComparers.cs

@@ -0,0 +1,57 @@
+/*
+Copyright (c) 2018-2023 Festo SE & Co. KG <https://www.festo.com/net/de_de/Forms/web/contact_international>
+Author: Michael Hoffmeister
+
+This source code is licensed under the Apache License 2.0 (see LICENSE.txt).
+
+This source code may use other Open Source software components (see LICENSE.txt).
+*/
+
+using Extensions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Serialization;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+
+namespace AdminShellNS
+{
+    public static class AdminShellComparers
+    {
+
+        /// see: https://www.codeproject.com/Articles/72470/LINQ-Enhancing-Distinct-With-The-PredicateEquality
+        public class PredicateEqualityComparer<T> : EqualityComparer<T>
+        {
+            private Func<T, T, bool> predicate;
+
+            public PredicateEqualityComparer(Func<T, T, bool> predicate)
+                : base()
+            {
+                this.predicate = predicate;
+            }
+
+            public override bool Equals(T x, T y)
+            {
+                if (x != null)
+                {
+                    return ((y != null) && this.predicate(x, y));
+                }
+
+                if (y != null)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+
+            public override int GetHashCode(T obj)
+            {
+                // Always return the same value to force the call to IEqualityComparer<T>.Equals
+                return 0;
+            }
+        }
+    }
+}