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 2017/11/09 16:19:57 UTC

[geode] branch whitelist_wip updated: Whitelist WIP: Add services and serializable tests to modules.

This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a commit to branch whitelist_wip
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/whitelist_wip by this push:
     new 69b5996  Whitelist WIP: Add services and serializable tests to modules.
69b5996 is described below

commit 69b599612f0ae446d19128fb9bedad6848ac3709
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Wed Nov 8 15:44:33 2017 -0800

    Whitelist WIP: Add services and serializable tests to modules.
    
    Also sort imports and clean up files
---
 .../geode/internal/InternalDataSerializer.java     |  6 +-
 .../geode/internal/sanctionedSerializables.txt     | 50 +++++++-------
 .../AnalyzeSerializablesJUnitTest.java             |  6 --
 .../apache/geode/codeAnalysis/excludedClasses.txt  | 78 +++++++++++-----------
 .../geode/internal/CQDistributedSystemService.java | 40 +++++++++++
 ...e.distributed.internal.DistributedSystemService | 16 +++++
 .../geode/internal}/sanctionedSerializables.txt    |  0
 .../internal/WANDistributedSystemService.java      | 41 ++++++++++++
 ...e.distributed.internal.DistributedSystemService | 15 +++++
 .../geode/internal}/sanctionedSerializables.txt    |  0
 .../geode/internal}/sanctionedSerializables.txt    |  0
 .../apache/geode/codeAnalysis/excludedClasses.txt  |  2 +
 .../org/apache/geode/codeAnalysis/openBugs.txt     |  0
 .../codeAnalysis/sanctionedDataSerializables.txt   |  0
 14 files changed, 180 insertions(+), 74 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
index c9352a2..1c67cc6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
@@ -267,9 +267,8 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
    */
   public static Collection<String> loadClassNames(File sanctionedSerializables) throws IOException {
     Collection<String> result = new ArrayList(1000);
-    FileReader fr = null;
-    fr = new FileReader(sanctionedSerializables);
-    try (BufferedReader in = new BufferedReader(fr)) {
+    try (FileReader fr = new FileReader(sanctionedSerializables);
+         BufferedReader in = new BufferedReader(fr)) {
       String line;
       while ((line = in.readLine()) != null) {
         line = line.trim();
@@ -281,7 +280,6 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
         }
       }
     }
-    fr.close();
     return result;
 
   }
diff --git a/geode-core/src/main/resources/org/apache/geode/internal/sanctionedSerializables.txt b/geode-core/src/main/resources/org/apache/geode/internal/sanctionedSerializables.txt
old mode 100755
new mode 100644
index 403929e..b8f8682
--- a/geode-core/src/main/resources/org/apache/geode/internal/sanctionedSerializables.txt
+++ b/geode-core/src/main/resources/org/apache/geode/internal/sanctionedSerializables.txt
@@ -154,8 +154,8 @@ org/apache/geode/cache/query/TypeMismatchException,true,4205901708655503775
 org/apache/geode/cache/query/internal/CompiledSelect$DataContainerType,false,isDistinct:boolean,isIgnoreOrderBy:boolean,isOrdered:boolean,isStructType:boolean
 org/apache/geode/cache/query/internal/CompiledSelect$NullIteratorException,false
 org/apache/geode/cache/query/internal/CompiledSortCriterion$1,false,this$0:org/apache/geode/cache/query/internal/CompiledSortCriterion
-org/apache/geode/cache/query/internal/ObjectIntHashMap,true,7718697444988416372,hashingStrategy:org/apache/geode/cache/query/internal/HashingStrategy,loadFactor:float,threshold:int
 org/apache/geode/cache/query/internal/ObjectIntHashMap$IntHashMapStrategy,false,this$0:org/apache/geode/cache/query/internal/ObjectIntHashMap
+org/apache/geode/cache/query/internal/ObjectIntHashMap,true,7718697444988416372,hashingStrategy:org/apache/geode/cache/query/internal/HashingStrategy,loadFactor:float,threshold:int
 org/apache/geode/cache/query/internal/QueryExecutionCanceledException,true,-2699578956684551688
 org/apache/geode/cache/query/internal/StructBag$ObjectArrayHashingStrategy,false
 org/apache/geode/cache/query/internal/index/IMQException,true,-5012914292321850775
@@ -231,8 +231,8 @@ org/apache/geode/distributed/internal/locks/DistributedMemberLock$LockReentryPol
 org/apache/geode/distributed/internal/locks/LockGrantorDestroyedException,true,-3540124531032570817
 org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave$ViewAbandonedException,false
 org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage$messageType,false
-org/apache/geode/internal/ConfigSource,true,-4097017272431018553,description:java/lang/String,type:org/apache/geode/internal/ConfigSource$Type
 org/apache/geode/internal/ConfigSource$Type,false
+org/apache/geode/internal/ConfigSource,true,-4097017272431018553,description:java/lang/String,type:org/apache/geode/internal/ConfigSource$Type
 org/apache/geode/internal/CopyOnWriteHashSet,true,8591978652141659932
 org/apache/geode/internal/DSFIDNotFoundException,true,130596009484324655,dsfid:int,versionOrdinal:short
 org/apache/geode/internal/InternalDataSerializer$SERIALIZATION_VERSION,false
