GEODE-2365: Replace gemfire with geode in clicache. This closes #375
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/fc9f1f6f Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/fc9f1f6f Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/fc9f1f6f Branch: refs/heads/next-gen-native-client-software-grant Commit: fc9f1f6f5741d7f06077dda5208326f6e30abb94 Parents: 340f2fc Author: Mike Martell <mmart...@pivotal.io> Authored: Mon Jan 30 21:00:34 2017 -0800 Committer: Jacob Barrett <jbarr...@pivotal.io> Committed: Thu Feb 2 14:27:31 2017 -0800 ---------------------------------------------------------------------- .../BuiltinCacheableWrappersN.cs | 323 +-- src/clicache/integration-test/CacheHelperN.cs | 85 +- .../integration-test/CacheableWrapper.cs | 6 +- .../integration-test/CacheableWrapperN.cs | 8 +- src/clicache/integration-test/PutGetTestsN.cs | 16 +- .../integration-test/SerializationTestsN.cs | 156 +- .../ThinClientAppDomainQueryTests.cs | 428 ++-- .../integration-test/ThinClientCSTXN.cs | 8 +- .../integration-test/ThinClientDocExamplesN.cs | 10 +- .../integration-test/ThinClientDurableTestsN.cs | 101 +- .../integration-test/ThinClientQueryTestsN.cs | 126 +- .../integration-test/ThinClientRegionTestsN.cs | 124 +- src/clicache/src/AttributesFactory.cpp | 2 +- src/clicache/src/AttributesMutator.cpp | 3 +- src/clicache/src/Cache.hpp | 56 +- src/clicache/src/CacheFactory.hpp | 896 ++++---- src/clicache/src/CacheableArrayList.hpp | 6 +- src/clicache/src/CacheableBuiltins.hpp | 714 +++--- src/clicache/src/CacheableDate.cpp | 26 +- src/clicache/src/CacheableFileName.cpp | 22 +- src/clicache/src/CacheableHashMap.hpp | 12 +- src/clicache/src/CacheableHashSet.hpp | 254 +-- src/clicache/src/CacheableHashTable.hpp | 2 +- src/clicache/src/CacheableIdentityHashMap.hpp | 2 +- src/clicache/src/CacheableLinkedList.hpp | 48 +- src/clicache/src/CacheableObject.hpp | 8 +- src/clicache/src/CacheableObjectArray.hpp | 4 +- src/clicache/src/CacheableObjectXml.hpp | 6 +- src/clicache/src/CacheableStack.cpp | 28 +- src/clicache/src/CacheableString.cpp | 56 +- src/clicache/src/CacheableString.hpp | 42 +- src/clicache/src/CacheableStringArray.hpp | 22 +- src/clicache/src/CacheableUndefined.hpp | 6 +- src/clicache/src/CacheableVector.hpp | 16 +- src/clicache/src/CqEvent.cpp | 5 +- src/clicache/src/DataInput.cpp | 2058 +++++++++--------- src/clicache/src/DataOutput.cpp | 1452 ++++++------ src/clicache/src/DistributedSystem.cpp | 848 ++++---- src/clicache/src/DistributedSystem.hpp | 28 +- src/clicache/src/GemFireClassIds.hpp | 369 ---- src/clicache/src/GeodeClassIds.hpp | 369 ++++ src/clicache/src/ICacheListener.hpp | 26 +- src/clicache/src/ICacheLoader.hpp | 6 +- src/clicache/src/ICacheWriter.hpp | 16 +- src/clicache/src/ICqAttributes.hpp | 10 +- src/clicache/src/ICqEvent.hpp | 10 +- src/clicache/src/ICqListener.hpp | 10 +- src/clicache/src/IFixedPartitionResolver.hpp | 118 +- src/clicache/src/IGFDelta.hpp | 22 +- src/clicache/src/IGemFireCache.hpp | 110 - src/clicache/src/IGeodeCache.hpp | 110 + src/clicache/src/IPartitionResolver.hpp | 80 +- src/clicache/src/IPdxSerializable.hpp | 60 +- src/clicache/src/IPdxSerializer.hpp | 62 +- src/clicache/src/IPdxUnreadFields.hpp | 16 +- src/clicache/src/IRegion.hpp | 78 +- src/clicache/src/IResultCollector.hpp | 28 +- src/clicache/src/ISubscriptionService.hpp | 1134 +++++----- src/clicache/src/ITransactionWriter.hpp | 48 +- src/clicache/src/Log.cpp | 70 +- src/clicache/src/Log.hpp | 92 +- src/clicache/src/Pool.hpp | 558 ++--- src/clicache/src/PoolFactory.hpp | 728 +++---- src/clicache/src/Properties.hpp | 4 +- src/clicache/src/QueryService.cpp | 99 +- src/clicache/src/Region.cpp | 944 ++++---- src/clicache/src/RegionAttributes.hpp | 102 +- src/clicache/src/ResultCollector.hpp | 8 +- src/clicache/src/ResultSet.hpp | 18 +- src/clicache/src/Serializable.cpp | 1825 ++++++++-------- src/clicache/src/StatisticDescriptor.hpp | 146 +- src/clicache/src/StatisticsFactory.hpp | 408 ++-- src/clicache/src/SystemProperties.hpp | 90 +- src/clicache/src/TransactionEvent.hpp | 70 +- .../src/UserFunctionExecutionException.hpp | 170 +- src/clicache/src/gf_defs.hpp | 26 +- src/clicache/src/impl/EnumInfo.hpp | 102 +- src/clicache/src/impl/ManagedAuthInitialize.cpp | 8 +- src/clicache/src/impl/ManagedCacheListener.cpp | 12 +- src/clicache/src/impl/ManagedCacheLoader.cpp | 14 +- src/clicache/src/impl/ManagedCacheWriter.cpp | 10 +- src/clicache/src/impl/ManagedCacheableKey.cpp | 4 +- src/clicache/src/impl/ManagedCqListener.cpp | 6 +- .../src/impl/ManagedCqStatusListener.cpp | 6 +- .../src/impl/ManagedFixedPartitionResolver.cpp | 10 +- .../src/impl/ManagedPartitionResolver.cpp | 10 +- .../src/impl/ManagedResultCollector.cpp | 6 +- .../src/impl/ManagedTransactionListener.cpp | 80 +- .../src/impl/ManagedTransactionWriter.cpp | 64 +- src/clicache/src/impl/PdxFieldType.cpp | 92 +- src/clicache/src/impl/PdxFieldType.hpp | 58 +- .../src/impl/PdxInstanceFactoryImpl.cpp | 532 ++--- src/clicache/src/impl/PdxInstanceImpl.cpp | 1285 +++++------ src/clicache/src/impl/PdxInstanceImpl.hpp | 316 +-- src/clicache/src/impl/PdxLocalWriter.hpp | 106 +- .../src/impl/PdxReaderWithTypeCollector.cpp | 238 +- src/clicache/src/impl/PdxType.cpp | 40 +- src/clicache/src/impl/PdxType.hpp | 248 +-- .../src/impl/PdxWriterWithTypeCollector.cpp | 644 +++--- 99 files changed, 9995 insertions(+), 9949 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/integration-test/BuiltinCacheableWrappersN.cs ---------------------------------------------------------------------- diff --git a/src/clicache/integration-test/BuiltinCacheableWrappersN.cs b/src/clicache/integration-test/BuiltinCacheableWrappersN.cs index 647fbcc..444fe71 100644 --- a/src/clicache/integration-test/BuiltinCacheableWrappersN.cs +++ b/src/clicache/integration-test/BuiltinCacheableWrappersN.cs @@ -23,7 +23,7 @@ namespace Apache.Geode.Client.UnitTests using NUnit.Framework; using Apache.Geode.DUnitFramework; using Apache.Geode.Client; - + #region Helper class public class CacheableHelper @@ -114,15 +114,15 @@ namespace Apache.Geode.Client.UnitTests public static bool IsContainerTypeId(uint typeId) { - return (typeId == GemFireClassIds.CacheableObjectArray) || - (typeId == GemFireClassIds.CacheableVector) || - (typeId == GemFireClassIds.CacheableArrayList) || - (typeId == GemFireClassIds.CacheableStack) || - (typeId == GemFireClassIds.CacheableHashMap) || - (typeId == GemFireClassIds.CacheableIdentityHashMap) || - (typeId == GemFireClassIds.CacheableHashTable) || - (typeId == GemFireClassIds.CacheableLinkedHashSet) || - (typeId == GemFireClassIds.CacheableHashSet); + return (typeId == GeodeClassIds.CacheableObjectArray) || + (typeId == GeodeClassIds.CacheableVector) || + (typeId == GeodeClassIds.CacheableArrayList) || + (typeId == GeodeClassIds.CacheableStack) || + (typeId == GeodeClassIds.CacheableHashMap) || + (typeId == GeodeClassIds.CacheableIdentityHashMap) || + (typeId == GeodeClassIds.CacheableHashTable) || + (typeId == GeodeClassIds.CacheableLinkedHashSet) || + (typeId == GeodeClassIds.CacheableHashSet); } public static bool IsUnhandledType(uint typeId) @@ -131,9 +131,9 @@ namespace Apache.Geode.Client.UnitTests // not work on Windows without significant workarounds; also see // the corresponding comment in C++ testThinClientCacheables. // Also skipping C# specific classes. - return (typeId == GemFireClassIds.CacheableFileName) || - (typeId == GemFireClassIds.CacheableManagedObject) || - (typeId == GemFireClassIds.CacheableManagedObjectXml); + return (typeId == GeodeClassIds.CacheableFileName) || + (typeId == GeodeClassIds.CacheableManagedObject) || + (typeId == GeodeClassIds.CacheableManagedObjectXml); } public static long ConstantDateTime = 0; public static void RegisterBuiltins(long dateTime) @@ -142,33 +142,33 @@ namespace Apache.Geode.Client.UnitTests CacheableWrapperFactory.ClearStaticVaraiables(); #region Cacheable keys - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableBoolean, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableBoolean, typeof(CacheableBooleanWrapper), CacheableBooleanWrapper.Create, typeof(bool)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableByte, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableByte, typeof(CacheableByteWrapper), CacheableByteWrapper.Create, typeof(sbyte)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableCharacter, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableCharacter, typeof(CacheableCharacterWrapper), CacheableCharacterWrapper.Create, typeof(Char)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableDate, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableDate, typeof(CacheableDateWrapper), CacheableDateWrapper.Create, typeof(DateTime)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableDouble, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableDouble, typeof(CacheableDoubleWrapper), CacheableDoubleWrapper.Create, typeof(Double)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableFileName, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableFileName, typeof(CacheableFileNameWrapper), CacheableFileNameWrapper.Create, typeof(CacheableFileName)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableFloat, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableFloat, typeof(CacheableFloatWrapper), CacheableFloatWrapper.Create, typeof(float)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableInt16, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableInt16, typeof(CacheableInt16Wrapper), CacheableInt16Wrapper.Create, typeof(Int16)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableInt32, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableInt32, typeof(CacheableInt32Wrapper), CacheableInt32Wrapper.Create, typeof(Int32)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableInt64, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableInt64, typeof(CacheableInt64Wrapper), CacheableInt64Wrapper.Create, typeof(Int64)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableASCIIString, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableASCIIString, typeof(CacheableStringWrapper), CacheableStringWrapper.Create, typeof(string)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableString, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableString, typeof(CacheableUnicodeStringWrapper), CacheableUnicodeStringWrapper.Create); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableASCIIStringHuge, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableASCIIStringHuge, typeof(CacheableHugeStringWrapper), CacheableHugeStringWrapper.Create); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableStringHuge, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableStringHuge, typeof(CacheableHugeUnicodeStringWrapper), CacheableHugeUnicodeStringWrapper.Create); CacheableWrapperFactory.RegisterKeyType(10001, typeof(PdxCDataWrapper), PdxCDataWrapper.Create, typeof(PdxCData)); @@ -180,55 +180,55 @@ namespace Apache.Geode.Client.UnitTests #region Other cacheables - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableBytes, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableBytes, typeof(CacheableBytesWrapper), CacheableBytesWrapper.Create, typeof(byte[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableDoubleArray, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableDoubleArray, typeof(CacheableDoubleArrayWrapper), CacheableDoubleArrayWrapper.Create, typeof(Double[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableFloatArray, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableFloatArray, typeof(CacheableFloatArrayWrapper), CacheableFloatArrayWrapper.Create, typeof(float[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableHashMap, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableHashMap, typeof(CacheableHashMapWrapper), CacheableHashMapWrapper.Create, typeof(Dictionary<object, object>)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableHashTable, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableHashTable, typeof(CacheableHashTableWrapper), CacheableHashTableWrapper.Create, typeof(System.Collections.Hashtable)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableIdentityHashMap, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableIdentityHashMap, typeof(CacheableIdentityHashMapWrapper), CacheableIdentityHashMapWrapper.Create, typeof(Dictionary<object, object>)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableHashSet, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableHashSet, typeof(CacheableHashSetWrapper), CacheableHashSetWrapper.Create, typeof(CacheableHashSet)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableLinkedHashSet, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableLinkedHashSet, typeof(CacheableLinkedHashSetWrapper), CacheableLinkedHashSetWrapper.Create, typeof(CacheableLinkedHashSet)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableInt16Array, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableInt16Array, typeof(CacheableInt16ArrayWrapper), CacheableInt16ArrayWrapper.Create, typeof(Int16[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableInt32Array, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableInt32Array, typeof(CacheableInt32ArrayWrapper), CacheableInt32ArrayWrapper.Create, typeof(Int32[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableInt64Array, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableInt64Array, typeof(CacheableInt64ArrayWrapper), CacheableInt64ArrayWrapper.Create, typeof(Int64[])); {//old one - //CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableNullString, + //CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableNullString, // typeof(CacheableNullStringWrapper), CacheableNullStringWrapper.Create); - //CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableASCIIString, + //CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableASCIIString, // typeof(CacheableEmptyStringWrapper), CacheableEmptyStringWrapper.Create); - //CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableString, + //CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableString, // typeof(CacheableEmptyUnicodeStringWrapper), CacheableEmptyUnicodeStringWrapper.Create); } - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableStringArray, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableStringArray, typeof(CacheableStringArrayWrapper), CacheableStringArrayWrapper.Create, typeof(string[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableUndefined, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableUndefined, typeof(CacheableUndefinedWrapper), CacheableUndefinedWrapper.Create, typeof(CacheableUndefined)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableVector, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableVector, typeof(CacheableVectorWrapper), CacheableVectorWrapper.Create, typeof(System.Collections.ArrayList)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableObjectArray, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableObjectArray, typeof(CacheableObjectArrayWrapper), CacheableObjectArrayWrapper.Create, typeof(CacheableObjectArray)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableArrayList, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableArrayList, typeof(CacheableArrayListWrapper), CacheableArrayListWrapper.Create, typeof(List<object>)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableStack, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableStack, typeof(CacheableStackWrapper), CacheableStackWrapper.Create, typeof(Stack<object>)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableManagedObject, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableManagedObject, typeof(CacheableObjectWrapper), CacheableObjectWrapper.Create, typeof(CacheableObject)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableManagedObjectXml, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableManagedObjectXml, typeof(CacheableObjectXmlWrapper), CacheableObjectXmlWrapper.Create, typeof(CacheableObjectXml)); - + #endregion @@ -240,35 +240,35 @@ namespace Apache.Geode.Client.UnitTests CacheableWrapperFactory.ClearStaticVaraiables(); #region Cacheable keys - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableBoolean, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableBoolean, typeof(CacheableBooleanWrapper), CacheableBooleanWrapper.Create, typeof(bool)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableByte, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableByte, typeof(CacheableByteWrapper), CacheableByteWrapper.Create, typeof(sbyte)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableCharacter, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableCharacter, typeof(CacheableCharacterWrapper), CacheableCharacterWrapper.Create, typeof(Char)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableDate, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableDate, typeof(CacheableDateWrapper), CacheableDateWrapper.Create, typeof(DateTime)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableDouble, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableDouble, typeof(CacheableDoubleWrapper), CacheableDoubleWrapper.Create, typeof(Double)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableFileName, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableFileName, typeof(CacheableFileNameWrapper), CacheableFileNameWrapper.Create, typeof(CacheableFileName)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableFloat, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableFloat, typeof(CacheableFloatWrapper), CacheableFloatWrapper.Create, typeof(float)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableInt16, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableInt16, typeof(CacheableInt16Wrapper), CacheableInt16Wrapper.Create, typeof(Int16)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableInt32, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableInt32, typeof(CacheableInt32Wrapper), CacheableInt32Wrapper.Create, typeof(Int32)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableInt64, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableInt64, typeof(CacheableInt64Wrapper), CacheableInt64Wrapper.Create, typeof(Int64)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableASCIIString, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableASCIIString, typeof(CacheableStringWrapper), CacheableStringWrapper.Create, typeof(string)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableString, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableString, typeof(CacheableUnicodeStringWrapper), CacheableUnicodeStringWrapper.Create); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableASCIIStringHuge, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableASCIIStringHuge, typeof(CacheableHugeStringWrapper), CacheableHugeStringWrapper.Create); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableStringHuge, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableStringHuge, typeof(CacheableHugeUnicodeStringWrapper), CacheableHugeUnicodeStringWrapper.Create); - + //need to register pdx type Serializable.RegisterPdxType(PdxCData.CreateDeserializable); @@ -276,53 +276,53 @@ namespace Apache.Geode.Client.UnitTests #region Other cacheables - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableBytes, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableBytes, typeof(CacheableBytesWrapper), CacheableBytesWrapper.Create, typeof(byte[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableDoubleArray, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableDoubleArray, typeof(CacheableDoubleArrayWrapper), CacheableDoubleArrayWrapper.Create, typeof(Double[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableFloatArray, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableFloatArray, typeof(CacheableFloatArrayWrapper), CacheableFloatArrayWrapper.Create, typeof(float[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableHashMap, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableHashMap, typeof(CacheableHashMapWrapper), CacheableHashMapWrapper.Create, typeof(Dictionary<object, object>)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableHashTable, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableHashTable, typeof(CacheableHashTableWrapper), CacheableHashTableWrapper.Create, typeof(System.Collections.Hashtable)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableIdentityHashMap, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableIdentityHashMap, typeof(CacheableIdentityHashMapWrapper), CacheableIdentityHashMapWrapper.Create, typeof(Dictionary<object, object>)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableHashSet, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableHashSet, typeof(CacheableHashSetWrapper), CacheableHashSetWrapper.Create, typeof(CacheableHashSet)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableLinkedHashSet, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableLinkedHashSet, typeof(CacheableLinkedHashSetWrapper), CacheableLinkedHashSetWrapper.Create, typeof(CacheableLinkedHashSet)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableInt16Array, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableInt16Array, typeof(CacheableInt16ArrayWrapper), CacheableInt16ArrayWrapper.Create, typeof(Int16[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableInt32Array, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableInt32Array, typeof(CacheableInt32ArrayWrapper), CacheableInt32ArrayWrapper.Create, typeof(Int32[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableInt64Array, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableInt64Array, typeof(CacheableInt64ArrayWrapper), CacheableInt64ArrayWrapper.Create, typeof(Int64[])); {//old one - //CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableNullString, + //CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableNullString, // typeof(CacheableNullStringWrapper), CacheableNullStringWrapper.Create); - //CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableASCIIString, + //CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableASCIIString, // typeof(CacheableEmptyStringWrapper), CacheableEmptyStringWrapper.Create); - //CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableString, + //CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableString, // typeof(CacheableEmptyUnicodeStringWrapper), CacheableEmptyUnicodeStringWrapper.Create); } - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableStringArray, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableStringArray, typeof(CacheableStringArrayWrapper), CacheableStringArrayWrapper.Create, typeof(string[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableUndefined, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableUndefined, typeof(CacheableUndefinedWrapper), CacheableUndefinedWrapper.Create, typeof(CacheableUndefined)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableVector, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableVector, typeof(CacheableVectorWrapper), CacheableVectorWrapper.Create, typeof(System.Collections.ArrayList)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableObjectArray, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableObjectArray, typeof(CacheableObjectArrayWrapper), CacheableObjectArrayWrapper.Create, typeof(CacheableObjectArray)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableArrayList, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableArrayList, typeof(CacheableArrayListWrapper), CacheableArrayListWrapper.Create, typeof(List<object>)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableStack, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableStack, typeof(CacheableStackWrapper), CacheableStackWrapper.Create, typeof(Stack<object>)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableManagedObject, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableManagedObject, typeof(CacheableObjectWrapper), CacheableObjectWrapper.Create, typeof(CacheableObject)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableManagedObjectXml, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableManagedObjectXml, typeof(CacheableObjectXmlWrapper), CacheableObjectXmlWrapper.Create, typeof(CacheableObjectXml)); @@ -336,34 +336,34 @@ namespace Apache.Geode.Client.UnitTests CacheableWrapperFactory.ClearStaticVaraiables(); #region Cacheable keys - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableBoolean, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableBoolean, typeof(CacheableBooleanWrapper), CacheableBooleanWrapper.Create, typeof(bool)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableByte, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableByte, typeof(CacheableByteWrapper), CacheableByteWrapper.Create, typeof(sbyte)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableCharacter, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableCharacter, typeof(CacheableCharacterWrapper), CacheableCharacterWrapper.Create, typeof(Char)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableDate, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableDate, typeof(CacheableDateWrapper), CacheableDateWrapper.Create, typeof(DateTime)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableDouble, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableDouble, typeof(CacheableDoubleWrapper), CacheableDoubleWrapper.Create, typeof(Double)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableFileName, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableFileName, typeof(CacheableFileNameWrapper), CacheableFileNameWrapper.Create, typeof(CacheableFileName)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableFloat, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableFloat, typeof(CacheableFloatWrapper), CacheableFloatWrapper.Create, typeof(float)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableInt16, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableInt16, typeof(CacheableInt16Wrapper), CacheableInt16Wrapper.Create, typeof(Int16)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableInt32, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableInt32, typeof(CacheableInt32Wrapper), CacheableInt32Wrapper.Create, typeof(Int32)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableInt64, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableInt64, typeof(CacheableInt64Wrapper), CacheableInt64Wrapper.Create, typeof(Int64)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableASCIIString, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableASCIIString, typeof(CacheableStringWrapper), CacheableStringWrapper.Create, typeof(string)); - CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableString, + CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableString, typeof(CacheableUnicodeStringWrapper), CacheableUnicodeStringWrapper.Create); { - //CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableASCIIStringHuge, + //CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableASCIIStringHuge, // typeof(CacheableHugeStringWrapper), CacheableHugeStringWrapper.Create); - //CacheableWrapperFactory.RegisterKeyType(GemFireClassIds.CacheableStringHuge, + //CacheableWrapperFactory.RegisterKeyType(GeodeClassIds.CacheableStringHuge, // typeof(CacheableHugeUnicodeStringWrapper), CacheableHugeUnicodeStringWrapper.Create); } CacheableWrapperFactory.RegisterKeyType(10001, @@ -377,53 +377,53 @@ namespace Apache.Geode.Client.UnitTests #region Other cacheables - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableBytes, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableBytes, typeof(CacheableBytesWrapper), CacheableBytesWrapper.Create, typeof(byte[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableDoubleArray, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableDoubleArray, typeof(CacheableDoubleArrayWrapper), CacheableDoubleArrayWrapper.Create, typeof(Double[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableFloatArray, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableFloatArray, typeof(CacheableFloatArrayWrapper), CacheableFloatArrayWrapper.Create, typeof(float[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableHashMap, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableHashMap, typeof(CacheableHashMapWrapper), CacheableHashMapWrapper.Create, typeof(Dictionary<object, object>)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableHashTable, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableHashTable, typeof(CacheableHashTableWrapper), CacheableHashTableWrapper.Create, typeof(System.Collections.Hashtable)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableIdentityHashMap, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableIdentityHashMap, typeof(CacheableIdentityHashMapWrapper), CacheableIdentityHashMapWrapper.Create, typeof(Dictionary<object, object>)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableHashSet, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableHashSet, typeof(CacheableHashSetWrapper), CacheableHashSetWrapper.Create, typeof(CacheableHashSet)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableLinkedHashSet, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableLinkedHashSet, typeof(CacheableLinkedHashSetWrapper), CacheableLinkedHashSetWrapper.Create, typeof(CacheableLinkedHashSet)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableInt16Array, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableInt16Array, typeof(CacheableInt16ArrayWrapper), CacheableInt16ArrayWrapper.Create, typeof(Int16[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableInt32Array, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableInt32Array, typeof(CacheableInt32ArrayWrapper), CacheableInt32ArrayWrapper.Create, typeof(Int32[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableInt64Array, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableInt64Array, typeof(CacheableInt64ArrayWrapper), CacheableInt64ArrayWrapper.Create, typeof(Int64[])); {//old one - //CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableNullString, + //CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableNullString, // typeof(CacheableNullStringWrapper), CacheableNullStringWrapper.Create); - //CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableASCIIString, + //CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableASCIIString, // typeof(CacheableEmptyStringWrapper), CacheableEmptyStringWrapper.Create); - //CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableString, + //CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableString, // typeof(CacheableEmptyUnicodeStringWrapper), CacheableEmptyUnicodeStringWrapper.Create); } - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableStringArray, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableStringArray, typeof(CacheableStringArrayWrapper), CacheableStringArrayWrapper.Create, typeof(string[])); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableUndefined, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableUndefined, typeof(CacheableUndefinedWrapper), CacheableUndefinedWrapper.Create, typeof(CacheableUndefined)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableVector, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableVector, typeof(CacheableVectorWrapper), CacheableVectorWrapper.Create, typeof(System.Collections.ArrayList)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableObjectArray, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableObjectArray, typeof(CacheableObjectArrayWrapper), CacheableObjectArrayWrapper.Create, typeof(CacheableObjectArray)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableArrayList, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableArrayList, typeof(CacheableArrayListWrapper), CacheableArrayListWrapper.Create, typeof(List<object>)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableStack, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableStack, typeof(CacheableStackWrapper), CacheableStackWrapper.Create, typeof(Stack<object>)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableManagedObject, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableManagedObject, typeof(CacheableObjectWrapper), CacheableObjectWrapper.Create, typeof(CacheableObject)); - CacheableWrapperFactory.RegisterType(GemFireClassIds.CacheableManagedObjectXml, + CacheableWrapperFactory.RegisterType(GeodeClassIds.CacheableManagedObjectXml, typeof(CacheableObjectXmlWrapper), CacheableObjectXmlWrapper.Create, typeof(CacheableObjectXml)); @@ -617,18 +617,18 @@ namespace Apache.Geode.Client.UnitTests public override void InitKey(int keyIndex, int maxSize) { //m_cacheableObject = DateTime.Today.AddMinutes(keyIndex % 0xFFFF); - DateTime dt = new DateTime(CacheableHelper.ConstantDateTime + keyIndex*TimeSpan.TicksPerMinute ); + DateTime dt = new DateTime(CacheableHelper.ConstantDateTime + keyIndex * TimeSpan.TicksPerMinute); m_cacheableObject = dt; Util.Log(" datevalue initkey " + dt.ToString()); } private DateTime createRoundOffDTVal(DateTime dt) - { + { long ticksToAdd = dt.Ticks % TimeSpan.TicksPerMillisecond; - ticksToAdd = (ticksToAdd >= (TimeSpan.TicksPerMillisecond/ 2) ? - (TimeSpan.TicksPerMillisecond - ticksToAdd) : -ticksToAdd); - dt = dt.AddTicks(ticksToAdd); - return dt; + ticksToAdd = (ticksToAdd >= (TimeSpan.TicksPerMillisecond / 2) ? + (TimeSpan.TicksPerMillisecond - ticksToAdd) : -ticksToAdd); + dt = dt.AddTicks(ticksToAdd); + return dt; } public override void InitRandomValue(int maxSize) @@ -827,7 +827,7 @@ namespace Apache.Geode.Client.UnitTests Assert.IsNotNull(value, "GetChecksum: Null object."); return CacheableHelper.CRC32(BitConverter.GetBytes(value)); } - + public override int GetHashCodeN(object cacheableObject) { float val = (float)cacheableObject; @@ -1502,20 +1502,20 @@ namespace Apache.Geode.Client.UnitTests int index = 0; foreach (UInt32 valueTypeId in valueTypeIds) { - if ((valueTypeId == GemFireClassIds.CacheableASCIIStringHuge || - valueTypeId == GemFireClassIds.CacheableStringHuge) - && !(keyTypeId == GemFireClassIds.CacheableBoolean)) + if ((valueTypeId == GeodeClassIds.CacheableASCIIStringHuge || + valueTypeId == GeodeClassIds.CacheableStringHuge) + && !(keyTypeId == GeodeClassIds.CacheableBoolean)) { continue; } - if ((keyTypeId == GemFireClassIds.CacheableASCIIStringHuge || - keyTypeId == GemFireClassIds.CacheableStringHuge) - && !(valueTypeId == GemFireClassIds.CacheableBoolean)) + if ((keyTypeId == GeodeClassIds.CacheableASCIIStringHuge || + keyTypeId == GeodeClassIds.CacheableStringHuge) + && !(valueTypeId == GeodeClassIds.CacheableBoolean)) { continue; } // null object does not work on server side during deserialization - if (valueTypeId == GemFireClassIds.CacheableNullString) + if (valueTypeId == GeodeClassIds.CacheableNullString) { continue; } @@ -1605,19 +1605,19 @@ namespace Apache.Geode.Client.UnitTests int index = 0; foreach (UInt32 valueTypeId in valueTypeIds) { - if ((valueTypeId == GemFireClassIds.CacheableASCIIStringHuge || - valueTypeId == GemFireClassIds.CacheableStringHuge) - && !(keyTypeId == GemFireClassIds.CacheableBoolean)) + if ((valueTypeId == GeodeClassIds.CacheableASCIIStringHuge || + valueTypeId == GeodeClassIds.CacheableStringHuge) + && !(keyTypeId == GeodeClassIds.CacheableBoolean)) { continue; } - if ((keyTypeId == GemFireClassIds.CacheableASCIIStringHuge || - keyTypeId == GemFireClassIds.CacheableStringHuge) - && !(valueTypeId == GemFireClassIds.CacheableBoolean)) + if ((keyTypeId == GeodeClassIds.CacheableASCIIStringHuge || + keyTypeId == GeodeClassIds.CacheableStringHuge) + && !(valueTypeId == GeodeClassIds.CacheableBoolean)) { continue; } - if (valueTypeId == GemFireClassIds.CacheableNullString) + if (valueTypeId == GeodeClassIds.CacheableNullString) { continue; } @@ -1713,20 +1713,20 @@ namespace Apache.Geode.Client.UnitTests int index = 0; foreach (UInt32 valueTypeId in valueTypeIds) { - if ((valueTypeId == GemFireClassIds.CacheableASCIIStringHuge || - valueTypeId == GemFireClassIds.CacheableStringHuge) - && !(keyTypeId == GemFireClassIds.CacheableBoolean)) + if ((valueTypeId == GeodeClassIds.CacheableASCIIStringHuge || + valueTypeId == GeodeClassIds.CacheableStringHuge) + && !(keyTypeId == GeodeClassIds.CacheableBoolean)) { continue; } - if ((keyTypeId == GemFireClassIds.CacheableASCIIStringHuge || - keyTypeId == GemFireClassIds.CacheableStringHuge) - && !(valueTypeId == GemFireClassIds.CacheableBoolean)) + if ((keyTypeId == GeodeClassIds.CacheableASCIIStringHuge || + keyTypeId == GeodeClassIds.CacheableStringHuge) + && !(valueTypeId == GeodeClassIds.CacheableBoolean)) { continue; } // null object does not work on server side during deserialization - if (valueTypeId == GemFireClassIds.CacheableNullString) + if (valueTypeId == GeodeClassIds.CacheableNullString) { continue; } @@ -2209,9 +2209,9 @@ namespace Apache.Geode.Client.UnitTests { ms.WriteByte((byte)(c & 0xff)); byte uByte = (byte)((c >> 8) & 0xff); - if(uByte != 0x00) + if (uByte != 0x00) ms.WriteByte(uByte); - } + } } return CacheableHelper.CRC32(ms.ToArray()); } @@ -2361,7 +2361,7 @@ namespace Apache.Geode.Client.UnitTests } wrapper = CacheableWrapperFactory.CreateInstance(obj); Assert.IsNotNull(wrapper, "CacheableObjectArrayWrapper.GetChecksum:" + - " Could not create an instance of typeId [{0}].", wrapper.TypeId ); + " Could not create an instance of typeId [{0}].", wrapper.TypeId); ckSum ^= wrapper.GetChecksum(obj); } return ckSum; @@ -2592,7 +2592,7 @@ namespace Apache.Geode.Client.UnitTests #region Static factory creation function public static CacheableKeyWrapper Create() - { + { return new PdxCDataWrapper(); } @@ -2639,12 +2639,13 @@ namespace Apache.Geode.Client.UnitTests public override void InitKey(int keyIndex, int maxSize) { //PdxCData value = CacheableHelper.RandPdxCData(); - PdxCData value = new PdxCData(keyIndex, keyIndex*2999); + PdxCData value = new PdxCData(keyIndex, keyIndex * 2999); m_cacheableObject = value; } } - public class TypesClass { + public class TypesClass + { private Object[,] typesArray; private Object NullItem = null; public TypesClass() @@ -2713,7 +2714,7 @@ namespace Apache.Geode.Client.UnitTests { /*TypeIds.ObjectArrayId ,*/ new object[]{(object)0 , (object)1 , (object)2 , (object)3 , (object)4 , (object)5 , (object)6 , (object)7 }, new object[]{(object)0 , (object)1 , (object)2 , (object)3 , (object)4 , (object)5 , (object)6 , (object)7 }, new object[]{(object)0 , (object)1 , (object)2 , (object)3 , (object)4 , (object)5 , (object)6 , (object)7 }, new object[]{(object)0 , (object)1 , (object)2 , (object)3 , (object)4 , (object)5 , (object)6 , (object)7 }, new object[]{(object)0 , (object)1 , (object)2 , (object)3 , (object)4 , (object)5 , (object)6 , (object)7 }, new object[]{(object)0 , (object)1 , (object)2 , (object)3 , (object)4 , (object)5 , (object)6 , (object)7 }, new object[]{(object)0 , (object)1 , (object)2 , (object)3 , (object)4 , (object)5 , (object)6 , (object)7 }, new object[]{(object)0 , (object)1 , (object)2 , (object)3 , (object)4 , (object)5 , (object)6 , (object)7 } } - }; + }; } public enum TypeIds @@ -2733,7 +2734,7 @@ namespace Apache.Geode.Client.UnitTests UlongId, UshortId, StringId, - ObjectId, + ObjectId, //These all array types will be values only. BoolArrayId, ByteArrayId, @@ -2775,7 +2776,7 @@ namespace Apache.Geode.Client.UnitTests { return NullItem; } - -}; + + }; #endregion } http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/integration-test/CacheHelperN.cs ---------------------------------------------------------------------- diff --git a/src/clicache/integration-test/CacheHelperN.cs b/src/clicache/integration-test/CacheHelperN.cs index 83e17b5..5ca47bb 100644 --- a/src/clicache/integration-test/CacheHelperN.cs +++ b/src/clicache/integration-test/CacheHelperN.cs @@ -312,7 +312,7 @@ namespace Apache.Geode.Client.UnitTests private const string DefaultCacheName = "cachetest"; private const string JavaServerName = "gfsh.bat"; - private const string GemFireName = "gfsh.bat"; + private const string GeodeName = "gfsh.bat"; private static int JavaMcastPort = -1; private const string JavaServerStartArgs = "start server --J=-Xmx512m --J=-Xms128m --J=-XX:+UseConcMarkSweepGC --J=-XX:+UseParNewGC --J=-Xss256k --cache-xml-file="; @@ -520,12 +520,12 @@ namespace Apache.Geode.Client.UnitTests public static void InitConfigForDurable_Pool2(string locators, int redundancyLevel, string durableClientId, int durableTimeout, int ackInterval, string poolName) { - Properties<string, string> config = new Properties<string, string>(); - config.Insert("durable-client-id", durableClientId); - config.Insert("durable-timeout", durableTimeout.ToString()); - InitConfig(config, null); - CreatePool<object, object>(poolName, locators, (string)null, redundancyLevel, true, - ackInterval, 300); + Properties<string, string> config = new Properties<string, string>(); + config.Insert("durable-client-id", durableClientId); + config.Insert("durable-timeout", durableTimeout.ToString()); + InitConfig(config, null); + CreatePool<object, object>(poolName, locators, (string)null, redundancyLevel, true, + ackInterval, 300); } public static void InitConfigForConflation(string durableClientId, string conflation) @@ -584,7 +584,8 @@ namespace Apache.Geode.Client.UnitTests createDuplicateXMLFile(cacheXml, duplicateXMLFile); cacheXml = duplicateXMLFile; } - if (config == null) { + if (config == null) + { config = new Properties<string, string>(); } if (m_extraPropertiesFile != null) @@ -919,14 +920,14 @@ namespace Apache.Geode.Client.UnitTests regionFactory.SetCachingEnabled(caching); if (resolver != null) - { + { Util.Log("resolver is attached {0}", resolver); regionFactory.SetPartitionResolver(resolver); } else { Util.Log("resolver is null {0}", resolver); - } + } PoolFactory/*<TKey, TVal>*/ poolFactory = PoolManager/*<TKey, TVal>*/.CreateFactory(); @@ -1026,7 +1027,7 @@ namespace Apache.Geode.Client.UnitTests fact.SetMultiuserAuthentication(isMultiuserMode); fact.SetPRSingleHopEnabled(prSingleHop); fact.SetThreadLocalConnections(threadLocal); - Util.Log("SingleHop set to {0}" , prSingleHop ); + Util.Log("SingleHop set to {0}", prSingleHop); Util.Log("ThreadLocal = {0} ", threadLocal); Util.Log("numConnections set to {0}", numConnections); if (numConnections >= 0) @@ -1865,7 +1866,7 @@ namespace Apache.Geode.Client.UnitTests if (m_localServer) { Process javaProc; - string locatorPath = m_gfeDir + PathSep + "bin" + PathSep + GemFireName; + string locatorPath = m_gfeDir + PathSep + "bin" + PathSep + GeodeName; Util.Log("Starting locator {0} in directory {1}.", locatorNum, startDir); string serverName = "Locator" + Util.Rand(64687687).ToString(); if (startDir != null) @@ -1877,7 +1878,7 @@ namespace Apache.Geode.Client.UnitTests } try { - TextWriter tw = new StreamWriter(Directory.GetCurrentDirectory() + "\\" + startDir + "\\gemfire.properties", false); + TextWriter tw = new StreamWriter(Directory.GetCurrentDirectory() + "\\" + startDir + "\\geode.properties", false); tw.WriteLine("locators=localhost[{0}],localhost[{1}],localhost[{2}]", LOCATOR_PORT_1, LOCATOR_PORT_2, LOCATOR_PORT_3); if (ssl) { @@ -1932,7 +1933,7 @@ namespace Apache.Geode.Client.UnitTests StreamReader outSr = javaProc.StandardOutput; // Wait for cache server to start bool started = javaProc.WaitForExit(MaxWaitMillis); - Util.Log("Output from '{0} {1}':{2}{3}", GemFireName, locatorArgs, + Util.Log("Output from '{0} {1}':{2}{3}", GeodeName, locatorArgs, Environment.NewLine, outSr.ReadToEnd()); outSr.Close(); if (!started) @@ -1955,7 +1956,7 @@ namespace Apache.Geode.Client.UnitTests } } - + static int getLocatorPort(int num) { @@ -1979,7 +1980,7 @@ namespace Apache.Geode.Client.UnitTests if (m_localServer) { Process javaProc; - string locatorPath = m_gfeDir + PathSep + "bin" + PathSep + GemFireName; + string locatorPath = m_gfeDir + PathSep + "bin" + PathSep + GeodeName; string serverName = "Locator" + Util.Rand(64687687).ToString(); Util.Log("Starting locator {0} in directory {1}.", locatorNum, startDir); if (startDir != null) @@ -1991,7 +1992,7 @@ namespace Apache.Geode.Client.UnitTests } try { - TextWriter tw = new StreamWriter(Directory.GetCurrentDirectory() + "\\" + startDir + "\\gemfire.properties", false); + TextWriter tw = new StreamWriter(Directory.GetCurrentDirectory() + "\\" + startDir + "\\geode.properties", false); //tw.WriteLine("locators=localhost[{0}],localhost[{1}],localhost[{2}]", LOCATOR_PORT_1, LOCATOR_PORT_2, LOCATOR_PORT_3); tw.WriteLine("distributed-system-id=" + dsId); tw.WriteLine("mcast-port=0"); @@ -2034,7 +2035,7 @@ namespace Apache.Geode.Client.UnitTests StreamReader outSr = javaProc.StandardOutput; // Wait for cache server to start bool started = javaProc.WaitForExit(MaxWaitMillis); - Util.Log("Output from '{0} {1}':{2}{3}", GemFireName, locatorArgs, + Util.Log("Output from '{0} {1}':{2}{3}", GeodeName, locatorArgs, Environment.NewLine, outSr.ReadToEnd()); outSr.Close(); if (!started) @@ -2091,7 +2092,7 @@ namespace Apache.Geode.Client.UnitTests public static void StartJavaServerWithLocator_MDS(int serverNum, string startDir, int locatorNumber) { string extraServerArgs = "--locators="; - extraServerArgs += "localhost[" + getLocatorPort(locatorNumber) +"]"; + extraServerArgs += "localhost[" + getLocatorPort(locatorNumber) + "]"; StartJavaServer(serverNum, startDir, extraServerArgs); } @@ -2152,20 +2153,20 @@ namespace Apache.Geode.Client.UnitTests int port = 0; switch (serverNum) { - case 1: - port = HOST_PORT_1; - break; - case 2: - port = HOST_PORT_2; - break; - case 3: - port = HOST_PORT_3; - break; - case 4: - port = HOST_PORT_4; - break; - default: - throw new InvalidOperationException(); + case 1: + port = HOST_PORT_1; + break; + case 2: + port = HOST_PORT_2; + break; + case 3: + port = HOST_PORT_3; + break; + case 4: + port = HOST_PORT_4; + break; + default: + throw new InvalidOperationException(); } Util.Log("Starting server {0} in directory {1}.", serverNum, startDir); if (startDir != null) @@ -2235,7 +2236,7 @@ namespace Apache.Geode.Client.UnitTests { Util.Log("Stopping locator {0} in directory {1}.", locatorNum, startDir); Process javaStopProc; - string javaLocatorPath = m_gfeDir + PathSep + "bin" + PathSep + GemFireName; + string javaLocatorPath = m_gfeDir + PathSep + "bin" + PathSep + GeodeName; string sslArgs = String.Empty; if (ssl) { @@ -2245,7 +2246,7 @@ namespace Apache.Geode.Client.UnitTests sslArgs += " --J=-Djavax.net.ssl.trustStore=" + keystore + "/server_truststore.jks "; sslArgs += " --J=-Djavax.net.ssl.trustStorePassword=gemstone "; string propdir = startDir.Replace("--dir=", string.Empty).Trim(); - File.Copy(propdir + "/gemfire.properties", Directory.GetCurrentDirectory() + "/gemfire.properties", true); + File.Copy(propdir + "/geode.properties", Directory.GetCurrentDirectory() + "/geode.properties", true); } if (!Util.StartProcess(javaLocatorPath, LocatorStopArgs + startDir + sslArgs, false, null, true, false, false, true, out javaStopProc)) @@ -2257,7 +2258,7 @@ namespace Apache.Geode.Client.UnitTests StreamReader outSr = javaStopProc.StandardOutput; // Wait for cache server to stop bool stopped = javaStopProc.WaitForExit(MaxWaitMillis); - Util.Log("Output from '{0} stop-locator':{1}{2}", GemFireName, + Util.Log("Output from '{0} stop-locator':{1}{2}", GeodeName, Environment.NewLine, outSr.ReadToEnd()); outSr.Close(); if (!stopped) @@ -2266,7 +2267,7 @@ namespace Apache.Geode.Client.UnitTests } if (ssl) { - File.Delete(Directory.GetCurrentDirectory() + "/gemfire.properties"); + File.Delete(Directory.GetCurrentDirectory() + "/geode.properties"); } Assert.IsTrue(stopped, "Timed out waiting for " + "Java locator to stop.{0}Please check the locator logs.", @@ -2371,7 +2372,7 @@ namespace Apache.Geode.Client.UnitTests m_locators = null; } - + public static void KillJavaProcesses() { @@ -2387,17 +2388,17 @@ namespace Apache.Geode.Client.UnitTests int processId = Convert.ToInt32(item["ProcessId"].ToString()); string commandline = item["CommandLine"].ToString(); - Util.Log("processId:{0} name:{1}", item["ProcessId"],item["Name"]); - if (commandline.Contains("gemfire.jar")) + Util.Log("processId:{0} name:{1}", item["ProcessId"], item["Name"]); + if (commandline.Contains("geode.jar")) { - Util.Log("Killing gemfire process with id {0}", processId); + Util.Log("Killing geode process with id {0}", processId); Process proc = Process.GetProcessById(processId); proc.Kill(); proc.WaitForExit(); } else { - Util.Log("Process with id {0} is not gemfire process", processId); + Util.Log("Process with id {0} is not geode process", processId); } } catch (Exception e) http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/integration-test/CacheableWrapper.cs ---------------------------------------------------------------------- diff --git a/src/clicache/integration-test/CacheableWrapper.cs b/src/clicache/integration-test/CacheableWrapper.cs index 1e0927b..a77bd69 100644 --- a/src/clicache/integration-test/CacheableWrapper.cs +++ b/src/clicache/integration-test/CacheableWrapper.cs @@ -25,7 +25,7 @@ namespace Apache.Geode.Client.UnitTests using NUnit.Framework; /// <summary> - /// Interface class for wrappers of gemfire cacheable types. + /// Interface class for wrappers of geode cacheable types. /// </summary> /// <remarks> /// This interface has various useful functions like setting value randomly, @@ -61,7 +61,7 @@ namespace Apache.Geode.Client.UnitTests } public abstract void InitRandomValue(int maxSize); - + public abstract uint GetChecksum(IGFSerializable cacheableObject); public virtual uint GetChecksum() @@ -71,7 +71,7 @@ namespace Apache.Geode.Client.UnitTests } /// <summary> - /// Interface class for wrappers of gemfire cacheable key types. + /// Interface class for wrappers of geode cacheable key types. /// </summary> /// <remarks> /// This interface has various useful functions like setting value randomly, http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/integration-test/CacheableWrapperN.cs ---------------------------------------------------------------------- diff --git a/src/clicache/integration-test/CacheableWrapperN.cs b/src/clicache/integration-test/CacheableWrapperN.cs index 38975c3..6a79f46 100644 --- a/src/clicache/integration-test/CacheableWrapperN.cs +++ b/src/clicache/integration-test/CacheableWrapperN.cs @@ -22,11 +22,11 @@ using System.Runtime.Serialization; namespace Apache.Geode.Client.UnitTests { - + using NUnit.Framework; using Apache.Geode.Client; /// <summary> - /// Interface class for wrappers of gemfire cacheable types. + /// Interface class for wrappers of geode cacheable types. /// </summary> /// <remarks> /// This interface has various useful functions like setting value randomly, @@ -62,7 +62,7 @@ namespace Apache.Geode.Client.UnitTests } public abstract void InitRandomValue(int maxSize); - + public abstract uint GetChecksum(object cacheableObject); public virtual int GetHashCodeN(object cacheableObject) @@ -83,7 +83,7 @@ namespace Apache.Geode.Client.UnitTests } /// <summary> - /// Interface class for wrappers of gemfire cacheable key types. + /// Interface class for wrappers of geode cacheable key types. /// </summary> /// <remarks> /// This interface has various useful functions like setting value randomly, http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/integration-test/PutGetTestsN.cs ---------------------------------------------------------------------- diff --git a/src/clicache/integration-test/PutGetTestsN.cs b/src/clicache/integration-test/PutGetTestsN.cs index ed7c5b7..58b6dd7 100644 --- a/src/clicache/integration-test/PutGetTestsN.cs +++ b/src/clicache/integration-test/PutGetTestsN.cs @@ -478,11 +478,11 @@ namespace Apache.Geode.Client.UnitTests IRegion<TradeKey, Object> region = CacheHelper.GetRegion<TradeKey, Object>(rname); int nonSingleHopCount = 0, metadatarefreshCount = 0; int nonSingleHopCount1 = 0, metadatarefreshCount1 = 0; - Assert.IsNotNull(region, "DoPRSHTradeResolverTasks: null region."); + Assert.IsNotNull(region, "DoPRSHTradeResolverTasks: null region."); for (int i = 0; i < 1000; i++) { try - { + { region[new TradeKey(i)] = "Value" + i; Util.Log("Put inside DoPRSHTradeResolverTasks successfull "); } @@ -515,14 +515,14 @@ namespace Apache.Geode.Client.UnitTests } Util.Log("nonSingleHopCount = {0} & metadatarefreshCount = {1} ", nonSingleHopCount, metadatarefreshCount); Assert.GreaterOrEqual(nonSingleHopCount, 1, "nonSingleHopCount should be GreaterOrEqual to 1"); - Assert.GreaterOrEqual(metadatarefreshCount, 1 , "metadatarefreshCount should be equal to 1"); + Assert.GreaterOrEqual(metadatarefreshCount, 1, "metadatarefreshCount should be equal to 1"); Util.Log("DoPRSHTradeResolverTasks WarmUp Task completed."); for (int i = 1000; i < 2000; i++) { try - { + { region[new TradeKey(i)] = "Value" + i; Util.Log("Put inside DoPRSHTradeResolverTasks successfull"); } @@ -604,7 +604,7 @@ namespace Apache.Geode.Client.UnitTests TradeKey[] filter = new TradeKey[901]; int j = 0; for (int i = 100; i < 1001; i++) - { + { filter[j] = new TradeKey(i); j++; } @@ -705,7 +705,7 @@ namespace Apache.Geode.Client.UnitTests Util.Log("DoPRSHFixedPartitionResolverTests Put Task completed nonSingleHopCount = {0} metadatarefreshCount = {1}.", nonSingleHopCount, metadatarefreshCount); Assert.Greater(nonSingleHopCount, 1, "nonSingleHopCount should be Greater than 1"); - Assert.Greater(metadatarefreshCount, 1, "metadatarefreshCount should be Greater than 1"); + Assert.Greater(metadatarefreshCount, 1, "metadatarefreshCount should be Greater than 1"); for (int i = 0; i < 1000; i++) { @@ -762,7 +762,7 @@ namespace Apache.Geode.Client.UnitTests } } Util.Log("DoPRSHFixedPartitionResolverTests All Task completed "); - Util.Log("nonSingleHopCount = {0} metadatarefreshCount = {1} .", nonSingleHopCount, metadatarefreshCount); + Util.Log("nonSingleHopCount = {0} metadatarefreshCount = {1} .", nonSingleHopCount, metadatarefreshCount); Util.Log("nonSingleHopCount1 = {0} metadatarefreshCount1 = {1} .", nonSingleHopCount1, metadatarefreshCount1); Assert.AreEqual(nonSingleHopCount, nonSingleHopCount1, "nonSingleHopCount should be equal to {0}", nonSingleHopCount); Assert.AreEqual(metadatarefreshCount, metadatarefreshCount1, "metadatarefreshCount should be equal to {0}", metadatarefreshCount); @@ -927,7 +927,7 @@ namespace Apache.Geode.Client.UnitTests Object actualValue = m_region[m_cKeys[keyIndex].CacheableKey]; if (actualValue == null) { - Assert.AreEqual(GemFireClassIds.CacheableNullString, + Assert.AreEqual(GeodeClassIds.CacheableNullString, m_cValues[keyIndex].TypeId, "Only null string should return a " + "null object"); } http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/integration-test/SerializationTestsN.cs ---------------------------------------------------------------------- diff --git a/src/clicache/integration-test/SerializationTestsN.cs b/src/clicache/integration-test/SerializationTestsN.cs index fa894b4..9a5dc2c 100644 --- a/src/clicache/integration-test/SerializationTestsN.cs +++ b/src/clicache/integration-test/SerializationTestsN.cs @@ -360,7 +360,7 @@ namespace Apache.Geode.Client.UnitTests public override int GetHashCode() { - return m_first.GetHashCode() ; + return m_first.GetHashCode(); } #region IPdxSerializable Members @@ -372,7 +372,7 @@ namespace Apache.Geode.Client.UnitTests } public void ToData(IPdxWriter writer) - { + { writer.WriteInt("m_first", m_first); writer.MarkIdentityField("m_first"); writer.WriteLong("m_second", m_second); @@ -380,9 +380,9 @@ namespace Apache.Geode.Client.UnitTests #endregion - - + + }; public class OtherType : IGFSerializable @@ -393,12 +393,12 @@ namespace Apache.Geode.Client.UnitTests public enum ExceptionType { None, - Gemfire, + Geode, System, // below are with inner exceptions - GemfireGemfire, - GemfireSystem, - SystemGemfire, + GeodeGeode, + GeodeSystem, + SystemGeode, SystemSystem } @@ -447,17 +447,17 @@ namespace Apache.Geode.Client.UnitTests { case ExceptionType.None: break; - case ExceptionType.Gemfire: + case ExceptionType.Geode: throw new GemFireIOException("Throwing an exception"); case ExceptionType.System: throw new IOException("Throwing an exception"); - case ExceptionType.GemfireGemfire: + case ExceptionType.GeodeGeode: throw new GemFireIOException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); - case ExceptionType.GemfireSystem: + case ExceptionType.GeodeSystem: throw new CacheServerException("Throwing an exception with inner " + "exception", new IOException("This is an inner exception")); - case ExceptionType.SystemGemfire: + case ExceptionType.SystemGeode: throw new ApplicationException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); case ExceptionType.SystemSystem: @@ -475,17 +475,17 @@ namespace Apache.Geode.Client.UnitTests { case ExceptionType.None: break; - case ExceptionType.Gemfire: + case ExceptionType.Geode: throw new GemFireIOException("Throwing an exception"); case ExceptionType.System: throw new IOException("Throwing an exception"); - case ExceptionType.GemfireGemfire: + case ExceptionType.GeodeGeode: throw new GemFireIOException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); - case ExceptionType.GemfireSystem: + case ExceptionType.GeodeSystem: throw new CacheServerException("Throwing an exception with inner " + "exception", new IOException("This is an inner exception")); - case ExceptionType.SystemGemfire: + case ExceptionType.SystemGeode: throw new ApplicationException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); case ExceptionType.SystemSystem: @@ -521,7 +521,7 @@ namespace Apache.Geode.Client.UnitTests { return m_struct.First.GetHashCode() ^ m_struct.Second.GetHashCode(); } - + public override bool Equals(object obj) { OtherType ot = obj as OtherType; @@ -541,15 +541,15 @@ namespace Apache.Geode.Client.UnitTests public enum ExceptionType { None, - Gemfire, + Geode, System, // below are with inner exceptions - GemfireGemfire, - GemfireSystem, - SystemGemfire, + GeodeGeode, + GeodeSystem, + SystemGeode, SystemSystem } - + public OtherType2() { m_exType = ExceptionType.None; @@ -595,17 +595,17 @@ namespace Apache.Geode.Client.UnitTests { case ExceptionType.None: break; - case ExceptionType.Gemfire: + case ExceptionType.Geode: throw new GemFireIOException("Throwing an exception"); case ExceptionType.System: throw new IOException("Throwing an exception"); - case ExceptionType.GemfireGemfire: + case ExceptionType.GeodeGeode: throw new GemFireIOException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); - case ExceptionType.GemfireSystem: + case ExceptionType.GeodeSystem: throw new CacheServerException("Throwing an exception with inner " + "exception", new IOException("This is an inner exception")); - case ExceptionType.SystemGemfire: + case ExceptionType.SystemGeode: throw new ApplicationException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); case ExceptionType.SystemSystem: @@ -623,17 +623,17 @@ namespace Apache.Geode.Client.UnitTests { case ExceptionType.None: break; - case ExceptionType.Gemfire: + case ExceptionType.Geode: throw new GemFireIOException("Throwing an exception"); case ExceptionType.System: throw new IOException("Throwing an exception"); - case ExceptionType.GemfireGemfire: + case ExceptionType.GeodeGeode: throw new GemFireIOException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); - case ExceptionType.GemfireSystem: + case ExceptionType.GeodeSystem: throw new CacheServerException("Throwing an exception with inner " + "exception", new IOException("This is an inner exception")); - case ExceptionType.SystemGemfire: + case ExceptionType.SystemGeode: throw new ApplicationException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); case ExceptionType.SystemSystem: @@ -690,12 +690,12 @@ namespace Apache.Geode.Client.UnitTests public enum ExceptionType { None, - Gemfire, + Geode, System, // below are with inner exceptions - GemfireGemfire, - GemfireSystem, - SystemGemfire, + GeodeGeode, + GeodeSystem, + SystemGeode, SystemSystem } @@ -744,17 +744,17 @@ namespace Apache.Geode.Client.UnitTests { case ExceptionType.None: break; - case ExceptionType.Gemfire: + case ExceptionType.Geode: throw new GemFireIOException("Throwing an exception"); case ExceptionType.System: throw new IOException("Throwing an exception"); - case ExceptionType.GemfireGemfire: + case ExceptionType.GeodeGeode: throw new GemFireIOException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); - case ExceptionType.GemfireSystem: + case ExceptionType.GeodeSystem: throw new CacheServerException("Throwing an exception with inner " + "exception", new IOException("This is an inner exception")); - case ExceptionType.SystemGemfire: + case ExceptionType.SystemGeode: throw new ApplicationException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); case ExceptionType.SystemSystem: @@ -772,17 +772,17 @@ namespace Apache.Geode.Client.UnitTests { case ExceptionType.None: break; - case ExceptionType.Gemfire: + case ExceptionType.Geode: throw new GemFireIOException("Throwing an exception"); case ExceptionType.System: throw new IOException("Throwing an exception"); - case ExceptionType.GemfireGemfire: + case ExceptionType.GeodeGeode: throw new GemFireIOException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); - case ExceptionType.GemfireSystem: + case ExceptionType.GeodeSystem: throw new CacheServerException("Throwing an exception with inner " + "exception", new IOException("This is an inner exception")); - case ExceptionType.SystemGemfire: + case ExceptionType.SystemGeode: throw new ApplicationException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); case ExceptionType.SystemSystem: @@ -838,12 +838,12 @@ namespace Apache.Geode.Client.UnitTests public enum ExceptionType { None, - Gemfire, + Geode, System, // below are with inner exceptions - GemfireGemfire, - GemfireSystem, - SystemGemfire, + GeodeGeode, + GeodeSystem, + SystemGeode, SystemSystem } @@ -892,17 +892,17 @@ namespace Apache.Geode.Client.UnitTests { case ExceptionType.None: break; - case ExceptionType.Gemfire: + case ExceptionType.Geode: throw new GemFireIOException("Throwing an exception"); case ExceptionType.System: throw new IOException("Throwing an exception"); - case ExceptionType.GemfireGemfire: + case ExceptionType.GeodeGeode: throw new GemFireIOException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); - case ExceptionType.GemfireSystem: + case ExceptionType.GeodeSystem: throw new CacheServerException("Throwing an exception with inner " + "exception", new IOException("This is an inner exception")); - case ExceptionType.SystemGemfire: + case ExceptionType.SystemGeode: throw new ApplicationException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); case ExceptionType.SystemSystem: @@ -920,17 +920,17 @@ namespace Apache.Geode.Client.UnitTests { case ExceptionType.None: break; - case ExceptionType.Gemfire: + case ExceptionType.Geode: throw new GemFireIOException("Throwing an exception"); case ExceptionType.System: throw new IOException("Throwing an exception"); - case ExceptionType.GemfireGemfire: + case ExceptionType.GeodeGeode: throw new GemFireIOException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); - case ExceptionType.GemfireSystem: + case ExceptionType.GeodeSystem: throw new CacheServerException("Throwing an exception with inner " + "exception", new IOException("This is an inner exception")); - case ExceptionType.SystemGemfire: + case ExceptionType.SystemGeode: throw new ApplicationException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); case ExceptionType.SystemSystem: @@ -987,12 +987,12 @@ namespace Apache.Geode.Client.UnitTests public enum ExceptionType { None, - Gemfire, + Geode, System, // below are with inner exceptions - GemfireGemfire, - GemfireSystem, - SystemGemfire, + GeodeGeode, + GeodeSystem, + SystemGeode, SystemSystem } @@ -1041,17 +1041,17 @@ namespace Apache.Geode.Client.UnitTests { case ExceptionType.None: break; - case ExceptionType.Gemfire: + case ExceptionType.Geode: throw new GemFireIOException("Throwing an exception"); case ExceptionType.System: throw new IOException("Throwing an exception"); - case ExceptionType.GemfireGemfire: + case ExceptionType.GeodeGeode: throw new GemFireIOException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); - case ExceptionType.GemfireSystem: + case ExceptionType.GeodeSystem: throw new CacheServerException("Throwing an exception with inner " + "exception", new IOException("This is an inner exception")); - case ExceptionType.SystemGemfire: + case ExceptionType.SystemGeode: throw new ApplicationException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); case ExceptionType.SystemSystem: @@ -1069,17 +1069,17 @@ namespace Apache.Geode.Client.UnitTests { case ExceptionType.None: break; - case ExceptionType.Gemfire: + case ExceptionType.Geode: throw new GemFireIOException("Throwing an exception"); case ExceptionType.System: throw new IOException("Throwing an exception"); - case ExceptionType.GemfireGemfire: + case ExceptionType.GeodeGeode: throw new GemFireIOException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); - case ExceptionType.GemfireSystem: + case ExceptionType.GeodeSystem: throw new CacheServerException("Throwing an exception with inner " + "exception", new IOException("This is an inner exception")); - case ExceptionType.SystemGemfire: + case ExceptionType.SystemGeode: throw new ApplicationException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); case ExceptionType.SystemSystem: @@ -1136,12 +1136,12 @@ namespace Apache.Geode.Client.UnitTests public enum ExceptionType { None, - Gemfire, + Geode, System, // below are with inner exceptions - GemfireGemfire, - GemfireSystem, - SystemGemfire, + GeodeGeode, + GeodeSystem, + SystemGeode, SystemSystem } @@ -1190,17 +1190,17 @@ namespace Apache.Geode.Client.UnitTests { case ExceptionType.None: break; - case ExceptionType.Gemfire: + case ExceptionType.Geode: throw new GemFireIOException("Throwing an exception"); case ExceptionType.System: throw new IOException("Throwing an exception"); - case ExceptionType.GemfireGemfire: + case ExceptionType.GeodeGeode: throw new GemFireIOException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); - case ExceptionType.GemfireSystem: + case ExceptionType.GeodeSystem: throw new CacheServerException("Throwing an exception with inner " + "exception", new IOException("This is an inner exception")); - case ExceptionType.SystemGemfire: + case ExceptionType.SystemGeode: throw new ApplicationException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); case ExceptionType.SystemSystem: @@ -1218,17 +1218,17 @@ namespace Apache.Geode.Client.UnitTests { case ExceptionType.None: break; - case ExceptionType.Gemfire: + case ExceptionType.Geode: throw new GemFireIOException("Throwing an exception"); case ExceptionType.System: throw new IOException("Throwing an exception"); - case ExceptionType.GemfireGemfire: + case ExceptionType.GeodeGeode: throw new GemFireIOException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); - case ExceptionType.GemfireSystem: + case ExceptionType.GeodeSystem: throw new CacheServerException("Throwing an exception with inner " + "exception", new IOException("This is an inner exception")); - case ExceptionType.SystemGemfire: + case ExceptionType.SystemGeode: throw new ApplicationException("Throwing an exception with inner " + "exception", new CacheServerException("This is an inner exception")); case ExceptionType.SystemSystem:
