Skip to content

Commit f608cea

Browse files
committed
fix: remove redundant cast and update public API
1 parent 32568e8 commit f608cea

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,13 +295,13 @@ public bool Contains(string location)
295295
var uri = ToLocationUrl(location);
296296
if (uri is not null)
297297
{
298-
if (_IOpenApiReferenceableRegistry.TryGetValue(uri, out var referenceableValue))
298+
if (_IOpenApiReferenceableRegistry.TryGetValue(uri, out var referenceableValue) && referenceableValue is T referenceable)
299299
{
300-
return (T)referenceableValue;
300+
return referenceable;
301301
}
302-
else if (_artifactsRegistry.TryGetValue(uri, out var artifact))
302+
else if (_artifactsRegistry.TryGetValue(uri, out var artifact) && artifact is T artifactValue)
303303
{
304-
return (T)(object)artifact;
304+
return artifactValue;
305305
}
306306
}
307307

test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1915,7 +1915,7 @@ namespace Microsoft.OpenApi.Writers
19151915
void WriteValue(decimal value);
19161916
void WriteValue(int value);
19171917
void WriteValue(object value);
1918-
void WriteValue(string? value);
1918+
void WriteValue(string value);
19191919
}
19201920
public class OpenApiJsonWriter : Microsoft.OpenApi.Writers.OpenApiWriterBase
19211921
{
@@ -1927,11 +1927,11 @@ namespace Microsoft.OpenApi.Writers
19271927
public override void WriteEndObject() { }
19281928
public override void WriteIndentation() { }
19291929
public override void WriteNull() { }
1930-
public override void WritePropertyName(string? name) { }
1930+
public override void WritePropertyName(string name) { }
19311931
public override void WriteRaw(string value) { }
19321932
public override void WriteStartArray() { }
19331933
public override void WriteStartObject() { }
1934-
public override void WriteValue(string? value) { }
1934+
public override void WriteValue(string value) { }
19351935
protected override void WriteValueSeparator() { }
19361936
}
19371937
public class OpenApiJsonWriterSettings : Microsoft.OpenApi.Writers.OpenApiWriterSettings
@@ -1962,13 +1962,13 @@ namespace Microsoft.OpenApi.Writers
19621962
protected bool IsObjectScope() { }
19631963
protected bool IsTopLevelScope() { }
19641964
protected Microsoft.OpenApi.Writers.Scope StartScope(Microsoft.OpenApi.Writers.ScopeType type) { }
1965-
protected void VerifyCanWritePropertyName(string? name) { }
1965+
protected void VerifyCanWritePropertyName(string name) { }
19661966
public abstract void WriteEndArray();
19671967
public abstract void WriteEndObject();
19681968
public virtual void WriteEnumerable<T>(System.Collections.Generic.IEnumerable<T> collection) { }
19691969
public virtual void WriteIndentation() { }
19701970
public abstract void WriteNull();
1971-
public abstract void WritePropertyName(string? name);
1971+
public abstract void WritePropertyName(string name);
19721972
public abstract void WriteRaw(string value);
19731973
public abstract void WriteStartArray();
19741974
public abstract void WriteStartObject();
@@ -1981,7 +1981,7 @@ namespace Microsoft.OpenApi.Writers
19811981
public virtual void WriteValue(int value) { }
19821982
public virtual void WriteValue(long value) { }
19831983
public virtual void WriteValue(object? value) { }
1984-
public abstract void WriteValue(string? value);
1984+
public abstract void WriteValue(string value);
19851985
protected abstract void WriteValueSeparator();
19861986
public static void WriteV2Examples(Microsoft.OpenApi.Writers.IOpenApiWriter writer, Microsoft.OpenApi.Models.OpenApiExample example, Microsoft.OpenApi.OpenApiSpecVersion version) { }
19871987
}
@@ -2028,11 +2028,11 @@ namespace Microsoft.OpenApi.Writers
20282028
public override void WriteEndArray() { }
20292029
public override void WriteEndObject() { }
20302030
public override void WriteNull() { }
2031-
public override void WritePropertyName(string? name) { }
2031+
public override void WritePropertyName(string name) { }
20322032
public override void WriteRaw(string value) { }
20332033
public override void WriteStartArray() { }
20342034
public override void WriteStartObject() { }
2035-
public override void WriteValue(string? value) { }
2035+
public override void WriteValue(string value) { }
20362036
protected override void WriteValueSeparator() { }
20372037
}
20382038
public sealed class Scope

0 commit comments

Comments
 (0)