Author: borges Date: 2011-11-10 06:07:28 -0500 (Thu, 10 Nov 2011) New Revision: 11683 Modified: trunk/hornetq-core/src/main/java/org/hornetq/api/core/DiscoveryGroupConfiguration.java trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagedMessage.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PagedReferenceImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageSyncTimer.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagedMessageImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java Log: clean up Modified: trunk/hornetq-core/src/main/java/org/hornetq/api/core/DiscoveryGroupConfiguration.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/api/core/DiscoveryGroupConfiguration.java 2011-11-09 19:10:14 UTC (rev 11682) +++ trunk/hornetq-core/src/main/java/org/hornetq/api/core/DiscoveryGroupConfiguration.java 2011-11-10 11:07:28 UTC (rev 11683) @@ -16,7 +16,6 @@ import java.io.Serializable; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.logging.Logger; import org.hornetq.utils.UUIDGenerator; /** @@ -32,9 +31,6 @@ { private static final long serialVersionUID = 8657206421727863400L; - private static final Logger log = Logger.getLogger(DiscoveryGroupConfiguration.class); - - private String name; private String localBindAddress; 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 2011-11-09 19:10:14 UTC (rev 11682) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/SecurityDeployer.java 2011-11-10 11:07:28 UTC (rev 11683) @@ -35,7 +35,7 @@ private static final String MATCH = "match"; - private final FileConfigurationParser parser = new FileConfigurationParser(); + private final FileConfigurationParser parser = new FileConfigurationParser(); /** * The repository to add to @@ -68,8 +68,7 @@ } /** - * the key attribute for theelement, usually 'name' but can be overridden - * + * the key attribute for the element, usually 'name' but can be overridden * @return the key attribute */ @Override Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagedMessage.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagedMessage.java 2011-11-09 19:10:14 UTC (rev 11682) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagedMessage.java 2011-11-10 11:07:28 UTC (rev 11683) @@ -18,21 +18,19 @@ import org.hornetq.core.server.ServerMessage; /** - * - * A Paged message - * - * We can't just record the ServerMessage as we need other information (such as the TransactionID used during paging) - * + * A Paged message. + * <p> + * We can't just record the ServerMessage as we need other information (such as the TransactionID + * used during paging) * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a> - * */ public interface PagedMessage extends EncodingSupport { ServerMessage getMessage(); - + /** The queues that were routed during paging */ long[] getQueueIDs(); - + void initMessage(StorageManager storageManager); long getTransactionID(); Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PagedReferenceImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PagedReferenceImpl.java 2011-11-09 19:10:14 UTC (rev 11682) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PagedReferenceImpl.java 2011-11-10 11:07:28 UTC (rev 11683) @@ -33,9 +33,6 @@ */ public class PagedReferenceImpl implements PagedReference { - - private static final long serialVersionUID = -8640232251318264710L; - private static final Logger log = Logger.getLogger(PagedReferenceImpl.class); private static final boolean isTrace = log.isTraceEnabled(); @@ -50,7 +47,7 @@ private int messageEstimate; - private AtomicInteger deliveryCount = new AtomicInteger(0); + private final AtomicInteger deliveryCount = new AtomicInteger(0); private final PageSubscription subscription; Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageImpl.java 2011-11-09 19:10:14 UTC (rev 11682) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageImpl.java 2011-11-10 11:07:28 UTC (rev 11683) @@ -41,7 +41,7 @@ // Constants ----------------------------------------------------- private static final Logger log = Logger.getLogger(PageImpl.class); - + private static final boolean isTrace = log.isTraceEnabled(); private static final boolean isDebug = log.isDebugEnabled(); @@ -111,7 +111,7 @@ { log.debug("reading page " + this.pageId + " on address = " + storeName); } - + ArrayList<PagedMessage> messages = new ArrayList<PagedMessage>(); size.set((int)file.size()); @@ -238,7 +238,7 @@ { storageManager.pageDeleted(storeName, pageId); } - + if (isDebug) { log.debug("Deleting pageId=" + pageId + " on store " + storeName); @@ -301,18 +301,11 @@ } - /* (non-Javadoc) - * @see java.lang.Comparable#compareTo(java.lang.Object) - */ public int compareTo(Page otherPage) { return otherPage.getPageId() - this.pageId; } - - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -322,16 +315,6 @@ return result; } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -347,6 +330,12 @@ return true; } + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + /** * @param position * @param msgNumber Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageSyncTimer.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageSyncTimer.java 2011-11-09 19:10:14 UTC (rev 11682) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PageSyncTimer.java 2011-11-10 11:07:28 UTC (rev 11683) @@ -19,7 +19,6 @@ import java.util.concurrent.TimeUnit; import org.hornetq.api.core.HornetQException; -import org.hornetq.core.logging.Logger; import org.hornetq.core.paging.PagingStore; import org.hornetq.core.persistence.OperationContext; @@ -35,9 +34,6 @@ // Constants ----------------------------------------------------- - private static final Logger log = Logger.getLogger(PageSyncTimer.class); - - // Attributes ---------------------------------------------------- private final PagingStore store; @@ -56,7 +52,7 @@ } }; - private List<OperationContext> syncOperations = new LinkedList<OperationContext>(); + private final List<OperationContext> syncOperations = new LinkedList<OperationContext>(); // Static -------------------------------------------------------- Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagedMessageImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagedMessageImpl.java 2011-11-09 19:10:14 UTC (rev 11682) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagedMessageImpl.java 2011-11-10 11:07:28 UTC (rev 11683) @@ -163,9 +163,6 @@ DataConstants.SIZE_INT + queueIDs.length * DataConstants.SIZE_LONG; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -176,9 +173,9 @@ message + "]"; } - - + + // Package protected --------------------------------------------- // Protected ----------------------------------------------------- Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java 2011-11-09 19:10:14 UTC (rev 11682) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java 2011-11-10 11:07:28 UTC (rev 11683) @@ -83,12 +83,4 @@ return journalID; } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - }