From 79bb3f6cc44bc30100c58ce41507e989b78e244e Mon Sep 17 00:00:00 2001 From: z3r0fox <z3r0fox@mail.i2p> Date: Sat, 6 Feb 2016 20:39:58 +0000 Subject: [PATCH] Added @Deprecated annotations to router classes/methods --- .../src/net/i2p/data/i2np/DeliveryInstructions.java | 11 +++++++++++ .../src/net/i2p/data/i2np/FastI2NPMessageImpl.java | 3 +++ router/java/src/net/i2p/data/i2np/GarlicClove.java | 2 ++ router/java/src/net/i2p/data/i2np/I2NPMessage.java | 1 + .../src/net/i2p/data/i2np/I2NPMessageHandler.java | 1 + .../java/src/net/i2p/data/i2np/I2NPMessageImpl.java | 4 ++++ .../java/src/net/i2p/data/i2np/I2NPMessageReader.java | 3 +++ .../java/src/net/i2p/data/router/RouterAddress.java | 6 ++++++ router/java/src/net/i2p/data/router/RouterInfo.java | 3 +++ router/java/src/net/i2p/router/Banlist.java | 1 + router/java/src/net/i2p/router/JobImpl.java | 2 ++ router/java/src/net/i2p/router/JobQueue.java | 10 ++++++++++ router/java/src/net/i2p/router/KeyManager.java | 1 + router/java/src/net/i2p/router/MessageHistory.java | 1 + router/java/src/net/i2p/router/OutNetMessage.java | 3 +++ router/java/src/net/i2p/router/Router.java | 5 +++++ router/java/src/net/i2p/router/RouterClock.java | 1 + router/java/src/net/i2p/router/RouterContext.java | 1 + router/java/src/net/i2p/router/RouterDoSThrottle.java | 1 + .../java/src/net/i2p/router/RouterThrottleImpl.java | 1 + .../java/src/net/i2p/router/TunnelManagerFacade.java | 1 + .../java/src/net/i2p/router/client/ClientManager.java | 1 + .../i2p/router/client/ClientManagerFacadeImpl.java | 1 + .../i2p/router/crypto/TransientSessionKeyManager.java | 1 + .../i2p/router/dummy/DummyTunnelManagerFacade.java | 1 + .../networkdb/kademlia/ExploreKeySelectorJob.java | 1 + .../i2p/router/peermanager/PeerManagerFacadeImpl.java | 2 ++ .../i2p/router/peermanager/ProfileManagerImpl.java | 1 + .../net/i2p/router/peermanager/ProfileOrganizer.java | 3 +++ .../i2p/router/transport/FIFOBandwidthLimiter.java | 3 +++ .../java/src/net/i2p/router/transport/GetBidsJob.java | 1 + .../i2p/router/transport/OutboundMessageRegistry.java | 1 + .../java/src/net/i2p/router/transport/Transport.java | 1 + .../src/net/i2p/router/transport/udp/UDPPacket.java | 1 + .../net/i2p/router/transport/udp/UDPPacketReader.java | 3 +++ .../src/net/i2p/router/transport/udp/UDPSender.java | 1 + .../net/i2p/router/transport/udp/UDPTransport.java | 2 ++ .../src/net/i2p/router/tunnel/HashSetIVValidator.java | 1 + .../java/src/net/i2p/router/tunnel/HopProcessor.java | 2 ++ .../i2p/router/tunnel/InboundEndpointProcessor.java | 1 + .../net/i2p/router/tunnel/TrivialPreprocessor.java | 1 + .../i2p/router/tunnel/TrivialRouterPreprocessor.java | 1 + .../src/net/i2p/router/tunnel/TunnelDispatcher.java | 1 + .../router/tunnel/pool/PooledTunnelCreatorConfig.java | 2 ++ .../net/i2p/router/tunnel/pool/TunnelPoolManager.java | 2 ++ .../src/net/i2p/router/util/PriBlockingQueue.java | 3 +++ router/java/src/org/cybergarage/upnp/Action.java | 1 + .../java/src/org/cybergarage/upnp/ArgumentList.java | 1 + 48 files changed, 102 insertions(+) diff --git a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java index 2c34b40013..fab0c6d99d 100644 --- a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java +++ b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java @@ -52,6 +52,7 @@ public class DeliveryInstructions extends DataStructureImpl { private final static int FLAG_MODE_TUNNEL = 3; /** @deprecated unused */ + @Deprecated private final static long FLAG_ENCRYPTED = 128; private final static long FLAG_MODE = 96; private final static long FLAG_DELAY = 16; @@ -84,24 +85,28 @@ public class DeliveryInstructions extends DataStructureImpl { * For cloves only (not tunnels), default false, unused * @deprecated unused */ + @Deprecated public boolean getEncrypted() { return /* _encrypted */ false; } /** * For cloves only (not tunnels), default false, unused * @deprecated unused */ + @Deprecated public void setEncrypted(boolean encrypted) { /* _encrypted = encrypted; */ } /** * For cloves only (not tunnels), default null, unused * @deprecated unused */ + @Deprecated public SessionKey getEncryptionKey() { return /* _encryptionKey */ null; } /** * For cloves only (not tunnels), default null, unused * @deprecated unused */ + @Deprecated public void setEncryptionKey(SessionKey key) { /* _encryptionKey = key; */ } /** default -1 */ @@ -132,29 +137,34 @@ public class DeliveryInstructions extends DataStructureImpl { * default false, unused * @deprecated unused */ + @Deprecated public boolean getDelayRequested() { return _delayRequested; } /** * default false, unused * @deprecated unused */ + @Deprecated public void setDelayRequested(boolean req) { _delayRequested = req; } /** * default 0, unused * @deprecated unused */ + @Deprecated public long getDelaySeconds() { return _delaySeconds; } /** * default 0, unused * @deprecated unused */ + @Deprecated public void setDelaySeconds(long seconds) { _delaySeconds = seconds; } /** * @deprecated unused */ + @Deprecated public void readBytes(InputStream in) throws DataFormatException, IOException { long flags = DataHelper.readLong(in, 1); //if (_log.shouldLog(Log.DEBUG)) @@ -423,6 +433,7 @@ public class DeliveryInstructions extends DataStructureImpl { /** * @deprecated unused */ + @Deprecated public void writeBytes(OutputStream out) throws DataFormatException, IOException { if ( (_deliveryMode < 0) || (_deliveryMode > FLAG_MODE_TUNNEL) ) throw new DataFormatException("Invalid data: mode = " + _deliveryMode); long flags = getFlags(); diff --git a/router/java/src/net/i2p/data/i2np/FastI2NPMessageImpl.java b/router/java/src/net/i2p/data/i2np/FastI2NPMessageImpl.java index 912a9e2b9e..72f726a8bf 100644 --- a/router/java/src/net/i2p/data/i2np/FastI2NPMessageImpl.java +++ b/router/java/src/net/i2p/data/i2np/FastI2NPMessageImpl.java @@ -53,6 +53,7 @@ public abstract class FastI2NPMessageImpl extends I2NPMessageImpl { * @deprecated unused * @throws UnsupportedOperationException */ + @Deprecated @Override public void readBytes(InputStream in) throws DataFormatException, IOException { throw new UnsupportedOperationException(); @@ -62,6 +63,7 @@ public abstract class FastI2NPMessageImpl extends I2NPMessageImpl { * @deprecated unused * @throws UnsupportedOperationException */ + @Deprecated @Override public int readBytes(InputStream in, int type, byte buffer[]) throws I2NPMessageException, IOException { throw new UnsupportedOperationException(); @@ -118,6 +120,7 @@ public abstract class FastI2NPMessageImpl extends I2NPMessageImpl { * @deprecated unused * @throws UnsupportedOperationException */ + @Deprecated @Override public void writeBytes(OutputStream out) throws DataFormatException, IOException { throw new UnsupportedOperationException(); diff --git a/router/java/src/net/i2p/data/i2np/GarlicClove.java b/router/java/src/net/i2p/data/i2np/GarlicClove.java index d19435321e..0d73ccf309 100644 --- a/router/java/src/net/i2p/data/i2np/GarlicClove.java +++ b/router/java/src/net/i2p/data/i2np/GarlicClove.java @@ -60,6 +60,7 @@ public class GarlicClove extends DataStructureImpl { * @deprecated unused, use byte array method to avoid copying * @throws UnsupportedOperationException always */ + @Deprecated public void readBytes(InputStream in) throws DataFormatException, IOException { throw new UnsupportedOperationException(); /**** @@ -119,6 +120,7 @@ public class GarlicClove extends DataStructureImpl { * @deprecated unused, use byte array method to avoid copying * @throws UnsupportedOperationException always */ + @Deprecated public void writeBytes(OutputStream out) throws DataFormatException, IOException { throw new UnsupportedOperationException(); /**** diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessage.java b/router/java/src/net/i2p/data/i2np/I2NPMessage.java index c714700f36..af13f563ed 100644 --- a/router/java/src/net/i2p/data/i2np/I2NPMessage.java +++ b/router/java/src/net/i2p/data/i2np/I2NPMessage.java @@ -48,6 +48,7 @@ public interface I2NPMessage extends DataStructure { * @throws IOException if there is a problem reading from the stream * @deprecated unused */ + @Deprecated public int readBytes(InputStream in, int type, byte buffer[]) throws I2NPMessageException, IOException; /** diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java b/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java index 224918ef48..16506d1a1f 100644 --- a/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java +++ b/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java @@ -46,6 +46,7 @@ public class I2NPMessageHandler { * @throws I2NPMessageException if there is a problem handling the particular * message - if it is an unknown type or has improper formatting, etc. */ + @Deprecated public I2NPMessage readMessage(InputStream in) throws IOException, I2NPMessageException { if (_messageBuffer == null) _messageBuffer = new byte[38*1024]; // more than necessary try { diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java index 062e310b12..851c0dc82b 100644 --- a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java +++ b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java @@ -58,6 +58,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM private static final Map<Integer, Builder> _builders = new ConcurrentHashMap<Integer, Builder>(1); /** @deprecated unused */ + @Deprecated public static final void registerBuilder(Builder builder, int type) { _builders.put(Integer.valueOf(type), builder); } /** interface for extending the types of messages handled - unused */ @@ -80,6 +81,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM * * @deprecated unused */ + @Deprecated public void readBytes(InputStream in) throws DataFormatException, IOException { try { readBytes(in, -1, new byte[1024]); @@ -112,6 +114,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM * @return total length of the message * @deprecated unused */ + @Deprecated public int readBytes(InputStream in, int type, byte buffer[]) throws I2NPMessageException, IOException { try { if (type < 0) @@ -243,6 +246,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM * * @deprecated unused */ + @Deprecated public void writeBytes(OutputStream out) throws DataFormatException, IOException { int size = getMessageSize(); if (size < 15 + CHECKSUM_LENGTH) throw new DataFormatException("Unable to build the message"); diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java b/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java index d23a489d60..05134f7074 100644 --- a/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java +++ b/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java @@ -34,6 +34,7 @@ import net.i2p.util.Log; * * @author jrandom */ +@Deprecated public class I2NPMessageReader { private Log _log; private RouterContext _context; @@ -70,12 +71,14 @@ public class I2NPMessageReader { * Have the already started reader pause its reading indefinitely * @deprecated unused */ + @Deprecated public void pauseReading() { _reader.pauseRunner(); } /** * Resume reading after a pause * @deprecated unused */ + @Deprecated public void resumeReading() { _reader.resumeRunner(); } /** diff --git a/router/java/src/net/i2p/data/router/RouterAddress.java b/router/java/src/net/i2p/data/router/RouterAddress.java index a350ef5936..a81ae0202e 100644 --- a/router/java/src/net/i2p/data/router/RouterAddress.java +++ b/router/java/src/net/i2p/data/router/RouterAddress.java @@ -112,6 +112,7 @@ public class RouterAddress extends DataStructureImpl { * @deprecated unused for now * @return null for never, or a Date */ + @Deprecated public Date getExpiration() { //return _expiration; if (_expiration > 0) @@ -127,6 +128,7 @@ public class RouterAddress extends DataStructureImpl { * @return 0 for never * @since 0.9.12 */ + @Deprecated public long getExpirationTime() { return _expiration; } @@ -141,6 +143,7 @@ public class RouterAddress extends DataStructureImpl { * Unused for now, always null * @deprecated unused for now */ + @Deprecated public void setExpiration(Date expiration) { _expiration = expiration.getDate(); } @@ -159,6 +162,7 @@ public class RouterAddress extends DataStructureImpl { * @throws IllegalStateException if was already set * @deprecated unused, use 3-arg constructor */ + @Deprecated public void setTransportStyle(String transportStyle) { if (_transportStyle != null) throw new IllegalStateException(); @@ -171,6 +175,7 @@ public class RouterAddress extends DataStructureImpl { * @deprecated use getOptionsMap() * @return sorted, non-null, NOT a copy, do not modify */ + @Deprecated public Properties getOptions() { return _options; } @@ -199,6 +204,7 @@ public class RouterAddress extends DataStructureImpl { * @throws IllegalStateException if was already set * @deprecated unused, use 3-arg constructor */ + @Deprecated public void setOptions(Properties options) { if (!_options.isEmpty()) throw new IllegalStateException(); diff --git a/router/java/src/net/i2p/data/router/RouterInfo.java b/router/java/src/net/i2p/data/router/RouterInfo.java index fdfd291365..bc96fa853c 100644 --- a/router/java/src/net/i2p/data/router/RouterInfo.java +++ b/router/java/src/net/i2p/data/router/RouterInfo.java @@ -221,6 +221,7 @@ public class RouterInfo extends DatabaseEntry { * * @deprecated Implemented here but unused elsewhere */ + @Deprecated public Set<Hash> getPeers() { if (_peers == null) return Collections.emptySet(); @@ -234,6 +235,7 @@ public class RouterInfo extends DatabaseEntry { * @deprecated Implemented here but unused elsewhere * @throws IllegalStateException if RouterInfo is already signed */ + @Deprecated public void setPeers(Set<Hash> peers) { if (_signature != null) throw new IllegalStateException(); @@ -255,6 +257,7 @@ public class RouterInfo extends DatabaseEntry { * @deprecated use getOptionsMap() * @return sorted, non-null, NOT a copy, do not modify!!! */ + @Deprecated public Properties getOptions() { return _options; } diff --git a/router/java/src/net/i2p/router/Banlist.java b/router/java/src/net/i2p/router/Banlist.java index 984be5ec69..716b9e1f76 100644 --- a/router/java/src/net/i2p/router/Banlist.java +++ b/router/java/src/net/i2p/router/Banlist.java @@ -294,6 +294,7 @@ public class Banlist { } /** @deprecated moved to router console */ + @Deprecated public void renderStatusHTML(Writer out) throws IOException { } } diff --git a/router/java/src/net/i2p/router/JobImpl.java b/router/java/src/net/i2p/router/JobImpl.java index 25431e20b0..54275fd19f 100644 --- a/router/java/src/net/i2p/router/JobImpl.java +++ b/router/java/src/net/i2p/router/JobImpl.java @@ -48,6 +48,7 @@ public abstract class JobImpl implements Job { * class list for no good reason. Logging in jobs is almost always * set explicitly rather than by class name. */ + @Deprecated void addedToQueue() { //if (_context.logManager().getLog(getClass()).shouldLog(Log.DEBUG)) // _addedBy = new Exception(); @@ -57,6 +58,7 @@ public abstract class JobImpl implements Job { * @deprecated * @return null always */ + @Deprecated public Exception getAddedBy() { return null; } public long getMadeReadyOn() { return _madeReadyOn; } public void madeReady() { _madeReadyOn = _context.clock().now(); } diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java index 141f348bf0..0bf72ad9d0 100644 --- a/router/java/src/net/i2p/router/JobQueue.java +++ b/router/java/src/net/i2p/router/JobQueue.java @@ -86,30 +86,35 @@ public class JobQueue { private long _lagWarning = DEFAULT_LAG_WARNING; private final static long DEFAULT_LAG_WARNING = 5*1000; /** @deprecated unimplemented */ + @Deprecated private final static String PROP_LAG_WARNING = "router.jobLagWarning"; /** if a job is this lagged, the router is hosed, so spit out a warning (dont shut it down) */ private long _lagFatal = DEFAULT_LAG_FATAL; private final static long DEFAULT_LAG_FATAL = 30*1000; /** @deprecated unimplemented */ + @Deprecated private final static String PROP_LAG_FATAL = "router.jobLagFatal"; /** if a job takes this long to run, spit out a warning, but keep going */ private long _runWarning = DEFAULT_RUN_WARNING; private final static long DEFAULT_RUN_WARNING = 5*1000; /** @deprecated unimplemented */ + @Deprecated private final static String PROP_RUN_WARNING = "router.jobRunWarning"; /** if a job takes this long to run, the router is hosed, so spit out a warning (dont shut it down) */ private long _runFatal = DEFAULT_RUN_FATAL; private final static long DEFAULT_RUN_FATAL = 30*1000; /** @deprecated unimplemented */ + @Deprecated private final static String PROP_RUN_FATAL = "router.jobRunFatal"; /** don't enforce fatal limits until the router has been up for this long */ private long _warmupTime = DEFAULT_WARMUP_TIME; private final static long DEFAULT_WARMUP_TIME = 10*60*1000; /** @deprecated unimplemented */ + @Deprecated private final static String PROP_WARMUP_TIME = "router.jobWarmupTime"; /** max ready and waiting jobs before we start dropping 'em */ @@ -118,6 +123,7 @@ public class JobQueue { private final static long MIN_LAG_TO_DROP = 500; /** @deprecated unimplemented */ + @Deprecated private final static String PROP_MAX_WAITING_JOBS = "router.maxWaitingJobs"; /** @@ -249,6 +255,7 @@ public class JobQueue { * * @deprecated unused */ + @Deprecated public boolean isJobActive(Job job) { synchronized (_jobLock) { if (_readyJobs.contains(job) || _timedJobs.contains(job)) @@ -263,6 +270,7 @@ public class JobQueue { /** * @deprecated contention - see JobTiming.setStartAfter() comments */ + @Deprecated public void timingUpdated() { synchronized (_jobLock) { _jobLock.notifyAll(); @@ -346,6 +354,7 @@ public class JobQueue { } /** @deprecated do you really want to do this? */ + @Deprecated public void restart() { synchronized (_jobLock) { _timedJobs.clear(); @@ -787,6 +796,7 @@ public class JobQueue { } /** @deprecated moved to router console */ + @Deprecated public void renderStatusHTML(Writer out) throws IOException { } } diff --git a/router/java/src/net/i2p/router/KeyManager.java b/router/java/src/net/i2p/router/KeyManager.java index 3317b92903..cda22114fd 100644 --- a/router/java/src/net/i2p/router/KeyManager.java +++ b/router/java/src/net/i2p/router/KeyManager.java @@ -65,6 +65,7 @@ public class KeyManager { * * @deprecated we never read keys in anymore */ + @Deprecated public void startup() { // run inline so keys are loaded immediately (new SynchronizeKeysJob()).runJob(); diff --git a/router/java/src/net/i2p/router/MessageHistory.java b/router/java/src/net/i2p/router/MessageHistory.java index 82d1af9df1..0666fc6103 100644 --- a/router/java/src/net/i2p/router/MessageHistory.java +++ b/router/java/src/net/i2p/router/MessageHistory.java @@ -77,6 +77,7 @@ public class MessageHistory { public boolean getDoLog() { return _doLog; } /** @deprecated unused */ + @Deprecated void setPauseFlushes(boolean doPause) { _doPause = doPause; } String getFilename() { return _historyFile; } diff --git a/router/java/src/net/i2p/router/OutNetMessage.java b/router/java/src/net/i2p/router/OutNetMessage.java index 54434ac4b7..fc6f8b71b8 100644 --- a/router/java/src/net/i2p/router/OutNetMessage.java +++ b/router/java/src/net/i2p/router/OutNetMessage.java @@ -146,6 +146,7 @@ public class OutNetMessage implements CDPQEntry { } /** @deprecated unused */ + @Deprecated public Map<String, Long> getTimestamps() { if (_log.shouldLog(Log.INFO)) { synchronized (this) { @@ -157,6 +158,7 @@ public class OutNetMessage implements CDPQEntry { } /** @deprecated unused */ + @Deprecated public Long getTimestamp(String eventName) { if (_log.shouldLog(Log.INFO)) { synchronized (this) { @@ -178,6 +180,7 @@ public class OutNetMessage implements CDPQEntry { * @deprecated * @return null always */ + @Deprecated public Exception getCreatedBy() { return null; } /** diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 03183a9949..f250be3d56 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -450,12 +450,14 @@ public class Router implements RouterClock.ClockShiftListener { public void setKillVMOnEnd(boolean shouldDie) { _killVMOnEnd = shouldDie; } /** @deprecated unused */ + @Deprecated public boolean getKillVMOnEnd() { return _killVMOnEnd; } /** @return absolute path */ public String getConfigFilename() { return _configFilename; } /** @deprecated unused */ + @Deprecated public void setConfigFilename(String filename) { _configFilename = filename; } public String getConfigSetting(String name) { @@ -469,6 +471,7 @@ public class Router implements RouterClock.ClockShiftListener { * @since 0.8.13 * @deprecated use saveConfig(String name, String value) or saveConfig(Map toAdd, Set toRemove) */ + @Deprecated public void setConfigSetting(String name, String value) { _config.put(name, value); } @@ -480,6 +483,7 @@ public class Router implements RouterClock.ClockShiftListener { * @since 0.8.13 * @deprecated use saveConfig(String name, String value) or saveConfig(Map toAdd, Set toRemove) */ + @Deprecated public void removeConfigSetting(String name) { _config.remove(name); // remove the backing default also @@ -937,6 +941,7 @@ public class Router implements RouterClock.ClockShiftListener { public static final String PROP_FORCE_UNREACHABLE = "router.forceUnreachable"; /** @deprecated unused */ + @Deprecated public static final char CAPABILITY_NEW_TUNNEL = 'T'; /** diff --git a/router/java/src/net/i2p/router/RouterClock.java b/router/java/src/net/i2p/router/RouterClock.java index 1d0418c154..68a45ac618 100644 --- a/router/java/src/net/i2p/router/RouterClock.java +++ b/router/java/src/net/i2p/router/RouterClock.java @@ -330,6 +330,7 @@ public class RouterClock extends Clock { * @since 0.7.12 * @deprecated for debugging only */ + @Deprecated public long getDeltaOffset() { return _desiredOffset - _offset; } diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java index e29d2bb432..ac15c1be43 100644 --- a/router/java/src/net/i2p/router/RouterContext.java +++ b/router/java/src/net/i2p/router/RouterContext.java @@ -136,6 +136,7 @@ public class RouterContext extends I2PAppContext { * @since 0.8.4 * @deprecated Use Router.saveConfig() */ + @Deprecated public void setProperty(String propName, String value) { _overrideProps.setProperty(propName, value); } diff --git a/router/java/src/net/i2p/router/RouterDoSThrottle.java b/router/java/src/net/i2p/router/RouterDoSThrottle.java index 3ef8cdab6e..57f5b7ddaa 100644 --- a/router/java/src/net/i2p/router/RouterDoSThrottle.java +++ b/router/java/src/net/i2p/router/RouterDoSThrottle.java @@ -10,6 +10,7 @@ import net.i2p.data.Hash; * * @deprecated unused */ +@Deprecated class RouterDoSThrottle extends RouterThrottleImpl { public RouterDoSThrottle(RouterContext context) { super(context); diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java index 80473af2eb..e4cdfb8890 100644 --- a/router/java/src/net/i2p/router/RouterThrottleImpl.java +++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java @@ -102,6 +102,7 @@ public class RouterThrottleImpl implements RouterThrottle { } /** @deprecated unused, function moved to netdb */ + @Deprecated public boolean acceptNetDbLookupRequest(Hash key) { long lag = _context.jobQueue().getMaxLag(); if (lag > JOB_LAG_LIMIT_NETDB) { diff --git a/router/java/src/net/i2p/router/TunnelManagerFacade.java b/router/java/src/net/i2p/router/TunnelManagerFacade.java index 5b3e000ac0..cce1e5b8d4 100644 --- a/router/java/src/net/i2p/router/TunnelManagerFacade.java +++ b/router/java/src/net/i2p/router/TunnelManagerFacade.java @@ -29,6 +29,7 @@ public interface TunnelManagerFacade extends Service { * @param id the tunnelId as seen at the gateway * @deprecated unused */ + @Deprecated TunnelInfo getTunnelInfo(TunnelId id); /** diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index 6665409a03..b320f89956 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -565,6 +565,7 @@ class ClientManager { } /** @deprecated unused */ + @Deprecated public void renderStatusHTML(Writer out) throws IOException { /****** StringBuilder buf = new StringBuilder(8*1024); diff --git a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java index 385d3bd2be..b6ba9de182 100644 --- a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java +++ b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java @@ -235,6 +235,7 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade implements Inte /** @deprecated unused */ @Override + @Deprecated public void renderStatusHTML(Writer out) throws IOException { if (_manager != null) _manager.renderStatusHTML(out); diff --git a/router/java/src/net/i2p/router/crypto/TransientSessionKeyManager.java b/router/java/src/net/i2p/router/crypto/TransientSessionKeyManager.java index 15f0ec6016..606409c2c1 100644 --- a/router/java/src/net/i2p/router/crypto/TransientSessionKeyManager.java +++ b/router/java/src/net/i2p/router/crypto/TransientSessionKeyManager.java @@ -450,6 +450,7 @@ public class TransientSessionKeyManager extends SessionKeyManager { * @deprecated unused and rather drastic */ @Override + @Deprecated public void failTags(PublicKey target) { removeSession(target); } diff --git a/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java b/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java index 96dceea18e..163c32a97f 100644 --- a/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java +++ b/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java @@ -30,6 +30,7 @@ import net.i2p.router.tunnel.pool.TunnelPool; public class DummyTunnelManagerFacade implements TunnelManagerFacade { /** @deprecated unused */ + @Deprecated public TunnelInfo getTunnelInfo(TunnelId id) { return null; } public TunnelInfo selectInboundTunnel() { return null; } public TunnelInfo selectInboundTunnel(Hash destination) { return null; } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreKeySelectorJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreKeySelectorJob.java index d3fe0198bf..ba4b59f690 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreKeySelectorJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreKeySelectorJob.java @@ -26,6 +26,7 @@ import net.i2p.util.Log; * * @deprecated unused, see comments in KNDF */ +@Deprecated class ExploreKeySelectorJob extends JobImpl { private Log _log; private KademliaNetworkDatabaseFacade _facade; diff --git a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java index 74e96cd01a..30d6978858 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java +++ b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java @@ -78,6 +78,7 @@ public class PeerManagerFacadeImpl implements PeerManagerFacade { } /** @deprecated unused */ + @Deprecated public Hash selectRandomByCapability(char capability) { //if (_manager == null) return null; //return _manager.selectRandomByCapability(capability); @@ -94,6 +95,7 @@ public class PeerManagerFacadeImpl implements PeerManagerFacade { } /** @deprecated moved to routerconsole */ + @Deprecated public void renderStatusHTML(Writer out) throws IOException { } diff --git a/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java b/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java index b0a9c7785d..3f94394922 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java @@ -357,6 +357,7 @@ public class ProfileManagerImpl implements ProfileManager { * provide a simple summary of a number of peers, suitable for publication in the netDb * @deprecated unused */ + @Deprecated public Properties summarizePeers(int numPeers) { /**** Set peers = new HashSet(numPeers); diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java index 5e6e2f7a92..cf1b94c4c7 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java @@ -240,6 +240,7 @@ public class ProfileOrganizer { public int countFastPeers() { return count(_fastPeers); } public int countHighCapacityPeers() { return count(_highCapacityPeers); } /** @deprecated use ProfileManager.getPeersByCapability('f').size() */ + @Deprecated public int countWellIntegratedPeers() { return count(_wellIntegratedPeers); } public int countNotFailingPeers() { return count(_notFailingPeers); } public int countFailingPeers() { return count(_failingPeers); } @@ -492,6 +493,7 @@ public class ProfileOrganizer { * * @deprecated unused */ + @Deprecated public void selectWellIntegratedPeers(int howMany, Set<Hash> exclude, Set<Hash> matches) { selectWellIntegratedPeers(howMany, exclude, matches, 0); } @@ -503,6 +505,7 @@ public class ProfileOrganizer { * not be in the same tunnel. 0 = disable check; 1 = /8; 2 = /16; 3 = /24; 4 = exact IP match * @deprecated unused */ + @Deprecated public void selectWellIntegratedPeers(int howMany, Set<Hash> exclude, Set<Hash> matches, int mask) { getReadLock(); try { diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java index 209d7ba62c..02f4cabd31 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java @@ -114,9 +114,11 @@ public class FIFOBandwidthLimiter { //public void setMaxOutboundBytes(int numBytes) { _maxOutboundBytes = numBytes; } /** @deprecated unused for now, we are always limited */ + @Deprecated void setInboundUnlimited(boolean isUnlimited) { _inboundUnlimited = isUnlimited; } /** @deprecated unused for now, we are always limited */ + @Deprecated void setOutboundUnlimited(boolean isUnlimited) { _outboundUnlimited = isUnlimited; } /** @return smoothed one second rate */ @@ -735,6 +737,7 @@ public class FIFOBandwidthLimiter { } /** @deprecated not worth translating */ + @Deprecated public void renderStatusHTML(Writer out) throws IOException { /******* long now = now(); diff --git a/router/java/src/net/i2p/router/transport/GetBidsJob.java b/router/java/src/net/i2p/router/transport/GetBidsJob.java index aaa50ee45c..1471adeca0 100644 --- a/router/java/src/net/i2p/router/transport/GetBidsJob.java +++ b/router/java/src/net/i2p/router/transport/GetBidsJob.java @@ -29,6 +29,7 @@ class GetBidsJob extends JobImpl { /** * @deprecated unused, see static getBids() */ + @Deprecated public GetBidsJob(RouterContext ctx, TransportManager tmgr, OutNetMessage msg) { super(ctx); _log = ctx.logManager().getLog(GetBidsJob.class); diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java index 9a5661b5f2..f73634babe 100644 --- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java +++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java @@ -255,6 +255,7 @@ public class OutboundMessageRegistry { } /** @deprecated unused */ + @Deprecated public void renderStatusHTML(Writer out) throws IOException {} private class CleanupTask extends SimpleTimer2.TimedEvent { diff --git a/router/java/src/net/i2p/router/transport/Transport.java b/router/java/src/net/i2p/router/transport/Transport.java index 41c19211c6..508435bf1b 100644 --- a/router/java/src/net/i2p/router/transport/Transport.java +++ b/router/java/src/net/i2p/router/transport/Transport.java @@ -159,6 +159,7 @@ public interface Transport { /** * @deprecated unused */ + @Deprecated public void recheckReachability(); public boolean isBacklogged(Hash peer); diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java index 238ec16fd2..f5647661c6 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java @@ -328,6 +328,7 @@ class UDPPacket implements CDQEntry { * @since 0.9.21 * @deprecated unused */ + @Deprecated public synchronized void requestInboundBandwidth() { verifyNotReleased(); _bandwidthRequest = _context.bandwidthLimiter().requestInbound(_packet.getLength(), "UDP receiver"); diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java index c7c9d90cc0..e0476a70a2 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java @@ -849,6 +849,7 @@ class UDPPacketReader { } /** @deprecated unused */ + @Deprecated public int readAliceIPSize() { int offset = readBodyOffset(); offset += _message[offset] & 0xff; @@ -856,6 +857,7 @@ class UDPPacketReader { return _message[offset] & 0xff; } /** @deprecated unused */ + @Deprecated public void readAliceIP(byte target[], int targetOffset) { int offset = readBodyOffset(); offset += _message[offset] & 0xff; @@ -865,6 +867,7 @@ class UDPPacketReader { System.arraycopy(_message, offset, target, targetOffset, sz); } /** @deprecated unused */ + @Deprecated public int readAlicePort() { int offset = readBodyOffset(); offset += _message[offset] & 0xff; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPSender.java b/router/java/src/net/i2p/router/transport/udp/UDPSender.java index ebb2de795e..5ffff56dbb 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPSender.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPSender.java @@ -124,6 +124,7 @@ class UDPSender { * @param blockTime how long to block IGNORED * @deprecated use add(packet) */ + @Deprecated public void add(UDPPacket packet, int blockTime) { /******** //long expiration = _context.clock().now() + blockTime; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index 0202ee39fa..85e6e3d1c8 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -127,6 +127,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority /** now unused, we pick a random port * @deprecated unused */ + @Deprecated public static final int DEFAULT_INTERNAL_PORT = 8887; /** define this to explicitly set an external IP address */ @@ -3102,6 +3103,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority * @deprecated unused */ @Override + @Deprecated public void recheckReachability() { // FIXME locking if we do this again //_testEvent.runTest(); diff --git a/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java b/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java index e450f6827e..0c9f10efde 100644 --- a/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java +++ b/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java @@ -11,6 +11,7 @@ import net.i2p.util.ConcurrentHashSet; * * @deprecated unused */ +@Deprecated class HashSetIVValidator implements IVValidator { private final Set<ByteArray> _received; diff --git a/router/java/src/net/i2p/router/tunnel/HopProcessor.java b/router/java/src/net/i2p/router/tunnel/HopProcessor.java index 9ba6218fd9..92b985e631 100644 --- a/router/java/src/net/i2p/router/tunnel/HopProcessor.java +++ b/router/java/src/net/i2p/router/tunnel/HopProcessor.java @@ -34,6 +34,7 @@ class HopProcessor { /** * @deprecated used only by unit tests */ + @Deprecated HopProcessor(I2PAppContext ctx, HopConfig config) { this(ctx, config, createValidator()); } @@ -48,6 +49,7 @@ class HopProcessor { /** * @deprecated used only by unit test constructor */ + @Deprecated private static IVValidator createValidator() { // yeah, we'll use an O(1) validator later (e.g. bloom filter) return new HashSetIVValidator(); diff --git a/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java b/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java index 4a3c5eccbe..a45b1dd8dd 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java +++ b/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java @@ -24,6 +24,7 @@ class InboundEndpointProcessor { /** * @deprecated used only by unit tests */ + @Deprecated InboundEndpointProcessor(RouterContext ctx, TunnelCreatorConfig cfg) { this(ctx, cfg, DummyValidator.getInstance()); } diff --git a/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java b/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java index 19e84dc04d..64668884e1 100644 --- a/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java +++ b/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java @@ -150,6 +150,7 @@ class TrivialPreprocessor implements TunnelGateway.QueuePreprocessor { * are there follow up headers? * @deprecated unimplemented */ + @Deprecated private static final byte MASK_EXTENDED = FragmentHandler.MASK_EXTENDED; private static final byte MASK_TUNNEL = (byte)(FragmentHandler.TYPE_TUNNEL << 5); private static final byte MASK_ROUTER = (byte)(FragmentHandler.TYPE_ROUTER << 5); diff --git a/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java b/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java index b37baa8cea..01598f94a0 100644 --- a/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java +++ b/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java @@ -9,6 +9,7 @@ import net.i2p.router.RouterContext; * * @deprecated unused */ +@Deprecated class TrivialRouterPreprocessor extends TrivialPreprocessor { public TrivialRouterPreprocessor(RouterContext ctx) { diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java index 134c76802e..05df3e28d5 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java @@ -949,6 +949,7 @@ public class TunnelDispatcher implements Service { } /** @deprecated moved to router console */ + @Deprecated public void renderStatusHTML(Writer out) throws IOException {} /** diff --git a/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java b/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java index 914e8bf397..027dc2cda8 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java +++ b/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java @@ -75,6 +75,7 @@ class PooledTunnelCreatorConfig extends TunnelCreatorConfig { /** @deprecated unused, which makes _testJob unused - why is it here */ + @Deprecated void setTestJob(TestJob job) { _testJob = job; } /** does nothing, to be deprecated */ public void setExpireJob(Job job) { /* _expireJob = job; */ } @@ -82,6 +83,7 @@ class PooledTunnelCreatorConfig extends TunnelCreatorConfig { /** * @deprecated Fix memory leaks caused by references if you need to use pairedTunnel */ + @Deprecated public void setPairedTunnel(TunnelInfo tunnel) { /* _pairedTunnel = tunnel; */} // public TunnelInfo getPairedTunnel() { return _pairedTunnel; } } diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java index e2e54e6e1a..997b27b8e5 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -254,6 +254,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { * Expensive (iterates through all tunnels of all pools) and unnecessary. * @deprecated unused */ + @Deprecated public TunnelInfo getTunnelInfo(TunnelId id) { TunnelInfo info = null; for (TunnelPool pool : _clientInboundPools.values()) { @@ -646,6 +647,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { public int getInboundBuildQueueSize() { return _handler.getInboundBuildQueueSize(); } /** @deprecated moved to routerconsole */ + @Deprecated public void renderStatusHTML(Writer out) throws IOException { } diff --git a/router/java/src/net/i2p/router/util/PriBlockingQueue.java b/router/java/src/net/i2p/router/util/PriBlockingQueue.java index 7a46741c8a..2252e81c20 100644 --- a/router/java/src/net/i2p/router/util/PriBlockingQueue.java +++ b/router/java/src/net/i2p/router/util/PriBlockingQueue.java @@ -49,6 +49,7 @@ public class PriBlockingQueue<E extends PQEntry> extends PriorityBlockingQueue<E * Returns false if full * @deprecated use offer(o) */ + @Deprecated @Override public boolean add(E o) { timestamp(o); @@ -79,6 +80,7 @@ public class PriBlockingQueue<E extends PQEntry> extends PriorityBlockingQueue<E * @param unit ignored * @deprecated use offer(o) */ + @Deprecated @Override public boolean offer(E o, long timeout, TimeUnit unit) { timestamp(o); @@ -94,6 +96,7 @@ public class PriBlockingQueue<E extends PQEntry> extends PriorityBlockingQueue<E * Non blocking. Does not add if full. * @deprecated use offer(o) */ + @Deprecated @Override public void put(E o) { timestamp(o); diff --git a/router/java/src/org/cybergarage/upnp/Action.java b/router/java/src/org/cybergarage/upnp/Action.java index a4a4bc7825..e5ab1559ce 100644 --- a/router/java/src/org/cybergarage/upnp/Action.java +++ b/router/java/src/org/cybergarage/upnp/Action.java @@ -227,6 +227,7 @@ public class Action * - {@link #setInArgumentValues(ArgumentList)} <br/> * - {@link #setOutArgumentValues(ArgumentList)} */ + @Deprecated public void setArgumentValues(ArgumentList argList) { getArgumentList().set(argList); diff --git a/router/java/src/org/cybergarage/upnp/ArgumentList.java b/router/java/src/org/cybergarage/upnp/ArgumentList.java index c1251962d0..148d5c544a 100644 --- a/router/java/src/org/cybergarage/upnp/ArgumentList.java +++ b/router/java/src/org/cybergarage/upnp/ArgumentList.java @@ -62,6 +62,7 @@ public class ArgumentList extends Vector<Argument> /** * @deprecated */ + @Deprecated public void set(ArgumentList inArgList) { int nInArgs = inArgList.size(); -- GitLab