Move url slash appending out of YggdrasilConfiguration

This commit is contained in:
yushijinhun 2018-10-05 18:38:15 +08:00
parent 8dadd210fc
commit 0b81d69ff8
No known key found for this signature in database
GPG key ID: 5BC167F73EA558E4
2 changed files with 10 additions and 2 deletions

View file

@ -98,6 +98,8 @@ public final class AuthlibInjector {
private static Optional<YggdrasilConfiguration> configure() {
String apiRoot = System.getProperty(PROP_API_ROOT);
if (apiRoot == null) return empty();
apiRoot = appendSuffixSlash(apiRoot);
Logging.CONFIG.info("API root: " + apiRoot);
warnIfHttp(apiRoot);
@ -145,6 +147,14 @@ public final class AuthlibInjector {
}
}
private static String appendSuffixSlash(String url) {
if (!url.endsWith("/")) {
return url + "/";
} else {
return url;
}
}
private static ClassTransformer createTransformer(YggdrasilConfiguration config) {
ClassTransformer transformer = new ClassTransformer();
transformer.debugSaveClass = "true".equals(System.getProperty(PROP_DUMP_CLASS));

View file

@ -24,8 +24,6 @@ import moe.yushi.authlibinjector.util.KeyUtils;
public class YggdrasilConfiguration {
public static YggdrasilConfiguration parse(String apiRoot, String metadataResponse) throws UncheckedIOException {
if (!apiRoot.endsWith("/")) apiRoot += "/";
JSONObject response = asJsonObject(parseJson(metadataResponse));
List<String> skinDomains =