mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dan200/computercraft/core/apis/HTTPAPI.java
View File

@ -69,7 +69,7 @@ public void advance( double _dt )
}
}
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() {
@Override

17
src/main/java/dan200/computercraft/core/apis/HTTPRequest.java
View File

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