Added latest Guava and SLF4J compatibility

(1.18+ breaks support to older guava methods)
This commit is contained in:
Alberto Migliorato
2021-12-01 01:12:38 +01:00
parent 15fee92937
commit 2cdfdcb5c5
4 changed files with 20 additions and 7 deletions
@@ -35,7 +35,7 @@ import java.util.logging.Level;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.impl.JDK14LoggerAdapter;
import org.slf4j.jul.JDK14LoggerAdapter;
public class CommonUtil {
@@ -126,7 +126,7 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
Set<Proxy> proxies = config.getStringList("proxies")
.stream()
.map(HostAndPort::fromString)
.map(proxy -> new InetSocketAddress(proxy.getHostText(), proxy.getPort()))
.map(proxy -> new InetSocketAddress(proxy.getHost(), proxy.getPort()))
.map(sa -> new Proxy(Type.HTTP, sa))
.collect(toSet());
@@ -26,6 +26,7 @@
package com.github.games647.fastlogin.core.shared;
import com.github.games647.fastlogin.core.StoredProfile;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.util.UUID;
@@ -91,7 +92,7 @@ public abstract class LoginSession {
@Override
public synchronized String toString() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("profile", profile)
.add("requestUsername", requestUsername)
.add("username", username)