* messing up to much async

Author: festo-i40

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;
+            }
+        }
+    }
+}

src/AasxPackageLogic/PackageCentral/AasOnDemandEnvironment.cs

@@ -42,6 +42,7 @@ public class AasIdentifiableSideInfo : OnDemandSideInfoBase
 
         public string Id = "";
         public string IdShort = "";
+        public Uri Endpoint;
 
         /// <summary>
         /// In the tree of virtual elements, place a visual element below this entity

src/AasxPackageLogic/PackageCentral/AdminShellPackageDynamicFetchEnv.cs

@@ -84,8 +84,8 @@ public async Task<bool> TryFetchThumbnail(Aas.IAssetAdministrationShell aas)
             // try
             try
             {
-                await PackageHttpDownloadUtil.HttpGetToMemoryStream(
-                    sourceUri: PackageContainerHttpRepoSubset.BuildUriForAasThumbnail(_defaultRepoBaseUri, aas.Id),
+                await PackageHttpDownloadUtil.HttpGetToMemoryStreamOLD(
+                    sourceUri: PackageContainerHttpRepoSubset.BuildUriForRepoAasThumbnail(_defaultRepoBaseUri, aas.Id),
                     runtimeOptions: _runtimeOptions,
                     lambdaDownloadDone: (ms, contentFn) =>
                     {
@@ -129,11 +129,11 @@ await PackageHttpDownloadUtil.HttpGetToMemoryStream(
                     Aas.IIdentifiable res = null;
 
                     // build the location
-                    var loc = PackageContainerHttpRepoSubset.BuildUriForSubmodel(_defaultRepoBaseUri, id);
+                    var loc = PackageContainerHttpRepoSubset.BuildUriForRepoSingleSubmodel(_defaultRepoBaseUri, id);
                     if (loc == null)
                         return null;
 
-                    await PackageHttpDownloadUtil.HttpGetToMemoryStream(
+                    await PackageHttpDownloadUtil.HttpGetToMemoryStreamOLD(
                         sourceUri: loc,
                         allowFakeResponses: _runtimeOptions?.AllowFakeResponses ?? false,
                         runtimeOptions: _runtimeOptions,
@@ -317,15 +317,15 @@ public async Task<int> TrySaveAllTaintedIdentifiables(
 
             if (allAas) count += await TrySaveAllTaintedIdentifiablesOf<Aas.IAssetAdministrationShell>(
                 _aasEnv?.AssetAdministrationShells,
-                (defBase, id) => PackageContainerHttpRepoSubset.BuildUriForAAS(defBase, id));
+                (defBase, id) => PackageContainerHttpRepoSubset.BuildUriForRepoSingleAAS(defBase, id));
 
             if (allSubmodels) count += await TrySaveAllTaintedIdentifiablesOf<Aas.ISubmodel>(
                 _aasEnv?.Submodels,
-                (defBase, id) => PackageContainerHttpRepoSubset.BuildUriForSubmodel(defBase, id));
+                (defBase, id) => PackageContainerHttpRepoSubset.BuildUriForRepoSingleSubmodel(defBase, id));
 
             if (allCDs) count += await TrySaveAllTaintedIdentifiablesOf<Aas.IConceptDescription>(
                 _aasEnv?.ConceptDescriptions,
-                (defBase, id) => PackageContainerHttpRepoSubset.BuildUriForCD(defBase, id));
+                (defBase, id) => PackageContainerHttpRepoSubset.BuildUriForRepoSingleCD(defBase, id));
 
             return count;
         }