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 23:16:52 UTC

[geode] branch whitelist_wip updated: whitelist wip

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 01886fb  whitelist wip
01886fb is described below

commit 01886fbe32ef099e327799c9d5c0373bf927da17
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Thu Nov 9 15:03:28 2017 -0800

    whitelist wip
    
    This addresses all of the problems in openBugs.txt, which now has no entries.
    
    Several of the old Admin API classes couldn't be fixed, such as DistributionConfigSnapshot.
    The old Admin API consequently will not work when a serialization filter is installed.
    
    A handful of functions in extensions/geode-modules were causing problems in web server
    testing and I modified them to be DataSerializable.
    
    DistributionConfigImpl is still in excludedClasses.txt but it should not be there and
    remain a Serializable.  We can move it back to sanctionedSerializables.txt when the
    old Admin API is deleted.
---
 .../geode/modules/util/BootstrappingFunction.java  | 12 +++++-
 .../geode/modules/util/CreateRegionFunction.java   | 17 +++++++-
 .../geode/modules/util/RegionSizeFunction.java     | 16 +++++++-
 .../TouchPartitionedRegionEntriesFunction.java     | 17 +++++++-
 .../util/TouchReplicatedRegionEntriesFunction.java | 17 +++++++-
 .../java/org/apache/geode/admin/GemFireHealth.java |  3 ++
 .../admin/internal/ConfigurationParameterImpl.java | 12 ------
 .../internal/ConfigurationParameterJmxImpl.java    |  5 ---
 .../org/apache/geode/cache/AttributesFactory.java  |  2 +-
 .../apache/geode/cache/RegionAccessException.java  |  8 +++-
 .../geode/cache/RegionDistributionException.java   |  8 +++-
 .../geode/internal/InternalDataSerializer.java     | 16 +++++++-
 .../pdx/internal/AutoSerializableManager.java      |  1 +
 .../geode/internal/sanctionedSerializables.txt     | 12 ------
 .../apache/geode/codeAnalysis/excludedClasses.txt  | 12 +++++-
 .../org/apache/geode/codeAnalysis/openBugs.txt     | 47 ----------------------
 16 files changed, 116 insertions(+), 89 deletions(-)

diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
index a0e3e85..84b67c5 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.modules.util;
 