@@ -241,6 +241,7 @@ org/apache/geode/internal/SystemAdmin$CombinedResources,false
 org/apache/geode/internal/admin/CompoundEntrySnapshot,true,5776382582897895718,allUserAttributes:java/util/Set,allValues:java/util/Set,hitRatio:float,hitRatioSum:double,hitResponders:long,lastAccessTime:long,lastModifiedTime:long,name:java/lang/Object,numHits:long,numMisses:long
 org/apache/geode/internal/admin/CompoundRegionSnapshot,true,6295026394298398004,allCacheLoaders:java/util/Set,allCacheWriters:java/util/Set,allCapControllers:java/util/Set,allConcLevels:java/util/Set,allCustomIdle:java/util/HashSet,allCustomTtl:java/util/HashSet,allDataPolicies:java/util/Set,allEntryIdleTimeout:java/util/Set,allEntryTtl:java/util/Set,allInitialCaps:java/util/Set,allKeyConstraints:java/util/Set,allListeners:java/util/Set,allLoadFactors:java/util/Set,allRegionIdleTimeout:j [...]
 org/apache/geode/internal/admin/StatAlert,true,5725457607122449170,definitionId:int,time:java/util/Date,values:java/lang/Number[]
+org/apache/geode/internal/admin/remote/EntryValueNodeImpl,false,fields:org/apache/geode/internal/admin/remote/EntryValueNodeImpl[],name:java/lang/String,primitive:boolean,primitiveVal:java/lang/Object,type:java/lang/String
 org/apache/geode/internal/cache/BucketAdvisor$SetFromMap,true,2454657854757543876,m:java/util/Map
 org/apache/geode/internal/cache/BucketNotFoundException,true,2898657229184289911
 org/apache/geode/internal/cache/BucketRegion$SizeOp,false
@@ -279,8 +280,8 @@ org/apache/geode/internal/cache/PartitionedRegionException,true,5113786059279106
 org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator$MemberResultsList,false,isLastChunkReceived:boolean
 org/apache/geode/internal/cache/PartitionedRegionStatus,true,-6755318987122602065,numberOfLocalEntries:int
 org/apache/geode/internal/cache/PrimaryBucketException,true,1
-org/apache/geode/internal/cache/PutAllPartialResultException,true,2411654400733621071,result:org/apache/geode/internal/cache/PutAllPartialResultException$PutAllPartialResult
 org/apache/geode/internal/cache/PutAllPartialResultException$PutAllPartialResult,true,-2168767259323206954,firstCauseOfFailure:java/lang/Exception,firstFailedKey:java/lang/Object,succeededKeys:org/apache/geode/internal/cache/tier/sockets/VersionedObjectList,totalMapSize:int
+org/apache/geode/internal/cache/PutAllPartialResultException,true,2411654400733621071,result:org/apache/geode/internal/cache/PutAllPartialResultException$PutAllPartialResult
 org/apache/geode/internal/cache/RegionClearedException,true,1266503771775907997
 org/apache/geode/internal/cache/RegionQueueException,true,4159307586325821105
 org/apache/geode/internal/cache/RegionStatus,true,3442040750396350302,heapSize:long,numberOfEntries:int
@@ -343,8 +344,8 @@ org/apache/geode/internal/cache/wan/GatewaySenderException,true,8090143153569084
 org/apache/geode/internal/cache/wan/parallel/BucketRegionQueueUnavailableException,true,-1860388334938028312
 org/apache/geode/internal/cache/xmlcache/CacheXmlVersion,false,namespace:java/lang/String,publicId:java/lang/String,schemaLocation:java/lang/String,systemId:java/lang/String,version:java/lang/String
 org/apache/geode/internal/concurrent/AtomicLong5,true,-1915700199064062938
-org/apache/geode/internal/concurrent/CompactConcurrentHashSet2,true,7249069246763182397
 org/apache/geode/internal/concurrent/CompactConcurrentHashSet2$Segment,true,2249069246763182397,loadFactor:float
+org/apache/geode/internal/concurrent/CompactConcurrentHashSet2,true,7249069246763182397
 org/apache/geode/internal/concurrent/ConcurrentHashSet,true,-3338819662572203596,map:java/util/concurrent/ConcurrentHashMap
 org/apache/geode/internal/concurrent/LI,true,-6014738350371493969,className:java/lang/String,identityHashCode:int,lockedStackFrame:java/lang/StackTraceElement
 org/apache/geode/internal/config/ClusterConfigurationNotAvailableException,true,771319836094239284
@@ -363,9 +364,9 @@ org/apache/geode/internal/datasource/ManagedPoolCacheImpl,true,10646422717363997
 org/apache/geode/internal/datasource/PoolException,true,-6178632158204356727
 org/apache/geode/internal/datasource/TranxPoolCacheImpl,true,3295652525163658888,m_xads:javax/sql/XADataSource
 org/apache/geode/internal/hll/CardinalityMergeException,false
+org/apache/geode/internal/jta/TransactionManagerImpl$GlobalTransactionComparator,false
 org/apache/geode/internal/jta/TransactionManagerImpl,true,5033392316185449821,globalTransactionMap:java/util/Map,gtxSet:java/util/SortedSet,isActive:boolean,transactionMap:java/util/Map
 org/apache/geode/internal/jta/UserTransactionImpl,true,2994652455204901910,storedTimeOut:int,tm:javax/transaction/TransactionManager
-org/apache/geode/internal/memcached/Command,false
 org/apache/geode/internal/memcached/Command$1,false,processor:org/apache/geode/internal/memcached/CommandProcessor
 org/apache/geode/internal/memcached/Command$10,false,processor:org/apache/geode/internal/memcached/CommandProcessor
 org/apache/geode/internal/memcached/Command$11,false,processor:org/apache/geode/internal/memcached/CommandProcessor
@@ -400,7 +401,7 @@ org/apache/geode/internal/memcached/Command$6,false,processor:org/apache/geode/i
 org/apache/geode/internal/memcached/Command$7,false,processor:org/apache/geode/internal/memcached/CommandProcessor
 org/apache/geode/internal/memcached/Command$8,false,processor:org/apache/geode/internal/memcached/CommandProcessor
 org/apache/geode/internal/memcached/Command$9,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Reply,false
