Fixes #2487 (#2489)

* Fixes #2487

* Fixes #2487 add SimulationEntitySourceReferenceCache

* Remove auto generated code

Author: msevestre

src/OSPSuite.Core/Domain/Builder/IBuilder.cs

@@ -1,6 +1,6 @@
 namespace OSPSuite.Core.Domain.Builder
 {
-   public interface IBuilder : IObjectBase
+   public interface IBuilder : IEntity
    {
       //Reference to building block containing this entity. This does not have to be serialized
       IBuildingBlock BuildingBlock { get; set; }

src/OSPSuite.Core/Domain/Builder/IBuildingBlockRepository.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace OSPSuite.Core.Domain.Builder
+{
+   public interface IBuildingBlockRepository
+   {
+      IReadOnlyList<IBuildingBlock> All();
+      IReadOnlyList<T> All<T>() where T : IBuildingBlock;
+   }
+}

src/OSPSuite.Core/Domain/Builder/ILookupBuildingBlock.cs

@@ -0,0 +1,7 @@
+namespace OSPSuite.Core.Domain.Builder
+{
+   public interface ILookupBuildingBlock<T> : IBuildingBlock<T> where T : IBuilder
+   {
+      T ByPath(ObjectPath path);
+   }
+}

src/OSPSuite.Core/Domain/Builder/InitialConditionsBuildingBlock.cs

@@ -2,11 +2,6 @@
 
 namespace OSPSuite.Core.Domain.Builder
 {
-   public interface ILookupBuildingBlock<T> : IBuildingBlock<T> where T : IBuilder
-   {
-      T ByPath(ObjectPath path);
-   }
-
    public class InitialConditionsBuildingBlock : PathAndValueEntityBuildingBlock<InitialCondition>
    {
       public InitialConditionsBuildingBlock()

src/OSPSuite.Core/Domain/Builder/SimulationBuilder.cs

@@ -22,7 +22,7 @@ public class SimulationBuilder
       private readonly Cache<string, BuilderSource> _builderSources = new Cache<string, BuilderSource>(x => x.Builder.Id, x => null);
 
       //Cache of entity source by id and not by path. It is required because the path is not available at time of construction in the entity
-      private readonly Cache<string, EntitySource> _entitySources = new Cache<string, EntitySource>(onMissingKey: x => null);
+      private readonly Cache<string, SimulationEntitySource> _entitySources = new Cache<string, SimulationEntitySource>(onMissingKey: x => null);
 
       public SimulationBuilder(SimulationConfiguration simulationConfiguration)
       {
@@ -32,13 +32,13 @@ public SimulationBuilder(SimulationConfiguration simulationConfiguration)
 
       public bool CreateAllProcessRateParameters => _simulationConfiguration.CreateAllProcessRateParameters;
 
-      public IEntity BuilderFor(IEntity modelObject) => EntitySourceFor(modelObject)?.Source;
+      public IEntity BuilderFor(IEntity modelObject) => SimulationEntitySourceFor(modelObject)?.Source;
 
-      internal EntitySource EntitySourceFor(IEntity entity) => _entitySources[entity.Id];
+      internal SimulationEntitySource SimulationEntitySourceFor(IEntity entity) => _entitySources[entity.Id];
 
-      internal void AddEntitySource(string entityId, EntitySource entitySource)
+      internal void AddSimulationEntitySource(string entityId, SimulationEntitySource simulationEntitySource)
       {
-         _entitySources[entityId] = entitySource;
+         _entitySources[entityId] = simulationEntitySource;
       }
 
       internal IEnumerable<MoleculeBuilder> AllPresentMolecules()
@@ -203,7 +203,7 @@ private void addMolecules(IMoleculeDependentBuilder builder, MoleculeList molecu
       internal IReadOnlyCollection<ParameterValue> ParameterValues => _parameterValues;
       internal IReadOnlyCollection<InitialCondition> InitialConditions => _initialConditions;
 
-      public IReadOnlyCollection<EntitySource> EntitySources => _entitySources;
+      public IReadOnlyCollection<SimulationEntitySource> EntitySources => _entitySources;
 
       internal MoleculeList MoleculeListFor(IMoleculeDependentBuilder builder) => _moleculeListCache[builder];
 

src/OSPSuite.Core/Domain/Builder/SimulationConfiguration.cs

@@ -35,9 +35,17 @@ public class SimulationConfiguration : IVisitable<IVisitor>, IUpdatable
 
       public IReadOnlyList<T> All<T>() where T : class, IBuildingBlock
       {
+         if (typeof(T) == typeof(IBuildingBlock))
+            return All().OfType<T>().ToList();
+
          return ModuleConfigurations.Select(x => x.BuildingBlock<T>()).Where(x => x != null).ToList();
       }
 
+      public IReadOnlyList<IBuildingBlock> All()
+      {
+         return ModuleConfigurations.SelectMany(x => x.All()).Where(x => x != null).ToList();
+      }
+
       public virtual void AcceptVisitor(IVisitor visitor)
       {
          ModuleConfigurations.Each(x => x.AcceptVisitor(visitor));
@@ -60,8 +68,8 @@ public void UpdatePropertiesFrom(IUpdatable source, ICloneManager cloneManager)
       }
 
       /// <summary>
-      /// Copies the properties from <paramref name="sourceConfiguration"/> but does not clone any of the building blocks
-      /// or module configurations.
+      ///    Copies the properties from <paramref name="sourceConfiguration" /> but does not clone any of the building blocks
+      ///    or module configurations.
       /// </summary>
       /// <param name="sourceConfiguration"></param>
       public void CopyPropertiesFrom(SimulationConfiguration sourceConfiguration)

src/OSPSuite.Core/Domain/ModelCoreSimulation.cs

@@ -49,7 +49,7 @@ public interface IModelCoreSimulation : IObjectBase, IWithCreationMetaData, IWit
       /// <summary>
       ///    Tracks objects used to create the simulation. (may be null)
       /// </summary>
-      EntitySources EntitySources { get; }
+      SimulationEntitySources EntitySources { get; }
    }
 
    public class ModelCoreSimulation : ObjectBase, IModelCoreSimulation
@@ -60,7 +60,7 @@ public class ModelCoreSimulation : ObjectBase, IModelCoreSimulation
 
       public CreationMetaData Creation { get; set; }
 
-      public EntitySources EntitySources { get; } = new EntitySources();
+      public SimulationEntitySources EntitySources { get; } = new SimulationEntitySources();
 
       public double? EndTime => Settings?.OutputSchema?.EndTime;
 

src/OSPSuite.Core/Domain/ModelCoreSimulationExtensions.cs

@@ -95,7 +95,7 @@ private static IEnumerable<IParameter> allApplicationParametersIn(IReadOnlyList<
             .Where(x => x.IsNamed(parameterName));
       }
 
-      public static void AddEntitySources(this IModelCoreSimulation simulation, IEnumerable<EntitySource> entitySources)
+      public static void AddEntitySources(this IModelCoreSimulation simulation, IEnumerable<SimulationEntitySource> entitySources)
       {
          entitySources?.Each(simulation.EntitySources.Add);
       }

src/OSPSuite.Core/Domain/ModuleConfiguration.cs

@@ -1,12 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using OSPSuite.Core.Domain.Builder;
 using OSPSuite.Core.Domain.Services;
 using OSPSuite.Utility.Visitor;
 
 namespace OSPSuite.Core.Domain
 {
-
    public class ModuleConfiguration : IVisitable<IVisitor>, IUpdatable
    {
       public Module Module { get; private set; }
@@ -22,7 +22,7 @@ public class ModuleConfiguration : IVisitable<IVisitor>, IUpdatable
       public ParameterValuesBuildingBlock SelectedParameterValues { get; set; }
 
       /// <summary>
-      /// Merge behavior for merging spatial structures from different modules.
+      ///    Merge behavior for merging spatial structures from different modules.
       /// </summary>
       public MergeBehavior MergeBehavior => Module.MergeBehavior;
 
@@ -92,5 +92,12 @@ public void UpdatePropertiesFrom(IUpdatable source, ICloneManager cloneManager)
          SelectedInitialConditions = Module.InitialConditionsCollection.FindByName(sourceConfiguration.SelectedInitialConditions?.Name);
          SelectedParameterValues = Module.ParameterValuesCollection.FindByName(sourceConfiguration.SelectedParameterValues?.Name);
       }
+
+      public IReadOnlyList<IBuildingBlock> All()
+      {
+         return Module.BuildingBlocks.Union(new IBuildingBlock[] {SelectedInitialConditions, SelectedParameterValues})
+            .Where(x => x != null)
+            .ToList();
+      }
    }
 }

src/OSPSuite.Core/Domain/Services/EntityTracker.cs

@@ -23,17 +23,17 @@ public void Track(IEntity entityToTrack, IEntity sourceBuilder, SimulationBuilde
          var builderSource = simulationBuilder.BuilderSourceFor(sourceBuilder);
          if (builderSource != null)
          {
-            var objectSource = new EntitySource(builderSource.BuildingBlock, sourcePath, sourceBuilder);
-            simulationBuilder.AddEntitySource(entityToTrack.Id, objectSource);
+            var objectSource = new SimulationEntitySource(builderSource.BuildingBlock, sourcePath, sourceBuilder);
+            simulationBuilder.AddSimulationEntitySource(entityToTrack.Id, objectSource);
             return;
          }
 
          //in this case, we might have clone the object. We need to find the source of the source
-         var objectSourceOrigin = simulationBuilder.EntitySourceFor(sourceBuilder);
+         var objectSourceOrigin = simulationBuilder.SimulationEntitySourceFor(sourceBuilder);
          if (objectSourceOrigin != null)
          {
-            var newObjectSource = new EntitySource(objectSourceOrigin);
-            simulationBuilder.AddEntitySource(entityToTrack.Id, newObjectSource);
+            var newObjectSource = new SimulationEntitySource(objectSourceOrigin);
+            simulationBuilder.AddSimulationEntitySource(entityToTrack.Id, newObjectSource);
             return;
          }