Cleanup

Signed-off-by: Thomas Farr <[email protected]>
opensearch-project · Oct 30, 2023 · d9b561c · d9b561c
1 parent 0a61bd8
commit d9b561c
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 205 deletions.
diff --git a/src/OpenSearch.Client/Search/PointInTime/CreatePitRequest.cs b/src/OpenSearch.Client/Search/PointInTime/CreatePitRequest.cs
@@ -4,27 +4,6 @@
 * this file be licensed under the Apache-2.0 license or a
 * compatible open source license.
 */
-/*
-* Modifications Copyright OpenSearch Contributors. See
-* GitHub history for details.
-*
-*  Licensed to Elasticsearch B.V. under one or more contributor
-*  license agreements. See the NOTICE file distributed with
-*  this work for additional information regarding copyright
-*  ownership. Elasticsearch B.V. licenses this file to you under
-*  the Apache License, Version 2.0 (the "License"); you may
-*  not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-* 	http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing,
-*  software distributed under the License is distributed on an
-*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-*  KIND, either express or implied.  See the License for the
-*  specific language governing permissions and limitations
-*  under the License.
-*/
 
 namespace OpenSearch.Client;
 

diff --git a/src/OpenSearch.Client/Search/PointInTime/CreatePitResponse.cs b/src/OpenSearch.Client/Search/PointInTime/CreatePitResponse.cs
@@ -4,27 +4,6 @@
 * this file be licensed under the Apache-2.0 license or a
 * compatible open source license.
 */
-/*
-* Modifications Copyright OpenSearch Contributors. See
-* GitHub history for details.
-*
-*  Licensed to Elasticsearch B.V. under one or more contributor
-*  license agreements. See the NOTICE file distributed with
-*  this work for additional information regarding copyright
-*  ownership. Elasticsearch B.V. licenses this file to you under
-*  the Apache License, Version 2.0 (the "License"); you may
-*  not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-* 	http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing,
-*  software distributed under the License is distributed on an
-*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-*  KIND, either express or implied.  See the License for the
-*  specific language governing permissions and limitations
-*  under the License.
-*/
 
 using System.Runtime.Serialization;
 

diff --git a/src/OpenSearch.Client/Search/PointInTime/DeleteAllPitsRequest.cs b/src/OpenSearch.Client/Search/PointInTime/DeleteAllPitsRequest.cs
@@ -4,27 +4,6 @@
 * this file be licensed under the Apache-2.0 license or a
 * compatible open source license.
 */
-/*
-* Modifications Copyright OpenSearch Contributors. See
-* GitHub history for details.
-*
-*  Licensed to Elasticsearch B.V. under one or more contributor
-*  license agreements. See the NOTICE file distributed with
-*  this work for additional information regarding copyright
-*  ownership. Elasticsearch B.V. licenses this file to you under
-*  the Apache License, Version 2.0 (the "License"); you may
-*  not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-* 	http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing,
-*  software distributed under the License is distributed on an
-*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-*  KIND, either express or implied.  See the License for the
-*  specific language governing permissions and limitations
-*  under the License.
-*/
 
 namespace OpenSearch.Client;
 

diff --git a/src/OpenSearch.Client/Search/PointInTime/DeleteAllPitsResponse.cs b/src/OpenSearch.Client/Search/PointInTime/DeleteAllPitsResponse.cs
@@ -4,27 +4,6 @@
 * this file be licensed under the Apache-2.0 license or a
 * compatible open source license.
 */
-/*
-* Modifications Copyright OpenSearch Contributors. See
-* GitHub history for details.
-*
-*  Licensed to Elasticsearch B.V. under one or more contributor
-*  license agreements. See the NOTICE file distributed with
-*  this work for additional information regarding copyright
-*  ownership. Elasticsearch B.V. licenses this file to you under
-*  the Apache License, Version 2.0 (the "License"); you may
-*  not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-* 	http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing,
-*  software distributed under the License is distributed on an
-*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-*  KIND, either express or implied.  See the License for the
-*  specific language governing permissions and limitations
-*  under the License.
-*/
 
 using System.Collections.Generic;
 using System.Runtime.Serialization;

diff --git a/src/OpenSearch.Client/Search/PointInTime/DeletePitRequest.cs b/src/OpenSearch.Client/Search/PointInTime/DeletePitRequest.cs
@@ -4,27 +4,6 @@
 * this file be licensed under the Apache-2.0 license or a
 * compatible open source license.
 */
