Merge remote-tracking branch 'origin/dev'

1nf0rmagician · 1nf0rmagician · commit c645500e4b45 · 2024-12-20T17:17:02.000+01:00
diff --git a/.build/Common.props b/.build/Common.props
@@ -1,16 +1,16 @@
 <Project>
 
   <PropertyGroup>
-    <AssemblyVersion>0.0.0</AssemblyVersion>
+    <AssemblyVersion>8.0.0</AssemblyVersion>
     <AssemblyVersion Condition="'$(MORYX_ASSEMBLY_VERSION)'!=''">$(MORYX_ASSEMBLY_VERSION)</AssemblyVersion>
 
-    <FileVersion>0.0.0.0</FileVersion>
+    <FileVersion>8.0.0.0</FileVersion>
     <FileVersion Condition="'$(MORYX_FILE_VERSION)'!=''">$(MORYX_FILE_VERSION)</FileVersion>
 
-    <InformationalVersion>0.0.0.0</InformationalVersion>
+    <InformationalVersion>8.0.0.0</InformationalVersion>
     <InformationalVersion Condition="'$(MORYX_INFORMATIONAL_VERSION)'!=''">$(MORYX_INFORMATIONAL_VERSION)</InformationalVersion>
 
-    <PackageVersion>0.0.0</PackageVersion>
+    <PackageVersion>8.0.0</PackageVersion>
     <PackageVersion Condition="'$(MORYX_PACKAGE_VERSION)'!=''">$(MORYX_PACKAGE_VERSION)</PackageVersion>
 
     <Authors>PHOENIXCONTACT</Authors>
diff --git a/MORYX-Framework.sln b/MORYX-Framework.sln
@@ -60,6 +60,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DFC092A6-B935-4D19-A564-9AEDEEF999B9}"
 	ProjectSection(SolutionItems) = preProject
 		Build.ps1 = Build.ps1
+		.build\Common.props = .build\Common.props
 		Directory.build.props = Directory.build.props
 		Directory.Build.targets = Directory.Build.targets
 		LICENSE = LICENSE
