GEODE-2929: remove superfluous final from methods
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/4d61b82e Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/4d61b82e Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/4d61b82e Branch: refs/heads/feature/GEODE-2929-1 Commit: 4d61b82e94208c6754961f7ce9bf24e37b0f6389 Parents: 52dadee Author: Kirk Lund <kl...@apache.org> Authored: Wed May 17 14:25:02 2017 -0700 Committer: Kirk Lund <kl...@apache.org> Committed: Thu May 18 12:38:48 2017 -0700 ---------------------------------------------------------------------- .../internal/web/RestInterfaceJUnitTest.java | 2 +- .../java/org/apache/geode/CancelCriterion.java | 4 +- .../org/apache/geode/CanonicalInstantiator.java | 6 +- .../java/org/apache/geode/DataSerializer.java | 30 ++--- .../java/org/apache/geode/Instantiator.java | 20 +--- .../geode/admin/RegionSubRegionSnapshot.java | 16 +-- .../apache/geode/cache/DiskAccessException.java | 4 +- .../geode/cache/DynamicRegionFactory.java | 3 +- .../org/apache/geode/cache/EvictionAction.java | 10 +- .../apache/geode/cache/EvictionAlgorithm.java | 16 +-- .../apache/geode/cache/EvictionAttributes.java | 4 +- .../geode/cache/FixedPartitionAttributes.java | 10 +- .../geode/cache/MembershipAttributes.java | 16 ++- .../geode/cache/client/internal/AbstractOp.java | 2 +- .../geode/cache/execute/FunctionException.java | 10 +- .../cache/query/internal/ObjectIntHashMap.java | 13 +-- .../geode/compression/SnappyCompressor.java | 2 +- .../geode/distributed/AbstractLauncher.java | 2 +- .../geode/distributed/LocatorLauncher.java | 6 +- .../geode/distributed/ServerLauncher.java | 12 +- .../internal/DistributionAdvisor.java | 15 ++- .../internal/DistributionManager.java | 52 +++++++-- .../internal/DistributionMessage.java | 6 +- .../distributed/internal/ReplyProcessor21.java | 14 ++- .../apache/geode/internal/AbstractConfig.java | 3 +- .../geode/internal/HeapDataOutputStream.java | 26 +++-- .../geode/internal/ObjIdConcurrentMap.java | 27 ++--- .../apache/geode/internal/SharedLibrary.java | 2 +- .../org/apache/geode/internal/SystemTimer.java | 2 +- .../internal/cache/AbstractDiskRegion.java | 35 +++--- .../internal/cache/AbstractLRURegionMap.java | 9 +- .../cache/AbstractOplogDiskRegionEntry.java | 2 +- .../geode/internal/cache/AbstractRegion.java | 4 +- .../geode/internal/cache/AbstractRegionMap.java | 2 +- .../geode/internal/cache/BucketAdvisor.java | 5 +- .../geode/internal/cache/DestroyOperation.java | 9 +- .../internal/cache/DistPeerTXStateStub.java | 5 +- .../cache/DistributedCacheOperation.java | 8 +- .../cache/DistributedPutAllOperation.java | 3 +- .../geode/internal/cache/DistributedRegion.java | 2 +- ...stributedRegionFunctionStreamingMessage.java | 4 +- .../cache/DistributedRemoveAllOperation.java | 12 +- .../apache/geode/internal/cache/ExpiryTask.java | 2 +- .../geode/internal/cache/GemFireCacheImpl.java | 2 +- .../geode/internal/cache/GridAdvisor.java | 14 +-- .../internal/cache/InitialImageOperation.java | 6 +- .../cache/MemberFunctionStreamingMessage.java | 2 +- .../internal/cache/NonLocalRegionEntry.java | 8 +- .../cache/PartitionedRegionDataStore.java | 57 +-------- .../internal/cache/PlaceHolderDiskRegion.java | 4 +- .../geode/internal/cache/ProxyBucketRegion.java | 2 +- .../internal/cache/RemoteFetchEntryMessage.java | 8 +- .../internal/cache/RemotePutAllMessage.java | 3 +- .../internal/cache/RemoteRemoveAllMessage.java | 2 +- .../internal/cache/StateFlushOperation.java | 2 +- .../apache/geode/internal/cache/TXEvent.java | 7 +- .../org/apache/geode/internal/cache/TXId.java | 8 +- .../apache/geode/internal/cache/TXMessage.java | 2 +- .../apache/geode/internal/cache/TXState.java | 14 --- .../geode/internal/cache/TXStateStub.java | 16 +-- .../cache/VMStatsDiskLRURegionEntryHeap.java | 5 +- .../cache/VMStatsDiskLRURegionEntryOffHeap.java | 5 +- .../cache/VMStatsDiskRegionEntryHeap.java | 5 +- .../cache/VMStatsDiskRegionEntryOffHeap.java | 5 +- .../cache/VMStatsLRURegionEntryHeap.java | 5 +- .../cache/VMStatsLRURegionEntryOffHeap.java | 5 +- .../internal/cache/VMStatsRegionEntryHeap.java | 5 +- .../cache/VMStatsRegionEntryOffHeap.java | 5 +- .../cache/VMThinDiskLRURegionEntryHeap.java | 5 +- .../cache/VMThinDiskLRURegionEntryOffHeap.java | 5 +- .../cache/VMThinDiskRegionEntryHeap.java | 5 +- .../cache/VMThinDiskRegionEntryOffHeap.java | 5 +- .../cache/VMThinLRURegionEntryHeap.java | 5 +- .../cache/VMThinLRURegionEntryOffHeap.java | 5 +- .../internal/cache/VMThinRegionEntryHeap.java | 4 +- .../cache/VMThinRegionEntryOffHeap.java | 4 +- .../VersionedStatsDiskLRURegionEntryHeap.java | 5 +- ...VersionedStatsDiskLRURegionEntryOffHeap.java | 5 +- .../VersionedStatsDiskRegionEntryHeap.java | 5 +- .../VersionedStatsDiskRegionEntryOffHeap.java | 5 +- .../cache/VersionedStatsLRURegionEntryHeap.java | 5 +- .../VersionedStatsLRURegionEntryOffHeap.java | 5 +- .../cache/VersionedStatsRegionEntryHeap.java | 5 +- .../cache/VersionedStatsRegionEntryOffHeap.java | 5 +- .../VersionedThinDiskLRURegionEntryHeap.java | 5 +- .../VersionedThinDiskLRURegionEntryOffHeap.java | 5 +- .../cache/VersionedThinDiskRegionEntryHeap.java | 5 +- .../VersionedThinDiskRegionEntryOffHeap.java | 5 +- .../cache/VersionedThinLRURegionEntryHeap.java | 5 +- .../VersionedThinLRURegionEntryOffHeap.java | 5 +- .../cache/VersionedThinRegionEntryHeap.java | 5 +- .../cache/VersionedThinRegionEntryOffHeap.java | 5 +- .../internal/cache/control/ResourceAdvisor.java | 2 +- .../internal/cache/locks/TXLockIdImpl.java | 6 +- .../geode/internal/cache/lru/LRUAlgorithm.java | 42 ++----- .../cache/partitioned/BucketBackupMessage.java | 4 +- .../partitioned/DeposePrimaryBucketMessage.java | 4 +- .../cache/partitioned/FetchEntryMessage.java | 18 +-- .../FetchPartitionDetailsMessage.java | 4 +- .../cache/partitioned/MoveBucketMessage.java | 5 +- .../cache/partitioned/PartitionMessage.java | 14 +-- .../cache/partitioned/RemoveAllPRMessage.java | 4 +- .../cache/partitioned/RemoveBucketMessage.java | 6 +- .../internal/cache/partitioned/SizeMessage.java | 8 +- .../cache/tier/sockets/CacheClientUpdater.java | 4 +- .../geode/internal/cache/tier/sockets/Part.java | 20 +--- .../parallel/ParallelGatewaySenderQueue.java | 22 ---- .../cache/wan/serial/BatchDestroyOperation.java | 10 +- .../CacheTransactionManagerCreation.java | 10 +- .../cache/xmlcache/CacheXmlVersion.java | 7 +- .../cache/xmlcache/DefaultEntityResolver2.java | 9 +- .../internal/statistics/StatArchiveWriter.java | 4 +- .../apache/geode/internal/tcp/Connection.java | 117 +++++++++---------- .../management/internal/IdentityConverter.java | 5 +- .../management/internal/OpenTypeConverter.java | 63 ++-------- .../management/internal/cli/json/TypedJson.java | 19 +-- .../management/internal/web/domain/Link.java | 6 +- .../internal/web/http/ClientHttpRequest.java | 2 +- .../internal/executor/AbstractScanExecutor.java | 6 +- .../org/apache/geode/DataSerializerTest.java | 50 ++++++++ .../java/org/apache/geode/InstantiatorTest.java | 53 +++++++++ .../admin/RegionSubRegionSnapshotTest.java | 58 +++++++++ .../cache/ConnectionPoolFactoryJUnitTest.java | 2 +- .../geode/cache/DiskAccessExceptionTest.java | 34 ++++++ .../cache/client/internal/AbstractOpTest.java | 39 +++++++ .../cache/execute/FunctionExceptionTest.java | 51 ++++++++ .../query/functional/PdxOrderByJUnitTest.java | 6 +- ...pdateWithInplaceObjectModFalseDUnitTest.java | 2 +- .../cache30/CacheSerializableRunnable.java | 4 +- .../apache/geode/cache30/RegionTestCase.java | 4 +- .../geode/cache30/TXDistributedDUnitTest.java | 2 +- .../apache/geode/cache30/TestCacheCallback.java | 2 +- .../apache/geode/cache30/TestCacheListener.java | 12 +- .../apache/geode/cache30/TestCacheLoader.java | 2 +- .../apache/geode/cache30/TestCacheWriter.java | 19 ++- .../geode/cache30/TestTransactionListener.java | 6 +- .../geode/distributed/AbstractLauncherTest.java | 18 ++- ...ocatorLauncherRemoteIntegrationTestCase.java | 2 +- ...ServerLauncherRemoteIntegrationTestCase.java | 2 +- .../geode/distributed/LocatorLauncherTest.java | 29 ++++- .../geode/distributed/ServerLauncherTest.java | 45 ++++++- .../internal/DistributionAdvisorTest.java | 34 ++++++ .../internal/DistributionManagerTest.java | 43 +++++++ .../internal/DistributionMessageTest.java | 37 ++++++ .../internal/ReplyProcessor21Test.java | 38 ++++++ .../geode/internal/AbstractConfigTest.java | 34 ++++++ .../internal/DataSerializableJUnitTest.java | 4 +- .../internal/HeapDataOutputStreamTest.java | 35 ++++++ .../geode/internal/ObjIdConcurrentMapTest.java | 39 +++++++ .../internal/cache/AbstractDiskRegionTest.java | 42 +++++++ .../cache/AbstractLRURegionMapTest.java | 44 +++++++ .../cache/AbstractOplogDiskRegionEntryTest.java | 38 ++++++ .../internal/cache/AbstractRegionMapTest.java | 35 +++++- .../internal/cache/AbstractRegionTest.java | 39 +++++++ .../geode/internal/cache/BucketAdvisorTest.java | 40 +++++++ .../geode/internal/cache/Bug37377DUnitTest.java | 4 +- .../geode/internal/cache/Bug39079DUnitTest.java | 4 +- .../cache/CacheOperationMessageTest.java | 50 ++++++++ .../internal/cache/DestroyMessageTest.java | 42 +++++++ .../cache/DiskRegCacheXmlJUnitTest.java | 2 +- .../cache/DiskRegionClearJUnitTest.java | 2 +- .../internal/cache/DiskRegionTestingBase.java | 2 +- .../internal/cache/DistPeerTXStateStubTest.java | 44 +++++++ .../cache/DistributedCacheOperationTest.java | 50 ++++++++ .../cache/DistributedPutAllOperationTest.java | 38 ++++++ ...butedRegionFunctionStreamingMessageTest.java | 44 +++++++ .../internal/cache/DistributedRegionTest.java | 42 +++++++ .../DistributedRemoveAllOperationTest.java | 38 ++++++ .../geode/internal/cache/ExpiryTaskTest.java | 34 ++++++ .../internal/cache/GemFireCacheImplTest.java | 13 +++ .../geode/internal/cache/GridProfileTest.java | 61 ++++++++++ .../MemberFunctionStreamingMessageTest.java | 39 +++++++ .../internal/cache/NonLocalRegionEntryTest.java | 45 +++++++ ...gionBucketCreationDistributionDUnitTest.java | 4 +- .../cache/PlaceHolderDiskRegionTest.java | 34 ++++++ .../internal/cache/ProxyBucketRegionTest.java | 37 ++++++ .../cache/RemoteFetchEntryMessageTest.java | 43 +++++++ .../internal/cache/RemotePutAllMessageTest.java | 39 +++++++ .../cache/RemoteRemoveAllMessageTest.java | 39 +++++++ .../cache/RequestFilterInfoMessageTest.java | 35 ++++++ .../internal/cache/RequestImageMessageTest.java | 35 ++++++ .../internal/cache/RequestRVVMessageTest.java | 35 ++++++ .../internal/cache/StateMarkerMessageTest.java | 35 ++++++ .../geode/internal/cache/TXEventTest.java | 36 ++++++ .../geode/internal/cache/TXMessageTest.java | 36 ++++++ .../geode/internal/cache/TXStateStubTest.java | 38 ++++++ .../apache/geode/internal/cache/UnzipUtil.java | 4 +- .../cache/control/ResourceAdvisorTest.java | 37 ++++++ .../internal/cache/ha/ConflatableObject.java | 20 ++-- .../internal/cache/lru/LRUAlgorithmTest.java | 34 ++++++ .../partitioned/BucketBackupMessageTest.java | 34 ++++++ .../ColocatedRegionDetailsJUnitTest.java | 73 ++++-------- .../DeposePrimaryBucketMessageTest.java | 42 +++++++ .../partitioned/FetchEntryMessageTest.java | 48 ++++++++ .../FetchPartitionDetailsMessageTest.java | 45 +++++++ .../partitioned/MoveBucketMessageTest.java | 44 +++++++ .../cache/partitioned/PartitionMessageTest.java | 31 +++-- .../partitioned/RemoveAllPRMessageTest.java | 37 ++++++ .../partitioned/RemoveBucketMessageTest.java | 44 +++++++ .../cache/partitioned/SizeMessageTest.java | 33 ++++++ .../cache/tier/sockets/CCUStatsTest.java | 39 +++++++ .../internal/cache/tier/sockets/PartTest.java | 41 +++++++ .../versions/RegionVersionHolderJUnitTest.java | 2 +- .../cache/versions/TombstoneDUnitTest.java | 2 +- .../cache/wan/AsyncEventQueueTestBase.java | 2 +- .../AsyncEventQueueValidationsJUnitTest.java | 2 +- .../cache/wan/serial/DestroyMessageTest.java | 43 +++++++ .../CacheTransactionManagerCreationTest.java | 47 ++++++++ .../xmlcache/DefaultEntityResolver2Test.java | 40 +++++++ .../internal/jta/functional/CacheJUnitTest.java | 2 +- .../jta/functional/TestXACacheLoader.java | 2 +- .../internal/logging/LogServiceJUnitTest.java | 2 +- .../logging/log4j/AlertAppenderJUnitTest.java | 4 +- .../log4j/LogWriterAppenderJUnitTest.java | 6 +- .../statistics/StatArchiveWriterTest.java | 39 +++++++ .../geode/internal/tcp/ConnectionTest.java | 45 +++++++ .../internal/CompositeBuilderViaFromTest.java | 45 +++++++ .../internal/CompositeBuilderViaProxyTest.java | 45 +++++++ .../internal/IdentityConverterTest.java | 36 ++++++ .../cli/commands/CliCommandTestBase.java | 4 +- .../cli/commands/ConfigCommandsDUnitTest.java | 2 +- .../cli/functions/ExportedLogsSizeInfoTest.java | 18 +-- .../ShowMissingDiskStoresFunctionJUnitTest.java | 82 +++---------- .../internal/cli/json/TypedJsonTest.java | 38 ++++++ .../WanCommandsControllerJUnitTest.java | 2 +- .../internal/web/domain/LinkTest.java | 45 +++++++ .../web/http/ClientHttpRequestTest.java | 37 ++++++ .../geode/pdx/PdxSerializableDUnitTest.java | 2 +- .../executor/AbstractScanExecutorTest.java | 39 +++++++ .../security/ClientAuthorizationTestCase.java | 4 +- .../DeltaClientAuthorizationDUnitTest.java | 2 +- .../DeltaClientPostAuthorizationDUnitTest.java | 2 +- .../generator/AuthzCredentialGenerator.java | 8 +- .../security/generator/CredentialGenerator.java | 8 +- .../org/apache/geode/test/dunit/DUnitEnv.java | 2 +- .../geode/test/dunit/DistributedTestUtils.java | 2 +- .../java/org/apache/geode/test/dunit/Wait.java | 6 +- ...ingGetPropertiesDisconnectsAllDUnitTest.java | 2 +- .../geode/test/golden/FailOutputTestCase.java | 3 +- .../apache/geode/test/golden/PassJUnitTest.java | 2 +- .../golden/PassWithExpectedProblemTestCase.java | 2 +- .../internal/cache/ha/CQListGIIDUnitTest.java | 2 +- .../geode/cache/lucene/LuceneDUnitTest.java | 2 +- .../lucene/LuceneIndexCreationDUnitTest.java | 8 +- ...IndexCreationPersistenceIntegrationTest.java | 3 +- .../lucene/LuceneIndexDestroyDUnitTest.java | 2 +- .../LuceneIndexCreationProfileJUnitTest.java | 4 +- .../cache/execute/FunctionException.java | 12 +- .../cache/execute/FunctionExceptionTest.java | 48 ++++++++ .../geode/internal/cache/wan/WANTestBase.java | 2 +- .../web/controllers/support/RegionData.java | 47 ++------ .../web/controllers/support/RegionDataTest.java | 35 ++++++ 252 files changed, 3551 insertions(+), 1013 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java index 324284e..7cdc104 100644 --- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java +++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java @@ -403,7 +403,7 @@ public class RestInterfaceJUnitTest { this.lastName = lastName; } - protected final String format(final Date dateTime) { + protected String format(final Date dateTime) { return format(dateTime, DEFAULT_BIRTH_DATE_FORMAT_PATTERN); } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/CancelCriterion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/CancelCriterion.java b/geode-core/src/main/java/org/apache/geode/CancelCriterion.java index fec3827..704da8e 100644 --- a/geode-core/src/main/java/org/apache/geode/CancelCriterion.java +++ b/geode-core/src/main/java/org/apache/geode/CancelCriterion.java @@ -58,7 +58,7 @@ public abstract class CancelCriterion { * * @return failure string if system failure has occurred */ - protected final String checkFailure() { + protected String checkFailure() { Throwable tilt = SystemFailure.getFailure(); if (tilt != null) { // Allocate no objects here! @@ -74,7 +74,7 @@ public abstract class CancelCriterion { * @param e an underlying exception or null if there is no exception that triggered this check * @see #cancelInProgress() */ - public final void checkCancelInProgress(Throwable e) { + public void checkCancelInProgress(Throwable e) { SystemFailure.checkFailure(); String reason = cancelInProgress(); if (reason == null) { http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java b/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java index 10e6f16..af34363 100644 --- a/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java +++ b/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java @@ -14,7 +14,8 @@ */ package org.apache.geode; -import java.io.*; +import java.io.DataInput; +import java.io.IOException; /** * <code>CanonicalInstantiator</code> is much like its parent <code>Instantiator</code> except that @@ -31,6 +32,7 @@ import java.io.*; * @since GemFire 5.1 */ public abstract class CanonicalInstantiator extends Instantiator { + /** * Creates a new <code>CanonicalInstantiator</code> that instantiates a given class. * @@ -54,7 +56,7 @@ public abstract class CanonicalInstantiator extends Instantiator { * @throws UnsupportedOperationException in all cases */ @Override - public final DataSerializable newInstance() { + public DataSerializable newInstance() { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/DataSerializer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializer.java b/geode-core/src/main/java/org/apache/geode/DataSerializer.java index 34501f8..2d16459 100644 --- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java +++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java @@ -193,10 +193,6 @@ public abstract class DataSerializer { protected static final ThreadLocal<Boolean> DISALLOW_JAVA_SERIALIZATION = new ThreadLocal<Boolean>(); - ////////////////////// Instance Fields ///////////////////// - - ////////////////////// Static Methods ////////////////////// - /** * Writes an instance of <code>Class</code> to a <code>DataOutput</code>. This method will handle * a <code>null</code> value and not throw a <code>NullPointerException</code>. @@ -322,7 +318,6 @@ public abstract class DataSerializer { return rgn; } - /** * Writes an instance of <code>Date</code> to a <code>DataOutput</code>. Note that even though * <code>date</code> may be an instance of a subclass of <code>Date</code>, <code>readDate</code> @@ -509,7 +504,7 @@ public abstract class DataSerializer { out.writeByte(DSCODE.NULL_STRING); } else { - // [bruce] writeUTF is expensive - it creates a char[] to fetch + // writeUTF is expensive - it creates a char[] to fetch // the string's contents, iterates over the array to compute the // encoded length, creates a byte[] to hold the encoded bytes, // iterates over the char[] again to create the encode bytes, @@ -2903,7 +2898,7 @@ public abstract class DataSerializer { * @see Instantiator * @see ObjectOutputStream#writeObject */ - public static final void writeObject(Object o, DataOutput out, boolean allowJavaSerialization) + public static void writeObject(Object o, DataOutput out, boolean allowJavaSerialization) throws IOException { if (allowJavaSerialization) { @@ -2937,7 +2932,7 @@ public abstract class DataSerializer { * @see DataSerializer * @see ObjectOutputStream#writeObject */ - public static final void writeObject(Object o, DataOutput out) throws IOException { + public static void writeObject(Object o, DataOutput out) throws IOException { InternalDataSerializer.basicWriteObject(o, out, false); } @@ -2962,8 +2957,7 @@ public abstract class DataSerializer { * @see ObjectInputStream#readObject */ @SuppressWarnings("unchecked") - public static final <T> T readObject(final DataInput in) - throws IOException, ClassNotFoundException { + public static <T> T readObject(final DataInput in) throws IOException, ClassNotFoundException { return (T) InternalDataSerializer.basicReadObject(in); } @@ -2997,12 +2991,10 @@ public abstract class DataSerializer { * the classes reserved by DataSerializer (see {@link #getSupportedClasses} for a list). * @see #getSupportedClasses */ - public static final DataSerializer register(Class<?> c) { + public static DataSerializer register(Class<?> c) { return InternalDataSerializer.register(c, true); } - /////////////////////// Constructors /////////////////////// - /** * Creates a new <code>DataSerializer</code>. All class that implement <code>DataSerializer</code> * must provide a zero-argument constructor. @@ -3010,11 +3002,9 @@ public abstract class DataSerializer { * @see #register(Class) */ public DataSerializer() { - + // nothing } - ///////////////////// Instance Methods ///////////////////// - /** * Returns the <code>Class</code>es whose instances are data serialized by this * <code>DataSerializer</code>. This method is invoked when this serializer is @@ -3111,7 +3101,7 @@ public abstract class DataSerializer { * * @since GemFire 6.5 */ - public final void setEventId(Object/* EventID */ eventId) { + public void setEventId(Object/* EventID */ eventId) { this.eventId = (EventID) eventId; } @@ -3121,7 +3111,7 @@ public abstract class DataSerializer { * * @since GemFire 6.5 */ - public final Object/* EventID */ getEventId() { + public Object/* EventID */ getEventId() { return this.eventId; } @@ -3130,7 +3120,7 @@ public abstract class DataSerializer { * * @since GemFire 6.5 */ - public final void setContext(Object/* ClientProxyMembershipID */ context) { + public void setContext(Object/* ClientProxyMembershipID */ context) { this.context = (ClientProxyMembershipID) context; } @@ -3139,7 +3129,7 @@ public abstract class DataSerializer { * * @since GemFire 6.5 */ - public final Object/* ClientProxyMembershipID */ getContext() { + public Object/* ClientProxyMembershipID */ getContext() { return this.context; } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/Instantiator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/Instantiator.java b/geode-core/src/main/java/org/apache/geode/Instantiator.java index e4da556..3c1ca06 100644 --- a/geode-core/src/main/java/org/apache/geode/Instantiator.java +++ b/geode-core/src/main/java/org/apache/geode/Instantiator.java @@ -142,9 +142,6 @@ public abstract class Instantiator { /** The originator of this <code>Instantiator</code> */ private ClientProxyMembershipID context; - - /////////////////////// Static Methods /////////////////////// - /** * Registers a <code>DataSerializable</code> class with the data serialization framework. This * method is usually invoked from the static initializer of a class that implements @@ -182,8 +179,6 @@ public abstract class Instantiator { InternalInstantiator.register(instantiator, distribute); } - //////////////////////// Constructors //////////////////////// - /** * Creates a new <code>Instantiator</code> that instantiates a given class. * @@ -217,8 +212,6 @@ public abstract class Instantiator { this.id = classId; } - ////////////////////// Instance Methods ////////////////////// - /** * Creates a new "empty" instance of a <Code>DataSerializable</code> class whose state will be * filled in by invoking its {@link DataSerializable#fromData fromData} method. @@ -231,21 +224,21 @@ public abstract class Instantiator { * Returns the <code>DataSerializable</code> class that is instantiated by this * <code>Instantiator</code>. */ - public final Class<? extends DataSerializable> getInstantiatedClass() { + public Class<? extends DataSerializable> getInstantiatedClass() { return this.clazz; } /** * Returns the unique <code>id</code> of this <code>Instantiator</code>. */ - public final int getId() { + public int getId() { return this.id; } /** * sets the unique <code>eventId</code> of this <code>Instantiator</code>. For internal use only. */ - public final void setEventId(Object/* EventID */ eventId) { + public void setEventId(Object/* EventID */ eventId) { this.eventId = (EventID) eventId; } @@ -253,23 +246,22 @@ public abstract class Instantiator { * Returns the unique <code>eventId</code> of this <code>Instantiator</code>. For internal use * only. */ - public final Object/* EventID */ getEventId() { + public Object/* EventID */ getEventId() { return this.eventId; } /** * sets the context of this <code>Instantiator</code>. For internal use only. */ - public final void setContext(Object/* ClientProxyMembershipID */ context) { + public void setContext(Object/* ClientProxyMembershipID */ context) { this.context = (ClientProxyMembershipID) context; } /** * Returns the context of this <code>Instantiator</code>. For internal use only. */ - public final Object/* ClientProxyMembershipID */ getContext() { + public Object/* ClientProxyMembershipID */ getContext() { return this.context; } - } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java b/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java index 19f89b2..69774b8 100644 --- a/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java +++ b/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java @@ -83,56 +83,56 @@ public class RegionSubRegionSnapshot implements DataSerializable { /** * @return get entry count of region */ - public final int getEntryCount() { + public int getEntryCount() { return entryCount; } /** * @param entryCount entry count of region */ - public final void setEntryCount(int entryCount) { + public void setEntryCount(int entryCount) { this.entryCount = entryCount; } /** * @return name of region */ - public final String getName() { + public String getName() { return name; } /** * @param name name of region */ - public final void setName(String name) { + public void setName(String name) { this.name = name; } /** * @return subRegionSnapshots of all the sub regions */ - public final Set getSubRegionSnapshots() { + public Set getSubRegionSnapshots() { return subRegionSnapshots; } /** * @param subRegionSnapshots subRegionSnapshots of all the sub regions */ - public final void setSubRegionSnapshots(Set subRegionSnapshots) { + public void setSubRegionSnapshots(Set subRegionSnapshots) { this.subRegionSnapshots = subRegionSnapshots; } /** * @return snapshot of parent region */ - public final RegionSubRegionSnapshot getParent() { + public RegionSubRegionSnapshot getParent() { return parent; } /** * @param parent snapshot of parent region */ - public final void setParent(RegionSubRegionSnapshot parent) { + public void setParent(RegionSubRegionSnapshot parent) { this.parent = parent; } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java b/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java index e77e485..fb640cd 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java +++ b/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java @@ -19,8 +19,6 @@ import java.io.IOException; /** * Indicates that an <code>IOException</code> during a disk region operation. * - * - * * @since GemFire 3.2 */ public class DiskAccessException extends CacheRuntimeException { @@ -114,7 +112,7 @@ public class DiskAccessException extends CacheRuntimeException { /** * Returns true if this exception originated from a remote node. */ - public final boolean isRemote() { + public boolean isRemote() { return this.isRemote; } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java index 9bf14cd..e9e64e7 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java +++ b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java @@ -32,7 +32,6 @@ import org.apache.geode.cache.client.internal.ServerRegionProxy; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.cache.wan.GatewaySender; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.internal.Assert; import org.apache.geode.internal.cache.DistributedRegion; import org.apache.geode.internal.cache.DynamicRegionAttributes; @@ -995,7 +994,7 @@ public abstract class DynamicRegionFactory { // while internal, its contents should be communicated with bridge clients @Override - final public boolean shouldNotifyBridgeClients() { + public boolean shouldNotifyBridgeClients() { return getCache().getCacheServers().size() > 0; } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java b/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java index a8513d9..0fd1b27 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java +++ b/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java @@ -55,7 +55,7 @@ public final class EvictionAction extends EnumSyntax { private static final String[] stringTable = {"none", "local-destroy", "overflow-to-disk",}; @Override - final protected String[] getStringTable() { + protected String[] getStringTable() { return stringTable; } @@ -64,19 +64,19 @@ public final class EvictionAction extends EnumSyntax { {NONE, LOCAL_DESTROY, OVERFLOW_TO_DISK}; @Override - final protected EnumSyntax[] getEnumValueTable() { + protected EnumSyntax[] getEnumValueTable() { return enumValueTable; } - public final boolean isLocalDestroy() { + public boolean isLocalDestroy() { return this == LOCAL_DESTROY; } - public final boolean isOverflowToDisk() { + public boolean isOverflowToDisk() { return this == OVERFLOW_TO_DISK; } - public final boolean isNone() { + public boolean isNone() { return this == NONE; } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java b/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java index 96b55b6..f57f257 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java +++ b/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java @@ -25,6 +25,7 @@ import javax.print.attribute.EnumSyntax; */ public final class EvictionAlgorithm extends EnumSyntax { private static final long serialVersionUID = 5778669432033106789L; + /** * The canonical EvictionAction that represents no eviction action */ @@ -71,16 +72,15 @@ public final class EvictionAlgorithm extends EnumSyntax { "lru-memory-size", "lifo-entry-count", "lifo-memory-size"}; @Override - final protected String[] getStringTable() { + protected String[] getStringTable() { return stringTable; } - // TODO post Java 1.8.0u45 uncomment final flag, see JDK-8076152 - private static /* final */ EvictionAlgorithm[] enumValueTable = + private static final EvictionAlgorithm[] enumValueTable = {NONE, LRU_ENTRY, LRU_HEAP, LRU_MEMORY, LIFO_ENTRY, LIFO_MEMORY,}; @Override - final protected EnumSyntax[] getEnumValueTable() { + protected EnumSyntax[] getEnumValueTable() { return enumValueTable; } @@ -111,15 +111,15 @@ public final class EvictionAlgorithm extends EnumSyntax { return null; } - public final boolean isLRUEntry() { + public boolean isLRUEntry() { return this == LRU_ENTRY; } - public final boolean isLRUMemory() { + public boolean isLRUMemory() { return this == LRU_MEMORY; } - public final boolean isLRUHeap() { + public boolean isLRUHeap() { return this == LRU_HEAP; } @@ -128,7 +128,7 @@ public final class EvictionAlgorithm extends EnumSyntax { return this.isLRUEntry() || this.isLRUMemory() || this.isLRUHeap(); } - public final boolean isNone() { + public boolean isNone() { return this == NONE; } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java index 8c30b30..cdd8aeb 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java +++ b/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java @@ -435,7 +435,7 @@ public abstract class EvictionAttributes implements DataSerializable { public abstract EvictionAction getAction(); @Override - public final boolean equals(final Object obj) { + public boolean equals(final Object obj) { if (obj == this) { return true; } @@ -455,7 +455,7 @@ public abstract class EvictionAttributes implements DataSerializable { } @Override - public final int hashCode() { + public int hashCode() { if (getAlgorithm().isLRUHeap()) { return getAlgorithm().hashCode(); } else { http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java index dd8bd94..b257bfa 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java +++ b/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java @@ -32,7 +32,6 @@ import org.apache.geode.internal.cache.FixedPartitionAttributesImpl; * * @since GemFire 6.6 */ - public abstract class FixedPartitionAttributes { private final static boolean DEFAULT_PRIMARY_STATUS = false; @@ -44,7 +43,7 @@ public abstract class FixedPartitionAttributes { * * @param name Name of the fixed partition. */ - final public static FixedPartitionAttributes createFixedPartition(String name) { + public static FixedPartitionAttributes createFixedPartition(String name) { return new FixedPartitionAttributesImpl().setPartitionName(name) .isPrimary(DEFAULT_PRIMARY_STATUS).setNumBuckets(DEFAULT_NUM_BUCKETS); } @@ -55,8 +54,7 @@ public abstract class FixedPartitionAttributes { * @param name Name of the fixed partition. * @param isPrimary True if this member is the primary for the partition. */ - final public static FixedPartitionAttributes createFixedPartition(String name, - boolean isPrimary) { + public static FixedPartitionAttributes createFixedPartition(String name, boolean isPrimary) { return new FixedPartitionAttributesImpl().setPartitionName(name).isPrimary(isPrimary) .setNumBuckets(DEFAULT_NUM_BUCKETS); } @@ -68,7 +66,7 @@ public abstract class FixedPartitionAttributes { * @param isPrimary True if this member is the primary for the partition. * @param numBuckets Number of buckets allowed for the partition. */ - final public static FixedPartitionAttributes createFixedPartition(String name, boolean isPrimary, + public static FixedPartitionAttributes createFixedPartition(String name, boolean isPrimary, int numBuckets) { return new FixedPartitionAttributesImpl().setPartitionName(name).isPrimary(isPrimary) .setNumBuckets(numBuckets); @@ -80,7 +78,7 @@ public abstract class FixedPartitionAttributes { * @param name Name of the fixed partition. * @param numBuckets Number of buckets allowed for the partition. */ - final public static FixedPartitionAttributes createFixedPartition(String name, int numBuckets) { + public static FixedPartitionAttributes createFixedPartition(String name, int numBuckets) { return new FixedPartitionAttributesImpl().setPartitionName(name) .isPrimary(DEFAULT_PRIMARY_STATUS).setNumBuckets(numBuckets); } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java index 79f7d8a..4479899 100755 --- a/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java +++ b/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java @@ -16,12 +16,20 @@ package org.apache.geode.cache; import org.apache.geode.DataSerializable; import org.apache.geode.DataSerializer; -import org.apache.geode.distributed.internal.membership.InternalRole; import org.apache.geode.distributed.Role; +import org.apache.geode.distributed.internal.membership.InternalRole; import org.apache.geode.internal.i18n.LocalizedStrings; -import java.io.*; -import java.util.*; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; /** * Configuration attributes for defining reliability requirements and behavior for a @@ -142,7 +150,7 @@ public class MembershipAttributes implements DataSerializable, Externalizable { return this.resumptionAction; } - private final Set<Role> toRoleSet(String[] roleNames) { + private Set<Role> toRoleSet(String[] roleNames) { if (roleNames == null || roleNames.length == 0) { return Collections.emptySet(); } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java index 593375e..a0cb7d4 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java @@ -274,7 +274,7 @@ public abstract class AbstractOp implements Op { * @throws Exception if response could not be processed or we received a response with a server * exception. */ - protected final Object processObjResponse(Message msg, String opName) throws Exception { + protected Object processObjResponse(Message msg, String opName) throws Exception { Part part = msg.getPart(0); final int msgType = msg.getMessageType(); if (msgType == MessageType.RESPONSE) { http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java index 3198b0d..54b4427 100755 --- a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java +++ b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java @@ -12,7 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.cache.execute; import java.util.ArrayList; @@ -37,8 +36,7 @@ import org.apache.geode.internal.Assert; * <p> * The exception string provides details on the cause of failure. * </p> - * - * + * * @since GemFire 6.0 * @see FunctionService */ @@ -92,7 +90,7 @@ public class FunctionException extends GemFireException { * @param cause * @since GemFire 6.5 */ - public final void addException(Throwable cause) { + public void addException(Throwable cause) { Assert.assertTrue(cause != null, "unexpected null exception to add to FunctionException"); getExceptions().add(cause); } @@ -102,7 +100,7 @@ public class FunctionException extends GemFireException { * * @since GemFire 6.5 */ - public final List<Throwable> getExceptions() { + public List<Throwable> getExceptions() { if (this.exceptions == null) { this.exceptions = new ArrayList<Throwable>(); } @@ -114,7 +112,7 @@ public class FunctionException extends GemFireException { * * @since GemFire 6.5 */ - public final void addExceptions(Collection<? extends Throwable> ex) { + public void addExceptions(Collection<? extends Throwable> ex) { getExceptions().addAll(ex); } } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java index d0cf5db..8a82181 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java @@ -113,7 +113,6 @@ import java.util.TreeMap; * @since 1.2 * @since GemFire 7.1 */ - public class ObjectIntHashMap implements Cloneable, Serializable { private static final long serialVersionUID = 7718697444988416372L; @@ -761,21 +760,21 @@ public class ObjectIntHashMap implements Cloneable, Serializable { hash = h; } - public final Object getKey() { + public Object getKey() { return key; } - public final int getValue() { + public int getValue() { return value; } - public final int setValue(int newValue) { + public int setValue(int newValue) { int oldValue = value; value = newValue; return oldValue; } - public final boolean equals(Object o) { + public boolean equals(Object o) { if (!(o instanceof Entry)) return false; Entry e = (Entry) o; @@ -790,11 +789,11 @@ public class ObjectIntHashMap implements Cloneable, Serializable { return false; } - public final int hashCode() { + public int hashCode() { return this.hash ^ value; } - public final String toString() { + public String toString() { return getKey() + "=" + getValue(); } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java b/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java index 6324823..3e56801 100644 --- a/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java +++ b/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java @@ -39,7 +39,7 @@ public class SnappyCompressor implements Compressor, Serializable { * * @deprecated As of Geode 1.0, getDefaultInstance is deprecated. Use constructor instead. */ - public static final SnappyCompressor getDefaultInstance() { + public static SnappyCompressor getDefaultInstance() { return new SnappyCompressor(); } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java index feba893..75f7b70 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java @@ -203,7 +203,7 @@ public abstract class AbstractLauncher<T extends Comparable<T>> implements Runna * @param debug a boolean used to enable or disable debug mode. * @see #isDebugging() */ - public final void setDebug(final boolean debug) { + public void setDebug(final boolean debug) { this.debug = debug; } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java index 641e009..40891e1 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java @@ -267,7 +267,7 @@ public class LocatorLauncher extends AbstractLauncher<String> { * * @return a reference to the Locator. */ - final InternalLocator getLocator() { + InternalLocator getLocator() { return this.locator; } @@ -279,7 +279,7 @@ public class LocatorLauncher extends AbstractLauncher<String> { * @see #getBindAddressAsString() * @see #getPortAsString() */ - public final String getId() { + public String getId() { return LocatorState.getBindAddressAsString(this).concat("[") .concat(LocatorState.getPortAsString(this)).concat("]"); } @@ -1489,7 +1489,7 @@ public class LocatorLauncher extends AbstractLauncher<String> { return this; } - final boolean isBindAddressSpecified() { + boolean isBindAddressSpecified() { return (getBindAddress() != null); } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java index b2d0151..d1f4c27 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java @@ -328,7 +328,7 @@ public class ServerLauncher extends AbstractLauncher<String> { * @return a reference to the Cache created by the GemFire Server start operation. * @see org.apache.geode.cache.Cache */ - final Cache getCache() { + Cache getCache() { if (this.cache != null) { boolean isReconnecting = this.cache.isReconnecting(); if (isReconnecting) { @@ -348,7 +348,7 @@ public class ServerLauncher extends AbstractLauncher<String> { * @return a CacheConfig object with additional GemFire Cache configuration meta-data used on * startup to configure the Cache. */ - public final CacheConfig getCacheConfig() { + public CacheConfig getCacheConfig() { final CacheConfig copy = new CacheConfig(); copy.setDeclarativeConfig(this.cacheConfig); return copy; @@ -362,7 +362,7 @@ public class ServerLauncher extends AbstractLauncher<String> { * @see #getServerBindAddressAsString() * @see #getServerPortAsString() */ - public final String getId() { + public String getId() { final StringBuilder buffer = new StringBuilder(ServerState.getServerBindAddressAsString(this)); final String serverPort = ServerState.getServerPortAsString(this); @@ -899,7 +899,7 @@ public class ServerLauncher extends AbstractLauncher<String> { * determined by the running flag and a connection to the distributed system (GemFire * cluster). */ - final boolean isWaiting(final Cache cache) { + boolean isWaiting(final Cache cache) { // return (isRunning() && !getCache().isClosed()); return (isRunning() && (cache.getDistributedSystem().isConnected() || cache.isReconnecting())); } @@ -952,7 +952,7 @@ public class ServerLauncher extends AbstractLauncher<String> { * @param cache the Cache to which the server will be added. * @throws IOException if the Cache server fails to start due to IO error. */ - final void startCacheServer(final Cache cache) throws IOException { + void startCacheServer(final Cache cache) throws IOException { if (isDefaultServerEnabled(cache)) { final String serverBindAddress = (getServerBindAddress() == null ? null : getServerBindAddress().getHostAddress()); @@ -1894,7 +1894,7 @@ public class ServerLauncher extends AbstractLauncher<String> { * * @return a boolean indicating if help was enabled. */ - protected final boolean isHelping() { + protected boolean isHelping() { return Boolean.TRUE.equals(getHelp()); } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java index 4eb9888..0acc6c2 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java @@ -12,7 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.distributed.internal; import org.apache.geode.CancelException; @@ -37,7 +36,14 @@ import org.apache.logging.log4j.Logger; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; @@ -57,7 +63,6 @@ import java.util.concurrent.atomic.AtomicInteger; * A primary design goal of this class is scalability: the footprint must be kept to a minimum as * the number of instances grows across a growing number of members in the distributed system. * - * * @since GemFire 3.0 */ public class DistributionAdvisor { @@ -242,7 +247,7 @@ public class DistributionAdvisor { return advisor; } - protected final void initialize() { + protected void initialize() { subInit(); getDistributionManager().addMembershipListener(this.ml); } @@ -1581,7 +1586,7 @@ public class DistributionAdvisor { * * @since GemFire 5.0 */ - public final InternalDistributedMember getDistributedMember() { + public InternalDistributedMember getDistributedMember() { return this.peerMemberId; } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/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 f4e547f..029e637 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 @@ -14,16 +14,33 @@ */ package org.apache.geode.distributed.internal; -import org.apache.geode.*; +import org.apache.geode.CancelCriterion; +import org.apache.geode.CancelException; +import org.apache.geode.ForcedDisconnectException; +import org.apache.geode.IncompatibleSystemException; +import org.apache.geode.InternalGemFireError; +import org.apache.geode.InternalGemFireException; +import org.apache.geode.InvalidDeltaException; +import org.apache.geode.SystemConnectException; +import org.apache.geode.SystemFailure; +import org.apache.geode.ToDataException; import org.apache.geode.admin.GemFireHealthConfig; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.DistributedSystemDisconnectedException; import org.apache.geode.distributed.Locator; import org.apache.geode.distributed.Role; import org.apache.geode.distributed.internal.locks.ElderState; -import org.apache.geode.distributed.internal.membership.*; +import org.apache.geode.distributed.internal.membership.DistributedMembershipListener; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.MemberFactory; +import org.apache.geode.distributed.internal.membership.MembershipManager; +import org.apache.geode.distributed.internal.membership.NetView; import org.apache.geode.i18n.StringId; -import org.apache.geode.internal.*; +import org.apache.geode.internal.Assert; +import org.apache.geode.internal.NanoTimer; +import org.apache.geode.internal.OSProcess; +import org.apache.geode.internal.SetUtils; +import org.apache.geode.internal.Version; import org.apache.geode.internal.admin.remote.AdminConsoleDisconnectMessage; import org.apache.geode.internal.admin.remote.RemoteGfManagerAgent; import org.apache.geode.internal.admin.remote.RemoteTransportConfig; @@ -42,11 +59,31 @@ import org.apache.geode.internal.tcp.ReenteredConnectException; import org.apache.geode.internal.util.concurrent.StoppableReentrantLock; import org.apache.logging.log4j.Logger; -import java.io.*; +import java.io.NotSerializableException; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.Semaphore; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** * The <code>DistributionManager</code> uses a {@link MembershipManager} to distribute @@ -3355,9 +3392,8 @@ public class DistributionManager implements DM { /** * Returns the executor for the given type of processor. - * */ - public final Executor getExecutor(int processorType, InternalDistributedMember sender) { + public Executor getExecutor(int processorType, InternalDistributedMember sender) { switch (processorType) { case STANDARD_EXECUTOR: return getThreadPool(); http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/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 403b420..bf11f7a 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 @@ -56,8 +56,6 @@ import org.apache.geode.internal.util.Breadcrumbs; * sequentialness/thread requirements of a message, extend DistributionMessage and implement * getExecutor(). * </P> - * - * */ public abstract class DistributionMessage implements DataSerializableFixedID, Cloneable { @@ -135,7 +133,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl * Get the next bit mask position while checking that the value should not exceed given maximum * value. */ - protected static final int getNextBitMask(int mask, final int maxValue) { + protected static int getNextBitMask(int mask, final int maxValue) { mask <<= 1; if (mask > maxValue) { Assert.fail("exhausted bit flags with all available bits: 0x" + Integer.toHexString(mask) @@ -158,7 +156,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl this.doDecMessagesBeingReceived = v; } - public final void setReplySender(ReplySender acker) { + public void setReplySender(ReplySender acker) { this.acker = acker; } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/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 7e87c8c..d93487d 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 @@ -12,7 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.distributed.internal; import org.apache.geode.CancelCriterion; @@ -34,7 +33,12 @@ import org.apache.geode.internal.util.Breadcrumbs; import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch; import org.apache.logging.log4j.Logger; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; /** * This class processes responses to {@link DistributionMessage}s. It handles a the generic case of @@ -69,8 +73,6 @@ import java.util.*; * <p> * * @see MessageWithReply - * - * * @since GemFire 2.1 */ public class ReplyProcessor21 implements MembershipListener { @@ -852,7 +854,7 @@ public class ReplyProcessor21 implements MembershipListener { * @throws InternalGemFireException if ack-threshold was exceeded and system property * "ack-threshold-exception" is set to true */ - public final void waitForRepliesUninterruptibly() throws ReplyException { + public void waitForRepliesUninterruptibly() throws ReplyException { waitForRepliesUninterruptibly(0); } @@ -929,7 +931,7 @@ public class ReplyProcessor21 implements MembershipListener { } /** do processing required when finished */ - protected final void finished() { + protected void finished() { boolean isDone = false; synchronized (this) { if (!this.done) { // make sure only called once http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java b/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java index 101ee63..7bb2de9 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java +++ b/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java @@ -12,7 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.internal; import static org.apache.geode.distributed.ConfigurationProperties.*; @@ -82,7 +81,7 @@ public abstract class AbstractConfig implements Config { * all values. */ @Override - public final String toString() { + public String toString() { return getClass().getName() + "@" + Integer.toHexString(hashCode()); } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/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 ae28120..98b1b44 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 @@ -22,7 +22,11 @@ import org.apache.geode.internal.logging.LogService; import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource; import org.apache.logging.log4j.Logger; -import java.io.*; +import java.io.DataOutput; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UTFDataFormatException; import java.nio.BufferOverflowException; import java.nio.ByteBuffer; import java.nio.channels.SocketChannel; @@ -35,21 +39,21 @@ import java.util.LinkedList; * ByteArrayOutputStream. * <p> * This class is not thread safe + * <p> + * Added boolean flag that when turned on will throw an exception instead of allocating a new + * buffer. The exception is a BufferOverflowException thrown from expand, and will restore the + * position to the point at which the flag was set with the disallowExpansion method. * - * @since GemFire 5.0.2 - * - * + * Usage Model: boolean succeeded = true; stream.disallowExpansion(); try { + * DataSerializer.writeObject(obj, stream); } catch (BufferOverflowException e) { succeeded = false; + * } * - * Added boolean flag that when turned on will throw an exception instead of allocating a new - * buffer. The exception is a BufferOverflowException thrown from expand, and will restore - * the position to the point at which the flag was set with the disallowExpansion method. - * Usage Model: boolean succeeded = true; stream.disallowExpansion(); try { - * DataSerializer.writeObject(obj, stream); } catch (BufferOverflowException e) { succeeded = - * false; } + * @since GemFire 5.0.2 */ public class HeapDataOutputStream extends OutputStream implements ObjToByteArraySerializer, VersionedDataStream, ByteBufferWriter { private static final Logger logger = LogService.getLogger(); + ByteBuffer buffer; protected LinkedList<ByteBuffer> chunks = null; protected int size = 0; @@ -163,7 +167,7 @@ public class HeapDataOutputStream extends OutputStream * {@inheritDoc} */ @Override - public final Version getVersion() { + public Version getVersion() { return this.version; } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java b/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java index 17894ad..a187c65 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java @@ -12,22 +12,23 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -/** - * - */ package org.apache.geode.internal; -/* - * Written by Doug Lea with assistance from members of JCP JSR-166 Expert Group and released to the - * public domain, as explained at http://creativecommons.org/licenses/publicdomain - */ - -import java.util.concurrent.locks.*; -import java.util.*; -import java.io.Serializable; import java.io.IOException; +import java.io.Serializable; +import java.util.ConcurrentModificationException; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.concurrent.locks.ReentrantLock; /** + * Written by Doug Lea with assistance from members of JCP JSR-166 Expert Group and released to the + * public domain, as explained at http://creativecommons.org/licenses/publicdomain + * + * <p> * A hash table supporting full concurrency of retrievals and adjustable expected concurrency for * updates. This class obeys the same functional specification as {@link java.util.Hashtable}, and * includes versions of methods corresponding to each method of <tt>Hashtable</tt>. However, even @@ -171,7 +172,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */ * @param hash the hash code for the key * @return the segment */ - final Segment<V> segmentFor(int hash) { + Segment<V> segmentFor(int hash) { return segments[(hash >>> segmentShift) & segmentMask]; } @@ -1005,7 +1006,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */ return hasNext(); } - final void advance() { + void advance() { if (nextEntry != null && (nextEntry = nextEntry.next) != null) return; http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java b/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java index 7faebe9..83e1422 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java +++ b/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java @@ -222,7 +222,7 @@ public class SharedLibrary { * @return returns a boolean indicating if the 64bit native library was loaded. * @since GemFire 5.1 */ - public final static boolean getIs64Bit() { + public static boolean getIs64Bit() { return PureJavaMode.is64Bit(); } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java b/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java index 16227d2..bd6b60a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java +++ b/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java @@ -435,7 +435,7 @@ public class SystemTimer { * Does debug logging, catches critical errors, then delegates to {@link #run2()} */ @Override - final public void run() { + public void run() { final boolean isDebugEnabled = logger.isTraceEnabled(); if (isDebugEnabled) { logger.trace("SystemTimer.MyTask: starting {}", this); http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java index 81011d3..1958a85 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java @@ -14,16 +14,6 @@ */ package org.apache.geode.internal.cache; -import java.io.PrintStream; -import java.util.EnumSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; - -import org.apache.logging.log4j.Logger; - import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.EvictionAlgorithm; import org.apache.geode.compression.Compressor; @@ -42,19 +32,25 @@ import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.LogService; import org.apache.geode.internal.logging.log4j.LogMarker; import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap; +import org.apache.logging.log4j.Logger; + +import java.io.PrintStream; +import java.util.EnumSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicLong; import joptsimple.internal.Strings; /** * Code shared by both DiskRegion and RecoveredDiskRegion. * - * * @since GemFire prPersistSprint2 */ public abstract class AbstractDiskRegion implements DiskRegionView { private static final Logger logger = LogService.getLogger(); - ////////////////////// Instance Fields /////////////////////// - private final DiskStoreImpl ds; private final long id; private long clearOplogEntryId = DiskStoreImpl.INVALID_ID; @@ -235,11 +231,9 @@ public abstract class AbstractDiskRegion implements DiskRegionView { this.offHeap = drv.getOffHeap(); } - ////////////////////// Instance Methods ////////////////////// - public abstract String getName(); - public final DiskStoreImpl getDiskStore() { + public DiskStoreImpl getDiskStore() { return this.ds; } @@ -380,15 +374,12 @@ public abstract class AbstractDiskRegion implements DiskRegionView { return PartitionedRegionHelper.getPRPath(bn); } - - private PersistentMemberID myInitializingId = null; private PersistentMemberID myInitializedId = null; private final CopyOnWriteHashSet<PersistentMemberID> onlineMembers; private final CopyOnWriteHashSet<PersistentMemberID> offlineMembers; private final CopyOnWriteHashSet<PersistentMemberID> equalMembers; - public PersistentMemberID addMyInitializingPMID(PersistentMemberID pmid) { PersistentMemberID result = this.myInitializingId; this.myInitializingId = pmid; @@ -905,7 +896,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView { public void dumpMetadata() { String name = getName(); - // TODO - DAN - make this a flag + // TODO: make this a flag // if (isBucket() && !DiskStoreImpl.TRACE_RECOVERY) { // name = getPrName(); // } @@ -976,7 +967,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView { * * @return an instance of BytesAndBits or Token.REMOVED_PHASE1 */ - public final Object getRaw(DiskId id) { + public Object getRaw(DiskId id) { this.acquireReadLock(); try { return getDiskStore().getRaw(this, id); @@ -1047,7 +1038,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView { @Override public void oplogRecovered(long oplogId) { - // do nothing. Overriden in ExportDiskRegion + // do nothing. Overridden in ExportDiskRegion } @Override http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java index bcaa0d0..988be0a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java @@ -12,7 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.internal.cache; import java.util.Iterator; @@ -50,8 +49,6 @@ import org.apache.geode.internal.size.ReflectionSingleObjectSizer; * Abstract implementation of {@link RegionMap} that adds LRU behaviour. * * @since GemFire 3.5.1 - * - * */ public abstract class AbstractLRURegionMap extends AbstractRegionMap { private static final Logger logger = LogService.getLogger(); @@ -263,7 +260,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { } /** unsafe audit code. */ - public final void audit() { + public void audit() { if (logger.isTraceEnabled(LogMarker.LRU)) { logger.trace(LogMarker.LRU, "Size of LRUMap = {}", sizeInVM()); } @@ -353,7 +350,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { * * @param delta Description of the Parameter */ - protected final void changeTotalEntrySize(int delta) { + protected void changeTotalEntrySize(int delta) { if (_isOwnerALocalRegion()) { if (_getOwner() instanceof BucketRegion) { BucketRegion bucketRegion = (BucketRegion) _getOwner(); @@ -577,7 +574,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { return resourceManager.getMemoryMonitor(offheap).getState().isEviction() && this.sizeInVM() > 0; } - public final int centralizedLruUpdateCallback() { + public int centralizedLruUpdateCallback() { final boolean isDebugEnabled_LRU = logger.isTraceEnabled(LogMarker.LRU); int evictedBytes = 0; http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java index 866ff03..bfeb941 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java @@ -35,7 +35,7 @@ public abstract class AbstractOplogDiskRegionEntry extends AbstractDiskRegionEnt abstract void setDiskId(RegionEntry oldRe); @Override - public final void removePhase1(LocalRegion r, boolean isClear) throws RegionClearedException { + public void removePhase1(LocalRegion r, boolean isClear) throws RegionClearedException { synchronized (this) { Helper.removeFromDisk(this, r, isClear); _removePhase1(); http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java index ac5fb37..b7cd199 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java @@ -1529,7 +1529,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes, Attrib * * @since GemFire 5.0 */ - final boolean isAllEvents() { + boolean isAllEvents() { return getDataPolicy().withReplication() || getSubscriptionAttributes().getInterestPolicy().isAll(); } @@ -1787,7 +1787,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes, Attrib return this.cache; } - public final long cacheTimeMillis() { + public long cacheTimeMillis() { return this.cache.getInternalDistributedSystem().getClock().cacheTimeMillis(); } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java index 5dcf3bc..a1b4a9d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java @@ -3768,7 +3768,7 @@ public abstract class AbstractRegionMap implements RegionMap { } /** removes a tombstone that has expired locally */ - public final boolean removeTombstone(RegionEntry re, VersionHolder version, boolean isEviction, + public boolean removeTombstone(RegionEntry re, VersionHolder version, boolean isEviction, boolean isScheduledTombstone) { boolean result = false; int destroyedVersion = version.getEntryVersion(); http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java index 04a48d0..0c58963 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java @@ -71,7 +71,6 @@ import org.apache.geode.internal.util.StopWatch; * Specialized {@link CacheDistributionAdvisor} for {@link BucketRegion BucketRegions}. The * <code>BucketAdvisor</code> is owned by a {@link ProxyBucketRegion} and may outlive a * <code>BucketRegion</code>. - * */ @SuppressWarnings("synthetic-access") public class BucketAdvisor extends CacheDistributionAdvisor { @@ -1211,7 +1210,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor { * * @return the member or null if no primary exists */ - public final InternalDistributedMember basicGetPrimaryMember() { + public InternalDistributedMember basicGetPrimaryMember() { return (InternalDistributedMember) this.primaryMember.get(); } @@ -1882,7 +1881,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor { * * @return current number of hosts of this bucket ; -1 if there are no hosts */ - public final int getBucketRedundancy() { + public int getBucketRedundancy() { return redundancy; } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java index ad3f976..20cbd28 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java @@ -12,14 +12,11 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.internal.cache; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import java.util.Collections; -import java.util.List; import org.apache.geode.DataSerializer; import org.apache.geode.cache.CacheEvent; @@ -36,10 +33,9 @@ import org.apache.geode.internal.offheap.annotations.Retained; /** * Handles distribution messaging for destroying an entry in a region. - * - * */ public class DestroyOperation extends DistributedCacheOperation { + /** Creates a new instance of DestroyOperation */ public DestroyOperation(EntryEventImpl event) { super(event); @@ -116,8 +112,7 @@ public class DestroyOperation extends DistributedCacheOperation { @Override @Retained - protected final InternalCacheEvent createEvent(DistributedRegion rgn) - throws EntryNotFoundException { + protected InternalCacheEvent createEvent(DistributedRegion rgn) throws EntryNotFoundException { EntryEventImpl ev = createEntryEvent(rgn); boolean evReturned = false; try { http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java index 6411353..4d85578 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java @@ -36,10 +36,9 @@ import org.apache.geode.internal.i18n.LocalizedStrings; * 1. It forwards TX operations to primary or a selected replica (in case of RR) for each op </br> * 2.It also records those transactional operations in order to send those to * secondaries/replicas(in one batch) at commit time. - * - * */ public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordinatorInterface { + private ArrayList<DistTxEntryEvent> primaryTransactionalOperations = null; private ArrayList<DistTxEntryEvent> secondaryTransactionalOperations = null; private DistTXPrecommitMessage precommitDistTxMsg = null; @@ -108,7 +107,7 @@ public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordi } @Override - public final ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations() + public ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations() throws UnsupportedOperationInTransactionException { return primaryTransactionalOperations; } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java index 6c33c65..a2d2e9d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java @@ -750,7 +750,7 @@ public abstract class DistributedCacheOperation { // nothing to do here - see UpdateMessage } - protected final void waitForAckIfNeeded(CacheOperationMessage msg, + protected void waitForAckIfNeeded(CacheOperationMessage msg, Map<InternalDistributedMember, PersistentMemberID> persistentIds) { if (this.processor == null) { return; @@ -1068,7 +1068,7 @@ public abstract class DistributedCacheOperation { } @Override - protected final void process(final DistributionManager dm) { + protected void process(final DistributionManager dm) { Throwable thr = null; boolean sendReply = true; @@ -1481,7 +1481,7 @@ public abstract class DistributedCacheOperation { } } - public final boolean supportsDirectAck() { + public boolean supportsDirectAck() { return this.directAck; } @@ -1518,7 +1518,7 @@ public abstract class DistributedCacheOperation { this.hasOldValue = true; } - protected final boolean _mayAddToMultipleSerialGateways(DistributionManager dm) { + protected boolean _mayAddToMultipleSerialGateways(DistributionManager dm) { int oldLevel = LocalRegion.setThreadInitLevelRequirement(LocalRegion.ANY_INIT); try { LocalRegion lr = getLocalRegionForProcessing(dm); http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java index c26cd56..4dcb0b7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java @@ -12,7 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.internal.cache; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; @@ -261,7 +260,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation { } } - public final EntryEventImpl getBaseEvent() { + public EntryEventImpl getBaseEvent() { return getEvent(); } http://git-wip-us.apache.org/repos/asf/geode/blob/4d61b82e/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java index 485835b..650fe2a 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java @@ -888,7 +888,7 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA } @Override - public final Object validatedDestroy(Object key, EntryEventImpl event) + public Object validatedDestroy(Object key, EntryEventImpl event) throws TimeoutException, EntryNotFoundException, CacheWriterException { Lock dlock = this.getDistributedLockIfGlobal(key); try {