Author: borges Date: 2012-02-03 08:26:59 -0500 (Fri, 03 Feb 2012) New Revision: 12078 Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/FileLockNodeManager.java trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFile.java trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFileFactory.java Log: Restore: decreased visibility Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2012-02-03 13:11:56 UTC (rev 12077) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2012-02-03 13:26:59 UTC (rev 12078) @@ -128,17 +128,17 @@ private static final long CHECKPOINT_BATCH_SIZE = Integer.MAX_VALUE; // grouping journal record type - public static final byte GROUP_RECORD = 20; + private static final byte GROUP_RECORD = 20; // Bindings journal record type - public static final byte QUEUE_BINDING_RECORD = 21; + private static final byte QUEUE_BINDING_RECORD = 21; public static final byte ID_COUNTER_RECORD = 24; - public static final byte ADDRESS_SETTING_RECORD = 25; + private static final byte ADDRESS_SETTING_RECORD = 25; - public static final byte SECURITY_RECORD = 26; + private static final byte SECURITY_RECORD = 26; // Message journal record types @@ -146,29 +146,29 @@ // We use this to avoid temporary files missing public static final byte ADD_LARGE_MESSAGE_PENDING = 29; - public static final byte ADD_LARGE_MESSAGE = 30; + private static final byte ADD_LARGE_MESSAGE = 30; - public static final byte ADD_MESSAGE = 31; + private static final byte ADD_MESSAGE = 31; public static final byte ADD_REF = 32; - public static final byte ACKNOWLEDGE_REF = 33; + private static final byte ACKNOWLEDGE_REF = 33; public static final byte UPDATE_DELIVERY_COUNT = 34; public static final byte PAGE_TRANSACTION = 35; - public static final byte SET_SCHEDULED_DELIVERY_TIME = 36; + private static final byte SET_SCHEDULED_DELIVERY_TIME = 36; - public static final byte DUPLICATE_ID = 37; + private static final byte DUPLICATE_ID = 37; - public static final byte HEURISTIC_COMPLETION = 38; + private static final byte HEURISTIC_COMPLETION = 38; public static final byte ACKNOWLEDGE_CURSOR = 39; - public static final byte PAGE_CURSOR_COUNTER_VALUE = 40; + private static final byte PAGE_CURSOR_COUNTER_VALUE = 40; - public static final byte PAGE_CURSOR_COUNTER_INC = 41; + private static final byte PAGE_CURSOR_COUNTER_INC = 41; private final Semaphore pageMaxConcurrentIO; @@ -2041,7 +2041,7 @@ describeJournal(bindingsFF, bindings); } - public static void describeMessagesJournal(final String messagesDir) throws Exception + static void describeMessagesJournal(final String messagesDir) throws Exception { SequentialFileFactory messagesFF = new NIOSequentialFileFactory(messagesDir, null); @@ -2656,7 +2656,7 @@ } } - protected OperationContext getContext(final boolean sync) + private OperationContext getContext(final boolean sync) { if (sync) { @@ -2799,7 +2799,7 @@ } } - public static class HeuristicCompletionEncoding implements EncodingSupport + private static class HeuristicCompletionEncoding implements EncodingSupport { public Xid xid; @@ -2839,7 +2839,7 @@ } } - public static class GroupingEncoding implements EncodingSupport, GroupingInfo + private static class GroupingEncoding implements EncodingSupport, GroupingInfo { public long id; @@ -3145,17 +3145,12 @@ } - public static class DeleteEncoding implements EncodingSupport + private static class DeleteEncoding implements EncodingSupport { public byte recordType; public long id; - public DeleteEncoding() - { - super(); - } - public DeleteEncoding(final byte recordType, final long id) { this.recordType = recordType; @@ -3257,7 +3252,7 @@ } } - public static class ScheduledDeliveryEncoding extends QueueEncoding + private static class ScheduledDeliveryEncoding extends QueueEncoding { long scheduledDeliveryTime; @@ -3810,7 +3805,7 @@ } - public static class MessageDescribe + private static class MessageDescribe { public MessageDescribe(Message msg) { @@ -3859,7 +3854,7 @@ * @param buffer * @return */ - protected static PersistedRoles newSecurityRecord(long id, HornetQBuffer buffer) + private static PersistedRoles newSecurityRecord(long id, HornetQBuffer buffer) { PersistedRoles roles = new PersistedRoles(); roles.decode(buffer); @@ -3872,7 +3867,7 @@ * @param buffer * @return */ - protected static PersistedAddressSetting newAddressEncoding(long id, HornetQBuffer buffer) + private static PersistedAddressSetting newAddressEncoding(long id, HornetQBuffer buffer) { PersistedAddressSetting setting = new PersistedAddressSetting(); setting.decode(buffer); @@ -3885,7 +3880,7 @@ * @param buffer * @return */ - protected static GroupingEncoding newGroupEncoding(long id, HornetQBuffer buffer) + private static GroupingEncoding newGroupEncoding(long id, HornetQBuffer buffer) { GroupingEncoding encoding = new GroupingEncoding(); encoding.decode(buffer); @@ -3898,7 +3893,7 @@ * @param buffer * @return */ - protected static PersistentQueueBindingEncoding newBindingEncoding(long id, HornetQBuffer buffer) + private static PersistentQueueBindingEncoding newBindingEncoding(long id, HornetQBuffer buffer) { PersistentQueueBindingEncoding bindingEncoding = new PersistentQueueBindingEncoding(); @@ -3918,7 +3913,7 @@ * @param journal * @throws Exception */ - protected static void describeJournal(SequentialFileFactory fileFactory, JournalImpl journal) throws Exception + private static void describeJournal(SequentialFileFactory fileFactory, JournalImpl journal) throws Exception { List<JournalFile> files = journal.orderFiles(); Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java 2012-02-03 13:11:56 UTC (rev 12077) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java 2012-02-03 13:26:59 UTC (rev 12078) @@ -57,7 +57,7 @@ * * */ -public class CoreProtocolManager implements ProtocolManager +class CoreProtocolManager implements ProtocolManager { private static final Logger log = Logger.getLogger(CoreProtocolManager.class); @@ -67,7 +67,7 @@ private final List<Interceptor> interceptors; - public CoreProtocolManager(final HornetQServer server, final List<Interceptor> interceptors) + CoreProtocolManager(final HornetQServer server, final List<Interceptor> interceptors) { this.server = server; @@ -269,12 +269,12 @@ private final Map<String, ServerSessionPacketHandler> sessionHandlers = new ConcurrentHashMap<String, ServerSessionPacketHandler>(); - public ServerSessionPacketHandler getSessionHandler(final String sessionName) + ServerSessionPacketHandler getSessionHandler(final String sessionName) { return sessionHandlers.get(sessionName); } - public void addSessionHandler(final String name, final ServerSessionPacketHandler handler) + void addSessionHandler(final String name, final ServerSessionPacketHandler handler) { sessionHandlers.put(name, handler); } @@ -294,4 +294,10 @@ { return -1; } + + @Override + public String toString() + { + return "CoreProtocolManager(server=" + server + ")"; + } } Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/FileLockNodeManager.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/FileLockNodeManager.java 2012-02-03 13:11:56 UTC (rev 12077) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/FileLockNodeManager.java 2012-02-03 13:26:59 UTC (rev 12078) @@ -35,7 +35,7 @@ { private final Logger log = Logger.getLogger(this.getClass()); - protected static final String SERVER_LOCK_NAME = "server.lock"; + private static final String SERVER_LOCK_NAME = "server.lock"; private static final String ACCESS_MODE = "rw"; Modified: trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFile.java =================================================================== --- trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFile.java 2012-02-03 13:11:56 UTC (rev 12077) +++ trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFile.java 2012-02-03 13:26:59 UTC (rev 12078) @@ -36,7 +36,7 @@ * * */ -public abstract class AbstractSequentialFile implements SequentialFile +abstract class AbstractSequentialFile implements SequentialFile { // Constants ----------------------------------------------------- Modified: trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFileFactory.java =================================================================== --- trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFileFactory.java 2012-02-03 13:11:56 UTC (rev 12077) +++ trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/AbstractSequentialFileFactory.java 2012-02-03 13:26:59 UTC (rev 12078) @@ -39,7 +39,7 @@ * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a> * */ -public abstract class AbstractSequentialFileFactory implements SequentialFileFactory +abstract class AbstractSequentialFileFactory implements SequentialFileFactory { // Timeout used to wait executors to shutdown @@ -64,7 +64,7 @@ * */ protected ExecutorService writeExecutor; - public AbstractSequentialFileFactory(final String journalDir, + AbstractSequentialFileFactory(final String journalDir, final boolean buffered, final int bufferSize, final int bufferTimeout,