@@ -118,9 +119,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Runtime.Endpoints.Tes
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Runtime.Endpoints.IntegrationTests", "src\Tests\Moryx.Runtime.Endpoints.IntegrationTests\Moryx.Runtime.Endpoints.IntegrationTests.csproj", "{4FFB98A7-9A4C-476F-8BCC-C19B7F757BF8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.TestTools.NUnit", "src\Moryx.TestTools.NUnit\Moryx.TestTools.NUnit.csproj", "{6FF878E0-AF61-4C3A-9B9C-71C35A949E51}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.TestTools.NUnit", "src\Moryx.TestTools.NUnit\Moryx.TestTools.NUnit.csproj", "{6FF878E0-AF61-4C3A-9B9C-71C35A949E51}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moryx.TestTools.IntegrationTest", "src\Moryx.TestTools.IntegrationTest\Moryx.TestTools.IntegrationTest.csproj", "{C949164C-0345-4893-9E4C-A79BC1F93F85}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.TestTools.IntegrationTest", "src\Moryx.TestTools.IntegrationTest\Moryx.TestTools.IntegrationTest.csproj", "{C949164C-0345-4893-9E4C-A79BC1F93F85}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -356,8 +357,8 @@ Global
 		{C949164C-0345-4893-9E4C-A79BC1F93F85} = {953AAE25-26C8-4A28-AB08-61BAFE41B22F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		    RESX_ShowErrorsInErrorList = True
-		RESX_TaskErrorCategory = Message
 		SolutionGuid = {36EFC961-F4E7-49DC-A36A-99594FFB8243}		
+		RESX_TaskErrorCategory = Message
+		    RESX_ShowErrorsInErrorList = True
 	EndGlobalSection
 EndGlobal
diff --git a/src/Moryx.AbstractionLayer.Resources.Endpoints/Moryx.AbstractionLayer.Resources.Endpoints.csproj b/src/Moryx.AbstractionLayer.Resources.Endpoints/Moryx.AbstractionLayer.Resources.Endpoints.csproj
@@ -5,6 +5,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>REST Api in order to interact with the resource management</Description>
     <PackageTags>MORYX;IIoT;IoT;Resource</PackageTags>
+	<IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Moryx.AbstractionLayer.Resources.Endpoints/ResourceManagementController.cs b/src/Moryx.AbstractionLayer.Resources.Endpoints/ResourceManagementController.cs
@@ -17,6 +17,7 @@
 using Moryx.Runtime.Modules;
 using Moryx.Configuration;
 using System.Runtime.Serialization;
+using System.ComponentModel.DataAnnotations;
 
 namespace Moryx.AbstractionLayer.Resources.Endpoints
 {
@@ -32,8 +33,8 @@ public class ResourceModificationController : ControllerBase
         private readonly IResourceTypeTree _resourceTypeTree;
         private readonly ResourceSerialization _serialization;
 
-        public ResourceModificationController(IResourceManagement resourceManagement, 
-            IResourceTypeTree resourceTypeTree, 
+        public ResourceModificationController(IResourceManagement resourceManagement,
+            IResourceTypeTree resourceTypeTree,
             IModuleManager moduleManager,
             IServiceProvider serviceProvider)
         {
@@ -121,7 +122,7 @@ public ActionResult<Entry> InvokeMethod(long id, string method, Entry parameters
                     return true;
                 });
             }
-            catch(MissingMethodException)
+            catch (MissingMethodException)
             {
                 return BadRequest("Method could not be invoked. Please check spelling and access modifier (has to be `public` or `internal`).");
             }
@@ -142,30 +143,48 @@ public ActionResult<Entry> InvokeMethod(long id, string method, Entry parameters
         public ActionResult<ResourceModel> ConstructWithParameters(string type, string method = null, [FromBody(EmptyBodyBehavior = EmptyBodyBehavior.Allow)] Entry arguments = null)
         {
             var trustedType = WebUtility.HtmlEncode(type);
-
-            return method == null ? Construct(trustedType, null)
-                : Construct(trustedType, new MethodEntry { Name = method, Parameters = arguments });
+            if (method is null)
+                return Construct(trustedType);
+            else
+                return Construct(trustedType, new MethodEntry { Name = method, Parameters = arguments });
         }
 
-        private ActionResult<ResourceModel> Construct(string type, MethodEntry method)
+        private ActionResult<ResourceModel> Construct(string type)
         {
-            var resource = (Resource)Activator.CreateInstance(_resourceTypeTree[type].ResourceType);
-            if (resource is null)
+            Resource resource;
+            try
+            {
+                resource = (Resource)Activator.CreateInstance(_resourceTypeTree[type].ResourceType);
+            }
+            catch (Exception)
+            {
                 return NotFound(new MoryxExceptionResponse { Title = Strings.RESOURCE_NOT_FOUND });
+            }
 
             ValueProviderExecutor.Execute(resource, new ValueProviderExecutorSettings()
                 .AddFilter(new DataMemberAttributeValueProviderFilter(false))
                 .AddDefaultValueProvider());
 
-            if (method != null)
-                EntryConvert.InvokeMethod(resource, method, _serialization);
-
             var model = new ResourceToModelConverter(_resourceTypeTree, _serialization).GetDetails(resource);
             model.Methods = Array.Empty<MethodEntry>(); // Reset methods because they can not be invoked on new objects
-
             return model;
         }
 
+        private ActionResult<ResourceModel> Construct(string type, MethodEntry method)
+        {
+            try
+            {
+                var id = _resourceManagement.Create(_resourceTypeTree[type].ResourceType, r => EntryConvert.InvokeMethod(r, method, _serialization));
+                return GetDetails(id);
+            }
+            catch (Exception e)
+            {
+                if (e is ArgumentException or SerializationException or ValidationException)
+                    return BadRequest(e.Message);
+                throw;
+            }
+        }
+
         [HttpPost]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status409Conflict)]
@@ -185,11 +204,11 @@ public ActionResult<ResourceModel> Save(ResourceModel model)
                     resourcesToSave.Skip(1).ForEach(id => _resourceManagement.Modify(id, r => true));
                 });
 
-                return Ok(GetDetails(id));
+                return GetDetails(id);
             }
             catch (Exception e)
             {
-                if (e is ArgumentException or SerializationException)
+                if (e is ArgumentException or SerializationException or ValidationException)
                     return BadRequest(e.Message);
                 throw;
             }