+org/apache/geode/internal/memcached/Command,false
 org/apache/geode/internal/memcached/Reply$1,false
 org/apache/geode/internal/memcached/Reply$2,false
 org/apache/geode/internal/memcached/Reply$3,false
@@ -410,13 +411,14 @@ org/apache/geode/internal/memcached/Reply$6,false
 org/apache/geode/internal/memcached/Reply$7,false
 org/apache/geode/internal/memcached/Reply$8,false
 org/apache/geode/internal/memcached/Reply$9,false
-org/apache/geode/internal/memcached/ResponseStatus,false
+org/apache/geode/internal/memcached/Reply,false
 org/apache/geode/internal/memcached/ResponseStatus$1,false
 org/apache/geode/internal/memcached/ResponseStatus$2,false
 org/apache/geode/internal/memcached/ResponseStatus$3,false
 org/apache/geode/internal/memcached/ResponseStatus$4,false
 org/apache/geode/internal/memcached/ResponseStatus$5,false
 org/apache/geode/internal/memcached/ResponseStatus$6,false
+org/apache/geode/internal/memcached/ResponseStatus,false
 org/apache/geode/internal/memcached/commands/ClientError,true,-2426928000696680541
 org/apache/geode/internal/offheap/MemoryBlock$State,false
 org/apache/geode/internal/offheap/OffHeapStorage$1,false
@@ -448,12 +450,12 @@ org/apache/geode/internal/util/Breadcrumbs$CrumbType,false
 org/apache/geode/internal/util/SingletonValue$ValueState,false
 org/apache/geode/internal/util/SunAPINotFoundException,true,75895915344106684
 org/apache/geode/internal/util/concurrent/CopyOnWriteHashMap,false,map:java/util/Map
-org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap,true,-7056732555635108300,compareValues:boolean,entryCreator:org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$HashEntryCreator,segmentMask:int,segmentShift:int,segments:org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$Segment[]
 org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$DefaultHashEntryCreator,true,3765680607280951726
 org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$IdentitySegment,true,3086228147110819882
 org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$Segment,true,-6972364566212065192,entryCreator:org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$HashEntryCreator,listUpdateLock:java/util/concurrent/locks/ReentrantReadWriteLock,loadFactor:float
 org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$SimpleReusableEntry,true,1591026397367910439,key:java/lang/Object,this$0:org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap,value:java/lang/Object
 org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$WriteThroughEntry,true,-6364816773849437756,this$0:org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap
+org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap,true,-7056732555635108300,compareValues:boolean,entryCreator:org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$HashEntryCreator,segmentMask:int,segmentShift:int,segments:org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$Segment[]
 org/apache/geode/internal/util/concurrent/ReentrantSemaphore,false,holdCount:java/lang/ThreadLocal
 org/apache/geode/internal/util/concurrent/StoppableCondition,true,-7091681525970431937,condition:java/util/concurrent/locks/Condition,stopper:org/apache/geode/CancelCriterion
 org/apache/geode/internal/util/concurrent/StoppableReentrantReadWriteLock,true,-1185707921434766946
@@ -470,28 +472,29 @@ org/apache/geode/management/internal/JmxManagerLocator$StartJmxManagerFunction,t
 org/apache/geode/management/internal/ManagementAgent$GemFireRMIServerSocketFactory,true,-811909050641332716,bindAddr:java/net/InetAddress
 org/apache/geode/management/internal/ManagementFunction,true,1,mbeanServer:javax/management/MBeanServer,notificationHub:org/apache/geode/management/internal/NotificationHub
 org/apache/geode/management/internal/NotificationKey,false,currentTime:long,objectName:javax/management/ObjectName
-org/apache/geode/management/internal/beans/QueryDataFunction,true,1
 org/apache/geode/management/internal/beans/QueryDataFunction$LocalQueryFunction,true,1,id:java/lang/String,optimizeForWrite:boolean,regionName:java/lang/String,showMembers:boolean,this$0:org/apache/geode/management/internal/beans/QueryDataFunction
 org/apache/geode/management/internal/beans/QueryDataFunction$QueryDataFunctionResult,true,1,compressedBytes:byte[],message:java/lang/String
+org/apache/geode/management/internal/beans/QueryDataFunction,true,1
 org/apache/geode/management/internal/beans/stats/StatType,false
 org/apache/geode/management/internal/cli/AbstractCliAroundInterceptor$Response,false,text:java/lang/String
 org/apache/geode/management/internal/cli/CliUtil$DeflaterInflaterData,true,1104813333595216795,data:byte[],dataLength:int
 org/apache/geode/management/internal/cli/domain/AsyncEventQueueDetails,true,1,batchSize:int,diskStoreName:java/lang/String,id:java/lang/String,listener:java/lang/String,listenerProperties:java/util/Properties,maxQueueMemory:int,persistent:boolean
 org/apache/geode/management/internal/cli/domain/CacheServerInfo,true,1,bindAddress:java/lang/String,isRunning:boolean,port:int
