diff --git a/geode-core/src/main/java/org/apache/geode/management/RegionAttributesData.java b/geode-core/src/main/java/org/apache/geode/management/RegionAttributesData.java index fc6ac08f52ce..095dc4586f34 100644 --- a/geode-core/src/main/java/org/apache/geode/management/RegionAttributesData.java +++ b/geode-core/src/main/java/org/apache/geode/management/RegionAttributesData.java @@ -57,7 +57,7 @@ public class RegionAttributesData { private boolean diskSynchronous; private String compressorClassName; private boolean offHeap; - private Set eventQueueIds; + private Set asyncEventQueueIds; private Set gatewaySenderIds; /** @@ -72,7 +72,7 @@ public class RegionAttributesData { "concurrencyLevel", "indexMaintenanceSynchronous", "statisticsEnabled", "subscriptionConflationEnabled", "asyncConflationEnabled", "poolName", "cloningEnabled", "diskStoreName", "interestPolicy", "diskSynchronous", "cacheListeners", "compressorClassName", - "offHeap", "eventQueueIds", "gatewaySenderIds"}) + "offHeap", "asyncEventQueueIds", "gatewaySenderIds"}) public RegionAttributesData(String cacheLoaderClassName, String cacheWriterClassName, @@ -84,7 +84,7 @@ public RegionAttributesData(String cacheLoaderClassName, String cacheWriterClass boolean statisticsEnabled, boolean subscriptionConflationEnabled, boolean asyncConflationEnabled, String poolName, boolean cloningEnabled, String diskStoreName, String interestPolicy, boolean diskSynchronous, String[] cacheListeners, - String compressorClassName, boolean offHeap, Set eventQueueIds, + String compressorClassName, boolean offHeap, Set asyncEventQueueIds, Set gatewaySenderIds) { this.cacheLoaderClassName = cacheLoaderClassName; @@ -117,7 +117,7 @@ public RegionAttributesData(String cacheLoaderClassName, String cacheWriterClass this.cacheListeners = cacheListeners; this.compressorClassName = compressorClassName; this.offHeap = offHeap; - this.eventQueueIds = eventQueueIds; + this.asyncEventQueueIds = asyncEventQueueIds; this.gatewaySenderIds = gatewaySenderIds; } @@ -367,8 +367,8 @@ public boolean getOffHeap() { * * @return a set of ids. */ - public Set getEventQueueIds() { - return eventQueueIds; + public Set getAsyncEventQueueIds() { + return asyncEventQueueIds; } /** @@ -386,14 +386,15 @@ public Set getGatewaySenderIds() { @Override public String toString() { return "RegionAttributesData [asyncConflationEnabled=" + asyncConflationEnabled - + ", cacheListeners=" + Arrays.toString(cacheListeners) + ", cacheLoaderClassName=" - + cacheLoaderClassName + ", cacheWriterClassName=" + cacheWriterClassName - + ", cloningEnabled=" + cloningEnabled + ", compressorClassName=" + compressorClassName - + ", concurrencyLevel=" + concurrencyLevel + ", customEntryIdleTimeout=" - + customEntryIdleTimeout + ", customEntryTimeToLive=" + customEntryTimeToLive - + ", dataPolicy=" + dataPolicy + ", diskStoreName=" + diskStoreName + ", diskSynchronous=" - + diskSynchronous + ", entryIdleTimeout=" + entryIdleTimeout + ", entryTimeToLive=" - + entryTimeToLive + ", ignoreJTA=" + ignoreJTA + ", indexMaintenanceSynchronous=" + + ", asyncEventQueueIds=" + asyncEventQueueIds + ", cacheListeners=" + + Arrays.toString(cacheListeners) + ", cacheLoaderClassName=" + cacheLoaderClassName + + ", cacheWriterClassName=" + cacheWriterClassName + ", cloningEnabled=" + cloningEnabled + + ", compressorClassName=" + compressorClassName + ", concurrencyLevel=" + concurrencyLevel + + ", customEntryIdleTimeout=" + customEntryIdleTimeout + ", customEntryTimeToLive=" + + customEntryTimeToLive + ", dataPolicy=" + dataPolicy + ", diskStoreName=" + diskStoreName + + ", diskSynchronous=" + diskSynchronous + ", entryIdleTimeout=" + entryIdleTimeout + + ", entryTimeToLive=" + entryTimeToLive + ", gatewaySenderIds=" + gatewaySenderIds + + ", ignoreJTA=" + ignoreJTA + ", indexMaintenanceSynchronous=" + indexMaintenanceSynchronous + ", initialCapacity=" + initialCapacity + ", interestPolicy=" + interestPolicy + ", keyConstraintClassName=" + keyConstraintClassName + ", loadFactor=" + loadFactor + ", lockGrantor=" + lockGrantor + ", multicastEnabled=" + multicastEnabled @@ -401,9 +402,7 @@ public String toString() { + regionIdleTimeout + ", regionTimeToLive=" + regionTimeToLive + ", scope=" + scope + ", statisticsEnabled=" + statisticsEnabled + ", subscriptionConflationEnabled=" + subscriptionConflationEnabled + ", valueConstraintClassName=" + valueConstraintClassName - + ", eventQueueIds=" + eventQueueIds + ", gatewaySenderIds=" + gatewaySenderIds + "]"; + + "]"; } - - } diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java index 282573c5df2c..0ab77b011944 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java @@ -57,7 +57,7 @@ public void setUp() throws Exception { } @Test - public void regionMBeanContainsEventQueueId() throws Exception { + public void regionMBeanContainsAsyncEventQueueId() throws Exception { gfsh.executeAndAssertThat( "create async-event-queue --id=AEQ1 --listener=" + TestEventListener.class.getName()) .statusIsSuccess(); @@ -67,7 +67,7 @@ public void regionMBeanContainsEventQueueId() throws Exception { bean = mBeanRule.getProxyMBean(RegionMXBean.class); assertThat(bean).isNotNull(); - Set eventQueueIds = bean.listRegionAttributes().getEventQueueIds(); + Set eventQueueIds = bean.listRegionAttributes().getAsyncEventQueueIds(); assertThat(eventQueueIds).containsExactly("AEQ1"); } @@ -82,12 +82,12 @@ public void removingEventQueueAlsoRemovesFromMBean() throws Exception { bean = mBeanRule.getProxyMBean(RegionMXBean.class); assertThat(bean).isNotNull(); - Set eventQueueIds = bean.listRegionAttributes().getEventQueueIds(); + Set eventQueueIds = bean.listRegionAttributes().getAsyncEventQueueIds(); assertThat(eventQueueIds).containsExactly("AEQ1"); gfsh.executeAndAssertThat("alter region --name=/FOO --async-event-queue-id=").statusIsSuccess(); - eventQueueIds = bean.listRegionAttributes().getEventQueueIds(); + eventQueueIds = bean.listRegionAttributes().getAsyncEventQueueIds(); assertThat(eventQueueIds).containsExactly(""); } }