From 9ae07688a573cc15183a76c10f111e2fdde6bd14 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 29 Nov 2011 19:32:20 +0000
Subject: [PATCH] move dummy implementations to their own directory
---
router/java/src/net/i2p/router/RouterContext.java | 1 +
.../i2p/router/{ => dummy}/DummyClientManagerFacade.java | 7 ++++++-
.../router/{ => dummy}/DummyNetworkDatabaseFacade.java | 7 +++++--
.../i2p/router/{ => dummy}/DummyPeerManagerFacade.java | 6 ++++--
.../i2p/router/{ => dummy}/DummyTunnelManagerFacade.java | 8 ++++++--
router/java/src/net/i2p/router/dummy/package.html | 7 +++++++
6 files changed, 29 insertions(+), 7 deletions(-)
rename router/java/src/net/i2p/router/{ => dummy}/DummyClientManagerFacade.java (89%)
rename router/java/src/net/i2p/router/{ => dummy}/DummyNetworkDatabaseFacade.java (91%)
rename router/java/src/net/i2p/router/{ => dummy}/DummyPeerManagerFacade.java (86%)
rename router/java/src/net/i2p/router/{ => dummy}/DummyTunnelManagerFacade.java (92%)
create mode 100644 router/java/src/net/i2p/router/dummy/package.html
diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java
index 209ff218a1..81ba4965ba 100644
--- a/router/java/src/net/i2p/router/RouterContext.java
+++ b/router/java/src/net/i2p/router/RouterContext.java
@@ -12,6 +12,7 @@ import net.i2p.data.Hash;
import net.i2p.data.RouterInfo;
import net.i2p.internal.InternalClientManager;
import net.i2p.router.client.ClientManagerFacadeImpl;
+import net.i2p.router.dummy.*;
import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade;
import net.i2p.router.peermanager.PeerManagerFacadeImpl;
import net.i2p.router.peermanager.ProfileManagerImpl;
diff --git a/router/java/src/net/i2p/router/DummyClientManagerFacade.java b/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java
similarity index 89%
rename from router/java/src/net/i2p/router/DummyClientManagerFacade.java
rename to router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java
index 30daf47e56..d1f1792fa6 100644
--- a/router/java/src/net/i2p/router/DummyClientManagerFacade.java
+++ b/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java
@@ -1,4 +1,4 @@
-package net.i2p.router;
+package net.i2p.router.dummy;
/*
* free (adj.): unencumbered; not under the control of others
* Written by jrandom in 2003 and released into the public domain
@@ -14,6 +14,11 @@ import net.i2p.data.Hash;
import net.i2p.data.LeaseSet;
import net.i2p.data.i2cp.MessageId;
import net.i2p.data.i2cp.SessionConfig;
+import net.i2p.router.ClientManagerFacade;
+import net.i2p.router.ClientMessage;
+import net.i2p.router.Job;
+import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
/**
* Manage all interactions with clients
diff --git a/router/java/src/net/i2p/router/DummyNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/dummy/DummyNetworkDatabaseFacade.java
similarity index 91%
rename from router/java/src/net/i2p/router/DummyNetworkDatabaseFacade.java
rename to router/java/src/net/i2p/router/dummy/DummyNetworkDatabaseFacade.java
index 0f06f507cc..a3b1334c1a 100644
--- a/router/java/src/net/i2p/router/DummyNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/dummy/DummyNetworkDatabaseFacade.java
@@ -1,4 +1,4 @@
-package net.i2p.router;
+package net.i2p.router.dummy;
/*
* free (adj.): unencumbered; not under the control of others
* Written by jrandom in 2003 and released into the public domain
@@ -20,8 +20,11 @@ import net.i2p.data.DatabaseEntry;
import net.i2p.data.Hash;
import net.i2p.data.LeaseSet;
import net.i2p.data.RouterInfo;
+import net.i2p.router.Job;
+import net.i2p.router.NetworkDatabaseFacade;
+import net.i2p.router.RouterContext;
-class DummyNetworkDatabaseFacade extends NetworkDatabaseFacade {
+public class DummyNetworkDatabaseFacade extends NetworkDatabaseFacade {
private Map _routers;
private RouterContext _context;
diff --git a/router/java/src/net/i2p/router/DummyPeerManagerFacade.java b/router/java/src/net/i2p/router/dummy/DummyPeerManagerFacade.java
similarity index 86%
rename from router/java/src/net/i2p/router/DummyPeerManagerFacade.java
rename to router/java/src/net/i2p/router/dummy/DummyPeerManagerFacade.java
index 92f7d006a3..241a7fd847 100644
--- a/router/java/src/net/i2p/router/DummyPeerManagerFacade.java
+++ b/router/java/src/net/i2p/router/dummy/DummyPeerManagerFacade.java
@@ -1,4 +1,4 @@
-package net.i2p.router;
+package net.i2p.router.dummy;
/*
* free (adj.): unencumbered; not under the control of others
* Written by jrandom in 2003 and released into the public domain
@@ -13,6 +13,8 @@ import java.util.List;
import java.util.Set;
import net.i2p.data.Hash;
+import net.i2p.router.PeerManagerFacade;
+import net.i2p.router.PeerSelectionCriteria;
/**
* Manage peer references and keep them up to date so that when asked for peers,
@@ -20,7 +22,7 @@ import net.i2p.data.Hash;
* includes periodically queueing up outbound messages to the peers to test them.
*
*/
-class DummyPeerManagerFacade implements PeerManagerFacade {
+public class DummyPeerManagerFacade implements PeerManagerFacade {
public void shutdown() {}
public void startup() {}
public void restart() {}
diff --git a/router/java/src/net/i2p/router/DummyTunnelManagerFacade.java b/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java
similarity index 92%
rename from router/java/src/net/i2p/router/DummyTunnelManagerFacade.java
rename to router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java
index 7d5ef8eb80..b1574738cb 100644
--- a/router/java/src/net/i2p/router/DummyTunnelManagerFacade.java
+++ b/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java
@@ -1,4 +1,4 @@
-package net.i2p.router;
+package net.i2p.router.dummy;
/*
* free (adj.): unencumbered; not under the control of others
* Written by jrandom in 2003 and released into the public domain
@@ -17,13 +17,17 @@ import java.util.Set;
import net.i2p.data.Destination;
import net.i2p.data.Hash;
import net.i2p.data.TunnelId;
+import net.i2p.router.ClientTunnelSettings;
+import net.i2p.router.TunnelInfo;
+import net.i2p.router.TunnelManagerFacade;
+import net.i2p.router.TunnelPoolSettings;
import net.i2p.router.tunnel.pool.TunnelPool;
/**
* Build and maintain tunnels throughout the network.
*
*/
-class DummyTunnelManagerFacade implements TunnelManagerFacade {
+public class DummyTunnelManagerFacade implements TunnelManagerFacade {
public TunnelInfo getTunnelInfo(TunnelId id) { return null; }
public TunnelInfo selectInboundTunnel() { return null; }
diff --git a/router/java/src/net/i2p/router/dummy/package.html b/router/java/src/net/i2p/router/dummy/package.html
new file mode 100644
index 0000000000..41e29fd858
--- /dev/null
+++ b/router/java/src/net/i2p/router/dummy/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+Dummy versions of things for testing.
+</p>
+</body>
+</html>
--
GitLab