24
24
import org .apache .http .HttpEntity ;
25
25
import org .apache .http .entity .ContentType ;
26
26
import org .apache .http .nio .entity .NStringEntity ;
27
+ import org .elasticsearch .client .Request ;
27
28
import org .elasticsearch .client .Response ;
28
29
import org .elasticsearch .common .Strings ;
29
30
import org .elasticsearch .common .io .PathUtils ;
44
45
import java .util .List ;
45
46
import java .util .Map ;
46
47
47
- import static java .util .Collections .emptyMap ;
48
48
import static org .elasticsearch .common .xcontent .XContentFactory .jsonBuilder ;
49
49
import static org .hamcrest .Matchers .equalTo ;
50
50
import static org .hamcrest .Matchers .hasSize ;
@@ -70,8 +70,10 @@ public static Iterable<Object[]> parameters() throws Exception {
70
70
**/
71
71
@ Before
72
72
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 );
75
77
Map <String , Object > clusterSettings = entityAsMap (clusterSettingsResponse );
76
78
77
79
@ SuppressWarnings ("unchecked" )
@@ -83,13 +85,17 @@ public void registerRepositories() throws IOException {
83
85
final URI pathRepoUri = PathUtils .get (pathRepo ).toUri ().normalize ();
84
86
85
87
// 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 );
88
92
assertThat (createFsRepositoryResponse .getStatusLine ().getStatusCode (), equalTo (RestStatus .OK .getStatus ()));
89
93
90
94
// 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 );
93
99
assertThat (createFileRepositoryResponse .getStatusLine ().getStatusCode (), equalTo (RestStatus .OK .getStatus ()));
94
100
95
101
// Create a URL repository using the http://{fixture} URL
@@ -99,8 +105,10 @@ public void registerRepositories() throws IOException {
99
105
try {
100
106
InetAddress inetAddress = InetAddress .getByName (new URL (allowedUrl ).getHost ());
101
107
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 );
104
112
assertThat (createUrlRepositoryResponse .getStatusLine ().getStatusCode (), equalTo (RestStatus .OK .getStatus ()));
105
113
break ;
106
114
}
@@ -126,4 +134,3 @@ private static HttpEntity buildRepositorySettings(final String type, final Setti
126
134
}
127
135
}
128
136
}
129
-
0 commit comments