+import org.apache.geode.DataSerializable;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.execute.Execution;
@@ -26,10 +27,13 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.MembershipListener;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
-public class BootstrappingFunction implements Function, MembershipListener {
+public class BootstrappingFunction implements Function, MembershipListener, DataSerializable {
 
   private static final long serialVersionUID = 1856043174458190605L;
 
@@ -182,4 +186,10 @@ public class BootstrappingFunction implements Function, MembershipListener {
   @Override
   public void quorumLost(Set<InternalDistributedMember> internalDistributedMembers,
       List<InternalDistributedMember> internalDistributedMembers2) {}
+
+  @Override
+  public void toData(DataOutput out) throws IOException {}
+
+  @Override
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {}
 }
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
index 4e9e9fd..09f866d 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
@@ -14,12 +14,17 @@
  */
 package org.apache.geode.modules.util;
 
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Properties;
 
+import javax.xml.crypto.Data;
+
+import org.apache.geode.DataSerializable;
 import org.apache.geode.InternalGemFireError;
 import org.apache.geode.cache.AttributesFactory;
 import org.apache.geode.cache.Cache;
@@ -42,7 +47,7 @@ import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
-public class CreateRegionFunction implements Function, Declarable {
+public class CreateRegionFunction implements Function, Declarable, DataSerializable {
 
   private static final long serialVersionUID = -9210226844302128969L;
 
@@ -259,5 +264,15 @@ public class CreateRegionFunction implements Function, Declarable {
     }
     return lockService;
   }
+
+  @Override
+  public void toData(DataOutput out) throws IOException {
+
+  }
+
+  @Override
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+
+  }
 }
 
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java
index bedfcba..d084068 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java
@@ -14,14 +14,18 @@
  */
 package org.apache.geode.modules.util;
 
+import org.apache.geode.DataSerializable;
 import org.apache.geode.cache.Declarable;
 import org.apache.geode.cache.execute.Function;
 import org.apache.geode.cache.execute.FunctionContext;
 import org.apache.geode.cache.execute.RegionFunctionContext;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 import java.util.Properties;
 
-public class RegionSizeFunction implements Function, Declarable {
+public class RegionSizeFunction implements Function, Declarable, DataSerializable {
 
   private static final long serialVersionUID = -2791590491585777990L;
 
@@ -50,4 +54,14 @@ public class RegionSizeFunction implements Function, Declarable {
 
   @Override
   public void init(Properties arg0) {}
+
+  @Override
+  public void toData(DataOutput out) throws IOException {
+
+  }
+
+  @Override
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+
+  }
 }
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java
index 9a3f5aa..ab8071c 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.modules.util;
 
+import org.apache.geode.DataSerializable;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.Declarable;
@@ -23,6 +24,9 @@ import org.apache.geode.cache.execute.FunctionContext;
 import org.apache.geode.cache.execute.RegionFunctionContext;
 import org.apache.geode.cache.partition.PartitionRegionHelper;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 import java.util.Properties;
 import java.util.Set;
 
@@ -30,7 +34,8 @@ import java.util.Set;
  * Touches the keys contained in the set of keys by performing a get on the partitioned region.
  *
  */
-public class TouchPartitionedRegionEntriesFunction implements Function, Declarable {
+public class TouchPartitionedRegionEntriesFunction
+    implements Function, Declarable, DataSerializable {
 
   private static final long serialVersionUID = -3700389655056961153L;
 
@@ -88,5 +93,15 @@ public class TouchPartitionedRegionEntriesFunction implements Function, Declarab
   }
 
   public void init(Properties properties) {}
+
+  @Override
+  public void toData(DataOutput out) throws IOException {
+
+  }
+
+  @Override
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+
+  }
 }
 
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java
index 3d2a037..96435ea 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.modules.util;
 
+import org.apache.geode.DataSerializable;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.Declarable;
@@ -21,6 +22,9 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.cache.execute.Function;
 import org.apache.geode.cache.execute.FunctionContext;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 import java.util.Properties;
 import java.util.Set;
 
@@ -29,7 +33,8 @@ import java.util.Set;
  * is a non-data-aware function invoked using onMembers or onServers.
  *
  */
-public class TouchReplicatedRegionEntriesFunction implements Function, Declarable {
+public class TouchReplicatedRegionEntriesFunction
+    implements Function, Declarable, DataSerializable {
 
   private static final long serialVersionUID = -7424895036162243564L;
 
@@ -85,5 +90,15 @@ public class TouchReplicatedRegionEntriesFunction implements Function, Declarabl
   }
 
   public void init(Properties properties) {}
+
+  @Override
+  public void toData(DataOutput out) throws IOException {
+
+  }
+
+  @Override
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+
+  }
 }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java b/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
