You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2017/05/22 18:28:59 UTC
[03/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
index da86d8e..00707f5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
@@ -88,7 +88,7 @@ public class MsgStreamer extends OutputStream
/**
* Called to free up resources used by this streamer after the streamer has produced its message.
*/
- protected final void release() {
+ protected void release() {
MsgIdGenerator.release(this.msgId);
this.buffer.clear();
this.overflowBuf = null;
@@ -99,7 +99,7 @@ public class MsgStreamer extends OutputStream
* Returns an exception the describes which cons the message was not sent to. Call this after
* {@link #writeMessage}.
*/
- public final ConnectExceptions getConnectExceptions() {
+ public ConnectExceptions getConnectExceptions() {
return this.ce;
}
@@ -107,7 +107,7 @@ public class MsgStreamer extends OutputStream
* Returns a list of the Connections that the message was sent to. Call this after
* {@link #writeMessage}.
*/
- public final List<?> getSentConnections() {
+ public List<?> getSentConnections() {
return this.cons;
}
@@ -224,7 +224,7 @@ public class MsgStreamer extends OutputStream
/**
* @throws IOException if serialization failure
*/
- public final int writeMessage() throws IOException {
+ public int writeMessage() throws IOException {
// if (logger.isTraceEnabled()) logger.trace(this.msg);
try {
@@ -244,7 +244,7 @@ public class MsgStreamer 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 (logger.isTraceEnabled()) logger.trace(" byte={}", b);
ensureCapacity(1);
@@ -255,7 +255,7 @@ public class MsgStreamer extends OutputStream
this.buffer.put((byte) b);
}
- private final void ensureCapacity(int amount) {
+ private void ensureCapacity(int amount) {
if (this.overflowBuf != null) {
return;
}
@@ -289,7 +289,7 @@ public class MsgStreamer extends OutputStream
}
}
- public final void realFlush(boolean lastFlushForMessage) {
+ public void realFlush(boolean lastFlushForMessage) {
if (isOverflowMode()) {
if (this.overflowBuf == null) {
this.overflowBuf = new HeapDataOutputStream(
@@ -335,7 +335,7 @@ public class MsgStreamer extends OutputStream
}
@Override
- public final void close() throws IOException {
+ public void close() throws IOException {
try {
if (this.startedSerializingMsg && !this.doneWritingMsg) {
// if we wrote any bytes on the cnxs then we need to close them
@@ -354,7 +354,7 @@ public class MsgStreamer extends OutputStream
/** override OutputStream's write() */
@Override
- public final void write(byte[] source, int offset, int len) {
+ public void write(byte[] source, int offset, int len) {
// if (logger.isTraceEnabled()) {
// logger.trace(" bytes={} offset={} len={}", source, offset, len);
// }
@@ -383,7 +383,7 @@ public class MsgStreamer extends OutputStream
}
@Override
- public final void write(ByteBuffer bb) {
+ public void write(ByteBuffer bb) {
// if (logger.isTraceEnabled()) {
// logger.trace(" bytes={} offset={} len={}", source, offset, len);
// }
@@ -417,7 +417,7 @@ public class MsgStreamer extends OutputStream
/**
* write the header after the message has been written to the stream
*/
- private final void setMessageHeader() {
+ private void setMessageHeader() {
Assert.assertTrue(this.overflowBuf == null);
Assert.assertTrue(!isOverflowMode());
// int processorType = this.msg.getProcessorType();
@@ -457,7 +457,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the boolean to be written.
*/
- public final void writeBoolean(boolean v) {
+ public void writeBoolean(boolean v) {
write(v ? 1 : 0);
}
@@ -470,7 +470,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the byte value to be written.
*/
- public final void writeByte(int v) {
+ public void writeByte(int v) {
write(v);
}
@@ -492,7 +492,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the <code>short</code> value to be written.
*/
- public final void writeShort(int v) {
+ public void writeShort(int v) {
// if (logger.isTraceEnabled()) logger.trace(" short={}", v);
ensureCapacity(2);
@@ -521,7 +521,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the <code>char</code> value to be written.
*/
- public final void writeChar(int v) {
+ public void writeChar(int v) {
// if (logger.isTraceEnabled()) logger.trace(" char={}", v);
ensureCapacity(2);
@@ -551,7 +551,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the <code>int</code> value to be written.
*/
- public final void writeInt(int v) {
+ public void writeInt(int v) {
// if (logger.isTraceEnabled()) logger.trace(" int={}", v);
ensureCapacity(4);
@@ -585,7 +585,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the <code>long</code> value to be written.
*/
- public final void writeLong(long v) {
+ public void writeLong(long v) {
// if (logger.isTraceEnabled()) logger.trace(" long={}", v);
ensureCapacity(8);
@@ -606,7 +606,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the <code>float</code> value to be written.
*/
- public final void writeFloat(float v) {
+ public void writeFloat(float v) {
// if (logger.isTraceEnabled()) logger.trace(" float={}", v);
ensureCapacity(4);
@@ -627,7 +627,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the <code>double</code> value to be written.
*/
- public final void writeDouble(double v) {
+ public void writeDouble(double v) {
// if (logger.isTraceEnabled()) logger.trace(" double={}", v);
ensureCapacity(8);
@@ -651,7 +651,7 @@ public class MsgStreamer extends OutputStream
*
* @param str the string of bytes to be written.
*/
- public final void writeBytes(String str) {
+ public void writeBytes(String str) {
// if (logger.isTraceEnabled()) logger.trace(" bytes={}", str);
if (this.overflowBuf != null) {
@@ -676,7 +676,7 @@ public class MsgStreamer extends OutputStream
*
* @param s the string value to be written.
*/
- public final void writeChars(String s) {
+ public void writeChars(String s) {
// if (logger.isTraceEnabled()) logger.trace(" chars={}", s);
if (this.overflowBuf != null) {
@@ -765,7 +765,7 @@ public class MsgStreamer extends OutputStream
* @param str the string value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeUTF(String str) throws IOException {
+ public void writeUTF(String str) throws IOException {
// if (logger.isTraceEnabled()) logger.trace(" utf={}", str);
if (this.overflowBuf != null) {
@@ -779,7 +779,7 @@ public class MsgStreamer extends OutputStream
}
}
- private final void writeAsciiUTF(String str) throws IOException {
+ private void writeAsciiUTF(String str) throws IOException {
int len = str.length();
if (len > 65535) {
throw new UTFDataFormatException();
@@ -808,7 +808,7 @@ public class MsgStreamer extends OutputStream
}
}
- private final void writeFullUTF(String str) throws IOException {
+ private void writeFullUTF(String str) throws IOException {
int strlen = str.length();
if (strlen > 65535) {
throw new UTFDataFormatException();
@@ -854,7 +854,7 @@ public class MsgStreamer extends OutputStream
/**
* Used when we know the max size will fit in the current buffer.
*/
- private final void writeQuickFullUTF(String str, int strlen) throws IOException {
+ private void writeQuickFullUTF(String str, int strlen) throws IOException {
int utfSizeIdx = this.buffer.position();
// skip bytes reserved for length
this.buffer.position(utfSizeIdx + 2);
@@ -888,7 +888,7 @@ public class MsgStreamer extends OutputStream
* the contents of the HeapDataOutputStream to this streamer. All of this is done to prevent an
* extra copy when the serialized form will all fit into our current buffer.
*/
- public final void writeAsSerializedByteArray(Object v) throws IOException {
+ public void writeAsSerializedByteArray(Object v) throws IOException {
if (v instanceof HeapDataOutputStream) {
HeapDataOutputStream other = (HeapDataOutputStream) v;
InternalDataSerializer.writeArrayLength(other.size(), this);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java
index 87d9242..6797a11 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.logging.LogService;
*
* @since GemFire 7.1
*/
-public final class MsgStreamerList implements BaseMsgStreamer {
+public class MsgStreamerList implements BaseMsgStreamer {
private static final Logger logger = LogService.getLogger();
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
index 882cccf..d39b7be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.VersionedDataStream;
*
* @since GemFire 7.1
*/
-final class VersionedMsgStreamer extends MsgStreamer implements VersionedDataStream {
+class VersionedMsgStreamer extends MsgStreamer implements VersionedDataStream {
private final Version version;
@@ -41,7 +41,7 @@ final class VersionedMsgStreamer extends MsgStreamer implements VersionedDataStr
* {@inheritDoc}
*/
@Override
- public final Version getVersion() {
+ public Version getVersion() {
return this.version;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java
index 45b73e9..32f041c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java
@@ -224,7 +224,7 @@ public abstract class CollectionUtils {
* @since GemFire 8.1
* @see Collection#addAll(Collection)
*/
- public static final <T> boolean addAll(final Collection<T> collection,
+ public static <T> boolean addAll(final Collection<T> collection,
final Enumeration<T> enumeration) {
if (null == enumeration) {
return false;
@@ -247,7 +247,7 @@ public abstract class CollectionUtils {
* @return unmodifiable {@link Iterable}
* @since GemFire 8.1
*/
- public static final <T> Iterable<T> unmodifiableIterable(final Iterable<T> iterable) {
+ public static <T> Iterable<T> unmodifiableIterable(final Iterable<T> iterable) {
return new UnmodifiableIterable<T>(iterable);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java
index 403c1d2..fa540fa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberID;
/**
* Contains common data tranformation utility methods and transformers.
*/
-public final class TransformUtils {
+public class TransformUtils {
/**
* Transforms PersistentMemberIDs to a user friendly log entry.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
index 94e55b0..a5f6a8d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
@@ -218,7 +218,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* tables, that otherwise encounter collisions for hashCodes that do not differ in lower or upper
* bits.
*/
- public static final int keyHash(final Object o, final boolean compareValues) {
+ public static int keyHash(final Object o, final boolean compareValues) {
int h = compareValues ? o.hashCode() : System.identityHashCode(o);
// Spread bits to regularize both segment and index locations,
// using variant of single-word Wang/Jenkins hash.
@@ -236,7 +236,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @param hash the hash code for the key
* @return the segment
*/
- final Segment<K, V> segmentFor(final int hash) {
+ Segment<K, V> segmentFor(final int hash) {
if (this.segmentMask == 0) {
return this.segments[0];
}
@@ -305,7 +305,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* Segment.readValueUnderLock method is used as a backup in case a null (pre-initialized) value is
* ever seen in an unsynchronized access method.
*/
- static final class HashEntryImpl<K, V> implements HashEntry<K, V> {
+ static class HashEntryImpl<K, V> implements HashEntry<K, V> {
protected final K key;
@@ -329,42 +329,42 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* @see CustomEntryConcurrentHashMap.HashEntry#getKey()
*/
- public final K getKey() {
+ public K getKey() {
return this.key;
}
/**
* @see CustomEntryConcurrentHashMap.HashEntry#getMapValue()
*/
- public final V getMapValue() {
+ public V getMapValue() {
return this.value;
}
/**
* @see CustomEntryConcurrentHashMap.HashEntry#setMapValue(Object)
*/
- public final void setMapValue(V newValue) {
+ public void setMapValue(V newValue) {
this.value = newValue;
}
/**
* @see CustomEntryConcurrentHashMap.HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
/**
* @see CustomEntryConcurrentHashMap.HashEntry#getNextEntry()
*/
- public final HashEntry<K, V> getNextEntry() {
+ public HashEntry<K, V> getNextEntry() {
return this.next;
}
/**
* @see CustomEntryConcurrentHashMap.HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<K, V> n) {
+ public void setNextEntry(final HashEntry<K, V> n) {
this.next = n;
}
@@ -504,7 +504,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Sets table to new HashEntry array. Call only while holding lock or in constructor.
*/
- final void setTable(final HashEntry<K, V>[] newTable) {
+ void setTable(final HashEntry<K, V>[] newTable) {
this.threshold = (int) (newTable.length * this.loadFactor);
this.table = newTable;
}
@@ -512,7 +512,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Returns properly casted first entry of bin for given hash.
*/
- final HashEntry<K, V> getFirst(final int hash) {
+ HashEntry<K, V> getFirst(final int hash) {
final HashEntry<K, V>[] tab = this.table;
return tab[hash & (tab.length - 1)];
}
@@ -522,7 +522,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* is possible only if a compiler happens to reorder a HashEntry initialization with its table
* assignment, which is legal under memory model but is not known to ever occur.
*/
- final V readValueUnderLock(final HashEntry<K, V> e) {
+ V readValueUnderLock(final HashEntry<K, V> e) {
final ReentrantReadWriteLock.ReadLock readLock = super.readLock();
readLock.lock();
final V v = e.getMapValue();
@@ -553,7 +553,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/* Specialized implementations of map methods */
- final V get(final Object key, final int hash) {
+ V get(final Object key, final int hash) {
if (this.count != 0) { // read-volatile
// GemStone change to acquire the read lock on list updates
final ReentrantReadWriteLock.ReadLock listLock = this.listUpdateLock.readLock();
@@ -582,7 +582,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
return null;
}
- final V getNoLock(final Object key, final int hash, final boolean lockListForRead) {
+ V getNoLock(final Object key, final int hash, final boolean lockListForRead) {
if (this.count != 0) { // read-volatile
// GemStone change to acquire the read lock on list updates
ReentrantReadWriteLock.ReadLock listLock = null;
@@ -607,7 +607,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
return null;
}
- final boolean containsKey(final Object key, final int hash) {
+ boolean containsKey(final Object key, final int hash) {
if (this.count != 0) { // read-volatile
// GemStone change to acquire the read lock on list updates
final ReentrantReadWriteLock.ReadLock listLock = this.listUpdateLock.readLock();
@@ -627,7 +627,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
return false;
}
- final boolean containsValue(final Object value) {
+ boolean containsValue(final Object value) {
if (this.count != 0) { // read-volatile
// GemStone change to acquire the read lock on list updates
ReentrantReadWriteLock.ReadLock readLock = this.listUpdateLock.readLock();
@@ -662,7 +662,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
return false;
}
- final boolean replace(final K key, final int hash, final V oldValue, final V newValue) {
+ boolean replace(final K key, final int hash, final V oldValue, final V newValue) {
final ReentrantReadWriteLock.WriteLock writeLock = super.writeLock();
writeLock.lock();
try {
@@ -682,7 +682,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final V replace(final K key, final int hash, final V newValue) {
+ V replace(final K key, final int hash, final V newValue) {
final ReentrantReadWriteLock.WriteLock writeLock = super.writeLock();
writeLock.lock();
try {
@@ -702,7 +702,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final V put(final K key, final int hash, final V value, final boolean onlyIfAbsent) {
+ V put(final K key, final int hash, final V value, final boolean onlyIfAbsent) {
final ReentrantReadWriteLock.WriteLock writeLock = super.writeLock();
writeLock.lock();
try {
@@ -738,7 +738,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
// GemStone additions
- final <C, P> V create(final K key, final int hash, final MapCallback<K, V, C, P> valueCreator,
+ <C, P> V create(final K key, final int hash, final MapCallback<K, V, C, P> valueCreator,
final C context, final P createParams, final boolean lockForRead) {
// TODO: This can be optimized by having a special lock implementation
// that will allow upgrade from read to write lock atomically. This can
@@ -804,7 +804,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final V get(final Object key, final int hash, final MapCallback<K, V, ?, ?> readCallback) {
+ V get(final Object key, final int hash, final MapCallback<K, V, ?, ?> readCallback) {
final ReentrantReadWriteLock.ReadLock readLock = super.readLock();
readLock.lock();
try {
@@ -831,7 +831,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
// End GemStone additions
- final void rehash() {
+ void rehash() {
final HashEntry<K, V>[] oldTable = this.table;
final int oldCapacity = oldTable.length;
if (oldCapacity >= MAXIMUM_CAPACITY) {
@@ -934,7 +934,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*/
// GemStone change
// added "condition" and "removeParams" parameters
- final <C, P> V remove(final Object key, final int hash, final Object value,
+ <C, P> V remove(final Object key, final int hash, final Object value,
final MapCallback<K, V, C, P> condition, final C context, final P removeParams) {
// End GemStone change
final ReentrantReadWriteLock.WriteLock writeLock = super.writeLock();
@@ -1003,7 +1003,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* GemStone added the clearedEntries param and the result
*/
- final ArrayList<HashEntry<?, ?>> clear(ArrayList<HashEntry<?, ?>> clearedEntries) {
+ ArrayList<HashEntry<?, ?>> clear(ArrayList<HashEntry<?, ?>> clearedEntries) {
if (this.count != 0) {
final ReentrantReadWriteLock.WriteLock writeLock = super.writeLock();
writeLock.lock();
@@ -1069,7 +1069,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @since GemFire 7.0
*/
- static final class IdentitySegment<K, V> extends Segment<K, V> implements Serializable {
+ static class IdentitySegment<K, V> extends Segment<K, V> implements Serializable {
private static final long serialVersionUID = 3086228147110819882L;
@@ -1079,22 +1079,22 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
@SuppressWarnings("unchecked")
- static final <K, V> IdentitySegment<K, V>[] newArray(final int i) {
+ static <K, V> IdentitySegment<K, V>[] newArray(final int i) {
return new IdentitySegment[i];
}
@Override
- protected final boolean equalityKeyCompare(final Object key, final HashEntry<K, V> mapEntry) {
+ protected boolean equalityKeyCompare(final Object key, final HashEntry<K, V> mapEntry) {
return key == mapEntry.getKey();
}
@Override
- protected final boolean equalityCompare(final Object key, final Object mapKey) {
+ protected boolean equalityCompare(final Object key, final Object mapKey) {
return key == mapKey;
}
@Override
- protected final boolean equalityCompareWithNulls(final Object key, final Object mapKey) {
+ protected boolean equalityCompareWithNulls(final Object key, final Object mapKey) {
return key == mapKey;
}
}
@@ -1212,16 +1212,16 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- static final class DefaultHashEntryCreator<K, V> implements HashEntryCreator<K, V>, Serializable {
+ static class DefaultHashEntryCreator<K, V> implements HashEntryCreator<K, V>, Serializable {
private static final long serialVersionUID = 3765680607280951726L;
- public final HashEntry<K, V> newEntry(final K key, final int hash, final HashEntry<K, V> next,
+ public HashEntry<K, V> newEntry(final K key, final int hash, final HashEntry<K, V> next,
final V value) {
return new HashEntryImpl<K, V>(key, hash, next, value, null);
}
- public final int keyHashCode(final Object key, final boolean compareValues) {
+ public int keyHashCode(final Object key, final boolean compareValues) {
return keyHash(key, compareValues);
}
}
@@ -1284,7 +1284,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @return <tt>true</tt> if this map contains no key-value mappings
*/
@Override
- public final boolean isEmpty() {
+ public boolean isEmpty() {
final Segment<K, V>[] segments = this.segments;
/*
* We keep track of per-segment modCounts to avoid ABA problems in which an element in one
@@ -1323,7 +1323,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
@Override
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UL_UNRELEASED_LOCK",
justification = "The lock() calls are followed by unlock() calls without finally-block. Leaving this as is because it's lifted from JDK code and we want to minimize changes.")
- public final int size() {
+ public int size() {
final Segment<K, V>[] segments = this.segments;
long sum = 0;
long check = 0;
@@ -1382,7 +1382,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @throws NullPointerException if the specified key is null
*/
@Override
- public final V get(final Object key) {
+ public V get(final Object key) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
return segmentFor(hash).get(key, hash);
@@ -1397,7 +1397,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @throws NullPointerException if the specified key is null
*/
@Override
- public final boolean containsKey(final Object key) {
+ public boolean containsKey(final Object key) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
return segmentFor(hash).containsKey(key, hash);
@@ -1415,7 +1415,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
@Override
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UL_UNRELEASED_LOCK",
justification = "Leaving this as is because it's lifted from JDK code and we want to minimize changes.")
- public final boolean containsValue(final Object value) {
+ public boolean containsValue(final Object value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1478,7 +1478,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* as determined by the <tt>equals</tt> method; <tt>false</tt> otherwise
* @throws NullPointerException if the specified value is null
*/
- public final boolean contains(final Object value) {
+ public boolean contains(final Object value) {
return containsValue(value);
}
@@ -1497,7 +1497,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @throws NullPointerException if the specified key or value is null
*/
@Override
- public final V put(final K key, final V value) {
+ public V put(final K key, final V value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1513,7 +1513,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* mapping for the key
* @throws NullPointerException if the specified key or value is null
*/
- public final V putIfAbsent(final K key, final V value) {
+ public V putIfAbsent(final K key, final V value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1536,7 +1536,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @throws NullPointerException if the specified key is null
*/
- public final boolean create(final K key, final V value) {
+ public boolean create(final K key, final V value) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
final Segment<K, V> seg = segmentFor(hash);
@@ -1643,8 +1643,8 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @throws NullPointerException if the specified key or value is null
*/
- public final <C, P> V create(final K key, final MapCallback<K, V, C, P> valueCreator,
- final C context, final P createParams, final boolean lockForRead) {
+ public <C, P> V create(final K key, final MapCallback<K, V, C, P> valueCreator, final C context,
+ final P createParams, final boolean lockForRead) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
return segmentFor(hash).create(key, hash, valueCreator, context, createParams, lockForRead);
@@ -1665,7 +1665,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @throws NullPointerException if the specified key is null
*/
- public final V get(final Object key, final MapCallback<K, V, ?, ?> readCallback) {
+ public V get(final Object key, final MapCallback<K, V, ?, ?> readCallback) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
return segmentFor(hash).get(key, hash, readCallback);
@@ -1704,8 +1704,8 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @throws NullPointerException if the specified key or value is null, and this map does not
* permit null keys or values (optional)
*/
- public final <C, P> V removeConditionally(final Object key,
- final MapCallback<K, V, C, P> condition, final C context, final P removeParams) {
+ public <C, P> V removeConditionally(final Object key, final MapCallback<K, V, C, P> condition,
+ final C context, final P removeParams) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
return segmentFor(hash).remove(key, hash, NO_OBJECT_TOKEN, condition, context, removeParams);
@@ -1720,7 +1720,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @param m mappings to be stored in this map
*/
@Override
- public final void putAll(final Map<? extends K, ? extends V> m) {
+ public void putAll(final Map<? extends K, ? extends V> m) {
for (final Map.Entry<? extends K, ? extends V> e : m.entrySet()) {
put(e.getKey(), e.getValue());
}
@@ -1736,7 +1736,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @throws NullPointerException if the specified key is null
*/
@Override
- public final V remove(final Object key) {
+ public V remove(final Object key) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
return segmentFor(hash).remove(key, hash, NO_OBJECT_TOKEN, null, null, null);
@@ -1747,7 +1747,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @throws NullPointerException if the specified key is null
*/
- public final boolean remove(final Object key, final Object value) {
+ public boolean remove(final Object key, final Object value) {
if (value == null) {
return false;
}
@@ -1761,7 +1761,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @throws NullPointerException if any of the arguments are null
*/
- public final boolean replace(final K key, final V oldValue, final V newValue) {
+ public boolean replace(final K key, final V oldValue, final V newValue) {
if (oldValue == null || newValue == null) {
throw new NullPointerException();
}
@@ -1777,7 +1777,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* mapping for the key
* @throws NullPointerException if the specified key or value is null
*/
- public final V replace(final K key, final V value) {
+ public V replace(final K key, final V value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1790,7 +1790,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* Removes all of the mappings from this map.
*/
@Override
- public final void clear() {
+ public void clear() {
ArrayList<HashEntry<?, ?>> entries = null;
try {
for (int i = 0; i < this.segments.length; ++i) {
@@ -1848,7 +1848,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* modifications subsequent to construction.
*/
@Override
- public final Set<K> keySet() {
+ public Set<K> keySet() {
final Set<K> ks = this.keySet;
return (ks != null) ? ks : (this.keySet = new KeySet());
}
@@ -1868,7 +1868,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* modifications subsequent to construction.
*/
@Override
- public final Collection<V> values() {
+ public Collection<V> values() {
final Collection<V> vs = this.values;
return (vs != null) ? vs : (this.values = new Values());
}
@@ -1887,7 +1887,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* modifications subsequent to construction.
*/
@Override
- public final Set<Map.Entry<K, V>> entrySet() {
+ public Set<Map.Entry<K, V>> entrySet() {
final Set<Map.Entry<K, V>> es = this.entrySet;
return (es != null) ? es : (this.entrySet = new EntrySet(false));
}
@@ -1911,7 +1911,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* This set provides entries that are reused during iteration so caller cannot store the returned
* <code>Map.Entry</code> objects.
*/
- public final Set<Map.Entry<K, V>> entrySetWithReusableEntries() {
+ public Set<Map.Entry<K, V>> entrySetWithReusableEntries() {
final Set<Map.Entry<K, V>> es = this.reusableEntrySet;
return (es != null) ? es : (this.reusableEntrySet = new EntrySet(true));
}
@@ -1924,7 +1924,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @return an enumeration of the keys in this table
* @see #keySet()
*/
- public final Enumeration<K> keys() {
+ public Enumeration<K> keys() {
return new KeyIterator();
}
@@ -1934,7 +1934,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @return an enumeration of the values in this table
* @see #values()
*/
- public final Enumeration<V> elements() {
+ public Enumeration<V> elements() {
return new ValueIterator();
}
@@ -1965,11 +1965,11 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
advance();
}
- public final boolean hasMoreElements() {
+ public boolean hasMoreElements() {
return hasNext();
}
- final void advance() {
+ void advance() {
// GemStone changes BEGIN
if (this.currentListIndex < this.currentList.size()) {
this.nextEntry = this.currentList.get(this.currentListIndex++);
@@ -2031,7 +2031,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* Read lock on {@link #currentSegmentIndex}'s listUpdateLock should already be acquired.
*/
- private final void copyEntriesToList() {
+ private void copyEntriesToList() {
assert segments[currentSegmentIndex] != null : "unexpected null currentSegment";
assert segments[currentSegmentIndex].listUpdateLock.getReadLockCount() > 0;
@@ -2042,11 +2042,11 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- public final boolean hasNext() {
+ public boolean hasNext() {
return this.nextEntry != null;
}
- final HashEntry<K, V> nextEntry() {
+ HashEntry<K, V> nextEntry() {
if (this.nextEntry == null) {
throw new NoSuchElementException();
}
@@ -2055,7 +2055,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
return this.lastReturned;
}
- public final void remove() {
+ public void remove() {
if (this.lastReturned == null) {
throw new IllegalStateException();
}
@@ -2064,7 +2064,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final class KeyIterator extends HashIterator implements Iterator<K>, Enumeration<K> {
+ class KeyIterator extends HashIterator implements Iterator<K>, Enumeration<K> {
public K next() {
return super.nextEntry().getKey();
@@ -2075,7 +2075,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final class ValueIterator extends HashIterator implements Iterator<V>, Enumeration<V> {
+ class ValueIterator extends HashIterator implements Iterator<V>, Enumeration<V> {
public V next() {
return super.nextEntry().getMapValue();
@@ -2126,7 +2126,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @return the key corresponding to this entry
*/
- public final K getKey() {
+ public K getKey() {
return this.key;
}
@@ -2135,7 +2135,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @return the value corresponding to this entry
*/
- public final V getValue() {
+ public V getValue() {
return this.value;
}
@@ -2223,7 +2223,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* Custom Entry class used by EntryIterator.next(), that relays setValue changes to the underlying
* map.
*/
- final class WriteThroughEntry extends SimpleReusableEntry {
+ class WriteThroughEntry extends SimpleReusableEntry {
private static final long serialVersionUID = -6364816773849437756L;
@@ -2254,7 +2254,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final class EntryIterator extends HashIterator implements Iterator<Map.Entry<K, V>> {
+ class EntryIterator extends HashIterator implements Iterator<Map.Entry<K, V>> {
// GemStone change
// added possibility to reuse a single Map.Entry for entire iteration
@@ -2276,7 +2276,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
// End GemStone change
}
- final class KeySet extends AbstractSet<K> {
+ class KeySet extends AbstractSet<K> {
@Override
public Iterator<K> iterator() {
@@ -2304,7 +2304,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final class Values extends AbstractCollection<V> {
+ class Values extends AbstractCollection<V> {
@Override
public Iterator<V> iterator() {
@@ -2327,7 +2327,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final class EntrySet extends AbstractSet<Map.Entry<K, V>> {
+ class EntrySet extends AbstractSet<Map.Entry<K, V>> {
// GemStone change
// added possibility to reuse a single Map.Entry for entire iteration
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java b/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
index 936f602..767cf94 100644
--- a/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
@@ -105,7 +105,7 @@ public abstract class CommandService {
* @param cache Underlying <code>Cache</code> instance to be used to create a Command Service.
* @throws CommandServiceException If command service could not be initialized.
*/
- public static final CommandService createLocalCommandService(Cache cache)
+ public static CommandService createLocalCommandService(Cache cache)
throws CommandServiceException {
if (cache == null || cache.isClosed()) {
throw new CacheClosedException(
@@ -136,7 +136,7 @@ public abstract class CommandService {
*
* @return A usable <code>CommandService</code> or null if one cannot be found.
*/
- public static final CommandService getUsableLocalCommandService() {
+ public static CommandService getUsableLocalCommandService() {
if (localCommandService != null && localCommandService.isUsable()) {
return localCommandService;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java b/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java
index 99fb421..ecf8da2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java
@@ -142,7 +142,7 @@ public class AlertDetails {
* @param intLevel int alert level to convert
* @return A string representation of the alert level
*/
- public static final String getAlertLevelAsString(final int intLevel) {
+ public static String getAlertLevelAsString(final int intLevel) {
if (intLevel == Alert.SEVERE) {
return "severe";
} else if (intLevel == Alert.ERROR) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java
index cb203a0..624d6fc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java
@@ -27,14 +27,14 @@ import javax.management.openmbean.OpenDataException;
*
*
*/
-public final class ArrayConverter extends OpenTypeConverter {
+public class ArrayConverter extends OpenTypeConverter {
ArrayConverter(Type targetType, ArrayType openArrayType, Class openArrayClass,
OpenTypeConverter elementConverter) {
super(targetType, openArrayType, openArrayClass);
this.elementConverter = elementConverter;
}
- final Object toNonNullOpenValue(Object value) throws OpenDataException {
+ Object toNonNullOpenValue(Object value) throws OpenDataException {
Object[] valueArray = (Object[]) value;
final int len = valueArray.length;
final Object[] openArray = (Object[]) Array.newInstance(getOpenClass().getComponentType(), len);
@@ -44,7 +44,7 @@ public final class ArrayConverter extends OpenTypeConverter {
return openArray;
}
- public final Object fromNonNullOpenValue(Object openValue) throws InvalidObjectException {
+ public Object fromNonNullOpenValue(Object openValue) throws InvalidObjectException {
final Object[] openArray = (Object[]) openValue;
final Type targetType = getTargetType();
final Object[] valueArray;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java
index f469883..a3f6ad7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java
@@ -35,7 +35,7 @@ import javax.management.openmbean.OpenDataException;
*
*
*/
-public final class CollectionConverter extends OpenTypeConverter {
+public class CollectionConverter extends OpenTypeConverter {
CollectionConverter(Type targetType, ArrayType openArrayType, Class openArrayClass,
OpenTypeConverter elementConverter) {
super(targetType, openArrayType, openArrayClass);
@@ -60,7 +60,7 @@ public final class CollectionConverter extends OpenTypeConverter {
}
}
- final Object toNonNullOpenValue(Object value) throws OpenDataException {
+ Object toNonNullOpenValue(Object value) throws OpenDataException {
final Collection valueCollection = (Collection) value;
if (valueCollection instanceof SortedSet) {
Comparator comparator = ((SortedSet) valueCollection).comparator();
@@ -77,7 +77,7 @@ public final class CollectionConverter extends OpenTypeConverter {
return openArray;
}
- public final Object fromNonNullOpenValue(Object openValue) throws InvalidObjectException {
+ public Object fromNonNullOpenValue(Object openValue) throws InvalidObjectException {
final Object[] openArray = (Object[]) openValue;
final Collection<Object> valueCollection;
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java
index 51dc980..0ab3dfe 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java
@@ -55,7 +55,7 @@ public class CompositeConverter extends OpenTypeConverter {
/**
* Converts to open value
*/
- final Object toNonNullOpenValue(Object value) throws OpenDataException {
+ Object toNonNullOpenValue(Object value) throws OpenDataException {
CompositeType ct = (CompositeType) getOpenType();
if (value instanceof CompositeDataView)
return ((CompositeDataView) value).toCompositeData(ct);
@@ -128,7 +128,7 @@ public class CompositeConverter extends OpenTypeConverter {
makeCompositeBuilder();
}
- public final Object fromNonNullOpenValue(Object value) throws InvalidObjectException {
+ public Object fromNonNullOpenValue(Object value) throws InvalidObjectException {
makeCompositeBuilder();
return compositeBuilder.fromCompositeData((CompositeData) value, itemNames, getterConverters);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java
index 320e66f..f9e7547 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java
@@ -23,18 +23,18 @@ import javax.management.openmbean.SimpleType;
*
*
*/
-public final class EnumConverter<T extends Enum<T>> extends OpenTypeConverter {
+public class EnumConverter<T extends Enum<T>> extends OpenTypeConverter {
EnumConverter(Class<T> enumClass) {
super(enumClass, SimpleType.STRING, String.class);
this.enumClass = enumClass;
}
- final Object toNonNullOpenValue(Object value) {
+ Object toNonNullOpenValue(Object value) {
return ((Enum) value).name();
}
- public final Object fromNonNullOpenValue(Object value) throws InvalidObjectException {
+ public Object fromNonNullOpenValue(Object value) throws InvalidObjectException {
try {
return Enum.valueOf(enumClass, (String) value);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java
index dcdb578..ce5ba45 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java
@@ -24,7 +24,7 @@ import javax.management.openmbean.OpenType;
*
*
*/
-public final class IdentityConverter extends OpenTypeConverter {
+public class IdentityConverter extends OpenTypeConverter {
IdentityConverter(Type targetType, OpenType openType, Class openClass) {
super(targetType, openType, openClass);
}
@@ -37,7 +37,7 @@ public final class IdentityConverter extends OpenTypeConverter {
return value;
}
- public final Object fromNonNullOpenValue(Object value) {
+ public Object fromNonNullOpenValue(Object value) {
return value;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java b/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java
index b7591db..e144717 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java
@@ -108,15 +108,15 @@ public class OpenMethod {
return sig;
}
- final Object toOpenReturnValue(Object ret) throws OpenDataException {
+ Object toOpenReturnValue(Object ret) throws OpenDataException {
return returnTypeConverter.toOpenValue(ret);
}
- final Object fromOpenReturnValue(Object ret) throws InvalidObjectException {
+ Object fromOpenReturnValue(Object ret) throws InvalidObjectException {
return returnTypeConverter.fromOpenValue(ret);
}
- final Object[] toOpenParameters(Object[] params) throws OpenDataException {
+ Object[] toOpenParameters(Object[] params) throws OpenDataException {
if (paramConversionIsIdentity || params == null)
return params;
final Object[] oparams = new Object[params.length];
@@ -125,7 +125,7 @@ public class OpenMethod {
return oparams;
}
- final Object[] fromOpenParameters(Object[] params) throws InvalidObjectException {
+ Object[] fromOpenParameters(Object[] params) throws InvalidObjectException {
if (paramConversionIsIdentity || params == null)
return params;
final Object[] jparams = new Object[params.length];
@@ -134,11 +134,11 @@ public class OpenMethod {
return jparams;
}
- final Object toOpenParameter(Object param, int paramNo) throws OpenDataException {
+ Object toOpenParameter(Object param, int paramNo) throws OpenDataException {
return paramTypeConverters[paramNo].toOpenValue(param);
}
- final Object fromOpenParameter(Object param, int paramNo) throws InvalidObjectException {
+ Object fromOpenParameter(Object param, int paramNo) throws InvalidObjectException {
return paramTypeConverters[paramNo].fromOpenValue(param);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
index 6a0b842..4fdf291 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
@@ -91,8 +91,7 @@ public abstract class OpenTypeConverter {
private final Class openClass;
- private static final class ConverterMap
- extends WeakHashMap<Type, WeakReference<OpenTypeConverter>> {
+ private static class ConverterMap extends WeakHashMap<Type, WeakReference<OpenTypeConverter>> {
}
private static final ConverterMap converterMap = new ConverterMap();
@@ -118,7 +117,7 @@ public abstract class OpenTypeConverter {
* @return the java type object
* @throws InvalidObjectException
*/
- public final Object fromOpenValue(Object value) throws InvalidObjectException {
+ public Object fromOpenValue(Object value) throws InvalidObjectException {
if (value == null)
return null;
else
@@ -144,7 +143,7 @@ public abstract class OpenTypeConverter {
* @return open class object
* @throws OpenDataException
*/
- final Object toOpenValue(Object value) throws OpenDataException {
+ Object toOpenValue(Object value) throws OpenDataException {
if (value == null)
return null;
else
@@ -162,15 +161,15 @@ public abstract class OpenTypeConverter {
return false;
}
- final Type getTargetType() {
+ Type getTargetType() {
return targetType;
}
- final OpenType getOpenType() {
+ OpenType getOpenType() {
return openType;
}
- final Class getOpenClass() {
+ Class getOpenClass() {
return openClass;
}
@@ -513,7 +512,7 @@ public abstract class OpenTypeConverter {
*
*
*/
- protected static final class CompositeBuilderViaFrom extends CompositeBuilder {
+ protected static class CompositeBuilderViaFrom extends CompositeBuilder {
CompositeBuilderViaFrom(Class targetClass, String[] itemNames) {
super(targetClass, itemNames);
@@ -595,8 +594,7 @@ public abstract class OpenTypeConverter {
return possibleCause;
}
- final Object fromCompositeData(CompositeData cd, String[] itemNames,
- OpenTypeConverter[] converters) {
+ Object fromCompositeData(CompositeData cd, String[] itemNames, OpenTypeConverter[] converters) {
throw new Error();
}
@@ -669,7 +667,7 @@ public abstract class OpenTypeConverter {
*
*
*/
- protected static final class CompositeBuilderViaConstructor extends CompositeBuilder {
+ protected static class CompositeBuilderViaConstructor extends CompositeBuilder {
CompositeBuilderViaConstructor(Class targetClass, String[] itemNames) {
super(targetClass, itemNames);
@@ -853,7 +851,7 @@ public abstract class OpenTypeConverter {
*
*
*/
- protected static final class CompositeBuilderViaProxy extends CompositeBuilder {
+ protected static class CompositeBuilderViaProxy extends CompositeBuilder {
CompositeBuilderViaProxy(Class targetClass, String[] itemNames) {
super(targetClass, itemNames);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java b/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
index c674e48..fc8eb97 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
@@ -59,7 +59,7 @@ import org.apache.geode.management.membership.MembershipListener;
*
* @since GemFire 7.0
*/
-public final class SystemManagementService extends BaseManagementService {
+public class SystemManagementService extends BaseManagementService {
private static final Logger logger = LogService.getLogger();
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java
index b5e4ca3..8d41c5a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java
@@ -34,7 +34,7 @@ import javax.management.openmbean.TabularType;
*
*
*/
-public final class TableConverter extends OpenTypeConverter {
+public class TableConverter extends OpenTypeConverter {
TableConverter(Type targetType, boolean sortedMap, TabularType tabularType,
OpenTypeConverter keyConverter, OpenTypeConverter valueConverter) {
super(targetType, tabularType, TabularData.class);
@@ -43,7 +43,7 @@ public final class TableConverter extends OpenTypeConverter {
this.valueConverter = valueConverter;
}
- final Object toNonNullOpenValue(Object value) throws OpenDataException {
+ Object toNonNullOpenValue(Object value) throws OpenDataException {
final Map<Object, Object> valueMap = (Map<Object, Object>) value;
if (valueMap instanceof SortedMap) {
Comparator comparator = ((SortedMap) valueMap).comparator();
@@ -68,7 +68,7 @@ public final class TableConverter extends OpenTypeConverter {
return table;
}
- public final Object fromNonNullOpenValue(Object openValue) throws InvalidObjectException {
+ public Object fromNonNullOpenValue(Object openValue) throws InvalidObjectException {
final TabularData table = (TabularData) openValue;
final Collection<CompositeData> rows = (Collection<CompositeData>) table.values();
final Map<Object, Object> valueMap =
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
index 6d22a8f..dd24942 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
@@ -28,7 +28,7 @@ import org.apache.geode.management.internal.MBeanJMXAdapter;
*
*
*/
-public final class VMStatsMonitor extends MBeanStatsMonitor {
+public class VMStatsMonitor extends MBeanStatsMonitor {
private volatile float cpuUsage = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java
index c5c73dc..e4e00da 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java
@@ -73,7 +73,7 @@ import joptsimple.OptionSet;
*
* @since GemFire 7.0
*/
-public final class Launcher {
+public class Launcher {
private static final String EXECUTE_OPTION = "execute";
private static final String HELP_OPTION = "help";
private static final String HELP = CliStrings.HELP;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
index 0cf7078..4018beb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
@@ -57,7 +57,7 @@ import java.util.Set;
* @see org.apache.geode.management.internal.cli.commands.AbstractCommandsSupport
* @since GemFire 7.0
*/
-public final class DeployCommands extends AbstractCommandsSupport {
+public class DeployCommands extends AbstractCommandsSupport {
private final DeployFunction deployFunction = new DeployFunction();
private final UndeployFunction undeployFunction = new UndeployFunction();
@@ -75,7 +75,7 @@ public final class DeployCommands extends AbstractCommandsSupport {
@CliMetaData(
interceptor = "org.apache.geode.management.internal.cli.commands.DeployCommands$Interceptor",
relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
- public final Result deploy(
+ public Result deploy(
@CliOption(key = {CliStrings.DEPLOY__GROUP}, help = CliStrings.DEPLOY__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) String[] groups,
@CliOption(key = {CliStrings.DEPLOY__JAR}, help = CliStrings.DEPLOY__JAR__HELP) String jar,
@@ -153,7 +153,7 @@ public final class DeployCommands extends AbstractCommandsSupport {
@CliCommand(value = {CliStrings.UNDEPLOY}, help = CliStrings.UNDEPLOY__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
- public final Result undeploy(
+ public Result undeploy(
@CliOption(key = {CliStrings.UNDEPLOY__GROUP}, help = CliStrings.UNDEPLOY__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) String[] groups,
@CliOption(key = {CliStrings.UNDEPLOY__JAR}, help = CliStrings.UNDEPLOY__JAR__HELP,
@@ -223,7 +223,7 @@ public final class DeployCommands extends AbstractCommandsSupport {
@CliCommand(value = {CliStrings.LIST_DEPLOYED}, help = CliStrings.LIST_DEPLOYED__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
- public final Result listDeployed(@CliOption(key = {CliStrings.LIST_DEPLOYED__GROUP},
+ public Result listDeployed(@CliOption(key = {CliStrings.LIST_DEPLOYED__GROUP},
help = CliStrings.LIST_DEPLOYED__GROUP__HELP) String group) {
try {
@@ -277,7 +277,7 @@ public final class DeployCommands extends AbstractCommandsSupport {
}
@CliAvailabilityIndicator({CliStrings.DEPLOY, CliStrings.UNDEPLOY, CliStrings.LIST_DEPLOYED})
- public final boolean isConnected() {
+ public boolean isConnected() {
if (!CliUtil.isGfshVM()) {
return true;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
index d61e72d..101bae4 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -2614,7 +2614,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
return true;
}
- protected static final class LauncherSignalListener implements SignalListener {
+ protected static class LauncherSignalListener implements SignalListener {
private volatile boolean signaled = false;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusCommands.java
index f8d27de..29627f3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusCommands.java
@@ -83,7 +83,7 @@ public class StatusCommands extends AbstractCommandsSupport implements CommandMa
}
@CliAvailabilityIndicator({CliStrings.STATUS_SHARED_CONFIG})
- public final boolean isConnected() {
+ public boolean isConnected() {
if (!CliUtil.isGfshVM()) {
return true;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java
index 575930b..c175e1a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java
@@ -22,7 +22,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Objects;
-public final class ExportedLogsSizeInfo implements DataSerializable {
+public class ExportedLogsSizeInfo implements DataSerializable {
private long logsSize;
private long diskAvailable;
private long diskSize;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionAttributesDefault.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionAttributesDefault.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionAttributesDefault.java
index 049a3d6..1cbb9e2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionAttributesDefault.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionAttributesDefault.java
@@ -30,7 +30,7 @@ import org.apache.geode.management.internal.cli.domain.PartitionAttributesInfo;
* Contains the default values for the region attributes
*
*/
-public final class RegionAttributesDefault {
+public class RegionAttributesDefault {
public static final Scope SCOPE = AbstractRegion.DEFAULT_SCOPE.DISTRIBUTED_NO_ACK;
public static final DataPolicy DATA_POLICY = DataPolicy.DEFAULT;
public static final boolean CLONING_ENABLED = false;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
index 8ecf6a7..7450757 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
@@ -132,7 +132,7 @@ public class CacheElement {
* @throws IOException if unable to open {@link InputSource}.
* @since GemFire 8.1
*/
- private static final InputSource resolveSchema(final Map<String, List<String>> schemaLocationMap,
+ private static InputSource resolveSchema(final Map<String, List<String>> schemaLocationMap,
String namespaceUri) throws IOException {
final EntityResolver2 entityResolver = new CacheXmlParser();
@@ -170,8 +170,8 @@ public class CacheElement {
* @throws XPathExpressionException
* @since GemFire 8.1
*/
- private static final void buildElementMapCacheType(
- final LinkedHashMap<String, CacheElement> elementMap, final InputSource inputSource)
+ private static void buildElementMapCacheType(final LinkedHashMap<String, CacheElement> elementMap,
+ final InputSource inputSource)
throws SAXException, IOException, ParserConfigurationException, XPathExpressionException {
final Document doc = XmlUtils.getDocumentBuilder().parse(inputSource);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
index f740dde..be74e84 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
@@ -174,7 +174,7 @@ public class XmlEntity implements VersionedDataSerializable {
*
* @since GemFire 8.1
*/
- private final void init() {
+ private void init() {
Assert.assertTrue(!StringUtils.isBlank(type));
Assert.assertTrue(!StringUtils.isBlank(prefix));
Assert.assertTrue(!StringUtils.isBlank(namespace));
@@ -190,7 +190,7 @@ public class XmlEntity implements VersionedDataSerializable {
*
* @return XML string representation of the entity.
*/
- private final String loadXmlDefinition() {
+ private String loadXmlDefinition() {
final Cache cache = CacheFactory.getAnyInstance();
final StringWriter stringWriter = new StringWriter();
@@ -208,7 +208,7 @@ public class XmlEntity implements VersionedDataSerializable {
* @return XML for {@link XmlEntity} if found, otherwise <code>null</code>.
* @since GemFire 8.1
*/
- private final String loadXmlDefinition(final String xmlDocument) {
+ private String loadXmlDefinition(final String xmlDocument) {
final Cache cache = CacheFactory.getAnyInstance();
try {
InputSource inputSource = new InputSource(new StringReader(xmlDocument));
@@ -229,7 +229,7 @@ public class XmlEntity implements VersionedDataSerializable {
* @throws TransformerFactoryConfigurationError
* @since GemFire 8.1
*/
- private final String loadXmlDefinition(final Document document)
+ private String loadXmlDefinition(final Document document)
throws XPathExpressionException, TransformerFactoryConfigurationError, TransformerException {
final Cache cache = CacheFactory.getAnyInstance();
@@ -446,7 +446,7 @@ public class XmlEntity implements VersionedDataSerializable {
* @return new {@link XmlEntityBuilder}.
* @since GemFire 8.1
*/
- public static final XmlEntityBuilder builder() {
+ public static XmlEntityBuilder builder() {
return new XmlEntityBuilder();
}
@@ -461,7 +461,7 @@ public class XmlEntity implements VersionedDataSerializable {
*
* @since GemFire 8.1
*/
- public static final class XmlEntityBuilder {
+ public static class XmlEntityBuilder {
private XmlEntity xmlEntity;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java
index 4a0579a..b00e287 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java
@@ -21,7 +21,7 @@ import javax.xml.XMLConstants;
*
* @since GemFire 8.1
*/
-public final class XmlConstants {
+public class XmlConstants {
/**
* Standard prefix for {@link XMLConstants#W3C_XML_SCHEMA_INSTANCE_NS_URI}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
index a6fafaa..218762c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
@@ -281,8 +281,7 @@ public class XmlUtils {
* @return {@link Map} of schema namespace URIs to location URLs.
* @since GemFire 8.1
*/
- public static final Map<String, List<String>> buildSchemaLocationMap(
- final String schemaLocation) {
+ public static Map<String, List<String>> buildSchemaLocationMap(final String schemaLocation) {
return buildSchemaLocationMap(new HashMap<String, List<String>>(), schemaLocation);
}
@@ -298,7 +297,7 @@ public class XmlUtils {
* @return {@link Map} of schema namespace URIs to location URLs.
* @since GemFire 8.1
*/
- static final Map<String, List<String>> buildSchemaLocationMap(
+ static Map<String, List<String>> buildSchemaLocationMap(
Map<String, List<String>> schemaLocationMap, final String schemaLocation) {
if (null == schemaLocation) {
return schemaLocationMap;
@@ -419,14 +418,14 @@ public class XmlUtils {
return transform(transformer, doc);
}
- public static final String elementToString(Node element)
+ public static String elementToString(Node element)
throws TransformerFactoryConfigurationError, TransformerException {
Transformer transformer = TransformerFactory.newInstance().newTransformer();
return transform(transformer, element);
}
- private static final String transform(Transformer transformer, Node element)
+ private static String transform(Transformer transformer, Node element)
throws TransformerException {
StreamResult result = new StreamResult(new StringWriter());
DOMSource source = new DOMSource(element);
@@ -585,8 +584,7 @@ public class XmlUtils {
* @param schemaLocationMap {@link Map} to get schema locations from.
* @since GemFire 8.1
*/
- private static final String getSchemaLocationValue(
- final Map<String, List<String>> schemaLocationMap) {
+ private static String getSchemaLocationValue(final Map<String, List<String>> schemaLocationMap) {
final StringBuilder sb = new StringBuilder();
for (final Map.Entry<String, List<String>> entry : schemaLocationMap.entrySet()) {
for (final String schemaLocation : entry.getValue()) {
@@ -606,7 +604,7 @@ public class XmlUtils {
* @return {@link Map} of namespace URIs to prefixes.
* @since GemFire 8.1
*/
- private static final Map<String, String> buildNamespacePrefixMap(final Element root) {
+ private static Map<String, String> buildNamespacePrefixMap(final Element root) {
final HashMap<String, String> namespacePrefixMap = new HashMap<>();
// Look for all of the attributes of cache that start with
@@ -646,7 +644,7 @@ public class XmlUtils {
* @return the modified version of the passed in node.
* @since GemFire 8.1
*/
- static final Node changeNamespace(final Node node, final String oldNamespaceUri,
+ static Node changeNamespace(final Node node, final String oldNamespaceUri,
final String newNamespaceUri) throws XPathExpressionException {
Node result = null;
final NodeList nodes = query(node, "//*");
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java
index e782dc0..d4aa268 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java
@@ -41,7 +41,7 @@ public class MultipartFileResourceAdapter extends AbstractResource {
this.file = file;
}
- protected final MultipartFile getMultipartFile() {
+ protected MultipartFile getMultipartFile() {
return file;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/AbstractHttpOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/AbstractHttpOperationInvoker.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/AbstractHttpOperationInvoker.java
index 25f972e..b342c66 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/AbstractHttpOperationInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/AbstractHttpOperationInvoker.java
@@ -362,7 +362,7 @@ public abstract class AbstractHttpOperationInvoker implements HttpOperationInvok
* @return an instance of the ScheduledExecutorService for scheduling periodic or delayed tasks.
* @see java.util.concurrent.ScheduledExecutorService
*/
- protected final ScheduledExecutorService getExecutorService() {
+ protected ScheduledExecutorService getExecutorService() {
assertState(this.executorService != null,
"The ExecutorService for this HTTP OperationInvoker (%1$s) was not properly initialized!",
getClass().getName());
@@ -377,7 +377,7 @@ public abstract class AbstractHttpOperationInvoker implements HttpOperationInvok
* OperationInvoker to process commands.
* @see org.apache.geode.management.internal.cli.shell.Gfsh
*/
- protected final Gfsh getGfsh() {
+ protected Gfsh getGfsh() {
return this.gfsh;
}
@@ -388,7 +388,7 @@ public abstract class AbstractHttpOperationInvoker implements HttpOperationInvok
* @return an instance of the Spring RestTemplate used to make REST API web service calls.
* @see org.springframework.web.client.RestTemplate
*/
- protected final RestTemplate getRestTemplate() {
+ protected RestTemplate getRestTemplate() {
return this.restTemplate;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java
index b8e7506..a87948e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java
@@ -47,11 +47,11 @@ public class HttpInvocationHandler implements InvocationHandler {
this.objectName = objectName;
}
- protected final ObjectName getObjectName() {
+ protected ObjectName getObjectName() {
return objectName;
}
- protected final HttpOperationInvoker getOperationInvoker() {
+ protected HttpOperationInvoker getOperationInvoker() {
return operationInvoker;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java b/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java
index 2f2d0e3..e5de960 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java
@@ -247,7 +247,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* @param patterns the list of definitions to apply
* @deprecated as of 6.6.2 use {@link #reconfigure(String...)} instead.
*/
- public final void setSerializableClasses(List<String> patterns) {
+ public void setSerializableClasses(List<String> patterns) {
reconfigure(listToArray(patterns));
}
@@ -288,7 +288,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* @param patterns the definitions to apply
* @since GemFire 6.6.2
*/
- public final void reconfigure(String... patterns) {
+ public void reconfigure(String... patterns) {
reconfigure(false, patterns);
}
@@ -330,7 +330,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* throw an exception if the object it not portable to non-java languages.
* @since GemFire 6.6.2
*/
- public final void reconfigure(boolean checkPortability, String... patterns) {
+ public void reconfigure(boolean checkPortability, String... patterns) {
this.manager.reconfigure(checkPortability, patterns);
}
@@ -570,7 +570,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
*
* @since GemFire 6.6.2
*/
- public final RegionService getRegionService() {
+ public RegionService getRegionService() {
return this.manager.getRegionService();
}
@@ -579,7 +579,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
*
* @since GemFire 8.2
*/
- public final Object getManager() {
+ public Object getManager() {
// The result is not AutoSerializableManager because
// that class is not part of our public APIs.
return this.manager;