Skip to content

Commit

Permalink
Fixes #1976 remove some domain interfaces (#1977)
Browse files Browse the repository at this point in the history 
* Fixes #1976 remove some domain interfaces

* Fixes missing tests

* Fixes missing tests
  • Loading branch information
@msevestre
msevestre authored Apr 13, 2023
1 parent d781297 commit c135882
Show file tree
Hide file tree
Showing 164 changed files with 1,060 additions and 1,610 deletions.
12 changes: 6 additions & 6 deletions src/OSPSuite.Core/Comparison/ApplicationBuilderDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using System.Collections.Generic;
using OSPSuite.Utility.Extensions;
using OSPSuite.Core.Domain;
using OSPSuite.Core.Domain.Builder;
using OSPSuite.Utility.Extensions;

namespace OSPSuite.Core.Comparison
{
public class ApplicationBuilderDiffBuilder : DiffBuilder<IApplicationBuilder>
public class ApplicationBuilderDiffBuilder : DiffBuilder<ApplicationBuilder>
{
private readonly EntityDiffBuilder _entityDiffBuilder;
private readonly EnumerableComparer _enumerableComparer;
Expand All @@ -16,23 +16,23 @@ public ApplicationBuilderDiffBuilder(EntityDiffBuilder entityDiffBuilder, Enumer
_enumerableComparer = enumerableComparer;
}

public override void Compare(IComparison<IApplicationBuilder> comparison)
public override void Compare(IComparison<ApplicationBuilder> comparison)
{
_entityDiffBuilder.Compare(comparison);
CompareStringValues(x => x.MoleculeName, x => x.MoleculeName, comparison);
CompareValues(x => x.SourceCriteria, x => x.SourceCriteria, comparison);
//Special treatment for application moleculer builder, better compare relative container path then name
//Special treatment for application molecule builder, better compare relative container path then name

//Here we have a special treatment for application molecule builder, find missing by Container Path
_enumerableComparer.CompareEnumerables(comparison, x => x.Molecules, item => item.RelativeContainerPath);

// Treat all other children, application molecule builder are ignored
_enumerableComparer.CompareEnumerables(comparison, getChildrenButMolecules, item => item.Name);
}

private IEnumerable<IEntity> getChildrenButMolecules(IContainer container)
{
return container.GetChildren<IEntity>(child => !child.IsAnImplementationOf<IApplicationMoleculeBuilder>());
return container.GetChildren<IEntity>(child => !child.IsAnImplementationOf<ApplicationMoleculeBuilder>());
}
}
}
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/ApplicationMoleculeBuilderDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace OSPSuite.Core.Comparison
{
public class ApplicationMoleculeBuilderDiffBuilder : DiffBuilder<IApplicationMoleculeBuilder>
public class ApplicationMoleculeBuilderDiffBuilder : DiffBuilder<ApplicationMoleculeBuilder>
{
private readonly EntityDiffBuilder _entityDiffBuilder;
private readonly IObjectComparer _objectComparer;
Expand All @@ -13,7 +13,7 @@ public ApplicationMoleculeBuilderDiffBuilder(EntityDiffBuilder entityDiffBuilder
_objectComparer = objectComparer;
}

public override void Compare(IComparison<IApplicationMoleculeBuilder> comparison)
public override void Compare(IComparison<ApplicationMoleculeBuilder> comparison)
{
_entityDiffBuilder.Compare(comparison);
CompareValues(x => x.RelativeContainerPath, x => x.RelativeContainerPath, comparison, Equals, (molecule, path) => path.PathAsString);
Expand Down
14 changes: 7 additions & 7 deletions src/OSPSuite.Core/Comparison/BuildingBlockDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ public override void Compare(IComparison<TBuildingBlock> comparison)
}
}

public class MoleculeBuildingBlockDiffBuilder : BuildingBlockDiffBuilder<MoleculeBuildingBlock, IMoleculeBuilder>
public class MoleculeBuildingBlockDiffBuilder : BuildingBlockDiffBuilder<MoleculeBuildingBlock, MoleculeBuilder>
{
public MoleculeBuildingBlockDiffBuilder(ObjectBaseDiffBuilder objectBaseDiffBuilder, EnumerableComparer enumerableComparer) : base(objectBaseDiffBuilder, enumerableComparer)
{
}
}

public class SpatialStructureDiffBuilder : DiffBuilder<ISpatialStructure>
public class SpatialStructureDiffBuilder : DiffBuilder<SpatialStructure>
{
private readonly ObjectBaseDiffBuilder _objectBaseDiffBuilder;
private readonly EnumerableComparer _enumerableComparer;
Expand All @@ -49,37 +49,37 @@ public SpatialStructureDiffBuilder(ObjectBaseDiffBuilder objectBaseDiffBuilder,
_enumerableComparer = enumerableComparer;
}

public override void Compare(IComparison<ISpatialStructure> comparison)
public override void Compare(IComparison<SpatialStructure> comparison)
{
_objectBaseDiffBuilder.Compare(comparison);
_enumerableComparer.CompareEnumerables(comparison, x => x, x => x.Name);
}
}

public class ReactionBuildingBlockDiffBuilder : BuildingBlockDiffBuilder<IReactionBuildingBlock, IReactionBuilder>
public class ReactionBuildingBlockDiffBuilder : BuildingBlockDiffBuilder<ReactionBuildingBlock, ReactionBuilder>
{
public ReactionBuildingBlockDiffBuilder(ObjectBaseDiffBuilder objectBaseDiffBuilder, EnumerableComparer enumerableComparer) : base(objectBaseDiffBuilder, enumerableComparer)
{
}
}

public class PassiveTransportBuildingBlockDiffBuilder : BuildingBlockDiffBuilder<IPassiveTransportBuildingBlock, ITransportBuilder>
public class PassiveTransportBuildingBlockDiffBuilder : BuildingBlockDiffBuilder<PassiveTransportBuildingBlock, TransportBuilder>
{
public PassiveTransportBuildingBlockDiffBuilder(ObjectBaseDiffBuilder objectBaseDiffBuilder, EnumerableComparer enumerableComparer)
: base(objectBaseDiffBuilder, enumerableComparer)
{
}
}

public class EventGroupBuildingBlocksDiffBuilder : BuildingBlockDiffBuilder<IEventGroupBuildingBlock, IEventGroupBuilder>
public class EventGroupBuildingBlocksDiffBuilder : BuildingBlockDiffBuilder<EventGroupBuildingBlock, EventGroupBuilder>
{
public EventGroupBuildingBlocksDiffBuilder(ObjectBaseDiffBuilder objectBaseDiffBuilder, EnumerableComparer enumerableComparer)
: base(objectBaseDiffBuilder, enumerableComparer)
{
}
}

public class ObserverBuildingBlocksDiffBuilder : BuildingBlockDiffBuilder<IObserverBuildingBlock, IObserverBuilder>
public class ObserverBuildingBlocksDiffBuilder : BuildingBlockDiffBuilder<ObserverBuildingBlock, ObserverBuilder>
{
public ObserverBuildingBlocksDiffBuilder(ObjectBaseDiffBuilder objectBaseDiffBuilder, EnumerableComparer enumerableComparer)
: base(objectBaseDiffBuilder, enumerableComparer)
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/EventAssignmentBuilderDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace OSPSuite.Core.Comparison
{
public class EventAssignmentBuilderDiffBuilder : DiffBuilder<IEventAssignmentBuilder>
public class EventAssignmentBuilderDiffBuilder : DiffBuilder<EventAssignmentBuilder>
{
private readonly EntityDiffBuilder _entityDiffBuilder;
private readonly IObjectComparer _objectComparer;
Expand All @@ -13,7 +13,7 @@ public EventAssignmentBuilderDiffBuilder(EntityDiffBuilder entityDiffBuilder, IO
_objectComparer = objectComparer;
}

public override void Compare(IComparison<IEventAssignmentBuilder> comparison)
public override void Compare(IComparison<EventAssignmentBuilder> comparison)
{
_entityDiffBuilder.Compare(comparison);
CompareValues(x => x.UseAsValue, x => x.UseAsValue, comparison);
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/EventAssignmentDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace OSPSuite.Core.Comparison
{
public class EventAssignmentDiffBuilder : DiffBuilder<IEventAssignment>
public class EventAssignmentDiffBuilder : DiffBuilder<EventAssignment>
{
private readonly EntityDiffBuilder _entityDiffBuilder;
private readonly IObjectComparer _objectComparer;
Expand All @@ -13,7 +13,7 @@ public EventAssignmentDiffBuilder(EntityDiffBuilder entityDiffBuilder, IObjectCo
_objectComparer = objectComparer;
}

public override void Compare(IComparison<IEventAssignment> comparison)
public override void Compare(IComparison<EventAssignment> comparison)
{
_entityDiffBuilder.Compare(comparison);
CompareValues(x => x.UseAsValue, x => x.UseAsValue, comparison);
Expand Down
6 changes: 3 additions & 3 deletions src/OSPSuite.Core/Comparison/EventBuilderDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OSPSuite.Core.Comparison
{
public class EventBuilderDiffBuilder : DiffBuilder<IEventBuilder>
public class EventBuilderDiffBuilder : DiffBuilder<EventBuilder>
{
private readonly EntityDiffBuilder _entityDiffBuilder;
private readonly EnumerableComparer _enumerableComparer;
Expand All @@ -17,13 +17,13 @@ public EventBuilderDiffBuilder(EntityDiffBuilder entityDiffBuilder, EnumerableCo
_objectComparer = objectComparer;
}

public override void Compare(IComparison<IEventBuilder> comparison)
public override void Compare(IComparison<EventBuilder> comparison)
{
_entityDiffBuilder.Compare(comparison);
CompareValues(x => x.OneTime, x => x.OneTime, comparison);
_objectComparer.Compare(comparison.FormulaComparison());
_enumerableComparer.CompareEnumerables(comparison, x => x.Assignments, item => item.ObjectPath);
_enumerableComparer.CompareEnumerables(comparison, x => x.GetChildren<IEntity>(i => !i.IsAnImplementationOf<IEventAssignmentBuilder>()), item => item.Name);
_enumerableComparer.CompareEnumerables(comparison, x => x.GetChildren<IEntity>(i => !i.IsAnImplementationOf<EventAssignmentBuilder>()), item => item.Name);
}
}
}
6 changes: 3 additions & 3 deletions src/OSPSuite.Core/Comparison/EventDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OSPSuite.Core.Comparison
{
public class EventDiffBuilder : DiffBuilder<IEvent>
public class EventDiffBuilder : DiffBuilder<Event>
{
private readonly EntityDiffBuilder _entityDiffBuilder;
private readonly EnumerableComparer _enumerableComparer;
Expand All @@ -19,13 +19,13 @@ public EventDiffBuilder(EntityDiffBuilder entityDiffBuilder, EnumerableComparer
_entityPathResolver = entityPathResolver;
}

public override void Compare(IComparison<IEvent> comparison)
public override void Compare(IComparison<Event> comparison)
{
_entityDiffBuilder.Compare(comparison);
CompareValues(x => x.OneTime, x => x.OneTime, comparison);
_objectComparer.Compare(comparison.FormulaComparison());
_enumerableComparer.CompareEnumerables(comparison, x => x.Assignments, item => _entityPathResolver.ObjectPathFor(item.ChangedEntity));
_enumerableComparer.CompareEnumerables(comparison, x => x.GetChildren<IEntity>(i => !i.IsAnImplementationOf<IEventAssignment>()), item => item.Name);
_enumerableComparer.CompareEnumerables(comparison, x => x.GetChildren<IEntity>(i => !i.IsAnImplementationOf<EventAssignment>()), item => item.Name);
}
}
}
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/EventGroupBuilderDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace OSPSuite.Core.Comparison
{
public class EventGroupBuilderDiffBuilder : DiffBuilder<IEventGroupBuilder>
public class EventGroupBuilderDiffBuilder : DiffBuilder<EventGroupBuilder>
{
private readonly ContainerDiffBuilder _containerDiffBuilder;

Expand All @@ -11,7 +11,7 @@ public EventGroupBuilderDiffBuilder(ContainerDiffBuilder containerDiffBuilder)
_containerDiffBuilder = containerDiffBuilder;
}

public override void Compare(IComparison<IEventGroupBuilder> comparison)
public override void Compare(IComparison<EventGroupBuilder> comparison)
{
_containerDiffBuilder.Compare(comparison);
CompareValues(x => x.SourceCriteria, x => x.SourceCriteria, comparison);
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/EventGroupDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace OSPSuite.Core.Comparison
{
public class EventGroupDiffBuilder : DiffBuilder<IEventGroup>
public class EventGroupDiffBuilder : DiffBuilder<EventGroup>
{
private readonly ContainerDiffBuilder _containerDiffBuilder;

Expand All @@ -11,7 +11,7 @@ public EventGroupDiffBuilder(ContainerDiffBuilder containerDiffBuilder)
_containerDiffBuilder = containerDiffBuilder;
}

public override void Compare(IComparison<IEventGroup> comparison)
public override void Compare(IComparison<EventGroup> comparison)
{
_containerDiffBuilder.Compare(comparison);
CompareStringValues(x => x.EventGroupType, x => x.EventGroupType, comparison);
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/MoleculeAmountDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace OSPSuite.Core.Comparison
{
public class MoleculeAmountDiffBuilder:DiffBuilder<IMoleculeAmount>
public class MoleculeAmountDiffBuilder:DiffBuilder<MoleculeAmount>
{
private readonly QuantityDiffBuilder _quantityDiffBuilder;
private readonly ContainerDiffBuilder _containerDiffBuilder;
Expand All @@ -13,7 +13,7 @@ public MoleculeAmountDiffBuilder(QuantityDiffBuilder quantityDiffBuilder, Contai
_containerDiffBuilder = containerDiffBuilder;
}

public override void Compare(IComparison<IMoleculeAmount> comparison)
public override void Compare(IComparison<MoleculeAmount> comparison)
{
_quantityDiffBuilder.Compare(comparison);
_containerDiffBuilder.Compare(comparison);
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/MoleculeBuilderDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace OSPSuite.Core.Comparison
{
internal class MoleculeBuilderDiffBuilder : DiffBuilder<IMoleculeBuilder>
internal class MoleculeBuilderDiffBuilder : DiffBuilder<MoleculeBuilder>
{
private readonly ContainerDiffBuilder _containerDiffBuilder;
private readonly IObjectComparer _objectComparer;
Expand All @@ -16,7 +16,7 @@ public MoleculeBuilderDiffBuilder(ContainerDiffBuilder containerDiffBuilder, IOb
_enumerableComparerComparer = enumerableComparer;
}

public override void Compare(IComparison<IMoleculeBuilder> comparison)
public override void Compare(IComparison<MoleculeBuilder> comparison)
{
_containerDiffBuilder.Compare(comparison);
CompareValues(x=>!x.IsFloating,Captions.Diff.Stationary,comparison);
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/ObserverBuilderDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace OSPSuite.Core.Comparison
{
public class ObserverBuilderDiffBuilder : DiffBuilder<IObserverBuilder>
public class ObserverBuilderDiffBuilder : DiffBuilder<ObserverBuilder>
{
private readonly EntityDiffBuilder _entityDiffBuilder;
private readonly MoleculeDependentBuilderDiffBuilder _moleculeDependentDiffBuilder;
Expand All @@ -15,7 +15,7 @@ public ObserverBuilderDiffBuilder(EntityDiffBuilder entityDiffBuilder, MoleculeD
_objectComparer = objectComparer;
}

public override void Compare(IComparison<IObserverBuilder> comparison)
public override void Compare(IComparison<ObserverBuilder> comparison)
{
_entityDiffBuilder.Compare(comparison);
_moleculeDependentDiffBuilder.Compare(comparison);
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/ReactionBuilderDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace OSPSuite.Core.Comparison
{
public class ReactionBuilderDiffBuilder : DiffBuilder<IReactionBuilder>
public class ReactionBuilderDiffBuilder : DiffBuilder<ReactionBuilder>
{
private readonly ContainerDiffBuilder _containerDiffBuilder;
private readonly EnumerableComparer _enumerableComparer;
Expand All @@ -16,7 +16,7 @@ public ReactionBuilderDiffBuilder(IObjectComparer objectComparer, ContainerDiffB
_objectComparer = objectComparer;
}

public override void Compare(IComparison<IReactionBuilder> comparison)
public override void Compare(IComparison<ReactionBuilder> comparison)
{
_containerDiffBuilder.Compare(comparison);
_objectComparer.Compare(comparison.FormulaComparison());
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/ReactionDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace OSPSuite.Core.Comparison
{
public class ReactionDiffBuilder : DiffBuilder<IReaction>
public class ReactionDiffBuilder : DiffBuilder<Reaction>
{
private readonly ContainerDiffBuilder _containerDiffBuilder;
private readonly EnumerableComparer _enumerableComparer;
Expand All @@ -16,7 +16,7 @@ public ReactionDiffBuilder(IObjectComparer objectComparer, ContainerDiffBuilder
_objectComparer = objectComparer;
}

public override void Compare(IComparison<IReaction> comparison)
public override void Compare(IComparison<Reaction> comparison)
{
_containerDiffBuilder.Compare(comparison);
_objectComparer.Compare(comparison.FormulaComparison());
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/ReactionPartnerBuilderDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace OSPSuite.Core.Comparison
{
public class ReactionPartnerBuilderDiffBuilder : DiffBuilder<IReactionPartnerBuilder>
public class ReactionPartnerBuilderDiffBuilder : DiffBuilder<ReactionPartnerBuilder>
{
public override void Compare(IComparison<IReactionPartnerBuilder> comparison)
public override void Compare(IComparison<ReactionPartnerBuilder> comparison)
{
CompareStringValues(x => x.MoleculeName, x => x.MoleculeName, comparison);
CompareDoubleValues(x => x.StoichiometricCoefficient, x => x.StoichiometricCoefficient, comparison);
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/ReactionPartnerDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

namespace OSPSuite.Core.Comparison
{
public class ReactionPartnerDiffBuilder : DiffBuilder<IReactionPartner>
public class ReactionPartnerDiffBuilder : DiffBuilder<ReactionPartner>
{
public override void Compare(IComparison<IReactionPartner> comparison)
public override void Compare(IComparison<ReactionPartner> comparison)
{
CompareStringValues(x => x.Partner.Name,Captions.Diff.ReactionPartnerName, comparison);
CompareValues(x => x.StoichiometricCoefficient, x => x.StoichiometricCoefficient, comparison);
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/TransportDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OSPSuite.Core.Comparison
{
public class TransportDiffBuilder : DiffBuilder<ITransport>
public class TransportDiffBuilder : DiffBuilder<Transport>
{
private readonly ContainerDiffBuilder _containerDiffBuilder;
private readonly IObjectComparer _objectComparer;
Expand All @@ -17,7 +17,7 @@ public TransportDiffBuilder(ContainerDiffBuilder containerDiffBuilder, IObjectCo
_entityPathResolver = entityPathResolver;
}

public override void Compare(IComparison<ITransport> comparison)
public override void Compare(IComparison<Transport> comparison)
{
_containerDiffBuilder.Compare(comparison);
CompareValues(x => _entityPathResolver.PathFor(x.TargetAmount), Captions.Diff.TargetAmount, comparison);
Expand Down
4 changes: 2 additions & 2 deletions src/OSPSuite.Core/Comparison/TransporterBuilderDiffBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace OSPSuite.Core.Comparison
{
public class TransporterBuilderDiffBuilder : DiffBuilder<ITransportBuilder>
public class TransporterBuilderDiffBuilder : DiffBuilder<TransportBuilder>
{
private readonly ContainerDiffBuilder _containerDiffBuilder;
private readonly IObjectComparer _objectComparer;
Expand All @@ -15,7 +15,7 @@ public TransporterBuilderDiffBuilder(ContainerDiffBuilder containerDiffBuilder,
_moleculeDependentBuilderDiffBuilder = moleculeDependentBuilderDiffBuilder;
}

public override void Compare(IComparison<ITransportBuilder> comparison)
public override void Compare(IComparison<TransportBuilder> comparison)
{
_containerDiffBuilder.Compare(comparison);
CompareValues(x => x.SourceCriteria, x => x.SourceCriteria, comparison);
Expand Down
Loading

0 comments on commit c135882

Please sign in to comment.