From 605602e001e98158966c0d2f017314f982f60a22 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 10 Jun 2015 19:15:01 +0000 Subject: [PATCH] @since updates --- .../client/streaming/I2PSocketManager.java | 6 ++-- core/java/src/net/i2p/client/I2PSession.java | 6 ++-- .../src/net/i2p/client/I2PSessionImpl.java | 12 ++++---- .../src/net/i2p/client/I2PSessionImpl2.java | 2 +- .../net/i2p/client/I2PSessionMuxedImpl.java | 2 +- .../client/RequestLeaseSetMessageHandler.java | 2 +- core/java/src/net/i2p/client/SubSession.java | 5 +--- .../router/client/ClientConnectionRunner.java | 28 +++++++++---------- .../net/i2p/router/client/ClientManager.java | 2 +- 9 files changed, 31 insertions(+), 34 deletions(-) diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java index 3c2a37325..a969581bd 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java @@ -42,18 +42,18 @@ public interface I2PSocketManager { * @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session * and different signing keys * @param opts subsession options if any, may be null - * @since 0.9.19 + * @since 0.9.21 */ public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException; /** - * @since 0.9.19 + * @since 0.9.21 */ public void removeSubsession(I2PSession session); /** * @return a list of subsessions, non-null, does not include the primary session - * @since 0.9.19 + * @since 0.9.21 */ public List getSubsessions(); diff --git a/core/java/src/net/i2p/client/I2PSession.java b/core/java/src/net/i2p/client/I2PSession.java index dc79a1f4f..016293ea7 100644 --- a/core/java/src/net/i2p/client/I2PSession.java +++ b/core/java/src/net/i2p/client/I2PSession.java @@ -255,19 +255,19 @@ public interface I2PSession { * @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session * and different signing keys * @param opts subsession options if any, may be null - * @since 0.9.19 + * @since 0.9.21 */ public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException; /** * @return a list of subsessions, non-null, does not include the primary session - * @since 0.9.19 + * @since 0.9.21 */ public void removeSubsession(I2PSession session); /** * @return a list of subsessions, non-null, does not include the primary session - * @since 0.9.19 + * @since 0.9.21 */ public List getSubsessions(); diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index 035536c6c..429459d7b 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -226,7 +226,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 * @param destKeyStream stream containing the private key data, * format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile} * @param options set of options to configure the router with, if null will use System properties - * @since 0.9.19 + * @since 0.9.21 */ protected I2PSessionImpl(I2PSessionImpl primary, InputStream destKeyStream, Properties options) throws I2PSessionException { this(primary.getContext(), options, primary.getHandlerMap(), primary.getProducer(), true); @@ -307,7 +307,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 * @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session * and different signing keys * @param opts subsession options if any, may be null - * @since 0.9.19 + * @since 0.9.21 */ public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException { if (!_routerSupportsSubsessions) @@ -335,7 +335,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 } /** - * @since 0.9.19 + * @since 0.9.21 */ public void removeSubsession(I2PSession session) { if (!(session instanceof SubSession)) @@ -355,7 +355,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 /** * @return a list of subsessions, non-null, does not include the primary session - * @since 0.9.19 + * @since 0.9.21 */ public List getSubsessions() { synchronized(_subsessionLock) { @@ -985,13 +985,13 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 /** * For Subsessions - * @since 0.9.19 + * @since 0.9.21 */ I2PClientMessageHandlerMap getHandlerMap() { return _handlerMap; } /** * For Subsessions - * @since 0.9.19 + * @since 0.9.21 */ I2PAppContext getContext() { return _context; } diff --git a/core/java/src/net/i2p/client/I2PSessionImpl2.java b/core/java/src/net/i2p/client/I2PSessionImpl2.java index 4002bab80..d6fe3ad36 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl2.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl2.java @@ -102,7 +102,7 @@ class I2PSessionImpl2 extends I2PSessionImpl { * @param destKeyStream stream containing the private key data, * format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile} * @param options set of options to configure the router with, if null will use System properties - * @since 0.9.19 + * @since 0.9.21 */ protected I2PSessionImpl2(I2PSessionImpl primary, InputStream destKeyStream, Properties options) throws I2PSessionException { super(primary, destKeyStream, options); diff --git a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java b/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java index f4ae207e1..653fddc9a 100644 --- a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java @@ -89,7 +89,7 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 { * @param destKeyStream stream containing the private key data, * format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile} * @param options set of options to configure the router with, if null will use System properties - * @since 0.9.19 + * @since 0.9.21 */ protected I2PSessionMuxedImpl(I2PSessionImpl primary, InputStream destKeyStream, Properties options) throws I2PSessionException { super(primary, destKeyStream, options); diff --git a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java index e6729a2e4..68f8f07b8 100644 --- a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java +++ b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java @@ -225,7 +225,7 @@ class RequestLeaseSetMessageHandler extends HandlerImpl { /** * Existing crypto key, new signing key - * @since 0.9.20 + * @since 0.9.21 */ public LeaseInfo(PrivateKey privKey, Destination dest) { SimpleDataStructure signKeys[]; diff --git a/core/java/src/net/i2p/client/SubSession.java b/core/java/src/net/i2p/client/SubSession.java index 2a2882335..e115099b4 100644 --- a/core/java/src/net/i2p/client/SubSession.java +++ b/core/java/src/net/i2p/client/SubSession.java @@ -43,7 +43,7 @@ import net.i2p.util.I2PAppThread; * While the I2CP protocol, in theory, allows for fully independent sessions * over the same I2CP connection, this is not currently supported by the router. * - * @since 0.9.19 + * @since 0.9.21 */ class SubSession extends I2PSessionMuxedImpl { private final I2PSessionMuxedImpl _primary; @@ -64,7 +64,6 @@ class SubSession extends I2PSessionMuxedImpl { /** * Unsupported in a subsession. * @throws UnsupportedOperationException always - * @since 0.9.19 */ @Override public I2PSession addSubsession(InputStream destKeyStream, Properties opts) throws I2PSessionException { @@ -74,7 +73,6 @@ class SubSession extends I2PSessionMuxedImpl { /** * Unsupported in a subsession. * Does nothing. - * @since 0.9.19 */ @Override public void removeSubsession(I2PSession session) {} @@ -82,7 +80,6 @@ class SubSession extends I2PSessionMuxedImpl { /** * Unsupported in a subsession. * @return empty list always - * @since 0.9.19 */ @Override public List getSubsessions() { diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index 9cfa4da19..aaa106a78 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -115,7 +115,7 @@ class ClientConnectionRunner { /** * For multisession - * @since 0.9.19 + * @since 0.9.21 */ private static class SessionParams { final Destination dest; @@ -213,7 +213,7 @@ class ClientConnectionRunner { * Current client's config, * will be null if session not found * IS subsession aware. - * @since 0.9.19 added hash param + * @since 0.9.21 added hash param */ public SessionConfig getConfig(Hash h) { SessionParams sp = _sessions.get(h); @@ -226,7 +226,7 @@ class ClientConnectionRunner { * Current client's config, * will be null if session not found * IS subsession aware. - * @since 0.9.19 added id param + * @since 0.9.21 added id param */ public SessionConfig getConfig(SessionId id) { for (SessionParams sp : _sessions.values()) { @@ -239,7 +239,7 @@ class ClientConnectionRunner { /** * Primary client's config, * will be null if session not set up - * @since 0.9.19 + * @since 0.9.21 */ public SessionConfig getPrimaryConfig() { for (SessionParams sp : _sessions.values()) { @@ -273,7 +273,7 @@ class ClientConnectionRunner { * Currently allocated leaseSet. * IS subsession aware. Returns primary leaseset only. * @return leaseSet or null if not yet set or unknown hash - * @since 0.9.19 added hash parameter + * @since 0.9.21 added hash parameter */ public LeaseSet getLeaseSet(Hash h) { SessionParams sp = _sessions.get(h); @@ -312,7 +312,7 @@ class ClientConnectionRunner { /** * Return the hash for the given ID * @return hash or null if unknown - * @since 0.9.19 + * @since 0.9.21 */ public Hash getDestHash(SessionId id) { for (Map.Entry e : _sessions.entrySet()) { @@ -325,7 +325,7 @@ class ClientConnectionRunner { /** * Return the dest for the given ID * @return dest or null if unknown - * @since 0.9.19 + * @since 0.9.21 */ public Destination getDestination(SessionId id) { for (SessionParams sp : _sessions.values()) { @@ -340,7 +340,7 @@ class ClientConnectionRunner { * * @param h the local target * @return current client's sessionId or null if not yet set or not a valid hash - * @since 0.9.19 + * @since 0.9.21 */ SessionId getSessionId(Hash h) { SessionParams sp = _sessions.get(h); @@ -353,7 +353,7 @@ class ClientConnectionRunner { * Subsession aware. * * @return all current client's sessionIds, non-null - * @since 0.9.19 + * @since 0.9.21 */ List getSessionIds() { List rv = new ArrayList(_sessions.size()); @@ -369,7 +369,7 @@ class ClientConnectionRunner { * Subsession aware. * * @return all current client's destinations, non-null - * @since 0.9.19 + * @since 0.9.21 */ List getDestinations() { List rv = new ArrayList(_sessions.size()); @@ -384,7 +384,7 @@ class ClientConnectionRunner { * * @param hash for the session * @throws IllegalStateException if already set - * @since 0.9.19 added hash param + * @since 0.9.21 added hash param */ void setSessionId(Hash hash, SessionId id) { if (hash == null) @@ -398,7 +398,7 @@ class ClientConnectionRunner { /** * Kill the session. Caller must kill runner if none left. * - * @since 0.9.19 + * @since 0.9.21 */ void removeSession(SessionId id) { boolean isPrimary = false; @@ -430,7 +430,7 @@ class ClientConnectionRunner { /** * Data for the current leaseRequest, or null if there is no active leaseSet request. * Not subsession aware. Returns primary ID only. - * @since 0.9.19 added hash param + * @since 0.9.21 added hash param */ LeaseRequestState getLeaseRequest(Hash h) { SessionParams sp = _sessions.get(h); @@ -720,7 +720,7 @@ class ClientConnectionRunner { * * @param toHash non-null * @param fromDest generally null when from remote, non-null if from local - * @since 0.9.20 + * @since 0.9.21 */ void receiveMessage(Hash toHash, Destination fromDest, Payload payload) { SessionParams sp = _sessions.get(toHash); diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index d9d4a3bd2..ea35681f9 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -242,7 +242,7 @@ class ClientManager { /** * Remove only the following session. Does not remove the runner if it has more. * - * @since 0.9.19 + * @since 0.9.21 */ public void unregisterSession(SessionId id, Destination dest) { if (_log.shouldLog(Log.WARN))