[hornetq-commits] JBoss hornetq SVN: r12046 - in trunk: hornetq-core/src/main/java/org/hornetq/core/deployers and 10 other directories.

Author: borges Date: 2012-01-23 07:02:38 -0500 (Mon, 23 Jan 2012) New Revision: 12046 Modified: trunk/hornetq-commons/src/main/java/org/hornetq/utils/TypedProperties.java trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/DeploymentManager.java trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagingStore.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PageCache.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/LivePageCacheImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PagePositionImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java trunk/hornetq-core/src/main/java/org/hornetq/core/transaction/TransactionOperationAbstract.java trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQQueue.java trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQTemporaryQueue.java trunk/hornetq-jms/src/main/java/org/hornetq/jms/persistence/config/PersistedConnectionFactory.java Log: Non-public API javadoc fixes. Modified: trunk/hornetq-commons/src/main/java/org/hornetq/utils/TypedProperties.java =================================================================== --- trunk/hornetq-commons/src/main/java/org/hornetq/utils/TypedProperties.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-commons/src/main/java/org/hornetq/utils/TypedProperties.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -28,8 +28,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.PropertyConversionException; @@ -37,17 +37,14 @@ import org.hornetq.core.logging.Logger; /** - * * Property Value Conversion. * <p> - * This implementation follows section 3.5.4 of the <i>Java Message Service<i> - * specification (Version 1.1 April 12, 2002). + * This implementation follows section 3.5.4 of the <i>Java Message Service<i> specification + * (Version 1.1 April 12, 2002). * <p> * TODO - should have typed property getters and do conversions herein - * * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a> - * @see <i>Java Message Service<i> specification (Version 1.1 April 12, 2002), section 3.5.4. */ public class TypedProperties { @@ -138,7 +135,7 @@ checkCreateProperties(); doPutValue(key, value == null ? new NullValue() : new StringValue(value)); } - + public void putNullValue(final SimpleString key) { checkCreateProperties(); Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/DeploymentManager.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/DeploymentManager.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/DeploymentManager.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -24,17 +24,15 @@ { /** * registers a deployable object which will handle the deployment of URL's - * * @param deployer The deployable object - * @throws Exception . + * @throws Exception */ void registerDeployer(Deployer deployer) throws Exception; /** * unregisters a deployable object which will handle the deployment of URL's - * * @param deployer The deployable object - * @throws Exception . + * @throws Exception */ void unregisterDeployer(Deployer deployer) throws Exception; } Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -58,7 +58,7 @@ /** * deploy an element * @param node the element to deploy - * @throws Exception . + * @throws Exception */ @Override public void deploy(final Node node) throws Exception @@ -78,7 +78,7 @@ /** * Undeploys an element. * @param node the element to undeploy - * @throws Exception . + * @throws Exception */ @Override public void undeploy(final Node node) throws Exception Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -79,9 +79,8 @@ /** * deploy an element - * * @param node the element to deploy - * @throws Exception . + * @throws Exception */ @Override public void deploy(final Node node) throws Exception @@ -92,9 +91,8 @@ /** * undeploys an element - * * @param node the element to undeploy - * @throws Exception . + * @throws Exception */ @Override public void undeploy(final Node node) throws Exception Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagingStore.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagingStore.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagingStore.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -122,7 +122,8 @@ boolean lock(long timeout); /** - * Call this method using the same thread used by the last call of {@link PagingStore#lock()}. + * Call this method using the same thread used by the last call of {@link PagingStore#lock(long)} + * . */ void unlock(); Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PageCache.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PageCache.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PageCache.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -27,23 +27,22 @@ public interface PageCache extends SoftValueHashMap.ValueCache { Page getPage(); - + long getPageId(); int getNumberOfMessages(); - + void setMessages(PagedMessage[] messages); - + PagedMessage[] getMessages(); - + /** - * If this cache is still being updated - * @return + * @return whether this cache is still being updated */ boolean isLive(); /** - * + * * @param messageNumber The order of the message on the page * @return */ @@ -59,7 +58,7 @@ * You have to call this method within the same thread you called lock */ void unlock(); - + void close(); } Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/LivePageCacheImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/LivePageCacheImpl.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/LivePageCacheImpl.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -71,17 +71,13 @@ return page.getPageId(); } - /* (non-Javadoc) - * @see org.hornetq.core.paging.cursor.PageCache#getNumberOfMessages() - */ + @Override public synchronized int getNumberOfMessages() { return messages.size(); } - /* (non-Javadoc) - * @see org.hornetq.core.paging.cursor.PageCache#setMessages(org.hornetq.core.server.ServerMessage[]) - */ + @Override public synchronized void setMessages(PagedMessage[] messages) { // This method shouldn't be called on liveCache, but we will provide the implementation for it anyway @@ -91,9 +87,7 @@ } } - /* (non-Javadoc) - * @see org.hornetq.core.paging.cursor.PageCache#getMessage(int) - */ + @Override public synchronized PagedMessage getMessage(int messageNumber) { if (messageNumber < messages.size()) Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PagePositionImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PagePositionImpl.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PagePositionImpl.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -40,10 +40,6 @@ this.messageNr = messageNr; } - /** - * @param pageNr - * @param messageNr - */ public PagePositionImpl() { Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -693,17 +693,6 @@ } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - /** - * Depage one page-file, read it and send it to the pagingManager / postoffice - * @return - * @throws Exception - */ private final Queue<OurRunnable> onMemoryFreedRunnables = new ConcurrentLinkedQueue<OurRunnable>(); private class MemoryFreedRunnablesExecutor implements Runnable Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -36,7 +36,7 @@ /** * Return the default ClusterConnection to be used case it's not defined by the acceptor - * @return + * @return default connection */ ClusterConnection getDefaultConnection(); @@ -60,7 +60,7 @@ void destroyBridge(String name) throws Exception; /** - * @return + * @return description */ String describe(); } Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/transaction/TransactionOperationAbstract.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/transaction/TransactionOperationAbstract.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/transaction/TransactionOperationAbstract.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -65,17 +65,15 @@ public void afterRollback(Transaction tx) { } - - /* (non-Javadoc) - * @see org.hornetq.core.transaction.TransactionOperation#getRelatedMessageReferences() - */ + + @Override public List<MessageReference> getRelatedMessageReferences() { return Collections.emptyList(); } - + // Package protected --------------------------------------------- // Protected ----------------------------------------------------- Modified: trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -98,10 +98,9 @@ * Helper base class for our unit tests. * <p> * See {@code org.hornetq.tests.util.ServiceTestBase} for a test case with server set-up. - * @see Service + * @see ServiceTestBase * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> * @author <a href="mailto:csuconic@redhat.com">Clebert</a> - * */ public abstract class UnitTestCase extends TestCase { Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQQueue.java =================================================================== --- trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQQueue.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQQueue.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -41,7 +41,7 @@ public static SimpleString createAddressFromName(final String name) { - return new SimpleString(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name); + return new SimpleString(HornetQDestination.JMS_QUEUE_ADDRESS_PREFIX + name); } // Attributes ---------------------------------------------------- @@ -50,7 +50,7 @@ public HornetQQueue(final String name) { - super(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name, name, false, true, null); + super(HornetQDestination.JMS_QUEUE_ADDRESS_PREFIX + name, name, false, true, null); } @@ -59,7 +59,6 @@ * @param address * @param name * @param temporary - * @param queue * @param session */ public HornetQQueue(String address, String name, boolean temporary, HornetQSession session) Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQTemporaryQueue.java =================================================================== --- trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQTemporaryQueue.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQTemporaryQueue.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -46,8 +46,6 @@ /** * @param address * @param name - * @param temporary - * @param queue * @param session */ public HornetQTemporaryQueue(String address, String name, HornetQSession session) Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/persistence/config/PersistedConnectionFactory.java =================================================================== --- trunk/hornetq-jms/src/main/java/org/hornetq/jms/persistence/config/PersistedConnectionFactory.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/persistence/config/PersistedConnectionFactory.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -42,7 +42,6 @@ } /** - * @param id * @param config */ public PersistedConnectionFactory(final ConnectionFactoryConfiguration config)