This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
commit 5e744c606fbbcf15699fc00e74f7539c86508c5c Author: Jacob Barrett <jbarr...@pivotal.io> AuthorDate: Fri Jan 15 14:48:09 2021 -0800 GEODE-6588: Static analyzer cleanup. --- .../codeAnalysis/sanctionedDataSerializables.txt | 4 +- .../tier/sockets/ClientDataSerializerMessage.java | 66 ++- .../tier/sockets/ClientInstantiatorMessage.java | 44 +- .../tier/sockets/ClientInterestMessageImpl.java | 98 ++--- .../tier/sockets/ClientMarkerMessageImpl.java | 12 +- .../tier/sockets/ClientRegistrationMetadata.java | 2 +- .../tier/sockets/ClientUpdateMessageImpl.java | 450 ++++++++++----------- 7 files changed, 322 insertions(+), 354 deletions(-) diff --git a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt index 075b99d..058733c 100644 --- a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt +++ b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt @@ -1713,7 +1713,7 @@ toData,17 org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage,2 fromData,82 -toData,85 +toData,99 org/apache/geode/internal/cache/tier/sockets/ClientDenylistProcessor$ClientDenylistMessage,2 fromData,25 @@ -1721,7 +1721,7 @@ toData,25 org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage,2 fromData,82 -toData,85 +toData,99 org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl,2 fromData,84 diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java index 78c55d9..31d18b4 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java @@ -31,12 +31,12 @@ import org.apache.geode.internal.serialization.SerializationContext; public class ClientDataSerializerMessage extends ClientUpdateMessageImpl { private byte[][] serializedDataSerializer; - private Class[][] supportedClasses; + private Class<?>[][] supportedClasses; public ClientDataSerializerMessage(EnumListenerEvent operation, byte[][] dataSerializer, - ClientProxyMembershipID memberId, EventID eventIdentifier, Class[][] supportedClasses) { + ClientProxyMembershipID memberId, EventID eventIdentifier, Class<?>[][] supportedClasses) { super(operation, memberId, eventIdentifier); - this.serializedDataSerializer = dataSerializer; + serializedDataSerializer = dataSerializer; this.supportedClasses = supportedClasses; } @@ -73,23 +73,7 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl { } } - protected Message getGFEMessage(KnownVersion clientVersion) { - Message message = null; - int dataSerializerLength = this.serializedDataSerializer.length; - message = new Message(dataSerializerLength + 1, clientVersion); // one for eventID - // Set message type - message.setMessageType(MessageType.REGISTER_DATASERIALIZERS); - for (int i = 0; i < dataSerializerLength - 1; i += 2) { - message.addBytesPart(this.serializedDataSerializer[i]); - message.addBytesPart(this.serializedDataSerializer[i + 1]); - } - message.setTransactionId(0); - message.addObjPart(this.getEventId()); - return message; - } - - protected Message getGFE6516Message(KnownVersion clientVersion) { - Message message = null; + private Message getGFE6516Message(KnownVersion clientVersion) { // The format: // part 0: serializer1 classname @@ -106,34 +90,34 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl { // ... // Last part: event ID - int dsLength = this.serializedDataSerializer.length; // multiple of 2 + int dsLength = serializedDataSerializer.length; // multiple of 2 assert (dsLength % 2) == 0; - int numOfDS = (this.supportedClasses != null) ? this.supportedClasses.length : 0; + int numOfDS = (supportedClasses != null) ? supportedClasses.length : 0; assert (dsLength / 2) == numOfDS; // Calculate total number of parts int numOfParts = dsLength + numOfDS; for (int i = 0; i < numOfDS; i++) { - if (this.supportedClasses[i] != null) { - numOfParts += this.supportedClasses[i].length; + if (supportedClasses[i] != null) { + numOfParts += supportedClasses[i].length; } } numOfParts += 1; // one for eventID // this._logger.fine("Number of parts for ClientDataSerializerMessage: " // + numOfParts + ", with eventID: " + this.getEventId()); - message = new Message(numOfParts, clientVersion); + final Message message = new Message(numOfParts, clientVersion); // Set message type message.setMessageType(MessageType.REGISTER_DATASERIALIZERS); for (int i = 0; i < dsLength; i = i + 2) { - message.addBytesPart(this.serializedDataSerializer[i]); // part 0 - message.addBytesPart(this.serializedDataSerializer[i + 1]); // part 1 + message.addBytesPart(serializedDataSerializer[i]); // part 0 + message.addBytesPart(serializedDataSerializer[i + 1]); // part 1 - int numOfClasses = this.supportedClasses[i / 2].length; + int numOfClasses = supportedClasses[i / 2].length; byte[][] classBytes = new byte[numOfClasses][]; try { for (int j = 0; j < numOfClasses; j++) { - classBytes[j] = CacheServerHelper.serialize(this.supportedClasses[i / 2][j].getName()); + classBytes[j] = CacheServerHelper.serialize(supportedClasses[i / 2][j].getName()); } } catch (IOException ioe) { numOfClasses = 0; @@ -145,7 +129,7 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl { } } message.setTransactionId(0); - message.addObjPart(this.getEventId()); // last part + message.addObjPart(getEventId()); // last part return message; } @@ -165,10 +149,10 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl { SerializationContext context) throws IOException { out.writeByte(_operation.getEventCode()); - int dataSerializerCount = this.serializedDataSerializer.length; + int dataSerializerCount = serializedDataSerializer.length; out.writeInt(dataSerializerCount); - for (int i = 0; i < dataSerializerCount; i++) { - DataSerializer.writeByteArray(this.serializedDataSerializer[i], out); + for (final byte[] bytes : serializedDataSerializer) { + DataSerializer.writeByteArray(bytes, out); } context.getSerializer().writeObject(_membershipId, out); context.getSerializer().writeObject(_eventIdentifier, out); @@ -187,12 +171,12 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl { // Note: does not call super.fromData what a HACK _operation = EnumListenerEvent.getEnumListenerEvent(in.readByte()); int dataSerializerCount = in.readInt(); - this.serializedDataSerializer = new byte[dataSerializerCount][]; + serializedDataSerializer = new byte[dataSerializerCount][]; for (int i = 0; i < dataSerializerCount; i++) { - this.serializedDataSerializer[i] = DataSerializer.readByteArray(in); + serializedDataSerializer[i] = DataSerializer.readByteArray(in); } _membershipId = ClientProxyMembershipID.readCanonicalized(in); - _eventIdentifier = (EventID) context.getDeserializer().readObject(in); + _eventIdentifier = context.getDeserializer().readObject(in); } @Override @@ -225,11 +209,9 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl { @Override public String toString() { - StringBuilder buffer = new StringBuilder(); - buffer.append("ClientDataSerializerMessage[value=") - .append(Arrays.deepToString(this.serializedDataSerializer)) - .append(";memberId=") - .append(getMembershipId()).append(";eventId=").append(getEventId()).append("]"); - return buffer.toString(); + return "ClientDataSerializerMessage[value=" + + Arrays.deepToString(serializedDataSerializer) + + ";memberId=" + + getMembershipId() + ";eventId=" + getEventId() + "]"; } } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java index 6dc8602..37ede9e 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java @@ -55,7 +55,7 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl { public ClientInstantiatorMessage(EnumListenerEvent operation, byte[][] instantiator, ClientProxyMembershipID memberId, EventID eventIdentifier) { super(operation, memberId, eventIdentifier); - this.serializedInstantiators = instantiator; + serializedInstantiators = instantiator; } /* @@ -83,16 +83,6 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl { } - // /** - // * Returns the serialized value of Instantiators. - // * - // * @return the serialized value of Instantiators - // */ - // public byte[][] getInstantiators() - // { - // return this.serializedInstantiators; - // } - /** * Determines whether or not to conflate this message. * @@ -111,12 +101,12 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl { // Set message type message.setMessageType(MessageType.REGISTER_INSTANTIATORS); for (int i = 0; i < instantiatorsLength - 2; i += 3) { - message.addBytesPart(this.serializedInstantiators[i]); - message.addBytesPart(this.serializedInstantiators[i + 1]); - message.addBytesPart(this.serializedInstantiators[i + 2]); + message.addBytesPart(serializedInstantiators[i]); + message.addBytesPart(serializedInstantiators[i + 1]); + message.addBytesPart(serializedInstantiators[i + 2]); } message.setTransactionId(0); - message.addObjPart(this.getEventId()); + message.addObjPart(getEventId()); return message; } @@ -136,10 +126,10 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl { SerializationContext context) throws IOException { // Note: does not call super.toData what a HACK out.writeByte(_operation.getEventCode()); - int instantiatorCount = this.serializedInstantiators.length; + int instantiatorCount = serializedInstantiators.length; out.writeInt(instantiatorCount); - for (int i = 0; i < instantiatorCount; i++) { - DataSerializer.writeByteArray(this.serializedInstantiators[i], out); + for (final byte[] serializedInstantiator : serializedInstantiators) { + DataSerializer.writeByteArray(serializedInstantiator, out); } context.getSerializer().writeObject(_membershipId, out); context.getSerializer().writeObject(_eventIdentifier, out); @@ -158,12 +148,12 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl { // Note: does not call super.fromData what a HACK _operation = EnumListenerEvent.getEnumListenerEvent(in.readByte()); int instantiatorCount = in.readInt(); // is byte suficient for this ? - this.serializedInstantiators = new byte[instantiatorCount][]; + serializedInstantiators = new byte[instantiatorCount][]; for (int i = 0; i < instantiatorCount; i++) { - this.serializedInstantiators[i] = DataSerializer.readByteArray(in); + serializedInstantiators[i] = DataSerializer.readByteArray(in); } _membershipId = ClientProxyMembershipID.readCanonicalized(in); - _eventIdentifier = (EventID) context.getDeserializer().readObject(in); + _eventIdentifier = context.getDeserializer().readObject(in); } @Override @@ -186,13 +176,11 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl { @Override public String toString() { - StringBuffer buffer = new StringBuffer(); - buffer.append("ClientInstantiatorMessage[value=") - .append(Arrays.deepToString(this.serializedInstantiators)) - .append(";memberId=") - .append(getMembershipId()).append(";eventId=").append(getEventId()) - .append("]"); - return buffer.toString(); + return "ClientInstantiatorMessage[value=" + + Arrays.deepToString(serializedInstantiators) + + ";memberId=" + + getMembershipId() + ";eventId=" + getEventId() + + "]"; } } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java index bb69b09..b6b0db6 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java @@ -112,20 +112,20 @@ public class ClientInterestMessageImpl implements ClientMessage { this.interestType = interestType; this.interestResultPolicy = interestResultPolicy; this.isDurable = isDurable; - this.forUpdatesAsInvalidates = sendUpdatesAsInvalidates; + forUpdatesAsInvalidates = sendUpdatesAsInvalidates; this.action = action; } public ClientInterestMessageImpl(DistributedSystem distributedSystem, ClientInterestMessageImpl message, Object keyOfInterest) { - this.eventId = new EventID(distributedSystem); - this.regionName = message.regionName; + eventId = new EventID(distributedSystem); + regionName = message.regionName; this.keyOfInterest = keyOfInterest; - this.interestType = message.interestType; - this.interestResultPolicy = message.interestResultPolicy; - this.isDurable = message.isDurable; - this.forUpdatesAsInvalidates = message.forUpdatesAsInvalidates; - this.action = message.action; + interestType = message.interestType; + interestResultPolicy = message.interestResultPolicy; + isDurable = message.isDurable; + forUpdatesAsInvalidates = message.forUpdatesAsInvalidates; + action = message.action; } /** @@ -139,7 +139,7 @@ public class ClientInterestMessageImpl implements ClientMessage { message.setTransactionId(0); // Set the message type - switch (this.action) { + switch (action) { case REGISTER: message.setMessageType(MessageType.CLIENT_REGISTER_INTEREST); break; @@ -147,32 +147,32 @@ public class ClientInterestMessageImpl implements ClientMessage { message.setMessageType(MessageType.CLIENT_UNREGISTER_INTEREST); break; default: - String s = "Unknown action: " + this.action; + String s = "Unknown action: " + action; throw new IOException(s); } // Add the region name - message.addStringPart(this.regionName, true); + message.addStringPart(regionName, true); // Add the key - message.addStringOrObjPart(this.keyOfInterest); + message.addStringOrObjPart(keyOfInterest); // Add the interest type - message.addObjPart(Integer.valueOf(this.interestType)); + message.addObjPart(interestType); // Add the interest result policy (if register interest) if (isRegister()) { - message.addObjPart(Byte.valueOf(this.interestResultPolicy)); + message.addObjPart(interestResultPolicy); } // Add the isDurable flag - message.addObjPart(Boolean.valueOf(this.isDurable)); + message.addObjPart(isDurable); // Add the forUpdatesAsInvalidates flag - message.addObjPart(Boolean.valueOf(this.forUpdatesAsInvalidates)); + message.addObjPart(forUpdatesAsInvalidates); // Add the event id - message.addObjPart(this.eventId); + message.addObjPart(eventId); return message; } @@ -198,64 +198,64 @@ public class ClientInterestMessageImpl implements ClientMessage { @Override public void toData(DataOutput out, SerializationContext context) throws IOException { - context.getSerializer().writeObject(this.eventId, out); - DataSerializer.writeString(this.regionName, out); - context.getSerializer().writeObject(this.keyOfInterest, out); - DataSerializer.writePrimitiveBoolean(this.isDurable, out); - DataSerializer.writePrimitiveBoolean(this.forUpdatesAsInvalidates, out); - DataSerializer.writePrimitiveInt(this.interestType, out); - DataSerializer.writePrimitiveByte(this.interestResultPolicy, out); - DataSerializer.writePrimitiveByte(this.action, out); + context.getSerializer().writeObject(eventId, out); + DataSerializer.writeString(regionName, out); + context.getSerializer().writeObject(keyOfInterest, out); + DataSerializer.writePrimitiveBoolean(isDurable, out); + DataSerializer.writePrimitiveBoolean(forUpdatesAsInvalidates, out); + DataSerializer.writePrimitiveInt(interestType, out); + DataSerializer.writePrimitiveByte(interestResultPolicy, out); + DataSerializer.writePrimitiveByte(action, out); } @Override public void fromData(DataInput in, DeserializationContext context) throws IOException, ClassNotFoundException { - this.eventId = (EventID) context.getDeserializer().readObject(in); - this.regionName = DataSerializer.readString(in); - this.keyOfInterest = context.getDeserializer().readObject(in); - this.isDurable = DataSerializer.readPrimitiveBoolean(in); - this.forUpdatesAsInvalidates = DataSerializer.readPrimitiveBoolean(in); - this.interestType = DataSerializer.readPrimitiveInt(in); - this.interestResultPolicy = DataSerializer.readPrimitiveByte(in); - this.action = DataSerializer.readPrimitiveByte(in); + eventId = context.getDeserializer().readObject(in); + regionName = DataSerializer.readString(in); + keyOfInterest = context.getDeserializer().readObject(in); + isDurable = DataSerializer.readPrimitiveBoolean(in); + forUpdatesAsInvalidates = DataSerializer.readPrimitiveBoolean(in); + interestType = DataSerializer.readPrimitiveInt(in); + interestResultPolicy = DataSerializer.readPrimitiveByte(in); + action = DataSerializer.readPrimitiveByte(in); } @Override public EventID getEventId() { - return this.eventId; + return eventId; } public String getRegionName() { - return this.regionName; + return regionName; } public Object getKeyOfInterest() { - return this.keyOfInterest; + return keyOfInterest; } public int getInterestType() { - return this.interestType; + return interestType; } public byte getInterestResultPolicy() { - return this.interestResultPolicy; + return interestResultPolicy; } public boolean getIsDurable() { - return this.isDurable; + return isDurable; } public boolean getForUpdatesAsInvalidates() { - return this.forUpdatesAsInvalidates; + return forUpdatesAsInvalidates; } public boolean isKeyInterest() { - return this.interestType == InterestType.KEY; + return interestType == InterestType.KEY; } public boolean isRegister() { - return this.action == REGISTER; + return action == REGISTER; } @Override @@ -281,13 +281,13 @@ public class ClientInterestMessageImpl implements ClientMessage { public void setLatestValue(Object value) {} public String toString() { - return new StringBuilder().append(getClass().getSimpleName()).append("[").append("eventId=") - .append(this.eventId).append("; regionName=").append(this.regionName) - .append("; keyOfInterest=").append(this.keyOfInterest).append("; isDurable=") - .append(this.isDurable).append("; forUpdatesAsInvalidates=") - .append(this.forUpdatesAsInvalidates).append("; interestType=").append(this.interestType) - .append("; interestResultPolicy=").append(this.interestResultPolicy).append("; action=") - .append(this.action).append("]").toString(); + return getClass().getSimpleName() + "[" + "eventId=" + + eventId + "; regionName=" + regionName + + "; keyOfInterest=" + keyOfInterest + "; isDurable=" + + isDurable + "; forUpdatesAsInvalidates=" + + forUpdatesAsInvalidates + "; interestType=" + interestType + + "; interestResultPolicy=" + interestResultPolicy + "; action=" + + action + "]"; } @Override diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java index 85d9e7b..4b3d48a 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java @@ -62,7 +62,7 @@ public class ClientMarkerMessageImpl implements ClientMessage { Message message = new Message(1, KnownVersion.CURRENT); message.setMessageType(MessageType.CLIENT_MARKER); message.setTransactionId(0); - message.addObjPart(this.eventId); + message.addObjPart(eventId); return message; } @@ -74,7 +74,7 @@ public class ClientMarkerMessageImpl implements ClientMessage { @Override public void toData(DataOutput out, SerializationContext context) throws IOException { - DataSerializer.writeObject(this.eventId, out); + DataSerializer.writeObject(eventId, out); } @Override @@ -85,12 +85,12 @@ public class ClientMarkerMessageImpl implements ClientMessage { @Override public void fromData(DataInput in, DeserializationContext context) throws IOException, ClassNotFoundException { - this.eventId = (EventID) DataSerializer.readObject(in); + eventId = DataSerializer.readObject(in); } @Override public EventID getEventId() { - return this.eventId; + return eventId; } @Override @@ -113,9 +113,7 @@ public class ClientMarkerMessageImpl implements ClientMessage { } @Override - public void setLatestValue(Object value) { - return; - } + public void setLatestValue(Object value) {} @Override public KnownVersion[] getSerializationVersions() { diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java index b537851..1b369b1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientRegistrationMetadata.java @@ -51,7 +51,7 @@ class ClientRegistrationMetadata { ClientRegistrationMetadata(final InternalCache cache, final Socket socket) { this.cache = cache; this.socket = socket; - this.socketMessageWriter = new SocketMessageWriter(); + socketMessageWriter = new SocketMessageWriter(); } boolean initialize() throws IOException { diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java index dcf7102..11cc3e8 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java @@ -141,7 +141,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N */ private byte[] deltaBytes = null; - private VersionTag versionTag; + private VersionTag<?> versionTag; /* added up all constants and form single value */ private static final int CONSTANT_MEMORY_OVERHEAD; @@ -167,17 +167,17 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N public ClientUpdateMessageImpl(EnumListenerEvent operation, InternalRegion region, Object keyOfInterest, Object value, byte[] delta, byte valueIsObject, Object callbackArgument, - ClientProxyMembershipID memberId, EventID eventIdentifier, VersionTag versionTag) { - this._operation = operation; - this._regionName = region.getFullPath(); - this._keyOfInterest = keyOfInterest; - this._value = value; - this._valueIsObject = valueIsObject; - this._callbackArgument = callbackArgument; - this._membershipId = memberId; - this._eventIdentifier = eventIdentifier; - this._shouldConflate = isUpdate() && region.getEnableConflation(); - this.deltaBytes = delta; + ClientProxyMembershipID memberId, EventID eventIdentifier, VersionTag<?> versionTag) { + _operation = operation; + _regionName = region.getFullPath(); + _keyOfInterest = keyOfInterest; + _value = value; + _valueIsObject = valueIsObject; + _callbackArgument = callbackArgument; + _membershipId = memberId; + _eventIdentifier = eventIdentifier; + _shouldConflate = isUpdate() && region.getEnableConflation(); + deltaBytes = delta; this.versionTag = versionTag; } @@ -191,9 +191,9 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N */ protected ClientUpdateMessageImpl(EnumListenerEvent operation, ClientProxyMembershipID memberId, EventID eventIdentifier) { - this._operation = operation; - this._membershipId = memberId; - this._eventIdentifier = eventIdentifier; + _operation = operation; + _membershipId = memberId; + _eventIdentifier = eventIdentifier; } /** @@ -206,34 +206,34 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N @Override public String getRegionName() { - return this._regionName; + return _regionName; } @Override public Object getKeyOfInterest() { - return this._keyOfInterest; + return _keyOfInterest; } @Override public EnumListenerEvent getOperation() { - return this._operation; + return _operation; } @Override public Object getValue() { - return this._value; + return _value; } @Override public boolean valueIsObject() { - return (this._valueIsObject == 0x01); + return (_valueIsObject == 0x01); } /** * @return the callback argument */ public Object getCallbackArgument() { - return this._callbackArgument; + return _callbackArgument; } /// Conflatable interface methods /// @@ -252,35 +252,35 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N // create, destroy, invalidate or destroy-region, it is not conflatable. // Only updates are conflated. If it is an update, then verify that // the region has conflation enabled. - return this._shouldConflate; + return _shouldConflate; } @Override public String getRegionToConflate() { - return this._regionName; + return _regionName; } @Override public Object getKeyToConflate() { - return this._keyOfInterest; + return _keyOfInterest; } @Override public Object getValueToConflate() { - return this._value; + return _value; } @Override public void setLatestValue(Object value) { // does this also need to set _valueIsObject - this._value = value; + _value = value; } /// End Conflatable interface methods /// @Override public ClientProxyMembershipID getMembershipId() { - return this._membershipId; + return _membershipId; } /** @@ -290,46 +290,46 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N */ @Override public EventID getEventId() { - return this._eventIdentifier; + return _eventIdentifier; } @Override - public VersionTag getVersionTag() { - return this.versionTag; + public VersionTag<?> getVersionTag() { + return versionTag; } @Override public boolean isCreate() { - return this._operation == EnumListenerEvent.AFTER_CREATE; + return _operation == EnumListenerEvent.AFTER_CREATE; } @Override public boolean isUpdate() { - return this._operation == EnumListenerEvent.AFTER_UPDATE; + return _operation == EnumListenerEvent.AFTER_UPDATE; } @Override public boolean isDestroy() { - return this._operation == EnumListenerEvent.AFTER_DESTROY; + return _operation == EnumListenerEvent.AFTER_DESTROY; } @Override public boolean isInvalidate() { - return this._operation == EnumListenerEvent.AFTER_INVALIDATE; + return _operation == EnumListenerEvent.AFTER_INVALIDATE; } @Override public boolean isDestroyRegion() { - return this._operation == EnumListenerEvent.AFTER_REGION_DESTROY; + return _operation == EnumListenerEvent.AFTER_REGION_DESTROY; } @Override public boolean isClearRegion() { - return this._operation == EnumListenerEvent.AFTER_REGION_CLEAR; + return _operation == EnumListenerEvent.AFTER_REGION_CLEAR; } private boolean isInvalidateRegion() { - return this._operation == EnumListenerEvent.AFTER_REGION_INVALIDATE; + return _operation == EnumListenerEvent.AFTER_REGION_INVALIDATE; } @Override @@ -355,7 +355,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N Message message; boolean conflation; conflation = (proxy.clientConflation == Handshake.CONFLATION_ON) - || (proxy.clientConflation == Handshake.CONFLATION_DEFAULT && this.shouldBeConflated()); + || (proxy.clientConflation == Handshake.CONFLATION_DEFAULT && shouldBeConflated()); if (latestValue != null) { serializedValue = latestValue; @@ -364,11 +364,11 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N * This means latestValue is instance of Delta, and its delta has already been extracted and * put into deltaBytes. We serialize the value. */ - if (this.deltaBytes == null || isCreate()) { + if (deltaBytes == null || isCreate()) { // Delta could not be extracted. We would need to send full value. // OR A CREATE operation has a value which has delta. But we send full value for CREATE. // So serialize it. - this._value = serializedValue = CacheServerHelper.serialize(latestValue); + _value = serializedValue = CacheServerHelper.serialize(latestValue); } } if (clientVersion.isNotOlderThan(KnownVersion.GFE_70)) { @@ -392,29 +392,29 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N // Add CQ info. int cqMsgParts = 0; - boolean clientHasCq = this._hasCqs && (this.getCqs(proxyId) != null); + boolean clientHasCq = _hasCqs && (getCqs(proxyId) != null); if (clientHasCq) { - cqMsgParts = (this.getCqs(proxyId).length * 2) + 1; + cqMsgParts = (getCqs(proxyId).length * 2) + 1; } if (isCreate() || isUpdate()) { // Create or update event - if (this._clientInterestListInv != null && this._clientInterestListInv.contains(proxyId)) { + if (_clientInterestListInv != null && _clientInterestListInv.contains(proxyId)) { // Notify all - do not send the value message = new Message(6, clientVersion); message.setMessageType(MessageType.LOCAL_INVALIDATE); // Add the region name - message.addStringPart(this._regionName, true); + message.addStringPart(_regionName, true); // Add the key // Currently serializing the key here instead of when the message // is put in the queue so that it can be conflated it later - message.addStringOrObjPart(this._keyOfInterest); + message.addStringOrObjPart(_keyOfInterest); // Add the callback argument - message.addObjPart(this._callbackArgument); + message.addObjPart(_callbackArgument); // Add interestlist status. message.addObjPart(isClientInterested(proxyId)); @@ -432,48 +432,48 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N message.setMessageType(MessageType.LOCAL_CREATE); // Add the region name - message.addStringPart(this._regionName, true); + message.addStringPart(_regionName, true); // Add the key // Currently serializing the key here instead of when the message // is put in the queue so that it can be conflated it later - message.addStringOrObjPart(this._keyOfInterest); + message.addStringOrObjPart(_keyOfInterest); message.addObjPart(Boolean.FALSE); // NO delta // Add the value (which has already been serialized) - message.addRawPart(latestValue, (this._valueIsObject == 0x01)); + message.addRawPart(latestValue, (_valueIsObject == 0x01)); } else { message.setMessageType(MessageType.LOCAL_UPDATE); // Add the region name - message.addStringPart(this._regionName, true); + message.addStringPart(_regionName, true); // Add the key // Currently serializing the key here instead of when the message // is put in the queue so that it can be conflated it later - message.addStringOrObjPart(this._keyOfInterest); + message.addStringOrObjPart(_keyOfInterest); - if (this.deltaBytes != null && !conflation && !proxy.isMarkerEnqueued() + if (deltaBytes != null && !conflation && !proxy.isMarkerEnqueued() && !proxy.getRegionsWithEmptyDataPolicy().containsKey(_regionName)) { message.addObjPart(Boolean.TRUE); - message.addBytesPart(this.deltaBytes); + message.addBytesPart(deltaBytes); proxy.getStatistics().incDeltaMessagesSent(); } else { message.addObjPart(Boolean.FALSE); byte[] l = latestValue; if (l == null) { - if (!(this._value instanceof byte[])) { - this._value = CacheServerHelper.serialize(this._value); + if (!(_value instanceof byte[])) { + _value = CacheServerHelper.serialize(_value); } - l = (byte[]) this._value; + l = (byte[]) _value; } // Add the value (which has already been serialized) - message.addRawPart(l, (this._valueIsObject == 0x01)); + message.addRawPart(l, (_valueIsObject == 0x01)); } } // Add the callback argument - message.addObjPart(this._callbackArgument); + message.addObjPart(_callbackArgument); // Add interest list status. message.addObjPart(isClientInterested); @@ -482,7 +482,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N message.addObjPart(clientHasCq); if (clientHasCq) { - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } } else if (isDestroy() || isInvalidate()) { @@ -495,48 +495,48 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N message.setMessageType(MessageType.LOCAL_INVALIDATE); } - message.addStringPart(this._regionName, true); + message.addStringPart(_regionName, true); // Currently serializing the key here instead of when the message // is put in the queue so that it can be conflated later - message.addStringOrObjPart(this._keyOfInterest); + message.addStringOrObjPart(_keyOfInterest); - message.addObjPart(this._callbackArgument); + message.addObjPart(_callbackArgument); message.addObjPart(isClientInterested(proxyId)); message.addObjPart(clientHasCq); if (clientHasCq) { - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else if (isDestroyRegion()) { message = new Message(4 + cqMsgParts, clientVersion); message.setMessageType(MessageType.LOCAL_DESTROY_REGION); - message.addStringPart(this._regionName, true); - message.addObjPart(this._callbackArgument); + message.addStringPart(_regionName, true); + message.addObjPart(_callbackArgument); message.addObjPart(clientHasCq); if (clientHasCq) { - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else if (isClearRegion()) { message = new Message(4 + cqMsgParts, clientVersion); message.setMessageType(MessageType.CLEAR_REGION); - message.addStringPart(this._regionName, true); - message.addObjPart(this._callbackArgument); + message.addStringPart(_regionName, true); + message.addObjPart(_callbackArgument); message.addObjPart(clientHasCq); if (clientHasCq) { - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else if (isInvalidateRegion()) { message = new Message(4 + cqMsgParts, clientVersion); message.setMessageType(MessageType.INVALIDATE_REGION); - message.addStringPart(this._regionName, true); - message.addObjPart(this._callbackArgument); + message.addStringPart(_regionName, true); + message.addObjPart(_callbackArgument); message.addObjPart(clientHasCq); if (clientHasCq) { - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else { throw new InternalGemFireError("Don't know what kind of message"); @@ -545,7 +545,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N message.setTransactionId(0); // Add the EventId since 5.1 (used to prevent duplicate events // received on the client side after a failover) - message.addObjPart(this._eventIdentifier); + message.addObjPart(_eventIdentifier); return message; } @@ -557,15 +557,15 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N // Add CQ info. int cqMsgParts = 0; - boolean clientHasCq = this._hasCqs && (this.getCqs(proxyId) != null); + boolean clientHasCq = _hasCqs && (getCqs(proxyId) != null); if (clientHasCq) { - cqMsgParts = (this.getCqs(proxyId).length * 2) + 1; + cqMsgParts = (getCqs(proxyId).length * 2) + 1; } if (isCreate() || isUpdate()) { // Create or update event - if (this._clientInterestListInv != null && this._clientInterestListInv.contains(proxyId)) { + if (_clientInterestListInv != null && _clientInterestListInv.contains(proxyId)) { // Client is registered for invalidates. if (cqMsgParts > 0) { cqMsgParts++; // To store base operation type for CQ. @@ -575,12 +575,12 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N message.setMessageType(MessageType.LOCAL_INVALIDATE); // Add the region name - message.addStringPart(this._regionName, true); + message.addStringPart(_regionName, true); // Add the key // Currently serializing the key here instead of when the message // is put in the queue so that it can be conflated it later - message.addStringOrObjPart(this._keyOfInterest); + message.addStringOrObjPart(_keyOfInterest); } else { // Notify by subscription - send the value message = new Message(8 + cqMsgParts, clientVersion); @@ -590,47 +590,47 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N message.setMessageType(MessageType.LOCAL_CREATE); // Add the region name - message.addStringPart(this._regionName, true); + message.addStringPart(_regionName, true); // Add the key // Currently serializing the key here instead of when the message // is put in the queue so that it can be conflated it later - message.addStringOrObjPart(this._keyOfInterest); + message.addStringOrObjPart(_keyOfInterest); message.addObjPart(Boolean.FALSE); // NO delta // Add the value (which has already been serialized) - message.addRawPart(latestValue, (this._valueIsObject == 0x01)); + message.addRawPart(latestValue, (_valueIsObject == 0x01)); } else { message.setMessageType(MessageType.LOCAL_UPDATE); // Add the region name - message.addStringPart(this._regionName, true); + message.addStringPart(_regionName, true); // Add the key // Currently serializing the key here instead of when the message // is put in the queue so that it can be conflated it later - message.addStringOrObjPart(this._keyOfInterest); + message.addStringOrObjPart(_keyOfInterest); - if (this.deltaBytes != null && !conflation && !proxy.isMarkerEnqueued() + if (deltaBytes != null && !conflation && !proxy.isMarkerEnqueued() && !proxy.getRegionsWithEmptyDataPolicy().containsKey(_regionName)) { message.addObjPart(Boolean.TRUE); - message.addBytesPart(this.deltaBytes); + message.addBytesPart(deltaBytes); proxy.getStatistics().incDeltaMessagesSent(); } else { message.addObjPart(Boolean.FALSE); if (latestValue == null) { - if (!(this._value instanceof byte[])) { - this._value = CacheServerHelper.serialize(this._value); + if (!(_value instanceof byte[])) { + _value = CacheServerHelper.serialize(_value); } - latestValue = (byte[]) this._value; + latestValue = (byte[]) _value; } // Add the value (which has already been serialized) - message.addRawPart(latestValue, (this._valueIsObject == 0x01)); + message.addRawPart(latestValue, (_valueIsObject == 0x01)); } } } - message.addObjPart(this._callbackArgument); + message.addObjPart(_callbackArgument); message.addObjPart(isClientInterested(proxyId)); message.addObjPart(clientHasCq); @@ -639,7 +639,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N // in case of invalidate, set the region operation type. message.addIntPart(isCreate() ? MessageType.LOCAL_CREATE : MessageType.LOCAL_UPDATE); } - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else if (isDestroy() || isInvalidate()) { if (isDestroy()) { @@ -652,9 +652,9 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N message = new Message(6 + cqMsgParts, clientVersion); message.setMessageType(MessageType.LOCAL_INVALIDATE); } - message.addStringPart(this._regionName, true); - message.addStringOrObjPart(this._keyOfInterest); - message.addObjPart(this._callbackArgument); + message.addStringPart(_regionName, true); + message.addStringOrObjPart(_keyOfInterest); + message.addObjPart(_callbackArgument); message.addObjPart(isClientInterested(proxyId)); message.addObjPart(clientHasCq); @@ -664,39 +664,39 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N // to the Client. See the code for create/update operation. message.addIntPart(MessageType.LOCAL_INVALIDATE); } - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else if (isDestroyRegion()) { message = new Message(4 + cqMsgParts, clientVersion); message.setMessageType(MessageType.LOCAL_DESTROY_REGION); - message.addStringPart(this._regionName, true); - message.addObjPart(this._callbackArgument); + message.addStringPart(_regionName, true); + message.addObjPart(_callbackArgument); message.addObjPart(clientHasCq); if (clientHasCq) { - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else if (isClearRegion()) { message = new Message(4 + cqMsgParts, clientVersion); message.setMessageType(MessageType.CLEAR_REGION); - message.addStringPart(this._regionName, true); - message.addObjPart(this._callbackArgument); + message.addStringPart(_regionName, true); + message.addObjPart(_callbackArgument); message.addObjPart(clientHasCq); if (clientHasCq) { - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else if (isInvalidateRegion()) { message = new Message(4 + cqMsgParts, clientVersion); message.setMessageType(MessageType.INVALIDATE_REGION); - message.addStringPart(this._regionName, true); - message.addObjPart(this._callbackArgument); + message.addStringPart(_regionName, true); + message.addObjPart(_callbackArgument); // Add CQ status. message.addObjPart(clientHasCq); if (clientHasCq) { - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else { throw new InternalGemFireError("Don't know what kind of message"); @@ -705,7 +705,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N message.setTransactionId(0); // Add the EventId since 5.1 (used to prevent duplicate events // received on the client side after a failover) - message.addObjPart(this._eventIdentifier); + message.addObjPart(_eventIdentifier); return message; } @@ -718,15 +718,15 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N ClientProxyMembershipID proxyId = proxy.getProxyID(); // Add CQ info. int cqMsgParts = 0; - boolean clientHasCq = this._hasCqs && (this.getCqs(proxyId) != null); + boolean clientHasCq = _hasCqs && (getCqs(proxyId) != null); if (clientHasCq) { - cqMsgParts = (this.getCqs(proxyId).length * 2) + 1; + cqMsgParts = (getCqs(proxyId).length * 2) + 1; } if (isCreate() || isUpdate()) { // Create or update event - if (this._clientInterestListInv != null && this._clientInterestListInv.contains(proxyId)) { + if (_clientInterestListInv != null && _clientInterestListInv.contains(proxyId)) { // Client is registered for invalidates. if (cqMsgParts > 0) { cqMsgParts++; // To store base operation type for CQ. @@ -734,47 +734,47 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N message = getMessage(7 + cqMsgParts, clientVersion); message.setMessageType(MessageType.LOCAL_INVALIDATE); - message.addStringPart(this._regionName, true); - message.addStringOrObjPart(this._keyOfInterest); + message.addStringPart(_regionName, true); + message.addStringOrObjPart(_keyOfInterest); } else { // Notify by subscription - send the value message = getMessage(9 + cqMsgParts, clientVersion); if (isCreate()) { message.setMessageType(MessageType.LOCAL_CREATE); - message.addStringPart(this._regionName, true); - message.addStringOrObjPart(this._keyOfInterest); + message.addStringPart(_regionName, true); + message.addStringOrObjPart(_keyOfInterest); message.addObjPart(Boolean.FALSE); // NO delta // Add the value (which has already been serialized) - message.addRawPart(latestValue, (this._valueIsObject == 0x01)); + message.addRawPart(latestValue, (_valueIsObject == 0x01)); } else { message.setMessageType(MessageType.LOCAL_UPDATE); - message.addStringPart(this._regionName, true); - message.addStringOrObjPart(this._keyOfInterest); + message.addStringPart(_regionName, true); + message.addStringOrObjPart(_keyOfInterest); - if (this.deltaBytes != null && !conflation && !proxy.isMarkerEnqueued() + if (deltaBytes != null && !conflation && !proxy.isMarkerEnqueued() && !proxy.getRegionsWithEmptyDataPolicy().containsKey(_regionName)) { message.addObjPart(Boolean.TRUE); - message.addBytesPart(this.deltaBytes); + message.addBytesPart(deltaBytes); proxy.getStatistics().incDeltaMessagesSent(); } else { message.addObjPart(Boolean.FALSE); if (latestValue == null) { - if (!(this._value instanceof byte[])) { - this._value = CacheServerHelper.serialize(this._value); + if (!(_value instanceof byte[])) { + _value = CacheServerHelper.serialize(_value); } - latestValue = (byte[]) this._value; + latestValue = (byte[]) _value; } // Add the value (which has already been serialized) - message.addRawPart(latestValue, (this._valueIsObject == 0x01)); + message.addRawPart(latestValue, (_valueIsObject == 0x01)); } } } - message.addObjPart(this._callbackArgument); - if (this.versionTag != null) { - this.versionTag.setCanonicalIDs(proxy.getCache().getDistributionManager()); + message.addObjPart(_callbackArgument); + if (versionTag != null) { + versionTag.setCanonicalIDs(proxy.getCache().getDistributionManager()); } - message.addObjPart(this.versionTag); + message.addObjPart(versionTag); message.addObjPart(isClientInterested(proxyId)); message.addObjPart(clientHasCq); @@ -783,7 +783,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N // in case of invalidate, set the region operation type. message.addIntPart(isCreate() ? MessageType.LOCAL_CREATE : MessageType.LOCAL_UPDATE); } - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else if (isDestroy() || isInvalidate()) { if (isDestroy()) { @@ -796,10 +796,10 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N message = getMessage(7 + cqMsgParts, clientVersion); message.setMessageType(MessageType.LOCAL_INVALIDATE); } - message.addStringPart(this._regionName, true); - message.addStringOrObjPart(this._keyOfInterest); - message.addObjPart(this._callbackArgument); - message.addObjPart(this.versionTag); + message.addStringPart(_regionName, true); + message.addStringOrObjPart(_keyOfInterest); + message.addObjPart(_callbackArgument); + message.addObjPart(versionTag); message.addObjPart(isClientInterested(proxyId)); message.addObjPart(clientHasCq); @@ -809,39 +809,39 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N // to the Client. See the code for create/update operation. message.addIntPart(MessageType.LOCAL_INVALIDATE); } - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else if (isDestroyRegion()) { message = getMessage(4 + cqMsgParts, clientVersion); message.setMessageType(MessageType.LOCAL_DESTROY_REGION); - message.addStringPart(this._regionName, true); - message.addObjPart(this._callbackArgument); + message.addStringPart(_regionName, true); + message.addObjPart(_callbackArgument); message.addObjPart(clientHasCq); if (clientHasCq) { - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else if (isClearRegion()) { message = getMessage(4 + cqMsgParts, clientVersion); message.setMessageType(MessageType.CLEAR_REGION); - message.addStringPart(this._regionName, true); - message.addObjPart(this._callbackArgument); + message.addStringPart(_regionName, true); + message.addObjPart(_callbackArgument); message.addObjPart(clientHasCq); if (clientHasCq) { - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else if (isInvalidateRegion()) { message = getMessage(4 + cqMsgParts, clientVersion); message.setMessageType(MessageType.INVALIDATE_REGION); - message.addStringPart(this._regionName, true); - message.addObjPart(this._callbackArgument); + message.addStringPart(_regionName, true); + message.addObjPart(_callbackArgument); // Add CQ status. message.addObjPart(clientHasCq); if (clientHasCq) { - this.addCqsToMessage(proxyId, message); + addCqsToMessage(proxyId, message); } } else { throw new InternalGemFireError("Don't know what kind of message"); @@ -850,7 +850,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N message.setTransactionId(0); // Add the EventId since 5.1 (used to prevent duplicate events // received on the client side after a failover) - message.addObjPart(this._eventIdentifier); + message.addObjPart(_eventIdentifier); return message; } @@ -873,7 +873,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N */ @Override public boolean isNetLoad() { - return this._isNetLoad; + return _isNetLoad; } /** @@ -881,7 +881,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N */ @Override public void setIsNetLoad(boolean isNetLoad) { - this._isNetLoad = isNetLoad; + _isNetLoad = isNetLoad; } @@ -890,8 +890,8 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N */ @Override public boolean hasCqs(ClientProxyMembershipID clientId) { - if (this._clientCqs != null) { - CqNameToOp cqs = this._clientCqs.get(clientId); + if (_clientCqs != null) { + CqNameToOp cqs = _clientCqs.get(clientId); return cqs != null && !cqs.isEmpty(); } return false; @@ -902,7 +902,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N */ @Override public boolean hasCqs() { - return this._hasCqs; + return _hasCqs; } /** @@ -911,8 +911,8 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N */ private String[] getCqs(ClientProxyMembershipID clientId) { String[] cqNames = null; - if (this._clientCqs != null) { - CqNameToOp cqs = this._clientCqs.get(clientId); + if (_clientCqs != null) { + CqNameToOp cqs = _clientCqs.get(clientId); if (cqs != null && !cqs.isEmpty()) { cqNames = cqs.getNames(); @@ -922,7 +922,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N } public ClientCqConcurrentMap getClientCqs() { - return this._clientCqs; + return _clientCqs; } /** @@ -930,34 +930,34 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N * */ public void addClientCqs(ClientProxyMembershipID clientId, CqNameToOp filteredCqs) { - if (this._clientCqs == null) { - this._clientCqs = new ClientCqConcurrentMap(); - this._hasCqs = true; + if (_clientCqs == null) { + _clientCqs = new ClientCqConcurrentMap(); + _hasCqs = true; } - this._clientCqs.put(clientId, filteredCqs); + _clientCqs.put(clientId, filteredCqs); } void addClientCq(ClientProxyMembershipID clientId, String cqName, Integer cqEvent) { - if (this._clientCqs == null) { - this._clientCqs = new ClientCqConcurrentMap(); - this._hasCqs = true; + if (_clientCqs == null) { + _clientCqs = new ClientCqConcurrentMap(); + _hasCqs = true; } - CqNameToOp cqInfo = this._clientCqs.get(clientId); + CqNameToOp cqInfo = _clientCqs.get(clientId); if (cqInfo == null) { cqInfo = new CqNameToOpSingleEntry(cqName, cqEvent); - this._clientCqs.put(clientId, cqInfo); + _clientCqs.put(clientId, cqInfo); } else if (!cqInfo.isFull()) { cqInfo.add(cqName, cqEvent); } else { cqInfo = new CqNameToOpHashMap((CqNameToOpSingleEntry) cqInfo); cqInfo.add(cqName, cqEvent); - this._clientCqs.put(clientId, cqInfo); + _clientCqs.put(clientId, cqInfo); } } private void addCqsToMessage(ClientProxyMembershipID proxyId, Message message) { - if (this._clientCqs != null) { - CqNameToOp cqs = this._clientCqs.get(proxyId); + if (_clientCqs != null) { + CqNameToOp cqs = _clientCqs.get(proxyId); if (cqs != null) { message.addIntPart(cqs.size() * 2); cqs.addToMessage(message); @@ -971,7 +971,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N cqs.delete(cqToClose.getName()); // remove clientId key if no more cqs exist for this clientId if (cqs.isEmpty()) { - this._clientCqs.remove(clientId); + _clientCqs.remove(clientId); } } } @@ -981,7 +981,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N */ @Override public void setRegionName(String regionName) { - this._regionName = regionName; + _regionName = regionName; } /** @@ -989,8 +989,8 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N * @see HAContainerRegion#get(Object) */ public void setEventIdentifier(EventID eventId) { - if (this._eventIdentifier == null) { - this._eventIdentifier = eventId; + if (_eventIdentifier == null) { + _eventIdentifier = eventId; } } @@ -999,23 +999,23 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N * @see HAContainerRegion#get(Object) */ public void setClientCqs(ClientCqConcurrentMap clientCqs) { - if (this._clientCqs == null) { - this._clientCqs = clientCqs; + if (_clientCqs == null) { + _clientCqs = clientCqs; } } void addClientInterestList(Set<ClientProxyMembershipID> clientIds, boolean receiveValues) { if (receiveValues) { - if (this._clientInterestList == null) { - this._clientInterestList = clientIds; + if (_clientInterestList == null) { + _clientInterestList = clientIds; } else { - this._clientInterestList.addAll(clientIds); + _clientInterestList.addAll(clientIds); } } else { - if (this._clientInterestListInv == null) { - this._clientInterestListInv = clientIds; + if (_clientInterestListInv == null) { + _clientInterestListInv = clientIds; } else { - this._clientInterestListInv.addAll(clientIds); + _clientInterestListInv.addAll(clientIds); } } } @@ -1023,40 +1023,40 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N public void addClientInterestList(ClientProxyMembershipID clientId, boolean receiveValues) { // This happens under synchronization on HAContainer. if (receiveValues) { - if (this._clientInterestList == null) { - this._clientInterestList = ConcurrentHashMap.newKeySet(); + if (_clientInterestList == null) { + _clientInterestList = ConcurrentHashMap.newKeySet(); } - this._clientInterestList.add(clientId); + _clientInterestList.add(clientId); } else { - if (this._clientInterestListInv == null) { - this._clientInterestListInv = ConcurrentHashMap.newKeySet(); + if (_clientInterestListInv == null) { + _clientInterestListInv = ConcurrentHashMap.newKeySet(); } - this._clientInterestListInv.add(clientId); + _clientInterestListInv.add(clientId); } } @Override public boolean isClientInterested(ClientProxyMembershipID clientId) { - return (this._clientInterestList != null && this._clientInterestList.contains(clientId)) - || (this._clientInterestListInv != null && this._clientInterestListInv.contains(clientId)); + return (_clientInterestList != null && _clientInterestList.contains(clientId)) + || (_clientInterestListInv != null && _clientInterestListInv.contains(clientId)); } public boolean isClientInterestedInUpdates(ClientProxyMembershipID clientId) { - return (this._clientInterestList != null && this._clientInterestList.contains(clientId)); + return (_clientInterestList != null && _clientInterestList.contains(clientId)); } public boolean isClientInterestedInInvalidates(ClientProxyMembershipID clientId) { - return (this._clientInterestListInv != null && this._clientInterestListInv.contains(clientId)); + return (_clientInterestListInv != null && _clientInterestListInv.contains(clientId)); } @VisibleForTesting boolean hasClientsInterestedInUpdates() { - return this._clientInterestList != null; + return _clientInterestList != null; } @VisibleForTesting boolean hasClientsInterestedInInvalidates() { - return this._clientInterestListInv != null; + return _clientInterestListInv != null; } private Object deserialize(byte[] serializedBytes) { @@ -1073,17 +1073,17 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N @Override public String toString() { StringBuilder buffer = new StringBuilder(); - buffer.append("ClientUpdateMessageImpl[").append("op=").append(this._operation) - .append(";region=").append(this._regionName).append(";key=").append(this._keyOfInterest); + buffer.append("ClientUpdateMessageImpl[").append("op=").append(_operation) + .append(";region=").append(_regionName).append(";key=").append(_keyOfInterest); if (logger.isTraceEnabled()) { buffer.append(";value=").append( - (this._value instanceof byte[]) ? deserialize((byte[]) this._value) : this._value); + (_value instanceof byte[]) ? deserialize((byte[]) _value) : _value); } buffer.append(";isObject=").append(_valueIsObject).append(";cbArg=") - .append(this._callbackArgument).append(";memberId=").append(this._membershipId) + .append(_callbackArgument).append(";memberId=").append(_membershipId) .append(";eventId=").append(_eventIdentifier).append(";shouldConflate=") - .append(_shouldConflate).append(";versionTag=").append(this.versionTag).append(";hasCqs=") - .append(this._hasCqs) + .append(_shouldConflate).append(";versionTag=").append(versionTag).append(";hasCqs=") + .append(_hasCqs) // skip _logger :-) .append("]"); return buffer.toString(); @@ -1109,57 +1109,57 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N DataSerializer.writeObject(_membershipId, out); out.writeBoolean(_shouldConflate); out.writeBoolean(_isInterestListPassed); - DataSerializer.writeByteArray(this.deltaBytes, out); + DataSerializer.writeByteArray(deltaBytes, out); out.writeBoolean(_hasCqs); DataSerializer.writeObject(_callbackArgument, out); HashSet<ClientProxyMembershipID> clientInterestListSnapshot = - this._clientInterestList != null - ? new HashSet<>(this._clientInterestList) + _clientInterestList != null + ? new HashSet<>(_clientInterestList) : null; DataSerializer.writeHashSet(clientInterestListSnapshot, out); HashSet<ClientProxyMembershipID> clientInterestListInvSnapshot = - this._clientInterestListInv != null - ? new HashSet<>(this._clientInterestListInv) + _clientInterestListInv != null + ? new HashSet<>(_clientInterestListInv) : null; DataSerializer.writeHashSet(clientInterestListInvSnapshot, out); - DataSerializer.writeObject(this.versionTag, out); + DataSerializer.writeObject(versionTag, out); } @Override public void fromData(DataInput in, DeserializationContext context) throws IOException, ClassNotFoundException { - this._operation = EnumListenerEvent.getEnumListenerEvent(in.readByte()); - this._regionName = DataSerializer.readString(in); - this._keyOfInterest = DataSerializer.readObject(in); - this._value = DataSerializer.readByteArray(in); - this._valueIsObject = in.readByte(); - this._membershipId = ClientProxyMembershipID.readCanonicalized(in); - this._shouldConflate = in.readBoolean(); - this._isInterestListPassed = in.readBoolean(); - this.deltaBytes = DataSerializer.readByteArray(in); - this._hasCqs = in.readBoolean(); - this._callbackArgument = DataSerializer.readObject(in); + _operation = EnumListenerEvent.getEnumListenerEvent(in.readByte()); + _regionName = DataSerializer.readString(in); + _keyOfInterest = DataSerializer.readObject(in); + _value = DataSerializer.readByteArray(in); + _valueIsObject = in.readByte(); + _membershipId = ClientProxyMembershipID.readCanonicalized(in); + _shouldConflate = in.readBoolean(); + _isInterestListPassed = in.readBoolean(); + deltaBytes = DataSerializer.readByteArray(in); + _hasCqs = in.readBoolean(); + _callbackArgument = DataSerializer.readObject(in); CacheClientNotifier ccn = CacheClientNotifier.getInstance(); Set<ClientProxyMembershipID> clientInterestList = DataSerializer.readHashSet(in); - this._clientInterestList = ccn != null && clientInterestList != null + _clientInterestList = ccn != null && clientInterestList != null ? ccn.getProxyIDs(clientInterestList) : null; Set<ClientProxyMembershipID> clientInterestListInv = DataSerializer.readHashSet(in); - this._clientInterestListInv = ccn != null && clientInterestListInv != null + _clientInterestListInv = ccn != null && clientInterestListInv != null ? ccn.getProxyIDs(clientInterestListInv) : null; - this.versionTag = DataSerializer.readObject(in); + versionTag = DataSerializer.readObject(in); } private Object getOriginalCallbackArgument() { - Object result = this._callbackArgument; + Object result = _callbackArgument; while (result instanceof WrappedCallbackArgument) { WrappedCallbackArgument wca = (WrappedCallbackArgument) result; result = wca.getOriginalCallbackArg(); @@ -1235,8 +1235,8 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N int size = CONSTANT_MEMORY_OVERHEAD; // The value (a byte[]) - if (this._value != null) { - size += CachedDeserializableFactory.calcMemSize(this._value); + if (_value != null) { + size += CachedDeserializableFactory.calcMemSize(_value); } // The sizeOf call gets the size of the input callback argument. @@ -1274,8 +1274,8 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N @Override public CqNameToOp getClientCq(ClientProxyMembershipID clientId) { - if (this._clientCqs != null) { - return this._clientCqs.get(clientId); + if (_clientCqs != null) { + return _clientCqs.get(clientId); } else { return null; } @@ -1350,21 +1350,21 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N int size = size(); InternalDataSerializer.writeArrayLength(size, out); if (size > 0) { - DataSerializer.writeObject(this.name[0], out); - DataSerializer.writeObject(this.op, out); + DataSerializer.writeObject(name[0], out); + DataSerializer.writeObject(op, out); } } @Override public boolean isEmpty() { - return this.name == null; + return name == null; } @Override public void addToMessage(Message message) { if (!isEmpty()) { - message.addStringPart(this.name[0], true); - message.addIntPart(this.op); + message.addStringPart(name[0], true); + message.addIntPart(op); } } @@ -1375,7 +1375,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N @Override public String[] getNames() { - return (isEmpty()) ? EMPTY_NAMES_ARRAY : this.name; + return (isEmpty()) ? EMPTY_NAMES_ARRAY : name; } @Override @@ -1477,7 +1477,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N throw new IllegalStateException("Expected importNewBytes to be called."); } try { - this._value = CacheServerHelper.serialize(nv); + _value = CacheServerHelper.serialize(nv); } catch (IOException e) { throw new GemFireIOException("Exception serializing entry value", e); } @@ -1488,9 +1488,9 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N if (!isSerialized) { // The value is already a byte[]. Set _valueIsObject flag to 0x00 // (not an object) - this._valueIsObject = 0x00; + _valueIsObject = 0x00; } - this._value = nv; + _value = nv; } }