Github user kirklund commented on a diff in the pull request:
https://github.com/apache/incubator-geode/pull/249#discussion_r81404596
--- Diff:
geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
---
@@ -360,31 +373,36 @@ public static Object queryData(final String query,
for (String regionPath : regionsInQuery) {
DistributedRegionMXBean regionMBean =
service.getDistributedRegionMXBean(regionPath);
if (regionMBean == null) {
- return new
JsonisedErroMessage(ManagementStrings.QUERY__MSG__REGIONS_NOT_FOUND.toLocalizedString(regionPath)).toString();
+ return new
JsonisedErroMessage(ManagementStrings.QUERY__MSG__REGIONS_NOT_FOUND.toLocalizedString(regionPath))
+ .toString();
} else {
Set<DistributedMember> associatedMembers =
DataCommands.getRegionAssociatedMembers(regionPath, cache, true);
if (inputMembers != null && inputMembers.size() > 0) {
if (!associatedMembers.containsAll(inputMembers)) {
- return new
JsonisedErroMessage(ManagementStrings.QUERY__MSG__REGIONS_NOT_FOUND_ON_MEMBERS.toLocalizedString(regionPath))
- .toString();
+ return new
JsonisedErroMessage(ManagementStrings.QUERY__MSG__REGIONS_NOT_FOUND_ON_MEMBERS
+ .toLocalizedString(regionPath)).toString();
}
}
}
}
} else {
- return new
JsonisedErroMessage(ManagementStrings.QUERY__MSG__INVALID_QUERY.toLocalizedString("Region
mentioned in query probably missing /")).toString();
+ return new
JsonisedErroMessage(ManagementStrings.QUERY__MSG__INVALID_QUERY.toLocalizedString("Region
mentioned in query probably missing /"))
+ .toString();
}
// Validate
if (regionsInQuery.size() > 1 && inputMembers == null) {
for (String regionPath : regionsInQuery) {
DistributedRegionMXBean regionMBean =
service.getDistributedRegionMXBean(regionPath);
- if
(regionMBean.getRegionType().equals(DataPolicy.PARTITION.toString()) ||
-
regionMBean.getRegionType().equals(DataPolicy.PERSISTENT_PARTITION.toString()))
{
- return new
JsonisedErroMessage(ManagementStrings.QUERY__MSG__JOIN_OP_EX.toLocalizedString()).toString();
+ if (regionMBean.getRegionType()
--- End diff --
I updated the formatters in etc/ including etc/intellijIdeaCodeStyle.xml to
prevent these whacky linefeeds. Please update and rerun the formatter. The
changes look good and I'll pull it in as soon as you've reformatted. Thanks!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