-org/apache/geode/management/internal/cli/domain/DataCommandResult,true,1,command:java/lang/String,error:java/lang/Throwable,errorString:java/lang/String,getResult:java/lang/Object,hasResultForAggregation:boolean,infoString:java/lang/String,inputKey:java/lang/Object,inputQuery:java/lang/Object,inputValue:java/lang/Object,keyClass:java/lang/String,limit:int,locateEntryLocations:java/util/List,locateEntryResult:org/apache/geode/management/internal/cli/domain/DataCommandResult$KeyInfo,operat [...]
+org/apache/geode/management/internal/cli/domain/DataCommandRequest,false,command:java/lang/String,key:java/lang/String,keyClass:java/lang/String,loadOnCacheMiss:boolean,principal:java/lang/Object,putIfAbsent:boolean,query:java/lang/String,recursive:boolean,regionName:java/lang/String,removeAllKeys:java/lang/String,value:java/lang/String,valueClass:java/lang/String
 org/apache/geode/management/internal/cli/domain/DataCommandResult$KeyInfo,false,host:java/lang/String,locations:java/util/ArrayList,memberId:java/lang/String,memberName:java/lang/String,pid:int
 org/apache/geode/management/internal/cli/domain/DataCommandResult$SelectResultRow,true,1,type:int,value:java/lang/Object
-org/apache/geode/management/internal/cli/domain/DiskStoreDetails,false,allowForceCompaction:java/lang/Boolean,asyncEventQueueDetailsSet:java/util/Set,autoCompact:java/lang/Boolean,cacheServerDetailsSet:java/util/Set,compactionThreshold:java/lang/Integer,diskDirDetailsSet:java/util/Set,diskUsageCriticalPercentage:java/lang/Float,diskUsageWarningPercentage:java/lang/Float,gatewayDetailsSet:java/util/Set,id:java/util/UUID,maxOplogSize:java/lang/Long,memberId:java/lang/String,memberName:java [...]
+org/apache/geode/management/internal/cli/domain/DataCommandResult,true,1,command:java/lang/String,error:java/lang/Throwable,errorString:java/lang/String,getResult:java/lang/Object,hasResultForAggregation:boolean,infoString:java/lang/String,inputKey:java/lang/Object,inputQuery:java/lang/Object,inputValue:java/lang/Object,keyClass:java/lang/String,limit:int,locateEntryLocations:java/util/List,locateEntryResult:org/apache/geode/management/internal/cli/domain/DataCommandResult$KeyInfo,operat [...]
 org/apache/geode/management/internal/cli/domain/DiskStoreDetails$AsyncEventQueueDetails,false,id:java/lang/String
 org/apache/geode/management/internal/cli/domain/DiskStoreDetails$CacheServerDetails,false,bindAddress:java/lang/String,hostName:java/lang/String,port:int
 org/apache/geode/management/internal/cli/domain/DiskStoreDetails$DiskDirDetails,false,absolutePath:java/lang/String,size:int
 org/apache/geode/management/internal/cli/domain/DiskStoreDetails$GatewayDetails,false,id:java/lang/String,persistent:boolean
 org/apache/geode/management/internal/cli/domain/DiskStoreDetails$RegionDetails,false,fullPath:java/lang/String,name:java/lang/String,overflowToDisk:boolean,persistent:boolean
+org/apache/geode/management/internal/cli/domain/DiskStoreDetails,false,allowForceCompaction:java/lang/Boolean,asyncEventQueueDetailsSet:java/util/Set,autoCompact:java/lang/Boolean,cacheServerDetailsSet:java/util/Set,compactionThreshold:java/lang/Integer,diskDirDetailsSet:java/util/Set,diskUsageCriticalPercentage:java/lang/Float,diskUsageWarningPercentage:java/lang/Float,gatewayDetailsSet:java/util/Set,id:java/util/UUID,maxOplogSize:java/lang/Long,memberId:java/lang/String,memberName:java [...]
 org/apache/geode/management/internal/cli/domain/DurableCqNamesResult,true,1,cqNames:java/util/List
 org/apache/geode/management/internal/cli/domain/EvictionAttributesInfo,true,1,evictionAction:java/lang/String,evictionAlgorithm:java/lang/String,evictionMaxValue:int,nonDefaultAttributes:java/util/Map
 org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo,true,1,isPrimary:boolean,numBuckets:int,partitionName:java/lang/String
-org/apache/geode/management/internal/cli/domain/IndexDetails,true,-2198907141534201288,fromClause:java/lang/String,indexName:java/lang/String,indexStatisticsDetails:org/apache/geode/management/internal/cli/domain/IndexDetails$IndexStatisticsDetails,indexType:org/apache/geode/cache/query/IndexType,indexedExpression:java/lang/String,isValid:boolean,memberId:java/lang/String,memberName:java/lang/String,projectionAttributes:java/lang/String,regionName:java/lang/String,regionPath:java/lang/String
 org/apache/geode/management/internal/cli/domain/IndexDetails$IndexStatisticsDetails,false,numberOfKeys:java/lang/Long,numberOfUpdates:java/lang/Long,numberOfValues:java/lang/Long,totalUpdateTime:java/lang/Long,totalUses:java/lang/Long
+org/apache/geode/management/internal/cli/domain/IndexDetails,true,-2198907141534201288,fromClause:java/lang/String,indexName:java/lang/String,indexStatisticsDetails:org/apache/geode/management/internal/cli/domain/IndexDetails$IndexStatisticsDetails,indexType:org/apache/geode/cache/query/IndexType,indexedExpression:java/lang/String,isValid:boolean,memberId:java/lang/String,memberName:java/lang/String,projectionAttributes:java/lang/String,regionName:java/lang/String,regionPath:java/lang/String
 org/apache/geode/management/internal/cli/domain/IndexInfo,true,1,indexName:java/lang/String,indexType:org/apache/geode/cache/query/IndexType,indexedExpression:java/lang/String,regionPath:java/lang/String
 org/apache/geode/management/internal/cli/domain/MemberConfigurationInfo,false,cacheAttributes:java/util/Map,cacheServerAttributes:java/util/List,gfePropsRuntime:java/util/Map,gfePropsSetFromFile:java/util/Map,gfePropsSetUsingApi:java/util/Map,gfePropsSetWithDefaults:java/util/Map,jvmInputArguments:java/util/List,pdxAttributes:java/util/Map,systemProperties:java/util/Properties
 org/apache/geode/management/internal/cli/domain/MemberInformation,true,1,cacheServerList:java/util/List,cacheXmlFilePath:java/lang/String,clientCount:int,cpuUsage:double,groups:java/lang/String,heapUsage:java/lang/String,host:java/lang/String,hostedRegions:java/util/Set,id:java/lang/String,initHeapSize:java/lang/String,isServer:boolean,locatorBindAddress:java/lang/String,locatorPort:int,locators:java/lang/String,logFilePath:java/lang/String,maxHeapSize:java/lang/String,name:java/lang/Str [...]
