From c10a4f51baa010df8fe63159cca823d823d141c7 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 2 Oct 2010 14:27:01 +0000 Subject: [PATCH] I2CP: cleanups to replace method calls with fields --- .../src/net/i2p/data/i2cp/AbuseReason.java | 6 ++--- .../src/net/i2p/data/i2cp/AbuseSeverity.java | 6 ++--- .../i2p/data/i2cp/CreateSessionMessage.java | 8 +++---- .../i2p/data/i2cp/DestroySessionMessage.java | 4 ++-- .../net/i2p/data/i2cp/I2CPMessageHandler.java | 8 ++++--- .../java/src/net/i2p/data/i2cp/MessageId.java | 8 +++---- .../i2p/data/i2cp/MessagePayloadMessage.java | 12 +++++----- .../i2p/data/i2cp/MessageStatusMessage.java | 22 ++++++++++--------- .../data/i2cp/ReceiveMessageBeginMessage.java | 8 +++---- .../data/i2cp/ReceiveMessageEndMessage.java | 8 +++---- .../data/i2cp/ReconfigureSessionMessage.java | 8 +++---- .../i2p/data/i2cp/RequestLeaseSetMessage.java | 8 +++---- .../src/net/i2p/data/i2cp/SessionConfig.java | 4 ++-- .../java/src/net/i2p/data/i2cp/SessionId.java | 8 +++---- .../src/net/i2p/data/i2cp/SetDateMessage.java | 6 ++--- 15 files changed, 63 insertions(+), 61 deletions(-) diff --git a/core/java/src/net/i2p/data/i2cp/AbuseReason.java b/core/java/src/net/i2p/data/i2cp/AbuseReason.java index f631fa591..99388faf2 100644 --- a/core/java/src/net/i2p/data/i2cp/AbuseReason.java +++ b/core/java/src/net/i2p/data/i2cp/AbuseReason.java @@ -49,16 +49,16 @@ public class AbuseReason extends DataStructureImpl { @Override public boolean equals(Object object) { if ((object == null) || !(object instanceof AbuseReason)) return false; - return DataHelper.eq(getReason(), ((AbuseReason) object).getReason()); + return DataHelper.eq(_reason, ((AbuseReason) object).getReason()); } @Override public int hashCode() { - return DataHelper.hashCode(getReason()); + return DataHelper.hashCode(_reason); } @Override public String toString() { - return "[AbuseReason: " + getReason() + "]"; + return "[AbuseReason: " + _reason + "]"; } } diff --git a/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java b/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java index 69cba7d24..bc3b9bbc9 100644 --- a/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java +++ b/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java @@ -28,7 +28,7 @@ public class AbuseSeverity extends DataStructureImpl { private int _severityId; public AbuseSeverity() { - setSeverity(-1); + _severityId = -1; } public int getSeverity() { @@ -56,11 +56,11 @@ public class AbuseSeverity extends DataStructureImpl { @Override public int hashCode() { - return getSeverity(); + return _severityId; } @Override public String toString() { - return "[AbuseSeverity: " + getSeverity() + "]"; + return "[AbuseSeverity: " + _severityId + "]"; } } diff --git a/core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java b/core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java index 1b8004ce0..8590a554c 100644 --- a/core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java @@ -27,11 +27,11 @@ public class CreateSessionMessage extends I2CPMessageImpl { private SessionConfig _sessionConfig; public CreateSessionMessage(SessionConfig config) { - setSessionConfig(config); + _sessionConfig = config; } public CreateSessionMessage() { - setSessionConfig(new SessionConfig()); + _sessionConfig = new SessionConfig(); } public SessionConfig getSessionConfig() { @@ -75,7 +75,7 @@ public class CreateSessionMessage extends I2CPMessageImpl { public boolean equals(Object object) { if ((object != null) && (object instanceof CreateSessionMessage)) { CreateSessionMessage msg = (CreateSessionMessage) object; - return DataHelper.eq(getSessionConfig(), msg.getSessionConfig()); + return DataHelper.eq(_sessionConfig, msg.getSessionConfig()); } return false; @@ -85,7 +85,7 @@ public class CreateSessionMessage extends I2CPMessageImpl { public String toString() { StringBuilder buf = new StringBuilder(); buf.append("[CreateSessionMessage: "); - buf.append("\n\tConfig: ").append(getSessionConfig()); + buf.append("\n\tConfig: ").append(_sessionConfig); buf.append("]"); return buf.toString(); } diff --git a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java index 8b4db852f..edb07ae41 100644 --- a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java @@ -69,7 +69,7 @@ public class DestroySessionMessage extends I2CPMessageImpl { public boolean equals(Object object) { if ((object != null) && (object instanceof DestroySessionMessage)) { DestroySessionMessage msg = (DestroySessionMessage) object; - return DataHelper.eq(getSessionId(), msg.getSessionId()); + return DataHelper.eq(_sessionId, msg.getSessionId()); } return false; @@ -86,7 +86,7 @@ public class DestroySessionMessage extends I2CPMessageImpl { public String toString() { StringBuilder buf = new StringBuilder(); buf.append("[DestroySessionMessage: "); - buf.append("\n\tSessionId: ").append(getSessionId()); + buf.append("\n\tSessionId: ").append(_sessionId); buf.append("]"); return buf.toString(); } diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java index 739f7823e..aaa35427b 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java +++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageHandler.java @@ -41,7 +41,7 @@ public class I2CPMessageHandler { try { if (length < 0) throw new I2CPMessageException("Invalid message length specified"); int type = (int) DataHelper.readLong(in, 1); - I2CPMessage msg = createMessage(in, length, type); + I2CPMessage msg = createMessage(type); msg.readMessage(in, length, type); return msg; } catch (DataFormatException dfe) { @@ -53,8 +53,8 @@ public class I2CPMessageHandler { * Yes, this is fairly ugly, but its the only place it ever happens. * */ - private static I2CPMessage createMessage(InputStream in, int length, int type) throws IOException, - I2CPMessageException { + private static I2CPMessage createMessage(int type) throws IOException, + I2CPMessageException { switch (type) { case CreateLeaseSetMessage.MESSAGE_TYPE: return new CreateLeaseSetMessage(); @@ -101,6 +101,7 @@ public class I2CPMessageHandler { } } +/*** public static void main(String args[]) { try { I2CPMessage msg = readMessage(new FileInputStream(args[0])); @@ -109,4 +110,5 @@ public class I2CPMessageHandler { e.printStackTrace(); } } +***/ } diff --git a/core/java/src/net/i2p/data/i2cp/MessageId.java b/core/java/src/net/i2p/data/i2cp/MessageId.java index d1db73761..365dc6dbb 100644 --- a/core/java/src/net/i2p/data/i2cp/MessageId.java +++ b/core/java/src/net/i2p/data/i2cp/MessageId.java @@ -27,10 +27,10 @@ public class MessageId extends DataStructureImpl { private long _messageId; public MessageId() { - setMessageId(-1); + _messageId = -1; } public MessageId(long id) { - setMessageId(id); + _messageId = id; } public long getMessageId() { @@ -58,11 +58,11 @@ public class MessageId extends DataStructureImpl { @Override public int hashCode() { - return (int)getMessageId(); + return (int)_messageId; } @Override public String toString() { - return "[MessageId: " + getMessageId() + "]"; + return "[MessageId: " + _messageId + "]"; } } diff --git a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java index f06fe86f3..d9739ee58 100644 --- a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java @@ -29,8 +29,8 @@ public class MessagePayloadMessage extends I2CPMessageImpl { private Payload _payload; public MessagePayloadMessage() { - setSessionId(-1); - setMessageId(-1); + _sessionId = -1; + _messageId = -1; } public long getSessionId() { @@ -113,7 +113,7 @@ public class MessagePayloadMessage extends I2CPMessageImpl { MessagePayloadMessage msg = (MessagePayloadMessage) object; return _sessionId == msg.getSessionId() && _messageId == msg.getMessageId() - && DataHelper.eq(getPayload(), msg.getPayload()); + && DataHelper.eq(_payload, msg.getPayload()); } return false; @@ -123,9 +123,9 @@ public class MessagePayloadMessage extends I2CPMessageImpl { public String toString() { StringBuilder buf = new StringBuilder(); buf.append("[MessagePayloadMessage: "); - buf.append("\n\tSessionId: ").append(getSessionId()); - buf.append("\n\tMessageId: ").append(getMessageId()); - buf.append("\n\tPayload: ").append(getPayload()); + buf.append("\n\tSessionId: ").append(_sessionId); + buf.append("\n\tMessageId: ").append(_messageId); + buf.append("\n\tPayload: ").append(_payload); buf.append("]"); return buf.toString(); } diff --git a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java index 67fde8134..933a80785 100644 --- a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java @@ -32,17 +32,19 @@ public class MessageStatusMessage extends I2CPMessageImpl { public final static int STATUS_AVAILABLE = 0; public final static int STATUS_SEND_ACCEPTED = 1; + /** unused */ public final static int STATUS_SEND_BEST_EFFORT_SUCCESS = 2; + /** unused */ public final static int STATUS_SEND_BEST_EFFORT_FAILURE = 3; public final static int STATUS_SEND_GUARANTEED_SUCCESS = 4; public final static int STATUS_SEND_GUARANTEED_FAILURE = 5; public MessageStatusMessage() { - setSessionId(-1); - setStatus(-1); - setMessageId(-1); - setSize(-1); - setNonce(-1); + _sessionId = -1; + _status = -1; + _messageId = -1; + _size = -1; + _nonce = -1; } public long getSessionId() { @@ -169,11 +171,11 @@ public class MessageStatusMessage extends I2CPMessageImpl { public String toString() { StringBuilder buf = new StringBuilder(); buf.append("[MessageStatusMessage: "); - buf.append("\n\tSessionId: ").append(getSessionId()); - buf.append("\n\tNonce: ").append(getNonce()); - buf.append("\n\tMessageId: ").append(getMessageId()); - buf.append("\n\tStatus: ").append(getStatusString(getStatus())); - buf.append("\n\tSize: ").append(getSize()); + buf.append("\n\tSessionId: ").append(_sessionId); + buf.append("\n\tNonce: ").append(_nonce); + buf.append("\n\tMessageId: ").append(_messageId); + buf.append("\n\tStatus: ").append(getStatusString(_status)); + buf.append("\n\tSize: ").append(_size); buf.append("]"); return buf.toString(); } diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java index 6ad5e2745..15bd6779d 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java @@ -28,8 +28,8 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl { private long _messageId; public ReceiveMessageBeginMessage() { - setSessionId(-1); - setMessageId(-1); + _sessionId = -1; + _messageId = -1; } public long getSessionId() { @@ -103,8 +103,8 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl { public String toString() { StringBuilder buf = new StringBuilder(); buf.append("[ReceiveMessageBeginMessage: "); - buf.append("\n\tSessionId: ").append(getSessionId()); - buf.append("\n\tMessageId: ").append(getMessageId()); + buf.append("\n\tSessionId: ").append(_sessionId); + buf.append("\n\tMessageId: ").append(_messageId); buf.append("]"); return buf.toString(); } diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java index 79cf88382..718fd8b73 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java @@ -27,8 +27,8 @@ public class ReceiveMessageEndMessage extends I2CPMessageImpl { private long _messageId; public ReceiveMessageEndMessage() { - setSessionId(-1); - setMessageId(-1); + _sessionId = -1; + _messageId = -1; } public long getSessionId() { @@ -87,8 +87,8 @@ public class ReceiveMessageEndMessage extends I2CPMessageImpl { public String toString() { StringBuilder buf = new StringBuilder(); buf.append("[ReceiveMessageEndMessage: "); - buf.append("\n\tSessionId: ").append(getSessionId()); - buf.append("\n\tMessageId: ").append(getMessageId()); + buf.append("\n\tSessionId: ").append(_sessionId); + buf.append("\n\tMessageId: ").append(_messageId); buf.append("]"); return buf.toString(); } diff --git a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java index 9400091be..336fb3ed5 100644 --- a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java @@ -81,8 +81,8 @@ public class ReconfigureSessionMessage extends I2CPMessageImpl { public boolean equals(Object object) { if ((object != null) && (object instanceof ReconfigureSessionMessage)) { ReconfigureSessionMessage msg = (ReconfigureSessionMessage) object; - return DataHelper.eq(getSessionId(), msg.getSessionId()) - && DataHelper.eq(getSessionConfig(), msg.getSessionConfig()); + return DataHelper.eq(_sessionId, msg.getSessionId()) + && DataHelper.eq(_sessionConfig, msg.getSessionConfig()); } return false; @@ -92,8 +92,8 @@ public class ReconfigureSessionMessage extends I2CPMessageImpl { public String toString() { StringBuilder buf = new StringBuilder(); buf.append("[ReconfigureSessionMessage: "); - buf.append("\n\tSessionId: ").append(getSessionId()); - buf.append("\n\tSessionConfig: ").append(getSessionConfig()); + buf.append("\n\tSessionId: ").append(_sessionId); + buf.append("\n\tSessionConfig: ").append(_sessionConfig); buf.append("]"); return buf.toString(); } diff --git a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java index ef877afe5..32241e833 100644 --- a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java @@ -30,7 +30,7 @@ import net.i2p.data.TunnelId; public class RequestLeaseSetMessage extends I2CPMessageImpl { public final static int MESSAGE_TYPE = 21; private SessionId _sessionId; - private List _endpoints; + private List _endpoints; private Date _end; public RequestLeaseSetMessage() { @@ -51,12 +51,12 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl { public Hash getRouter(int endpoint) { if ((endpoint < 0) || (_endpoints.size() < endpoint)) return null; - return ((TunnelEndpoint) _endpoints.get(endpoint)).getRouter(); + return _endpoints.get(endpoint).getRouter(); } public TunnelId getTunnelId(int endpoint) { if ((endpoint < 0) || (_endpoints.size() < endpoint)) return null; - return ((TunnelEndpoint) _endpoints.get(endpoint)).getTunnelId(); + return _endpoints.get(endpoint).getTunnelId(); } /** @deprecated unused - presumably he meant remove? */ @@ -159,8 +159,6 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl { private TunnelId _tunnelId; public TunnelEndpoint() { - _router = null; - _tunnelId = null; } public TunnelEndpoint(Hash router, TunnelId id) { diff --git a/core/java/src/net/i2p/data/i2cp/SessionConfig.java b/core/java/src/net/i2p/data/i2cp/SessionConfig.java index b96918a45..6534e0dbb 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionConfig.java +++ b/core/java/src/net/i2p/data/i2cp/SessionConfig.java @@ -168,8 +168,8 @@ public class SessionConfig extends DataStructureImpl { ByteArrayOutputStream out = new ByteArrayOutputStream(); try { - _log.debug("PubKey size for destination: " + _destination.getPublicKey().getData().length); - _log.debug("SigningKey size for destination: " + _destination.getSigningPublicKey().getData().length); + //_log.debug("PubKey size for destination: " + _destination.getPublicKey().getData().length); + //_log.debug("SigningKey size for destination: " + _destination.getSigningPublicKey().getData().length); _destination.writeBytes(out); DataHelper.writeProperties(out, _options, true); // UTF-8 DataHelper.writeDate(out, _creationDate); diff --git a/core/java/src/net/i2p/data/i2cp/SessionId.java b/core/java/src/net/i2p/data/i2cp/SessionId.java index f79589c42..708ba9c46 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionId.java +++ b/core/java/src/net/i2p/data/i2cp/SessionId.java @@ -26,7 +26,7 @@ public class SessionId extends DataStructureImpl { private int _sessionId; public SessionId() { - setSessionId(-1); + _sessionId = -1; } public int getSessionId() { @@ -49,16 +49,16 @@ public class SessionId extends DataStructureImpl { @Override public boolean equals(Object obj) { if ((obj == null) || !(obj instanceof SessionId)) return false; - return getSessionId() == ((SessionId) obj).getSessionId(); + return _sessionId == ((SessionId) obj).getSessionId(); } @Override public int hashCode() { - return getSessionId(); + return _sessionId; } @Override public String toString() { - return "[SessionId: " + getSessionId() + "]"; + return "[SessionId: " + _sessionId + "]"; } } diff --git a/core/java/src/net/i2p/data/i2cp/SetDateMessage.java b/core/java/src/net/i2p/data/i2cp/SetDateMessage.java index f0abce1a5..9f6633b6d 100644 --- a/core/java/src/net/i2p/data/i2cp/SetDateMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SetDateMessage.java @@ -28,7 +28,7 @@ public class SetDateMessage extends I2CPMessageImpl { public SetDateMessage() { super(); - setDate(new Date(Clock.getInstance().now())); + _date = new Date(Clock.getInstance().now()); } public Date getDate() { @@ -70,7 +70,7 @@ public class SetDateMessage extends I2CPMessageImpl { public boolean equals(Object object) { if ((object != null) && (object instanceof SetDateMessage)) { SetDateMessage msg = (SetDateMessage) object; - return DataHelper.eq(getDate(), msg.getDate()); + return DataHelper.eq(_date, msg.getDate()); } return false; @@ -80,7 +80,7 @@ public class SetDateMessage extends I2CPMessageImpl { public String toString() { StringBuilder buf = new StringBuilder(); buf.append("[SetDateMessage"); - buf.append("\n\tDate: ").append(getDate()); + buf.append("\n\tDate: ").append(_date); buf.append("]"); return buf.toString(); }