1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-07-19 02:12:53 +00:00

Return string->string headers instead, joining fields with a comma.

This commit is contained in:
SquidDev 2017-05-01 18:00:53 +01:00
parent 29952d5b4f
commit f2596a8547
2 changed files with 7 additions and 12 deletions

View File

@ -69,7 +69,7 @@ public class HTTPAPI implements ILuaAPI
} }
} }
private static ILuaObject wrapBufferedReader( final BufferedReader reader, final int responseCode, final Map<String, Map<Integer, String>> responseHeaders ) private static ILuaObject wrapBufferedReader( final BufferedReader reader, final int responseCode, final Map<String, String> responseHeaders )
{ {
return new ILuaObject() { return new ILuaObject() {
@Override @Override

View File

@ -6,6 +6,7 @@
package dan200.computercraft.core.apis; package dan200.computercraft.core.apis;
import com.google.common.base.Joiner;
import dan200.computercraft.ComputerCraft; import dan200.computercraft.ComputerCraft;
import java.io.*; import java.io.*;
@ -207,16 +208,10 @@ public class HTTPRequest
m_result = result.toString(); m_result = result.toString();
m_responseCode = connection.getResponseCode(); m_responseCode = connection.getResponseCode();
Map<String, Map<Integer, String>> headers = m_responseHeaders = new HashMap<String, Map<Integer, String>>(); Joiner joiner = Joiner.on( ',' );
Map<String, String> headers = m_responseHeaders = new HashMap<String, String>();
for (Map.Entry<String, List<String>> header : connection.getHeaderFields().entrySet()) { for (Map.Entry<String, List<String>> header : connection.getHeaderFields().entrySet()) {
Map<Integer, String> values = new HashMap<Integer, String>(); headers.put(header.getKey(), joiner.join( header.getValue() ));
int i = 0;
for (String value : header.getValue()) {
values.put(++i, value);
}
headers.put(header.getKey(), values);
} }
} }
} }
@ -264,7 +259,7 @@ public class HTTPRequest
} }
} }
public Map<String, Map<Integer, String>> getResponseHeaders() { public Map<String, String> getResponseHeaders() {
synchronized (m_lock) { synchronized (m_lock) {
return m_responseHeaders; return m_responseHeaders;
} }
@ -299,5 +294,5 @@ public class HTTPRequest
private boolean m_success; private boolean m_success;
private String m_result; private String m_result;
private int m_responseCode; private int m_responseCode;
private Map<String, Map<Integer, String>> m_responseHeaders; private Map<String, String> m_responseHeaders;
} }