Port Extend PossibleValuesAttribute with ServiceProvider to MORYX 8

VERSION

@@ -1 +1 @@
-8.1.0
+8.2.0

docs/articles/Core/Serialization/PossibleValues.md

@@ -26,15 +26,15 @@ public abstract class PossibleValuesAttribute : Attribute
     public abstract bool UpdateFromPredecessor { get; }
 
     /// <summary>
-    /// All possible values for this member represented as strings. The given container might be null
+    /// All possible values for this member represented as strings. The given containers might be null
     /// and can be used to resolve possible values
     /// </summary>
-    public abstract IEnumerable<string> GetValues(IContainer container);
+    public virtual IEnumerable<string> GetValues(IContainer container, IServiceProvider serviceProvider);
 
     /// <summary>
     /// String to value conversion. Must be override if <see cref="OverridesConversion"/> is set to true"/>
     /// </summary>
-    public virtual object Parse(IContainer container, string value)
+    public virtual object Parse(IContainer container, IServiceProvider serviceProvider), string value)
     {
        return value;
     }

src/Moryx.AbstractionLayer.Products.Endpoints/Moryx.AbstractionLayer.Products.Endpoints.csproj

@@ -14,6 +14,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Moryx.AbstractionLayer\Moryx.AbstractionLayer.csproj" />
 	<ProjectReference Include="..\Moryx.Asp.Extensions\Moryx.Asp.Extensions.csproj" />
+	<ProjectReference Include="..\Moryx.Runtime\Moryx.Runtime.csproj" />
   </ItemGroup>
 
 </Project>

src/Moryx.AbstractionLayer.Products.Endpoints/PartialSerialization.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Reflection;
 using Moryx.Configuration;
+using Moryx.Container;
 using Moryx.Serialization;
 
 namespace Moryx.AbstractionLayer.Products.Endpoints
@@ -31,7 +32,18 @@ static PartialSerialization()
         /// <summary>
         /// Creates a new <see cref="PartialSerialization{T}"/>  instance
         /// </summary>
-        public PartialSerialization() : base(null, new EmptyValueProvider())
+        [Obsolete("Use serialization with containers instead")]
+        public PartialSerialization() : this(null, null)
+        {
+        }
+
+        /// <summary>
+        /// Create serialization with access to global and local container
+        /// </summary>
+        /// <param name="localContainer"></param>
+        /// <param name="serviceProvider"></param>
+        public PartialSerialization(IContainer localContainer, IServiceProvider serviceProvider) 
+            : base(localContainer, serviceProvider, new EmptyValueProvider())
         {
         }
 

src/Moryx.AbstractionLayer.Products.Endpoints/ProductConverter.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0
 
 using Moryx.AbstractionLayer.Recipes;
+using Moryx.Container;
 using Moryx.Serialization;
 using Moryx.Tools;
 using Moryx.Workplans;
@@ -20,12 +21,19 @@ public class ProductConverter
         // Null object pattern for identity
         private static readonly ProductIdentity EmptyIdentity = new ProductIdentity(string.Empty, 0);
 
-        private static readonly ICustomSerialization ProductSerialization = new PartialSerialization<ProductType>();
-        private static readonly ICustomSerialization RecipeSerialization = new PartialSerialization<ProductionRecipe>();
+        private readonly ICustomSerialization _productSerialization;
+        private readonly ICustomSerialization _recipeSerialization;
 
-        public ProductConverter(IProductManagement productManagement)
+        public IContainer ProductManagerContainer { get; }
+        public IServiceProvider GlobalContainer { get; }
+
+        public ProductConverter(IProductManagement productManagement, IContainer localContainer, IServiceProvider globalContainer)
         {
             _productManagement = productManagement;
+            ProductManagerContainer = localContainer;
+            GlobalContainer = globalContainer;
+            _productSerialization = new PartialSerialization<ProductType>(localContainer, globalContainer);
+            _recipeSerialization = new PartialSerialization<ProductionRecipe>(localContainer, globalContainer);
         }
 
         public ProductDefinitionModel ConvertProductType(Type productType)
@@ -39,7 +47,7 @@ public ProductDefinitionModel ConvertProductType(Type productType)
                 Name = productType.FullName,
                 DisplayName = productType.GetDisplayName() ?? productType.Name,
                 BaseDefinition = baseTypeName,
