Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 30EFF177E4 for ; Tue, 14 Jul 2015 10:50:50 +0000 (UTC) Received: (qmail 19618 invoked by uid 500); 14 Jul 2015 10:50:50 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 19589 invoked by uid 500); 14 Jul 2015 10:50:50 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 19580 invoked by uid 99); 14 Jul 2015 10:50:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jul 2015 10:50:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BFA27DFC90; Tue, 14 Jul 2015 10:50:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robbie@apache.org To: commits@qpid.apache.org Message-Id: <0b8d202f8f29438cbe66bded9e251ab6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: qpid-proton git commit: PROTON-947: deprecate stale methods, to be removed after the imminent release Date: Tue, 14 Jul 2015 10:50:49 +0000 (UTC) Repository: qpid-proton Updated Branches: refs/heads/master b67a2a943 -> 3459aa239 PROTON-947: deprecate stale methods, to be removed after the imminent release Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/3459aa23 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/3459aa23 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/3459aa23 Branch: refs/heads/master Commit: 3459aa239252412d77a125d34d7dc51b65ed0201 Parents: b67a2a9 Author: Robert Gemmell Authored: Tue Jul 14 11:23:03 2015 +0100 Committer: Robert Gemmell Committed: Tue Jul 14 11:44:15 2015 +0100 ---------------------------------------------------------------------- .../org/apache/qpid/proton/message/Message.java | 18 ++++++++++++++---- .../apache/qpid/proton/message/MessageFormat.java | 4 +++- .../proton/message/MessageFormatException.java | 3 +++ .../proton/message/impl/AMQPMessageFormat.java | 4 +++- .../qpid/proton/message/impl/MessageImpl.java | 18 ++++++++++++++++++ 5 files changed, 41 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3459aa23/proton-j/src/main/java/org/apache/qpid/proton/message/Message.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message/Message.java b/proton-j/src/main/java/org/apache/qpid/proton/message/Message.java index aede34b..ffd5dc4 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/message/Message.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/message/Message.java @@ -182,8 +182,7 @@ public interface Message /** * Loads message body from the {@code data}. * - * TODO describe how the object is interpreted according to the MessageFormat. - * + * @deprecated This method will be removed in a future release. * @see #setMessageFormat(MessageFormat) */ void load(Object data); @@ -191,17 +190,28 @@ public interface Message /** * Return the message body in a format determined by {@link #getMessageFormat()}. * - * TODO describe the formatting process - * + * @deprecated This method will be removed in a future release. */ Object save(); + /** + * @deprecated This method will be removed in a future release. + */ String toAMQPFormat(Object value); + /** + * @deprecated This method will be removed in a future release. + */ Object parseAMQPFormat(String value); + /** + * @deprecated This method will be removed in a future release. + */ void setMessageFormat(MessageFormat format); + /** + * @deprecated This method will be removed in a future release. + */ MessageFormat getMessageFormat(); void clear(); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3459aa23/proton-j/src/main/java/org/apache/qpid/proton/message/MessageFormat.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message/MessageFormat.java b/proton-j/src/main/java/org/apache/qpid/proton/message/MessageFormat.java index ee369c7..6a3401c 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/message/MessageFormat.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/message/MessageFormat.java @@ -20,7 +20,9 @@ package org.apache.qpid.proton.message; * */ - +/** + * @deprecated This enum will be removed in a future release. + */ public enum MessageFormat { DATA, http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3459aa23/proton-j/src/main/java/org/apache/qpid/proton/message/MessageFormatException.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message/MessageFormatException.java b/proton-j/src/main/java/org/apache/qpid/proton/message/MessageFormatException.java index 230a3c6..59a9d00 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/message/MessageFormatException.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/message/MessageFormatException.java @@ -21,6 +21,9 @@ package org.apache.qpid.proton.message; +/** + * @deprecated This class will be removed in a future release. + */ public class MessageFormatException extends RuntimeException { public MessageFormatException(String message, CharSequence value) http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3459aa23/proton-j/src/main/java/org/apache/qpid/proton/message/impl/AMQPMessageFormat.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message/impl/AMQPMessageFormat.java b/proton-j/src/main/java/org/apache/qpid/proton/message/impl/AMQPMessageFormat.java index 90b7d93..18e9b6c 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/message/impl/AMQPMessageFormat.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/message/impl/AMQPMessageFormat.java @@ -30,7 +30,9 @@ import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.transport.Flow; import org.apache.qpid.proton.message.*; - +/** + * @deprecated This class will be removed in a future release. + */ class AMQPMessageFormat { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3459aa23/proton-j/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java index 9ea09a2..38feb38 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java @@ -748,6 +748,9 @@ public class MessageImpl implements ProtonJMessage return length - buffer.remaining(); } + /** + * @deprecated This method will be removed in a future release. + */ @Override public void load(Object data) { @@ -789,6 +792,9 @@ public class MessageImpl implements ProtonJMessage } + /** + * @deprecated This method will be removed in a future release. + */ @Override public Object save() { @@ -821,12 +827,18 @@ public class MessageImpl implements ProtonJMessage } } + /** + * @deprecated This method will be removed in a future release. + */ @Override public String toAMQPFormat(Object value) { return _parser.encode(value); } + /** + * @deprecated This method will be removed in a future release. + */ @Override public Object parseAMQPFormat(String value) { @@ -835,12 +847,18 @@ public class MessageImpl implements ProtonJMessage return obj; } + /** + * @deprecated This method will be removed in a future release. + */ @Override public void setMessageFormat(MessageFormat format) { _format = format; } + /** + * @deprecated This method will be removed in a future release. + */ @Override public MessageFormat getMessageFormat() { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org