From 962a8f6f49763fc51c62faa0dd7fbae9031ae507 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 10 Dec 2008 15:37:28 +0000
Subject: [PATCH] more splitting classes
---
.../net/i2p/router/ClientManagerFacade.java | 26 ----------
.../src/net/i2p/router/CommSystemFacade.java | 2 +
.../i2p/router/DummyClientManagerFacade.java | 47 +++++++++++++++++
.../i2p/router/DummyPeerManagerFacade.java | 32 ++++++++++++
.../i2p/router/DummyTunnelManagerFacade.java | 52 +++++++++++++++++++
.../src/net/i2p/router/PeerManagerFacade.java | 12 -----
.../net/i2p/router/TunnelManagerFacade.java | 32 ------------
.../kademlia/RepublishLeaseSetJob.java | 32 ++++++------
.../router/peermanager/PersistProfileJob.java | 29 +++++++++++
.../peermanager/PersistProfilesJob.java | 22 --------
10 files changed, 178 insertions(+), 108 deletions(-)
create mode 100644 router/java/src/net/i2p/router/DummyClientManagerFacade.java
create mode 100644 router/java/src/net/i2p/router/DummyPeerManagerFacade.java
create mode 100644 router/java/src/net/i2p/router/DummyTunnelManagerFacade.java
create mode 100644 router/java/src/net/i2p/router/peermanager/PersistProfileJob.java
diff --git a/router/java/src/net/i2p/router/ClientManagerFacade.java b/router/java/src/net/i2p/router/ClientManagerFacade.java
index 6dd1c8e210..07f6e561fc 100644
--- a/router/java/src/net/i2p/router/ClientManagerFacade.java
+++ b/router/java/src/net/i2p/router/ClientManagerFacade.java
@@ -92,29 +92,3 @@ public abstract class ClientManagerFacade implements Service {
public abstract SessionConfig getClientSessionConfig(Destination dest);
public void renderStatusHTML(Writer out) throws IOException { }
}
-
-class DummyClientManagerFacade extends ClientManagerFacade {
- private RouterContext _context;
- public DummyClientManagerFacade(RouterContext ctx) {
- _context = ctx;
- }
- public boolean isLocal(Hash destHash) { return true; }
- public boolean isLocal(Destination dest) { return true; }
- public void reportAbuse(Destination dest, String reason, int severity) { }
- public void messageReceived(ClientMessage msg) {}
- public void requestLeaseSet(Destination dest, LeaseSet set, long timeout,
- Job onCreateJob, Job onFailedJob) {
- _context.jobQueue().addJob(onFailedJob);
- }
- public void startup() {}
- public void stopAcceptingClients() { }
- public void shutdown() {}
- public void restart() {}
-
- public void messageDeliveryStatusUpdate(Destination fromDest, MessageId id, boolean delivered) {}
-
- public SessionConfig getClientSessionConfig(Destination _dest) { return null; }
-
- public void requestLeaseSet(Hash dest, LeaseSet set) {}
-
-}
diff --git a/router/java/src/net/i2p/router/CommSystemFacade.java b/router/java/src/net/i2p/router/CommSystemFacade.java
index fc354e3846..57ada6bf25 100644
--- a/router/java/src/net/i2p/router/CommSystemFacade.java
+++ b/router/java/src/net/i2p/router/CommSystemFacade.java
@@ -91,9 +91,11 @@ public abstract class CommSystemFacade implements Service {
}
+/** unused
class DummyCommSystemFacade extends CommSystemFacade {
public void shutdown() {}
public void startup() {}
public void restart() {}
public void processMessage(OutNetMessage msg) { }
}
+**/
diff --git a/router/java/src/net/i2p/router/DummyClientManagerFacade.java b/router/java/src/net/i2p/router/DummyClientManagerFacade.java
new file mode 100644
index 0000000000..61e312875b
--- /dev/null
+++ b/router/java/src/net/i2p/router/DummyClientManagerFacade.java
@@ -0,0 +1,47 @@
+package net.i2p.router;
+/*
+ * free (adj.): unencumbered; not under the control of others
+ * Written by jrandom in 2003 and released into the public domain
+ * with no warranty of any kind, either expressed or implied.
+ * It probably won't make your computer catch on fire, or eat
+ * your children, but it might. Use at your own risk.
+ *
+ */
+
+import net.i2p.data.Destination;
+import net.i2p.data.Hash;
+import net.i2p.data.LeaseSet;
+import net.i2p.data.i2cp.MessageId;
+import net.i2p.data.i2cp.SessionConfig;
+
+/**
+ * Manage all interactions with clients
+ *
+ * @author jrandom
+ */
+public class DummyClientManagerFacade extends ClientManagerFacade {
+ private RouterContext _context;
+ public DummyClientManagerFacade(RouterContext ctx) {
+ _context = ctx;
+ }
+ public boolean isLocal(Hash destHash) { return true; }
+ public boolean isLocal(Destination dest) { return true; }
+ public void reportAbuse(Destination dest, String reason, int severity) { }
+ public void messageReceived(ClientMessage msg) {}
+ public void requestLeaseSet(Destination dest, LeaseSet set, long timeout,
+ Job onCreateJob, Job onFailedJob) {
+ _context.jobQueue().addJob(onFailedJob);
+ }
+ public void startup() {}
+ public void stopAcceptingClients() { }
+ public void shutdown() {}
+ public void restart() {}
+
+ public void messageDeliveryStatusUpdate(Destination fromDest, MessageId id, boolean delivered) {}
+
+ public SessionConfig getClientSessionConfig(Destination _dest) { return null; }
+
+ public void requestLeaseSet(Hash dest, LeaseSet set) {}
+
+}
+
diff --git a/router/java/src/net/i2p/router/DummyPeerManagerFacade.java b/router/java/src/net/i2p/router/DummyPeerManagerFacade.java
new file mode 100644
index 0000000000..221d0b2f17
--- /dev/null
+++ b/router/java/src/net/i2p/router/DummyPeerManagerFacade.java
@@ -0,0 +1,32 @@
+package net.i2p.router;
+/*
+ * free (adj.): unencumbered; not under the control of others
+ * Written by jrandom in 2003 and released into the public domain
+ * with no warranty of any kind, either expressed or implied.
+ * It probably won't make your computer catch on fire, or eat
+ * your children, but it might. Use at your own risk.
+ *
+ */
+
+import java.io.Writer;
+import java.util.List;
+
+import net.i2p.data.Hash;
+
+/**
+ * Manage peer references and keep them up to date so that when asked for peers,
+ * it can provide appropriate peers according to the criteria provided. This
+ * includes periodically queueing up outbound messages to the peers to test them.
+ *
+ */
+class DummyPeerManagerFacade implements PeerManagerFacade {
+ public void shutdown() {}
+ public void startup() {}
+ public void restart() {}
+ public void renderStatusHTML(Writer out) { }
+ public List selectPeers(PeerSelectionCriteria criteria) { return null; }
+ public List getPeersByCapability(char capability) { return null; }
+ public void setCapabilities(Hash peer, String caps) {}
+ public void removeCapabilities(Hash peer) {}
+ public Hash selectRandomByCapability(char capability) { return null; }
+}
diff --git a/router/java/src/net/i2p/router/DummyTunnelManagerFacade.java b/router/java/src/net/i2p/router/DummyTunnelManagerFacade.java
new file mode 100644
index 0000000000..f7f204857a
--- /dev/null
+++ b/router/java/src/net/i2p/router/DummyTunnelManagerFacade.java
@@ -0,0 +1,52 @@
+package net.i2p.router;
+/*
+ * free (adj.): unencumbered; not under the control of others
+ * Written by jrandom in 2003 and released into the public domain
+ * with no warranty of any kind, either expressed or implied.
+ * It probably won't make your computer catch on fire, or eat
+ * your children, but it might. Use at your own risk.
+ *
+ */
+
+import java.io.IOException;
+import java.io.Writer;
+
+import net.i2p.data.Destination;
+import net.i2p.data.Hash;
+import net.i2p.data.TunnelId;
+
+/**
+ * Build and maintain tunnels throughout the network.
+ *
+ */
+class DummyTunnelManagerFacade implements TunnelManagerFacade {
+
+ public TunnelInfo getTunnelInfo(TunnelId id) { return null; }
+ public TunnelInfo selectInboundTunnel() { return null; }
+ public TunnelInfo selectInboundTunnel(Hash destination) { return null; }
+ public TunnelInfo selectOutboundTunnel() { return null; }
+ public TunnelInfo selectOutboundTunnel(Hash destination) { return null; }
+ public boolean isInUse(Hash peer) { return false; }
+ public boolean isValidTunnel(Hash client, TunnelInfo tunnel) { return false; }
+ public int getParticipatingCount() { return 0; }
+ public int getFreeTunnelCount() { return 0; }
+ public int getOutboundTunnelCount() { return 0; }
+ public int getInboundClientTunnelCount() { return 0; }
+ public int getOutboundClientTunnelCount() { return 0; }
+ public long getLastParticipatingExpiration() { return -1; }
+ public void buildTunnels(Destination client, ClientTunnelSettings settings) {}
+ public TunnelPoolSettings getInboundSettings() { return null; }
+ public TunnelPoolSettings getOutboundSettings() { return null; }
+ public TunnelPoolSettings getInboundSettings(Hash client) { return null; }
+ public TunnelPoolSettings getOutboundSettings(Hash client) { return null; }
+ public void setInboundSettings(TunnelPoolSettings settings) {}
+ public void setOutboundSettings(TunnelPoolSettings settings) {}
+ public void setInboundSettings(Hash client, TunnelPoolSettings settings) {}
+ public void setOutboundSettings(Hash client, TunnelPoolSettings settings) {}
+ public int getInboundBuildQueueSize() { return 0; }
+
+ public void renderStatusHTML(Writer out) throws IOException {}
+ public void restart() {}
+ public void shutdown() {}
+ public void startup() {}
+}
diff --git a/router/java/src/net/i2p/router/PeerManagerFacade.java b/router/java/src/net/i2p/router/PeerManagerFacade.java
index bebe1a927d..791b77616a 100644
--- a/router/java/src/net/i2p/router/PeerManagerFacade.java
+++ b/router/java/src/net/i2p/router/PeerManagerFacade.java
@@ -32,15 +32,3 @@ public interface PeerManagerFacade extends Service {
public void removeCapabilities(Hash peer);
public Hash selectRandomByCapability(char capability);
}
-
-class DummyPeerManagerFacade implements PeerManagerFacade {
- public void shutdown() {}
- public void startup() {}
- public void restart() {}
- public void renderStatusHTML(Writer out) { }
- public List selectPeers(PeerSelectionCriteria criteria) { return null; }
- public List getPeersByCapability(char capability) { return null; }
- public void setCapabilities(Hash peer, String caps) {}
- public void removeCapabilities(Hash peer) {}
- public Hash selectRandomByCapability(char capability) { return null; }
-}
diff --git a/router/java/src/net/i2p/router/TunnelManagerFacade.java b/router/java/src/net/i2p/router/TunnelManagerFacade.java
index be0b7e441d..a6c1c96146 100644
--- a/router/java/src/net/i2p/router/TunnelManagerFacade.java
+++ b/router/java/src/net/i2p/router/TunnelManagerFacade.java
@@ -79,35 +79,3 @@ public interface TunnelManagerFacade extends Service {
public void setInboundSettings(Hash client, TunnelPoolSettings settings);
public void setOutboundSettings(Hash client, TunnelPoolSettings settings);
}
-
-class DummyTunnelManagerFacade implements TunnelManagerFacade {
-
- public TunnelInfo getTunnelInfo(TunnelId id) { return null; }
- public TunnelInfo selectInboundTunnel() { return null; }
- public TunnelInfo selectInboundTunnel(Hash destination) { return null; }
- public TunnelInfo selectOutboundTunnel() { return null; }
- public TunnelInfo selectOutboundTunnel(Hash destination) { return null; }
- public boolean isInUse(Hash peer) { return false; }
- public boolean isValidTunnel(Hash client, TunnelInfo tunnel) { return false; }
- public int getParticipatingCount() { return 0; }
- public int getFreeTunnelCount() { return 0; }
- public int getOutboundTunnelCount() { return 0; }
- public int getInboundClientTunnelCount() { return 0; }
- public int getOutboundClientTunnelCount() { return 0; }
- public long getLastParticipatingExpiration() { return -1; }
- public void buildTunnels(Destination client, ClientTunnelSettings settings) {}
- public TunnelPoolSettings getInboundSettings() { return null; }
- public TunnelPoolSettings getOutboundSettings() { return null; }
- public TunnelPoolSettings getInboundSettings(Hash client) { return null; }
- public TunnelPoolSettings getOutboundSettings(Hash client) { return null; }
- public void setInboundSettings(TunnelPoolSettings settings) {}
- public void setOutboundSettings(TunnelPoolSettings settings) {}
- public void setInboundSettings(Hash client, TunnelPoolSettings settings) {}
- public void setOutboundSettings(Hash client, TunnelPoolSettings settings) {}
- public int getInboundBuildQueueSize() { return 0; }
-
- public void renderStatusHTML(Writer out) throws IOException {}
- public void restart() {}
- public void shutdown() {}
- public void startup() {}
-}
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java
index a6ca3c0bbc..47753998cb 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java
@@ -81,23 +81,23 @@ public class RepublishLeaseSetJob extends JobImpl {
_log.warn("FAILED publishing of the leaseSet for " + _dest.toBase64());
requeue(getContext().random().nextInt(60*1000));
}
-}
-class OnRepublishSuccess extends JobImpl {
- public OnRepublishSuccess(RouterContext ctx) { super(ctx); }
- public String getName() { return "Publish leaseSet successful"; }
- public void runJob() {
- //if (_log.shouldLog(Log.DEBUG))
- // _log.debug("successful publishing of the leaseSet for " + _dest.toBase64());
+ class OnRepublishSuccess extends JobImpl {
+ public OnRepublishSuccess(RouterContext ctx) { super(ctx); }
+ public String getName() { return "Publish leaseSet successful"; }
+ public void runJob() {
+ //if (_log.shouldLog(Log.DEBUG))
+ // _log.debug("successful publishing of the leaseSet for " + _dest.toBase64());
+ }
}
-}
-class OnRepublishFailure extends JobImpl {
- private RepublishLeaseSetJob _job;
- public OnRepublishFailure(RouterContext ctx, RepublishLeaseSetJob job) {
- super(ctx);
- _job = job;
+ class OnRepublishFailure extends JobImpl {
+ private RepublishLeaseSetJob _job;
+ public OnRepublishFailure(RouterContext ctx, RepublishLeaseSetJob job) {
+ super(ctx);
+ _job = job;
+ }
+ public String getName() { return "Publish leaseSet failed"; }
+ public void runJob() { _job.requeueRepublish(); }
}
- public String getName() { return "Publish leaseSet failed"; }
- public void runJob() { _job.requeueRepublish(); }
-}
\ No newline at end of file
+}
diff --git a/router/java/src/net/i2p/router/peermanager/PersistProfileJob.java b/router/java/src/net/i2p/router/peermanager/PersistProfileJob.java
new file mode 100644
index 0000000000..3b230fd861
--- /dev/null
+++ b/router/java/src/net/i2p/router/peermanager/PersistProfileJob.java
@@ -0,0 +1,29 @@
+package net.i2p.router.peermanager;
+
+import java.util.Iterator;
+import java.util.Set;
+
+import net.i2p.data.Hash;
+import net.i2p.router.JobImpl;
+import net.i2p.router.RouterContext;
+
+class PersistProfileJob extends JobImpl {
+ private PersistProfilesJob _job;
+ private Iterator _peers;
+ public PersistProfileJob(RouterContext enclosingContext, PersistProfilesJob job, Set peers) {
+ super(enclosingContext);
+ _peers = peers.iterator();
+ _job = job;
+ }
+ public void runJob() {
+ if (_peers.hasNext())
+ _job.persist((Hash)_peers.next());
+ if (_peers.hasNext()) {
+ requeue(1000);
+ } else {
+ // no more left, requeue up the main persist-em-all job
+ _job.requeue();
+ }
+ }
+ public String getName() { return "Persist profile"; }
+}
diff --git a/router/java/src/net/i2p/router/peermanager/PersistProfilesJob.java b/router/java/src/net/i2p/router/peermanager/PersistProfilesJob.java
index 6d43923e39..fc137ccc87 100644
--- a/router/java/src/net/i2p/router/peermanager/PersistProfilesJob.java
+++ b/router/java/src/net/i2p/router/peermanager/PersistProfilesJob.java
@@ -1,6 +1,5 @@
package net.i2p.router.peermanager;
-import java.util.Iterator;
import java.util.Set;
import net.i2p.data.Hash;
@@ -25,24 +24,3 @@ class PersistProfilesJob extends JobImpl {
void persist(Hash peer) { _mgr.storeProfile(peer); }
void requeue() { requeue(PERSIST_DELAY); }
}
-
-class PersistProfileJob extends JobImpl {
- private PersistProfilesJob _job;
- private Iterator _peers;
- public PersistProfileJob(RouterContext enclosingContext, PersistProfilesJob job, Set peers) {
- super(enclosingContext);
- _peers = peers.iterator();
- _job = job;
- }
- public void runJob() {
- if (_peers.hasNext())
- _job.persist((Hash)_peers.next());
- if (_peers.hasNext()) {
- requeue(1000);
- } else {
- // no more left, requeue up the main persist-em-all job
- _job.requeue();
- }
- }
- public String getName() { return "Persist profile"; }
-}
\ No newline at end of file
--
GitLab