Skip to content

Commit 72cb720

Browse files
committed
[#eng-5593] bump ES and Jetty dependencies
and changes to satisfy API changes in ES 0.90.10
1 parent 2bcec97 commit 72cb720

File tree

3 files changed

+26
-4
lines changed

3 files changed

+26
-4
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
</parent>
7171

7272
<properties>
73-
<elasticsearch.version>0.90.0</elasticsearch.version>
74-
<jetty.version>8.1.4.v20120524</jetty.version>
73+
<elasticsearch.version>0.90.10</elasticsearch.version>
74+
<jetty.version>8.1.14.v20131031</jetty.version>
7575
<github.global.server>github</github.global.server>
7676
</properties>
7777

src/main/java/com/sonian/elasticsearch/http/jetty/JettyHttpServerRestRequest.java

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,21 @@
1919
import org.elasticsearch.common.bytes.BytesReference;
2020
import org.elasticsearch.common.io.Streams;
2121
import org.elasticsearch.http.HttpRequest;
22-
import org.elasticsearch.rest.support.AbstractRestRequest;
2322
import org.elasticsearch.rest.support.RestUtils;
2423

2524
import javax.servlet.http.HttpServletRequest;
2625
import java.io.IOException;
26+
import java.util.AbstractMap.SimpleEntry;
27+
import java.util.ArrayList;
28+
import java.util.Enumeration;
2729
import java.util.HashMap;
30+
import java.util.List;
2831
import java.util.Map;
2932

3033
/**
3134
* @author imotov
3235
*/
33-
public class JettyHttpServerRestRequest extends AbstractRestRequest implements HttpRequest {
36+
public class JettyHttpServerRestRequest extends HttpRequest {
3437

3538
public static final String REQUEST_CONTENT_ATTRIBUTE = "com.sonian.elasticsearch.http.jetty.request-content";
3639

@@ -98,6 +101,20 @@ public BytesReference content() {
98101
return request.getHeader(name);
99102
}
100103

104+
@Override public Iterable<Map.Entry<String, String>> headers() {
105+
List<Map.Entry<String, String>> headers = new ArrayList<Map.Entry<String, String>>();
106+
Enumeration<String> headerNames = this.request.getHeaderNames();
107+
while (headerNames.hasMoreElements()) {
108+
String name = headerNames.nextElement();
109+
Enumeration<String> headerValues = this.request.getHeaders(name);
110+
while (headerValues.hasMoreElements()) {
111+
String value = headerValues.nextElement();
112+
headers.add(new SimpleEntry<String,String>(name, value));
113+
}
114+
}
115+
return headers;
116+
}
117+
101118
@Override public Map<String, String> params() {
102119
return params;
103120
}

src/test/java/com/sonian/elasticsearch/http/filter/logging/CollectingESLogger.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ public String getName() {
9696
return name;
9797
}
9898

99+
@Override
100+
public String getLevel() {
101+
return this.level.name();
102+
}
103+
99104
@Override
100105
public void setLevel(String level) {
101106
this.level = Level.valueOf(level);

0 commit comments

Comments
 (0)