|
1 | 1 | package com.codingchili.Model; |
2 | 2 |
|
3 | 3 | import io.netty.handler.codec.http.HttpHeaderNames; |
| 4 | +import io.netty.handler.codec.http.HttpHeaderValues; |
4 | 5 | import io.vertx.core.AbstractVerticle; |
5 | 6 | import io.vertx.core.AsyncResult; |
6 | 7 | import io.vertx.core.Context; |
@@ -125,13 +126,18 @@ private HttpClientRequest post(String path) { |
125 | 126 | HttpClientRequest client = vertx.createHttpClient() |
126 | 127 | .post(Configuration.getElasticPort(), Configuration.getElasticHost(), path); |
127 | 128 |
|
128 | | - addSecurityHeaders(client); |
| 129 | + addHeaders(client); |
129 | 130 | return client; |
130 | 131 | } |
131 | 132 |
|
132 | | - private void addSecurityHeaders(HttpClientRequest request) { |
| 133 | + private void addHeaders(HttpClientRequest client) { |
| 134 | + |
| 135 | + // comply with ElasticSearch 6.0 - strict content type. |
| 136 | + client.putHeader(HttpHeaderNames.CONTENT_TYPE, HttpHeaderValues.APPLICATION_JSON); |
| 137 | + |
| 138 | + // support basic authentication. |
133 | 139 | Configuration.getBasicAuth().ifPresent(auth -> { |
134 | | - request.putHeader(HttpHeaderNames.AUTHORIZATION, "Basic " + auth); |
| 140 | + client.putHeader(HttpHeaderNames.AUTHORIZATION, "Basic " + auth); |
135 | 141 | }); |
136 | 142 | } |
137 | 143 |
|
@@ -182,13 +188,13 @@ private void pollElasticServer(Long id) { |
182 | 188 |
|
183 | 189 | private HttpClientRequest get(String path) { |
184 | 190 | HttpClientRequest request = vertx.createHttpClient().get(Configuration.getElasticPort(), Configuration.getElasticHost(), path); |
185 | | - addSecurityHeaders(request); |
| 191 | + addHeaders(request); |
186 | 192 | return request; |
187 | 193 | } |
188 | 194 |
|
189 | 195 | private HttpClientRequest delete(String path) { |
190 | 196 | HttpClientRequest request = vertx.createHttpClient().delete(Configuration.getElasticPort(), Configuration.getElasticHost(), path); |
191 | | - addSecurityHeaders(request); |
| 197 | + addHeaders(request); |
192 | 198 | return request; |
193 | 199 | } |
194 | 200 |
|
|
0 commit comments