index 1db839e..986e6e0 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
@@ -184,6 +184,9 @@ public interface GemFireHealth {
      * Returns the appropriate canonical instance of <code>Health</code>.
      */
     public Object readResolve() {
+      if (this.healthString == null) {
+        return null;
+      }
       if (this.healthString.equals(GOOD_STRING)) {
         return GemFireHealth.GOOD_HEALTH;
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
index 8e5707d..0b370da 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
@@ -255,21 +255,9 @@ public class ConfigurationParameterImpl implements org.apache.geode.admin.Config
    */
   protected void setInternalState(String description, Object value, Class type,
       boolean userModifiable) {
-    if (description == null || description.length() == 0) {
-      throw new IllegalArgumentException(
-          LocalizedStrings.ConfigurationParameterImpl_CONFIGURATIONPARAMETER_DESCRIPTION_MUST_BE_SPECIFIED
-              .toLocalizedString());
-    }
     this.description = description;
     this.type = type;
     this.userModifiable = userModifiable;
-
-    if (value == null) {
-      throw new IllegalArgumentException(
-          LocalizedStrings.ConfigurationParameterImpl_UNABLE_TO_SET_0_TO_NULL_VALUE
-              .toLocalizedString(getName()));
-    }
-
     this.value = value;
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
index f9add13..049273f 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
@@ -149,11 +149,6 @@ public class ConfigurationParameterJmxImpl
     Class inClass = (Class) in.readObject();
     boolean inUserModifiable = in.readBoolean();
 
-    Assert.assertTrue(inName != null);
-    Assert.assertTrue(inDescription != null);
-    Assert.assertTrue(inValue != null);
-    Assert.assertTrue(inClass != null);
-
     this.deserialized = true;
     this.name = inName;
     setInternalState(inDescription, inValue, inClass, inUserModifiable);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
index 0d59279..bc493ec 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
@@ -1530,7 +1530,7 @@ public class AttributesFactory<K, V> {
 
 
   private static class RegionAttributesImpl<K, V> extends UserSpecifiedRegionAttributes<K, V>
-      implements Cloneable, Serializable {
+      implements Cloneable {
     public Set<String> gatewaySenderIds;
     public Set<String> asyncEventQueueIds;
     private static final long serialVersionUID = -3663000883567530374L;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java b/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
index 125b73c..3934692 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
@@ -84,8 +84,12 @@ public class RegionAccessException extends RegionRoleException {
   private void writeObject(java.io.ObjectOutputStream out) throws IOException {
     out.defaultWriteObject();
     // transform roles to string names which are serializable...
-    Set roleNames = new HashSet(this.missingRoles.size());
-    for (Iterator iter = this.missingRoles.iterator(); iter.hasNext();) {
+    Set mr = this.missingRoles;
+    if (mr == null) {
+      mr = Collections.EMPTY_SET;
+    }
+    Set roleNames = new HashSet(mr.size());
+    for (Iterator iter = mr.iterator(); iter.hasNext();) {
       String name = ((Role) iter.next()).getName();
       roleNames.add(name);
     }
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java b/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
index e384237..97df437 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
@@ -88,8 +88,12 @@ public class RegionDistributionException extends RegionRoleException {
   private void writeObject(java.io.ObjectOutputStream out) throws IOException {
     out.defaultWriteObject();
     // transform roles to string names which are serializable...
-    Set roleNames = new HashSet(this.failedRoles.size());
-    for (Iterator iter = this.failedRoles.iterator(); iter.hasNext();) {
+    Set fr = this.failedRoles;
+    if (fr == null) {
+      fr = Collections.EMPTY_SET;
+    }
+    Set roleNames = new HashSet(fr.size());
+    for (Iterator iter = fr.iterator(); iter.hasNext();) {
       String name = ((Role) iter.next()).getName();
       roleNames.add(name);
     }
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 2ef1ebb..b591cd4 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
@@ -209,8 +209,20 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
    */
   public static void initialize(DistributionConfig distributionConfig,
       Collection<DistributedSystemService> services) {
-    String serializationFilterSpec; // get from configuration
-    serializationFilterSpec = "java.**;javax.management.**;javax.print.attribute.EnumSyntax;antlr.**;!*";
+
+    String configSerializationSpec = ""; // distributionConfig.getSerializationSpecification()
+    // if (configSerializationSpec == null || configSerializationSpec.trim().length() == 0) {
+    // return;
+    // }
+
+    String serializationFilterSpec =
+        "java.**;javax.management.**;javax.print.attribute.EnumSyntax" + ";antlr.**" // query AST
+                                                                                     // objects
+            + ";org.apache.commons.modeler.AttributeInfo" // old Admin API
+            + ";org.apache.commons.modeler.FeatureInfo" // old Admin API
+            + ";org.apache.commons.modeler.ManagedBean" // old Admin API
+            + ";" + configSerializationSpec + ";!*"; // everything else is black-listed
+
     if (serializationFilterSpec != null) {
       if (!ClassUtils.isClassAvailable("sun.misc.ObjectInputFilter")) {
         throw new GemFireConfigException(
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
index 354a9f7..6e45c67 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
@@ -93,6 +93,7 @@ public class AutoSerializableManager {
    */
   private Set<Pattern> hardcodedExclusions = new HashSet<Pattern>() {
     {
+      add(Pattern.compile("org\\.apache\\.geode\\..*"));
       add(Pattern.compile("com\\.gemstone\\..*"));
       add(Pattern.compile("java\\..*"));
       add(Pattern.compile("javax\\..*"));
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
index b8f8682..cfa8f4d 100644
--- a/geode-core/src/main/resources/org/apache/geode/internal/sanctionedSerializables.txt
+++ b/geode-core/src/main/resources/org/apache/geode/internal/sanctionedSerializables.txt
@@ -47,7 +47,6 @@ org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl,true,148271964716
 org/apache/geode/admin/jmx/internal/ManagedResourceType,true,3752874768667480449,ordinal:int
 org/apache/geode/admin/jmx/internal/RefreshNotificationType,true,4376763592395613794,ordinal:int
 org/apache/geode/admin/jmx/internal/StatisticAttributeInfo,true,28022387514935560,stat:org/apache/geode/admin/Statistic
-org/apache/geode/cache/AttributesFactory$RegionAttributesImpl,true,-3663000883567530374,asyncEventQueueIds:java/util/Set,cacheListeners:java/util/ArrayList,cacheLoader:org/apache/geode/cache/CacheLoader,cacheWriter:org/apache/geode/cache/CacheWriter,compressor:org/apache/geode/compression/Compressor,concurrencyChecksEnabled:boolean,concurrencyLevel:int,customEntryIdleTimeout:org/apache/geode/cache/CustomExpiry,customEntryTimeToLive:org/apache/geode/cache/CustomExpiry,dataPolicy:org/apach [...]
 org/apache/geode/cache/CacheClosedException,true,-6479561694497811262
 org/apache/geode/cache/CacheException,true,7699432887938858940
 org/apache/geode/cache/CacheExistsException,true,4090002289325418100
@@ -73,7 +72,6 @@ org/apache/geode/cache/GatewayConfigurationException,true,3112317608711263007
 org/apache/geode/cache/GatewayException,true,8090143153569084886
 org/apache/geode/cache/IncompatibleVersionException,true,668812986092856749
 org/apache/geode/cache/InterestPolicy,true,1567179436331385968,ordinal:byte
-org/apache/geode/cache/InterestResultPolicy,true,-4993765891973030160,ordinal:byte
 org/apache/geode/cache/LossAction,true,-832035480397447797,ordinal:byte
 org/apache/geode/cache/LowMemoryException,true,6585765466722883168,critMems:java/util/Set
 org/apache/geode/cache/MirrorType,true,-6632651349646672540,ordinal:int
@@ -211,14 +209,12 @@ org/apache/geode/distributed/OplogCancelledException,true,106566926222526806
 org/apache/geode/distributed/PoolCancelledException,true,-4562742255812266767
 org/apache/geode/distributed/TXManagerCancelledException,true,3902857360354568446
 org/apache/geode/distributed/internal/AtomicLongWithTerminalState,true,-6130409343386576390
-org/apache/geode/distributed/internal/DistributionConfigSnapshot,true,7445728132965092798,modifiable:java/util/HashSet
 org/apache/geode/distributed/internal/DistributionException,true,9039055444056269504
 org/apache/geode/distributed/internal/FlowControlParams,true,7322447678546893647,byteAllowance:int,rechargeBlockMs:int,rechargeThreshold:float
 org/apache/geode/distributed/internal/HighPriorityAckedMessage$operationType,false
 org/apache/geode/distributed/internal/ReliableReplyException,true,472566058783450438
 org/apache/geode/distributed/internal/ReplyException,true,-4410839793809166071
 org/apache/geode/distributed/internal/ResourceEvent,false
-org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl,true,-805637520096606113
 org/apache/geode/distributed/internal/deadlock/DLockDependencyMonitor$LockId,false,serviceName:java/lang/String,tokenName:java/io/Serializable
 org/apache/geode/distributed/internal/deadlock/Dependency,true,1,depender:java/lang/Object,dependsOn:java/lang/Object
 org/apache/geode/distributed/internal/deadlock/DependencyGraph,true,-6794339771271587648,edges:java/util/Set,vertices:java/util/Map
@@ -272,7 +268,6 @@ org/apache/geode/internal/cache/Oplog$OkToSkipResult,false
 org/apache/geode/internal/cache/Oplog$OplogFileType,false
 org/apache/geode/internal/cache/PRContainsValueFunction,false
 org/apache/geode/internal/cache/PRHARedundancyProvider$ArrayListWithClearState,true,1,wasCleared:boolean
-org/apache/geode/internal/cache/PartitionedRegion$7,true,0,this$0:org/apache/geode/internal/cache/PartitionedRegion,val$bucketId:int
 org/apache/geode/internal/cache/PartitionedRegion$PRIdMap,true,3667357372967498179,cleared:boolean
 org/apache/geode/internal/cache/PartitionedRegion$SizeEntry,false,isPrimary:boolean,size:int
 org/apache/geode/internal/cache/PartitionedRegionDataStore$CreateBucketResult,false,nowExists:boolean
@@ -290,8 +285,6 @@ org/apache/geode/internal/cache/RemoteRegionOperation$Operation,false
 org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$TryAgainException,false
 org/apache/geode/internal/cache/TXCommitMessage$CommitExceptionCollectingException,true,589384721273797822,cacheExceptions:java/util/Set,fatalExceptions:java/util/Map,id:org/apache/geode/internal/cache/TXId,regionExceptions:java/util/Map
 org/apache/geode/internal/cache/TXCommitMessage$RegionCommitList,true,-8910813949027683641
-org/apache/geode/internal/cache/TXFarSideCMTracker$2,false,this$0:org/apache/geode/internal/cache/TXFarSideCMTracker
-org/apache/geode/internal/cache/TXManagerImpl$1,true,-4156018226167594134,this$0:org/apache/geode/internal/cache/TXManagerImpl
 org/apache/geode/internal/cache/control/InternalResourceManager$ResourceType,false,id:int
 org/apache/geode/internal/cache/control/MemoryThresholds$MemoryState,false
 org/apache/geode/internal/cache/control/PartitionRebalanceDetailsImpl,true,5880667005758250156,bucketCreateBytes:long,bucketCreateTime:long,bucketCreatesCompleted:int,bucketRemoveBytes:long,bucketRemoveTime:long,bucketRemovesCompleted:int,bucketTransferBytes:long,bucketTransferTime:long,bucketTransfersCompleted:int,partitionMemberDetailsAfter:java/util/Set,partitionMemberDetailsBefore:java/util/Set,primaryTransferTime:long,primaryTransfersCompleted:int,time:long
@@ -309,7 +302,6 @@ org/apache/geode/internal/cache/lru/LRUAlgorithm,false,bucketRegion:org/apache/g
 org/apache/geode/internal/cache/lru/LRUCapacityController,true,-4383074909189355938,maximumEntries:int
 org/apache/geode/internal/cache/lru/MemLRUCapacityController,true,6364183985590572514,isOffHeap:boolean,limit:long,perEntryOverHead:int,sizer:org/apache/geode/cache/util/ObjectSizer
 org/apache/geode/internal/cache/partitioned/DumpB2NRegion$PrimaryInfo,true,6334695270795306178,hostToken:java/lang/String,isHosting:boolean,isPrimary:boolean
-org/apache/geode/internal/cache/partitioned/FetchEntriesMessage$FetchEntriesResponse$1,true,0,this$0:org/apache/geode/internal/cache/partitioned/FetchEntriesMessage$FetchEntriesResponse,val$bucketId:int,val$recipient:org/apache/geode/distributed/internal/membership/InternalDistributedMember
 org/apache/geode/internal/cache/partitioned/PRLocallyDestroyedException,true,-1291911181409686840
 org/apache/geode/internal/cache/partitioned/PartitionMemberInfoImpl,true,8245020687604034289,bucketCount:int,configuredMaxMemory:long,distributedMember:org/apache/geode/distributed/DistributedMember,primaryCount:int,size:long
 org/apache/geode/internal/cache/partitioned/PartitionRegionInfoImpl,true,6462414089469761476,actualRedundantCopies:int,colocatedWith:java/lang/String,configuredBucketCount:int,configuredRedundantCopies:int,createdBucketCount:int,lowRedundancyBucketCount:int,memberDetails:java/util/Set,offlineMembers:org/apache/geode/internal/cache/partitioned/OfflineMemberDetails,regionPath:java/lang/String
@@ -606,14 +598,10 @@ org/apache/geode/pdx/PdxFieldTypeMismatchException,true,-829617162170742740
 org/apache/geode/pdx/PdxInitializationException,true,5098737377658808834
 org/apache/geode/pdx/PdxRegistryMismatchException,true,-2329989020829052537
 org/apache/geode/pdx/PdxSerializationException,true,-3843814927034345635
-org/apache/geode/pdx/internal/AutoSerializableManager$1,false,this$0:org/apache/geode/pdx/internal/AutoSerializableManager
 org/apache/geode/pdx/internal/EnumInfo$PdxInstanceEnumInfo,true,7907582104525106416,ei:org/apache/geode/pdx/internal/EnumInfo,enumId:int
 org/apache/geode/pdx/internal/FieldNotFoundInPdxVersion,true,1292033563588485577
 org/apache/geode/pdx/internal/PdxInputStream,false
-org/apache/geode/pdx/internal/PdxInstanceEnum,true,-7417287878052772302,className:java/lang/String,enumName:java/lang/String,enumOrdinal:int
-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$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
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 b5228ae..82336a8 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,4 +1,3 @@
-
 org.apache.geode.internal.security.SecurableCommunicationChannel
 org/apache/geode/GemFireCacheException
 org/apache/geode/admin/AlertLevel
@@ -67,3 +66,14 @@ 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/internal/cache/PartitionedRegion$7
+org/apache/geode/internal/cache/TXFarSideCMTracker$2
+org/apache/geode/internal/cache/TXManagerImpl$1
+org/apache/geode/internal/cache/partitioned/FetchEntriesMessage$FetchEntriesResponse$1
+org/apache/geode/pdx/internal/AutoSerializableManager$1
+org/apache/geode/cache/InterestResultPolicy
+org/apache/geode/distributed/internal/DistributionConfigSnapshot
+org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl
+org/apache/geode/pdx/internal/PdxInstanceEnum
+org/apache/geode/pdx/internal/PdxInstanceImpl
+org/apache/geode/pdx/internal/WritablePdxInstanceImpl
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt
index 07f2e1e..af8c45a 100644
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt
@@ -18,52 +18,5 @@
 
 
 # ~~~~~~~~~~~~~~~~~~~ Whitelist Testing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# these are failures from
 
-# has assertions that throw an InternalGemFireError when deserializing
-????,org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl
 
-# deprecated classes that extend an apache commons class (commons class would have to be whitelisted)
-????,org/apache/geode/admin/jmx/internal/ConfigAttributeInfo
-????,org/apache/geode/admin/jmx/internal/DynamicManagedBean
-????,org/apache/geode/admin/jmx/internal/StatisticAttributeInfo
-
-# has an incestuous subclass that should be merged into the superclass.
-# see InterestResultPolicyImpl
-????,org/apache/geode/cache/InterestResultPolicy
-
-# deprecated class that does custom serialization
-????,org/apache/geode/cache/RegionAccessException
-????,org/apache/geode/cache/RegionDistributionException
-
-# query class that does custom serialization and throws an NPE in the test
-????,org/apache/geode/cache/query/internal/ObjectIntHashMap
-
-# This needs a bug report.  This class serializes a DistributionConfigImpl but we
-# have that class in excludedClasses.txt and aren't monitoring it.
-????,org/apache/geode/distributed/internal/DistributionConfigSnapshot
-????,org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl
-
-# class is serializable and causes DataSerializable contents to be java-serialized
-????,org/apache/geode/cache/AttributesFactory$RegionAttributesImpl
-
-# NPE in readResolve()
-????,org/apache/geode/admin/GemFireHealth$Health
-
-# NPE in InternalDataSerializer.processIncomingClassName
-????,org/apache/geode/pdx/internal/PdxInstanceEnum
-
-# NPE in PdxInstanceImpl.sendTo
-????,org/apache/geode/pdx/internal/PdxInstanceImpl
-
-# NPE when serializing
-????,org/apache/geode/pdx/internal/WritablePdxInstanceImpl
-
-# class is an anonymous inner class.  If a new inner class is added to the enclosing
-# class the name of this class may be changed (e.g., $8) and break backward compatibility.
-# The class also has no constructor that the whitelist test can use.
-????,org/apache/geode/internal/cache/PartitionedRegion$7
-????,org/apache/geode/internal/cache/TXFarSideCMTracker$2
-????,org/apache/geode/internal/cache/TXManagerImpl$1
-????,org/apache/geode/internal/cache/partitioned/FetchEntriesMessage$FetchEntriesResponse$1
-????,org/apache/geode/pdx/internal/AutoSerializableManager$1

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