http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java index df880a0..f4e547f 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java @@ -4280,7 +4280,7 @@ public class DistributionManager implements DM { * A simple class used for locking the list of members of the distributed system. We give this * lock its own class so that it shows up nicely in stack traces. */ - private static final class MembersLock { + private static class MembersLock { protected MembersLock() { } @@ -4290,7 +4290,7 @@ public class DistributionManager implements DM { * A simple class used for locking the list of membership listeners. We give this lock its own * class so that it shows up nicely in stack traces. */ - private static final class MembershipListenersLock { + private static class MembershipListenersLock { protected MembershipListenersLock() {} } @@ -4298,7 +4298,7 @@ public class DistributionManager implements DM { * This is the listener implementation for responding from events from the Membership Manager. * */ - private final class MyListener implements DistributedMembershipListener { + private class MyListener implements DistributedMembershipListener { DistributionManager dm; public MyListener(DistributionManager dm) { @@ -4438,7 +4438,7 @@ public class DistributionManager implements DM { * * */ - private static final class MemberJoinedEvent extends MemberEvent { + private static class MemberJoinedEvent extends MemberEvent { MemberJoinedEvent(InternalDistributedMember id) { super(id); } @@ -4458,7 +4458,7 @@ public class DistributionManager implements DM { * This is an event reflecting that a InternalDistributedMember has left the system. * */ - private static final class MemberDepartedEvent extends MemberEvent { + private static class MemberDepartedEvent extends MemberEvent { String reason; MemberDepartedEvent(InternalDistributedMember id, String r) { @@ -4483,7 +4483,7 @@ public class DistributionManager implements DM { * * */ - private static final class MemberCrashedEvent extends MemberEvent { + private static class MemberCrashedEvent extends MemberEvent { String reason; MemberCrashedEvent(InternalDistributedMember id, String r) { @@ -4506,7 +4506,7 @@ public class DistributionManager implements DM { * This is an event reflecting that a InternalDistributedMember may be missing but has not yet * left the system. */ - private static final class MemberSuspectEvent extends MemberEvent { + private static class MemberSuspectEvent extends MemberEvent { InternalDistributedMember whoSuspected; String reason; @@ -4536,7 +4536,7 @@ public class DistributionManager implements DM { } } - private static final class ViewInstalledEvent extends MemberEvent { + private static class ViewInstalledEvent extends MemberEvent { NetView view; ViewInstalledEvent(NetView view) { @@ -4564,7 +4564,7 @@ public class DistributionManager implements DM { } } - private static final class QuorumLostEvent extends MemberEvent { + private static class QuorumLostEvent extends MemberEvent { Set<InternalDistributedMember> failures; List<InternalDistributedMember> remaining;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java index 69a5d90..403b420 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java @@ -144,7 +144,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl return mask; } - public static final byte getNumBits(final int maxValue) { + public static byte getNumBits(final int maxValue) { byte numBits = 1; while ((1 << numBits) <= maxValue) { numBits++; @@ -345,7 +345,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl /** * Scheduled action to take when on this message when we are ready to process it. */ - protected final void scheduleAction(final DistributionManager dm) { + protected void scheduleAction(final DistributionManager dm) { if (logger.isTraceEnabled(LogMarker.DM)) { logger.trace(LogMarker.DM, "Processing '{}'", this); } @@ -411,7 +411,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl /** * Schedule this message's process() method in a thread determined by getExecutor() */ - protected final void schedule(final DistributionManager dm) { + protected void schedule(final DistributionManager dm) { boolean inlineProcess = DistributionManager.INLINE_PROCESS && getProcessorType() == DistributionManager.SERIAL_EXECUTOR && !isPreciousThread(); http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java index 35c0a2e..f84bee9 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java @@ -30,14 +30,13 @@ public abstract class DistributionMessageObserver { * @param instance * @return the old observer, or null if there was no old observer. */ - public static final DistributionMessageObserver setInstance( - DistributionMessageObserver instance) { + public static DistributionMessageObserver setInstance(DistributionMessageObserver instance) { DistributionMessageObserver oldInstance = DistributionMessageObserver.instance; DistributionMessageObserver.instance = instance; return oldInstance; } - public static final DistributionMessageObserver getInstance() { + public static DistributionMessageObserver getInstance() { return instance; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java index a519c0e..3f3eaba 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java @@ -212,14 +212,14 @@ public class FunctionExecutionPooledExecutor extends ThreadPoolExecutor { } @Override - protected final void beforeExecute(Thread t, Runnable r) { + protected void beforeExecute(Thread t, Runnable r) { if (this.stats != null) { this.stats.startJob(); } } @Override - protected final void afterExecute(Runnable r, Throwable ex) { + protected void afterExecute(Runnable r, Throwable ex) { if (this.stats != null) { this.stats.endJob(); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java index 939b8ed..93ebe55 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java @@ -44,7 +44,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage; * * @since GemFire 5.1 */ -public final class HighPriorityAckedMessage extends HighPriorityDistributionMessage +public class HighPriorityAckedMessage extends HighPriorityDistributionMessage implements MessageWithReply { private static final Logger logger = LogService.getLogger(); http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java index 873ec4b..eeb44e7a 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java @@ -1460,7 +1460,7 @@ public class InternalDistributedSystem extends DistributedSystem /** * Returns the distribution manager without checking for connected or not so can also return null. */ - public final DM getDM() { + public DM getDM() { return this.dm; } @@ -1471,7 +1471,7 @@ public class InternalDistributedSystem extends DistributedSystem * * @return the quorum checking service */ - public final QuorumChecker getQuorumChecker() { + public QuorumChecker getQuorumChecker() { return this.quorumChecker; } @@ -1743,7 +1743,7 @@ public class InternalDistributedSystem extends DistributedSystem } @Override - public final int getStatisticsCount() { + public int getStatisticsCount() { int result = 0; List<Statistics> statsList = this.statsList; if (statsList != null) { @@ -1753,7 +1753,7 @@ public class InternalDistributedSystem extends DistributedSystem } @Override - public final Statistics findStatistics(long id) { + public Statistics findStatistics(long id) { List<Statistics> statsList = this.statsList; for (Statistics s : statsList) { if (s.getUniqueId() == id) { @@ -1765,7 +1765,7 @@ public class InternalDistributedSystem extends DistributedSystem } @Override - public final boolean statisticsExists(long id) { + public boolean statisticsExists(long id) { List<Statistics> statsList = this.statsList; for (Statistics s : statsList) { if (s.getUniqueId() == id) { @@ -1776,7 +1776,7 @@ public class InternalDistributedSystem extends DistributedSystem } @Override - public final Statistics[] getStatistics() { + public Statistics[] getStatistics() { List<Statistics> statsList = this.statsList; return (Statistics[]) statsList.toArray(new Statistics[0]); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java index a190d05..6b19a12 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java @@ -541,7 +541,7 @@ public class LocatorLoadSnapshot { } } - private final class LoadEstimateTask implements Runnable { + private class LoadEstimateTask implements Runnable { private final EstimateMapKey key; private final LoadHolder lh; @@ -578,7 +578,7 @@ public class LocatorLoadSnapshot { } } - private static final class LoadHolder { + private static class LoadHolder { private float load; private float loadPerConnection; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java index b7f6e04..1f51a8d 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java @@ -112,7 +112,7 @@ public class LocatorStats { } - public final void setServerCount(int sc) { + public void setServerCount(int sc) { if (this._stats == null) { this.endpoints_known.set(sc); } else { @@ -120,7 +120,7 @@ public class LocatorStats { } } - public final void setLocatorCount(int lc) { + public void setLocatorCount(int lc) { if (this._stats == null) { this.known_locators.set(lc); } else { @@ -128,7 +128,7 @@ public class LocatorStats { } } - public final void endLocatorRequest(long startTime) { + public void endLocatorRequest(long startTime) { long took = DistributionStats.getStatTime() - startTime; if (this._stats == null) { this.requests_to_locator.incrementAndGet(); @@ -143,7 +143,7 @@ public class LocatorStats { } } - public final void endLocatorResponse(long startTime) { + public void endLocatorResponse(long startTime) { long took = DistributionStats.getStatTime() - startTime; if (this._stats == null) { this.responses_from_locator.incrementAndGet(); @@ -160,7 +160,7 @@ public class LocatorStats { - public final void setLocatorRequests(long rl) { + public void setLocatorRequests(long rl) { if (this._stats == null) { this.requests_to_locator.set(rl); } else { @@ -168,7 +168,7 @@ public class LocatorStats { } } - public final void setLocatorResponses(long rl) { + public void setLocatorResponses(long rl) { if (this._stats == null) { this.responses_from_locator.set(rl); } else { @@ -176,7 +176,7 @@ public class LocatorStats { } } - public final void setServerLoadUpdates(long v) { + public void setServerLoadUpdates(long v) { if (this._stats == null) { this.serverLoadUpdates.set(v); } else { @@ -184,7 +184,7 @@ public class LocatorStats { } } - public final void incServerLoadUpdates() { + public void incServerLoadUpdates() { if (this._stats == null) { this.serverLoadUpdates.incrementAndGet(); } else { http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java index 4a76f20..9888342 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java @@ -23,7 +23,7 @@ package org.apache.geode.distributed.internal; public abstract class PooledDistributionMessage extends DistributionMessage { @Override - final public int getProcessorType() { + public int getProcessorType() { return DistributionManager.STANDARD_EXECUTOR; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java index f2092a4..00dcf00 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java @@ -151,14 +151,14 @@ public class PooledExecutorWithDMStats extends ThreadPoolExecutor { } @Override - protected final void beforeExecute(Thread t, Runnable r) { + protected void beforeExecute(Thread t, Runnable r) { if (this.stats != null) { this.stats.startJob(); } } @Override - protected final void afterExecute(Runnable r, Throwable ex) { + protected void afterExecute(Runnable r, Throwable ex) { if (this.stats != null) { this.stats.endJob(); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java index 4022759..924d49b 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java @@ -38,7 +38,7 @@ import org.apache.geode.internal.logging.PureLogWriter; * * @since GemFire 2013 */ -public final class ProductUseLog implements MembershipListener { +public class ProductUseLog implements MembershipListener { protected static long MAX_PRODUCT_USE_FILE_SIZE = Long.getLong("max_view_log_size", 5000000); private final int logLevel; private final File productUseLogFile; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java index 3904ba7..c57d38e 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java @@ -90,7 +90,7 @@ public class ReliableReplyProcessor21 extends ReplyProcessor21 { * @throws InterruptedException * @throws ReliableReplyException when a member departs */ - public final void waitForReliableDelivery() + public void waitForReliableDelivery() throws ReplyException, InterruptedException, ReliableReplyException { waitForReliableDelivery(0); } @@ -102,7 +102,7 @@ public class ReliableReplyProcessor21 extends ReplyProcessor21 { * @throws InterruptedException * @throws ReliableReplyException */ - public final void waitForReliableDelivery(long msecs) + public void waitForReliableDelivery(long msecs) throws ReplyException, InterruptedException, ReliableReplyException { super.waitForReplies(msecs); synchronized (this) { http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java index 73fde88..2673f68 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java @@ -182,11 +182,11 @@ public class ReplyMessage extends HighPriorityDistributionMessage { * @param dm the distribution manager that is processing the message. */ @Override - protected final void process(final DistributionManager dm) { + protected void process(final DistributionManager dm) { dmProcess(dm); } - public final void dmProcess(final DM dm) { + public void dmProcess(final DM dm) { final long startTime = getTimestamp(); ReplyProcessor21 processor = ReplyProcessor21.getProcessor(processorId); try { @@ -262,7 +262,7 @@ public class ReplyMessage extends HighPriorityDistributionMessage { public static final byte OBJECT_FLAG = 0x40; public static final byte INTERNAL_FLAG = (byte) 0x80; - private static final boolean testFlag(byte status, byte flag) { + private static boolean testFlag(byte status, byte flag) { return (status & flag) != 0; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java index bc66dd8..7e87c8c 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java @@ -512,7 +512,7 @@ public class ReplyProcessor21 implements MembershipListener { * @throws InterruptedException thrown if the wait is interrupted * @see #canStopWaiting() */ - public final void waitForReplies() throws InterruptedException, ReplyException { + public void waitForReplies() throws InterruptedException, ReplyException { boolean result = waitForReplies(0); Assert.assertTrue(result, "failed but no exception thrown"); @@ -587,7 +587,7 @@ public class ReplyProcessor21 implements MembershipListener { // start waiting for replies without explicitly waiting for all of them using // waitForReplies* methods; useful for streaming of results in function execution - public final void startWait() { + public void startWait() { if (!this.waiting && stillWaiting()) { preWait(); } @@ -595,7 +595,7 @@ public class ReplyProcessor21 implements MembershipListener { // end waiting for replies without explicitly invoking waitForReplies* // methods; useful for streaming of results in function execution - public final void endWait(boolean doCleanup) { + public void endWait(boolean doCleanup) { try { postWait(); } finally { @@ -618,11 +618,11 @@ public class ReplyProcessor21 implements MembershipListener { * * @return Whether or not we received all of the replies in the given amount of time. */ - public final boolean waitForReplies(long msecs) throws InterruptedException, ReplyException { + public boolean waitForReplies(long msecs) throws InterruptedException, ReplyException { return waitForReplies(msecs, getLatch(), true); } - public final boolean waitForReplies(long msecs, StoppableCountDownLatch latch, boolean doCleanUp) + public boolean waitForReplies(long msecs, StoppableCountDownLatch latch, boolean doCleanUp) throws InterruptedException, ReplyException { if (this.keeperCleanedUp) { throw new IllegalStateException( @@ -765,11 +765,11 @@ public class ReplyProcessor21 implements MembershipListener { * "ack-threshold-exception" is set to true * @throws IllegalStateException if the processor is not registered to receive replies */ - public final boolean waitForRepliesUninterruptibly(long p_msecs) throws ReplyException { + public boolean waitForRepliesUninterruptibly(long p_msecs) throws ReplyException { return waitForRepliesUninterruptibly(p_msecs, getLatch(), true); } - public final boolean waitForRepliesUninterruptibly(long p_msecs, StoppableCountDownLatch latch, + public boolean waitForRepliesUninterruptibly(long p_msecs, StoppableCountDownLatch latch, boolean doCleanUp) throws ReplyException { if (this.keeperCleanedUp) { throw new IllegalStateException( http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java index abe8133..567bbac 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java @@ -37,7 +37,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.*; * * @since GemFire 3.0 */ -public final class RuntimeDistributionConfigImpl extends DistributionConfigImpl { +public class RuntimeDistributionConfigImpl extends DistributionConfigImpl { private static final long serialVersionUID = -805637520096606113L; transient private final InternalDistributedSystem ds; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java index 3217e19..c56a929 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java @@ -34,8 +34,7 @@ import org.apache.geode.internal.logging.LogService; * some tests to flush the serial communication channels after no-ack tests. * */ -public final class SerialAckedMessage extends SerialDistributionMessage - implements MessageWithReply { +public class SerialAckedMessage extends SerialDistributionMessage implements MessageWithReply { private static final Logger logger = LogService.getLogger(); /** The is of the distribution manager that sent the message */ http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java index 45cffa3..5861e40 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java @@ -33,14 +33,14 @@ public class SerialQueuedExecutorWithDMStats extends ThreadPoolExecutor { } @Override - protected final void beforeExecute(Thread t, Runnable r) { + protected void beforeExecute(Thread t, Runnable r) { if (this.stats != null) { this.stats.startJob(); } } @Override - protected final void afterExecute(Runnable r, Throwable ex) { + protected void afterExecute(Runnable r, Throwable ex) { if (this.stats != null) { this.stats.endJob(); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java index 6dcf0a5..3004496 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java @@ -66,11 +66,11 @@ public class ServerLocation implements DataSerializable, Comparable { this.port = port; } - public final String getHostName() { + public String getHostName() { return hostName; } - public final int getPort() { + public int getPort() { return port; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java index 46c51db..42de647 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java @@ -26,7 +26,7 @@ import org.apache.geode.distributed.internal.membership.*; * * N.B. -- this is a SerialDistributionMessage due to bug32980 */ -public final class ShutdownMessage extends HighPriorityDistributionMessage +public class ShutdownMessage extends HighPriorityDistributionMessage implements AdminMessageType, MessageWithReply { /** The is of the distribution manager that is shutting down */ protected InternalDistributedMember id; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java index 022cea7..d81aed0 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java @@ -38,8 +38,7 @@ import java.util.Set; /** * A message that is sent to all other distribution manager when a distribution manager starts up. */ -public final class StartupMessage extends HighPriorityDistributionMessage - implements AdminMessageType { +public class StartupMessage extends HighPriorityDistributionMessage implements AdminMessageType { private static final Logger logger = LogService.getLogger(); private String version = GemFireVersion.getGemFireVersion(); // added for bug 29005 http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java index ec2e3e6..97519e3 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java @@ -231,9 +231,8 @@ public class DirectChannel { * @throws ConnectExceptions if message could not be send to its <code>destination</code> * @throws NotSerializableException If the msg cannot be serialized */ - private final int sendToOne(final MembershipManager mgr, - InternalDistributedMember[] p_destinations, final DistributionMessage msg, - long ackWaitThreshold, long ackSAThreshold) + private int sendToOne(final MembershipManager mgr, InternalDistributedMember[] p_destinations, + final DistributionMessage msg, long ackWaitThreshold, long ackSAThreshold) throws ConnectExceptions, NotSerializableException { return sendToMany(mgr, p_destinations, msg, ackWaitThreshold, ackSAThreshold); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java index f8fcdd0..df21141 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java @@ -123,7 +123,7 @@ public class DLockQueryProcessor extends ReplyProcessor21 { // ------------------------------------------------------------------------- // DLockQueryMessage // ------------------------------------------------------------------------- - public static final class DLockQueryMessage extends PooledDistributionMessage + public static class DLockQueryMessage extends PooledDistributionMessage implements MessageWithReply { /** The name of the DistributedLockService */ protected String serviceName; @@ -348,7 +348,7 @@ public class DLockQueryProcessor extends ReplyProcessor21 { // ------------------------------------------------------------------------- // DLockQueryReplyMessage // ------------------------------------------------------------------------- - public static final class DLockQueryReplyMessage extends ReplyMessage { + public static class DLockQueryReplyMessage extends ReplyMessage { static final int NOT_GRANTOR = 0; static final int OK = 1; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java index 2a48308..0ed4890 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java @@ -187,7 +187,7 @@ public class DLockRecoverGrantorProcessor extends ReplyProcessor21 { // ------------------------------------------------------------------------- // DLockRecoverGrantorMessage // ------------------------------------------------------------------------- - public static final class DLockRecoverGrantorMessage extends PooledDistributionMessage + public static class DLockRecoverGrantorMessage extends PooledDistributionMessage implements MessageWithReply { /** The name of the DistributedLockService */ @@ -312,7 +312,7 @@ public class DLockRecoverGrantorProcessor extends ReplyProcessor21 { // ------------------------------------------------------------------------- // DLockRecoverGrantorReplyMessage // ------------------------------------------------------------------------- - public static final class DLockRecoverGrantorReplyMessage extends ReplyMessage { + public static class DLockRecoverGrantorReplyMessage extends ReplyMessage { public static final int OK = 0; public static final int GRANTOR_DISPUTE = 1; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java index 6adfa9b..e133f79 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java @@ -132,7 +132,7 @@ public class DLockReleaseProcessor extends ReplyProcessor21 { // ------------------------------------------------------------------------- // DLockReleaseMessage // ------------------------------------------------------------------------- - public static final class DLockReleaseMessage extends HighPriorityDistributionMessage + public static class DLockReleaseMessage extends HighPriorityDistributionMessage implements MessageWithReply { /** The name of the DistributedLockService */ protected String serviceName; @@ -372,7 +372,7 @@ public class DLockReleaseProcessor extends ReplyProcessor21 { // ------------------------------------------------------------------------- // DLockReleaseReplyMessage // ------------------------------------------------------------------------- - public static final class DLockReleaseReplyMessage extends ReplyMessage { + public static class DLockReleaseReplyMessage extends ReplyMessage { static final int NOT_GRANTOR = 0; static final int OK = 1; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java index ca012d3..c38cdad 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java @@ -255,15 +255,15 @@ public class DLockService extends DistributedLockService { } } - private final boolean isCurrentThreadDoingDestroy() { + private boolean isCurrentThreadDoingDestroy() { return Boolean.TRUE.equals(this.destroyingThread.get()); } - private final void setDestroyingThread() { + private void setDestroyingThread() { this.destroyingThread.set(Boolean.TRUE); } - private final void clearDestroyingThread() { + private void clearDestroyingThread() { this.destroyingThread.remove(); } @@ -2102,7 +2102,7 @@ public class DLockService extends DistributedLockService { // Public instance methods // ------------------------------------------------------------------------- - public final DistributedLockStats getStats() { + public DistributedLockStats getStats() { return this.dlockStats; } @@ -2299,11 +2299,11 @@ public class DLockService extends DistributedLockService { } /** The name of this service */ - public final String getName() { + public String getName() { return this.serviceName; } - public final DM getDistributionManager() { + public DM getDistributionManager() { return this.dm; } @@ -3180,7 +3180,7 @@ public class DLockService extends DistributedLockService { // ------------------------------------------------------------------------- /** Used as the name (key) for the suspend locking entry in the tokens map */ - public static final class SuspendLockingToken implements DataSerializableFixedID { + public static class SuspendLockingToken implements DataSerializableFixedID { public SuspendLockingToken() {} @Override @@ -3270,7 +3270,7 @@ public class DLockService extends DistributedLockService { } - public final CancelCriterion getCancelCriterion() { + public CancelCriterion getCancelCriterion() { return stopper; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java index f05cc82..907e731 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java @@ -99,7 +99,7 @@ public class DeposeGrantorProcessor extends ReplyProcessor21 { /////////////// Inner message classes ////////////////// - public static final class DeposeGrantorMessage extends PooledDistributionMessage + public static class DeposeGrantorMessage extends PooledDistributionMessage implements MessageWithReply { private int processorId; private String serviceName; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java index c779e6f..9b379c7 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java @@ -39,7 +39,7 @@ import java.util.concurrent.locks.Lock; * * @since GemFire 5.1 */ -public final class DistributedMemberLock implements Lock { +public class DistributedMemberLock implements Lock { /** Lock lease timeout value that never expires. */ public static final long NON_EXPIRING_LEASE = -1; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java index 886aafc..0dbaa0f 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java @@ -143,7 +143,7 @@ public class ElderInitProcessor extends ReplyProcessor21 { /////////////// Inner message classes ////////////////// - public static final class ElderInitMessage extends PooledDistributionMessage + public static class ElderInitMessage extends PooledDistributionMessage implements MessageWithReply { private int processorId; @@ -222,7 +222,7 @@ public class ElderInitProcessor extends ReplyProcessor21 { } } - public static final class ElderInitReplyMessage extends ReplyMessage { + public static class ElderInitReplyMessage extends ReplyMessage { private ArrayList grantors; // svc names private ArrayList grantorVersions; // grantor version longs private ArrayList grantorSerialNumbers; // grantor dls serial number ints http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java index ba78771..1ee15af 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java @@ -355,7 +355,7 @@ public class ElderState { } } - private final boolean isInitiatingTransfer(GrantorInfo gi) { + private boolean isInitiatingTransfer(GrantorInfo gi) { if (gi == null) return false; synchronized (this) { @@ -363,20 +363,20 @@ public class ElderState { } } - private final void beginInitiatingTransfer(GrantorInfo gi) { + private void beginInitiatingTransfer(GrantorInfo gi) { synchronized (this) { gi.setInitiatingTransfer(true); } } - private final void finishInitiatingTransfer(GrantorInfo gi) { + private void finishInitiatingTransfer(GrantorInfo gi) { synchronized (this) { gi.setInitiatingTransfer(false); notifyAll(); } } - private final void waitWhileInitiatingTransfer(GrantorInfo gi) { + private void waitWhileInitiatingTransfer(GrantorInfo gi) { synchronized (this) { boolean interrupted = false; try { http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java index 449627d..6fd969f 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java @@ -38,40 +38,40 @@ public class GrantorInfo { } /** Caller is sync'ed on ElderState */ - public final void setInitiatingTransfer(boolean initiatingTransfer) { + public void setInitiatingTransfer(boolean initiatingTransfer) { this.initiatingTransfer = initiatingTransfer; } /** Caller is sync'ed on ElderState */ - public final boolean isInitiatingTransfer() { + public boolean isInitiatingTransfer() { return this.initiatingTransfer; } /** * Gets the member id of this grantor. */ - public final InternalDistributedMember getId() { + public InternalDistributedMember getId() { return this.id; } /** * Returns true if the current grantor needs to do lock recovery. */ - public final boolean needsRecovery() { + public boolean needsRecovery() { return this.needsRecovery; } /** * Returns the elder version id of this grantor. */ - public final long getVersionId() { + public long getVersionId() { return this.versionId; } /** * Returns the DLockService serial number of this grantor. */ - public final int getSerialNumber() { + public int getSerialNumber() { return this.serialNumber; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java index 0b301c3..21dd318 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java @@ -114,7 +114,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 { } } - private final static boolean basicStartElderCall(InternalDistributedSystem sys, ElderState es, + private static boolean basicStartElderCall(InternalDistributedSystem sys, ElderState es, InternalDistributedMember elder, DLockService dls) { GrantorRequestContext grc = sys.getGrantorRequestContext(); grc.elderLock.lock(); @@ -217,7 +217,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 { * Sets currentElder to the memberId of the current elder if elder is remote; null if elder is in * our vm. TODO: collaboration lock was removed */ - private final static ElderState startElderCall(InternalDistributedSystem sys, DLockService dls, + private static ElderState startElderCall(InternalDistributedSystem sys, DLockService dls, boolean usesElderCollaborationLock) { InternalDistributedMember elder; ElderState es = null; @@ -248,7 +248,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 { return es; } - private final static void finishElderCall(GrantorRequestContext grc, ElderState es) { + private static void finishElderCall(GrantorRequestContext grc, ElderState es) { if (es == null) { grc.elderLock.lock(); try { @@ -458,7 +458,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 { /////////////// Inner message classes ////////////////// - public static final class GrantorRequestMessage extends PooledDistributionMessage + public static class GrantorRequestMessage extends PooledDistributionMessage implements MessageWithReply { private long grantorVersion; private int dlsSerialNumber; @@ -637,7 +637,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 { } } - public static final class GrantorInfoReplyMessage extends ReplyMessage { + public static class GrantorInfoReplyMessage extends ReplyMessage { private InternalDistributedMember grantor; private long elderVersionId; private int grantorSerialNumber; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java index 9a6c55b..d8f688b 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java @@ -103,7 +103,7 @@ public class NonGrantorDestroyedProcessor extends ReplyProcessor21 { /////////////// Inner message classes ////////////////// - public static final class NonGrantorDestroyedMessage extends PooledDistributionMessage + public static class NonGrantorDestroyedMessage extends PooledDistributionMessage implements MessageWithReply { private int processorId; @@ -218,7 +218,7 @@ public class NonGrantorDestroyedProcessor extends ReplyProcessor21 { } } - public static final class NonGrantorDestroyedReplyMessage extends ReplyMessage { + public static class NonGrantorDestroyedReplyMessage extends ReplyMessage { public static final byte OK = 0; public static final byte NOT_GRANTOR = 1; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java index 41c85d6..b993b53 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java @@ -1166,12 +1166,12 @@ public class InternalDistributedMember implements DistributedMember, Externaliza * index)); } else { sb.append(hostname); } } */ - public final void setVersionObjectForTest(Version v) { + public void setVersionObjectForTest(Version v) { this.versionObj = v; netMbr.setVersion(v); } - public final Version getVersionObject() { + public Version getVersionObject() { return this.versionObj; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java index 94c5f38..d2a6d1e 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java @@ -77,19 +77,19 @@ public class JGAddress extends UUID { } - public final InetAddress getInetAddress() { + public InetAddress getInetAddress() { return ip_addr; } - public final int getPort() { + public int getPort() { return port; } - public final int getVmViewId() { + public int getVmViewId() { return this.vmViewId; } - protected final void setVmViewId(int id) { + protected void setVmViewId(int id) { this.vmViewId = id; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java index f92c318..be4047f 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java @@ -31,7 +31,7 @@ import org.apache.geode.distributed.internal.membership.NetView; * */ -public final class LocalViewMessage extends SerialDistributionMessage { +public class LocalViewMessage extends SerialDistributionMessage { private GMSMembershipManager manager; private long viewId; @@ -47,7 +47,7 @@ public final class LocalViewMessage extends SerialDistributionMessage { } @Override - final public int getProcessorType() { + public int getProcessorType() { return DistributionManager.VIEW_EXECUTOR; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java index b67191d..783f651 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java @@ -416,7 +416,7 @@ public abstract class StreamingOperation { } } - public static final class StreamingReplyMessage extends ReplyMessage { + public static class StreamingReplyMessage extends ReplyMessage { /** the number of this message */ protected int msgNum; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java b/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java index 768475b..2e81af6 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java +++ b/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java @@ -51,7 +51,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * (a copy is not made) so it should not be changed externally. * @param version the product version that serialized the object on given bytes */ - public final void initialize(byte[] bytes, Version version) { + public void initialize(byte[] bytes, Version version) { this.bytes = bytes; this.nBytes = bytes.length; this.pos = 0; @@ -62,11 +62,11 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final Version getVersion() { + public Version getVersion() { return this.version; } - private final int skipOver(long n) { + private int skipOver(long n) { final int capacity = (this.nBytes - this.pos); if (n <= capacity) { this.pos += (int) n; @@ -81,7 +81,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final int read() throws IOException { + public int read() throws IOException { if (this.pos < this.nBytes) { return (this.bytes[this.pos++] & 0xff); } else { @@ -93,7 +93,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final int read(byte[] b, int off, int len) { + public int read(byte[] b, int off, int len) { if (b == null) { throw new NullPointerException(); } else if (off < 0 || len < 0 || b.length < (off + len)) { @@ -117,7 +117,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final long skip(long n) { + public long skip(long n) { return skipOver(n); } @@ -125,21 +125,21 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final int available() { + public int available() { return (this.nBytes - this.pos); } /** * Get the current position in the byte[]. */ - public final int position() { + public int position() { return this.pos; } /** * Set the current position in the byte[]. */ - public final void setPosition(int pos) { + public void setPosition(int pos) { this.pos = pos; } @@ -147,7 +147,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final void readFully(byte[] b) throws IOException { + public void readFully(byte[] b) throws IOException { final int len = b.length; System.arraycopy(this.bytes, this.pos, b, 0, len); this.pos += len; @@ -157,7 +157,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final void readFully(byte[] b, int off, int len) throws IOException { + public void readFully(byte[] b, int off, int len) throws IOException { if (len > 0) { if ((this.nBytes - this.pos) >= len) { System.arraycopy(this.bytes, this.pos, b, off, len); @@ -174,7 +174,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final int skipBytes(int n) { + public int skipBytes(int n) { return skipOver(n); } @@ -182,7 +182,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final boolean readBoolean() throws IOException { + public boolean readBoolean() throws IOException { if (this.pos < this.nBytes) { return (this.bytes[this.pos++] != 0); } else { @@ -194,7 +194,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final byte readByte() throws IOException { + public byte readByte() throws IOException { if (this.pos < this.nBytes) { return this.bytes[this.pos++]; } else { @@ -206,7 +206,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final int readUnsignedByte() throws IOException { + public int readUnsignedByte() throws IOException { return read(); } @@ -214,7 +214,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final short readShort() throws IOException { + public short readShort() throws IOException { if ((this.pos + 1) < this.nBytes) { int result = (this.bytes[this.pos++] & 0xff); return (short) ((result << 8) | (this.bytes[this.pos++] & 0xff)); @@ -227,7 +227,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final int readUnsignedShort() throws IOException { + public int readUnsignedShort() throws IOException { if ((this.pos + 1) < this.nBytes) { int result = (this.bytes[this.pos++] & 0xff); return ((result << 8) | (this.bytes[this.pos++] & 0xff)); @@ -268,7 +268,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final long readLong() throws IOException { + public long readLong() throws IOException { if ((this.pos + 7) < this.nBytes) { long result = (this.bytes[this.pos++] & 0xff); result = (result << 8) | (this.bytes[this.pos++] & 0xff); @@ -287,7 +287,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final float readFloat() throws IOException { + public float readFloat() throws IOException { return Float.intBitsToFloat(readInt()); } @@ -295,7 +295,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final double readDouble() throws IOException { + public double readDouble() throws IOException { return Double.longBitsToDouble(readLong()); } @@ -303,7 +303,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio * {@inheritDoc} */ @Override - public final String readUTF() throws IOException { + public String readUTF() throws IOException { final int utfLen = readUnsignedShort(); if ((this.pos + utfLen) <= this.nBytes) { http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java index 2363990..4773229 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java +++ b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java @@ -37,7 +37,7 @@ public class ByteBufferOutputStream extends OutputStream { /** write the low-order 8 bits of the given int */ @Override - public final void write(int b) { + public void write(int b) { try { this.buffer.put((byte) (b & 0xff)); } catch (BufferOverflowException e) { @@ -62,7 +62,7 @@ public class ByteBufferOutputStream extends OutputStream { /** override OutputStream's write() */ @Override - public final void write(byte[] source, int offset, int len) { + public void write(byte[] source, int offset, int len) { try { // System.out.println("writing len="+len + " cap=" + buffer.capacity() + " // pos="+buffer.position()); @@ -77,11 +77,11 @@ public class ByteBufferOutputStream extends OutputStream { } } - public final int size() { + public int size() { return buffer.position(); } - public final void reset() { + public void reset() { buffer.clear(); } @@ -89,7 +89,7 @@ public class ByteBufferOutputStream extends OutputStream { * gets the content ByteBuffer, ready for reading. The stream should not be written to past this * point until it has been reset. */ - public final ByteBuffer getContentBuffer() { + public ByteBuffer getContentBuffer() { buffer.flip(); return buffer; } @@ -97,7 +97,7 @@ public class ByteBufferOutputStream extends OutputStream { /** * Gets a duplicate of the current content buffer. */ - public final ByteBuffer getDuplicateBuffer() { + public ByteBuffer getDuplicateBuffer() { return buffer.duplicate(); } } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java index be3b18c..4e77f38 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java +++ b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java @@ -31,11 +31,11 @@ public abstract class ExternalizableDSFID implements DataSerializableFixedID, Ex public abstract void fromData(DataInput in) throws IOException, ClassNotFoundException; - public final void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(ObjectOutput out) throws IOException { toData(out); } - public final void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { fromData(in); } } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java b/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java index f71a7c1..120d625 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java @@ -32,11 +32,11 @@ import org.apache.geode.management.internal.cli.util.GfshConsoleReader; public class GfeConsoleReaderFactory { private static GfeConsoleReader defaultConsoleReader = createConsoleReader(); - public static final GfeConsoleReader getDefaultConsoleReader() { + public static GfeConsoleReader getDefaultConsoleReader() { return defaultConsoleReader; } - public static final GfeConsoleReader createConsoleReader() { + public static GfeConsoleReader createConsoleReader() { GfeConsoleReader consoleReader = null; if (CliUtil.isGfshVM()) { http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java index ef8cfb2..ae28120 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java +++ b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java @@ -182,7 +182,7 @@ public class HeapDataOutputStream extends OutputStream /** write the low-order 8 bits of the given int */ @Override - public final void write(int b) { + public void write(int b) { if (this.ignoreWrites) return; checkIfWritable(); @@ -190,14 +190,14 @@ public class HeapDataOutputStream extends OutputStream buffer.put((byte) b); } - private final void ensureCapacity(int amount) { + private void ensureCapacity(int amount) { int remainingSpace = this.buffer.capacity() - this.buffer.position(); if (amount > remainingSpace) { expand(amount); } } - private final void expand(int amount) { + private void expand(int amount) { if (this.disallowExpansion) { this.buffer.position(this.memoPosition); this.ignoreWrites = true; @@ -217,7 +217,7 @@ public class HeapDataOutputStream extends OutputStream this.buffer = ByteBuffer.allocate(amount); } - private final void checkIfWritable() { + private void checkIfWritable() { if (!this.writeMode) { throw new IllegalStateException( LocalizedStrings.HeapDataOutputStream_NOT_IN_WRITE_MODE.toLocalizedString()); @@ -311,7 +311,7 @@ public class HeapDataOutputStream extends OutputStream } } - public final int size() { + public int size() { if (this.writeMode) { return this.size + this.buffer.position(); } else { @@ -322,7 +322,7 @@ public class HeapDataOutputStream extends OutputStream /** * Free up any unused memory */ - public final void trim() { + public void trim() { finishWriting(); if (this.buffer.limit() < this.buffer.capacity()) { // buffer is less than half full so allocate a new one and copy it in @@ -333,7 +333,7 @@ public class HeapDataOutputStream extends OutputStream } } - private final void consolidateChunks() { + private void consolidateChunks() { if (this.chunks != null) { final int size = size(); ByteBuffer newBuffer = ByteBuffer.allocate(size); @@ -355,7 +355,7 @@ public class HeapDataOutputStream extends OutputStream /** * Prepare the contents for sending again */ - public final void rewind() { + public void rewind() { finishWriting(); this.size = 0; if (this.chunks != null) { @@ -368,7 +368,7 @@ public class HeapDataOutputStream extends OutputStream size += this.buffer.remaining(); } - public final void reset() { + public void reset() { this.size = 0; if (this.chunks != null) { this.chunks.clear(); @@ -425,7 +425,7 @@ public class HeapDataOutputStream extends OutputStream * gets the contents of this stream as s ByteBuffer, ready for reading. The stream should not be * written to past this point until it has been reset. */ - public final ByteBuffer toByteBuffer() { + public ByteBuffer toByteBuffer() { finishWriting(); consolidateChunks(); return this.buffer; @@ -435,7 +435,7 @@ public class HeapDataOutputStream extends OutputStream * gets the contents of this stream as a byte[]. The stream should not be written to past this * point until it has been reset. */ - public final byte[] toByteArray() { + public byte[] toByteArray() { ByteBuffer bb = toByteBuffer(); if (bb.hasArray() && bb.arrayOffset() == 0 && bb.limit() == bb.capacity()) { return bb.array(); @@ -484,7 +484,7 @@ public class HeapDataOutputStream extends OutputStream * @return the number of bytes written, possibly zero. * @throws IOException if channel is closed, not yet connected, or some other I/O error occurs. */ - public final int sendTo(SocketChannel chan) throws IOException { + public int sendTo(SocketChannel chan) throws IOException { finishWriting(); if (size() == 0) { return 0; @@ -502,7 +502,7 @@ public class HeapDataOutputStream extends OutputStream return result; } - public final void sendTo(SocketChannel chan, ByteBuffer out) throws IOException { + public void sendTo(SocketChannel chan, ByteBuffer out) throws IOException { finishWriting(); if (size() == 0) { return; @@ -521,8 +521,7 @@ public class HeapDataOutputStream extends OutputStream * sends the data from "in" by writing it to "sc" through "out" (out is used to chunk to data and * is probably a direct memory buffer). */ - private final void sendChunkTo(ByteBuffer in, SocketChannel sc, ByteBuffer out) - throws IOException { + private void sendChunkTo(ByteBuffer in, SocketChannel sc, ByteBuffer out) throws IOException { int bytesSent = in.remaining(); if (in.isDirect()) { flushBuffer(sc, out); @@ -570,7 +569,7 @@ public class HeapDataOutputStream extends OutputStream * * @throws BufferOverflowException if out is not large enough to contain all of our data. */ - public final void sendTo(ByteBuffer out) { + public void sendTo(ByteBuffer out) { finishWriting(); if (out.remaining() < size()) { throw new BufferOverflowException(); @@ -597,7 +596,7 @@ public class HeapDataOutputStream extends OutputStream /** * Write the contents of this stream to the specified stream using outBuf if a buffer is needed. */ - public final void sendTo(OutputStream out, ByteBuffer outBuf) throws IOException { + public void sendTo(OutputStream out, ByteBuffer outBuf) throws IOException { finishWriting(); if (this.chunks != null) { for (ByteBuffer bb : this.chunks) { @@ -655,7 +654,7 @@ public class HeapDataOutputStream extends OutputStream /** * Write the contents of this stream to the specified stream. */ - public final void sendTo(ByteBufferWriter out) { + public void sendTo(ByteBufferWriter out) { finishWriting(); if (this.chunks != null) { for (ByteBuffer bb : this.chunks) { @@ -677,11 +676,11 @@ public class HeapDataOutputStream extends OutputStream * Returns an input stream that can be used to read the contents that where written to this output * stream. */ - public final InputStream getInputStream() { + public InputStream getInputStream() { return new HDInputStream(); } - private final class HDInputStream extends InputStream { + private class HDInputStream extends InputStream { private Iterator<ByteBuffer> chunkIt; private ByteBuffer bb; @@ -802,7 +801,7 @@ public class HeapDataOutputStream extends OutputStream * Note this implementation is exactly the same as writeTo(OutputStream) but they do not both * implement a common interface. */ - public final void sendTo(DataOutput out) throws IOException { + public void sendTo(DataOutput out) throws IOException { finishWriting(); if (this.chunks != null) { for (ByteBuffer bb : this.chunks) { @@ -847,7 +846,7 @@ public class HeapDataOutputStream extends OutputStream * * @param v the boolean to be written. */ - public final void writeBoolean(boolean v) { + public void writeBoolean(boolean v) { write(v ? 1 : 0); } @@ -860,7 +859,7 @@ public class HeapDataOutputStream extends OutputStream * * @param v the byte value to be written. */ - public final void writeByte(int v) { + public void writeByte(int v) { write(v); } @@ -882,7 +881,7 @@ public class HeapDataOutputStream extends OutputStream * * @param v the <code>short</code> value to be written. */ - public final void writeShort(int v) { + public void writeShort(int v) { if (this.ignoreWrites) return; checkIfWritable(); @@ -908,7 +907,7 @@ public class HeapDataOutputStream extends OutputStream * * @param v the <code>char</code> value to be written. */ - public final void writeChar(int v) { + public void writeChar(int v) { if (this.ignoreWrites) return; checkIfWritable(); @@ -935,7 +934,7 @@ public class HeapDataOutputStream extends OutputStream * * @param v the <code>int</code> value to be written. */ - public final void writeInt(int v) { + public void writeInt(int v) { if (this.ignoreWrites) return; checkIfWritable(); @@ -966,7 +965,7 @@ public class HeapDataOutputStream extends OutputStream * * @param v the <code>long</code> value to be written. */ - public final void writeLong(long v) { + public void writeLong(long v) { if (this.ignoreWrites) return; checkIfWritable(); @@ -980,7 +979,7 @@ public class HeapDataOutputStream extends OutputStream * * @return the LongUpdater that allows the long to be updated */ - public final LongUpdater reserveLong() { + public LongUpdater reserveLong() { if (this.ignoreWrites) return null; checkIfWritable(); @@ -1014,7 +1013,7 @@ public class HeapDataOutputStream extends OutputStream * * @param v the <code>float</code> value to be written. */ - public final void writeFloat(float v) { + public void writeFloat(float v) { if (this.ignoreWrites) return; checkIfWritable(); @@ -1032,7 +1031,7 @@ public class HeapDataOutputStream extends OutputStream * * @param v the <code>double</code> value to be written. */ - public final void writeDouble(double v) { + public void writeDouble(double v) { if (this.ignoreWrites) return; checkIfWritable(); @@ -1053,7 +1052,7 @@ public class HeapDataOutputStream extends OutputStream * * @param str the string of bytes to be written. */ - public final void writeBytes(String str) { + public void writeBytes(String str) { if (this.ignoreWrites) return; checkIfWritable(); @@ -1087,7 +1086,7 @@ public class HeapDataOutputStream extends OutputStream * * @param s the string value to be written. */ - public final void writeChars(String s) { + public void writeChars(String s) { if (this.ignoreWrites) return; checkIfWritable(); @@ -1157,7 +1156,7 @@ public class HeapDataOutputStream extends OutputStream * * @param str the string value to be written. */ - public final void writeUTF(String str) throws UTFDataFormatException { + public void writeUTF(String str) throws UTFDataFormatException { if (this.ignoreWrites) return; checkIfWritable(); @@ -1168,7 +1167,7 @@ public class HeapDataOutputStream extends OutputStream } } - private final void writeAsciiUTF(String str, boolean encodeLength) throws UTFDataFormatException { + private void writeAsciiUTF(String str, boolean encodeLength) throws UTFDataFormatException { int strlen = str.length(); if (encodeLength && strlen > 65535) { throw new UTFDataFormatException(); @@ -1203,7 +1202,7 @@ public class HeapDataOutputStream extends OutputStream * The reader code should use the logic similar to DataOutputStream.readUTF() from the version * 1.6.0_10 to decode this properly. */ - private final void writeFullUTF(String str, boolean encodeLength) throws UTFDataFormatException { + private void writeFullUTF(String str, boolean encodeLength) throws UTFDataFormatException { int strlen = str.length(); if (encodeLength && strlen > 65535) { throw new UTFDataFormatException(); http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java index 7dbd701..78b2944 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java +++ b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java @@ -3230,7 +3230,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D * A distribution message that alerts other members of the distributed cache of a new * {@code DataSerializer} being registered. */ - public static final class RegistrationMessage extends SerialDistributionMessage { + public static class RegistrationMessage extends SerialDistributionMessage { /** * The id of the {@code DataSerializer} that was registered since 5.7 an int instead of a byte */ @@ -3465,21 +3465,21 @@ public abstract class InternalDataSerializer extends DataSerializer implements D */ protected abstract static class WellKnownDS extends DataSerializer { @Override - public final int getId() { + public int getId() { // illegal for a customer to use but since our WellKnownDS is never registered // with this id it gives us one to use return 0; } @Override - public final Class[] getSupportedClasses() { + public Class[] getSupportedClasses() { // illegal for a customer to return null but we can do it since we never register // this serializer. return null; } @Override - public final Object fromData(DataInput in) throws IOException, ClassNotFoundException { + public Object fromData(DataInput in) throws IOException, ClassNotFoundException { throw new IllegalStateException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString()); } // subclasses need to implement toData http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java b/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java index 1c1a73e..64dd90b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java @@ -955,7 +955,7 @@ public class InternalInstantiator { * * @since GemFire 5.0 */ - public static final class RegistrationContextMessage extends RegistrationMessage { + public static class RegistrationContextMessage extends RegistrationMessage { private transient ClientProxyMembershipID context; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java index d4ec874..0945a10 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java +++ b/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java @@ -27,7 +27,7 @@ import org.apache.geode.DataSerializer; * @since GemFire 5.0.2 * */ -public final class NullDataOutputStream extends OutputStream implements ObjToByteArraySerializer { +public class NullDataOutputStream extends OutputStream implements ObjToByteArraySerializer { private int size; @@ -37,17 +37,17 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt /** write the low-order 8 bits of the given int */ @Override - public final void write(int b) { + public void write(int b) { this.size++; } /** override OutputStream's write() */ @Override - public final void write(byte[] source, int offset, int len) { + public void write(byte[] source, int offset, int len) { this.size += len; } - public final int size() { + public int size() { return this.size; } @@ -68,7 +68,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt * @param v the boolean to be written. * @exception IOException if an I/O error occurs. */ - public final void writeBoolean(boolean v) throws IOException { + public void writeBoolean(boolean v) throws IOException { write(v ? 1 : 0); } @@ -82,7 +82,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt * @param v the byte value to be written. * @exception IOException if an I/O error occurs. */ - public final void writeByte(int v) throws IOException { + public void writeByte(int v) throws IOException { write(v); } @@ -105,7 +105,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt * @param v the <code>short</code> value to be written. * @exception IOException if an I/O error occurs. */ - public final void writeShort(int v) throws IOException { + public void writeShort(int v) throws IOException { this.size += 2; } @@ -128,7 +128,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt * @param v the <code>char</code> value to be written. * @exception IOException if an I/O error occurs. */ - public final void writeChar(int v) throws IOException { + public void writeChar(int v) throws IOException { this.size += 2; } @@ -152,7 +152,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt * @param v the <code>int</code> value to be written. * @exception IOException if an I/O error occurs. */ - public final void writeInt(int v) throws IOException { + public void writeInt(int v) throws IOException { this.size += 4; } @@ -180,7 +180,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt * @param v the <code>long</code> value to be written. * @exception IOException if an I/O error occurs. */ - public final void writeLong(long v) throws IOException { + public void writeLong(long v) throws IOException { this.size += 8; } @@ -195,7 +195,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt * @param v the <code>float</code> value to be written. * @exception IOException if an I/O error occurs. */ - public final void writeFloat(float v) throws IOException { + public void writeFloat(float v) throws IOException { this.size += 4; } @@ -210,7 +210,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt * @param v the <code>double</code> value to be written. * @exception IOException if an I/O error occurs. */ - public final void writeDouble(double v) throws IOException { + public void writeDouble(double v) throws IOException { this.size += 8; } @@ -228,7 +228,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt * @param str the string of bytes to be written. * @exception IOException if an I/O error occurs. */ - public final void writeBytes(String str) throws IOException { + public void writeBytes(String str) throws IOException { int strlen = str.length(); if (strlen > 0) { this.size += strlen; @@ -246,7 +246,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt * @param s the string value to be written. * @exception IOException if an I/O error occurs. */ - public final void writeChars(String s) throws IOException { + public void writeChars(String s) throws IOException { int len = s.length(); if (len > 0) { this.size += len * 2; @@ -304,7 +304,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt * @param str the string value to be written. * @exception IOException if an I/O error occurs. */ - public final void writeUTF(String str) throws IOException { + public void writeUTF(String str) throws IOException { int strlen = str.length(); if (strlen > 65535) { throw new UTFDataFormatException();
