embulk-input-http 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d4db1e839abd5e9c5d84c54cbda141d3ffe613f
-  data.tar.gz: 94c29e9b318d8eaa383c2a46a6131c4b5a1c770e
+  metadata.gz: 175926ebb8b9f4dbff0a806fc559ac1a1103f517
+  data.tar.gz: 14a442cbeb472243bc4b83b1bf448d6da11afa8a
 SHA512:
-  metadata.gz: 8ce9962babf185be1fa4909d1d2fa697e3df54bbb4b79ac3fb2b43006b9fbe4b11d98763c9b0fc6862615e174dddffe17a24607e432bb7873d7ced2c44618aab
-  data.tar.gz: 88f88ed98d50eed6fc97e68284b083879ab0586ff0459e1642050698b90e385e2676f450fca2cc6f61f0351d8ddfb161c740e8feea870a70081b041172490fbc
+  metadata.gz: c8b5fa9860063ad4fa3f659cd53df83de39ea6d6ec6aa54fa308833cfe5ac730497c0c2f1a4f5992dfaec3862455faabfd93d8fded6c4e3936357683b755aa65
+  data.tar.gz: 30b3254118b8eeb453a748fa9dbf27e047f61fa3efe616bdc2e8c74b72b199f77574dd2213b6f6f2c7c3b24acbc61827eb91d52f9bcc78069f0f6bd2b3ed4f75

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.22.0"
+version = "0.23.0"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/input/http/HttpFileInputPlugin.java

@@ -46,6 +46,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -204,13 +205,19 @@ public class HttpFileInputPlugin implements FileInputPlugin {
   }
 
   private List<Header> makeHeaders(PluginTask task) {
-    List<Header> headers = new ArrayList<>();
-    headers.add(new BasicHeader("Accept", "*/*"));
-    headers.add(new BasicHeader("Accept-Charset", task.getCharset()));
-    headers.add(new BasicHeader("Accept-Encoding", "gzip, deflate"));
-    headers.add(new BasicHeader("Accept-Language", "en-us,en;q=0.5"));
-    headers.add(new BasicHeader("User-Agent", task.getUserAgent()));
+    Map<String, String> map = new HashMap<>();
+    map.put("Accept", "*/*");
+    map.put("Accept-Charset", task.getCharset());
+    map.put("Accept-Encoding", "gzip, deflate");
+    map.put("Accept-Language", "en-us,en;q=0.5");
+    map.put("User-Agent", task.getUserAgent());
     for (Map.Entry<String, String> entry : task.getRequestHeaders().entrySet()) {
+      // Overwrite default headers by user defined headers
+      map.put(entry.getKey(), entry.getValue());
+    }
+
+    List<Header> headers = new ArrayList<>();
+    for (Map.Entry<String, String> entry : map.entrySet()) {
       headers.add(new BasicHeader(entry.getKey(), entry.getValue()));
     }
     return headers;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-http
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Takuma kanari
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ files:
 - classpath/commons-codec-1.11.jar
 - classpath/commons-io-2.6.jar
 - classpath/commons-logging-1.2.jar
-- classpath/embulk-input-http-0.22.0.jar
+- classpath/embulk-input-http-0.23.0.jar
 - classpath/httpclient-4.5.9.jar
 - classpath/httpcore-4.4.11.jar
 - config/checkstyle/checkstyle.xml