-                Properties = EntryConvert.EncodeClass(productType, ProductSerialization)
+                Properties = EntryConvert.EncodeClass(productType, _productSerialization)
             };
         }
 
@@ -73,7 +81,7 @@ public ProductModel ConvertProduct(IProductType productType, bool flat)
             // Properties
             var typeWrapper = _productManagement.GetTypeWrapper(productType.GetType().FullName);
             var properties = typeWrapper != null ? typeWrapper.Properties.ToArray() : productType.GetType().GetProperties();
-            converted.Properties = EntryConvert.EncodeObject(productType, ProductSerialization);
+            converted.Properties = EntryConvert.EncodeObject(productType, _productSerialization);
 
             // Files         
             converted.Files = ConvertFiles(productType, properties);
@@ -124,7 +132,7 @@ private void ConvertParts(IProductType productType, IEnumerable<PropertyInfo> pr
                         DisplayName = displayName,
                         Type = FetchProductType(property.PropertyType),
                         Parts = partModel is null ? new PartModel[0] : new[] { partModel },
-                        PropertyTemplates = EntryConvert.EncodeClass(property.PropertyType, ProductSerialization)
+                        PropertyTemplates = EntryConvert.EncodeClass(property.PropertyType, _productSerialization)
                     };
                     connectors.Add(connector);
                 }
@@ -139,7 +147,7 @@ private void ConvertParts(IProductType productType, IEnumerable<PropertyInfo> pr
                         DisplayName = displayName,
                         Type = FetchProductType(linkType),
                         Parts = links?.Select(ConvertPart).ToArray(),
-                        PropertyTemplates = EntryConvert.EncodeClass(linkType, ProductSerialization)
+                        PropertyTemplates = EntryConvert.EncodeClass(linkType, _productSerialization)
                     };
                     connectors.Add(connector);
                 }
@@ -165,7 +173,7 @@ private PartModel ConvertPart(IProductPartLink link)
             {
                 Id = link.Id,
                 Product = ConvertProduct(link.Product, true),
-                Properties = EntryConvert.EncodeObject(link, ProductSerialization)
+                Properties = EntryConvert.EncodeObject(link, _productSerialization)
             };
             return part;
         }
@@ -214,7 +222,7 @@ public IProductType ConvertProductBack(ProductModel source, ProductType converte
             // Copy extended properties
             var typeWrapper = _productManagement.GetTypeWrapper(converted.GetType().FullName);
             var properties = typeWrapper != null ? typeWrapper.Properties.ToArray() : converted.GetType().GetProperties();
-            EntryConvert.UpdateInstance(converted, source.Properties, ProductSerialization);
+            EntryConvert.UpdateInstance(converted, source.Properties, _productSerialization);
 
             // Copy Files
             ConvertFilesBack(converted, source, properties);
@@ -318,7 +326,12 @@ private static void ConvertFilesBack(object converted, ProductModel product, Pro
             }
         }
 
-        public static RecipeModel ConvertRecipe(IRecipe recipe)
+        [Obsolete("Use ConvertRecipe on instance")]
+        public static RecipeModel ConvertRecipe(IRecipe recipe) => ConvertRecipe(recipe, new PartialSerialization<ProductionRecipe>(null, null));
+
+        public RecipeModel ConvertRecipeV2(IRecipe recipe) => ConvertRecipe(recipe, _recipeSerialization);
+
+        private static RecipeModel ConvertRecipe(IRecipe recipe, ICustomSerialization serialization)
         {
             // Transform to DTO and transmit
             var converted = new RecipeModel
@@ -328,7 +341,7 @@ public static RecipeModel ConvertRecipe(IRecipe recipe)
                 Type = recipe.GetType().Name,
                 State = recipe.State,
                 Revision = recipe.Revision,
-                Properties = EntryConvert.EncodeObject(recipe, RecipeSerialization),
+                Properties = EntryConvert.EncodeObject(recipe, serialization),
                 IsClone = recipe.Classification.HasFlag(RecipeClassification.Clone)
             };
 
@@ -377,7 +390,7 @@ public IProductRecipe ConvertRecipeBack(RecipeModel recipe, IProductRecipe produ
                 productRecipe.Product = productType;
             }
 
-            EntryConvert.UpdateInstance(productRecipe, recipe.Properties, RecipeSerialization);
+            EntryConvert.UpdateInstance(productRecipe, recipe.Properties, _recipeSerialization);
 
             // Do not update a clones classification
             if (productRecipe.Classification.HasFlag(RecipeClassification.Clone))

