Add default headers.

Author: igr

src/main/java/jodd/http/HttpBase.java

@@ -81,6 +81,12 @@ public static class Defaults {
 		 * Default body encoding (UTF-8).
 		 */
 		public static String bodyEncoding = "UTF-8";
+		/**
+		 * Default headers.
+		 */
+		public static HeadersMultiMap headers = new HeadersMultiMap() {{
+			addHeader(HEADER_USER_AGENT, "Jodd HTTP");
+		}};
 		/**
 		 * Flag that controls if headers should be rewritten and capitalized in PascalCase.
 		 * When disabled, header keys are used as they are passed.
@@ -178,6 +184,14 @@ public void headerRemove(final String name) {
 		headers.remove(name.trim());
 	}
 
+	/**
+	 * Clears all headers.
+	 */
+	public T headersClear() {
+		this.headers.clear();
+		return _this();
+	}
+
 	/**
 	 * Adds header parameter. If a header with the same name exist,
 	 * it will not be overwritten, but the new header with the same

src/main/java/jodd/http/HttpRequest.java

@@ -69,10 +69,16 @@ public HttpRequest() {
 	 * Prepares request on creation. Does the following:
 	 * <ul>
 	 *     <li>adds "Connection: Close" header.</li>
+	 *     <li>adds default headers</li>
 	 * </ul>
 	 */
 	protected void initRequest() {
 		connectionKeepAlive(false);
+		if (Defaults.headers.size() > 0) {
+			for (Map.Entry<String, String> entry : Defaults.headers) {
+				this.headers.add(entry.getKey(), entry.getValue());
+			}
+		}
 	}
 
 	// ---------------------------------------------------------------- properties

src/test/java/jodd/http/HttpBrowserOfflineTest.java

@@ -41,7 +41,7 @@ void testDefaultParameters() {
 
 		httpBrowser.addDefaultHeaders(request);
 
-		assertEquals(3, request.headerNames().size());
+		assertEquals(4, request.headerNames().size());
 		assertEquals("123", request.header("aaa"));
 		assertEquals("987", request.header("bbb"));
 	}
@@ -56,7 +56,7 @@ void testDefaultParametersOverwrite() {
 
 		httpBrowser.addDefaultHeaders(request);
 
-		assertEquals(2, request.headerNames().size());
+		assertEquals(3, request.headerNames().size());
 		assertEquals("987", request.header("aaa"));
 	}
 }

src/test/java/jodd/http/HttpConnectionTest.java

@@ -145,7 +145,7 @@ public void transferred(final int len) {
 		echoTestServer.stop();
 		file.delete();
 
-		assertEquals(":0:512:1024:146", StringUtil.substring(sb.toString(), 0, -1));
+		assertEquals(":0:512:1024:148", StringUtil.substring(sb.toString(), 0, -1));
 	}
 
 }

src/test/java/jodd/http/HttpRequestTest.java

@@ -198,6 +198,7 @@ void testSet() {
 	@Test
 	void testInOutForm() {
 		final HttpRequest request = HttpRequest.get("http://jodd.org/?id=173");
+		request.headersClear();
 		request.header("User-Agent", "Scaly");
 		request.form("one", "funny");
 
@@ -250,6 +251,7 @@ void testNegativeContentLength() {
 	void testFileUpload() throws IOException {
 		final HttpRequest request = HttpRequest.get("http://jodd.org/?id=173");
 
+		request.headersClear();
 		request.header("User-Agent", "Scaly").form("one", "funny");
 
 		final File tempFile = FileUtil.createTempFile();
@@ -355,7 +357,7 @@ void testCapitalizeHeaders() {
 		request.header("key-test2", "value3");
 		assertTrue(request.toString(false).contains("Key-Test2: value2, value3"), "Header key should have been modified");
 		assertEquals(2, request.headers("KEY-TEST2").size());
-		assertEquals(1 + 2, request.headerNames().size());		// 2 default and 2 added
+		assertEquals(2 + 2, request.headerNames().size());		// 2 default and 2 added
 
 		request.headerRemove("key-test2");
 		assertFalse(request.headers.contains("key-test2"));
@@ -375,7 +377,7 @@ void testCapitalizeHeaders() {
 		request.header("key-test1", "value4");
 		assertTrue(request.toString(false).contains("key-test1: VALUE1, value4"), "Header key should not have been modified");
 		assertEquals(2, request.headers("KEY-TEST1").size());
-		assertEquals(1 + 2, request.headerNames().size());		// 2 default and 2 added
+		assertEquals(2 + 2, request.headerNames().size());		// 2 default and 2 added
 
 		request.headerRemove("key-test1");
 		assertFalse(request.headers.contains("key-test1"));

src/test/java/jodd/http/RemoveHeaderTest.java

@@ -26,6 +26,8 @@ void testRemoveHeader() {
 
 	@Test
 	void testRemoveHeaderUserAgent() throws IOException {
+		HttpBase.Defaults.headers.remove("User-Agent");
+
 		HttpRequest request = HttpRequest
 				.get("https://example.com")
 				.header("x-dummy-header", "remove me");
@@ -41,5 +43,7 @@ void testRemoveHeaderUserAgent() throws IOException {
 		String out = baos.toString();
 
 		assertFalse(out.contains("User-Agent"));
+
+		HttpBase.Defaults.headers.addHeader("User-Agent", "Jodd HTTP");
 	}
 }