[
https://issues.apache.org/jira/browse/GEODE-3956?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16289995#comment-16289995
]
ASF GitHub Bot commented on GEODE-3956:
---------------------------------------
jdeppe-pivotal closed pull request #1157: GEODE-3956: Consistent naming for
async event queue related variables
URL: https://github.com/apache/geode/pull/1157
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 fc6ac08f52..095dc4586f 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 @@
private boolean diskSynchronous;
private String compressorClassName;
private boolean offHeap;
- private Set<String> eventQueueIds;
+ private Set<String> asyncEventQueueIds;
private Set<String> gatewaySenderIds;
/**
@@ -72,7 +72,7 @@
"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<String> eventQueueIds,
+ String compressorClassName, boolean offHeap, Set<String>
asyncEventQueueIds,
Set<String> 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<String> getEventQueueIds() {
- return eventQueueIds;
+ public Set<String> getAsyncEventQueueIds() {
+ return asyncEventQueueIds;
}
/**
@@ -386,14 +386,15 @@ public boolean getOffHeap() {
@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 282573c5df..0ab77b0119 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<String> eventQueueIds = bean.listRegionAttributes().getEventQueueIds();
+ Set<String> 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<String> eventQueueIds = bean.listRegionAttributes().getEventQueueIds();
+ Set<String> 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("");
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> The JMX RegionMBean listRegionAttributes operation doesn't include the
> async-event-queue-ids or gateway-sender-ids
> ------------------------------------------------------------------------------------------------------------------
>
> Key: GEODE-3956
> URL: https://issues.apache.org/jira/browse/GEODE-3956
> Project: Geode
> Issue Type: Improvement
> Components: jmx
> Reporter: Barry Oglesby
> Fix For: 1.4.0
>
>
> That would be a modification to the
> {{org.apache.geode.management.internal.beans.RegionMBeanCompositeDataFactory
> getRegionAttributesData}} method and the
> {{org.apache.geode.management.RegionAttributesData}} class.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)