@@ -323,7 +342,7 @@ private void UpdateReferences(Resource instance, HashSet<long> resourcesToSave,
         [Authorize(Policy = ResourcePermissions.CanEdit)]
         public ActionResult<ResourceModel> Update(long id, ResourceModel model)
         {
-            if (_resourceManagement.GetAllResources<IResource>(r=>r.Id == id) is null)
+            if (_resourceManagement.GetAllResources<IResource>(r => r.Id == id) is null)
                 return NotFound(new MoryxExceptionResponse { Title = string.Format(Strings.ResourceNotFoundException_ById_Message, id) });
 
             try
@@ -339,7 +358,7 @@ public ActionResult<ResourceModel> Update(long id, ResourceModel model)
             }
             catch (Exception e)
             {
-                if (e is ArgumentException or SerializationException)
+                if (e is ArgumentException or SerializationException or ValidationException)
                     return BadRequest(e.Message);
                 throw;
             }            
diff --git a/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriver.cs b/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriver.cs
@@ -1,4 +1,5 @@
 ﻿using Moryx.AbstractionLayer.Drivers;
+using System;
 using System.Threading.Tasks;
 
 namespace Moryx.Drivers.Camera.Interfaces
@@ -9,15 +10,9 @@ namespace Moryx.Drivers.Camera.Interfaces
     public interface ICameraDriver<TImage> : IDriver where TImage : class
     {
         /// <summary>
-        /// Registers an ICameraDriverListener that should be provided
-        /// with images.
+        /// Eventhandler to continously provide images from a camera
         /// </summary>
-        void Register(ICameraDriverListener<TImage> listener);
-
-        /// <summary>
-        /// Unregisters an ICameraDriverListener
-        /// </summary>
-        void Unregister(ICameraDriverListener<TImage> listener);
+        event EventHandler<TImage> CapturedImage;
 
         /// <summary>
         /// Capture a single image from the camera
diff --git a/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriverListener.cs b/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriverListener.cs
diff --git a/src/Moryx.AbstractionLayer/Moryx.AbstractionLayer.csproj b/src/Moryx.AbstractionLayer/Moryx.AbstractionLayer.csproj
@@ -5,6 +5,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Domain model types and definitions of Cyber-physical systems in IIoT projects.</Description>
     <PackageTags>MORYX;IIoT;IoT;Hardware;Communication;Manufacturing;Industrial;Abstraction;Realtime</PackageTags>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Moryx.Asp.Extensions/Moryx.Asp.Extensions.csproj b/src/Moryx.Asp.Extensions/Moryx.Asp.Extensions.csproj
@@ -4,6 +4,7 @@
 		<TargetFramework>net8.0</TargetFramework>
 		<Description>Extensions for the Integration of MORYX in ASP.NET Core</Description>
 		<PackageTags>MORYX;ASP</PackageTags>
+		<IsPackable>true</IsPackable>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/Moryx.Container/Moryx.Container.csproj b/src/Moryx.Container/Moryx.Container.csproj
@@ -5,6 +5,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>MORYX container functionality based on Castle.Windsor.</Description>
     <PackageTags>MORYX;Container;IoC</PackageTags>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Moryx.Model.InMemory/Moryx.Model.InMemory.csproj b/src/Moryx.Model.InMemory/Moryx.Model.InMemory.csproj
@@ -5,6 +5,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>InMemory extension for unit tests referencing Moryx.Model</Description>
     <PackageTags>MORYX;Entity;Framework;EntityFramework;DataModel;Model;Database;InMemory;Effort</PackageTags>
+	<IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.csproj b/src/Moryx.Model.PostgreSQL/Moryx.Model.PostgreSQL.csproj
@@ -5,6 +5,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Adapter for Moryx.Model on PostgreSQL</Description>
     <PackageTags>MORYX;Entity;Framework;EntityFramework;DataModel;Model;Database;Npgsql;PostgreSQL;Postgres</PackageTags>
+	<IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Moryx.Model.Sqlite/Moryx.Model.Sqlite.csproj b/src/Moryx.Model.Sqlite/Moryx.Model.Sqlite.csproj
@@ -5,6 +5,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Adapter for Moryx.Model on Sqlite</Description>
     <PackageTags>MORYX;Entity;Framework;EntityFramework;DataModel;Model;Database;Sqlite</PackageTags>
+	<IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Moryx.Model/Moryx.Model.csproj b/src/Moryx.Model/Moryx.Model.csproj
@@ -5,6 +5,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Datamodel integration for MORYX applications based on Entity Framework</Description>
     <PackageTags>MORYX;Entity;Framework;EntityFramework;DataModel;Model;Database</PackageTags>
+	<IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Moryx.Notifications/Moryx.Notifications.csproj b/src/Moryx.Notifications/Moryx.Notifications.csproj
@@ -5,6 +5,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Types and interfaces for notifications within MORYX applications</Description>
     <PackageTags>MORYX;IIoT;IoT;Notifications</PackageTags>
+	<IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Moryx.Resources.Management/Moryx.Resources.Management.csproj b/src/Moryx.Resources.Management/Moryx.Resources.Management.csproj
@@ -6,6 +6,7 @@
 	<IsPackable>true</IsPackable>
     <Description>ResourceManagement module composing and maintaining the resource graph as the habitat for digital twins of manufacturing assets.</Description>
     <PackageTags>MORYX;IIoT;IoT;Manufacturing;API;Resource</PackageTags>
+	<IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Moryx.Resources.Management/Resources/ResourceTypeController.cs b/src/Moryx.Resources.Management/Resources/ResourceTypeController.cs
@@ -264,17 +264,19 @@ private ResourceProxy InstantiateProxy(string typeName, Resource instance)
         /// </summary>
         private void ProvideProxyType(Type resourceType)
         {
-            // Step 1: Find the least specific base type that offers the same amount of interfaces
+            // Step 1: Find the least specific base type that offers the same amount of interfaces and is not a generic itself
             // ReSharper disable once AssignNullToNotNullAttribute -> FullName should be not null
             var targetType = _typeCache[resourceType.ResourceType()];
             var linker = targetType;
 
             var interfaces = RelevantInterfaces(linker);
-            // Move up the type tree until the parent offers less interfaces than the current linker
-            while (linker.BaseType != null && interfaces.Count == RelevantInterfaces(linker.BaseType).Count)
+            // Move up the type tree until the parent offers less interfaces than the current linker, is abstract or a generic
+            while (linker.BaseType != null && !linker.BaseType.ResourceType.IsGenericType 
+                && interfaces.Count == RelevantInterfaces(linker.BaseType).Count)
             {
                 linker = linker.BaseType;
             }
+                
 
             // Step 2: Check if we already created a proxy for this type. If we already
             // did use this one for the requested type as well.
diff --git a/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.csproj b/src/Moryx.Runtime.Kernel/Moryx.Runtime.Kernel.csproj
@@ -5,6 +5,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Kernel components that comprise the MORYX server side runtime environment</Description>
     <PackageTags>MORYX;Kernel;Runtime;Server</PackageTags>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Moryx.Runtime/Moryx.Runtime.csproj b/src/Moryx.Runtime/Moryx.Runtime.csproj
@@ -5,6 +5,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Server side component types and implementations for MORYX applications</Description>
     <PackageTags>MORYX;Runtime;Server</PackageTags>
+	<IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Moryx/Moryx.csproj b/src/Moryx/Moryx.csproj
@@ -6,6 +6,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>Core package of the MORYX ecosystem. It defines the necessary types for MORYX compatibility as well as commonly required tools.</Description>
     <PackageTags>MORYX;Serialization;Configuration;Logging;Core;Modules;Workplans</PackageTags>
+	<IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
diff --git a/src/Tests/Moryx.Resources.Management.Tests/Mocks/ResourceWithGenericMethod.cs b/src/Tests/Moryx.Resources.Management.Tests/Mocks/ResourceWithGenericMethod.cs
@@ -37,24 +37,18 @@ public class ResourceWithGenericMethod : Resource, IGenericMethodCall, ISimpleRe
         public event EventHandler SomeEvent;
         public event EventHandler<ICapabilities> CapabilitiesChanged;
 
-        public IList<TChannel> GenericMethod<TChannel>(string identifier)
-        {
-            throw new NotImplementedException();
-        }
-
-        public int MultiplyFoo(int factor)
-        {
-            throw new NotImplementedException();
-        }
-
-        public int MultiplyFoo(int factor, ushort offset)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void RaiseEvent()
-        {
-            throw new NotImplementedException();
-        }
+        public IList<TChannel> GenericMethod<TChannel>(string identifier) => throw new NotImplementedException();
+
+        public int MultiplyFoo(int factor) => throw new NotImplementedException();
+
+        public int MultiplyFoo(int factor, ushort offset) => throw new NotImplementedException();
+
+        public void RaiseEvent() => throw new NotImplementedException();
     }
+
+    public interface IGenericBaseResourceInterface : IResource { }
+
+    public class GenericBaseResource<T> : Resource, IGenericBaseResourceInterface { }
+
+    public class InheritingFromGenericResource : GenericBaseResource<object> { }
 }
diff --git a/src/Tests/Moryx.Resources.Management.Tests/TypeControllerTests.cs b/src/Tests/Moryx.Resources.Management.Tests/TypeControllerTests.cs
@@ -236,6 +236,20 @@ public void ProxyBuilderFiltersGenericInterfaces()
             Assert.IsFalse(typeof(IGenericMethodCall).IsAssignableFrom(proxy.GetType()));
         }
 
+        [Test]
+        public void ProxyBuilderSkipsGenericBaseTypes()
+        {
+            // Arrange
+            var driver = new InheritingFromGenericResource { Id = 42, Name = "A non generic resource inheriting from a generic base type" };
+
+            // Act
+            var proxy = _typeController.GetProxy(driver);
+
+            // Assert
+            Assert.IsNotNull(proxy);
+            Assert.IsFalse(typeof(GenericBaseResource<object>).IsAssignableFrom(proxy.GetType()));
+        }
+
         [Test]
         public void FacadeExceptionForGenericProxy()
         {
