From e855f92c3502b2b5be5be47dc26d980cdc2bd6cb Mon Sep 17 00:00:00 2001 From: Dimitrie Stefanescu Date: Thu, 19 Dec 2024 18:06:15 +0000 Subject: [PATCH] chore: cleanup --- .../Speckle.Converters.AutocadShared.projitems | 2 +- ...leFallbackToHostConversion.cs => DataObjectConverter.cs} | 6 ++---- .../Speckle.Converters.RhinoShared.projitems | 2 +- ...ackToHostTopLevelConverter.cs => DataObjectConverter.cs} | 0 .../ToHost/ConverterWithFallback.cs | 2 ++ 5 files changed, 6 insertions(+), 6 deletions(-) rename Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/{SpeckleFallbackToHostConversion.cs => DataObjectConverter.cs} (90%) rename Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/TopLevel/{FallbackToHostTopLevelConverter.cs => DataObjectConverter.cs} (100%) diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems b/Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems index 30fd7c666..3e1738bd3 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems @@ -19,7 +19,7 @@ - + diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/SpeckleFallbackToHostConversion.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/DataObjectConverter.cs similarity index 90% rename from Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/SpeckleFallbackToHostConversion.cs rename to Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/DataObjectConverter.cs index 4d8059324..e0fb67637 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/SpeckleFallbackToHostConversion.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/DataObjectConverter.cs @@ -7,9 +7,7 @@ using Speckle.Sdk.Models; namespace Speckle.Converters.Rhino7.ToHost.TopLevel; [NameAndRankValue(nameof(DataObject), NameAndRankValueAttribute.SPECKLE_DEFAULT_RANK)] -public class SpeckleFallbackToAutocadTopLevelConverter - : IToHostTopLevelConverter, - ITypedConverter> +public class DataObjectConverter : IToHostTopLevelConverter, ITypedConverter> { private readonly ITypedConverter _lineConverter; private readonly ITypedConverter _polylineConverter; @@ -17,7 +15,7 @@ public class SpeckleFallbackToAutocadTopLevelConverter private readonly ITypedConverter _arcConverter; private readonly ITypedConverter _pointConverter; - public SpeckleFallbackToAutocadTopLevelConverter( + public DataObjectConverter( ITypedConverter lineConverter, ITypedConverter polylineConverter, ITypedConverter meshConverter, diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/Speckle.Converters.RhinoShared.projitems b/Converters/Rhino/Speckle.Converters.RhinoShared/Speckle.Converters.RhinoShared.projitems index d3840250a..632f0e62a 100644 --- a/Converters/Rhino/Speckle.Converters.RhinoShared/Speckle.Converters.RhinoShared.projitems +++ b/Converters/Rhino/Speckle.Converters.RhinoShared/Speckle.Converters.RhinoShared.projitems @@ -9,6 +9,6 @@ Speckle.Converters.RhinoShared - + \ No newline at end of file diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/TopLevel/FallbackToHostTopLevelConverter.cs b/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/TopLevel/DataObjectConverter.cs similarity index 100% rename from Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/TopLevel/FallbackToHostTopLevelConverter.cs rename to Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/TopLevel/DataObjectConverter.cs diff --git a/Sdk/Speckle.Converters.Common/ToHost/ConverterWithFallback.cs b/Sdk/Speckle.Converters.Common/ToHost/ConverterWithFallback.cs index 552f60b55..35feb7750 100644 --- a/Sdk/Speckle.Converters.Common/ToHost/ConverterWithFallback.cs +++ b/Sdk/Speckle.Converters.Common/ToHost/ConverterWithFallback.cs @@ -49,6 +49,8 @@ public sealed class ConverterWithFallback : IRootToHostConverter } catch (ConversionNotSupportedException e) { + // NOTE: `ConversionNotSupportedException` should not be an exception - we know what we can convert and what we can't; this is doubly true + // on hot paths where we *know* that we will fallback to a display value anyway. _logger.LogInformation(e, "Attempt to find conversion for type {type} failed", type); }