use some more declared HeaderFramework constants

source/net/yacy/cora/federate/solr/instance/RemoteInstance.java

@@ -30,6 +30,7 @@ import java.util.Map;
 
 import net.yacy.cora.document.id.MultiProtocolURL;
 import net.yacy.cora.protocol.Domains;
+import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.util.CommonPattern;
 import net.yacy.cora.util.ConcurrentLog;
 import net.yacy.kelondro.util.MemoryControl;
@@ -150,7 +151,7 @@ public class RemoteInstance implements SolrInstance {
             ((org.apache.http.impl.client.DefaultHttpClient) this.client).addRequestInterceptor(new HttpRequestInterceptor() {
                 @Override
                 public void process(final HttpRequest request, final HttpContext context) throws IOException {
-                    if (!request.containsHeader("Accept-Encoding")) request.addHeader("Accept-Encoding", "gzip");
+                    if (!request.containsHeader(HeaderFramework.ACCEPT_ENCODING)) request.addHeader(HeaderFramework.ACCEPT_ENCODING, HeaderFramework.CONTENT_ENCODING_GZIP);
                     if (!request.containsHeader("Connection")) request.addHeader("Connection", "close"); // prevent CLOSE_WAIT
                 }
 
@@ -164,7 +165,7 @@ public class RemoteInstance implements SolrInstance {
                         if (ceheader != null) {
                             HeaderElement[] codecs = ceheader.getElements();
                             for (HeaderElement codec : codecs) {
-                                if (codec.getName().equalsIgnoreCase("gzip")) {
+                                if (codec.getName().equalsIgnoreCase(HeaderFramework.CONTENT_ENCODING_GZIP)) {
                                     response.setEntity(new GzipDecompressingEntity(response.getEntity()));
                                     return;
                                 }

source/net/yacy/cora/protocol/http/GzipCompressingEntity.java

@@ -30,6 +30,8 @@ import java.io.OutputStream;
 import java.util.zip.Deflater;
 import java.util.zip.GZIPOutputStream;
 
+import net.yacy.cora.protocol.HeaderFramework;
+
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.entity.HttpEntityWrapper;
@@ -38,17 +40,16 @@ import org.apache.http.protocol.HTTP;
 
 public class GzipCompressingEntity extends HttpEntityWrapper {
 
-	private static final String GZIP_CODEC = "gzip";
 //	private static final int DEFAULT_BUFFER_SIZE = 1024; // this is also the maximum chunk size
 
-	public GzipCompressingEntity(final HttpEntity entity) {
-		super(entity);
-	}
+    public GzipCompressingEntity(final HttpEntity entity) {
+        super(entity);
+    }
 
-	@Override
+    @Override
     public Header getContentEncoding() {
-		return new BasicHeader(HTTP.CONTENT_ENCODING, GZIP_CODEC);
-	}
+        return new BasicHeader(HTTP.CONTENT_ENCODING, HeaderFramework.CONTENT_ENCODING_GZIP);
+    }
 
 	@Override
     public long getContentLength() {

source/net/yacy/cora/protocol/http/GzipRequestInterceptor.java

@@ -26,21 +26,18 @@
 package net.yacy.cora.protocol.http;
 
 import java.io.IOException;
-
+import net.yacy.cora.protocol.HeaderFramework;
 import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.protocol.HttpContext;
 
 public class GzipRequestInterceptor implements HttpRequestInterceptor {
-
-    private static final String ACCEPT_ENCODING = "Accept-Encoding";
-    private static final String GZIP_CODEC = "gzip";
     
     @Override
     public void process(final HttpRequest request, final HttpContext context) throws HttpException, IOException {
-        if (!request.containsHeader(ACCEPT_ENCODING)) {
-            request.addHeader(ACCEPT_ENCODING, GZIP_CODEC);
+        if (!request.containsHeader(HeaderFramework.ACCEPT_ENCODING)) {
+            request.addHeader(HeaderFramework.ACCEPT_ENCODING, HeaderFramework.CONTENT_ENCODING_GZIP);
         }
     }
 

source/net/yacy/cora/protocol/http/GzipResponseInterceptor.java

@@ -26,8 +26,7 @@
 package net.yacy.cora.protocol.http;
 
 import java.io.IOException;
-
-
+import net.yacy.cora.protocol.HeaderFramework;
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
 import org.apache.http.HttpEntity;
@@ -38,8 +37,6 @@ import org.apache.http.client.entity.GzipDecompressingEntity;
 import org.apache.http.protocol.HttpContext;
 
 public class GzipResponseInterceptor implements HttpResponseInterceptor {
-
-    private static final String GZIP_CODEC = "gzip";
     
     @Override
     public void process(final HttpResponse response, final HttpContext context) throws HttpException, IOException {
@@ -52,7 +49,7 @@ public class GzipResponseInterceptor implements HttpResponseInterceptor {
 			if (ceheader != null) {
 				HeaderElement[] codecs = ceheader.getElements();
 				for (int i = 0; i < codecs.length; i++) {
-					if (codecs[i].getName().equalsIgnoreCase(GZIP_CODEC)) {
+					if (codecs[i].getName().equalsIgnoreCase(HeaderFramework.CONTENT_ENCODING_GZIP)) {
 //						response.removeHeader(ceheader);
 						response.setEntity(new GzipDecompressingEntity(response.getEntity()));
 						return;

source/net/yacy/server/http/HTTPDProxyHandler.java

@@ -722,8 +722,8 @@ public final class HTTPDProxyHandler {
         }
 
 	// only gzip-encoding is supported, remove other encodings (e. g. deflate)
-        if ((requestHeader.get(HeaderFramework.ACCEPT_ENCODING,"")).indexOf("gzip",0) != -1) {
-            requestHeader.put(HeaderFramework.ACCEPT_ENCODING, "gzip");
+        if ((requestHeader.get(HeaderFramework.ACCEPT_ENCODING,"")).indexOf(HeaderFramework.CONTENT_ENCODING_GZIP,0) != -1) {
+            requestHeader.put(HeaderFramework.ACCEPT_ENCODING, HeaderFramework.CONTENT_ENCODING_GZIP);
 	} else {
             requestHeader.put(HeaderFramework.ACCEPT_ENCODING, "");
 	}