@@ -511,8 +514,8 @@ org/apache/geode/management/internal/cli/functions/AsyncEventQueueFunctionArgs,t
 org/apache/geode/management/internal/cli/functions/ChangeLogLevelFunction,true,1
 org/apache/geode/management/internal/cli/functions/CloseDurableClientFunction,true,1
 org/apache/geode/management/internal/cli/functions/CloseDurableCqFunction,true,1
-org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction,true,1
 org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction$ClientInfo,true,1,isDurable:java/lang/String,primaryServer:java/lang/String,secondaryServer:java/lang/String,this$0:org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction
+org/apache/geode/management/internal/cli/functions/ContinuousQueryFunction,true,1
 org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction,true,1
 org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunction,true,1
 org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction,true,1
@@ -524,10 +527,10 @@ org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction,true
 org/apache/geode/management/internal/cli/functions/DestroyIndexFunction,true,1
 org/apache/geode/management/internal/cli/functions/ExportConfigFunction,true,1
 org/apache/geode/management/internal/cli/functions/ExportDataFunction,true,1
-org/apache/geode/management/internal/cli/functions/ExportLogsFunction,true,1
 org/apache/geode/management/internal/cli/functions/ExportLogsFunction$Args,false,endTime:java/time/LocalDateTime,includeLogs:boolean,includeStats:boolean,logLevel:org/apache/logging/log4j/Level,startTime:java/time/LocalDateTime,thisLogLevelOnly:boolean
-org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction,true,4366812590788342070
+org/apache/geode/management/internal/cli/functions/ExportLogsFunction,true,1
 org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction$FetchRegionAttributesFunctionResult,true,-3970828263897978845,cacheListenerClasses:java/lang/String[],cacheLoaderClass:java/lang/String,cacheWriterClass:java/lang/String,regionAttributes:org/apache/geode/cache/RegionAttributes
+org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction,true,4366812590788342070
 org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction,true,1
 org/apache/geode/management/internal/cli/functions/GarbageCollectionFunction,true,1
 org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction,true,8746830191680509335
@@ -551,17 +554,17 @@ org/apache/geode/management/internal/cli/functions/ListFunctionFunction,true,1
 org/apache/geode/management/internal/cli/functions/ListIndexFunction,false
 org/apache/geode/management/internal/cli/functions/MemberRegionFunction,true,1
 org/apache/geode/management/internal/cli/functions/MembersForRegionFunction,true,8746830191680509335
-org/apache/geode/management/internal/cli/functions/NetstatFunction,true,1
 org/apache/geode/management/internal/cli/functions/NetstatFunction$NetstatFunctionArgument,true,1,lineSeparator:java/lang/String,withlsof:boolean
 org/apache/geode/management/internal/cli/functions/NetstatFunction$NetstatFunctionResult,true,1,compressedBytes:org/apache/geode/management/internal/cli/CliUtil$DeflaterInflaterData,headerInfo:java/lang/String,host:java/lang/String
+org/apache/geode/management/internal/cli/functions/NetstatFunction,true,1
 org/apache/geode/management/internal/cli/functions/RebalanceFunction,true,1
 org/apache/geode/management/internal/cli/functions/RegionAlterFunction,true,-4846425364943216425
 org/apache/geode/management/internal/cli/functions/RegionCreateFunction,true,8746830191680509335
 org/apache/geode/management/internal/cli/functions/RegionDestroyFunction,true,9172773671865750685
-org/apache/geode/management/internal/cli/functions/RegionFunctionArgs,true,-5158224572470173267,asyncEventQueueIds:java/util/Set,cacheListeners:java/util/Set,cacheLoader:java/lang/String,cacheWriter:java/lang/String,cloningEnabled:java/lang/Boolean,compressor:java/lang/String,concurrencyChecksEnabled:java/lang/Boolean,concurrencyLevel:java/lang/Integer,diskStore:java/lang/String,diskSynchronous:java/lang/Boolean,enableAsyncConflation:java/lang/Boolean,enableSubscriptionConflation:java/la [...]
-org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs,true,1474255033398008062,action:org/apache/geode/cache/ExpirationAction,time:java/lang/Integer,type:org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs$ExpirationFor
 org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs$ExpirationFor,false
+org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs,true,1474255033398008062,action:org/apache/geode/cache/ExpirationAction,time:java/lang/Integer,type:org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs$ExpirationFor
 org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$PartitionArgs,true,5907052187323280919,hasPartitionAttributes:boolean,isPartitionResolver:boolean,isSetPRLocalMaxMemory:boolean,isSetPRRecoveryDelay:boolean,isSetPRRedundantCopies:boolean,isSetPRStartupRecoveryDelay:boolean,isSetPRTotalMaxMemory:boolean,isSetPRTotalNumBuckets:boolean,partitionResolver:java/lang/String,prColocatedWith:java/lang/String,prLocalMaxMemory:int,prRecoveryDelay:long,prRedundantCopies:int,prSta [...]