src/Moryx.AbstractionLayer.Products.Endpoints/ProductManagementController.cs

@@ -14,6 +14,10 @@
 using Moryx.Configuration;
 using Moryx.Asp.Extensions;
 using Moryx.AbstractionLayer.Properties;
+using Microsoft.Extensions.DependencyInjection;
+using Moryx.AbstractionLayer.Resources;
+using Moryx.Runtime.Modules;
+using System.ComponentModel;
 
 namespace Moryx.AbstractionLayer.Products.Endpoints
 {
@@ -27,10 +31,14 @@ public class ProductManagementController : ControllerBase
     {
         private readonly IProductManagement _productManagement;
         private readonly ProductConverter _productConverter;
-        public ProductManagementController(IProductManagement productManagement)
+        public ProductManagementController(IProductManagement productManagement,
+            IModuleManager moduleManager,
+            IServiceProvider serviceProvider)
         {
             _productManagement = productManagement;
-            _productConverter = new ProductConverter(_productManagement);
+
+            var module = moduleManager.AllModules.FirstOrDefault(module => module is IFacadeContainer<IProductManagement>);    
+            _productConverter = new ProductConverter(_productManagement, module.Container, serviceProvider);
         }
 
         #region importers
@@ -39,14 +47,16 @@ public ProductManagementController(IProductManagement productManagement)
         [Authorize(Policy = ProductPermissions.CanViewTypes)]
         public ActionResult<ProductCustomization> GetProductCustomization()
         {
+            var parameterSerialization = new PossibleValuesSerialization(_productConverter.ProductManagerContainer, _productConverter.GlobalContainer,
+                new ValueProviderExecutor(new ValueProviderExecutorSettings().AddDefaultValueProvider()));
             return new ProductCustomization
             {
                 ProductTypes = GetProductTypes(),
                 RecipeTypes = GetRecipeTypes(),
                 Importers = _productManagement.Importers.Select(i => new ProductImporter
                 {
                     Name = i.Key,
-                    Parameters = EntryConvert.EncodeObject(i.Value, new PossibleValuesSerialization(null, new ValueProviderExecutor(new ValueProviderExecutorSettings().AddDefaultValueProvider())))
+                    Parameters = EntryConvert.EncodeObject(i.Value, parameterSerialization) 
                 }).ToArray()
             };
         }
@@ -247,7 +257,7 @@ public ActionResult<RecipeModel[]> GetRecipes(long id, int classification)
             var recipes = _productManagement.GetRecipes(productType, (RecipeClassification)classification);
             var recipeModels = new List<RecipeModel>();
             foreach (var recipe in recipes)
-                recipeModels.Add(ProductConverter.ConvertRecipe(recipe));
+                recipeModels.Add(_productConverter.ConvertRecipeV2(recipe));
             return recipeModels.ToArray();
         }
         #endregion
@@ -330,7 +340,7 @@ public ActionResult<RecipeModel> GetRecipe(long id)
             var recipe = _productManagement.LoadRecipe(id);
             if (recipe == null)
                 return NotFound(new MoryxExceptionResponse {Title= string.Format(Strings.RecipeNotFoundException_Message, id) });
-            return ProductConverter.ConvertRecipe(recipe);
+            return _productConverter.ConvertRecipeV2(recipe);
         }
 
         [HttpPost]
@@ -380,7 +390,7 @@ public ActionResult<RecipeModel> CreateRecipe(string recipeType)
             var recipe = _productManagement.CreateRecipe(recipeType);
             if (recipe == null)
                 recipe = (IProductRecipe)TypeTool.CreateInstance<IProductRecipe>(recipeType);
-            return ProductConverter.ConvertRecipe(recipe);
+            return _productConverter.ConvertRecipeV2(recipe);
         }
         #endregion
     }

src/Moryx.AbstractionLayer.Resources.Endpoints/ResourceManagementController.cs

@@ -31,12 +31,15 @@ public class ResourceModificationController : ControllerBase
         private readonly IResourceTypeTree _resourceTypeTree;
         private readonly ResourceSerialization _serialization;
 
