Skip to content

Commit 815a11a

Browse files
gwbrownkcm
authored andcommitted
HLRC: Standardize access in *RequestConverters (#34768)
With the move to separate RequestConverters classes for each client, some of the access restrictions on the new classes are more open than the prior RequestConverters classes. This standardizes the *RequestConverters classes as package-private, final, and with a private constructor so that no instances of the can be inadvertently created.
1 parent ecf8657 commit 815a11a

10 files changed

+31
-9
lines changed

client/rest-high-level/src/main/java/org/elasticsearch/client/ClusterRequestConverters.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131

3232
final class ClusterRequestConverters {
3333

34+
private ClusterRequestConverters() {}
35+
3436
static Request clusterPutSettings(ClusterUpdateSettingsRequest clusterUpdateSettingsRequest) throws IOException {
3537
Request request = new Request(HttpPut.METHOD_NAME, "/_cluster/settings");
3638

client/rest-high-level/src/main/java/org/elasticsearch/client/GraphRequestConverters.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424

2525
import java.io.IOException;
2626

27-
public class GraphRequestConverters {
27+
final class GraphRequestConverters {
28+
29+
private GraphRequestConverters() {}
2830

2931
static Request explore(GraphExploreRequest exploreRequest) throws IOException {
3032
String endpoint = RequestConverters.endpoint(exploreRequest.indices(), exploreRequest.types(), "_xpack/graph/_explore");

client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesRequestConverters.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@
5353
import java.io.IOException;
5454
import java.util.Locale;
5555

56-
public class IndicesRequestConverters {
56+
final class IndicesRequestConverters {
57+
58+
private IndicesRequestConverters() {}
59+
5760
static Request deleteIndex(DeleteIndexRequest deleteIndexRequest) {
5861
String endpoint = RequestConverters.endpoint(deleteIndexRequest.indices());
5962
Request request = new Request(HttpDelete.METHOD_NAME, endpoint);

client/rest-high-level/src/main/java/org/elasticsearch/client/IngestRequestConverters.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030

3131
import java.io.IOException;
3232

33-
public class IngestRequestConverters {
33+
final class IngestRequestConverters {
34+
35+
private IngestRequestConverters() {}
3436

3537
static Request getPipeline(GetPipelineRequest getPipelineRequest) {
3638
String endpoint = new RequestConverters.EndpointBuilder()

client/rest-high-level/src/main/java/org/elasticsearch/client/LicenseRequestConverters.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
import org.elasticsearch.client.license.GetLicenseRequest;
3030
import org.elasticsearch.client.license.PutLicenseRequest;
3131

32-
public class LicenseRequestConverters {
32+
final class LicenseRequestConverters {
33+
34+
private LicenseRequestConverters() {}
35+
3336
static Request putLicense(PutLicenseRequest putLicenseRequest) {
3437
String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_xpack", "license").build();
3538
Request request = new Request(HttpPut.METHOD_NAME, endpoint);

client/rest-high-level/src/main/java/org/elasticsearch/client/MigrationRequestConverters.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
import org.apache.http.client.methods.HttpGet;
2323
import org.elasticsearch.protocol.xpack.migration.IndexUpgradeInfoRequest;
2424

25-
public class MigrationRequestConverters {
25+
final class MigrationRequestConverters {
26+
27+
private MigrationRequestConverters() {}
2628

2729
static Request getMigrationAssistance(IndexUpgradeInfoRequest indexUpgradeInfoRequest) {
2830
RequestConverters.EndpointBuilder endpointBuilder = new RequestConverters.EndpointBuilder()

client/rest-high-level/src/main/java/org/elasticsearch/client/SnapshotRequestConverters.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636

3737
import java.io.IOException;
3838

39-
public class SnapshotRequestConverters {
39+
final class SnapshotRequestConverters {
40+
41+
private SnapshotRequestConverters() {}
4042

4143
static Request getRepositories(GetRepositoriesRequest getRepositoriesRequest) {
4244
String[] repositories = getRepositoriesRequest.repositories() == null ? Strings.EMPTY_ARRAY : getRepositoriesRequest.repositories();

client/rest-high-level/src/main/java/org/elasticsearch/client/TasksRequestConverters.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
import org.elasticsearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
2525
import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksRequest;
2626

27-
public class TasksRequestConverters {
27+
final class TasksRequestConverters {
28+
29+
private TasksRequestConverters() {}
2830

2931
static Request cancelTasks(CancelTasksRequest cancelTasksRequest) {
3032
Request request = new Request(HttpPost.METHOD_NAME, "/_tasks/_cancel");

client/rest-high-level/src/main/java/org/elasticsearch/client/WatcherRequestConverters.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
import org.elasticsearch.protocol.xpack.watcher.DeleteWatchRequest;
3333
import org.elasticsearch.protocol.xpack.watcher.PutWatchRequest;
3434

35-
public class WatcherRequestConverters {
35+
final class WatcherRequestConverters {
36+
37+
private WatcherRequestConverters() {}
3638

3739
static Request startWatchService(StartWatchServiceRequest startWatchServiceRequest) {
3840
String endpoint = new RequestConverters.EndpointBuilder()

client/rest-high-level/src/main/java/org/elasticsearch/client/XPackRequestConverters.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
import java.util.Locale;
2828
import java.util.stream.Collectors;
2929

30-
public class XPackRequestConverters {
30+
final class XPackRequestConverters {
31+
32+
private XPackRequestConverters() {}
3133

3234
static Request info(XPackInfoRequest infoRequest) {
3335
Request request = new Request(HttpGet.METHOD_NAME, "/_xpack");

0 commit comments

Comments
 (0)