fix yet more javadoc errors when using running release profile using Java 8
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/2a960c5c Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/2a960c5c Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/2a960c5c Branch: refs/heads/master Commit: 2a960c5c9bf07a90234b41feab1156003e71b3f4 Parents: 3a26fcc Author: Robert Gemmell <[email protected]> Authored: Wed Feb 25 11:58:08 2015 +0000 Committer: Robert Gemmell <[email protected]> Committed: Wed Feb 25 12:09:34 2015 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/qpid/jms/JmsQueueSession.java | 3 +-- .../src/main/java/org/apache/qpid/jms/JmsSession.java | 2 +- .../src/main/java/org/apache/qpid/jms/JmsTopicPublisher.java | 2 +- .../apache/qpid/jms/message/JmsMessagePropertyIntercepter.java | 4 ++-- .../org/apache/qpid/jms/provider/amqp/AmqpProviderFactory.java | 2 +- .../amqp/message/AmqpJmsMessagePropertyIntercepter.java | 4 ++-- .../src/main/java/org/apache/qpid/jms/sasl/Mechanism.java | 4 ++-- .../apache/qpid/jms/selector/filter/ConstantExpression.java | 2 +- .../main/java/org/apache/qpid/jms/util/InetAddressUtil.java | 4 ++-- .../src/main/java/org/apache/qpid/jms/util/StopWatch.java | 2 +- .../main/java/org/apache/qpid/jms/util/ThreadPoolUtils.java | 6 +++--- .../src/main/java/org/apache/qpid/jms/util/URISupport.java | 4 ++-- 12 files changed, 19 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2a960c5c/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSession.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSession.java index 5bff105..ed7ad1d 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSession.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSession.java @@ -97,13 +97,12 @@ public class JmsQueueSession extends JmsSession { * @param messageSelector * @param noLocal * @return the durable TopicSubscriber - * @throws IllegalStateException * @throws JMSException * @see javax.jms.Session#createDurableSubscriber(javax.jms.Topic, * java.lang.String, java.lang.String, boolean) */ @Override - public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) throws IllegalStateException { + public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException { throw new IllegalStateException("Operation not supported by a QueueSession"); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2a960c5c/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java index 0780b26..9da95af 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java @@ -284,7 +284,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa /** * @param destination * @param messageSelector - * @param NoLocal + * @param noLocal * @return the MessageConsumer * @throws JMSException * @see javax.jms.Session#createConsumer(javax.jms.Destination, http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2a960c5c/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicPublisher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicPublisher.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicPublisher.java index 47d5088..a68ff00 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicPublisher.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicPublisher.java @@ -32,7 +32,7 @@ public class JmsTopicPublisher extends JmsMessageProducer implements TopicPublis /** * Constructor * - * @param s + * @param session * @param destination */ protected JmsTopicPublisher(JmsProducerId id, JmsSession session, JmsDestination destination) throws JMSException { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2a960c5c/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java index aeef09b..4b7da1d 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java @@ -609,7 +609,7 @@ public class JmsMessagePropertyIntercepter { * @param message * the JmsMessageFacade instance to read property names from. * - * @return a Set<String> containing the names of all intercepted properties. + * @return a {@code Set<String>} containing the names of all intercepted properties. * * @throws JMSException if an error occurs while gathering the message property names. */ @@ -631,7 +631,7 @@ public class JmsMessagePropertyIntercepter { * @param excludeStandardJMSHeaders * whether the standard JMS header names should be excluded from the returned set * - * @return a Set<String> containing the names of all intercepted properties with a value. + * @return a {@code Set<String>} containing the names of all intercepted properties with a value. * * @throws JMSException if an error occurs while gathering the message property names. */ http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2a960c5c/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactory.java index 42e6300..2013ae3 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProviderFactory.java @@ -70,7 +70,7 @@ public class AmqpProviderFactory extends ProviderFactory { } /** - * @param transport + * @param transportType * the transport type name to use when creating a new provider. */ public void setTransportType(String transportType) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2a960c5c/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java index df87a76..35c5af5 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java @@ -266,7 +266,7 @@ public class AmqpJmsMessagePropertyIntercepter { * For each of the currently configured message property intercepter instance a * string key value is inserted into an Set and returned. * - * @return a Set<String> containing the names of all intercepted properties. + * @return a {@code Set<String>} containing the names of all intercepted properties. */ public static Set<String> getAllPropertyNames() { return PROPERTY_INTERCEPTERS.keySet(); @@ -279,7 +279,7 @@ public class AmqpJmsMessagePropertyIntercepter { * manipulated by the receiver without impacting the facade, and an empty set * will be returned if there are no matching properties. * - * @return a Set<String> containing the names of all intercepted properties with a value. + * @return a {@code Set<String>} containing the names of all intercepted properties with a value. */ public static Set<String> getPropertyNames(AmqpJmsMessageFacade message) { Set<String> names = new HashSet<String>(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2a960c5c/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java index 78ea081..c178fb0 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java @@ -82,7 +82,7 @@ public interface Mechanism extends Comparable<Mechanism> { * @param username * The user name given. */ - void setUsername(String value); + void setUsername(String username); /** * Returns the configured user name value for this Mechanism. @@ -98,7 +98,7 @@ public interface Mechanism extends Comparable<Mechanism> { * @param username * The user name given. */ - void setPassword(String value); + void setPassword(String username); /** * Returns the configured password value for this Mechanism. http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2a960c5c/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ConstantExpression.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ConstantExpression.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ConstantExpression.java index 5175112..a270405 100755 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ConstantExpression.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ConstantExpression.java @@ -144,7 +144,7 @@ public class ConstantExpression implements Expression { * Encodes the value of string so that it looks like it would look like when * it was provided in a selector. * - * @param string + * @param s the original string * @return the encoded String */ public static String encodeString(String s) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2a960c5c/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/InetAddressUtil.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/InetAddressUtil.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/InetAddressUtil.java index 9513892..b97d665 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/InetAddressUtil.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/InetAddressUtil.java @@ -37,8 +37,8 @@ public class InetAddressUtil { * * @return The hostname * @throws UnknownHostException - * @see {@link java.net.InetAddress#getLocalHost()} - * @see {@link java.net.InetAddress#getHostName()} + * @see java.net.InetAddress#getLocalHost() + * @see java.net.InetAddress#getHostName() */ public static String getLocalHostName() throws UnknownHostException { try { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2a960c5c/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/StopWatch.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/StopWatch.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/StopWatch.java index 72c871d..12a429a 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/StopWatch.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/StopWatch.java @@ -18,7 +18,7 @@ package org.apache.qpid.jms.util; /** * A very simple stop watch. - * <p/> + * <p> * This implementation is not thread safe and can only time one task at any given time. */ public final class StopWatch { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2a960c5c/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ThreadPoolUtils.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ThreadPoolUtils.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ThreadPoolUtils.java index 4aca779..acf823d 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ThreadPoolUtils.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ThreadPoolUtils.java @@ -73,7 +73,7 @@ public final class ThreadPoolUtils { /** * Shutdown the given executor service graceful at first, and then aggressively if the await * termination timeout was hit. - * <p/> + * <p> * This implementation invokes the * {@link #shutdownGraceful(java.util.concurrent.ExecutorService, long)} with a timeout * value of {@link #DEFAULT_SHUTDOWN_AWAIT_TERMINATION} millis. @@ -85,7 +85,7 @@ public final class ThreadPoolUtils { /** * Shutdown the given executor service graceful at first, and then aggressively if the await * termination timeout was hit. - * <p/> + * <p> * Will try to perform an orderly shutdown by giving the running threads time to complete * tasks, before going more aggressively by doing a * {@link #shutdownNow(java.util.concurrent.ExecutorService)} which forces a shutdown. The @@ -153,7 +153,7 @@ public final class ThreadPoolUtils { /** * Awaits the termination of the thread pool. - * <p/> + * <p> * This implementation will log every 2nd second at INFO level that we are waiting, so the * end user can see we are not hanging in case it takes longer time to terminate the pool. * http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2a960c5c/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/URISupport.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/URISupport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/URISupport.java index e2aaaa0..1335398 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/URISupport.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/URISupport.java @@ -346,8 +346,8 @@ public class URISupport { * Given a URI parse and extract any URI query options and return them as a Key / Value * mapping. * - * This method differs from the {@link parseQuery} method in that it handles composite URI - * types and will extract the URI options from the outermost composite URI. + * This method handles composite URI types and will extract the URI options + * from the outermost composite URI. * * @param uri * The URI whose query should be extracted and processed. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
