Skip to content

fix bug in adding headers #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Brekhin wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

fix bug in adding headers #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions flume-ng-core/src/main/java/org/apache/flume/source/http/BLOBHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
package org.apache.flume.source.http;

import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

import javax.servlet.http.HttpServletRequest;

Expand Down Expand Up @@ -65,18 +62,13 @@ public List<Event> getEvents(HttpServletRequest request) throws Exception {

InputStream inputStream = request.getInputStream();

Map<String, String[]> parameters = request.getParameterMap();
for (String parameter : parameters.keySet()) {
String value = parameters.get(parameter)[0];
Enumeration<String> parameters = request.getHeaderNames();
while (parameters.hasMoreElements()){
String value = parameters.nextElement();
if (LOG.isDebugEnabled() && LogPrivacyUtil.allowLogRawData()) {
LOG.debug("Setting Header [Key, Value] as [{},{}] ", parameter, value);
LOG.debug("Setting Header [Key, Value] as [{},{}] ", request.getHeader(value), value);
}
headers.put(parameter, value);
}

for (String header : mandatoryHeaders) {
Preconditions.checkArgument(headers.containsKey(header),
"Please specify " + header + " parameter in the request.");
headers.put(request.getHeader(value), value);
}

ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
Expand Down
10 changes: 5 additions & 5 deletions flume-ng-core/src/test/java/org/apache/flume/source/http/TestBLOBHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ public void setUp() {
@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testCSVData() throws Exception {
Map requestParameterMap = new HashMap();
requestParameterMap.put("param1", new String[] { "value1" });
requestParameterMap.put("param2", new String[] { "value2" });
Map requestHeaders = new HashMap();
requestHeaders.put("param1", "value1");
requestHeaders.put("param2", "value2");

HttpServletRequest req = mock(HttpServletRequest.class);
final String csvData = "a,b,c";
Expand All @@ -63,7 +63,7 @@ public void testCSVData() throws Exception {
new ByteArrayInputStream(csvData.getBytes()));

when(req.getInputStream()).thenReturn(servletInputStream);
when(req.getParameterMap()).thenReturn(requestParameterMap);
when(req.getParameterMap()).thenReturn(requestHeaders);

Context context = mock(Context.class);
when(
Expand All @@ -85,7 +85,7 @@ public void testCSVData() throws Exception {
@Test
public void testTabData() throws Exception {
Map requestParameterMap = new HashMap();
requestParameterMap.put("param1", new String[] { "value1" });
requestParameterMap.put("param1", "value1");

HttpServletRequest req = mock(HttpServletRequest.class);
final String tabData = "a\tb\tc";
Expand Down