PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-03-28 14:27:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Backport null fix when reading a response

Browse source
This commit is contained in:
Sollace 2020-05-23 23:55:37 +02:00
parent ec4a357aa6
commit 547659ca30
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java
View file

@ -5,6 +5,8 @@ import com.google.common.io.CharStreams;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.voxelmodpack.hdskins.server.SkinServer; import com.voxelmodpack.hdskins.server.SkinServer;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;
import org.apache.http.NameValuePair; import org.apache.http.NameValuePair;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
@ -19,6 +21,7 @@ import java.io.InputStreamReader;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
/** /**
@ -37,8 +40,12 @@ public interface MoreHttpResponses extends AutoCloseable {
return getResponse().getStatusLine().getStatusCode(); return getResponse().getStatusLine().getStatusCode();
} }
default Optional<HttpEntity> getEntity() {
return Optional.ofNullable(getResponse().getEntity());
}
default String getContentType() { default String getContentType() {
return getResponse().getEntity().getContentType().getValue(); return getEntity().map(HttpEntity::getContentType).map(Header::getValue).orElse("text/plain");
} }
default InputStream getInputStream() throws IOException { default InputStream getInputStream() throws IOException {