2424import org .apache .http .HttpEntity ;
2525import org .apache .http .entity .ContentType ;
2626import org .apache .http .nio .entity .NStringEntity ;
27+ import org .elasticsearch .client .Request ;
2728import org .elasticsearch .client .Response ;
2829import org .elasticsearch .common .Strings ;
2930import org .elasticsearch .common .io .PathUtils ;
4445import java .util .List ;
4546import java .util .Map ;
4647
47- import static java .util .Collections .emptyMap ;
4848import static org .elasticsearch .common .xcontent .XContentFactory .jsonBuilder ;
4949import static org .hamcrest .Matchers .equalTo ;
5050import static org .hamcrest .Matchers .hasSize ;
@@ -70,8 +70,10 @@ public static Iterable<Object[]> parameters() throws Exception {
7070 **/
7171 @ Before
7272 public void registerRepositories () throws IOException {
73- Response clusterSettingsResponse = client ().performRequest ("GET" , "/_cluster/settings?include_defaults=true" +
74- "&filter_path=defaults.path.repo,defaults.repositories.url.allowed_urls" );
73+ Request clusterSettingsRequest = new Request ("GET" , "/_cluster/settings" );
74+ clusterSettingsRequest .addParameter ("include_defaults" , "true" );
75+ clusterSettingsRequest .addParameter ("filter_path" , "defaults.path.repo,defaults.repositories.url.allowed_urls" );
76+ Response clusterSettingsResponse = client ().performRequest (clusterSettingsRequest );
7577 Map <String , Object > clusterSettings = entityAsMap (clusterSettingsResponse );
7678
7779 @ SuppressWarnings ("unchecked" )
@@ -83,13 +85,17 @@ public void registerRepositories() throws IOException {
8385 final URI pathRepoUri = PathUtils .get (pathRepo ).toUri ().normalize ();
8486
8587 // Create a FS repository using the path.repo location
86- Response createFsRepositoryResponse = client ().performRequest ("PUT" , "_snapshot/repository-fs" , emptyMap (),
87- buildRepositorySettings (FsRepository .TYPE , Settings .builder ().put ("location" , pathRepo ).build ()));
88+ Request createFsRepositoryRequest = new Request ("PUT" , "/_snapshot/repository-fs" );
89+ createFsRepositoryRequest .setEntity (buildRepositorySettings (FsRepository .TYPE ,
90+ Settings .builder ().put ("location" , pathRepo ).build ()));
91+ Response createFsRepositoryResponse = client ().performRequest (createFsRepositoryRequest );
8892 assertThat (createFsRepositoryResponse .getStatusLine ().getStatusCode (), equalTo (RestStatus .OK .getStatus ()));
8993
9094 // Create a URL repository using the file://{path.repo} URL
91- Response createFileRepositoryResponse = client ().performRequest ("PUT" , "_snapshot/repository-file" , emptyMap (),
92- buildRepositorySettings (URLRepository .TYPE , Settings .builder ().put ("url" , pathRepoUri .toString ()).build ()));
95+ Request createFileRepositoryRequest = new Request ("PUT" , "/_snapshot/repository-file" );
96+ createFileRepositoryRequest .setEntity (buildRepositorySettings (URLRepository .TYPE ,
97+ Settings .builder ().put ("url" , pathRepoUri .toString ()).build ()));
98+ Response createFileRepositoryResponse = client ().performRequest (createFileRepositoryRequest );
9399 assertThat (createFileRepositoryResponse .getStatusLine ().getStatusCode (), equalTo (RestStatus .OK .getStatus ()));
94100
95101 // Create a URL repository using the http://{fixture} URL
@@ -99,8 +105,10 @@ public void registerRepositories() throws IOException {
99105 try {
100106 InetAddress inetAddress = InetAddress .getByName (new URL (allowedUrl ).getHost ());
101107 if (inetAddress .isAnyLocalAddress () || inetAddress .isLoopbackAddress ()) {
102- Response createUrlRepositoryResponse = client ().performRequest ("PUT" , "_snapshot/repository-url" , emptyMap (),
103- buildRepositorySettings (URLRepository .TYPE , Settings .builder ().put ("url" , allowedUrl ).build ()));
108+ Request createUrlRepositoryRequest = new Request ("PUT" , "/_snapshot/repository-url" );
109+ createUrlRepositoryRequest .setEntity (buildRepositorySettings (URLRepository .TYPE ,
110+ Settings .builder ().put ("url" , allowedUrl ).build ()));
111+ Response createUrlRepositoryResponse = client ().performRequest (createUrlRepositoryRequest );
104112 assertThat (createUrlRepositoryResponse .getStatusLine ().getStatusCode (), equalTo (RestStatus .OK .getStatus ()));
105113 break ;
106114 }
@@ -126,4 +134,3 @@ private static HttpEntity buildRepositorySettings(final String type, final Setti
126134 }
127135 }
128136}
129-
0 commit comments