cleanup CallbackInfo and mark deprecated Verbs
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd020e1f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd020e1f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd020e1f Branch: refs/heads/trunk Commit: dd020e1fd97019af4a2be66813071540b3d1be28 Parents: f81cc74 Author: Yuki Morishita <mor.y...@gmail.com> Authored: Wed Apr 4 16:26:21 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue May 8 12:41:01 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/net/CallbackInfo.java | 15 +++++++++------ .../org/apache/cassandra/net/MessagingService.java | 12 ++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd020e1f/src/java/org/apache/cassandra/net/CallbackInfo.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/CallbackInfo.java b/src/java/org/apache/cassandra/net/CallbackInfo.java index 1def33a..a5fc8ad 100644 --- a/src/java/org/apache/cassandra/net/CallbackInfo.java +++ b/src/java/org/apache/cassandra/net/CallbackInfo.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.cassandra.net; import java.net.InetAddress; @@ -35,12 +34,16 @@ public class CallbackInfo protected final MessageOut<?> sentMessage; protected final IVersionedSerializer<?> serializer; + /** + * Create CallbackInfo without sent message + * + * @param target target to send message + * @param callback + * @param serializer serializer to deserialize response message + */ public CallbackInfo(InetAddress target, IMessageCallback callback, IVersionedSerializer<?> serializer) { - this.target = target; - this.callback = callback; - this.serializer = serializer; - this.sentMessage = null; + this(target, callback, null, serializer); } public CallbackInfo(InetAddress target, IMessageCallback callback, MessageOut<?> sentMessage, IVersionedSerializer<?> serializer) http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd020e1f/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index 4f3b603..5fa4d31 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -87,27 +87,27 @@ public final class MessagingService implements MessagingServiceMBean public enum Verb { MUTATION, - BINARY, // Deprecated + @Deprecated BINARY, READ_REPAIR, READ, REQUEST_RESPONSE, // client-initiated reads and writes - STREAM_INITIATE, // Deprecated - STREAM_INITIATE_DONE, // Deprecated + @Deprecated STREAM_INITIATE, + @Deprecated STREAM_INITIATE_DONE, STREAM_REPLY, STREAM_REQUEST, RANGE_SLICE, BOOTSTRAP_TOKEN, TREE_REQUEST, TREE_RESPONSE, - JOIN, // Deprecated + @Deprecated JOIN, GOSSIP_DIGEST_SYN, GOSSIP_DIGEST_ACK, GOSSIP_DIGEST_ACK2, - DEFINITIONS_ANNOUNCE, // Deprecated + @Deprecated DEFINITIONS_ANNOUNCE, DEFINITIONS_UPDATE, TRUNCATE, SCHEMA_CHECK, - INDEX_SCAN, // Deprecated + @Deprecated INDEX_SCAN, REPLICATION_FINISHED, INTERNAL_RESPONSE, // responses to internal calls COUNTER_MUTATION,
