From 88b3fa1eb3cdae7d75b5a098fb4bda0aa43de43c Mon Sep 17 00:00:00 2001 From: eyedeekay Date: Fri, 24 Nov 2023 21:30:57 -0500 Subject: [PATCH] Router: get rid of getClientFloodfillNetworkDatabaseFacades, closes #472 --- .../src/net/i2p/router/ClientManagerFacade.java | 8 -------- .../src/net/i2p/router/client/ClientManager.java | 16 ---------------- .../router/client/ClientManagerFacadeImpl.java | 13 ------------- .../router/dummy/DummyClientManagerFacade.java | 3 --- 4 files changed, 40 deletions(-) diff --git a/router/java/src/net/i2p/router/ClientManagerFacade.java b/router/java/src/net/i2p/router/ClientManagerFacade.java index 3be5e9aea6..9c92922229 100644 --- a/router/java/src/net/i2p/router/ClientManagerFacade.java +++ b/router/java/src/net/i2p/router/ClientManagerFacade.java @@ -133,14 +133,6 @@ public void unregisterMetaDest(Destination dest) {} */ public abstract FloodfillNetworkDatabaseFacade getClientFloodfillNetworkDatabaseFacade(Hash destHash); - /** - * get all of the FloodfillNetworkDatabaseFacades for all of the clients. - * - * @return non-null set of FloodfillNetworkDatabaseFacades - * @since 0.9.60 - */ - public abstract Set getClientFloodfillNetworkDatabaseFacades(); - /** * get a set of all primary hashes * diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index af586f9288..fea0e6d5dc 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -798,22 +798,6 @@ public FloodfillNetworkDatabaseFacade getClientFloodfillNetworkDatabaseFacade(Ha return null; } - /** - * get all of the FloodfillNetworkDatabaseFacades for all of the clients. - * - * @return non-null - * @since 0.9.60 - */ - public Set getClientFloodfillNetworkDatabaseFacades() { - Set rv = new HashSet(); - for (ClientConnectionRunner runner : _runners.values()) { - FloodfillNetworkDatabaseFacade fndf = runner.getFloodfillNetworkDatabaseFacade(); - if (fndf != null) - rv.add(fndf); - } - return rv; - } - /** * get all the primary hashes for all the clients and return them as a set * diff --git a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java index f73af84bb5..4c686fd3a7 100644 --- a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java +++ b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java @@ -307,19 +307,6 @@ public FloodfillNetworkDatabaseFacade getClientFloodfillNetworkDatabaseFacade(Ha return null; } - /** - * get all of the FloodfillNetworkDatabaseFacades for all of the clients. - * - * @return - */ - @Override - public Set getClientFloodfillNetworkDatabaseFacades() { - if (_manager != null) - return _manager.getClientFloodfillNetworkDatabaseFacades(); - else - return Collections.emptySet(); - } - /** * get all the primary hashes for all the clients and return them as a set * diff --git a/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java b/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java index 735059fc5d..f93b7f87d2 100644 --- a/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java +++ b/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java @@ -56,9 +56,6 @@ public void requestLeaseSet(Hash dest, LeaseSet set) {} public FloodfillNetworkDatabaseFacade getClientFloodfillNetworkDatabaseFacade(Hash dbid) { return null; } - public Set getClientFloodfillNetworkDatabaseFacades() { - return Collections.emptySet(); - } public Set getPrimaryHashes() { return Collections.emptySet(); }