Add exceptions for new methods in japicmp and fix javadoc warnings an…

…d add function to sanctioned data serializables
apache · Sep 29, 2022 · a1ee7c3 · a1ee7c3
1 parent 6322def
commit a1ee7c3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/build-tools/geode-japicmp/src/main/resources/japicmp_exceptions.json b/build-tools/geode-japicmp/src/main/resources/japicmp_exceptions.json
@@ -13,5 +13,10 @@
   "Class org.apache.geode.management.DiskStoreMXBean": "Added new methods.",
   "Method org.apache.geode.management.DiskStoreMXBean.getTotalRecoveredEntryCreates()": "Added new stat",
   "Method org.apache.geode.management.DiskStoreMXBean.getTotalRecoveredEntryDestroys()": "Added new stat",
-  "Method org.apache.geode.management.DiskStoreMXBean.getTotalRecoveredEntryUpdates()": "Added new stat"
+  "Method org.apache.geode.management.DiskStoreMXBean.getTotalRecoveredEntryUpdates()": "Added new stat",
+  "Class org.apache.geode.cache.server.CacheServer": "Added two methods",
+  "Method org.apache.geode.cache.server.CacheServer.getRejectedProxyRequests()": "added new counter",
+  "Method org.apache.geode.cache.server.CacheServer.incRejectedProxyRequests()": "added new counter",
+  "Class org.apache.geode.management.CacheServerMXBean":"Added new counter",
+  "Method org.apache.geode.management.CacheServerMXBean.getRejectedProxyRequests()": "added new counter"
 }
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -223,6 +223,9 @@ javadoc/org/apache/geode/cache/PartitionAttributesFactory.html
 javadoc/org/apache/geode/cache/PartitionResolver.html
 javadoc/org/apache/geode/cache/PartitionedRegionDistributionException.html
 javadoc/org/apache/geode/cache/PartitionedRegionStorageException.html
+javadoc/org/apache/geode/cache/ProxyRequestObserver.html
+javadoc/org/apache/geode/cache/ProxyRequestObserverAdapter.html
+javadoc/org/apache/geode/cache/ProxyRequestObserverHolder.html
 javadoc/org/apache/geode/cache/Region.Entry.html
 javadoc/org/apache/geode/cache/Region.html
 javadoc/org/apache/geode/cache/RegionAccessException.html
@@ -248,6 +251,7 @@ javadoc/org/apache/geode/cache/SerializedCacheValue.html
 javadoc/org/apache/geode/cache/StatisticsDisabledException.html
 javadoc/org/apache/geode/cache/SubscriptionAttributes.html
 javadoc/org/apache/geode/cache/SynchronizationCommitConflictException.html
+javadoc/org/apache/geode/cache/ThreadLimitingProxyRequestObserver.html
 javadoc/org/apache/geode/cache/TimeoutException.html
 javadoc/org/apache/geode/cache/TransactionDataNodeHasDepartedException.html
 javadoc/org/apache/geode/cache/TransactionDataNotColocatedException.html

diff --git a/geode-core/src/main/java/org/apache/geode/cache/ProxyRequestObserverHolder.java b/geode-core/src/main/java/org/apache/geode/cache/ProxyRequestObserverHolder.java
@@ -63,14 +63,22 @@ public class ProxyRequestObserverHolder {
 
   /**
    * Set the given observer to be notified of proxy requests. Returns the current observer.
+   *
+   * @param observer the observer to be set
+   *
+   * @return the current observer instance
    */
   public static ProxyRequestObserver setInstance(
       @NotNull ProxyRequestObserver observer) {
     logger.info("Setting ProxyRequestObserver with: {}", observer);
     return _instance.getAndSet(observer);
   }
 
-  /** Return the current observer instance */
+  /**
+   * Return the current observer instance
+   *
+   * @return the current observer instance
+   */
   public static ProxyRequestObserver getInstance() {
     return _instance.get();
   }

diff --git a/...sources/org/apache/geode/gfsh/internal/management/sanctioned-geode-gfsh-serializables.txt b/...sources/org/apache/geode/gfsh/internal/management/sanctioned-geode-gfsh-serializables.txt
@@ -94,6 +94,7 @@ org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$EvictionAt
 org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs,true,1474255033398008063,action:org/apache/geode/cache/ExpirationAction,time:java/lang/Integer
 org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$PartitionArgs,true,5907052187323280919,partitionResolver:java/lang/String,prColocatedWith:java/lang/String,prLocalMaxMemory:java/lang/Integer,prRecoveryDelay:java/lang/Long,prRedundantCopies:java/lang/Integer,prStartupRecoveryDelay:java/lang/Long,prTotalMaxMemory:java/lang/Long,prTotalNumBuckets:java/lang/Integer
 org/apache/geode/management/internal/cli/functions/ResumeAsyncEventQueueDispatcherFunction,false
+org/apache/geode/management/internal/cli/functions/SetThreadLimitingProxyRequestFunction,true,1
 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