Skip to content

Commit 4aa4a89

Browse files
committed
make sure we generate https:// even if the source says http://
(cherry picked from commit 392680f)
1 parent 060e13b commit 4aa4a89

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed

src/ApiGenerator/Domain/Specification/Documentation.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ namespace ApiGenerator.Domain.Specification
88
public class Documentation
99
{
1010
public string Description { get; set; }
11-
public string Url { get; set; }
11+
12+
private string _url;
13+
public string Url
14+
{
15+
get => _url;
16+
set => _url = value?.Replace("http://", "https://");
17+
}
1218
}
1319

1420
public class DocumentationConverter : JsonConverter

src/Elasticsearch.Net/Api/RequestParameters/RequestParameters.MachineLearning.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public class DeleteTrainedModelRequestParameters : RequestParameters<DeleteTrain
154154
public override HttpMethod DefaultHttpMethod => HttpMethod.DELETE;
155155
}
156156

157-
///<summary>Request options for EstimateMemoryUsage <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/estimate-memory-usage-dfanalytics.html</para></summary>
157+
///<summary>Request options for EstimateMemoryUsage <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/estimate-memory-usage-dfanalytics.html</para></summary>
158158
public class EstimateMemoryUsageRequestParameters : RequestParameters<EstimateMemoryUsageRequestParameters>
159159
{
160160
public override HttpMethod DefaultHttpMethod => HttpMethod.POST;
@@ -166,7 +166,7 @@ public class EvaluateDataFrameRequestParameters : RequestParameters<EvaluateData
166166
public override HttpMethod DefaultHttpMethod => HttpMethod.POST;
167167
}
168168

