From f16cd154f7d39e42e2669e6a46cbbd4b589a561f Mon Sep 17 00:00:00 2001 From: sgaebel Date: Sat, 20 Mar 2021 15:14:09 +0100 Subject: [PATCH] removes unused imports and variables --- htroot/ConfigAccounts_p.java | 1 - htroot/ConfigUser_p.java | 2 +- htroot/SettingsAck_p.java | 1 - .../yacy/cora/federate/solr/instance/RemoteInstance.java | 3 --- source/net/yacy/cora/order/Digest.java | 1 - source/net/yacy/cora/protocol/Domains.java | 9 ++++----- source/net/yacy/cora/protocol/Scanner.java | 2 -- source/net/yacy/http/InetPathAccessHandler.java | 2 -- source/net/yacy/kelondro/util/MemoryStrategy.java | 4 ++-- source/net/yacy/yacy.java | 1 - 10 files changed, 7 insertions(+), 19 deletions(-) diff --git a/htroot/ConfigAccounts_p.java b/htroot/ConfigAccounts_p.java index 1df7ca608..f1c502616 100644 --- a/htroot/ConfigAccounts_p.java +++ b/htroot/ConfigAccounts_p.java @@ -34,7 +34,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import net.yacy.cora.order.Digest; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.util.ConcurrentLog; import net.yacy.data.TransactionManager; diff --git a/htroot/ConfigUser_p.java b/htroot/ConfigUser_p.java index 6818dc5e9..35d96a78c 100644 --- a/htroot/ConfigUser_p.java +++ b/htroot/ConfigUser_p.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; -import net.yacy.cora.order.Digest; + import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.util.ConcurrentLog; import net.yacy.data.UserDB; diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index 13f16fafd..1ca89cb56 100644 --- a/htroot/SettingsAck_p.java +++ b/htroot/SettingsAck_p.java @@ -33,7 +33,6 @@ import java.util.StringTokenizer; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import net.yacy.cora.order.Digest; import net.yacy.cora.protocol.RequestHeader; import net.yacy.data.TransactionManager; import net.yacy.http.InetPathAccessHandler; diff --git a/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java b/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java index fb5a07950..39a0adb4f 100644 --- a/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java +++ b/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java @@ -78,9 +78,6 @@ public class RemoteInstance implements SolrInstance { /** Default maximum time in seconds to keep alive an idle connection in the pool */ private static final int DEFAULT_POOLED_CONNECTION_TIME_TO_LIVE = 30; - /** Default sleep time in seconds between each run of the connection evictor */ - private static final int DEFAULT_CONNECTION_EVICTOR_SLEEP_TIME = 5; - /** Default total maximum number of connections in the pool */ private static final int DEFAULT_POOL_MAX_TOTAL = 100; diff --git a/source/net/yacy/cora/order/Digest.java b/source/net/yacy/cora/order/Digest.java index 9ba42552e..3e6e2bb4f 100644 --- a/source/net/yacy/cora/order/Digest.java +++ b/source/net/yacy/cora/order/Digest.java @@ -40,7 +40,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.LinkedBlockingQueue; -import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.storage.ARC; import net.yacy.cora.storage.ConcurrentARC; import net.yacy.cora.util.Memory; diff --git a/source/net/yacy/cora/protocol/Domains.java b/source/net/yacy/cora/protocol/Domains.java index c57647361..d6262e260 100644 --- a/source/net/yacy/cora/protocol/Domains.java +++ b/source/net/yacy/cora/protocol/Domains.java @@ -55,6 +55,10 @@ import java.util.concurrent.TimeoutException; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import com.google.common.net.InetAddresses; +import com.google.common.util.concurrent.SimpleTimeLimiter; +import com.google.common.util.concurrent.TimeLimiter; + import net.yacy.cora.plugin.ClassProvider; import net.yacy.cora.protocol.tld.GenericTLD; import net.yacy.cora.protocol.tld.InternationalizedCountryCodeTLD; @@ -67,11 +71,6 @@ import net.yacy.cora.util.ConcurrentLog; import net.yacy.kelondro.util.MemoryControl; import net.yacy.kelondro.util.NamePrefixThreadFactory; -import com.google.common.net.InetAddresses; -import com.google.common.util.concurrent.SimpleTimeLimiter; -import com.google.common.util.concurrent.TimeLimiter; -import com.google.common.util.concurrent.UncheckedTimeoutException; - public class Domains { private final static ConcurrentLog log = new ConcurrentLog(Domains.class.getName()); diff --git a/source/net/yacy/cora/protocol/Scanner.java b/source/net/yacy/cora/protocol/Scanner.java index cd1bb8132..9af8c8841 100644 --- a/source/net/yacy/cora/protocol/Scanner.java +++ b/source/net/yacy/cora/protocol/Scanner.java @@ -25,7 +25,6 @@ package net.yacy.cora.protocol; import java.io.IOException; -import java.net.Inet4Address; import java.net.InetAddress; import java.net.MalformedURLException; import java.net.UnknownHostException; @@ -33,7 +32,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; diff --git a/source/net/yacy/http/InetPathAccessHandler.java b/source/net/yacy/http/InetPathAccessHandler.java index 50f3d202b..822a518ff 100644 --- a/source/net/yacy/http/InetPathAccessHandler.java +++ b/source/net/yacy/http/InetPathAccessHandler.java @@ -24,8 +24,6 @@ package net.yacy.http; import java.io.IOException; import java.net.InetAddress; -import javax.servlet.http.HttpServletRequest; - import org.eclipse.jetty.http.pathmap.MappedResource; import org.eclipse.jetty.http.pathmap.PathMappings; import org.eclipse.jetty.http.pathmap.PathSpec; diff --git a/source/net/yacy/kelondro/util/MemoryStrategy.java b/source/net/yacy/kelondro/util/MemoryStrategy.java index d7d0475c6..7bf645e9c 100644 --- a/source/net/yacy/kelondro/util/MemoryStrategy.java +++ b/source/net/yacy/kelondro/util/MemoryStrategy.java @@ -142,7 +142,7 @@ public abstract class MemoryStrategy { System.out.println("StandardMemoryStrategy / memoryTotal : " + sms.total()); MemoryStrategy gms = new GenerationMemoryStrategy(); - System.out.println("GenerationMemoryStrategy / memoryFree : " + sms.free()); - System.out.println("GenerationMemoryStrategy / memoryTotal : " + sms.total()); + System.out.println("GenerationMemoryStrategy / memoryFree : " + gms.free()); + System.out.println("GenerationMemoryStrategy / memoryTotal : " + gms.total()); } } diff --git a/source/net/yacy/yacy.java b/source/net/yacy/yacy.java index 6871adfde..63a01d0aa 100644 --- a/source/net/yacy/yacy.java +++ b/source/net/yacy/yacy.java @@ -56,7 +56,6 @@ import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.document.id.MultiProtocolURL; import net.yacy.cora.federate.solr.instance.RemoteInstance; -import net.yacy.cora.order.Digest; import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.ConnectionInfo; import net.yacy.cora.protocol.HeaderFramework;