You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/09/11 03:28:01 UTC
[30/50] usergrid git commit: USERGRID-992: check organization config
for default connections parameter functionality
USERGRID-992: check organization config for default connections parameter functionality
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/89b21362
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/89b21362
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/89b21362
Branch: refs/heads/USERGRID-909
Commit: 89b21362309d5c7a96a473e72f3fe9fe0cb6000e
Parents: 94008ad
Author: Mike Dunker <md...@apache.org>
Authored: Tue Sep 8 13:04:15 2015 -0700
Committer: Mike Dunker <md...@apache.org>
Committed: Tue Sep 8 13:04:15 2015 -0700
----------------------------------------------------------------------
.../rest/applications/ServiceResource.java | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/89b21362/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
index 37130de..f885fff 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
@@ -43,6 +43,7 @@ import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+import org.apache.usergrid.management.OrganizationConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -277,13 +278,24 @@ public class ServiceResource extends AbstractContextResource {
returnInboundConnections = false;
returnOutboundConnections = false;
} else if ("in".equalsIgnoreCase(connectionQueryParm)) {
+ returnInboundConnections = true;
returnOutboundConnections = false;
} else if ("out".equalsIgnoreCase(connectionQueryParm)) {
returnInboundConnections = false;
- } else if (! "all".equalsIgnoreCase(connectionQueryParm)) {
- // unrecognized variable
- if (connectionQueryParm != null)
- logger.error( String.format( "Invalid connection query parameter=%s, ignoring.", connectionQueryParm));
+ returnOutboundConnections = true;
+ } else if ("all".equalsIgnoreCase(connectionQueryParm)) {
+ returnInboundConnections = true;
+ returnOutboundConnections = true;
+ } else {
+ if (connectionQueryParm != null) {
+ // unrecognized parameter
+ logger.error(String.format("Invalid connections query parameter=%s, ignoring.", connectionQueryParm));
+ }
+ // use the default query parameter functionality
+ OrganizationConfig orgConfig = management.getOrganizationConfigForApplication(services.getApplicationId());
+ String defaultConnectionQueryParm = orgConfig.getDefaultConnectionParam();
+ returnInboundConnections = (defaultConnectionQueryParm == "in") || (defaultConnectionQueryParm == "all");
+ returnOutboundConnections = (defaultConnectionQueryParm == "out") || (defaultConnectionQueryParm == "all");
}
}