+org/apache/geode/management/internal/cli/functions/RegionFunctionArgs,true,-5158224572470173267,asyncEventQueueIds:java/util/Set,cacheListeners:java/util/Set,cacheLoader:java/lang/String,cacheWriter:java/lang/String,cloningEnabled:java/lang/Boolean,compressor:java/lang/String,concurrencyChecksEnabled:java/lang/Boolean,concurrencyLevel:java/lang/Integer,diskStore:java/lang/String,diskSynchronous:java/lang/Boolean,enableAsyncConflation:java/lang/Boolean,enableSubscriptionConflation:java/la [...]
 org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunction,false
 org/apache/geode/management/internal/cli/functions/ShutDownFunction,true,1
 org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction,true,1
@@ -612,7 +615,6 @@ org/apache/geode/pdx/internal/PdxInstanceImpl,true,-1669268527103938431
 org/apache/geode/pdx/internal/PdxReaderImpl,true,-6094553093860427759,blobType:org/apache/geode/pdx/internal/PdxType,dis:org/apache/geode/pdx/internal/PdxInputStream
 org/apache/geode/pdx/internal/WritablePdxInstanceImpl,true,7398999150097596214,dirtyFields:java/lang/Object[]
 org/apache/geode/redis/internal/RedisCommandParserException,true,4707944288714910949
-org/apache/geode/redis/internal/RedisCommandType,false
 org/apache/geode/redis/internal/RedisCommandType$1,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
 org/apache/geode/redis/internal/RedisCommandType$10,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
 org/apache/geode/redis/internal/RedisCommandType$100,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
@@ -726,7 +728,7 @@ org/apache/geode/redis/internal/RedisCommandType$96,false,dataType:org/apache/ge
 org/apache/geode/redis/internal/RedisCommandType$97,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
 org/apache/geode/redis/internal/RedisCommandType$98,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
 org/apache/geode/redis/internal/RedisCommandType$99,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisDataType,false
+org/apache/geode/redis/internal/RedisCommandType,false
 org/apache/geode/redis/internal/RedisDataType$1,false
 org/apache/geode/redis/internal/RedisDataType$2,false
 org/apache/geode/redis/internal/RedisDataType$3,false
@@ -735,9 +737,9 @@ org/apache/geode/redis/internal/RedisDataType$5,false
 org/apache/geode/redis/internal/RedisDataType$6,false
 org/apache/geode/redis/internal/RedisDataType$7,false
 org/apache/geode/redis/internal/RedisDataType$8,false
+org/apache/geode/redis/internal/RedisDataType,false
 org/apache/geode/redis/internal/RedisDataTypeMismatchException,true,-2451663685348513870
 org/apache/geode/redis/internal/RegionCreationException,true,8416820139078312997
-org/apache/geode/redis/internal/executor/ListQuery,false
 org/apache/geode/redis/internal/executor/ListQuery$1,false
 org/apache/geode/redis/internal/executor/ListQuery$2,false
 org/apache/geode/redis/internal/executor/ListQuery$3,false
@@ -745,7 +747,7 @@ org/apache/geode/redis/internal/executor/ListQuery$4,false
 org/apache/geode/redis/internal/executor/ListQuery$5,false
 org/apache/geode/redis/internal/executor/ListQuery$6,false
 org/apache/geode/redis/internal/executor/ListQuery$7,false
-org/apache/geode/redis/internal/executor/SortedSetQuery,false
+org/apache/geode/redis/internal/executor/ListQuery,false
 org/apache/geode/redis/internal/executor/SortedSetQuery$1,false
 org/apache/geode/redis/internal/executor/SortedSetQuery$10,false
 org/apache/geode/redis/internal/executor/SortedSetQuery$11,false
@@ -791,11 +793,9 @@ org/apache/geode/redis/internal/executor/SortedSetQuery$6,false
 org/apache/geode/redis/internal/executor/SortedSetQuery$7,false
 org/apache/geode/redis/internal/executor/SortedSetQuery$8,false
 org/apache/geode/redis/internal/executor/SortedSetQuery$9,false
+org/apache/geode/redis/internal/executor/SortedSetQuery,false
 org/apache/geode/redis/internal/executor/list/ListExecutor$ListDirection,false
 org/apache/geode/security/AuthenticationFailedException,true,-8202866472279088879
 org/apache/geode/security/AuthenticationRequiredException,true,4675976651103154919
 org/apache/geode/security/GemFireSecurityException,true,3814254578203076926,cause:java/lang/Throwable
 org/apache/geode/security/NotAuthorizedException,true,419215768216387745,principal:java/security/Principal
-org/apache/geode/internal/admin/remote/EntryValueNodeImpl,false,fields:org/apache/geode/internal/admin/remote/EntryValueNodeImpl[],name:java/lang/String,primitive:boolean,primitiveVal:java/lang/Object,type:java/lang/String
-org/apache/geode/internal/jta/TransactionManagerImpl$GlobalTransactionComparator,false
-org/apache/geode/management/internal/cli/domain/DataCommandRequest,false,command:java/lang/String,key:java/lang/String,keyClass:java/lang/String,loadOnCacheMiss:boolean,principal:java/lang/Object,putIfAbsent:boolean,query:java/lang/String,recursive:boolean,regionName:java/lang/String,removeAllKeys:java/lang/String,value:java/lang/String,valueClass:java/lang/String
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
index 14d15ef..d6a661b 100644
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
@@ -358,12 +358,6 @@ public class AnalyzeSerializablesJUnitTest {
     }
   }
 