-        public ResourceModificationController(IResourceManagement resourceManagement, IResourceTypeTree resourceTypeTree, IModuleManager moduleManager)
+        public ResourceModificationController(IResourceManagement resourceManagement, 
+            IResourceTypeTree resourceTypeTree, 
+            IModuleManager moduleManager,
+            IServiceProvider serviceProvider)
         {
             _resourceManagement = resourceManagement ?? throw new ArgumentNullException(nameof(resourceManagement));
             _resourceTypeTree = resourceTypeTree ?? throw new ArgumentNullException(nameof(resourceTypeTree));
             var module = moduleManager.AllModules.FirstOrDefault(module => module is IFacadeContainer<IResourceManagement>);
-            _serialization = new ResourceSerialization(module.Container);
+            _serialization = new ResourceSerialization(module.Container, serviceProvider);
         }
 
         [HttpGet]

src/Moryx.AbstractionLayer.Resources.Endpoints/ResourceSerialization.cs

@@ -18,7 +18,7 @@ internal class ResourceSerialization : PossibleValuesSerialization
         /// </summary>
         private EntrySerializeSerialization _memberFilter = new();
 
-        public ResourceSerialization(IContainer container) : base(container, new ValueProviderExecutor(new ValueProviderExecutorSettings()))
+        public ResourceSerialization(IContainer container, IServiceProvider serviceProvider) : base(container, serviceProvider, new ValueProviderExecutor(new ValueProviderExecutorSettings()))
         {
         }
 

src/Moryx.Products.Samples/Moryx.Products.Samples.csproj

@@ -9,6 +9,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Moryx.AbstractionLayer\Moryx.AbstractionLayer.csproj" />
     <ProjectReference Include="..\Moryx.Products.Management\Moryx.Products.Management.csproj" />
+    <ProjectReference Include="..\Moryx.TestModule\Moryx.TestModule.csproj" />
   </ItemGroup>
 
 </Project>

src/Moryx.Products.Samples/Recipe/FacacadeRecipeValueAttribute.cs

@@ -0,0 +1,25 @@
+using Microsoft.Extensions.DependencyInjection;
+using Moryx.Container;
+using Moryx.Serialization;
+using Moryx.TestModule;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Moryx.Products.Samples.Recipe
+{
+    public class FacacadeRecipeValueAttribute : PossibleValuesAttribute
+    {
+        public override bool OverridesConversion => false;
+
+        public override bool UpdateFromPredecessor => false;
+
+        public override IEnumerable<string> GetValues(IContainer localContainer, IServiceProvider serviceProvider)
+        {
+            var module = serviceProvider.GetRequiredService<ITestModule>();
+            return new[] { module.Bla.ToString("D") };
+        }
+    }
+}

src/Moryx.Products.Samples/Recipe/WatchProductRecipe.cs

@@ -21,7 +21,7 @@ public WatchProductRecipe(WatchProductRecipe source) : base(source)
             Case = source.Case;
         }
 
-        [EntrySerialize]
+        [EntrySerialize, FacacadeRecipeValue]
         [DisplayName("Cores Installed")]
         public int CoresInstalled { get; set; }
 

src/Moryx.Runtime.Endpoints/Modules/Endpoint/ModulesController.cs

@@ -26,12 +26,14 @@ public class ModulesController : ControllerBase
         private readonly IModuleManager _moduleManager;
         private readonly IConfigManager _configManager;
         private readonly IParallelOperations _parallelOperations;
+        private readonly IServiceProvider _serviceProvider;
 
-        public ModulesController(IModuleManager moduleManager, IConfigManager configManager, IParallelOperations parallelOperations)
+        public ModulesController(IModuleManager moduleManager, IConfigManager configManager, IParallelOperations parallelOperations, IServiceProvider serviceProvider)
         {
             _moduleManager = moduleManager;
             _configManager = configManager;
             _parallelOperations = parallelOperations;
+            _serviceProvider = serviceProvider;
         }
 
         [HttpGet("dependencies")]
@@ -264,7 +266,7 @@ public ActionResult<Entry> InvokeMethod([FromRoute] string moduleName, [FromBody
         /// </summary>
         private ICustomSerialization CreateSerialization(IServerModule module)
         {
-            return new PossibleValuesSerialization(module.Container, (IEmptyPropertyProvider)_configManager)
+            return new PossibleValuesSerialization(module.Container, _serviceProvider, (IEmptyPropertyProvider)_configManager)
             {
                 FormatProvider = Thread.CurrentThread.CurrentUICulture
             };