You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/12/22 17:42:02 UTC
qpid-proton git commit: PROTON-973: fix javadoc errors when building
with Java 8
Repository: qpid-proton
Updated Branches:
refs/heads/master 12d2cd62c -> 213eef923
PROTON-973: fix javadoc errors when building with Java 8
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/213eef92
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/213eef92
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/213eef92
Branch: refs/heads/master
Commit: 213eef923523cfb75cb87c5a030816abf03849f3
Parents: 12d2cd6
Author: Robert Gemmell <ro...@apache.org>
Authored: Tue Dec 22 16:34:32 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Tue Dec 22 16:40:34 2015 +0000
----------------------------------------------------------------------
.../qpid/proton/jms/JMSMappingOutboundTransformer.java | 5 ++---
.../src/main/java/org/apache/qpid/proton/driver/Driver.java | 2 +-
.../src/main/java/org/apache/qpid/proton/engine/Event.java | 3 +--
.../org/apache/qpid/proton/engine/ExtendableAccessor.java | 2 +-
.../src/main/java/org/apache/qpid/proton/engine/Sasl.java | 6 +++---
.../src/main/java/org/apache/qpid/proton/engine/Sender.java | 2 +-
.../main/java/org/apache/qpid/proton/engine/SslDomain.java | 2 +-
.../main/java/org/apache/qpid/proton/engine/Transport.java | 8 ++++----
.../org/apache/qpid/proton/engine/impl/ByteBufferUtils.java | 6 +++---
.../org/apache/qpid/proton/engine/impl/ConnectionImpl.java | 2 +-
.../org/apache/qpid/proton/engine/impl/FrameHandler.java | 2 +-
.../org/apache/qpid/proton/engine/impl/TransportImpl.java | 8 ++++----
.../qpid/proton/engine/impl/ssl/ProtonSslEngineProvider.java | 2 +-
.../apache/qpid/proton/engine/impl/ssl/SslDomainImpl.java | 2 +-
.../java/org/apache/qpid/proton/engine/impl/ssl/SslImpl.java | 6 +++---
.../qpid/proton/engine/impl/ssl/SslPeerDetailsImpl.java | 2 +-
.../main/java/org/apache/qpid/proton/message/Message.java | 2 +-
.../org/apache/qpid/proton/message/impl/MessageImpl.java | 5 +++--
.../org/apache/qpid/proton/messenger/impl/MessengerImpl.java | 4 ++--
19 files changed, 35 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
----------------------------------------------------------------------
diff --git a/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java b/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
index ba91f0a..af27a77 100644
--- a/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
+++ b/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
@@ -80,9 +80,8 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
* Perform the conversion between JMS Message and Proton Message without re-encoding it to array.
* This is needed because some frameworks may elect to do this on their own way (Netty for instance using Nettybuffers)
*
- * @param msg
- * @return
- * @throws Exception
+ * @param msg the supplied JMS Message
+ * @return the converted Proton Message
*/
public ProtonJMessage convert(Message msg)
throws JMSException, UnsupportedEncodingException {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/driver/Driver.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/driver/Driver.java b/proton-j/src/main/java/org/apache/qpid/proton/driver/Driver.java
index 2564f05..dd00fc5 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/driver/Driver.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/driver/Driver.java
@@ -67,7 +67,7 @@ public interface Driver
*
* @param timeout maximum time in milliseconds to wait. -1 means wait indefinitely.
*
- * @param returns true if woken up
+ * @return true if woken up
*/
boolean doWait(long timeout);
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java
index 1fd2f4c..5930d2c 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java
@@ -145,8 +145,7 @@ public interface Event extends Extendable
* this method explicitly to be able to do more processing after all child
* handlers have already processed the event. If handler does not invoke
* this method it is invoked implicitly by {@link #dispatch(Handler)}
- *
- * @param handler
+ *
* @throws HandlerException
*/
void delegate() throws HandlerException;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/ExtendableAccessor.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/ExtendableAccessor.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/ExtendableAccessor.java
index c30b48e..d2eee03 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/ExtendableAccessor.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/ExtendableAccessor.java
@@ -27,7 +27,7 @@ package org.apache.qpid.proton.engine;
* so it's best instantiated as a static final member.
* <pre><code>
* class Foo extends BaseHandler {
- * private static ExtendableAccessor<Link, Bar> LINK_BAR = new ExtendableAccessor<>(Bar.class);
+ * private static ExtendableAccessor<Link, Bar> LINK_BAR = new ExtendableAccessor<>(Bar.class);
* void onLinkRemoteOpen(Event e) {
* Bar bar = LINK_BAR.get(e.getLink());
* if (bar == null) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/Sasl.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/Sasl.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/Sasl.java
index 16043b9..08929e8 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/Sasl.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/Sasl.java
@@ -126,7 +126,7 @@ public interface Sasl
* @param bytes written with up to size bytes of inbound data.
* @param offset the offset in the array to begin writing at
* @param size maximum number of bytes that bytes can accept.
- * @return The number of bytes written to bytes, or an error code if < 0.
+ * @return The number of bytes written to bytes, or an error code if {@literal < 0}.
*/
int recv(byte[] bytes, int offset, int size);
@@ -136,7 +136,7 @@ public interface Sasl
* @param bytes The challenge/response data.
* @param offset the point within the array at which the data starts at
* @param size The number of data octets in bytes.
- * @return The number of octets read from bytes, or an error code if < 0
+ * @return The number of octets read from bytes, or an error code if {@literal < 0}
*/
int send(byte[] bytes, int offset, int size);
@@ -146,7 +146,7 @@ public interface Sasl
*
* Used by the server to set the result of the negotiation process.
*
- * @todo
+ * @param outcome the outcome of the SASL negotiation
*/
void done(SaslOutcome outcome);
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/Sender.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/Sender.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/Sender.java
index c0ed5aa..b4a61c6 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/Sender.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/Sender.java
@@ -32,8 +32,8 @@ public interface Sender extends Link
* indicates pending deliveries
*
* @param credits the number of pending deliveries
- * @todo is this absolute or cumulative?
*/
+ //TODO is this absolute or cumulative?
public void offer(int credits);
/**
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/SslDomain.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/SslDomain.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/SslDomain.java
index a908824..24b101c 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/SslDomain.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/SslDomain.java
@@ -123,7 +123,7 @@ public interface SslDomain
* In order to verify a peer, a trusted CA must be configured. See
* {@link #setTrustedCaDb(String)}.
*
- * @note Servers must provide their own certificate when verifying a peer. See
+ * NOTE: Servers must provide their own certificate when verifying a peer. See
* {@link #setCredentials(String, String, String)}).
*
* @param mode the level of validation to apply to the peer
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/Transport.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/Transport.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/Transport.java
index 0d8539f..a776970 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/Transport.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/Transport.java
@@ -38,31 +38,31 @@ import org.apache.qpid.proton.engine.impl.TransportImpl;
* </p>
* <p>
* <strong>Processing the input data received from another AMQP container.</strong>
+ * </p>
* <ol>
* <li>{@link #getInputBuffer()} </li>
* <li>Write data into input buffer</li>
* <li>{@link #processInput()}</li>
* <li>Check the result, e.g. by calling {@link TransportResult#checkIsOk()}</li>
* </ol>
- * </p>
* <p>
* <strong>Getting the output data to send to another AMQP container:</strong>
+ * </p>
* <ol>
* <li>{@link #getOutputBuffer()} </li>
* <li>Read output from output buffer</li>
* <li>{@link #outputConsumed()}</li>
* </ol>
- * </p>
*
* <p>The following methods on the byte buffers returned by {@link #getInputBuffer()} and {@link #getOutputBuffer()}
* must not be called:
+ * </p>
* <ol>
* <li> {@link ByteBuffer#clear()} </li>
* <li> {@link ByteBuffer#compact()} </li>
* <li> {@link ByteBuffer#flip()} </li>
* <li> {@link ByteBuffer#mark()} </li>
* </ol>
- * </p>
*/
public interface Transport extends Endpoint
{
@@ -226,7 +226,7 @@ public interface Transport extends Endpoint
/**
*
- * @param local idle timeout in milliseconds
+ * @param timeout local idle timeout in milliseconds
*/
void setIdleTimeout(int timeout);
/**
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ByteBufferUtils.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ByteBufferUtils.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ByteBufferUtils.java
index 2e34101..8616bee 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ByteBufferUtils.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ByteBufferUtils.java
@@ -42,7 +42,7 @@ public class ByteBufferUtils
/**
* Assumes {@code destination} is ready to be written.
*
- * @returns number of bytes poured which may be fewer than {@code sizeRequested} if
+ * @return number of bytes poured which may be fewer than {@code sizeRequested} if
* {@code destination} has insufficient remaining
*/
public static int pourArrayToBuffer(byte[] source, int offset, int sizeRequested, ByteBuffer destination)
@@ -54,7 +54,7 @@ public class ByteBufferUtils
/**
* Pours the contents of {@code source} into {@code destinationTransportInput}, calling
- * the TransportInput many times if necessary. If the TransportInput returns a {@link TransportResult}
+ * the TransportInput many times if necessary. If the TransportInput returns a {@link org.apache.qpid.proton.engine.TransportResult}
* other than ok, data may remain in source.
*/
public static int pourAll(ByteBuffer source, TransportInput destinationTransportInput) throws TransportException
@@ -84,7 +84,7 @@ public class ByteBufferUtils
/**
* Assumes {@code source} is ready to be read.
*
- * @returns number of bytes poured which may be fewer than {@code sizeRequested} if
+ * @return number of bytes poured which may be fewer than {@code sizeRequested} if
* {@code source} has insufficient remaining
*/
public static int pourBufferToArray(ByteBuffer source, byte[] destination, int offset, int sizeRequested)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
index e018d14..8b2cb49 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
@@ -79,7 +79,7 @@ public class ConnectionImpl extends EndpointImpl implements ProtonJConnection
/**
* @deprecated This constructor's visibility will be reduced to the default scope in a future release.
- * Client code outside this module should use a {@link EngineFactory} instead
+ * Client code outside this module should use {@link org.apache.qpid.proton.engine.Connection.Factory#create()} instead.
*/
@Deprecated public ConnectionImpl()
{
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameHandler.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameHandler.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameHandler.java
index 542466a..dfbb201 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameHandler.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameHandler.java
@@ -28,7 +28,7 @@ public interface FrameHandler
/**
* @throws IllegalStateException if I am not currently accepting input
* @see #isHandlingFrames()
- * @returns false on end of stream
+ * @return false on end of stream
*/
boolean handleFrame(TransportFrame frame);
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
index a98a6f1..03d4fb7 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
@@ -139,7 +139,7 @@ public class TransportImpl extends EndpointImpl
/**
* @deprecated This constructor's visibility will be reduced to the default scope in a future release.
- * Client code outside this module should use a {@link EngineFactory} instead
+ * Client code outside this module should use {@link org.apache.qpid.proton.engine.Transport.Factory#create()} instead
*/
@Deprecated public TransportImpl()
{
@@ -288,7 +288,7 @@ public class TransportImpl extends EndpointImpl
/**
* This method is public as it is used by Python layer.
- * @see Transport#input(byte[], int, int)
+ * @see org.apache.qpid.proton.engine.Transport#input(byte[], int, int)
*/
public TransportResult oldApiCheckStateBeforeInput(int inputLength)
{
@@ -361,8 +361,8 @@ public class TransportImpl extends EndpointImpl
/**
* {@inheritDoc}
*
- * <p>Note that sslDomain must implement {@link ProtonSslEngineProvider}. This is not possible
- * enforce at the API level because {@link ProtonSslEngineProvider} is not part of the
+ * <p>Note that sslDomain must implement {@link org.apache.qpid.proton.engine.impl.ssl.ProtonSslEngineProvider}.
+ * This is not possible enforce at the API level because {@link org.apache.qpid.proton.engine.impl.ssl.ProtonSslEngineProvider} is not part of the
* public Proton API.</p>
*/
@Override
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/ProtonSslEngineProvider.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/ProtonSslEngineProvider.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/ProtonSslEngineProvider.java
index 2f9a4fd..95ae337 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/ProtonSslEngineProvider.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/ProtonSslEngineProvider.java
@@ -25,7 +25,7 @@ public interface ProtonSslEngineProvider
/**
* Returns an SSL engine.
*
- * @param sslPeerDetails the details of the remote peer. If non-null, may be used to assist SSL session resumption.
+ * @param peerDetails the details of the remote peer. If non-null, may be used to assist SSL session resumption.
*/
public ProtonSslEngine createSslEngine(SslPeerDetails peerDetails);
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslDomainImpl.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslDomainImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslDomainImpl.java
index fbcb0f5..583e3ca 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslDomainImpl.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslDomainImpl.java
@@ -37,7 +37,7 @@ public class SslDomainImpl implements SslDomain, ProtonSslEngineProvider, Proton
/**
* @deprecated This constructor's visibility will be reduced to the default scope in a future release.
- * Client code outside this module should use a {@link EngineFactory} instead
+ * Client code outside this module should use {@link SslDomain.Factory#create()} instead.
*/
@Deprecated public SslDomainImpl()
{
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslImpl.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslImpl.java
index 02615cb..f726ff9 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslImpl.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslImpl.java
@@ -44,9 +44,9 @@ public class SslImpl implements Ssl
private TransportException _initException;
/**
- * @param sslDomain must implement {@link ProtonSslEngineProvider}. This is not possible
- * enforce at the API level because {@link ProtonSslEngineProvider} is not part of the
- * public Proton API.</p>
+ * @param domain must implement {@link org.apache.qpid.proton.engine.impl.ssl.ProtonSslEngineProvider}. This is not possible
+ * enforce at the API level because {@link org.apache.qpid.proton.engine.impl.ssl.ProtonSslEngineProvider} is not part of the
+ * public Proton API.
*/
public SslImpl(SslDomain domain, SslPeerDetails peerDetails)
{
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslPeerDetailsImpl.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslPeerDetailsImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslPeerDetailsImpl.java
index 87a9fe3..cbd9755 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslPeerDetailsImpl.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslPeerDetailsImpl.java
@@ -28,7 +28,7 @@ public class SslPeerDetailsImpl implements ProtonJSslPeerDetails
/**
* @deprecated This constructor's visibility will be reduced to the default scope in a future release.
- * Client code outside this module should use a {@link EngineFactory} instead
+ * Client code outside this module should use {@link org.apache.qpid.proton.engine.SslPeerDetails.Factory#create(String, int)} instead.
*/
@Deprecated public SslPeerDetailsImpl(String hostname, int port)
{
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/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 4bb8fee..41945fa 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
@@ -33,7 +33,7 @@ import org.apache.qpid.proton.message.impl.MessageImpl;
/**
* Represents a Message within Proton.
*
- * Create instances of Message using a {@link MessageFactory} implementation.
+ * Create instances of Message using {@link Message.Factory}.
*
*/
public interface Message
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/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 6055973..b0204f3 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
@@ -57,7 +57,7 @@ public class MessageImpl implements ProtonJMessage
/**
* @deprecated This constructor's visibility will be reduced to the default scope in a future release.
- * Client code outside this module should use a {@link MessageFactory} instead
+ * Client code outside this module should use {@link Message.Factory#create()} instead
*/
@Deprecated public MessageImpl()
{
@@ -65,7 +65,8 @@ public class MessageImpl implements ProtonJMessage
/**
* @deprecated This constructor's visibility will be reduced to the default scope in a future release.
- * Client code outside this module should use a {@link MessageFactory} instead
+ * Client code outside this module should instead use
+ * {@link Message.Factory#create(Header, DeliveryAnnotations, MessageAnnotations, Properties, ApplicationProperties, Section, Footer)}
*/
@Deprecated public MessageImpl(Header header, DeliveryAnnotations deliveryAnnotations, MessageAnnotations messageAnnotations,
Properties properties, ApplicationProperties applicationProperties, Section body, Footer footer)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/213eef92/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
index 90f396c..b1e48d8 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
@@ -104,7 +104,7 @@ public class MessengerImpl implements Messenger
/**
* @deprecated This constructor's visibility will be reduced to the default scope in a future release.
- * Client code outside this module should use a {@link MessengerFactory} instead
+ * Client code outside this module should use {@link Messenger.Factory#create()} instead
*/
@Deprecated public MessengerImpl()
{
@@ -113,7 +113,7 @@ public class MessengerImpl implements Messenger
/**
* @deprecated This constructor's visibility will be reduced to the default scope in a future release.
- * Client code outside this module should use a {@link MessengerFactory} instead
+ * Client code outside this module should use a {@link Messenger.Factory#create(String)} instead
*/
@Deprecated public MessengerImpl(String name)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org