-  @Test
-  public void testSerializingForcedDisconnectException() throws Exception {
-    Throwable forcedDisconnectException = new ForcedDisconnectException("testing");
-    serializeAndDeserializeSanctionedObject(forcedDisconnectException);
-  }
-
   private void serializeAndDeserializeSanctionedObject(Object object) throws Exception {
     HeapDataOutputStream outputStream = new HeapDataOutputStream(Version.CURRENT);
     try {
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index 8c3bd33..b5228ae 100644
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -1,11 +1,46 @@
+
+org.apache.geode.internal.security.SecurableCommunicationChannel
+org/apache/geode/GemFireCacheException
+org/apache/geode/admin/AlertLevel
+org/apache/geode/cache/operations/internal/UpdateOnlyMap
 org/apache/geode/cache/query/internal/index/CompactRangeIndex$1
-org/apache/geode/internal/cache/tier/CommunicationMode
 org/apache/geode/distributed/LocatorLauncher$Command
 org/apache/geode/distributed/ServerLauncher$Command
+org/apache/geode/distributed/internal/DistributionConfigImpl
+org/apache/geode/distributed/internal/OverflowQueueWithDMStats
+org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats
+org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress
+org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager$BoundedLinkedHashMap
+org/apache/geode/distributed/internal/tcpserver/LocatorCancelException
+org/apache/geode/internal/AbstractConfig$SortedProperties
+org/apache/geode/internal/AvailablePort$Keeper
 org/apache/geode/internal/ExitCode
 org/apache/geode/internal/JarDeployer
+org/apache/geode/internal/ObjIdConcurrentMap
+org/apache/geode/internal/ObjIdConcurrentMap$Segment
+org/apache/geode/internal/admin/remote/DistributionLocatorId
 org/apache/geode/internal/cache/BackupLock
+org/apache/geode/internal/cache/DiskStoreMonitor$DiskState
+org/apache/geode/internal/cache/InitialImageOperation$GIITestHook
+org/apache/geode/internal/cache/Oplog$OPLOG_TYPE
+org/apache/geode/internal/cache/UserSpecifiedDiskStoreAttributes
+org/apache/geode/internal/cache/tier/CommunicationMode
+org/apache/geode/internal/cache/tier/InternalClientMembership$EventType
+org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl$ClientCqConcurrentMap
+org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl$CqNameToOpHashMap
+org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation
+org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation
+org/apache/geode/internal/datasource/FacetsJCAConnectionManagerImpl
 org/apache/geode/internal/exception/InvalidExecutionContextException
+org/apache/geode/internal/hll/HyperLogLog
+org/apache/geode/internal/hll/HyperLogLog$Builder
+org/apache/geode/internal/hll/HyperLogLog$HyperLogLogMergeException
+org/apache/geode/internal/hll/HyperLogLog$SerializationHolder
+org/apache/geode/internal/hll/HyperLogLogPlus
+org/apache/geode/internal/hll/HyperLogLogPlus$Builder
+org/apache/geode/internal/hll/HyperLogLogPlus$Format
+org/apache/geode/internal/hll/HyperLogLogPlus$HyperLogLogPlusMergeException
+org/apache/geode/internal/hll/HyperLogLogPlus$SerializationHolder
 org/apache/geode/internal/logging/log4j/FastLogger
 org/apache/geode/internal/logging/log4j/LocalizedMessage
 org/apache/geode/internal/logging/log4j/LogWriterAppenders$Identifier
@@ -16,6 +51,7 @@ org/apache/geode/internal/offheap/RefCountChangeInfo
 org/apache/geode/internal/process/ProcessStreamReader$ReadingMode
 org/apache/geode/internal/process/ProcessType
 org/apache/geode/internal/process/UnableToControlProcessException
+org/apache/geode/internal/security/shiro/GeodeAuthenticationToken
 org/apache/geode/internal/shared/NativeErrorException
 org/apache/geode/internal/shared/OSType
 org/apache/geode/internal/shared/OSType$1
@@ -24,46 +60,10 @@ org/apache/geode/internal/shared/OSType$3
 org/apache/geode/internal/shared/OSType$4
 org/apache/geode/internal/shared/OSType$5
 org/apache/geode/internal/shared/TCPSocketOptions
-org/apache/geode/internal/cache/tier/InternalClientMembership$EventType
-org/apache/geode/internal/util/concurrent/StoppableReadWriteLock
-org/apache/geode/distributed/internal/DistributionConfigImpl
-org/apache/geode/internal/cache/DiskStoreMonitor$DiskState
-org/apache/geode/internal/cache/UserSpecifiedDiskStoreAttributes
-org/apache/geode/internal/cache/Oplog$OPLOG_TYPE
-org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl$ClientCqConcurrentMap
-org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl$CqNameToOpHashMap
-org/apache/geode/internal/datasource/FacetsJCAConnectionManagerImpl
 org/apache/geode/internal/statistics/platform/LinuxProcFsStatistics$CPU
-org/apache/geode/cache/operations/internal/UpdateOnlyMap
+org/apache/geode/internal/tcp/VersionedByteBufferInputStream
+org/apache/geode/internal/util/concurrent/StoppableReadWriteLock
 org/apache/geode/security/ResourcePermission
 org/apache/geode/security/ResourcePermission$Operation
 org/apache/geode/security/ResourcePermission$Resource
 org/apache/geode/security/ResourcePermission$Target
-org/apache/geode/distributed/internal/tcpserver/LocatorCancelException
-org.apache.geode.internal.security.SecurableCommunicationChannel
-org/apache/geode/internal/security/shiro/GeodeAuthenticationToken
-org/apache/geode/internal/cache/InitialImageOperation$GIITestHook
-org/apache/geode/internal/AvailablePort$Keeper
-org/apache/geode/internal/admin/remote/DistributionLocatorId
-org/apache/geode/GemFireCacheException
-org/apache/geode/admin/AlertLevel
-org/apache/geode/distributed/internal/OverflowQueueWithDMStats
-org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats
-org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress
-org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager$BoundedLinkedHashMap
-org/apache/geode/internal/AbstractConfig$SortedProperties
-org/apache/geode/internal/ObjIdConcurrentMap
-org/apache/geode/internal/ObjIdConcurrentMap$Segment
-org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation
-org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation
-org/apache/geode/internal/hll/HyperLogLog
-org/apache/geode/internal/hll/HyperLogLog$Builder
-org/apache/geode/internal/hll/HyperLogLog$HyperLogLogMergeException
-org/apache/geode/internal/hll/HyperLogLog$SerializationHolder
-org/apache/geode/internal/hll/HyperLogLogPlus
-org/apache/geode/internal/hll/HyperLogLogPlus$Builder
-org/apache/geode/internal/hll/HyperLogLogPlus$Format
-org/apache/geode/internal/hll/HyperLogLogPlus$HyperLogLogPlusMergeException
-org/apache/geode/internal/hll/HyperLogLogPlus$SerializationHolder
-org/apache/geode/internal/tcp/VersionedByteBufferInputStream
-
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/CQDistributedSystemService.java b/geode-cq/src/main/java/org/apache/geode/internal/CQDistributedSystemService.java
new file mode 100644
index 0000000..df3a5df
--- /dev/null
+++ b/geode-cq/src/main/java/org/apache/geode/internal/CQDistributedSystemService.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+
+import org.apache.geode.distributed.internal.DistributedSystemService;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+
+public class CQDistributedSystemService implements DistributedSystemService {
+  @Override
+  public void init(InternalDistributedSystem internalDistributedSystem) {
+
+  }
+
+  @Override
+  public Class getInterface() {
+    return getClass();
+  }
+
+  @Override
+  public Collection<String> getSerializationWhitelist() throws IOException {
+    return InternalDataSerializer.loadClassNames(new File(getClass()
+        .getResource("sanctionedSerializables.txt").getFile()));
+  }
+}
diff --git a/geode-cq/src/main/resources/META-INF/services/org.apache.geode.distributed.internal.DistributedSystemService b/geode-cq/src/main/resources/META-INF/services/org.apache.geode.distributed.internal.DistributedSystemService
new file mode 100644
index 0000000..28be4b4
--- /dev/null
+++ b/geode-cq/src/main/resources/META-INF/services/org.apache.geode.distributed.internal.DistributedSystemService
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+org.apache.geode.distributed.internal.CQDistributedSystemService
+
diff --git a/geode-cq/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt b/geode-cq/src/main/resources/org/apache/geode/internal/sanctionedSerializables.txt
similarity index 100%
rename from geode-cq/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
rename to geode-cq/src/main/resources/org/apache/geode/internal/sanctionedSerializables.txt
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/WANDistributedSystemService.java b/geode-wan/src/main/java/org/apache/geode/internal/WANDistributedSystemService.java
new file mode 100644
index 0000000..677074c
--- /dev/null
+++ b/geode-wan/src/main/java/org/apache/geode/internal/WANDistributedSystemService.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+
+import org.apache.geode.distributed.internal.DistributedSystemService;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+
+public class WANDistributedSystemService implements DistributedSystemService
+{
+  @Override
+  public void init(InternalDistributedSystem internalDistributedSystem) {
+
+  }
+
+  @Override
+  public Class getInterface() {
+    return getClass();
+  }
+
+  @Override
+  public Collection<String> getSerializationWhitelist() throws IOException {
+    return InternalDataSerializer.loadClassNames(new File(getClass()
+        .getResource("sanctionedSerializables.txt").getFile()));
+  }
+}
diff --git a/geode-wan/src/main/resources/META-INF/services/org.apache.geode.distributed.internal.DistributedSystemService b/geode-wan/src/main/resources/META-INF/services/org.apache.geode.distributed.internal.DistributedSystemService
new file mode 100644
index 0000000..f62960b
--- /dev/null
+++ b/geode-wan/src/main/resources/META-INF/services/org.apache.geode.distributed.internal.DistributedSystemService
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+org.apache.geode.internal.WANDistributedSystemService
diff --git a/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt b/geode-wan/src/main/resources/org/apache/geode/internal/sanctionedSerializables.txt
similarity index 100%
copy from geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
copy to geode-wan/src/main/resources/org/apache/geode/internal/sanctionedSerializables.txt
diff --git a/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt b/geode-web-api/src/main/resources/org/apache/geode/internal/sanctionedSerializables.txt
old mode 100755
new mode 100644
similarity index 100%
copy from geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
copy to geode-web-api/src/main/resources/org/apache/geode/internal/sanctionedSerializables.txt
diff --git a/geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index 9d87a65..854a121 100644
--- a/geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++ b/geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -4,3 +4,5 @@ org/apache/geode/rest/internal/web/controllers/support/UpdateOp
 org/apache/geode/rest/internal/web/exception/MalformedJsonException
 org/apache/geode/rest/internal/web/exception/RegionNotFoundException
 org/apache/geode/rest/internal/web/exception/ResourceNotFoundException
+org/apache/geode/rest/internal/web/exception/DataTypeNotSupportedException
+org/apache/geode/rest/internal/web/exception/GemfireRestException
diff --git a/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt b/geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt
old mode 100755
new mode 100644
similarity index 100%
copy from geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
copy to geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt
diff --git a/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt b/geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
old mode 100755
new mode 100644
similarity index 100%
rename from geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
rename to geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].