You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/05/16 02:19:52 UTC
[42/78] geode git commit: GEODE-2929: remove final from methods on
internal classes
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 f2a6492..7042a85 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);
@@ -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,7 +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)
+ private void sendChunkTo(ByteBuffer in, SocketChannel sc, ByteBuffer out)
throws IOException {
int bytesSent = in.remaining();
if (in.isDirect()) {
@@ -570,7 +570,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 +597,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 +655,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,7 +677,7 @@ 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();
}
@@ -802,7 +802,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 +847,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 +860,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 +882,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 +908,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 +935,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 +966,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 +980,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 +1014,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 +1032,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 +1053,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 +1087,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 +1157,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 +1168,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 +1203,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/5abc4863/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 8c3ecb8..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
@@ -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/5abc4863/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 a9f9e95..2f0931d 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
@@ -37,17 +37,17 @@ public class NullDataOutputStream extends OutputStream implements ObjToByteArray
/** 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 class NullDataOutputStream extends OutputStream implements ObjToByteArray
* @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 class NullDataOutputStream extends OutputStream implements ObjToByteArray
* @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 class NullDataOutputStream extends OutputStream implements ObjToByteArray
* @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 class NullDataOutputStream extends OutputStream implements ObjToByteArray
* @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 class NullDataOutputStream extends OutputStream implements ObjToByteArray
* @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 class NullDataOutputStream extends OutputStream implements ObjToByteArray
* @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 class NullDataOutputStream extends OutputStream implements ObjToByteArray
* @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 class NullDataOutputStream extends OutputStream implements ObjToByteArray
* @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 class NullDataOutputStream extends OutputStream implements ObjToByteArray
* @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 class NullDataOutputStream extends OutputStream implements ObjToByteArray
* @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;
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 da94abb..17894ad 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
@@ -200,7 +200,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
}
@SuppressWarnings("unchecked")
- static final <V> HashEntry<V>[] newArray(int i) {
+ static <V> HashEntry<V>[] newArray(int i) {
return new HashEntry[i];
}
}
@@ -279,7 +279,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
}
@SuppressWarnings("unchecked")
- static final <K, V> Segment<V>[] newArray(int i) {
+ static <K, V> Segment<V>[] newArray(int i) {
return new Segment[i];
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java b/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java
index 3b10365..4e60c0b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java
@@ -67,11 +67,11 @@ public class PureJavaMode {
osStatsAreAvailable = osName.startsWith("Linux") || !isPure;
}
- public final static boolean isPure() {
+ public static boolean isPure() {
return isPure;
}
- public final static boolean is64Bit() {
+ public static boolean is64Bit() {
return is64Bit;
}
@@ -79,7 +79,7 @@ public class PureJavaMode {
* Linux has OsStats even in PureJava mode but other platforms require the native code to provide
* OS Statistics. return true if OSStatistics are available
*/
- public final static boolean osStatsAreAvailable() {
+ public static boolean osStatsAreAvailable() {
return osStatsAreAvailable;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/Version.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index 030da85..e058edb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -318,7 +318,7 @@ public class Version implements Comparable<Version> {
* {@link #readOrdinal(DataInput)} can deal with both compressed/uncompressed cases
* seemlessly
*/
- public final void writeOrdinal(DataOutput out, boolean compressed) throws IOException {
+ public void writeOrdinal(DataOutput out, boolean compressed) throws IOException {
writeOrdinal(out, this.ordinal, compressed);
}
@@ -326,7 +326,7 @@ public class Version implements Comparable<Version> {
* Fixed number of bytes required for serializing this version when "compressed" flag is false in
* {@link #writeOrdinal(DataOutput, boolean)}.
*/
- public static final int uncompressedSize() {
+ public static int uncompressedSize() {
return 3;
}
@@ -334,7 +334,7 @@ public class Version implements Comparable<Version> {
* Fixed number of bytes required for serializing this version when "compressed" flag is true in
* {@link #writeOrdinal(DataOutput, boolean)}.
*/
- public final int compressedSize() {
+ public int compressedSize() {
if (ordinal <= Byte.MAX_VALUE) {
return 1;
} else {
@@ -438,35 +438,35 @@ public class Version implements Comparable<Version> {
return this.gemfireVersion != null ? this.gemfireVersion : this;
}
- public final String getMethodSuffix() {
+ public String getMethodSuffix() {
return this.methodSuffix;
}
- public final String getProductName() {
+ public String getProductName() {
return this.productName;
}
- public final String getName() {
+ public String getName() {
return this.name;
}
- public final short getMajorVersion() {
+ public short getMajorVersion() {
return this.majorVersion;
}
- public final short getMinorVersion() {
+ public short getMinorVersion() {
return this.minorVersion;
}
- public final short getRelease() {
+ public short getRelease() {
return this.release;
}
- public final short getPatch() {
+ public short getPatch() {
return this.patch;
}
- public final short ordinal() {
+ public short ordinal() {
return this.ordinal;
}
@@ -488,7 +488,7 @@ public class Version implements Comparable<Version> {
* @return negative if this version is older, positive if this version is newer, 0 if this is the
* same version
*/
- public final int compareTo(short other) {
+ public int compareTo(short other) {
// first try to find the actual Version object
Version v = fromOrdinalNoThrow(other, false);
if (v == null) {
@@ -502,7 +502,7 @@ public class Version implements Comparable<Version> {
* {@inheritDoc}
*/
@Override
- public final int compareTo(Version other) {
+ public int compareTo(Version other) {
if (other != null) {
// [bruce] old implementation used ordinals for comparison, but this requires
// ordinals to be in increasing order, which may not always be possible
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
index cd14dc0..001fefe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
@@ -42,7 +42,7 @@ public class VersionedDataOutputStream extends DataOutputStream implements Versi
* {@inheritDoc}
*/
@Override
- public final Version getVersion() {
+ public Version getVersion() {
return this.version;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java
index 7a6ad09..fdcb224 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java
@@ -498,11 +498,11 @@ public class RemoteRegionAttributes implements RegionAttributes, DataSerializabl
}
@Override
- public final String toString() {
+ public String toString() {
return desc;
}
- public final void close() {}
+ public void close() {}
}
private static class RemoteCacheListener extends RemoteCacheCallback implements CacheListener {
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java
index 0f752b3..5b7c750 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java
@@ -48,7 +48,7 @@ public abstract class BaseDecoratorImpl implements StatAlertDefinition {
this._def = definition;
}
- public final int getId() {
+ public int getId() {
return _def.getId();
}
@@ -74,11 +74,11 @@ public abstract class BaseDecoratorImpl implements StatAlertDefinition {
_def.setName(name);
}
- public final StatisticInfo[] getStatisticInfo() {
+ public StatisticInfo[] getStatisticInfo() {
return _def.getStatisticInfo();
}
- public final void setStatisticInfo(StatisticInfo[] info) {
+ public void setStatisticInfo(StatisticInfo[] info) {
_def.setStatisticInfo(info);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java
index fa96cae..b1a8b0d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java
@@ -132,7 +132,7 @@ public class FunctionHelper {
*
* @param vals Array of number
*/
- public static final Number SUM(Number[] vals) {
+ public static Number SUM(Number[] vals) {
try {
double sum = 0.0;
for (int i = 0; i < vals.length; i++) {
@@ -160,7 +160,7 @@ public class FunctionHelper {
*
* @param vals Array of number
*/
- public static final Number AVG(Number[] vals) {
+ public static Number AVG(Number[] vals) {
try {
return Double.valueOf(SUM(vals).doubleValue() / vals.length);
} catch (VirtualMachineError err) {
@@ -184,7 +184,7 @@ public class FunctionHelper {
*
* @param vals Array of number
*/
- public static final Number MIN(Number[] vals) {
+ public static Number MIN(Number[] vals) {
try {
Collection col = Arrays.asList(vals);
Number min = (Number) Collections.max(col);
@@ -211,7 +211,7 @@ public class FunctionHelper {
*
* @param vals Array of number
*/
- public static final Number MAX(Number[] vals) {
+ public static Number MAX(Number[] vals) {
try {
Collection col = Arrays.asList(vals);
Number max = (Number) Collections.max(col);
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 554455d..81011d3 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
@@ -249,7 +249,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
this.versionVector = new DiskRegionVersionVector(ds.getDiskStoreID());
}
- public final long getId() {
+ public long getId() {
return this.id;
}
@@ -739,7 +739,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
this.readyForRecovery = false;
}
- public final boolean isReadyForRecovery() {
+ public boolean isReadyForRecovery() {
// better name for this method would be isRecovering
return this.readyForRecovery;
}
@@ -808,11 +808,11 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
* Returns true if this region maintains a backup of all its keys and values on disk. Returns
* false if only values that will not fit in memory are written to disk.
*/
- public final boolean isBackup() {
+ public boolean isBackup() {
return this.backup;
}
- protected final void setBackup(boolean v) {
+ protected void setBackup(boolean v) {
this.backup = v;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 a0e360f..e5e21ef 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
@@ -390,7 +390,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
*
* @return The total allowable size of this maps entries.
*/
- protected final long getLimit() {
+ protected long getLimit() {
if (_getOwner() instanceof BucketRegion) {
BucketRegion bucketRegion = (BucketRegion) _getOwner();
return bucketRegion.getLimit();
@@ -398,7 +398,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
return _getLruList().stats().getLimit();
}
- public final LRUStatistics getLRUStatistics() {
+ public LRUStatistics getLRUStatistics() {
return _getLruList().stats();
}
@@ -408,7 +408,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
*
* @return The current size of all the entries.
*/
- protected final long getTotalEntrySize() {
+ protected long getTotalEntrySize() {
if (_getOwnerObject() instanceof BucketRegion) {
BucketRegion bucketRegion = (BucketRegion) _getOwner();
return bucketRegion.getCounter();
@@ -417,7 +417,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- public final void lruUpdateCallback() {
+ public void lruUpdateCallback() {
final boolean isDebugEnabled_LRU = logger.isTraceEnabled(LogMarker.LRU);
if (getCallbackDisabled()) {
@@ -638,7 +638,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
*/
// TODO this method acts as LRUupdateCallbacks
// do we need to put it here are insert one level up
- public final void updateStats() {
+ public void updateStats() {
final int delta = getDelta();
resetThreadLocals();
if (logger.isTraceEnabled(LogMarker.LRU)) {
@@ -652,7 +652,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- public final boolean disableLruUpdateCallback() {
+ public boolean disableLruUpdateCallback() {
if (getCallbackDisabled()) {
return false;
} else {
@@ -662,29 +662,29 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- public final void enableLruUpdateCallback() {
+ public void enableLruUpdateCallback() {
setCallbackDisabled(false);
}
// TODO rebalancing these methods are new on the
// rebalancing branch but never used???
- public final void disableLruUpdateCallbackForInline() {
+ public void disableLruUpdateCallbackForInline() {
setCallbackDisabled(true);
}
- public final void enableLruUpdateCallbackForInline() {
+ public void enableLruUpdateCallbackForInline() {
setCallbackDisabled(false);
}
@Override
- public final void resetThreadLocals() {
+ public void resetThreadLocals() {
mustRemove.set(null);
lruDelta.set(null);
callbackDisabled.set(null);
}
@Override
- public final Set<VersionSource> clear(RegionVersionVector rvv) {
+ public Set<VersionSource> clear(RegionVersionVector rvv) {
_getLruList().clear(rvv);
return super.clear(rvv);
}
@@ -725,7 +725,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
*
*/
@Override
- protected final void lruEntryCreate(RegionEntry re) {
+ protected void lruEntryCreate(RegionEntry re) {
LRUEntry e = (LRUEntry) re;
// Assert.assertFalse(e._getValue() instanceof DiskEntry.RecoveredEntry)
if (logger.isTraceEnabled(LogMarker.LRU)) {
@@ -746,7 +746,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- protected final void lruEntryUpdate(RegionEntry re) {
+ protected void lruEntryUpdate(RegionEntry re) {
final LRUEntry e = (LRUEntry) re;
setDelta(e.updateEntrySize(_getCCHelper()));
if (logger.isDebugEnabled()) {
@@ -788,7 +788,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- protected final void lruEntryDestroy(RegionEntry re) {
+ protected void lruEntryDestroy(RegionEntry re) {
final LRUEntry e = (LRUEntry) re;
if (logger.isTraceEnabled(LogMarker.LRU)) {
logger.trace(LogMarker.LRU,
@@ -821,7 +821,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
* Called by DiskEntry.Helper.faultInValue
*/
@Override
- public final void lruEntryFaultIn(LRUEntry e) {
+ public void lruEntryFaultIn(LRUEntry e) {
if (logger.isDebugEnabled()) {
logger.debug("lruEntryFaultIn for key={} size={}", e.getKey(), e.getEntrySize());
}
@@ -841,7 +841,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- public final void decTxRefCount(RegionEntry re) {
+ public void decTxRefCount(RegionEntry re) {
LocalRegion lr = null;
if (_isOwnerALocalRegion()) {
lr = _getOwner();
@@ -850,7 +850,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- public final boolean lruLimitExceeded(DiskRegionView drv) {
+ public boolean lruLimitExceeded(DiskRegionView drv) {
return _getCCHelper().lruLimitExceeded(_getLruList().stats(), drv);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 0d03469..ac5fb37 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
@@ -347,32 +347,32 @@ public abstract class AbstractRegion implements Region, RegionAttributes, Attrib
EntryEventImpl clientEvent) throws TimeoutException, CacheLoaderException;
@Override
- public final void localDestroy(Object key) throws EntryNotFoundException {
+ public void localDestroy(Object key) throws EntryNotFoundException {
localDestroy(key, null);
}
@Override
- public final void destroyRegion() throws CacheWriterException, TimeoutException {
+ public void destroyRegion() throws CacheWriterException, TimeoutException {
destroyRegion(null);
}
@Override
- public final void invalidate(Object key) throws TimeoutException, EntryNotFoundException {
+ public void invalidate(Object key) throws TimeoutException, EntryNotFoundException {
invalidate(key, null);
}
@Override
- public final void localInvalidate(Object key) throws EntryNotFoundException {
+ public void localInvalidate(Object key) throws EntryNotFoundException {
localInvalidate(key, null);
}
@Override
- public final void localInvalidateRegion() {
+ public void localInvalidateRegion() {
localInvalidateRegion(null);
}
@Override
- public final void invalidateRegion() throws TimeoutException {
+ public void invalidateRegion() throws TimeoutException {
invalidateRegion(null);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 e0fc27c..2a337ed 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
@@ -152,23 +152,23 @@ public abstract class AbstractRegionMap implements RegionMap {
}
@Override
- public final void setEntryFactory(RegionEntryFactory f) {
+ public void setEntryFactory(RegionEntryFactory f) {
this.entryFactory = f;
}
- public final RegionEntryFactory getEntryFactory() {
+ public RegionEntryFactory getEntryFactory() {
return this.entryFactory;
}
- protected final void _setAttributes(Attributes a) {
+ protected void _setAttributes(Attributes a) {
this.attr = a;
}
- public final Attributes getAttributes() {
+ public Attributes getAttributes() {
return this.attr;
}
- protected final LocalRegion _getOwner() {
+ protected LocalRegion _getOwner() {
return (LocalRegion) this.owner;
}
@@ -176,19 +176,19 @@ public abstract class AbstractRegionMap implements RegionMap {
return this.owner instanceof LocalRegion;
}
- protected final Object _getOwnerObject() {
+ protected Object _getOwnerObject() {
return this.owner;
}
- public final void setOwner(Object r) {
+ public void setOwner(Object r) {
this.owner = r;
}
- protected final CustomEntryConcurrentHashMap<Object, Object> _getMap() {
+ protected CustomEntryConcurrentHashMap<Object, Object> _getMap() {
return this.map;
}
- protected final void _setMap(CustomEntryConcurrentHashMap<Object, Object> m) {
+ protected void _setMap(CustomEntryConcurrentHashMap<Object, Object> m) {
this.map = m;
}
@@ -221,7 +221,7 @@ public abstract class AbstractRegionMap implements RegionMap {
return (Collection) _getMap().values();
}
- public final boolean containsKey(Object key) {
+ public boolean containsKey(Object key) {
RegionEntry re = getEntry(key);
if (re == null) {
return false;
@@ -243,12 +243,12 @@ public abstract class AbstractRegionMap implements RegionMap {
@Override
- public final RegionEntry getEntryInVM(Object key) {
+ public RegionEntry getEntryInVM(Object key) {
return (RegionEntry) _getMap().get(key);
}
- public final RegionEntry putEntryIfAbsent(Object key, RegionEntry re) {
+ public RegionEntry putEntryIfAbsent(Object key, RegionEntry re) {
RegionEntry oldRe = (RegionEntry) _getMap().putIfAbsent(key, re);
if (oldRe == null && (re instanceof OffHeapRegionEntry) && _isOwnerALocalRegion()
&& _getOwner().isThisRegionBeingClosedOrDestroyed()) {
@@ -265,13 +265,13 @@ public abstract class AbstractRegionMap implements RegionMap {
}
@Override
- public final RegionEntry getOperationalEntryInVM(Object key) {
+ public RegionEntry getOperationalEntryInVM(Object key) {
RegionEntry re = (RegionEntry) _getMap().get(key);
return re;
}
- public final void removeEntry(Object key, RegionEntry re, boolean updateStat) {
+ public void removeEntry(Object key, RegionEntry re, boolean updateStat) {
if (re.isTombstone() && _getMap().get(key) == re) {
logger.fatal(
LocalizedMessage.create(LocalizedStrings.AbstractRegionMap_ATTEMPT_TO_REMOVE_TOMBSTONE),
@@ -286,7 +286,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public final void removeEntry(Object key, RegionEntry re, boolean updateStat,
+ public void removeEntry(Object key, RegionEntry re, boolean updateStat,
EntryEventImpl event, final LocalRegion owner) {
boolean success = false;
if (re.isTombstone() && _getMap().get(key) == re) {
@@ -304,7 +304,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- protected final void incEntryCount(int delta) {
+ protected void incEntryCount(int delta) {
LocalRegion lr = _getOwner();
if (lr != null) {
CachePerfStats stats = lr.getCachePerfStats();
@@ -314,7 +314,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- final void incClearCount(LocalRegion lr) {
+ void incClearCount(LocalRegion lr) {
if (lr != null && !(lr instanceof HARegion)) {
CachePerfStats stats = lr.getCachePerfStats();
if (stats != null) {
@@ -640,7 +640,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
@Retained // Region entry may contain an off-heap value
- public final RegionEntry initRecoveredEntry(Object key, DiskEntry.RecoveredEntry value) {
+ public RegionEntry initRecoveredEntry(Object key, DiskEntry.RecoveredEntry value) {
boolean needsCallback = false;
@Retained
RegionEntry newRe =
@@ -696,7 +696,7 @@ public abstract class AbstractRegionMap implements RegionMap {
return newRe;
}
- public final RegionEntry updateRecoveredEntry(Object key, DiskEntry.RecoveredEntry value) {
+ public RegionEntry updateRecoveredEntry(Object key, DiskEntry.RecoveredEntry value) {
boolean needsCallback = false;
RegionEntry re = getEntry(key);
if (re == null) {
@@ -755,7 +755,7 @@ public abstract class AbstractRegionMap implements RegionMap {
return re;
}
- public final boolean initialImagePut(final Object key, final long lastModified, Object newValue,
+ public boolean initialImagePut(final Object key, final long lastModified, Object newValue,
final boolean wasRecovered, boolean deferLRUCallback, VersionTag entryVersion,
InternalDistributedMember sender, boolean isSynchronizing) {
boolean result = false;
@@ -1023,7 +1023,7 @@ public abstract class AbstractRegionMap implements RegionMap {
return true;
}
- public final boolean destroy(EntryEventImpl event, boolean inTokenMode, boolean duringRI,
+ public boolean destroy(EntryEventImpl event, boolean inTokenMode, boolean duringRI,
boolean cacheWrite, boolean isEviction, Object expectedOldValue, boolean removeRecoveredEntry)
throws CacheWriterException, EntryNotFoundException, TimeoutException {
@@ -1555,7 +1555,7 @@ public abstract class AbstractRegionMap implements RegionMap {
return false;
}
- public final void txApplyDestroy(Object key, TransactionId txId, TXRmtEvent txEvent,
+ public void txApplyDestroy(Object key, TransactionId txId, TXRmtEvent txEvent,
boolean inTokenMode, boolean inRI, Operation op, EventID eventId, Object aCallbackArgument,
List<EntryEventImpl> pendingCallbacks, FilterRoutingInfo filterRoutingInfo,
ClientProxyMembershipID bridgeContext, boolean isOriginRemote, TXEntryState txEntryState,
@@ -1858,7 +1858,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public final boolean invalidate(EntryEventImpl event, boolean invokeCallbacks,
+ public boolean invalidate(EntryEventImpl event, boolean invokeCallbacks,
boolean forceNewEntry, boolean forceCallbacks) throws EntryNotFoundException {
final boolean isDebugEnabled = logger.isDebugEnabled();
@@ -2344,7 +2344,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public final void txApplyInvalidate(Object key, Object newValue, boolean didDestroy,
+ public void txApplyInvalidate(Object key, Object newValue, boolean didDestroy,
TransactionId txId, TXRmtEvent txEvent, boolean localOp, EventID eventId,
Object aCallbackArgument, List<EntryEventImpl> pendingCallbacks,
FilterRoutingInfo filterRoutingInfo, ClientProxyMembershipID bridgeContext,
@@ -3510,7 +3510,7 @@ public abstract class AbstractRegionMap implements RegionMap {
/** create a callback event for applying a transactional change to the local cache */
@Retained
- public static final EntryEventImpl createCBEvent(final LocalRegion re, Operation op, Object key,
+ public static EntryEventImpl createCBEvent(final LocalRegion re, Operation op, Object key,
Object newValue, TransactionId txId, TXRmtEvent txEvent, EventID eventId,
Object aCallbackArgument, FilterRoutingInfo filterRoutingInfo,
ClientProxyMembershipID bridgeContext, TXEntryState txEntryState, VersionTag versionTag,
@@ -3614,7 +3614,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public final void writeSyncIfPresent(Object key, Runnable runner) {
+ public void writeSyncIfPresent(Object key, Runnable runner) {
RegionEntry re = getEntry(key);
if (re != null) {
final boolean disabled = disableLruUpdateCallback();
@@ -3638,7 +3638,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public final void removeIfDestroyed(Object key) {
+ public void removeIfDestroyed(Object key) {
LocalRegion owner = _getOwner();
// boolean makeTombstones = owner.concurrencyChecksEnabled;
DiskRegion dr = owner.getDiskRegion();
@@ -3732,7 +3732,7 @@ public abstract class AbstractRegionMap implements RegionMap {
*
* @param entry the entry to attempt to add to the system
*/
- protected final RegionEntry putEntryIfAbsentForTest(RegionEntry entry) {
+ protected RegionEntry putEntryIfAbsentForTest(RegionEntry entry) {
return (RegionEntry) putEntryIfAbsent(entry.getKey(), entry);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
index 26fdde5..14e276a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
@@ -82,7 +82,7 @@ public abstract class AbstractUpdateOperation extends DistributedCacheOperation
Boolean.getBoolean("GemFire.ALWAYS_REPLICATE_UPDATES");
/** @return whether we should do a local create for a remote one */
- private static final boolean shouldDoRemoteCreate(LocalRegion rgn, EntryEventImpl ev) {
+ private static boolean shouldDoRemoteCreate(LocalRegion rgn, EntryEventImpl ev) {
DataPolicy dp = rgn.getAttributes().getDataPolicy();
if (!rgn.isAllEvents() || (dp.withReplication() && rgn.isInitialized()
&& ev.getOperation().isUpdate() && !rgn.concurrencyChecksEnabled // misordered CREATE and
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 f2640cd..04a48d0 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
@@ -842,7 +842,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
*
* @return the member who is primary for this bucket
*/
- public final InternalDistributedMember getPrimary() {
+ public InternalDistributedMember getPrimary() {
InternalDistributedMember primary = getExistingPrimary();
if (primary == null) {
primary = waitForNewPrimary();
@@ -857,7 +857,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
* @see #getPrimary()
* @return the existing primary (if it is still in the view) otherwise null
*/
- private final InternalDistributedMember getExistingPrimary() {
+ private InternalDistributedMember getExistingPrimary() {
return basicGetPrimaryMember();
}
@@ -865,7 +865,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
* If the current member is primary for this bucket return true, otherwise, give some time for the
* current member to become primary and then return whether it is a primary (true/false).
*/
- public final boolean isPrimaryWithWait() {
+ public boolean isPrimaryWithWait() {
if (this.isPrimary()) {
return true;
}
@@ -884,7 +884,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
* @see #getPrimary()
* @return the new primary
*/
- private final InternalDistributedMember waitForNewPrimary() {
+ private InternalDistributedMember waitForNewPrimary() {
DM dm = this.regionAdvisor.getDistributionManager();
DistributionConfig config = dm.getConfig();
// failure detection period
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
index 7ed1e3b..37974ab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
@@ -106,7 +106,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
this.rawValue = rawVal;
}
- public final boolean isValueByteArray() {
+ public boolean isValueByteArray() {
return this.rawValue instanceof byte[];
}
@@ -1017,7 +1017,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
}
@Override
- final void performExpiryTimeout(ExpiryTask expiryTask) throws CacheException {
+ void performExpiryTimeout(ExpiryTask expiryTask) throws CacheException {
ExpiryTask task = expiryTask;
boolean isEvictDestroy = isEntryEvictDestroyEnabled();
// Fix for bug 43805 - get the primary lock before
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java
index 104cf18..0c8f5fb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java
@@ -52,19 +52,19 @@ public class BytesAndBitsForCompactor {
}
- public final StoredObject getOffHeapData() {
+ public StoredObject getOffHeapData() {
return this.offHeapData;
}
- public final byte[] getBytes() {
+ public byte[] getBytes() {
return this.data;
}
- public final byte getBits() {
+ public byte getBits() {
return this.userBits;
}
- public final int getValidLength() {
+ public int getValidLength() {
return this.validLength;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java
index 033f530..701c93e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java
@@ -56,7 +56,7 @@ public class CacheObserverHolder {
/**
* Set the given observer to be notified of query events. Returns the current observer.
*/
- public static final CacheObserver setInstance(CacheObserver observer) {
+ public static CacheObserver setInstance(CacheObserver observer) {
if (observer == null)
observer = NO_OBSERVER;
CacheObserver oldObserver = _instance;
@@ -65,7 +65,7 @@ public class CacheObserverHolder {
}
/** Return the current QueryObserver instance */
- public static final CacheObserver getInstance() {
+ public static CacheObserver getInstance() {
return _instance;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
index 6bfb0f3..ab53ca4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
@@ -274,7 +274,7 @@ public class CacheServerLauncher {
public static final String EVICTION_OFF_HEAP_PERCENTAGE = "eviction-off-heap-percentage";
protected static final String LOCK_MEMORY = ConfigurationProperties.LOCK_MEMORY;
- protected final File processDirOption(final Map<String, Object> options, final String dirValue)
+ protected File processDirOption(final Map<String, Object> options, final String dirValue)
throws FileNotFoundException {
final File inputWorkingDirectory = new File(dirValue);
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java
index 1aeb61b..3964cd7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java
@@ -38,7 +38,7 @@ public class ClientServerObserverHolder {
/**
* Set the given observer to be notified of events. Returns the current observer.
*/
- public static final ClientServerObserver setInstance(ClientServerObserver observer) {
+ public static ClientServerObserver setInstance(ClientServerObserver observer) {
Support.assertArg(observer != null, "setInstance expects a non-null argument!");
ClientServerObserver oldObserver = _instance;
_instance = observer;
@@ -46,7 +46,7 @@ public class ClientServerObserverHolder {
}
/** Return the current BridgeObserver instance */
- public static final ClientServerObserver getInstance() {
+ public static ClientServerObserver getInstance() {
return _instance;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
index 68b1ae8..53efa4f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
@@ -471,7 +471,7 @@ public class DestroyRegionOperation extends DistributedCacheOperation {
protected transient Object context;
@Override
- final public RegionEventImpl createRegionEvent(DistributedRegion rgn) {
+ public RegionEventImpl createRegionEvent(DistributedRegion rgn) {
return new ClientRegionEventImpl(rgn, getOperation(), this.callbackArg,
true /* originRemote */, getSender(), (ClientProxyMembershipID) this.context);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
index f8b8289..36dc309 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
@@ -205,7 +205,7 @@ public class DiskRegion extends AbstractDiskRegion {
}
@Override
- public final String getName() {
+ public String getName() {
return this.name;
}
@@ -239,11 +239,11 @@ public class DiskRegion extends AbstractDiskRegion {
* method does any work is when backup is true and recovery data was discovered when this disk
* region was created.
*/
- final void initializeOwner(LocalRegion drs) {
+ void initializeOwner(LocalRegion drs) {
getDiskStore().initializeOwner(drs);
}
- final void finishInitializeOwner(LocalRegion drs, GIIStatus giiStatus) {
+ void finishInitializeOwner(LocalRegion drs, GIIStatus giiStatus) {
if (isReadyForRecovery()) {
// this.scheduleCompaction();
if (GIIStatus.didFullGII(giiStatus)) {
@@ -345,7 +345,7 @@ public class DiskRegion extends AbstractDiskRegion {
* completed successfully, resulting in the put operation to abort.
* @throws IllegalArgumentException If <code>id</code> is less than zero
*/
- final void put(DiskEntry entry, LocalRegion region, ValueWrapper value, boolean async)
+ void put(DiskEntry entry, LocalRegion region, ValueWrapper value, boolean async)
throws RegionClearedException {
getDiskStore().put(region, entry, value, async);
}
@@ -356,7 +356,7 @@ public class DiskRegion extends AbstractDiskRegion {
*
* @see #getBytesAndBitsWithoutLock(DiskId, boolean, boolean)
*/
- final Object get(DiskId id) {
+ Object get(DiskId id) {
return getDiskStore().get(this, id);
}
@@ -368,25 +368,25 @@ public class DiskRegion extends AbstractDiskRegion {
* @param id DiskId object for the entry
* @return value of the entry
*/
- final BytesAndBits getBytesAndBitsWithoutLock(DiskId id, boolean faultIn, boolean bitOnly) {
+ BytesAndBits getBytesAndBitsWithoutLock(DiskId id, boolean faultIn, boolean bitOnly) {
return getDiskStore().getBytesAndBitsWithoutLock(this, id, faultIn, bitOnly);
}
/**
* @since GemFire 3.2.1
*/
- final BytesAndBits getBytesAndBits(DiskId id) {
+ BytesAndBits getBytesAndBits(DiskId id) {
return getBytesAndBits(id, true);
}
- final BytesAndBits getBytesAndBits(DiskId id, boolean faultingIn) {
+ BytesAndBits getBytesAndBits(DiskId id, boolean faultingIn) {
return getDiskStore().getBytesAndBits(this, id, faultingIn);
}
/**
* @since GemFire 3.2.1
*/
- final byte getBits(DiskId id) {
+ byte getBits(DiskId id) {
return getDiskStore().getBits(this, id);
}
@@ -401,7 +401,7 @@ public class DiskRegion extends AbstractDiskRegion {
* @return null if entry has nothing stored on disk (id == INVALID_ID)
* @throws IllegalArgumentException If <code>id</code> is less than zero, no action is taken.
*/
- public final Object getNoBuffer(DiskId id) {
+ public Object getNoBuffer(DiskId id) {
return getDiskStore().getNoBuffer(this, id);
}
@@ -413,11 +413,11 @@ public class DiskRegion extends AbstractDiskRegion {
* @throws IllegalArgumentException If <code>id</code> is {@linkplain #INVALID_ID invalid}or is
* less than zero, no action is taken.
*/
- final void remove(LocalRegion region, DiskEntry entry) throws RegionClearedException {
+ void remove(LocalRegion region, DiskEntry entry) throws RegionClearedException {
getDiskStore().remove(region, entry, false, false);
}
- final void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear)
+ void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear)
throws RegionClearedException {
getDiskStore().remove(region, entry, async, isClear);
}
@@ -539,7 +539,7 @@ public class DiskRegion extends AbstractDiskRegion {
/**
* returns the active child
*/
- final Oplog testHook_getChild() {
+ Oplog testHook_getChild() {
return getDiskStore().persistentOplogs.getChild();
}
@@ -611,7 +611,7 @@ public class DiskRegion extends AbstractDiskRegion {
/** ThreadLocal to be used for maintaining consistency during clear* */
private final ThreadLocal<Integer> childReference = new ThreadLocal<Integer>();
- final void incClearCount() {
+ void incClearCount() {
this.clearCount.incrementAndGet();
}
@@ -733,7 +733,7 @@ public class DiskRegion extends AbstractDiskRegion {
return getOplogSet().getNextDir();
}
- final long newOplogEntryId() {
+ long newOplogEntryId() {
return getOplogSet().newOplogEntryId();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
index aeabbbc..67fcce8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
@@ -593,7 +593,7 @@ public class DiskStoreImpl implements DiskStore {
* Initializes the contents of any regions on this DiskStore that have been registered but are not
* yet initialized.
*/
- final void initializeOwner(LocalRegion lr) {
+ void initializeOwner(LocalRegion lr) {
DiskRegion dr = lr.getDiskRegion();
// We don't need to do recovery for overflow regions.
if (!lr.getDataPolicy().withPersistence() || !dr.isRecreated()) {
@@ -686,7 +686,7 @@ public class DiskStoreImpl implements DiskStore {
* completed successfully, resulting in the put operation to abort.
* @throws IllegalArgumentException If {@code id} is less than zero
*/
- final void put(LocalRegion region, DiskEntry entry, ValueWrapper value, boolean async)
+ void put(LocalRegion region, DiskEntry entry, ValueWrapper value, boolean async)
throws RegionClearedException {
DiskRegion dr = region.getDiskRegion();
DiskId id = entry.getDiskId();
@@ -754,7 +754,7 @@ public class DiskStoreImpl implements DiskStore {
}
}
- final void putVersionTagOnly(LocalRegion region, VersionTag tag, boolean async) {
+ void putVersionTagOnly(LocalRegion region, VersionTag tag, boolean async) {
DiskRegion dr = region.getDiskRegion();
// this method will only be called by backup oplog
assert dr.isBackup();
@@ -792,7 +792,7 @@ public class DiskStoreImpl implements DiskStore {
* {@linkplain DiskRegionStats statistics}
*
*/
- final Object get(DiskRegion dr, DiskId id) {
+ Object get(DiskRegion dr, DiskId id) {
acquireReadLock(dr);
try {
int count = 0;
@@ -851,7 +851,7 @@ public class DiskStoreImpl implements DiskStore {
*
* @return an instance of BytesAndBits or Token.REMOVED_PHASE1
*/
- final Object getRaw(DiskRegionView dr, DiskId id) {
+ Object getRaw(DiskRegionView dr, DiskId id) {
if (dr.isRegionClosed()) {
throw new RegionDestroyedException(
LocalizedStrings.DiskRegion_THE_DISKREGION_HAS_BEEN_CLOSED_OR_DESTROYED
@@ -926,7 +926,7 @@ public class DiskStoreImpl implements DiskStore {
* @return value of the entry or CLEAR_BB if it is detected that the entry was removed by a
* concurrent region clear.
*/
- final BytesAndBits getBytesAndBitsWithoutLock(DiskRegionView dr, DiskId id, boolean faultIn,
+ BytesAndBits getBytesAndBitsWithoutLock(DiskRegionView dr, DiskId id, boolean faultIn,
boolean bitOnly) {
long oplogId = id.getOplogId();
OplogSet oplogSet = getOplogSet(dr);
@@ -943,7 +943,7 @@ public class DiskStoreImpl implements DiskStore {
return oplog.getBytesAndBits(dr, id, faultIn, bitOnly);
}
- final BytesAndBits getBytesAndBits(DiskRegion dr, DiskId id, boolean faultingIn) {
+ BytesAndBits getBytesAndBits(DiskRegion dr, DiskId id, boolean faultingIn) {
acquireReadLock(dr);
try {
if (dr.isRegionClosed()) {
@@ -977,7 +977,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* @since GemFire 3.2.1
*/
- final byte getBits(DiskRegion dr, DiskId id) {
+ byte getBits(DiskRegion dr, DiskId id) {
acquireReadLock(dr);
try {
if (dr.isRegionClosed()) {
@@ -1016,7 +1016,7 @@ public class DiskStoreImpl implements DiskStore {
* @return null if entry has nothing stored on disk (id == INVALID_ID)
* @throws IllegalArgumentException If {@code id} is less than zero, no action is taken.
*/
- public final Object getNoBuffer(DiskRegion dr, DiskId id) {
+ public Object getNoBuffer(DiskRegion dr, DiskId id) {
BytesAndBits bb = null;
acquireReadLock(dr);
try {
@@ -1055,7 +1055,7 @@ public class DiskStoreImpl implements DiskStore {
* @throws IllegalArgumentException If {@code id} is {@linkplain #INVALID_ID invalid}or is less
* than zero, no action is taken.
*/
- final void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear)
+ void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear)
throws RegionClearedException {
DiskRegion dr = region.getDiskRegion();
if (!async) {
@@ -2009,7 +2009,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* Reads the oplogs files and loads them into regions that are ready to be recovered.
*/
- public final void recoverRegionsThatAreReady() {
+ public void recoverRegionsThatAreReady() {
persistentOplogs.recoverRegionsThatAreReady();
}
@@ -2052,7 +2052,7 @@ public class DiskStoreImpl implements DiskStore {
private final boolean isCompactionPossible;
- final boolean isCompactionPossible() {
+ boolean isCompactionPossible() {
return this.isCompactionPossible;
}
@@ -2311,7 +2311,7 @@ public class DiskStoreImpl implements DiskStore {
}
}
- final DiskAccessException getDiskAccessException() {
+ DiskAccessException getDiskAccessException() {
return diskException.get();
}
@@ -4728,11 +4728,11 @@ public class DiskStoreImpl implements DiskStore {
oplogSet.updateDiskRegion(dr);
}
- public final Version getRecoveredGFVersion() {
+ public Version getRecoveredGFVersion() {
return getRecoveredGFVersion(this.initFile);
}
- final Version getRecoveredGFVersion(DiskInitFile initFile) {
+ Version getRecoveredGFVersion(DiskInitFile initFile) {
return initFile.currentRecoveredGFVersion();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 a2eeaed..6411353 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
@@ -113,7 +113,7 @@ public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordi
return primaryTransactionalOperations;
}
- private final void addPrimaryTransactionalOperations(DistTxEntryEvent dtop) {
+ private void addPrimaryTransactionalOperations(DistTxEntryEvent dtop) {
if (logger.isDebugEnabled()) {
// [DISTTX] TODO Remove these
logger.debug("DistPeerTXStateStub.addPrimaryTransactionalOperations add " + dtop
@@ -128,7 +128,7 @@ public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordi
}
@Override
- public final void addSecondaryTransactionalOperations(DistTxEntryEvent dtop)
+ public void addSecondaryTransactionalOperations(DistTxEntryEvent dtop)
throws UnsupportedOperationInTransactionException {
secondaryTransactionalOperations.add(dtop);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java
index ca5764a..4517eb8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java
@@ -45,12 +45,12 @@ public class DistTXStateOnCoordinator extends DistTXState implements DistTXCoord
secondaryTransactionalOperations = new ArrayList<DistTxEntryEvent>();
}
- public final ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations()
+ public ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations()
throws UnsupportedOperationInTransactionException {
return primaryTransactionalOperations;
}
- private final void addPrimaryTransactionalOperations(DistTxEntryEvent dtop) {
+ private void addPrimaryTransactionalOperations(DistTxEntryEvent dtop) {
if (logger.isDebugEnabled()) {
// [DISTTX] TODO Remove these
logger.debug("DistTXStateOnCoordinator.addPrimaryTransactionalOperations add " + dtop
@@ -74,7 +74,7 @@ public class DistTXStateOnCoordinator extends DistTXState implements DistTXCoord
}
}
- public final void addSecondaryTransactionalOperations(DistTxEntryEvent dtop)
+ public void addSecondaryTransactionalOperations(DistTxEntryEvent dtop)
throws UnsupportedOperationInTransactionException {
secondaryTransactionalOperations.add(dtop);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 7ba7d0c..6c33c65 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
@@ -804,11 +804,11 @@ public abstract class DistributedCacheOperation {
return getRegion().scope.isAck();
}
- protected final DistributedRegion getRegion() {
+ protected DistributedRegion getRegion() {
return (DistributedRegion) this.event.getRegion();
}
- protected final EntryEventImpl getEvent() {
+ protected EntryEventImpl getEvent() {
return (EntryEventImpl) this.event;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
index 9f26cc9..b00612a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
@@ -268,7 +268,7 @@ public class DistributedClearOperation extends DistributedCacheOperation {
@Override
- final public RegionEventImpl createRegionEvent(DistributedRegion rgn) {
+ public RegionEventImpl createRegionEvent(DistributedRegion rgn) {
ClientRegionEventImpl event = new ClientRegionEventImpl(rgn, getOperation(), this.callbackArg,
true /* originRemote */, getSender(), (ClientProxyMembershipID) this.context);
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 7e76981..c26cd56 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
@@ -398,7 +398,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
* {@link PutAllPRMessage#toData(DataOutput)} <br>
* {@link RemotePutAllMessage#toData(DataOutput)} <br>
*/
- public final void toData(final DataOutput out) throws IOException {
+ public void toData(final DataOutput out) throws IOException {
Object key = this.key;
final Object v = this.value;
DataSerializer.writeObject(key, out);
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 e20a2c4..485835b 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
@@ -1969,7 +1969,7 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA
super.basicLocalClear(rEvent);
}
- public final DistributionConfig getDistributionConfig() {
+ public DistributionConfig getDistributionConfig() {
return getSystem().getDistributionManager().getConfig();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
index 9d85008..870e778 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
@@ -399,7 +399,7 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.REGION_FUNCTION_EXECUTION_EXECUTOR;
}
@@ -421,7 +421,7 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa
return txUniqId;
}
- public final InternalDistributedMember getMemberToMasqueradeAs() {
+ public InternalDistributedMember getMemberToMasqueradeAs() {
if (txMemberId == null) {
return getSender();
} else {
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
index 5a1b1be..42bf10f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
@@ -369,7 +369,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO
* {@link PutAllPRMessage#toData(DataOutput)} <br>
* {@link RemotePutAllMessage#toData(DataOutput)} <br>
*/
- public final void toData(final DataOutput out) throws IOException {
+ public void toData(final DataOutput out) throws IOException {
Object key = this.key;
DataSerializer.writeObject(key, out);
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java
index 76e9081..6d26c08 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java
@@ -61,7 +61,7 @@ public class EntriesSet extends AbstractSet {
this.allowTombstones = allowTombstones;
}
- protected final void checkTX() {
+ protected void checkTX() {
if (this.myTX != null) {
if (!myTX.isInProgress()) {
throw new IllegalStateException(
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
index 3cb5bbd..7eb7697 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
@@ -491,11 +491,11 @@ public class EntryEventImpl
return result;
}
- private final boolean testEventFlag(short mask) {
+ private boolean testEventFlag(short mask) {
return EventFlags.isSet(this.eventFlags, mask);
}
- private final void setEventFlag(short mask, boolean on) {
+ private void setEventFlag(short mask, boolean on) {
this.eventFlags = EventFlags.set(this.eventFlags, mask, on);
}
@@ -603,19 +603,19 @@ public class EntryEventImpl
return this.op.isEviction();
}
- public final void setEvicted() {
+ public void setEvicted() {
this.isEvicted = true;
}
- public final boolean isEvicted() {
+ public boolean isEvicted() {
return this.isEvicted;
}
- public final boolean isPendingSecondaryExpireDestroy() {
+ public boolean isPendingSecondaryExpireDestroy() {
return this.isPendingSecondaryExpireDestroy;
}
- public final void setPendingSecondaryExpireDestroy(boolean value) {
+ public void setPendingSecondaryExpireDestroy(boolean value) {
this.isPendingSecondaryExpireDestroy = value;
}
@@ -670,7 +670,7 @@ public class EntryEventImpl
*
* @return null if no event id has been set
*/
- public final EventID getEventId() {
+ public EventID getEventId() {
return this.eventID;
}
@@ -720,7 +720,7 @@ public class EntryEventImpl
*
* @return the value in the cache prior to this event.
*/
- public final Object getOldValue() {
+ public Object getOldValue() {
try {
if (isOriginRemote() && this.region.isProxy()) {
return null;
@@ -763,7 +763,7 @@ public class EntryEventImpl
* Like getRawNewValue except that if the result is an off-heap reference then copy it to the
* heap. Note: to prevent the heap copy use getRawNewValue instead
*/
- public final Object getRawNewValueAsHeapObject() {
+ public Object getRawNewValueAsHeapObject() {
Object result = basicGetNewValue();
if (mayHaveOffHeapReferences()) {
result = OffHeapHelper.copyIfNeeded(result);
@@ -777,7 +777,7 @@ public class EntryEventImpl
* lifetime of the EntryEventImpl instance that returned the value. Else return the raw form.
*/
@Unretained(ENTRY_EVENT_NEW_VALUE)
- public final Object getRawNewValue() {
+ public Object getRawNewValue() {
return basicGetNewValue();
}
@@ -809,7 +809,7 @@ public class EntryEventImpl
}
@Unretained
- protected final Object basicGetNewValue() {
+ protected Object basicGetNewValue() {
Object result = this.newValue;
if (!this.offHeapOk && isOffHeapReference(result)) {
// this.region.getCache().getLogger().info("DEBUG new value already freed " +
@@ -914,7 +914,7 @@ public class EntryEventImpl
* Like getRawOldValue except that if the result is an off-heap reference then copy it to the
* heap. To avoid the heap copy use getRawOldValue instead.
*/
- public final Object getRawOldValueAsHeapObject() {
+ public Object getRawOldValueAsHeapObject() {
Object result = basicGetOldValue();
if (mayHaveOffHeapReferences()) {
result = OffHeapHelper.copyIfNeeded(result);
@@ -928,7 +928,7 @@ public class EntryEventImpl
* lifetime of the EntryEventImpl instance that returned the value. Else return the raw form.
*/
@Unretained
- public final Object getRawOldValue() {
+ public Object getRawOldValue() {
return basicGetOldValue();
}
@@ -936,7 +936,7 @@ public class EntryEventImpl
* Just like getRawOldValue except if the raw old value is off-heap deserialize it.
*/
@Unretained(ENTRY_EVENT_OLD_VALUE)
- public final Object getOldValueAsOffHeapDeserializedOrRaw() {
+ public Object getOldValueAsOffHeapDeserializedOrRaw() {
Object result = basicGetOldValue();
if (mayHaveOffHeapReferences() && result instanceof StoredObject) {
result = ((CachedDeserializable) result).getDeserializedForReading();
@@ -957,7 +957,7 @@ public class EntryEventImpl
*
* @return the value in the cache after this event.
*/
- public final Object getNewValue() {
+ public Object getNewValue() {
boolean doCopyOnRead = getRegion().isCopyOnRead();
Object nv = basicGetNewValue();
@@ -1010,16 +1010,16 @@ public class EntryEventImpl
private final Object offHeapLock = new Object();
- public final String getNewValueStringForm() {
+ public String getNewValueStringForm() {
return StringUtils.forceToString(basicGetNewValue());
}
- public final String getOldValueStringForm() {
+ public String getOldValueStringForm() {
return StringUtils.forceToString(basicGetOldValue());
}
/** Set a deserialized value */
- public final void setNewValue(@Retained(ENTRY_EVENT_NEW_VALUE) Object obj) {
+ public void setNewValue(@Retained(ENTRY_EVENT_NEW_VALUE) Object obj) {
basicSetNewValue(obj);
}
@@ -1047,7 +1047,7 @@ public class EntryEventImpl
/**
* @see org.apache.geode.cache.CacheEvent#getRegion()
*/
- public final LocalRegion getRegion() {
+ public LocalRegion getRegion() {
return region;
}
@@ -1179,7 +1179,7 @@ public class EntryEventImpl
/**
* Export the event's new value to the given importer.
*/
- public final void exportNewValue(NewValueImporter importer) {
+ public void exportNewValue(NewValueImporter importer) {
final boolean prefersSerialized = importer.prefersNewSerialized();
if (prefersSerialized) {
if (getCachedSerializedNewValue() != null) {
@@ -1271,7 +1271,7 @@ public class EntryEventImpl
/**
* Export the event's old value to the given importer.
*/
- public final void exportOldValue(OldValueImporter importer) {
+ public void exportOldValue(OldValueImporter importer) {
final boolean prefersSerialized = importer.prefersOldSerialized();
if (prefersSerialized) {
if (this.oldValueBytes != null && this.oldValue instanceof CachedDeserializable) {
@@ -1310,7 +1310,7 @@ public class EntryEventImpl
* Just like getRawNewValue(true) except if the raw new value is off-heap deserialize it.
*/
@Unretained(ENTRY_EVENT_NEW_VALUE)
- public final Object getNewValueAsOffHeapDeserializedOrRaw() {
+ public Object getNewValueAsOffHeapDeserializedOrRaw() {
Object result = getRawNewValue();
if (mayHaveOffHeapReferences() && result instanceof StoredObject) {
result = ((CachedDeserializable) result).getDeserializedForReading();
@@ -1352,7 +1352,7 @@ public class EntryEventImpl
return result;
}
- public final Object getDeserializedValue() {
+ public Object getDeserializedValue() {
final Object val = basicGetNewValue();
if (val instanceof CachedDeserializable) {
return ((CachedDeserializable) val).getDeserializedForReading();
@@ -1361,7 +1361,7 @@ public class EntryEventImpl
}
}
- public final byte[] getSerializedValue() {
+ public byte[] getSerializedValue() {
if (this.newValueBytes == null) {
final Object val;
val = basicGetNewValue();
@@ -1392,7 +1392,7 @@ public class EntryEventImpl
/**
* @param isSynced true if RegionEntry currently under synchronization
*/
- private final void makeSerializedNewValue(boolean isSynced) {
+ private void makeSerializedNewValue(boolean isSynced) {
Object obj = basicGetNewValue();
// ezoerner:20080611 In the case where there is an unapplied
@@ -1448,7 +1448,7 @@ public class EntryEventImpl
return this.cachedSerializedNewValue;
}
- public final void setSerializedNewValue(byte[] serializedValue) {
+ public void setSerializedNewValue(byte[] serializedValue) {
Object newVal = null;
if (serializedValue != null) {
newVal = CachedDeserializableFactory.create(serializedValue);
@@ -1880,11 +1880,11 @@ public class EntryEventImpl
return tmp != null && tmp != Token.NOT_AVAILABLE;
}
- public final boolean hasOldValue() {
+ public boolean hasOldValue() {
return this.oldValue != null && this.oldValue != Token.NOT_AVAILABLE;
}
- public final boolean isOldValueAToken() {
+ public boolean isOldValueAToken() {
return this.oldValue instanceof Token;
}
@@ -2187,7 +2187,7 @@ public class EntryEventImpl
* @return null if old value is not serialized; otherwise returns a SerializedCacheValueImpl
* containing the old value.
*/
- public final SerializedCacheValue<?> getSerializedOldValue() {
+ public SerializedCacheValue<?> getSerializedOldValue() {
@Unretained(ENTRY_EVENT_OLD_VALUE)
final Object tmp = basicGetOldValue();
if (tmp instanceof CachedDeserializable) {
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
index 254fc88..45df435 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
@@ -181,7 +181,7 @@ public class EntryExpiryTask extends ExpiryTask {
}
@Override
- final protected void reschedule() throws CacheException {
+ protected void reschedule() throws CacheException {
if (isCacheClosing() || getLocalRegion().isClosed() || getLocalRegion().isDestroyed()
|| !isExpirationAllowed()) {
return;