-/*
-* Modifications Copyright OpenSearch Contributors. See
-* GitHub history for details.
-*
-*  Licensed to Elasticsearch B.V. under one or more contributor
-*  license agreements. See the NOTICE file distributed with
-*  this work for additional information regarding copyright
-*  ownership. Elasticsearch B.V. licenses this file to you under
-*  the Apache License, Version 2.0 (the "License"); you may
-*  not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-* 	http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing,
-*  software distributed under the License is distributed on an
-*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-*  KIND, either express or implied.  See the License for the
-*  specific language governing permissions and limitations
-*  under the License.
-*/
 
 using System.Collections.Generic;
 using System.Linq;
@@ -37,25 +16,25 @@ namespace OpenSearch.Client;
 public partial interface IDeletePitRequest
 {
 	[DataMember(Name = "pit_id")]
-	IEnumerable<string> PitIds { get; set; }
+	IEnumerable<string> PitId { get; set; }
 }
 
 public partial class DeletePitRequest
 {
-	public DeletePitRequest(IEnumerable<string> pitIds) : this(pitIds?.ToArray()) { }
+	public DeletePitRequest(IEnumerable<string> pitId) : this(pitId?.ToArray()) { }
 
-	public DeletePitRequest(params string[] pitIds) => PitIds = pitIds;
+	public DeletePitRequest(params string[] pitId) => PitId = pitId;
 
-	public IEnumerable<string> PitIds { get; set; }
+	public IEnumerable<string> PitId { get; set; }
 }
 
 public partial class DeletePitDescriptor
 {
-	IEnumerable<string> IDeletePitRequest.PitIds { get; set; }
+	IEnumerable<string> IDeletePitRequest.PitId { get; set; }
 
-	public DeletePitDescriptor PitIds(IEnumerable<string> pitIds) =>
-		Assign(pitIds?.ToArray(), (r, v) => r.PitIds = v);
+	public DeletePitDescriptor PitId(IEnumerable<string> pitId) =>
+		Assign(pitId?.ToArray(), (r, v) => r.PitId = v);
 
-	public DeletePitDescriptor PitIds(params string[] pitIds) =>
-		Assign(pitIds, (r, v) => r.PitIds = v);
+	public DeletePitDescriptor PitId(params string[] pitId) =>
+		Assign(pitId, (r, v) => r.PitId = v);
 }
diff --git a/src/OpenSearch.Client/Search/PointInTime/DeletePitResponse.cs b/src/OpenSearch.Client/Search/PointInTime/DeletePitResponse.cs
@@ -4,27 +4,6 @@
 * this file be licensed under the Apache-2.0 license or a
 * compatible open source license.
 */
-/*
-* Modifications Copyright OpenSearch Contributors. See
-* GitHub history for details.
-*
-*  Licensed to Elasticsearch B.V. under one or more contributor
-*  license agreements. See the NOTICE file distributed with
-*  this work for additional information regarding copyright
-*  ownership. Elasticsearch B.V. licenses this file to you under
-*  the Apache License, Version 2.0 (the "License"); you may
-*  not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-* 	http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing,
-*  software distributed under the License is distributed on an
-*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-*  KIND, either express or implied.  See the License for the
-*  specific language governing permissions and limitations
-*  under the License.
-*/
 
 using System.Collections.Generic;
 using System.Runtime.Serialization;

diff --git a/src/OpenSearch.Client/Search/PointInTime/GetAllPitsRequest.cs b/src/OpenSearch.Client/Search/PointInTime/GetAllPitsRequest.cs
@@ -4,27 +4,6 @@
 * this file be licensed under the Apache-2.0 license or a
 * compatible open source license.
 */
-/*
-* Modifications Copyright OpenSearch Contributors. See
-* GitHub history for details.
-*
-*  Licensed to Elasticsearch B.V. under one or more contributor
-*  license agreements. See the NOTICE file distributed with
-*  this work for additional information regarding copyright
-*  ownership. Elasticsearch B.V. licenses this file to you under
-*  the Apache License, Version 2.0 (the "License"); you may
-*  not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-* 	http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing,
-*  software distributed under the License is distributed on an
-*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-*  KIND, either express or implied.  See the License for the
-*  specific language governing permissions and limitations
-*  under the License.
-*/
 
 namespace OpenSearch.Client;
 

diff --git a/src/OpenSearch.Client/Search/PointInTime/GetAllPitsResponse.cs b/src/OpenSearch.Client/Search/PointInTime/GetAllPitsResponse.cs
@@ -4,27 +4,6 @@
 * this file be licensed under the Apache-2.0 license or a
 * compatible open source license.
 */
