Merge pull request #11231 from martijnvg/fix_ContextAndHeaderHolder_a…

…nd_HasHeaders_generics Removed generic types from ContextAndHeaderHolder and HasHeaders#putHeader()
elastic · May 19, 2015 · 02fa819 · 02fa819
2 parents bd4c741 + e6a25d4
commit 02fa819
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/src/main/java/org/elasticsearch/common/ContextAndHeaderHolder.java b/src/main/java/org/elasticsearch/common/ContextAndHeaderHolder.java
@@ -31,7 +31,7 @@
 /**
  *
  */
-public class ContextAndHeaderHolder<T> implements HasContextAndHeaders {
+public class ContextAndHeaderHolder implements HasContextAndHeaders {
 
     private ObjectObjectOpenHashMap<Object, Object> context;
     protected Map<String, Object> headers;
@@ -108,14 +108,13 @@ public synchronized void copyContextFrom(HasContext other) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    public final T putHeader(String key, Object value) {
+    public HasHeaders putHeader(String key, Object value) {
         if (headers == null) {
             headers = new HashMap<>();
         }
         headers.put(key, value);
-        return (T) this;
+        return this;
     }
 
     @SuppressWarnings("unchecked")

diff --git a/src/main/java/org/elasticsearch/common/HasHeaders.java b/src/main/java/org/elasticsearch/common/HasHeaders.java
@@ -26,7 +26,7 @@
  */
 public interface HasHeaders {
 
-    <V> V putHeader(String key, V value);
+    HasHeaders putHeader(String key, Object value);
 
     <V> V getHeader(String key);
 

diff --git a/src/main/java/org/elasticsearch/percolator/PercolateContext.java b/src/main/java/org/elasticsearch/percolator/PercolateContext.java
@@ -788,9 +788,9 @@ public void copyContextFrom(HasContext other) {
     }
 
     @Override
-    public <V> V putHeader(String key, V value) {
-        assert false : "percolatocontext does not support contexts & headers";
-        return value;
+    public HasHeaders putHeader(String key, Object value) {
+        assert false : "percolatcontext does not support contexts & headers";
+        return this;
     }
 
     @Override

diff --git a/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java b/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java
@@ -766,7 +766,7 @@ public void copyContextFrom(HasContext other) {
     }
 
     @Override
-    public <V> V putHeader(String key, V value) {
+    public HasHeaders putHeader(String key, Object value) {
         return request.putHeader(key, value);
     }
 

diff --git a/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java b/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java
@@ -658,7 +658,7 @@ public void copyContextFrom(HasContext other) {
     }
 
     @Override
-    public <V> V putHeader(String key, V value) {
+    public HasHeaders putHeader(String key, Object value) {
         return in.putHeader(key, value);
     }
 

diff --git a/src/main/java/org/elasticsearch/transport/TransportMessage.java b/src/main/java/org/elasticsearch/transport/TransportMessage.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.transport;
 
 import org.elasticsearch.common.ContextAndHeaderHolder;
+import org.elasticsearch.common.HasHeaders;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
@@ -32,7 +33,7 @@
  * The transport message is also a {@link ContextAndHeaderHolder context holder} that holds <b>transient</b> context, that is,
  * the context is not serialized with message.
  */
-public abstract class TransportMessage<TM extends TransportMessage<TM>> extends ContextAndHeaderHolder<TM> implements Streamable {
+public abstract class TransportMessage<TM extends TransportMessage<TM>> extends ContextAndHeaderHolder implements Streamable {
 
     private TransportAddress remoteAddress;
 
@@ -57,6 +58,11 @@ public TransportAddress remoteAddress() {
         return remoteAddress;
     }
 
+    // Needed for plugins already compiled against 1.5.x versions:
+    public TransportMessage putHeader(String key, Object value) {
+        return (TransportMessage) super.putHeader(key, value);
+    }
+
     @Override
     public void readFrom(StreamInput in) throws IOException {
         headers = in.readBoolean() ? in.readMap() : null;

diff --git a/src/test/java/org/elasticsearch/test/TestSearchContext.java b/src/test/java/org/elasticsearch/test/TestSearchContext.java
@@ -704,8 +704,8 @@ public void copyContextFrom(HasContext other) {
     }
 
     @Override
-    public <V> V putHeader(String key, V value) {
-        return value;
+    public HasHeaders putHeader(String key, Object value) {
+        return this;
     }
 
     @Override