github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-01-15 23:01:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set Accept header on URL connections

Browse Source 
This fixes #182 in theory, though test coverage is nonexistent.
This commit is contained in:
Havoc Pennington 2015-03-02 16:54:50 -05:00
parent d1918a2068
commit d4125f217b
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
config/src/main/java/com/typesafe/config/impl/Parseable.java
View File

@ -100,6 +100,10 @@ public abstract class Parseable implements ConfigParseable {
// to support the "allow missing" feature.
protected abstract Reader reader() throws IOException;
protected Reader reader(ConfigParseOptions options) throws IOException {
return reader();
}
protected static void trace(String message) {
if (ConfigImpl.traceLoadsEnabled()) {
ConfigImpl.trace(message);
@ -195,7 +199,7 @@ public abstract class Parseable implements ConfigParseable {
// options.getAllowMissing()
protected AbstractConfigValue rawParseValue(ConfigOrigin origin, ConfigParseOptions finalOptions)
throws IOException {
Reader reader = reader();
Reader reader = reader(finalOptions);
// after reader() we will have loaded the Content-Type.
ConfigSyntax contentType = contentType();
@ -437,9 +441,38 @@ public abstract class Parseable implements ConfigParseable {
@Override
protected Reader reader() throws IOException {
throw new ConfigException.BugOrBroken("reader() without options should not be called on ParseableURL");
}
private static String acceptContentType(ConfigParseOptions options) {
if (options.getSyntax() == null)
return null;
switch (options.getSyntax()) {
case JSON:
return jsonContentType;
case CONF:
return hoconContentType;
case PROPERTIES:
return propertiesContentType;
}
// not sure this is reachable but javac thinks it is
return null;
}
@Override
protected Reader reader(ConfigParseOptions options) throws IOException {
if (ConfigImpl.traceLoadsEnabled())
trace("Loading config from a URL: " + input.toExternalForm());
URLConnection connection = input.openConnection();
// allow server to serve multiple types from one URL
String acceptContent = acceptContentType(options);
if (acceptContent != null) {
connection.setRequestProperty("Accept", acceptContent);
}
connection.connect();
// save content type for later