Add support for custom headers

Author: peacekeeper

uni-resolver-client/src/main/java/uniresolver/client/ClientUniDereferencer.java

@@ -19,10 +19,7 @@
 
 import java.net.URI;
 import java.nio.charset.Charset;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class ClientUniDereferencer implements UniDereferencer {
 
@@ -31,9 +28,11 @@ public class ClientUniDereferencer implements UniDereferencer {
 	private static final ObjectMapper objectMapper = new ObjectMapper();
 
 	public static final HttpClient DEFAULT_HTTP_CLIENT = HttpClients.createDefault();
+	public static final Map<String, String> DEFAULT_HTTP_HEADERS = Collections.emptyMap();
 	public static final URI DEFAULT_DEREFERENCE_URI = URI.create("http://localhost:8080/1.0/identifiers");
 
 	private HttpClient httpClient = DEFAULT_HTTP_CLIENT;
+	private Map<String, String> httpHeaders = DEFAULT_HTTP_HEADERS;
 	private URI dereferenceUri = DEFAULT_DEREFERENCE_URI;
 
 	public ClientUniDereferencer() {
@@ -79,6 +78,7 @@ public DereferenceResult dereference(String didUrlString, Map<String, Object> de
 
 		HttpGet httpGet = new HttpGet(URI.create(uriString));
 		httpGet.addHeader("Accept", acceptMediaTypesString);
+		if (this.getHttpHeaders() != null) this.getHttpHeaders().forEach(httpGet::addHeader);
 
 		// execute HTTP request and read response
 
@@ -158,6 +158,14 @@ public void setHttpClient(HttpClient httpClient) {
 		this.httpClient = httpClient;
 	}
 
+	public Map<String, String> getHttpHeaders() {
+		return this.httpHeaders;
+	}
+
+	public void setHttpHeaders(Map<String, String> httpHeaders) {
+		this.httpHeaders = httpHeaders;
+	}
+
 	public URI getDereferenceUri() {
 		return this.dereferenceUri;
 	}

uni-resolver-client/src/main/java/uniresolver/client/ClientUniResolver.java

@@ -28,13 +28,15 @@ public class ClientUniResolver implements UniResolver {
 	private static final ObjectMapper objectMapper = new ObjectMapper();
 
 	public static final HttpClient DEFAULT_HTTP_CLIENT = HttpClients.createDefault();
+	public static final Map<String, String> DEFAULT_HTTP_HEADERS = Collections.emptyMap();
 	public static final URI DEFAULT_RESOLVE_URI = URI.create("http://localhost:8080/1.0/identifiers");
 	public static final URI DEFAULT_PROPERTIES_URI = URI.create("http://localhost:8080/1.0/properties");
 	public static final URI DEFAULT_METHODS_URI = URI.create("http://localhost:8080/1.0/methods");
 	public static final URI DEFAULT_TEST_IDENTIFIERS_URI = URI.create("http://localhost:8080/1.0/testIdentifiers");
 	public static final URI DEFAULT_TRAITS_URI = URI.create("http://localhost:8080/1.0/traits");
 
 	private HttpClient httpClient = DEFAULT_HTTP_CLIENT;
+	private Map<String, String> httpHeaders = DEFAULT_HTTP_HEADERS;
 	private URI resolveUri = DEFAULT_RESOLVE_URI;
 	private URI propertiesUri = DEFAULT_PROPERTIES_URI;
 	private URI methodsUri = DEFAULT_METHODS_URI;
@@ -88,6 +90,7 @@ public ResolveResult resolve(String didString, Map<String, Object> resolutionOpt
 
 		HttpGet httpGet = new HttpGet(URI.create(uriString));
 		httpGet.addHeader("Accept", acceptMediaTypesString);
+		if (this.getHttpHeaders() != null) this.getHttpHeaders().forEach(httpGet::addHeader);
 
 		// execute HTTP request and read response
 
@@ -367,6 +370,14 @@ public void setHttpClient(HttpClient httpClient) {
 		this.httpClient = httpClient;
 	}
 
+	public Map<String, String> getHttpHeaders() {
+		return this.httpHeaders;
+	}
+
+	public void setHttpHeaders(Map<String, String> httpHeaders) {
+		this.httpHeaders = httpHeaders;
+	}
+
 	public URI getResolveUri() {
 		return this.resolveUri;
 	}