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:49 UTC
[39/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/statistics/SimpleStatisticId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java
index 57c1d0a..fd6bbb2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java
@@ -50,7 +50,7 @@ public class SimpleStatisticId implements StatisticId {
* Object equality must be based on instance identity.
*/
@Override
- public final boolean equals(Object obj) {
+ public boolean equals(Object obj) {
return super.equals(obj);
}
@@ -58,7 +58,7 @@ public class SimpleStatisticId implements StatisticId {
* Object equality must be based on instance identity.
*/
@Override
- public final int hashCode() {
+ public int hashCode() {
return super.hashCode();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
index 65e4370..36888e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
@@ -1344,7 +1344,7 @@ public class StatArchiveReader implements StatArchiveFormat {
protected int count;
- public final int getSampleCount() {
+ public int getSampleCount() {
return this.count;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
index 4eabe3b..3d375ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
@@ -800,85 +800,85 @@ public class StatArchiveWriter implements StatArchiveFormat, SampleHandler {
this.dataOut = new DataOutputStream(out);
}
- public final long getBytesWritten() {
+ public long getBytesWritten() {
return this.bytesWritten;
}
- public final void flush() throws IOException {
+ public void flush() throws IOException {
this.dataOut.flush();
}
@SuppressWarnings("unused")
- public final void close() throws IOException {
+ public void close() throws IOException {
this.dataOut.close();
}
- public final void write(int b) throws IOException {
+ public void write(int b) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void write(byte[] b, int off, int len) throws IOException {
+ public void write(byte[] b, int off, int len) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void write(byte[] b) throws IOException {
+ public void write(byte[] b) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void writeBytes(String v) throws IOException {
+ public void writeBytes(String v) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void writeChar(int v) throws IOException {
+ public void writeChar(int v) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void writeChars(String v) throws IOException {
+ public void writeChars(String v) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void writeDouble(double v) throws IOException {
+ public void writeDouble(double v) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void writeFloat(float v) throws IOException {
+ public void writeFloat(float v) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void writeBoolean(boolean v) throws IOException {
+ public void writeBoolean(boolean v) throws IOException {
this.dataOut.writeBoolean(v);
this.bytesWritten += 1;
}
- public final void writeByte(int v) throws IOException {
+ public void writeByte(int v) throws IOException {
this.dataOut.writeByte(v);
this.bytesWritten += 1;
}
- public final void writeShort(int v) throws IOException {
+ public void writeShort(int v) throws IOException {
this.dataOut.writeShort(v);
this.bytesWritten += 2;
}
- public final void writeInt(int v) throws IOException {
+ public void writeInt(int v) throws IOException {
this.dataOut.writeInt(v);
this.bytesWritten += 4;
}
- public final void writeLong(long v) throws IOException {
+ public void writeLong(long v) throws IOException {
this.dataOut.writeLong(v);
this.bytesWritten += 8;
}
- public final void writeUTF(String v) throws IOException {
+ public void writeUTF(String v) throws IOException {
this.dataOut.writeUTF(v);
this.bytesWritten += v.length() + 2; // this is the minimum. The max is v.size()*3 +2
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java
index 476d118..1a59616 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java
@@ -82,7 +82,7 @@ public class StatisticDescriptorImpl implements StatisticDescriptor {
*
* @throws IllegalArgumentException <code>code</code> is an unknown type
*/
- public final static String getTypeCodeName(int code) {
+ public static String getTypeCodeName(int code) {
switch (code) {
case BYTE:
return "byte";
@@ -108,7 +108,7 @@ public class StatisticDescriptorImpl implements StatisticDescriptor {
*
* @throws IllegalArgumentException <code>code</code> is an unknown type
*/
- public final static int getTypeCodeBits(int code) {
+ public static int getTypeCodeBits(int code) {
switch (code) {
case BYTE:
return 8;
@@ -134,7 +134,7 @@ public class StatisticDescriptorImpl implements StatisticDescriptor {
*
* @throws IllegalArgumentException <code>code</code> is an unknown type
*/
- public final static Class<?> getTypeCodeClass(byte code) {
+ public static Class<?> getTypeCodeClass(byte code) {
switch (code) {
case BYTE:
return byte.class;
@@ -227,35 +227,35 @@ public class StatisticDescriptorImpl implements StatisticDescriptor {
//////////////////// StatisticDescriptor Methods ////////////////////
- public final String getName() {
+ public String getName() {
return this.name;
}
- public final String getDescription() {
+ public String getDescription() {
return this.description;
}
- public final Class<?> getType() {
+ public Class<?> getType() {
return getTypeCodeClass(this.typeCode);
}
- public final int getStorageBits() {
+ public int getStorageBits() {
return getTypeCodeBits(this.typeCode);
}
- public final boolean isCounter() {
+ public boolean isCounter() {
return this.isCounter;
}
- public final boolean isLargerBetter() {
+ public boolean isLargerBetter() {
return this.isLargerBetter;
}
- public final String getUnit() {
+ public String getUnit() {
return this.unit;
}
- public final int getId() {
+ public int getId() {
// if (this.id == INVALID_OFFSET) {
// String s = "The id has not been initialized yet.";
// throw new IllegalStateException(s);
@@ -265,7 +265,7 @@ public class StatisticDescriptorImpl implements StatisticDescriptor {
return this.id;
}
- public final Number getNumberForRawBits(long bits) {
+ public Number getNumberForRawBits(long bits) {
switch (this.typeCode) {
case StatisticDescriptorImpl.INT:
return (int) bits;
@@ -285,14 +285,14 @@ public class StatisticDescriptorImpl implements StatisticDescriptor {
/**
* Returns the type code of this statistic
*/
- public final byte getTypeCode() {
+ public byte getTypeCode() {
return this.typeCode;
}
/**
* Sets the id of this descriptor
*/
- final void setId(int id) {
+ void setId(int id) {
// Assert.assertTrue(id >= 0);
this.id = id;
}
@@ -309,7 +309,7 @@ public class StatisticDescriptorImpl implements StatisticDescriptor {
return this.getName().compareTo(o.getName());
}
- public final int checkInt() {
+ public int checkInt() {
if (this.typeCode != INT) {
throw new IllegalArgumentException(
LocalizedStrings.StatisticDescriptorImpl_THE_STATISTIC_0_WITH_ID_1_IS_OF_TYPE_2_AND_IT_WAS_EXPECTED_TO_BE_AN_INT
@@ -319,7 +319,7 @@ public class StatisticDescriptorImpl implements StatisticDescriptor {
return this.id;
}
- public final int checkLong() {
+ public int checkLong() {
if (this.typeCode != LONG) {
StringBuffer sb = new StringBuffer();
sb.append("The statistic " + getName() + " with id ");
@@ -333,7 +333,7 @@ public class StatisticDescriptorImpl implements StatisticDescriptor {
return this.id;
}
- public final int checkDouble() {
+ public int checkDouble() {
if (this.typeCode != DOUBLE) {
throw new IllegalArgumentException(
LocalizedStrings.StatisticDescriptorImpl_THE_STATISTIC_0_WITH_ID_1_IS_OF_TYPE_2_AND_IT_WAS_EXPECTED_TO_BE_A_DOUBLE
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java
index 0572d4c..0e2f5f4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java
@@ -124,19 +124,19 @@ public abstract class StatisticsImpl implements Statistics {
////////////////////// Instance Methods //////////////////////
- public final boolean usesSystemCalls() {
+ public boolean usesSystemCalls() {
return this.osStatFlags != 0;
}
- public final int getOsStatFlags() {
+ public int getOsStatFlags() {
return this.osStatFlags;
}
- public final int nameToId(String name) {
+ public int nameToId(String name) {
return this.type.nameToId(name);
}
- public final StatisticDescriptor nameToDescriptor(String name) {
+ public StatisticDescriptor nameToDescriptor(String name) {
return this.type.nameToDescriptor(name);
}
@@ -144,27 +144,27 @@ public abstract class StatisticsImpl implements Statistics {
this.closed = true;
}
- public final boolean isClosed() {
+ public boolean isClosed() {
return this.closed;
}
public abstract boolean isAtomic();
- private final boolean isOpen() { // fix for bug 29973
+ private boolean isOpen() { // fix for bug 29973
return !this.closed;
}
//////////////////////// attribute Methods ///////////////////////
- public final StatisticsType getType() {
+ public StatisticsType getType() {
return this.type;
}
- public final String getTextId() {
+ public String getTextId() {
return this.textId;
}
- public final long getNumericId() {
+ public long getNumericId() {
return this.numericId;
}
@@ -184,15 +184,15 @@ public abstract class StatisticsImpl implements Statistics {
//////////////////////// set() Methods ///////////////////////
- public final void setInt(String name, int value) {
+ public void setInt(String name, int value) {
setInt(nameToDescriptor(name), value);
}
- public final void setInt(StatisticDescriptor descriptor, int value) {
+ public void setInt(StatisticDescriptor descriptor, int value) {
setInt(getIntId(descriptor), value);
}
- public final void setInt(int id, int value) {
+ public void setInt(int id, int value) {
if (isOpen()) {
_setInt(id, value);
}
@@ -204,15 +204,15 @@ public abstract class StatisticsImpl implements Statistics {
*/
protected abstract void _setInt(int offset, int value);
- public final void setLong(String name, long value) {
+ public void setLong(String name, long value) {
setLong(nameToDescriptor(name), value);
}
- public final void setLong(StatisticDescriptor descriptor, long value) {
+ public void setLong(StatisticDescriptor descriptor, long value) {
setLong(getLongId(descriptor), value);
}
- public final void setLong(int id, long value) {
+ public void setLong(int id, long value) {
if (isOpen()) {
_setLong(id, value);
}
@@ -224,15 +224,15 @@ public abstract class StatisticsImpl implements Statistics {
*/
protected abstract void _setLong(int offset, long value);
- public final void setDouble(String name, double value) {
+ public void setDouble(String name, double value) {
setDouble(nameToDescriptor(name), value);
}
- public final void setDouble(StatisticDescriptor descriptor, double value) {
+ public void setDouble(StatisticDescriptor descriptor, double value) {
setDouble(getDoubleId(descriptor), value);
}
- public final void setDouble(int id, double value) {
+ public void setDouble(int id, double value) {
if (isOpen()) {
_setDouble(id, value);
}
@@ -246,15 +246,15 @@ public abstract class StatisticsImpl implements Statistics {
/////////////////////// get() Methods ///////////////////////
- public final int getInt(String name) {
+ public int getInt(String name) {
return getInt(nameToDescriptor(name));
}
- public final int getInt(StatisticDescriptor descriptor) {
+ public int getInt(StatisticDescriptor descriptor) {
return getInt(getIntId(descriptor));
}
- public final int getInt(int id) {
+ public int getInt(int id) {
if (isOpen()) {
return _getInt(id);
} else {
@@ -269,15 +269,15 @@ public abstract class StatisticsImpl implements Statistics {
protected abstract int _getInt(int offset);
- public final long getLong(String name) {
+ public long getLong(String name) {
return getLong(nameToDescriptor(name));
}
- public final long getLong(StatisticDescriptor descriptor) {
+ public long getLong(StatisticDescriptor descriptor) {
return getLong(getLongId(descriptor));
}
- public final long getLong(int id) {
+ public long getLong(int id) {
if (isOpen()) {
return _getLong(id);
} else {
@@ -292,15 +292,15 @@ public abstract class StatisticsImpl implements Statistics {
*/
protected abstract long _getLong(int offset);
- public final double getDouble(String name) {
+ public double getDouble(String name) {
return getDouble(nameToDescriptor(name));
}
- public final double getDouble(StatisticDescriptor descriptor) {
+ public double getDouble(StatisticDescriptor descriptor) {
return getDouble(getDoubleId(descriptor));
}
- public final double getDouble(int id) {
+ public double getDouble(int id) {
if (isOpen()) {
return _getDouble(id);
} else {
@@ -314,7 +314,7 @@ public abstract class StatisticsImpl implements Statistics {
*/
protected abstract double _getDouble(int offset);
- public final Number get(StatisticDescriptor descriptor) {
+ public Number get(StatisticDescriptor descriptor) {
if (isOpen()) {
return _get((StatisticDescriptorImpl) descriptor);
} else {
@@ -322,7 +322,7 @@ public abstract class StatisticsImpl implements Statistics {
}
}
- public final Number get(String name) {
+ public Number get(String name) {
return get(nameToDescriptor(name));
}
@@ -340,15 +340,15 @@ public abstract class StatisticsImpl implements Statistics {
//////////////////////// inc() Methods ////////////////////////
- public final void incInt(String name, int delta) {
+ public void incInt(String name, int delta) {
incInt(nameToDescriptor(name), delta);
}
- public final void incInt(StatisticDescriptor descriptor, int delta) {
+ public void incInt(StatisticDescriptor descriptor, int delta) {
incInt(getIntId(descriptor), delta);
}
- public final void incInt(int id, int delta) {
+ public void incInt(int id, int delta) {
if (isOpen()) {
_incInt(id, delta);
}
@@ -360,15 +360,15 @@ public abstract class StatisticsImpl implements Statistics {
*/
protected abstract void _incInt(int offset, int delta);
- public final void incLong(String name, long delta) {
+ public void incLong(String name, long delta) {
incLong(nameToDescriptor(name), delta);
}
- public final void incLong(StatisticDescriptor descriptor, long delta) {
+ public void incLong(StatisticDescriptor descriptor, long delta) {
incLong(getLongId(descriptor), delta);
}
- public final void incLong(int id, long delta) {
+ public void incLong(int id, long delta) {
if (isOpen()) {
_incLong(id, delta);
}
@@ -380,15 +380,15 @@ public abstract class StatisticsImpl implements Statistics {
*/
protected abstract void _incLong(int offset, long delta);
- public final void incDouble(String name, double delta) {
+ public void incDouble(String name, double delta) {
incDouble(nameToDescriptor(name), delta);
}
- public final void incDouble(StatisticDescriptor descriptor, double delta) {
+ public void incDouble(StatisticDescriptor descriptor, double delta) {
incDouble(getDoubleId(descriptor), delta);
}
- public final void incDouble(int id, double delta) {
+ public void incDouble(int id, double delta) {
if (isOpen()) {
_incDouble(id, delta);
}
@@ -533,22 +533,22 @@ public abstract class StatisticsImpl implements Statistics {
return this.uniqueId == other.getUniqueId();
}
- private final static int getIntId(StatisticDescriptor descriptor) {
+ private static int getIntId(StatisticDescriptor descriptor) {
return ((StatisticDescriptorImpl) descriptor).checkInt();
}
- private final static int getLongId(StatisticDescriptor descriptor) {
+ private static int getLongId(StatisticDescriptor descriptor) {
return ((StatisticDescriptorImpl) descriptor).checkLong();
}
- private final static int getDoubleId(StatisticDescriptor descriptor) {
+ private static int getDoubleId(StatisticDescriptor descriptor) {
return ((StatisticDescriptorImpl) descriptor).checkDouble();
}
/**
* Returns the value of the specified statistic descriptor.
*/
- private final Number _get(StatisticDescriptorImpl stat) {
+ private Number _get(StatisticDescriptorImpl stat) {
switch (stat.getTypeCode()) {
case StatisticDescriptorImpl.INT:
return Integer.valueOf(_getInt(stat.getId()));
@@ -566,7 +566,7 @@ public abstract class StatisticsImpl implements Statistics {
/**
* Returns the bits that represent the raw value of the specified statistic descriptor.
*/
- private final long _getRawBits(StatisticDescriptorImpl stat) {
+ private long _getRawBits(StatisticDescriptorImpl stat) {
switch (stat.getTypeCode()) {
case StatisticDescriptorImpl.INT:
return _getInt(stat.getId());
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
index 5a025f9..df67d74 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
@@ -38,11 +38,11 @@ public class StatisticsTypeFactoryImpl implements StatisticsTypeFactory {
/**
* Returns the single instance of this class.
*/
- public final static StatisticsTypeFactory singleton() {
+ public static StatisticsTypeFactory singleton() {
return singleton;
}
- protected final static void clear() {
+ protected static void clear() {
singleton.statTypes.clear();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
index 2c7fd3c..c6594ef 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
@@ -152,23 +152,23 @@ public class StatisticsTypeImpl implements StatisticsType {
////////////////////// StatisticsType Methods //////////////////////
- public final String getName() {
+ public String getName() {
return this.name;
}
- public final String getDescription() {
+ public String getDescription() {
return this.description;
}
- public final StatisticDescriptor[] getStatistics() {
+ public StatisticDescriptor[] getStatistics() {
return this.stats;
}
- public final int nameToId(String name) {
+ public int nameToId(String name) {
return nameToDescriptor(name).getId();
}
- public final StatisticDescriptor nameToDescriptor(String name) {
+ public StatisticDescriptor nameToDescriptor(String name) {
StatisticDescriptorImpl stat = (StatisticDescriptorImpl) statsMap.get(name);
if (stat == null) {
throw new IllegalArgumentException(
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/ProcessStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/ProcessStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/ProcessStats.java
index fc2fd05..690b514 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/ProcessStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/ProcessStats.java
@@ -40,11 +40,11 @@ public abstract class ProcessStats {
*
* @see Statistics#close
*/
- public final void close() {
+ public void close() {
this.stats.close();
}
- public final Statistics getStatistics() {
+ public Statistics getStatistics() {
return this.stats;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
index 568329b..17f6afe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
@@ -135,7 +135,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
////////////////////// Instance Methods //////////////////////
@Override
- public final boolean isAtomic() {
+ public boolean isAtomic() {
return true;
}
@@ -150,13 +150,13 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
/**
* Queue of new ThreadStorage instances.
*/
- private final ConcurrentLinkedQueue<ThreadStorage> threadStoreQ =
+ private ConcurrentLinkedQueue<ThreadStorage> threadStoreQ =
new ConcurrentLinkedQueue<ThreadStorage>();
/**
* List of ThreadStorage instances that will be used to roll up stat values on this instance. They
* come from the threadStoreQ.
*/
- private final CopyOnWriteArrayList<ThreadStorage> threadStoreList =
+ private CopyOnWriteArrayList<ThreadStorage> threadStoreList =
new CopyOnWriteArrayList<ThreadStorage>();
/**
@@ -225,17 +225,17 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
//////////////////////// store() Methods ///////////////////////
@Override
- protected final void _setInt(int offset, int value) {
+ protected void _setInt(int offset, int value) {
doIntWrite(offset, value);
}
@Override
- protected final void _setLong(int offset, long value) {
+ protected void _setLong(int offset, long value) {
doLongWrite(offset, value);
}
@Override
- protected final void _setDouble(int offset, double value) {
+ protected void _setDouble(int offset, double value) {
throw new IllegalStateException(
LocalizedStrings.Atomic50StatisticsImpl_DOUBLE_STATS_NOT_ON_ATOMIC50.toLocalizedString());
}
@@ -243,17 +243,17 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
/////////////////////// get() Methods ///////////////////////
@Override
- protected final int _getInt(int offset) {
+ protected int _getInt(int offset) {
return doIntRead(offset);
}
@Override
- protected final long _getLong(int offset) {
+ protected long _getLong(int offset) {
return doLongRead(offset);
}
@Override
- protected final double _getDouble(int offset) {
+ protected double _getDouble(int offset) {
throw new IllegalStateException(
LocalizedStrings.Atomic50StatisticsImpl_DOUBLE_STATS_NOT_ON_ATOMIC50.toLocalizedString());
}
@@ -261,19 +261,19 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
//////////////////////// inc() Methods ////////////////////////
@Override
- protected final void _incInt(int offset, int delta) {
+ protected void _incInt(int offset, int delta) {
getThreadIntStorage().getAndAdd(offset, delta);
setIntDirty(offset);
}
@Override
- protected final void _incLong(int offset, long delta) {
+ protected void _incLong(int offset, long delta) {
getThreadLongStorage().getAndAdd(offset, delta);
setLongDirty(offset);
}
@Override
- protected final void _incDouble(int offset, double delta) {
+ protected void _incDouble(int offset, double delta) {
throw new IllegalStateException(
LocalizedStrings.Atomic50StatisticsImpl_DOUBLE_STATS_NOT_ON_ATOMIC50.toLocalizedString());
}
@@ -355,29 +355,29 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
}
}
- private final boolean isIntDirty(final int idx) {
+ private boolean isIntDirty(final int idx) {
return this.intDirty.get(idx) != 0;
}
- private final boolean isLongDirty(final int idx) {
+ private boolean isLongDirty(final int idx) {
return this.longDirty.get(idx) != 0;
}
- private final boolean clearIntDirty(final int idx) {
+ private boolean clearIntDirty(final int idx) {
if (!this.intDirty.weakCompareAndSet(idx, 1/* expected */, 0/* update */)) {
return this.intDirty.compareAndSet(idx, 1/* expected */, 0/* update */);
}
return true;
}
- private final boolean clearLongDirty(final int idx) {
+ private boolean clearLongDirty(final int idx) {
if (!this.longDirty.weakCompareAndSet(idx, 1/* expected */, 0/* update */)) {
return this.longDirty.compareAndSet(idx, 1/* expected */, 0/* update */);
}
return true;
}
- private final void setIntDirty(final int idx) {
+ private void setIntDirty(final int idx) {
if (!this.intDirty.weakCompareAndSet(idx, 0/* expected */, 1/* update */)) {
if (!isIntDirty(idx)) {
this.intDirty.set(idx, 1);
@@ -385,7 +385,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
}
}
- private final void setLongDirty(final int idx) {
+ private void setLongDirty(final int idx) {
if (!this.longDirty.weakCompareAndSet(idx, 0/* expected */, 1/* update */)) {
if (!isLongDirty(idx)) {
this.longDirty.set(idx, 1);
@@ -393,7 +393,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
}
}
- private final int doIntRead(final int idx) {
+ private int doIntRead(final int idx) {
// early out for sampler; it called prepareForSample
if (samplerThread.get() != null) {
return this.intStorage.get(idx);
@@ -423,7 +423,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
}
}
- private final void doIntWrite(final int idx, int value) {
+ private void doIntWrite(final int idx, int value) {
synchronized (this.intReadPrepLock[idx]) {
if (!isIntDirty(idx)) {
// no need to prepare if not dirty
@@ -444,7 +444,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
}
}
- private final long doLongRead(final int idx) {
+ private long doLongRead(final int idx) {
if (samplerThread.get() != null) {
return this.longStorage.get(idx);
}
@@ -473,7 +473,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
}
}
- private final void doLongWrite(int idx, long value) {
+ private void doLongWrite(int idx, long value) {
synchronized (this.longReadPrepLock[idx]) {
if (!isLongDirty(idx)) {
// no need to prepare if not dirty
@@ -497,17 +497,17 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
/////////////////// internal package methods //////////////////
- final int[] _getIntStorage() {
+ int[] _getIntStorage() {
throw new IllegalStateException(
LocalizedStrings.Atomic50StatisticsImpl_DIRECT_ACCESS_NOT_ON_ATOMIC50.toLocalizedString());
}
- final long[] _getLongStorage() {
+ long[] _getLongStorage() {
throw new IllegalStateException(
LocalizedStrings.Atomic50StatisticsImpl_DIRECT_ACCESS_NOT_ON_ATOMIC50.toLocalizedString());
}
- final double[] _getDoubleStorage() {
+ double[] _getDoubleStorage() {
throw new IllegalStateException(
LocalizedStrings.Atomic50StatisticsImpl_DIRECT_ACCESS_NOT_ON_ATOMIC50.toLocalizedString());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
index 1a67f43..216a9d9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
@@ -481,7 +481,7 @@ public class ByteBufferInputStream extends InputStream
return this.chunk.getDataSize();
}
- private final int nextGetIndex() {
+ private int nextGetIndex() {
int p = this.position;
if (p >= this.limit) {
throw new BufferUnderflowException();
@@ -490,7 +490,7 @@ public class ByteBufferInputStream extends InputStream
return p;
}
- private final int nextGetIndex(int nb) {
+ private int nextGetIndex(int nb) {
int p = this.position;
if (this.limit - p < nb) {
throw new BufferUnderflowException();
@@ -503,13 +503,13 @@ public class ByteBufferInputStream extends InputStream
* Checks the given index against the limit, throwing an {@link IndexOutOfBoundsException} if it
* is not smaller than the limit or is smaller than zero.
*/
- private final void checkIndex(int i) {
+ private void checkIndex(int i) {
if ((i < 0) || (i >= this.limit)) {
throw new IndexOutOfBoundsException();
}
}
- private final void checkIndex(int i, int nb) {
+ private void checkIndex(int i, int nb) {
if ((i < 0) || (nb > this.limit - i)) {
throw new IndexOutOfBoundsException();
}
@@ -802,14 +802,14 @@ public class ByteBufferInputStream extends InputStream
this.buffer = ByteSourceFactory.create(blob);
}
- public final void setBuffer(ByteSource buffer) {
+ public void setBuffer(ByteSource buffer) {
if (buffer == null) {
throw new NullPointerException();
}
this.buffer = buffer;
}
- public final void setBuffer(ByteBuffer bb) {
+ public void setBuffer(ByteBuffer bb) {
if (bb == null) {
throw new NullPointerException();
}
@@ -821,7 +821,7 @@ public class ByteBufferInputStream extends InputStream
* the wrapped ByteBuffer is done this method throws BufferUnderflowException
*/
@Override
- public final int read() {
+ public int read() {
return (buffer.get() & 0xff);
}
@@ -832,7 +832,7 @@ public class ByteBufferInputStream extends InputStream
* BufferUnderflowException
*/
@Override
- public final int read(byte b[], int off, int len) {
+ public int read(byte b[], int off, int len) {
buffer.get(b, off, len);
return len;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index 70868e0..e59821d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
@@ -106,7 +106,7 @@ public class Connection implements Runnable {
/** true if connection is a shared resource that can be used by more than one thread */
private boolean sharedResource;
- public final boolean isSharedResource() {
+ public boolean isSharedResource() {
return this.sharedResource;
}
@@ -115,7 +115,7 @@ public class Connection implements Runnable {
private final static ThreadLocal isReaderThread = new ThreadLocal();
- public final static void makeReaderThread() {
+ public static void makeReaderThread() {
// mark this thread as a reader thread
makeReaderThread(true);
}
@@ -125,7 +125,7 @@ public class Connection implements Runnable {
}
// return true if this thread is a reader thread
- public final static boolean isReaderThread() {
+ public static boolean isReaderThread() {
Object o = isReaderThread.get();
if (o == null) {
return false;
@@ -156,7 +156,7 @@ public class Connection implements Runnable {
private final static ThreadLocal isDominoThread = new ThreadLocal();
// return true if this thread is a reader thread
- public final static boolean tipDomino() {
+ public static boolean tipDomino() {
if (DOMINO_THREAD_OWNED_SOCKETS) {
// mark this thread as one who wants to send ALL on TO sockets
ConnectionTable.threadWantsOwnResources();
@@ -167,7 +167,7 @@ public class Connection implements Runnable {
}
}
- public final static boolean isDominoThread() {
+ public static boolean isDominoThread() {
Object o = isDominoThread.get();
if (o == null) {
return false;
@@ -1917,7 +1917,7 @@ public class Connection implements Runnable {
* checks to see if an exception should not be logged: i.e., "forcibly closed", "reset by peer",
* or "connection reset"
*/
- public static final boolean isIgnorableIOException(Exception e) {
+ public static boolean isIgnorableIOException(Exception e) {
if (e instanceof ClosedChannelException) {
return true;
}
@@ -2476,7 +2476,7 @@ public class Connection implements Runnable {
}
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "DE_MIGHT_IGNORE")
- final int readFully(InputStream input, byte[] buffer, int len) throws IOException {
+ int readFully(InputStream input, byte[] buffer, int len) throws IOException {
int bytesSoFar = 0;
while (bytesSoFar < len) {
this.owner.getConduit().getCancelCriterion().checkCancelInProgress(null);
@@ -3994,21 +3994,21 @@ public class Connection implements Runnable {
}
- protected final void accessed() {
+ protected void accessed() {
this.accessed = true;
}
/**
* return the DM id of the guy on the other side of this connection.
*/
- public final InternalDistributedMember getRemoteAddress() {
+ public InternalDistributedMember getRemoteAddress() {
return this.remoteAddr;
}
/**
* Return the version of the guy on the other side of this connection.
*/
- public final Version getRemoteVersion() {
+ public Version getRemoteVersion() {
return this.remoteVersion;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
index e85046c..6f405fc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
@@ -492,7 +492,7 @@ public class MsgDestreamer {
}
@Override
- public final void close() {
+ public void close() {
signalDone();
}
@@ -501,7 +501,7 @@ public class MsgDestreamer {
* the wrapped ByteBuffer is done this method throws BufferUnderflowException
*/
@Override
- public final int read() throws IOException {
+ public int read() throws IOException {
ByteBuffer bb = waitForAvailableData();
// logit("read result=" + result);
return (bb.get() & 0xff);
@@ -514,7 +514,7 @@ public class MsgDestreamer {
* BufferUnderflowException
*/
@Override
- public final int read(byte b[], int off, int len) throws IOException {
+ public int read(byte b[], int off, int len) throws IOException {
ByteBuffer bb = waitForAvailableData();
int remaining = bb.remaining();
int bytesToRead = len;
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
index 5c6df46..52c70ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
@@ -44,13 +44,13 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
/** write the low-order 8 bits of the given int */
@Override
- public final void write(int b) {
+ public void write(int b) {
buffer.put((byte) b);
}
/** 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.buffer.put(source, offset, len);
}
@@ -61,13 +61,13 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
/**
* write the header after the message has been written to the stream
*/
- public final void setMessageHeader(int msgType, int processorType, short msgId) {
+ public void setMessageHeader(int msgType, int processorType, short msgId) {
buffer.putInt(Connection.MSG_HEADER_SIZE_OFFSET, Connection.calcHdrSize(size()));
buffer.put(Connection.MSG_HEADER_TYPE_OFFSET, (byte) (msgType & 0xff));
buffer.putShort(Connection.MSG_HEADER_ID_OFFSET, msgId);
}
- public final void reset() {
+ public void reset() {
this.buffer.clear();
this.buffer.position(Connection.MSG_HEADER_BYTES);
}
@@ -76,7 +76,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* gets the content ByteBuffer, ready for reading. The stream should not be written to past this
* point until it has been reset.
*/
- public final ByteBuffer getContentBuffer() {
+ public ByteBuffer getContentBuffer() {
buffer.flip();
return buffer;
}
@@ -92,7 +92,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @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);
}
@@ -106,7 +106,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @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);
}
@@ -129,7 +129,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @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 {
buffer.putShort((short) v);
}
@@ -152,7 +152,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @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 {
buffer.putChar((char) v);
}
@@ -176,7 +176,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @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 {
buffer.putInt(v);
}
@@ -204,7 +204,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @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 {
buffer.putLong(v);
}
@@ -219,7 +219,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @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 {
buffer.putFloat(v);
}
@@ -234,7 +234,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @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 {
buffer.putDouble(v);
}
@@ -252,7 +252,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @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) {
// I know this is a deprecated method but it is PERFECT for this impl.
@@ -283,7 +283,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @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) {
for (int i = 0; i < len; i++) {
@@ -343,11 +343,11 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @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 {
writeFullUTF(str);
}
- 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(
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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/5abc4863/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 de9c312..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
@@ -41,7 +41,7 @@ class VersionedMsgStreamer extends MsgStreamer implements VersionedDataStream {
* {@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/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/5abc4863/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 35c61c8..d1d0488 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];
}
@@ -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();
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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/5abc4863/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/5abc4863/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 1da9808..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
@@ -34,7 +34,7 @@ public class ArrayConverter extends OpenTypeConverter {
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 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/5abc4863/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 5d13516..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
@@ -60,7 +60,7 @@ public 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 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/5abc4863/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/5abc4863/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 8923c08..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
@@ -30,11 +30,11 @@ public class EnumConverter<T extends Enum<T>> extends OpenTypeConverter {
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/5abc4863/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 1d3a024..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
@@ -37,7 +37,7 @@ public 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/5abc4863/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/5abc4863/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 f4af2de..a019f95 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
@@ -117,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
@@ -143,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
@@ -161,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;
}
@@ -594,7 +594,7 @@ public abstract class OpenTypeConverter {
return possibleCause;
}
- final Object fromCompositeData(CompositeData cd, String[] itemNames,
+ Object fromCompositeData(CompositeData cd, String[] itemNames,
OpenTypeConverter[] converters) {
throw new Error();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 5b18065..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
@@ -43,7 +43,7 @@ public 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 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/5abc4863/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 9500677..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
@@ -75,7 +75,7 @@ public 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 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 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 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/5abc4863/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/5abc4863/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..c1d4b55 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,7 +170,7 @@ public class CacheElement {
* @throws XPathExpressionException
* @since GemFire 8.1
*/
- private static final void buildElementMapCacheType(
+ private static void buildElementMapCacheType(
final LinkedHashMap<String, CacheElement> elementMap, final InputSource inputSource)
throws SAXException, IOException, ParserConfigurationException, XPathExpressionException {
final Document doc = XmlUtils.getDocumentBuilder().parse(inputSource);