You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/09/13 16:09:41 UTC
qpid-broker-j git commit: QPID-7212: [Java Broker,
REST API] Don't transmit inherited context variables by default
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 2ed71d308 -> da9a963bf
QPID-7212: [Java Broker, REST API] Don't transmit inherited context variables by default
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/da9a963b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/da9a963b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/da9a963b
Branch: refs/heads/master
Commit: da9a963bff99ed9ad716caa26ce980135f5f5dc1
Parents: 2ed71d3
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Sep 13 17:09:11 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Sep 13 17:09:11 2017 +0100
----------------------------------------------------------------------
.../qpid/management/store/pool/bonecp/show.js | 27 +++++++---
.../js/qpid/management/virtualhost/jdbc/show.js | 3 +-
.../management/virtualhostnode/jdbc/show.js | 2 +-
.../plugin/servlet/rest/RestServlet.java | 57 +-------------------
.../main/java/resources/js/qpid/common/util.js | 14 ++---
.../Java-Broker-Management-Channel-REST-API.xml | 10 +---
.../qpid/systest/rest/BrokerRestTest.java | 15 +-----
7 files changed, 33 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/da9a963b/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js b/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js
index 1aa5c22..3cdd268 100644
--- a/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js
+++ b/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js
@@ -18,8 +18,8 @@
* under the License.
*
*/
-define(["dojo/_base/xhr", "dojo/parser", "dojox/html/entities", "dojo/query", "dojo/domReady!"],
- function (xhr, parser, entities, query)
+define(["dojo/_base/xhr", "dojo/parser", "dojox/html/entities", "dojo/query", "dojo/_base/lang", "dojo/domReady!"],
+ function (xhr, parser, entities, query, lang)
{
var fieldNames = ["maxConnectionsPerPartition", "minConnectionsPerPartition", "partitionCount"];
@@ -49,13 +49,24 @@ define(["dojo/_base/xhr", "dojo/parser", "dojox/html/entities", "dojo/query", "d
BoneCP.prototype.update = function (data)
{
-
- for (var i = 0; i < fieldNames.length; i++)
+ this.parent.management.load(this.parent.modelObj,
+ {
+ excludeInheritedContext: false,
+ depth: 0
+ }).then(lang.hitch(this, function (inheritedData)
{
- var fieldName = fieldNames[i];
- var value = data && data.context ? data.context["qpid.jdbcstore.bonecp." + fieldName] : "";
- this[fieldName].innerHTML = value ? entities.encode(String(value)) : "";
- }
+ if (inheritedData && inheritedData[0])
+ {
+ var context = inheritedData[0].context;
+ for (var i = 0; i < fieldNames.length; i++)
+ {
+ var fieldName = fieldNames[i];
+ var value = context ? context["qpid.jdbcstore.bonecp." + fieldName] : "";
+ this[fieldName].innerHTML = value ? entities.encode(String(value)) : "";
+ }
+ }
+ }));
+
};
return BoneCP;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/da9a963b/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js b/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js
index 12dbc88..edf8dc3 100644
--- a/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js
+++ b/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js
@@ -26,6 +26,7 @@ define(["qpid/common/util", "dojo/query", "dojo/_base/array", "dojo/dom-construc
function JDBC(data)
{
var that = this;
+ this.parent = data.parent;
util.buildUI(data.containerNode,
data.parent,
"virtualhostnode/jdbc/show.html",
@@ -59,7 +60,7 @@ define(["qpid/common/util", "dojo/query", "dojo/_base/array", "dojo/dom-construc
that.poolDetails = new PoolDetails({
containerNode: that.connectionPoolTypeAttributeContainer,
- parent: that
+ parent: that.parent
});
that.poolDetails.update(data);
});
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/da9a963b/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js b/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
index 22dabf2..1b7f9d8 100644
--- a/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
+++ b/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js
@@ -63,7 +63,7 @@ define(["qpid/common/util", "dojo/query", "dojo/_base/array", "dojo/dom-construc
that.poolDetails = new PoolDetails({
containerNode: that.connectionPoolTypeAttributeContainer,
- parent: that
+ parent: that.parent
});
that.poolDetails.update(data);
});
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/da9a963b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
index 6ad2158..ffa2a8a 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
@@ -77,8 +77,6 @@ public class RestServlet extends AbstractServlet
public static final String OVERSIZE_PARAM = "oversize";
public static final String ACTUALS_PARAM = "actuals";
public static final String SORT_PARAM = "sort";
- public static final String INCLUDE_SYS_CONTEXT_PARAM = "includeSysContext";
- public static final String INHERITED_ACTUALS_PARAM = "inheritedActuals";
public static final String EXTRACT_INITIAL_CONFIG_PARAM = "extractInitialConfig";
public static final String EXCLUDE_INHERITED_CONTEXT_PARAM = "excludeInheritedContext";
@@ -92,9 +90,7 @@ public class RestServlet extends AbstractServlet
SORT_PARAM,
OVERSIZE_PARAM,
ACTUALS_PARAM,
- INCLUDE_SYS_CONTEXT_PARAM,
EXTRACT_INITIAL_CONFIG_PARAM,
- INHERITED_ACTUALS_PARAM,
CONTENT_DISPOSITION_ATTACHMENT_FILENAME_PARAM,
EXCLUDE_INHERITED_CONTEXT_PARAM));
public static final int DEFAULT_DEPTH = 0;
@@ -232,65 +228,14 @@ public class RestServlet extends AbstractServlet
depth = getIntParameterFromRequest(request, DEPTH_PARAM, DEFAULT_DEPTH);
oversizeThreshold = getIntParameterFromRequest(request, OVERSIZE_PARAM, DEFAULT_OVERSIZE);
actuals = getBooleanParameterFromRequest(request, ACTUALS_PARAM);
- String includeSystemContextParameter = request.getParameter(INCLUDE_SYS_CONTEXT_PARAM);
- String inheritedActualsParameter = request.getParameter(INHERITED_ACTUALS_PARAM);
String excludeInheritedContextParameter = request.getParameter(EXCLUDE_INHERITED_CONTEXT_PARAM);
if (excludeInheritedContextParameter == null)
{
- /* backward (pre v6.1) compatible behaviour */
- if (inheritedActualsParameter == null && includeSystemContextParameter == null)
- {
- excludeInheritedContext = actuals;
- }
- else if (inheritedActualsParameter != null && includeSystemContextParameter != null)
- {
- if (actuals)
- {
- excludeInheritedContext = !Boolean.parseBoolean(inheritedActualsParameter);
- }
- else
- {
- excludeInheritedContext = !Boolean.parseBoolean(includeSystemContextParameter);
- }
- }
- else if (inheritedActualsParameter != null)
- {
- if (actuals)
- {
- excludeInheritedContext = !Boolean.parseBoolean(inheritedActualsParameter);
- }
- else
- {
- excludeInheritedContext = false;
- }
- }
- else
- {
- if (actuals)
- {
- excludeInheritedContext = true;
- }
- else
- {
- excludeInheritedContext = !Boolean.parseBoolean(includeSystemContextParameter);
- }
- }
+ excludeInheritedContext = true;
}
else
{
- if (inheritedActualsParameter != null || includeSystemContextParameter != null)
- {
- sendJsonErrorResponse(request,
- response,
- SC_UNPROCESSABLE_ENTITY,
- String.format(
- "Parameter '%s' cannot be specified together with '%s' or '%s'",
- EXCLUDE_INHERITED_CONTEXT_PARAM,
- INHERITED_ACTUALS_PARAM,
- INCLUDE_SYS_CONTEXT_PARAM));
- return;
- }
excludeInheritedContext = Boolean.parseBoolean(excludeInheritedContextParameter);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/da9a963b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
index faf0392..5c83b92 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
@@ -884,16 +884,16 @@ define(["dojo/_base/xhr",
{
var request = lang.mixin({depth: 0}, requestOptions);
- var effectiveResponsePromise = management.load(modelObj, request);
- var actualResponsePromise = management.load(modelObj, lang.mixin(lang.clone(request), {actuals: true}));
- var inheritedActualResponsePromise = management.load(modelObj, lang.mixin(lang.clone(request), {
+ var inheritedEffectivePromise = management.load(modelObj, lang.mixin(lang.clone(request), {excludeInheritedContext: false, actuals: false}));
+ var localActualsPromise = management.load(modelObj, lang.mixin(lang.clone(request), {excludeInheritedContext: true, actuals: true}));
+ var inheritedActualsPromise = management.load(modelObj, lang.mixin(lang.clone(request), {
actuals: true,
excludeInheritedContext: false
}));
_loadData({
- actual: actualResponsePromise,
- inheritedActual: inheritedActualResponsePromise,
- effective: effectiveResponsePromise
+ actual: localActualsPromise,
+ inheritedActual: inheritedActualsPromise,
+ effective: inheritedEffectivePromise
}, callback);
};
@@ -901,7 +901,7 @@ define(["dojo/_base/xhr",
{
var request = lang.mixin({depth: 0}, requestOptions);
- var effectiveResponsePromise = management.load(modelObj, request);
+ var effectiveResponsePromise = management.load(modelObj, lang.mixin(lang.clone(request), {excludeInheritedContext: false}));
var inheritedActualResponsePromise = management.load(modelObj, lang.mixin(lang.clone(request), {
actuals: true,
excludeInheritedContext: false
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/da9a963b/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-REST-API.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-REST-API.xml b/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-REST-API.xml
index 350c486..aef8f44 100644
--- a/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-REST-API.xml
+++ b/doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-REST-API.xml
@@ -188,15 +188,9 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>includeSysContext</term>
+ <term>excludeInheritedContext</term>
<listitem>
- <para>If set to "true" all system context variables are returned</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>inheritedActuals</term>
- <listitem>
- <para>If set to "true" actual values for all inherited context is returned.</para>
+ <para>If set to "false" the inherited context is included from the object's ancestors. Default is true.</para>
</listitem>
</varlistentry>
<varlistentry>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/da9a963b/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
index 35fab48..c0b3650 100644
--- a/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
@@ -165,23 +165,10 @@ public class BrokerRestTest extends QpidRestTestCase
}
- public void testActualInheritedContext() throws IOException
- {
- Map<String, Object> brokerDetails =
- getRestTestHelper().getJsonAsSingletonList("broker?inheritedActuals=true&actuals=true");
- Map<String, String> brokerContext = (Map<String, String>) brokerDetails.get(ConfiguredObject.CONTEXT);
- assertEquals("Unexpected test context variable value",
- SYSTEM_PROPERTY_ACTUAL_VALUE,
- brokerContext.get(SYSTEM_PROPERTY_NAME));
- assertEquals("Unexpected test context expression value",
- SYSTEM_PROPERTY2_ACTUAL_VALUE,
- brokerContext.get(SYSTEM_PROPERTY2_NAME));
- }
-
public void testEffectiveInheritedContext() throws IOException
{
Map<String, Object> brokerDetails =
- getRestTestHelper().getJsonAsSingletonList("broker?inheritedActuals=false&actuals=false");
+ getRestTestHelper().getJsonAsSingletonList("broker?excludeInheritedContext=false&actuals=false");
Map<String, String> brokerContext = (Map<String, String>) brokerDetails.get(ConfiguredObject.CONTEXT);
assertEquals("Unexpected test context variable value",
SYSTEM_PROPERTY_ACTUAL_VALUE,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org