Skip to content

Commit c24ee6c

Browse files
author
Robin Duda
committed
Add content-type header to support ElasticSearch 6.1.0
1 parent d6b3f7c commit c24ee6c

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<groupId>com.codingchili</groupId>
1212
<artifactId>excelastic</artifactId>
13-
<version>1.2.4</version>
13+
<version>1.2.5</version>
1414
<build>
1515
<plugins>
1616
<plugin>

src/main/java/com/codingchili/ApplicationLauncher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public class ApplicationLauncher {
3030
private static final Logger logger = Logger.getLogger(ApplicationLauncher.class.getName());
3131
public static final String PARAM_CLEAR = "--clear";
32-
public static String VERSION = "1.2.4";
32+
public static String VERSION = "1.2.5";
3333
private Vertx vertx = Vertx.vertx();
3434
private String[] args;
3535

src/main/java/com/codingchili/Model/ElasticWriter.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.codingchili.Model;
22

33
import io.netty.handler.codec.http.HttpHeaderNames;
4+
import io.netty.handler.codec.http.HttpHeaderValues;
45
import io.vertx.core.AbstractVerticle;
56
import io.vertx.core.AsyncResult;
67
import io.vertx.core.Context;
@@ -125,13 +126,18 @@ private HttpClientRequest post(String path) {
125126
HttpClientRequest client = vertx.createHttpClient()
126127
.post(Configuration.getElasticPort(), Configuration.getElasticHost(), path);
127128

128-
addSecurityHeaders(client);
129+
addHeaders(client);
129130
return client;
130131
}
131132

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.
133139
Configuration.getBasicAuth().ifPresent(auth -> {
134-
request.putHeader(HttpHeaderNames.AUTHORIZATION, "Basic " + auth);
140+
client.putHeader(HttpHeaderNames.AUTHORIZATION, "Basic " + auth);
135141
});
136142
}
137143

@@ -182,13 +188,13 @@ private void pollElasticServer(Long id) {
182188

183189
private HttpClientRequest get(String path) {
184190
HttpClientRequest request = vertx.createHttpClient().get(Configuration.getElasticPort(), Configuration.getElasticHost(), path);
185-
addSecurityHeaders(request);
191+
addHeaders(request);
186192
return request;
187193
}
188194

189195
private HttpClientRequest delete(String path) {
190196
HttpClientRequest request = vertx.createHttpClient().delete(Configuration.getElasticPort(), Configuration.getElasticHost(), path);
191-
addSecurityHeaders(request);
197+
addHeaders(request);
192198
return request;
193199
}
194200

0 commit comments

Comments
 (0)