169-
///<summary>Request options for ExplainDataFrameAnalytics <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/explain-dfanalytics.html</para></summary>
169+
///<summary>Request options for ExplainDataFrameAnalytics <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/explain-dfanalytics.html</para></summary>
170170
public class ExplainDataFrameAnalyticsRequestParameters : RequestParameters<ExplainDataFrameAnalyticsRequestParameters>
171171
{
172172
public override HttpMethod DefaultHttpMethod => HttpMethod.POST;

src/Elasticsearch.Net/ElasticLowLevelClient.Cat.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public TResponse Master<TResponse>(CatMasterRequestParameters requestParameters
176176
[MapsApi("cat.master", "")]
177177
public Task<TResponse> MasterAsync<TResponse>(CatMasterRequestParameters requestParameters = null, CancellationToken ctx = default)
178178
where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/master", ctx, null, RequestParams(requestParameters));
179-
///<summary>GET on /_cat/ml/datafeeds <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html</para></summary>
179+
///<summary>GET on /_cat/ml/datafeeds <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html</para></summary>
180180
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
181181
public TResponse MlDatafeeds<TResponse>(MlDatafeedsRequestParameters requestParameters = null)
182182
where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(GET, "_cat/ml/datafeeds", null, RequestParams(requestParameters));
@@ -240,37 +240,37 @@ public Task<TResponse> MlTrainedModelsAsync<TResponse>(string modelId, MlTrained
240240
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
241241
public TResponse Datafeeds<TResponse>(DatafeedsRequestParameters requestParameters = null)
242242
where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(GET, "_cat/ml/datafeeds", null, RequestParams(requestParameters));
243-
///<summary>GET on /_cat/ml/datafeeds <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html</para></summary>
243+
///<summary>GET on /_cat/ml/datafeeds <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html</para></summary>
244244
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
245245
[MapsApi("cat.datafeeds", "")]
246246
public Task<TResponse> DatafeedsAsync<TResponse>(DatafeedsRequestParameters requestParameters = null, CancellationToken ctx = default)
247247
where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/ml/datafeeds", ctx, null, RequestParams(requestParameters));
248-
///<summary>GET on /_cat/ml/datafeeds/{datafeed_id} <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html</para></summary>
248+
///<summary>GET on /_cat/ml/datafeeds/{datafeed_id} <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html</para></summary>
249249
///<param name = "datafeedId">The ID of the datafeeds stats to fetch</param>
250250
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
251251
public TResponse Datafeeds<TResponse>(string datafeedId, DatafeedsRequestParameters requestParameters = null)
252252
where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(GET, Url($"_cat/ml/datafeeds/{datafeedId:datafeedId}"), null, RequestParams(requestParameters));
253-
///<summary>GET on /_cat/ml/datafeeds/{datafeed_id} <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html</para></summary>
253+
///<summary>GET on /_cat/ml/datafeeds/{datafeed_id} <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html</para></summary>
254254
///<param name = "datafeedId">The ID of the datafeeds stats to fetch</param>
255255
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
256256
[MapsApi("cat.datafeeds", "datafeed_id")]
257257
public Task<TResponse> DatafeedsAsync<TResponse>(string datafeedId, DatafeedsRequestParameters requestParameters = null, CancellationToken ctx = default)
258258
where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(GET, Url($"_cat/ml/datafeeds/{datafeedId:datafeedId}"), ctx, null, RequestParams(requestParameters));
259-
///<summary>GET on /_cat/ml/anomaly_detectors <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html</para></summary>
259+
///<summary>GET on /_cat/ml/anomaly_detectors <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html</para></summary>
260260
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
261261
public TResponse Jobs<TResponse>(JobsRequestParameters requestParameters = null)
262262
where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(GET, "_cat/ml/anomaly_detectors", null, RequestParams(requestParameters));
263-
///<summary>GET on /_cat/ml/anomaly_detectors <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html</para></summary>
263+
///<summary>GET on /_cat/ml/anomaly_detectors <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html</para></summary>
264264
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
265265
[MapsApi("cat.jobs", "")]
266266
public Task<TResponse> JobsAsync<TResponse>(JobsRequestParameters requestParameters = null, CancellationToken ctx = default)
267267
where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(GET, "_cat/ml/anomaly_detectors", ctx, null, RequestParams(requestParameters));
268-
///<summary>GET on /_cat/ml/anomaly_detectors/{job_id} <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html</para></summary>
268+
///<summary>GET on /_cat/ml/anomaly_detectors/{job_id} <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html</para></summary>
269269
///<param name = "jobId">The ID of the jobs stats to fetch</param>
270270
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
271271
public TResponse Jobs<TResponse>(string jobId, JobsRequestParameters requestParameters = null)
272272
where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(GET, Url($"_cat/ml/anomaly_detectors/{jobId:jobId}"), null, RequestParams(requestParameters));
273-
///<summary>GET on /_cat/ml/anomaly_detectors/{job_id} <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html</para></summary>
273+
///<summary>GET on /_cat/ml/anomaly_detectors/{job_id} <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html</para></summary>
274274
///<param name = "jobId">The ID of the jobs stats to fetch</param>
275275
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
276276
[MapsApi("cat.jobs", "job_id")]

src/Elasticsearch.Net/ElasticLowLevelClient.MachineLearning.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,13 @@ public TResponse DeleteTrainedModel<TResponse>(string modelId, DeleteTrainedMode
187187
[MapsApi("ml.delete_trained_model", "model_id")]
188188
public Task<TResponse> DeleteTrainedModelAsync<TResponse>(string modelId, DeleteTrainedModelRequestParameters requestParameters = null, CancellationToken ctx = default)
189189
where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(DELETE, Url($"_ml/inference/{modelId:modelId}"), ctx, null, RequestParams(requestParameters));
190-
///<summary>POST on /_ml/data_frame/analytics/_estimate_memory_usage <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/estimate-memory-usage-dfanalytics.html</para></summary>
190+
///<summary>POST on /_ml/data_frame/analytics/_estimate_memory_usage <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/estimate-memory-usage-dfanalytics.html</para></summary>
191191
///<param name = "body">Memory usage estimation definition</param>
192192
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
193193
///<remarks>Note: Experimental within the Elasticsearch server, this functionality is experimental and may be changed or removed completely in a future release. Elastic will take a best effort approach to fix any issues, but experimental features are not subject to the support SLA of official GA features.</remarks>
194194
public TResponse EstimateMemoryUsage<TResponse>(PostData body, EstimateMemoryUsageRequestParameters requestParameters = null)
195195
where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(POST, "_ml/data_frame/analytics/_estimate_memory_usage", body, RequestParams(requestParameters));
196-
///<summary>POST on /_ml/data_frame/analytics/_estimate_memory_usage <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/estimate-memory-usage-dfanalytics.html</para></summary>
196+
///<summary>POST on /_ml/data_frame/analytics/_estimate_memory_usage <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/estimate-memory-usage-dfanalytics.html</para></summary>
197197
///<param name = "body">Memory usage estimation definition</param>
198198
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
199199
///<remarks>Note: Experimental within the Elasticsearch server, this functionality is experimental and may be changed or removed completely in a future release. Elastic will take a best effort approach to fix any issues, but experimental features are not subject to the support SLA of official GA features.</remarks>
@@ -213,27 +213,27 @@ public TResponse EvaluateDataFrame<TResponse>(PostData body, EvaluateDataFrameRe
213213
[MapsApi("ml.evaluate_data_frame", "body")]
214214
public Task<TResponse> EvaluateDataFrameAsync<TResponse>(PostData body, EvaluateDataFrameRequestParameters requestParameters = null, CancellationToken ctx = default)
215215
where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(POST, "_ml/data_frame/_evaluate", ctx, body, RequestParams(requestParameters));
216-
///<summary>POST on /_ml/data_frame/analytics/_explain <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/explain-dfanalytics.html</para></summary>
216+
///<summary>POST on /_ml/data_frame/analytics/_explain <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/explain-dfanalytics.html</para></summary>
217217
///<param name = "body">The data frame analytics config to explain</param>
218218
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
219219
///<remarks>Note: Experimental within the Elasticsearch server, this functionality is experimental and may be changed or removed completely in a future release. Elastic will take a best effort approach to fix any issues, but experimental features are not subject to the support SLA of official GA features.</remarks>
220220
public TResponse ExplainDataFrameAnalytics<TResponse>(PostData body, ExplainDataFrameAnalyticsRequestParameters requestParameters = null)
221221
where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(POST, "_ml/data_frame/analytics/_explain", body, RequestParams(requestParameters));
222-
///<summary>POST on /_ml/data_frame/analytics/_explain <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/explain-dfanalytics.html</para></summary>
222+
///<summary>POST on /_ml/data_frame/analytics/_explain <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/explain-dfanalytics.html</para></summary>
223223
///<param name = "body">The data frame analytics config to explain</param>
224224
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
225225
///<remarks>Note: Experimental within the Elasticsearch server, this functionality is experimental and may be changed or removed completely in a future release. Elastic will take a best effort approach to fix any issues, but experimental features are not subject to the support SLA of official GA features.</remarks>
226226
[MapsApi("ml.explain_data_frame_analytics", "body")]
227227
public Task<TResponse> ExplainDataFrameAnalyticsAsync<TResponse>(PostData body, ExplainDataFrameAnalyticsRequestParameters requestParameters = null, CancellationToken ctx = default)
228228
where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(POST, "_ml/data_frame/analytics/_explain", ctx, body, RequestParams(requestParameters));
229-
///<summary>POST on /_ml/data_frame/analytics/{id}/_explain <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/explain-dfanalytics.html</para></summary>
229+
///<summary>POST on /_ml/data_frame/analytics/{id}/_explain <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/explain-dfanalytics.html</para></summary>
230230
///<param name = "id">The ID of the data frame analytics to explain</param>
231231
///<param name = "body">The data frame analytics config to explain</param>
232232
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
233233
///<remarks>Note: Experimental within the Elasticsearch server, this functionality is experimental and may be changed or removed completely in a future release. Elastic will take a best effort approach to fix any issues, but experimental features are not subject to the support SLA of official GA features.</remarks>
234234
public TResponse ExplainDataFrameAnalytics<TResponse>(string id, PostData body, ExplainDataFrameAnalyticsRequestParameters requestParameters = null)
235235
where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(POST, Url($"_ml/data_frame/analytics/{id:id}/_explain"), body, RequestParams(requestParameters));
236-
///<summary>POST on /_ml/data_frame/analytics/{id}/_explain <para>http://www.elastic.co/guide/en/elasticsearch/reference/current/explain-dfanalytics.html</para></summary>
236+
///<summary>POST on /_ml/data_frame/analytics/{id}/_explain <para>https://www.elastic.co/guide/en/elasticsearch/reference/current/explain-dfanalytics.html</para></summary>
237237
///<param name = "id">The ID of the data frame analytics to explain</param>
238238
///<param name = "body">The data frame analytics config to explain</param>
239239
///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>

0 commit comments

Comments
 (0)