Skip to content

GEODE-3956: Consistent naming for async event queue related variables #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdeppe-pivotal merged 2 commits into from
Dec 13, 2017
Merged

GEODE-3956: Consistent naming for async event queue related variables #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b85c76
GEODE-3956: Consistent naming for async event queue related variables
jdeppe-pivotal Dec 12, 2017
97202bb
GEODE-3956: Somewhere a unicorn pony lost its wings
jdeppe-pivotal Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions geode-core/src/main/java/org/apache/geode/management/RegionAttributesData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class RegionAttributesData {
private boolean diskSynchronous;
private String compressorClassName;
private boolean offHeap;
private Set<String> eventQueueIds;
private Set<String> asyncEventQueueIds;
private Set<String> gatewaySenderIds;

/**
Expand All @@ -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,
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -367,8 +367,8 @@ public boolean getOffHeap() {
*
* @return a set of ids.
*/
public Set<String> getEventQueueIds() {
return eventQueueIds;
public Set<String> getAsyncEventQueueIds() {
return asyncEventQueueIds;
}

/**
Expand All @@ -386,24 +386,23 @@ public Set<String> 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
+ ", offHeap=" + offHeap + ", poolName=" + poolName + ", regionIdleTimeout="
+ regionIdleTimeout + ", regionTimeToLive=" + regionTimeToLive + ", scope=" + scope
+ ", statisticsEnabled=" + statisticsEnabled + ", subscriptionConflationEnabled="
+ subscriptionConflationEnabled + ", valueConstraintClassName=" + valueConstraintClassName
+ ", eventQueueIds=" + eventQueueIds + ", gatewaySenderIds=" + gatewaySenderIds + "]";
+ "]";
}



}
8 changes: 4 additions & 4 deletions ...e/src/test/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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");
}

Expand All @@ -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("");
}
}