You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2018/05/03 21:37:01 UTC
[geode] branch feature/GEODE-2709 created (now 5be4e1f)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a change to branch feature/GEODE-2709
in repository https://gitbox.apache.org/repos/asf/geode.git.
at 5be4e1f GEODE-2709: modify backward-compatibility support to work better with geode
This branch includes the following new commits:
new 5be4e1f GEODE-2709: modify backward-compatibility support to work better with geode
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
bschuchardt@apache.org.
[geode] 01/01: GEODE-2709: modify backward-compatibility support to
work better with geode
Posted by bs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-2709
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 5be4e1f66d145af81d44c67c499f10cfd7d8f747
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Thu May 3 14:32:52 2018 -0700
GEODE-2709: modify backward-compatibility support to work better with geode
Removed the "product name" from toDataPre/fromDataPre methods and from
sanctionedDataSerializable.txt files.
---
.../attributes/AbstractSessionAttributes.java | 8 ++---
.../membership/InternalDistributedMember.java | 12 +++----
.../geode/internal/DataSerializableFixedID.java | 12 +++----
.../geode/internal/SerializationVersions.java | 2 +-
.../java/org/apache/geode/internal/Version.java | 8 ++---
.../internal/admin/remote/ClientHealthStats.java | 4 +--
.../org/apache/geode/internal/cache/EventID.java | 4 +--
.../geode/internal/cache/FilterRoutingInfo.java | 8 ++---
.../cache/tier/sockets/ServerConnection.java | 2 +-
.../cache/tier/sockets/VersionedObjectList.java | 8 ++---
.../internal/cache/wan/GatewaySenderAdvisor.java | 4 +--
.../internal/cli/functions/CliFunctionResult.java | 4 +--
.../internal/configuration/domain/XmlEntity.java | 8 ++---
...ackwardCompatibilitySerializationDUnitTest.java | 8 ++---
.../geode/internal/DataSerializableJUnitTest.java | 4 +--
.../apache/geode/internal/VersionJUnitTest.java | 6 ++--
.../codeAnalysis/sanctionedDataSerializables.txt | 42 +++++++++++-----------
.../AnalyzeCQSerializablesJUnitTest.java | 3 +-
.../internal/LuceneIndexCreationProfile.java | 8 ++---
.../AnalyzeLuceneSerializablesJUnitTest.java | 3 +-
.../codeAnalysis/sanctionedDataSerializables.txt | 4 +--
.../AnalyzeWANSerializablesJUnitTest.java | 3 +-
.../AnalyzeWebApiSerializablesJUnitTest.java | 3 +-
23 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
index 9a9259f..97e22e3 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
@@ -155,11 +155,11 @@ public abstract class AbstractSessionAttributes implements SessionAttributes {
*/
@Override
public void toData(DataOutput out) throws IOException {
- toDataPre_GEODE_1_3_0_0(out);
+ toDataPre_1_3_0_0(out);
out.writeLong(creationTime);
}
- public void toDataPre_GEODE_1_3_0_0(DataOutput out) throws IOException {
+ public void toDataPre_1_3_0_0(DataOutput out) throws IOException {
out.writeInt(maxInactiveInterval);
out.writeLong(lastAccessedTime);
@@ -176,11 +176,11 @@ public abstract class AbstractSessionAttributes implements SessionAttributes {
@Override
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- fromDataPre_GEODE_1_3_0_0(in);
+ fromDataPre_1_3_0_0(in);
creationTime = in.readLong();
}
- private void fromDataPre_GEODE_1_3_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ private void fromDataPre_1_3_0_0(DataInput in) throws IOException, ClassNotFoundException {
maxInactiveInterval = in.readInt();
lastAccessedTime = in.readLong();
int size = in.readInt();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index 7941af1..7c1980f 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -851,14 +851,14 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
}
public void toData(DataOutput out) throws IOException {
- toDataPre_GFE_9_0_0_0(out);
+ toDataPre_9_0_0_0(out);
if (netMbr.getVersionOrdinal() >= Version.GFE_90.ordinal()) {
getNetMember().writeAdditionalData(out);
}
}
- public void toDataPre_GFE_9_0_0_0(DataOutput out) throws IOException {
+ public void toDataPre_9_0_0_0(DataOutput out) throws IOException {
// Assert.assertTrue(vmKind > 0);
// NOTE: If you change the serialized format of this class
// then bump Connection.HANDSHAKE_VERSION since an
@@ -903,7 +903,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
Version.writeOrdinal(out, version, true);
}
- public void toDataPre_GFE_7_1_0_0(DataOutput out) throws IOException {
+ public void toDataPre_7_1_0_0(DataOutput out) throws IOException {
Assert.assertTrue(netMbr.getVmKind() > 0);
// disabled to allow post-connect setting of the port for loner systems
// Assert.assertTrue(getPort() > 0);
@@ -950,7 +950,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- fromDataPre_GFE_9_0_0_0(in);
+ fromDataPre_9_0_0_0(in);
// just in case this is just a non-versioned read
// from a file we ought to check the version
if (getNetMember().getVersionOrdinal() >= Version.GFE_90.ordinal()) {
@@ -962,7 +962,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
}
}
- public void fromDataPre_GFE_9_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_9_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
InetAddress inetAddr = DataSerializer.readInetAddress(in);
int port = in.readInt();
@@ -1007,7 +1007,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
// Assert.assertTrue(getPort() > 0);
}
- public void fromDataPre_GFE_7_1_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_7_1_0_0(DataInput in) throws IOException, ClassNotFoundException {
InetAddress inetAddr = DataSerializer.readInetAddress(in);
int port = in.readInt();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java b/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
index b5b6b5e..df78622 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
@@ -843,10 +843,10 @@ public interface DataSerializableFixedID extends SerializationVersions {
* Writes the state of this object as primitive data to the given <code>DataOutput</code>.<br>
* <br>
* Note: For rolling upgrades, if there is a change in the object format from previous version,
- * add a new toDataPre_GFE_X_X_X_X() method and add an entry for the current {@link Version} in
+ * add a new toDataPre_X_X_X_X() method and add an entry for the current {@link Version} in
* the getSerializationVersions array of the implementing class. e.g. if msg format changed in
- * version 80, create toDataPre_GFE_8_0_0_0, add Version.GFE_80 to the getSerializationVersions
- * array and copy previous toData contents to this newly created toDataPre_GFE_X_X_X_X() method.
+ * version 80, create toDataPre_8_0_0_0, add Version.GFE_80 to the getSerializationVersions
+ * array and copy previous toData contents to this newly created toDataPre_X_X_X_X() method.
*
* @throws IOException A problem occurs while writing to <code>out</code>
*/
@@ -856,10 +856,10 @@ public interface DataSerializableFixedID extends SerializationVersions {
* Reads the state of this object as primitive data from the given <code>DataInput</code>. <br>
* <br>
* Note: For rolling upgrades, if there is a change in the object format from previous version,
- * add a new fromDataPre_GFE_X_X_X_X() method and add an entry for the current {@link Version} in
+ * add a new fromDataPre_X_X_X_X() method and add an entry for the current {@link Version} in
* the getSerializationVersions array of the implementing class. e.g. if msg format changed in
- * version 80, create fromDataPre_GFE_8_0_0_0, add Version.GFE_80 to the getSerializationVersions
- * array and copy previous fromData contents to this newly created fromDataPre_GFE_X_X_X_X()
+ * version 80, create fromDataPre_8_0_0_0, add Version.GFE_80 to the getSerializationVersions
+ * array and copy previous fromData contents to this newly created fromDataPre_X_X_X_X()
* method.
*
* @throws IOException A problem occurs while reading from <code>in</code>
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java b/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
index 8bcdd9b..e7b16b2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SerializationVersions.java
@@ -26,7 +26,7 @@ public interface SerializationVersions {
* method are expected to be in increasing ordinal order from 0 .. N. For instance,<br>
* Version.GFE_7_0, Version.GFE_7_0_1, Version.GFE_8_0, Version.GFXD_1_1<br>
* <p>
- * You are expected to implement toDataPre_GFE_7_0_0_0(), fromDataPre_GFE_7_0_0_0(), ...,
+ * You are expected to implement toDataPre_7_0_0_0(), fromDataPre_7_0_0_0(), ...,
* toDataPre_GFXD_1_1_0_0, fromDataPre_GFXD_1_1_0_0.
* <p>
* The method name is formed with the version's product name and its major, minor, release and
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index 3d7e4dc..322a2f7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -246,8 +246,8 @@ public class Version implements Comparable<Version> {
this.release = release;
this.patch = patch;
this.ordinal = ordinal;
- this.methodSuffix = this.productName + "_" + this.majorVersion + "_" + this.minorVersion + "_"
- + this.release + "_" + this.patch;
+ this.methodSuffix =
+ this.majorVersion + "_" + this.minorVersion + "_" + this.release + "_" + this.patch;
if (ordinal != TOKEN_ORDINAL) {
VALUES[this.ordinal] = this;
}
@@ -542,10 +542,6 @@ public class Version implements Comparable<Version> {
return bytes;
}
- public boolean isPre65() {
- return compareTo(Version.GFE_65) < 0;
- }
-
public static Iterable<? extends Version> getAllVersions() {
return Arrays.asList(VALUES).stream().filter(x -> x != null && x != TEST_VERSION)
.collect(Collectors.toList());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
index 67a7813..d15ed64 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ClientHealthStats.java
@@ -231,7 +231,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
DataSerializer.writeHashMap((poolStats), out);
}
- public void toDataPre_GFE_8_0_0_0(DataOutput out) throws IOException {
+ public void toDataPre_8_0_0_0(DataOutput out) throws IOException {
DataSerializer.writePrimitiveInt(numOfGets, out);
DataSerializer.writePrimitiveInt(numOfPuts, out);
DataSerializer.writePrimitiveInt(numOfMisses, out);
@@ -254,7 +254,7 @@ public class ClientHealthStats implements DataSerializableFixedID, Serializable
this.poolStats = DataSerializer.readHashMap(in);
}
- public void fromDataPre_GFE_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
this.numOfGets = DataSerializer.readPrimitiveInt(in);
this.numOfPuts = DataSerializer.readPrimitiveInt(in);
this.numOfMisses = DataSerializer.readPrimitiveInt(in);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
index 46130ed..4d759ae 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EventID.java
@@ -360,7 +360,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
dop.writeByte(this.breadcrumbCounter);
}
- public void toDataPre_GFE_8_0_0_0(DataOutput dop) throws IOException {
+ public void toDataPre_8_0_0_0(DataOutput dop) throws IOException {
DataSerializer.writeByteArray(this.membershipID, dop);
DataSerializer.writeByteArray(getOptimizedByteArrayForEventID(this.threadID, this.sequenceID),
dop);
@@ -375,7 +375,7 @@ public class EventID implements DataSerializableFixedID, Serializable, Externali
this.breadcrumbCounter = di.readByte();
}
- public void fromDataPre_GFE_8_0_0_0(DataInput di) throws IOException, ClassNotFoundException {
+ public void fromDataPre_8_0_0_0(DataInput di) throws IOException, ClassNotFoundException {
this.membershipID = DataSerializer.readByteArray(di);
ByteBuffer eventIdParts = ByteBuffer.wrap(DataSerializer.readByteArray(di));
this.threadID = readEventIdPartsFromOptmizedByteArray(eventIdParts);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
index 99589c3..fcab143 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
@@ -248,7 +248,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
return serializationVersions;
}
- public void fromDataPre_GFE_7_1_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_7_1_0_0(DataInput in) throws IOException, ClassNotFoundException {
DistributedMember myID = null;
InternalCache cache = GemFireCacheImpl.getInstance();
if (cache != null) {
@@ -267,7 +267,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
}
}
- public void toDataPre_GFE_7_1_0_0(DataOutput out) throws IOException {
+ public void toDataPre_7_1_0_0(DataOutput out) throws IOException {
int size = this.serverFilterInfo.size();
out.writeInt(size);
for (Map.Entry<InternalDistributedMember, FilterInfo> e : this.serverFilterInfo.entrySet()) {
@@ -397,7 +397,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
}
}
- public void fromDataPre_GFE_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
if (OLD_MEMBERS_OPTIMIZED) {
this.myDataVersion = InternalDataSerializer.getVersionForDataStreamOrNull(in);
this.myData = DataSerializer.readByteArray(in);
@@ -408,7 +408,7 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
}
}
- public void toDataPre_GFE_8_0_0_0(DataOutput out) throws IOException {
+ public void toDataPre_8_0_0_0(DataOutput out) throws IOException {
if (OLD_MEMBERS_OPTIMIZED) {
HeapDataOutputStream hdos =
new HeapDataOutputStream(1000, InternalDataSerializer.getVersionForDataStream(out));
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index 0707e73..a18c253 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -1803,7 +1803,7 @@ public abstract class ServerConnection implements Runnable {
public long getUniqueId() {
long uniqueId = 0;
- if (this.handshake.getVersion().isPre65() || communicationMode.isWAN()) {
+ if (this.handshake.getVersion().compareTo(Version.GFE_65) < 0 || communicationMode.isWAN()) {
uniqueId = this.userAuthId;
} else if (this.requestMsg.isSecureMode()) {
uniqueId = messageIdExtractor.getUniqueIdFromMessage(this.requestMsg,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
index 1b870fb..ee733ce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
@@ -301,12 +301,12 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
return serializationVersions;
}
- public void toDataPre_GFE_8_0_0_0(DataOutput out) throws IOException {
+ public void toDataPre_8_0_0_0(DataOutput out) throws IOException {
getCanonicalIDs();
toData(out);
}
- public void fromDataPre_GFE_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
fromData(in);
}
@@ -740,7 +740,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
throw new IOException("this fromData method should never be invoked");
}
- public void toDataPre_GFE_8_0_0_0(DataOutput out) throws IOException {
+ public void toDataPre_8_0_0_0(DataOutput out) throws IOException {
if (this.index == 0) {
this.list.getCanonicalIDs();
}
@@ -749,7 +749,7 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
// when deserialized a VersionedObjectList is created, not a Chunker, so this method isn't
// needed
- // public void fromDataPre_GFE_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException
+ // public void fromDataPre_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException
// {
// fromData(in);
// }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
index 3eb1dd1..622a6b9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
@@ -611,7 +611,7 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
}
}
- public void fromDataPre_GFE_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
super.fromData(in);
this.Id = DataSerializer.readString(in);
this.startTime = in.readLong();
@@ -636,7 +636,7 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
}
}
- public void toDataPre_GFE_8_0_0_0(DataOutput out) throws IOException {
+ public void toDataPre_8_0_0_0(DataOutput out) throws IOException {
super.toData(out);
DataSerializer.writeString(Id, out);
out.writeLong(startTime);
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java
index 71ff4c7..1ae50fd 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CliFunctionResult.java
@@ -171,7 +171,7 @@ public class CliFunctionResult implements Comparable<CliFunctionResult>, DataSer
DataSerializer.writeByteArray(this.byteData, out);
}
- public void toDataPre_GFE_8_0_0_0(DataOutput out) throws IOException {
+ public void toDataPre_8_0_0_0(DataOutput out) throws IOException {
DataSerializer.writeString(this.memberIdOrName, out);
DataSerializer.writeObjectArray(this.serializables, out);
DataSerializer.writeObject(this.resultObject, out);
@@ -187,7 +187,7 @@ public class CliFunctionResult implements Comparable<CliFunctionResult>, DataSer
this.byteData = DataSerializer.readByteArray(in);
}
- public void fromDataPre_GFE_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_8_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
this.memberIdOrName = DataSerializer.readString(in);
this.resultObject = DataSerializer.readObject(in);
this.serializables = (Serializable[]) DataSerializer.readObjectArray(in);
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
index 06eda64..5dd2dac 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
@@ -475,12 +475,12 @@ public class XmlEntity implements VersionedDataSerializable {
@Override
public void toData(DataOutput out) throws IOException {
- toDataPre_GEODE_1_1_1_0(out);
+ toDataPre_1_1_1_0(out);
DataSerializer.writeString(this.childPrefix, out);
DataSerializer.writeString(this.childNamespace, out);
}
- public void toDataPre_GEODE_1_1_1_0(DataOutput out) throws IOException {
+ public void toDataPre_1_1_1_0(DataOutput out) throws IOException {
DataSerializer.writeString(this.type, out);
DataSerializer.writeObject(this.attributes, out);
DataSerializer.writeString(this.xmlDefinition, out);
@@ -491,12 +491,12 @@ public class XmlEntity implements VersionedDataSerializable {
@Override
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- fromDataPre_GEODE_1_1_1_0(in);
+ fromDataPre_1_1_1_0(in);
this.childPrefix = DataSerializer.readString(in);
this.childNamespace = DataSerializer.readString(in);
}
- public void fromDataPre_GEODE_1_1_1_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_1_1_1_0(DataInput in) throws IOException, ClassNotFoundException {
this.type = DataSerializer.readString(in);
this.attributes = DataSerializer.readObject(in);
this.xmlDefinition = DataSerializer.readString(in);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
index 7d6bdf3..1df3d1a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -242,11 +242,11 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
toDataCalled = true;
}
- public void toDataPre_GFE_6_6_0_0(DataOutput out) throws IOException {
+ public void toDataPre_6_6_0_0(DataOutput out) throws IOException {
toDataPre66Called = true;
}
- public void toDataPre_GFE_7_0_0_0(DataOutput out) throws IOException {
+ public void toDataPre_7_0_0_0(DataOutput out) throws IOException {
toDataPre70called = true;
}
@@ -255,11 +255,11 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
fromDataCalled = true;
}
- public void fromDataPre_GFE_6_6_0_0(DataInput out) throws IOException {
+ public void fromDataPre_6_6_0_0(DataInput out) throws IOException {
fromDataPre66Called = true;
}
- public void fromDataPre_GFE_7_0_0_0(DataInput out) throws IOException {
+ public void fromDataPre_7_0_0_0(DataInput out) throws IOException {
fromDataPre70Called = true;
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
index 3b893a2..221b58f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
@@ -3002,12 +3002,12 @@ public class DataSerializableJUnitTest implements Serializable {
super(random);
}
- public void toDataPre_GFE_7_1_0_0(DataOutput out) throws IOException {
+ public void toDataPre_7_1_0_0(DataOutput out) throws IOException {
this.preMethodInvoked = true;
toData(out);
}
- public void fromDataPre_GFE_7_1_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_7_1_0_0(DataInput in) throws IOException, ClassNotFoundException {
this.preMethodInvoked = true;
fromData(in);
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
index 3ce3736..988f316 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
@@ -57,9 +57,9 @@ public class VersionJUnitTest {
@Test
public void testIsPre65() {
- assertTrue(Version.GFE_61.isPre65());
- assertFalse(Version.GFE_65.isPre65());
- assertFalse(Version.GFE_70.isPre65());
+ assertTrue(Version.GFE_61.compareTo(Version.GFE_65) < 0);
+ assertFalse(Version.GFE_65.compareTo(Version.GFE_65) < 0);
+ assertFalse(Version.GFE_70.compareTo(Version.GFE_65) < 0);
}
@Test
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index c4ad894..2215e84 100644
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -274,11 +274,11 @@ toData,16
org/apache/geode/distributed/internal/membership/InternalDistributedMember,6
fromData,38
-fromDataPre_GFE_7_1_0_0,282
-fromDataPre_GFE_9_0_0_0,282
+fromDataPre_7_1_0_0,282
+fromDataPre_9_0_0_0,282
toData,34
-toDataPre_GFE_7_1_0_0,271
-toDataPre_GFE_9_0_0_0,266
+toDataPre_7_1_0_0,271
+toDataPre_9_0_0_0,266
org/apache/geode/distributed/internal/membership/NetView,2
fromData,109
@@ -499,9 +499,9 @@ toData,16
org/apache/geode/internal/admin/remote/ClientHealthStats,4
fromData,73
-fromDataPre_GFE_8_0_0_0,65
+fromDataPre_8_0_0_0,65
toData,73
-toDataPre_GFE_8_0_0_0,65
+toDataPre_8_0_0_0,65
org/apache/geode/internal/admin/remote/CompactRequest,2
fromData,6
@@ -990,9 +990,9 @@ toData,22
org/apache/geode/internal/cache/EventID,4
fromData,53
-fromDataPre_GFE_8_0_0_0,33
+fromDataPre_8_0_0_0,33
toData,97
-toDataPre_GFE_8_0_0_0,24
+toDataPre_8_0_0_0,24
org/apache/geode/internal/cache/EvictionAttributesImpl,2
fromData,33
@@ -1008,15 +1008,15 @@ toData,133
org/apache/geode/internal/cache/FilterRoutingInfo,4
fromData,88
-fromDataPre_GFE_7_1_0_0,97
+fromDataPre_7_1_0_0,97
toData,88
-toDataPre_GFE_7_1_0_0,88
+toDataPre_7_1_0_0,88
org/apache/geode/internal/cache/FilterRoutingInfo$FilterInfo,4
fromData,9
-fromDataPre_GFE_8_0_0_0,50
+fromDataPre_8_0_0_0,50
toData,255
-toDataPre_GFE_8_0_0_0,213
+toDataPre_8_0_0_0,213
org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueMessage,2
fromData,24
@@ -1941,14 +1941,14 @@ toData,32
org/apache/geode/internal/cache/tier/sockets/VersionedObjectList,4
fromData,542
-fromDataPre_GFE_8_0_0_0,6
-toDataPre_GFE_8_0_0_0,10
+fromDataPre_8_0_0_0,6
+toDataPre_8_0_0_0,10
toData,623
org/apache/geode/internal/cache/tier/sockets/VersionedObjectList$Chunker,3
fromData,10
toData,40
-toDataPre_GFE_8_0_0_0,20
+toDataPre_8_0_0_0,20
org/apache/geode/internal/cache/tx/DistTxEntryEvent,2
fromData,100
@@ -1980,9 +1980,9 @@ toData,259
org/apache/geode/internal/cache/wan/GatewaySenderAdvisor$GatewaySenderProfile,4
fromData,282
-fromDataPre_GFE_8_0_0_0,187
+fromDataPre_8_0_0_0,187
toData,270
-toDataPre_GFE_8_0_0_0,235
+toDataPre_8_0_0_0,235
org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument,2
fromData,63
@@ -2070,9 +2070,9 @@ toData,41
org/apache/geode/management/internal/cli/functions/CliFunctionResult,4
fromData,58
-fromDataPre_GFE_8_0_0_0,31
+fromDataPre_8_0_0_0,31
toData,49
-toDataPre_GFE_8_0_0_0,25
+toDataPre_8_0_0_0,25
org/apache/geode/management/internal/configuration/domain/Configuration,2
fromData,49
@@ -2084,9 +2084,9 @@ toData,28
org/apache/geode/management/internal/configuration/domain/XmlEntity,4
fromData,22
-fromDataPre_GEODE_1_1_1_0,59
+fromDataPre_1_1_1_0,59
toData,22
-toDataPre_GEODE_1_1_1_0,49
+toDataPre_1_1_1_0,49
org/apache/geode/management/internal/configuration/messages/ConfigurationResponse,2
fromData,28
diff --git a/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java b/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
index d268238..1c3f559 100755
--- a/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
@@ -18,8 +18,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({IntegrationTest.class, SerializationTest.class, ClientSubscriptionTest.class})
public class AnalyzeCQSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
@Override
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
index 3d9b00d..248177a 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile.java
@@ -166,11 +166,11 @@ public class LuceneIndexCreationProfile implements CacheServiceProfile, Versione
@Override
public void toData(DataOutput out) throws IOException {
- toDataPre_GEODE_1_4_0_0(out);
+ toDataPre_1_4_0_0(out);
DataSerializer.writeString(this.serializerClass, out);
}
- public void toDataPre_GEODE_1_4_0_0(DataOutput out) throws IOException {
+ public void toDataPre_1_4_0_0(DataOutput out) throws IOException {
DataSerializer.writeString(this.indexName, out);
DataSerializer.writeString(this.regionPath, out);
DataSerializer.writeStringArray(this.fieldNames, out);
@@ -180,11 +180,11 @@ public class LuceneIndexCreationProfile implements CacheServiceProfile, Versione
@Override
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- fromDataPre_GEODE_1_4_0_0(in);
+ fromDataPre_1_4_0_0(in);
this.serializerClass = DataSerializer.readString(in);
}
- public void fromDataPre_GEODE_1_4_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_1_4_0_0(DataInput in) throws IOException, ClassNotFoundException {
this.indexName = DataSerializer.readString(in);
this.regionPath = DataSerializer.readString(in);
this.fieldNames = DataSerializer.readStringArray(in);
diff --git a/geode-lucene/src/test/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java
index 226c092..454913d 100644
--- a/geode-lucene/src/test/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java
@@ -18,9 +18,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.LuceneTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
-@Category({IntegrationTest.class, LuceneTest.class})
+@Category({IntegrationTest.class, SerializationTest.class, LuceneTest.class})
public class AnalyzeLuceneSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
@Override
diff --git a/geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index 1a3205e..66e13c5 100644
--- a/geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -3,9 +3,9 @@ fromData,32
toData,32
org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile,4
fromData,14
-fromDataPre_GEODE_1_4_0_0,41
+fromDataPre_1_4_0_0,41
toData,14
-toDataPre_GEODE_1_4_0_0,41
+toDataPre_1_4_0_0,41
org/apache/geode/cache/lucene/internal/LuceneResultStructImpl,2
fromData,27
toData,27
diff --git a/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
index e416abc..205c4aa 100644
--- a/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
@@ -17,10 +17,11 @@ package org.apache.geode.codeAnalysis;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.apache.geode.test.junit.categories.WanTest;
-@Category({IntegrationTest.class, WanTest.class})
+@Category({IntegrationTest.class, SerializationTest.class, WanTest.class})
public class AnalyzeWANSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
@Override
diff --git a/geode-web-api/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java b/geode-web-api/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
index 2d0bc62..af267df 100644
--- a/geode-web-api/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
+++ b/geode-web-api/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
@@ -18,8 +18,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
+import org.apache.geode.test.junit.categories.SerializationTest;
-@Category({IntegrationTest.class, RestAPITest.class})
+@Category({IntegrationTest.class, SerializationTest.class, RestAPITest.class})
public class AnalyzeWebApiSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
@Override
--
To stop receiving notification emails like this one, please contact
bschuchardt@apache.org.