Skip to content

Commit af94d0c

Browse files
authored
Rename Osc and Osc.JsonNetSerializer (#47)
Signed-off-by: MaxKsyunz <[email protected]>
1 parent 4ccd5df commit af94d0c

File tree

2,087 files changed

+2921
-2917
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,087 files changed

+2921
-2917
lines changed

OpenSearch.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.27130.2003
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RelatedFiles", "RelatedFiles", "{432D5575-2347-4D3C-BF8C-3E38410C46CA}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Osc", "src\Osc\Osc.csproj", "{072BA7DA-7B60-407D-8B6E-95E3186BE70C}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSearch.Client", "src\OpenSearch.Client\OpenSearch.Client.csproj", "{072BA7DA-7B60-407D-8B6E-95E3186BE70C}"
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSearch.Net", "src\OpenSearch.Net\OpenSearch.Net.csproj", "{E97CCF40-0BA6-43FE-9F2D-58D454134088}"
1111
EndProject
@@ -64,7 +64,7 @@ ProjectSection(SolutionItems) = preProject
6464
Directory.Build.targets = Directory.Build.targets
6565
EndProjectSection
6666
EndProject
67-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Osc.JsonNetSerializer", "src\Osc.JsonNetSerializer\Osc.JsonNetSerializer.csproj", "{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}"
67+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.Client.JsonNetSerializer", "src\OpenSearch.Client.JsonNetSerializer\OpenSearch.Client.JsonNetSerializer.csproj", "{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}"
6868
EndProject
6969
Global
7070
GlobalSection(SolutionConfigurationPlatforms) = preSolution

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
- [OpenSearch .NET Client](#opensearch-net-client)
1010
- [Welcome!](#welcome)
1111
- [Project Resources](#project-resources)
12-
- [OSC](#osc)
12+
- [OpenSearch.Client](#opensearch-client)
1313
- [Getting Started](#getting-started)
1414
- [Compatibility with OpenSearch](#compatibility-with-opensearch)
1515
- [Code of Conduct](#code-of-conduct)
@@ -22,7 +22,7 @@
2222

2323
**opensearch-net** is [a community-driven, open source fork](https://aws.amazon.com/blogs/opensource/introducing-opensearch/) of elasticsearch-net licensed under the [Apache v2.0 License](LICENSE.txt). For more information, see [opensearch.org](https://opensearch.org/).
2424

25-
**OSC** is [a community-driven, open source fork](https://aws.amazon.com/blogs/opensource/introducing-opensearch/) of elasticsearch-net high level client NEST licensed under the [Apache v2.0 License](LICENSE.txt). For more information, see [opensearch.org](https://opensearch.org/).
25+
**OpenSearch.Client** is [a community-driven, open source fork](https://aws.amazon.com/blogs/opensource/introducing-opensearch/) of elasticsearch-net high level client NEST licensed under the [Apache v2.0 License](LICENSE.txt). For more information, see [opensearch.org](https://opensearch.org/).
2626

2727
## Project Resources
2828

@@ -37,9 +37,9 @@
3737
* [Admin Responsibilities](ADMINS.md)
3838
* [Security](SECURITY.md)
3939

40-
## [OSC](https://github.com/opensearch-project/opensearch-net/tree/main/src/Osc)
40+
## [OpenSearch.Client](https://github.com/opensearch-project/opensearch-net/tree/main/src/OpenSearch.Client)
4141

42-
OSC is the official high-level .NET client of [OpenSearch](https://github.com/opensearch-project/OpenSearch).
42+
OpenSearch.Client is the official high-level .NET client of [OpenSearch](https://github.com/opensearch-project/OpenSearch).
4343

4444
## Getting Started
4545

build/scripts/Building.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ module Build =
164164
//rewrite assemblies to versioned counterparts
165165
let dependentAssemblies =
166166
let injectOpenSearchNet =
167-
match deps |> Seq.contains "OSC" with
167+
match deps |> Seq.contains "OpenSearch.Client" with
168168
| true -> List.append deps ["OpenSearch.Net"]
169169
| false -> deps
170170
injectOpenSearchNet

build/scripts/Commandline.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Execution hints can be provided anywhere on the command line
8989
let private (|IsProject|_|) (candidate:string) =
9090
let c = candidate.ToLowerInvariant()
9191
match c with
92-
| "osc" | "opensearch.net" | "osc.jsonnetserializer" -> Some c
92+
| "opensearch.client" | "opensearch.net" | "opensearch.client.jsonnetserializer" -> Some c
9393
| _ -> None
9494

9595
let private (|IsFormat|_|) (candidate:string) =

build/scripts/Testing.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ module Tests =
8585
let RunReleaseUnitTests version args =
8686
//xUnit always does its own build, this env var is picked up by Tests.csproj
8787
//if its set it will include the local package source (build/output/)
88-
//and references OSC and OSC.JsonNetSerializer by the current version
88+
//and references OpenSearch.Client and OpenSearch.Client.JsonNetSerializer by the current version
8989
//this works by not including the local package cache (nay source)
9090
//in the project file via:
9191
//<RestoreSources></RestoreSources>

build/scripts/Versioning.fs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ module Versioning =
144144
let allPackages = !! "build/output/*.nupkg" |> Seq.toList
145145
let toProject (package: string) =
146146
let id = Path.GetFileName(package) |> String.replace (version.Full.ToString()) "" |> String.replace "..nupkg" ""
147-
let assembly = id |> String.replace "OSC" "Osc"
148-
{| Package = package; NugetId = id; AssemblyName = assembly |}
147+
{| Package = package; NugetId = id; AssemblyName = id |}
149148

150149
allPackages |> List.map toProject
151150
packages

src/ApiGenerator/Configuration/CodeConfiguration.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static class CodeConfiguration
8080
/// The class name minus Request is used as the canonical .NET name for the API.
8181
/// </summary>
8282
public static readonly Dictionary<string, string> HighLevelApiNameMapping =
83-
(from f in new DirectoryInfo(GeneratorLocations.OscFolder).GetFiles("*.cs", SearchOption.AllDirectories)
83+
(from f in new DirectoryInfo(GeneratorLocations.OpenSearchClientFolder).GetFiles("*.cs", SearchOption.AllDirectories)
8484
let contents = File.ReadAllText(f.FullName)
8585
let c = Regex.Replace(contents, @"^.+\[MapsApi\(""([^ \r\n]+)""\)\].*$", "$1", RegexOptions.Singleline)
8686
where !c.Contains(" ") //filter results that did not match
@@ -136,7 +136,7 @@ public static Dictionary<string, string> ApiNameMapping
136136
/// The class name minus Request is used as the canonical .NET name for the API.
137137
/// </summary>
138138
public static readonly Dictionary<string, string> ResponseBuilderInClientCalls =
139-
(from f in new DirectoryInfo(GeneratorLocations.OscFolder).GetFiles("*.cs", SearchOption.AllDirectories)
139+
(from f in new DirectoryInfo(GeneratorLocations.OpenSearchClientFolder).GetFiles("*.cs", SearchOption.AllDirectories)
140140
from l in File.ReadLines(f.FullName)
141141
where Regex.IsMatch(l, ResponseBuilderAttributeRegex)
142142
let c = Regex.Replace(l, @"^.+\[ResponseBuilderWithGeneric\(""([^ \r\n]+)""\)\].*$", "$1", RegexOptions.Singleline)
@@ -145,7 +145,7 @@ where Regex.IsMatch(l, ResponseBuilderAttributeRegex)
145145
.ToDictionary(k => k.Key, v => v.Value);
146146

147147
public static readonly Dictionary<string, string> DescriptorGenericsLookup =
148-
(from f in new DirectoryInfo(GeneratorLocations.OscFolder).GetFiles("*Request.cs", SearchOption.AllDirectories)
148+
(from f in new DirectoryInfo(GeneratorLocations.OpenSearchClientFolder).GetFiles("*Request.cs", SearchOption.AllDirectories)
149149
let name = Path.GetFileNameWithoutExtension(f.Name).Replace("Request", "")
150150
let contents = File.ReadAllText(f.FullName)
151151
let c = Regex.Replace(contents, $@"^.+class ({name}Descriptor(?:<[^>\r\n]+>)?[^ \r\n]*).*$", "$1", RegexOptions.Singleline)
@@ -158,7 +158,7 @@ where Regex.IsMatch(l, ResponseBuilderAttributeRegex)
158158
/// <summary> Scan all OSC files for request interfaces and note any generics declared on them </summary>
159159
private static readonly List<Tuple<string, string>> AllKnownRequestInterfaces = (
160160
// find all files in OSC ending with Request.cs
161-
from f in new DirectoryInfo(GeneratorLocations.OscFolder).GetFiles("*Request.cs", SearchOption.AllDirectories)
161+
from f in new DirectoryInfo(GeneratorLocations.OpenSearchClientFolder).GetFiles("*Request.cs", SearchOption.AllDirectories)
162162
from l in File.ReadLines(f.FullName)
163163
// attempt to locate all Request interfaces lines
164164
where Regex.IsMatch(l, @"^.+interface [^ \r\n]+Request")
@@ -180,7 +180,7 @@ select Tuple.Create(request, generics)
180180

181181
public static readonly HashSet<string> DocumentRequests = new HashSet<string>((
182182
// find all files in OSC ending with Request.cs
183-
from f in new DirectoryInfo(GeneratorLocations.OscFolder).GetFiles("*Request.cs", SearchOption.AllDirectories)
183+
from f in new DirectoryInfo(GeneratorLocations.OpenSearchClientFolder).GetFiles("*Request.cs", SearchOption.AllDirectories)
184184
from l in File.ReadLines(f.FullName)
185185
// attempt to locate all Request interfaces lines
186186
where Regex.IsMatch(l, @"^.+interface [^ \r\n]+Request")
@@ -194,7 +194,7 @@ select request
194194

195195
public static readonly Dictionary<string, string> DescriptorConstructors = (
196196
// find all files in OSC ending with Request.cs
197-
from f in new DirectoryInfo(GeneratorLocations.OscFolder).GetFiles("*Request.cs", SearchOption.AllDirectories)
197+
from f in new DirectoryInfo(GeneratorLocations.OpenSearchClientFolder).GetFiles("*Request.cs", SearchOption.AllDirectories)
198198
let descriptor = Path.GetFileNameWithoutExtension(f.Name).Replace("Request", "Descriptor")
199199
let re = $@"^.+public {descriptor}\(([^\r\n\)]+?)\).*$"
200200
from l in File.ReadLines(f.FullName)
@@ -229,7 +229,7 @@ where Regex.IsMatch(l, re)
229229
public static readonly SortedDictionary<string, (string, string)> ResponseLookup = new SortedDictionary<string, (string, string)>(
230230
(
231231
// find all files in OSC ending with Request.cs
232-
from f in new DirectoryInfo(GeneratorLocations.OscFolder).GetFiles("*Response.cs", SearchOption.AllDirectories)
232+
from f in new DirectoryInfo(GeneratorLocations.OpenSearchClientFolder).GetFiles("*Response.cs", SearchOption.AllDirectories)
233233
from l in File.ReadLines(f.FullName)
234234
// attempt to locate all Response class lines
235235
where Regex.IsMatch(l, @"^.+public class [^ \r\n]+Response")

src/ApiGenerator/Configuration/GeneratorLocations.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ public static class GeneratorLocations
3636
public static string OpenSearchNetFolder { get; } = $@"{Root}../../src/OpenSearch.Net/";
3737
public static string LastDownloadedRef { get; } = Path.Combine(Root, "last_downloaded_version.txt");
3838

39-
public static string OscFolder { get; } = $@"{Root}../../src/Osc/";
39+
public static string OpenSearchClientFolder { get; } = $@"{Root}../../src/OpenSearch.Client/";
4040
public static string RestSpecificationFolder { get; } = $@"{Root}RestSpecification/";
4141
// @formatter:on — enable formatter after this line
4242

43-
public static string HighLevel(params string[] paths) => OscFolder + string.Join("/", paths);
43+
public static string HighLevel(params string[] paths) => OpenSearchClientFolder + string.Join("/", paths);
4444
public static string LowLevel(params string[] paths) => OpenSearchNetFolder + string.Join("/", paths);
4545

4646
public static readonly Assembly Assembly = typeof(Generator.ApiGenerator).Assembly;

src/ApiGenerator/Domain/Specification/QueryParameters.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public IEnumerable<string> DescriptionHighLevel
5656
yield return "A document is routed to a particular shard in an index using the following formula";
5757
yield return "<para> shard_num = hash(_routing) % num_primary_shards</para>";
5858
yield return "<para>OpenSearch will use the document id if not provided. </para>";
59-
yield return "<para>For requests that are constructed from/for a document OSC will automatically infer the routing key";
59+
yield return "<para>For requests that are constructed from/for a document OpenSearch.Client will automatically infer the routing key";
6060
yield return
61-
"if that document has a <see cref=\"Osc.JoinField\" /> or a routing mapping on for its type exists on <see cref=\"Osc.ConnectionSettings\" /></para> ";
61+
"if that document has a <see cref=\"OpenSearch.Client.JoinField\" /> or a routing mapping on for its type exists on <see cref=\"OpenSearch.Client.ConnectionSettings\" /></para> ";
6262

6363
yield break;
6464
case "_source":

src/ApiGenerator/Domain/Specification/UrlPath.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ orderby path.IndexOf($"{{{name}}}", StringComparison.Ordinal)
8686
public string AutoResolveBaseArguments(string generic) => string.Join(", ", Parts.Select(p => !ResolvabeFromT.Contains(p.Name) ? p.Name : $"typeof({generic})"));
8787

8888
public string DocumentPathBaseArgument(string generic) => string.Join(", ",
89-
_additionalPartsForConstructor.Select(p => p.Name =="id" ? $"id ?? Osc.Id.From(documentWithId)"
89+
_additionalPartsForConstructor.Select(p => p.Name =="id" ? $"id ?? OpenSearch.Client.Id.From(documentWithId)"
9090
: ResolvabeFromT.Contains(p.Name) ? $"{p.Name} ?? typeof({generic})" : p.Name));
9191

9292
public string DocumentPathConstructorArgument(string generic) => string.Join(", ",

src/ApiGenerator/Generator/Razor/ApiUrlsLookupsGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace ApiGenerator.Generator.Razor
3535
{
3636
public class ApiUrlsLookupsGenerator : RazorGeneratorBase
3737
{
38-
public override string Title => "OSC static url lookups";
38+
public override string Title => "OpenSearch.Client static url lookups";
3939

4040
public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
4141
{

src/ApiGenerator/Generator/Razor/DescriptorsGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ namespace ApiGenerator.Generator.Razor
3737
{
3838
public class DescriptorsGenerator : RazorGeneratorBase
3939
{
40-
public override string Title => "OSC descriptors";
40+
public override string Title => "OpenSearch.Client descriptors";
4141

4242
public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
4343
{
4444
// Delete existing files
45-
foreach (var file in Directory.GetFiles(GeneratorLocations.OscFolder, "Descriptors.*.cs"))
45+
foreach (var file in Directory.GetFiles(GeneratorLocations.OpenSearchClientFolder, "Descriptors.*.cs"))
4646
File.Delete(file);
4747

4848
var view = ViewLocations.HighLevel("Descriptors", "RequestDescriptorBase.cshtml");

src/ApiGenerator/Generator/Razor/HighLevelClientImplementationGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ namespace ApiGenerator.Generator.Razor
3838
{
3939
public class HighLevelClientImplementationGenerator : RazorGeneratorBase
4040
{
41-
public override string Title => "OSC client implementation";
41+
public override string Title => "OpenSearch.Client client implementation";
4242

4343
public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
4444
{
4545
// Delete existing files
46-
foreach (var file in Directory.GetFiles(GeneratorLocations.OscFolder, "OpenSearchClient.*.cs"))
46+
foreach (var file in Directory.GetFiles(GeneratorLocations.OpenSearchClientFolder, "OpenSearchClient.*.cs"))
4747
File.Delete(file);
4848

4949
var view = ViewLocations.HighLevel("Client", "Implementation", "OpenSearchClient.cshtml");

src/ApiGenerator/Generator/Razor/HighLevelClientInterfaceGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace ApiGenerator.Generator.Razor
3535
{
3636
public class HighLevelClientInterfaceGenerator : RazorGeneratorBase
3737
{
38-
public override string Title => "OSC client interface";
38+
public override string Title => "OpenSearch.Client client interface";
3939

4040
public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
4141
{

src/ApiGenerator/Generator/Razor/RequestsGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ namespace ApiGenerator.Generator.Razor
3737
{
3838
public class RequestsGenerator : RazorGeneratorBase
3939
{
40-
public override string Title => "OSC requests";
40+
public override string Title => "OpenSearch.Client requests";
4141

4242
public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
4343
{
4444
// Delete existing files
45-
foreach (var file in Directory.GetFiles(GeneratorLocations.OscFolder, "Requests.*.cs"))
45+
foreach (var file in Directory.GetFiles(GeneratorLocations.OpenSearchClientFolder, "Requests.*.cs"))
4646
File.Delete(file);
4747

4848
var view = ViewLocations.HighLevel("Requests", "PlainRequestBase.cshtml");

src/ApiGenerator/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static class Program
4646
/// <param name="branch">The stack's branch we are targeting the generation for</param>
4747
/// <param name="interactive">Run the generation interactively, this will ignore all flags</param>
4848
/// <param name="download">Whether to download the specs or use an already downloaded copy</param>
49-
/// <param name="includeHighLevel">Also generate the high level client (OSC)</param>
49+
/// <param name="includeHighLevel">Also generate the high level client (OpenSearch.Client)</param>
5050
/// <param name="skipGenerate">Only download the specs, skip all code generation</param>
5151
/// <param name="token"></param>
5252
/// <returns></returns>

src/ApiGenerator/Views/HighLevel/Client/Implementation/OpenSearchClient.Namespace.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ using OpenSearch.Net.@(CsharpNames.ApiNamespace).@(ns)@(CsharpNames.ApiNamespace
1818

1919
// ReSharper disable once CheckNamespace
2020
// ReSharper disable RedundantTypeArgumentsOfMethod
21-
namespace Osc.@(CsharpNames.ApiNamespace).@(ns)@(CsharpNames.ApiNamespaceSuffix)
21+
namespace OpenSearch.Client.@(CsharpNames.ApiNamespace).@(ns)@(CsharpNames.ApiNamespaceSuffix)
2222
{
2323
///<summary>
2424
/// @(ns.SplitPascalCase()) APIs.

src/ApiGenerator/Views/HighLevel/Client/Implementation/OpenSearchClient.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
using System;
99
using System.Threading;
1010
using System.Threading.Tasks;
11-
using Osc;
11+
using OpenSearch.Client;
1212
@{ await IncludeAsync("HighLevel/Client/Usings.cshtml", Model);}
1313

1414
@{
1515
RestApiSpec model = Model;
1616
var namespaces = model.EndpointsPerNamespaceHighLevel.Keys.Where(k => k != CsharpNames.RootNamespace).ToList();
1717
<text>
1818
// ReSharper disable RedundantTypeArgumentsOfMethod
19-
namespace Osc
19+
namespace OpenSearch.Client
2020
{
2121
///<summary>
2222
///OpenSearch high level client

src/ApiGenerator/Views/HighLevel/Client/Interface/IOpenSearchClient.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ using System.Collections.Generic;
1010
using System.Threading;
1111
using System.Threading.Tasks;
1212
using System.Linq;
13-
using Osc;
13+
using OpenSearch.Client;
1414
@{ await IncludeAsync("HighLevel/Client/Usings.cshtml", Model);}
1515

16-
namespace Osc
16+
namespace OpenSearch.Client
1717
{
1818
///<summary>
1919
///OpenSearch high level client

src/ApiGenerator/Views/HighLevel/Client/Usings.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{
66
if (kv.Key != CsharpNames.RootNamespace)
77
{
8-
<text>using Osc.@(CsharpNames.ApiNamespace).@(kv.Key)@(CsharpNames.ApiNamespaceSuffix);
8+
<text>using OpenSearch.Client.@(CsharpNames.ApiNamespace).@(kv.Key)@(CsharpNames.ApiNamespaceSuffix);
99
</text>
1010
}
1111
}

src/ApiGenerator/Views/HighLevel/Descriptors/Descriptors.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ using OpenSearch.Net.Utf8Json;
2929
// ReSharper disable UnusedTypeParameter
3030
// ReSharper disable PartialMethodWithSinglePart
3131
// ReSharper disable RedundantNameQualifier
32-
namespace Osc
32+
namespace OpenSearch.Client
3333
{
3434
@foreach (var endpoint in endpoints)
3535
{

src/ApiGenerator/Views/HighLevel/Descriptors/RequestDescriptorBase.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@inherits ApiGenerator.CodeTemplatePage<RestApiSpec>
33
using System.Collections.Generic;
44

5-
namespace Osc
5+
namespace OpenSearch.Client
66
{
77
// ReSharper disable UnusedTypeParameter
88
public abstract partial class @Raw("RequestDescriptorBase<TDescriptor, TParameters, TInterface>")

src/ApiGenerator/Views/HighLevel/Requests/ApiUrlsLookup.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
RestApiSpec m = Model;
88
}
99
@{ await IncludeAsync("GeneratorNotice.cshtml", m); }
10-
namespace Osc
10+
namespace OpenSearch.Client
1111
{
1212
internal static class ApiUrlsLookups
1313
{

src/ApiGenerator/Views/HighLevel/Requests/PlainRequestBase.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ using OpenSearch.Net.Utf8Json;
1414
@{ await IncludeAsync("LowLevel/Client/Usings.cshtml", Model);}
1515

1616
// ReSharper disable UnusedTypeParameter
17-
namespace Osc
17+
namespace OpenSearch.Client
1818
{
1919
public abstract partial class @Raw("PlainRequestBase<TParameters>")
2020
{

src/ApiGenerator/Views/HighLevel/Requests/Requests.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ using OpenSearch.Net.Utf8Json;
2929
// ReSharper disable UnusedTypeParameter
3030
// ReSharper disable PartialMethodWithSinglePart
3131
// ReSharper disable RedundantNameQualifier
32-
namespace Osc
32+
namespace OpenSearch.Client
3333
{
3434
@foreach (var endpoint in endpoints)
3535
{

src/Osc.JsonNetSerializer/ConnectionSettingsAwareContractResolver.cs renamed to src/OpenSearch.Client.JsonNetSerializer/ConnectionSettingsAwareContractResolver.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333
using Newtonsoft.Json;
3434
using Newtonsoft.Json.Converters;
3535
using Newtonsoft.Json.Serialization;
36+
using OpenSearch.Client;
3637
using JsonProperty = Newtonsoft.Json.Serialization.JsonProperty;
3738

38-
namespace Osc.JsonNetSerializer
39+
namespace OpenSearch.Client.JsonNetSerializer
3940
{
4041
public class ConnectionSettingsAwareContractResolver : DefaultContractResolver
4142
{

src/Osc.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Customization.cs renamed to src/OpenSearch.Client.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Customization.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
using OpenSearch.Net;
3434
using Newtonsoft.Json;
3535

36-
namespace Osc.JsonNetSerializer
36+
namespace OpenSearch.Client.JsonNetSerializer
3737
{
3838
public abstract partial class ConnectionSettingsAwareSerializerBase : IOpenSearchSerializer
3939
{

src/Osc.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.PropertyMappingProvider.cs renamed to src/OpenSearch.Client.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.PropertyMappingProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@
2929
using System.Reflection;
3030
using System.Runtime.Serialization;
3131
using Newtonsoft.Json;
32+
using OpenSearch.Client;
3233

33-
namespace Osc.JsonNetSerializer
34+
namespace OpenSearch.Client.JsonNetSerializer
3435
{
3536
public abstract partial class ConnectionSettingsAwareSerializerBase : IPropertyMappingProvider
3637
{

src/Osc.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Serializer.cs renamed to src/OpenSearch.Client.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Serializer.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@
2929
using System.Collections.Generic;
3030
using System.Linq;
3131
using OpenSearch.Net;
32-
using Osc.JsonNetSerializer.Converters;
3332
using Newtonsoft.Json;
33+
using OpenSearch.Client;
34+
using OpenSearch.Client.JsonNetSerializer.Converters;
3435

35-
namespace Osc.JsonNetSerializer
36+
namespace OpenSearch.Client.JsonNetSerializer
3637
{
3738
public abstract partial class ConnectionSettingsAwareSerializerBase
3839
{

0 commit comments

Comments
 (0)