-/*
-* Modifications Copyright OpenSearch Contributors. See
-* GitHub history for details.
-*
-*  Licensed to Elasticsearch B.V. under one or more contributor
-*  license agreements. See the NOTICE file distributed with
-*  this work for additional information regarding copyright
-*  ownership. Elasticsearch B.V. licenses this file to you under
-*  the Apache License, Version 2.0 (the "License"); you may
-*  not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-* 	http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing,
-*  software distributed under the License is distributed on an
-*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-*  KIND, either express or implied.  See the License for the
-*  specific language governing permissions and limitations
-*  under the License.
-*/
 
 using System.Collections.Generic;
 using System.Runtime.Serialization;

diff --git a/src/OpenSearch.Client/Search/Search/PointInTime/PointInTime.cs b/src/OpenSearch.Client/Search/Search/PointInTime/PointInTime.cs
@@ -4,28 +4,6 @@
 * this file be licensed under the Apache-2.0 license or a
 * compatible open source license.
 */
-/*
-* Modifications Copyright OpenSearch Contributors. See
-* GitHub history for details.
-*
-*  Licensed to Elasticsearch B.V. under one or more contributor
-*  license agreements. See the NOTICE file distributed with
-*  this work for additional information regarding copyright
-*  ownership. Elasticsearch B.V. licenses this file to you under
-*  the Apache License, Version 2.0 (the "License"); you may
-*  not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-* 	http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing,
-*  software distributed under the License is distributed on an
-*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-*  KIND, either express or implied.  See the License for the
-*  specific language governing permissions and limitations
-*  under the License.
-*/
-
 
 using System.Runtime.Serialization;
 

diff --git a/tests/Tests/Search/PointInTime/CreatePitApiTests.cs b/tests/Tests/Search/PointInTime/CreatePitApiTests.cs
@@ -67,7 +67,7 @@ protected override void ExpectResponse(CreatePitResponse response)
 	protected override void OnAfterCall(IOpenSearchClient client)
 	{
 		if (string.IsNullOrEmpty(_pitId)) return;
-		client.DeletePit(d => d.PitIds(_pitId));
+		client.DeletePit(d => d.PitId(_pitId));
 		_pitId = null;
 	}
 }
diff --git a/tests/Tests/Search/PointInTime/DeletePitApiTests.cs b/tests/Tests/Search/PointInTime/DeletePitApiTests.cs
@@ -30,15 +30,15 @@ public DeletePitApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 
 	protected override object ExpectJson => new
 	{
-		pit_ids = new[]
+		pit_id = new[]
 		{
 			_pitId
 		}
 	};
 
 	protected override int ExpectStatusCode => 200;
 
-	protected override Func<DeletePitDescriptor, IDeletePitRequest> Fluent => d => d.PitIds(_pitId);
+	protected override Func<DeletePitDescriptor, IDeletePitRequest> Fluent => d => d.PitId(_pitId);
 	protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 
 	protected override DeletePitRequest Initializer => new(_pitId);

diff --git a/tests/Tests/Search/PointInTime/DeletePitUrlTests.cs b/tests/Tests/Search/PointInTime/DeletePitUrlTests.cs
@@ -20,9 +20,9 @@ [U] public async Task Urls()
 		var pitIds = new[] { "pitid1", "pitid2" };
 
 		await DELETE("/_search/point_in_time")
-			.Fluent(c => c.DeletePit(d => d.PitIds(pitIds)))
+			.Fluent(c => c.DeletePit(d => d.PitId(pitIds)))
 			.Request(c => c.DeletePit(new DeletePitRequest(pitIds)))
-			.FluentAsync(c => c.DeletePitAsync(d => d.PitIds(pitIds)))
+			.FluentAsync(c => c.DeletePitAsync(d => d.PitId(pitIds)))
 			.RequestAsync(c => c.DeletePitAsync(new DeletePitRequest(pitIds)));
 	}
 }
diff --git a/tests/Tests/Search/PointInTime/PointInTimeIntegrationTests.cs b/tests/Tests/Search/PointInTime/PointInTimeIntegrationTests.cs
@@ -62,7 +62,7 @@ [I] public async Task PointInTimeQuery()
 		pitSearch.Total.Should().Be(10);
 		pitSearch.Documents.Should().AllSatisfy(d => d.Id.Should().BeLessThan(10));
 
-		var deleteResp = await client.DeletePitAsync(d => d.PitIds(pitResp.PitId));
+		var deleteResp = await client.DeletePitAsync(d => d.PitId(pitResp.PitId));
 		deleteResp.ShouldBeValid();
 		deleteResp.Pits.Should().BeEquivalentTo(new[]
 		{