From c10ea84adec0397b584b0fd6d3cea955fa9164bc Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 28 Nov 2009 14:37:07 +0000
Subject: [PATCH] * NamingServices - Move default reverseLookup to
base class - Deprecate unused services
---
core/java/src/net/i2p/I2PAppContext.java | 2 ++
core/java/src/net/i2p/client/naming/AddressDB.java | 3 +++
.../src/net/i2p/client/naming/AddressDBNamingService.java | 3 +++
core/java/src/net/i2p/client/naming/DummyAddressDB.java | 3 +++
.../java/src/net/i2p/client/naming/DummyNamingService.java | 7 +------
.../src/net/i2p/client/naming/EepGetNamingService.java | 5 -----
core/java/src/net/i2p/client/naming/ExecNamingService.java | 5 -----
.../src/net/i2p/client/naming/FilesystemAddressDB.java | 3 +++
.../src/net/i2p/client/naming/HostsTxtNamingService.java | 1 +
core/java/src/net/i2p/client/naming/NamingService.java | 4 +++-
core/java/src/net/i2p/client/naming/PetName.java | 2 +-
core/java/src/net/i2p/client/naming/PetNameDB.java | 2 +-
.../src/net/i2p/client/naming/PetNameNamingService.java | 3 +++
13 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java
index 86c1dc907e..1cdb6b2970 100644
--- a/core/java/src/net/i2p/I2PAppContext.java
+++ b/core/java/src/net/i2p/I2PAppContext.java
@@ -432,12 +432,14 @@ public class I2PAppContext {
}
}
+ /** @deprecated unused */
public PetNameDB petnameDb() {
if (!_petnameDbInitialized)
initializePetnameDb();
return _petnameDb;
}
+ /** @deprecated unused */
private void initializePetnameDb() {
synchronized (this) {
if (_petnameDb == null) {
diff --git a/core/java/src/net/i2p/client/naming/AddressDB.java b/core/java/src/net/i2p/client/naming/AddressDB.java
index 29b8cf7cb3..c43ada5892 100644
--- a/core/java/src/net/i2p/client/naming/AddressDB.java
+++ b/core/java/src/net/i2p/client/naming/AddressDB.java
@@ -7,6 +7,9 @@ import net.i2p.I2PAppContext;
import net.i2p.data.Address;
import net.i2p.util.Log;
+/**
+ * @deprecated unused
+ */
public abstract class AddressDB {
private final static Log _log = new Log(NamingService.class);
diff --git a/core/java/src/net/i2p/client/naming/AddressDBNamingService.java b/core/java/src/net/i2p/client/naming/AddressDBNamingService.java
index 4dc65a10d2..928212c895 100644
--- a/core/java/src/net/i2p/client/naming/AddressDBNamingService.java
+++ b/core/java/src/net/i2p/client/naming/AddressDBNamingService.java
@@ -6,6 +6,9 @@ import net.i2p.I2PAppContext;
import net.i2p.data.Address;
import net.i2p.data.Destination;
+/**
+ * @deprecated unused
+ */
public class AddressDBNamingService extends NamingService {
private AddressDB _addressdb;
diff --git a/core/java/src/net/i2p/client/naming/DummyAddressDB.java b/core/java/src/net/i2p/client/naming/DummyAddressDB.java
index d7ee9bac15..e18a2b7add 100644
--- a/core/java/src/net/i2p/client/naming/DummyAddressDB.java
+++ b/core/java/src/net/i2p/client/naming/DummyAddressDB.java
@@ -5,6 +5,9 @@ import java.util.Collection;
import net.i2p.I2PAppContext;
import net.i2p.data.Address;
+/**
+ * @deprecated unused
+ */
public class DummyAddressDB extends AddressDB {
public DummyAddressDB(I2PAppContext context) {
diff --git a/core/java/src/net/i2p/client/naming/DummyNamingService.java b/core/java/src/net/i2p/client/naming/DummyNamingService.java
index dddd5915b3..ff0855c279 100644
--- a/core/java/src/net/i2p/client/naming/DummyNamingService.java
+++ b/core/java/src/net/i2p/client/naming/DummyNamingService.java
@@ -27,9 +27,4 @@ class DummyNamingService extends NamingService {
public Destination lookup(String hostname) {
return lookupBase64(hostname);
}
-
- @Override
- public String reverseLookup(Destination dest) {
- return null;
- }
-}
\ No newline at end of file
+}
diff --git a/core/java/src/net/i2p/client/naming/EepGetNamingService.java b/core/java/src/net/i2p/client/naming/EepGetNamingService.java
index 6ce7ca17ba..8ddeaa2480 100644
--- a/core/java/src/net/i2p/client/naming/EepGetNamingService.java
+++ b/core/java/src/net/i2p/client/naming/EepGetNamingService.java
@@ -136,9 +136,4 @@ public class EepGetNamingService extends NamingService {
_log.error("Caught from: " + url + hostname);
return null;
}
-
- @Override
- public String reverseLookup(Destination dest) {
- return null;
- }
}
diff --git a/core/java/src/net/i2p/client/naming/ExecNamingService.java b/core/java/src/net/i2p/client/naming/ExecNamingService.java
index f014fa0d71..446e907c47 100644
--- a/core/java/src/net/i2p/client/naming/ExecNamingService.java
+++ b/core/java/src/net/i2p/client/naming/ExecNamingService.java
@@ -126,9 +126,4 @@ public class ExecNamingService extends NamingService {
}
return null;
}
-
- @Override
- public String reverseLookup(Destination dest) {
- return null;
- }
}
diff --git a/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java b/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java
index cefbf5eea6..806b9e90ad 100644
--- a/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java
+++ b/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java
@@ -16,6 +16,9 @@ import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper;
import net.i2p.util.Log;
+/**
+ * @deprecated unused
+ */
public class FilesystemAddressDB extends AddressDB {
public final static String PROP_ADDRESS_DIR = "i2p.addressdir";
diff --git a/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java b/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java
index f89d56d09d..ff1b367fd0 100644
--- a/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java
+++ b/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java
@@ -138,6 +138,7 @@ public class HostsTxtNamingService extends NamingService {
return null;
}
+ /** @deprecated unused */
@Override
public String reverseLookup(Hash h) {
List filenames = getFilenames();
diff --git a/core/java/src/net/i2p/client/naming/NamingService.java b/core/java/src/net/i2p/client/naming/NamingService.java
index fd62771392..a7098d7993 100644
--- a/core/java/src/net/i2p/client/naming/NamingService.java
+++ b/core/java/src/net/i2p/client/naming/NamingService.java
@@ -61,7 +61,9 @@ public abstract class NamingService {
* if none is known. It is safe for subclasses to always return
* <code>null</code> if no reverse lookup is possible.
*/
- public abstract String reverseLookup(Destination dest);
+ public String reverseLookup(Destination dest) { return null; };
+
+ /** @deprecated unused */
public String reverseLookup(Hash h) { return null; };
/**
diff --git a/core/java/src/net/i2p/client/naming/PetName.java b/core/java/src/net/i2p/client/naming/PetName.java
index 38d27b6083..cb0df4ab96 100644
--- a/core/java/src/net/i2p/client/naming/PetName.java
+++ b/core/java/src/net/i2p/client/naming/PetName.java
@@ -7,7 +7,7 @@ import java.util.StringTokenizer;
import net.i2p.data.DataHelper;
/**
- *
+ * deprecated unused but can be instantiated through I2PAppContext
*/
public class PetName {
private String _name;
diff --git a/core/java/src/net/i2p/client/naming/PetNameDB.java b/core/java/src/net/i2p/client/naming/PetNameDB.java
index efa96e5d0a..cff2ab56cc 100644
--- a/core/java/src/net/i2p/client/naming/PetNameDB.java
+++ b/core/java/src/net/i2p/client/naming/PetNameDB.java
@@ -19,7 +19,7 @@ import java.util.Set;
/**
- *
+ * deprecated unused but can be instantiated through I2PAppContext
*/
public class PetNameDB {
/** name (String) to PetName mapping */
diff --git a/core/java/src/net/i2p/client/naming/PetNameNamingService.java b/core/java/src/net/i2p/client/naming/PetNameNamingService.java
index ec59249a7e..a052315f39 100644
--- a/core/java/src/net/i2p/client/naming/PetNameNamingService.java
+++ b/core/java/src/net/i2p/client/naming/PetNameNamingService.java
@@ -5,6 +5,9 @@ import java.io.IOException;
import net.i2p.I2PAppContext;
import net.i2p.data.Destination;
+/**
+ * @deprecated unused
+ */
public class PetNameNamingService extends NamingService {
private PetNameDB _petnameDb;
--
GitLab