Author: kwall
Date: Fri Jul 15 13:07:25 2016
New Revision: 1752836
URL: http://svn.apache.org/viewvc?rev=1752836&view=rev
Log:
QPID-7331: [Java Broker] Query preferences - do not persist offset, limit etc
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/preferences/QueryPreferenceValue.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/preferences/QueryPreferenceValue.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/preferences/QueryPreferenceValue.java?rev=1752836&r1=1752835&r2=1752836&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/preferences/QueryPreferenceValue.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/preferences/QueryPreferenceValue.java
Fri Jul 15 13:07:25 2016
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
-import
org.apache.qpid.server.management.plugin.servlet.query.ConfiguredObjectQuery;
import org.apache.qpid.server.model.preferences.PreferenceValue;
public class QueryPreferenceValue implements PreferenceValue
@@ -34,26 +33,14 @@ public class QueryPreferenceValue implem
public static final String SELECT_ATTRIBUTE = "select";
public static final String WHERE_ATTRIBUTE = "where";
public static final String ORDER_BY_ATTRIBUTE = "orderBy";
- public static final String OFFSET_ATTRIBUTE = "offset";
- public static final String LIMIT_ATTRIBUTE = "limit";
- public static final String PAGE_SIZE_ATTRIBUTE = "pageSize";
- public static final String CURRENT_PAGE_ATTRIBUTE = "currentPage";
- public static final String REFRESH_INTERVAL_ATTRIBUTE =
"refreshIntervalMs";
public static final String DEFAULT_SCOPE = "";
public static final String DEFAULT_CATEGORY = "queue";
- public static final int DEFAULT_PAGE_SIZE = 10;
- public static final int DEFAULT_REFRESH_INTERVAL = 5000;
private final String _scope;
private final String _category;
private final String _select;
private final String _where;
private final String _orderBy;
- private final int _offset;
- private final int _limit;
- private final int _pageSize;
- private final int _currentPage;
- private final long _refreshInterval;
private final Map<String, Object> _originalAttributeMap;
public QueryPreferenceValue(final Map<String, Object>
preferenceValueAttributes)
@@ -66,11 +53,6 @@ public class QueryPreferenceValue implem
_select = getValue(preferenceValueAttributes, SELECT_ATTRIBUTE,
null);
_where = getValue(preferenceValueAttributes, WHERE_ATTRIBUTE,
null);
_orderBy = getValue(preferenceValueAttributes, ORDER_BY_ATTRIBUTE,
null);
- _offset = getValue(preferenceValueAttributes, OFFSET_ATTRIBUTE,
ConfiguredObjectQuery.DEFAULT_OFFSET);
- _limit = getValue(preferenceValueAttributes, LIMIT_ATTRIBUTE,
ConfiguredObjectQuery.DEFAULT_LIMIT);
- _pageSize = getValue(preferenceValueAttributes,
PAGE_SIZE_ATTRIBUTE, DEFAULT_PAGE_SIZE);
- _currentPage = getValue(preferenceValueAttributes,
CURRENT_PAGE_ATTRIBUTE, 0);
- _refreshInterval = getValue(preferenceValueAttributes,
REFRESH_INTERVAL_ATTRIBUTE, DEFAULT_REFRESH_INTERVAL);
_originalAttributeMap = Collections.unmodifiableMap(new
LinkedHashMap<>(preferenceValueAttributes));
}
catch (ClassCastException e)
@@ -110,31 +92,6 @@ public class QueryPreferenceValue implem
return _orderBy;
}
- public int getOffset()
- {
- return _offset;
- }
-
- public int getLimit()
- {
- return _limit;
- }
-
- public int getPageSize()
- {
- return _pageSize;
- }
-
- public int getCurrentPage()
- {
- return _currentPage;
- }
-
- public long getRefreshInterval()
- {
- return _refreshInterval;
- }
-
private <T> T getValue(Map<String, Object> attributes, String
attributeName, T defaultValue)
{
if (attributes.containsKey(attributeName))
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java?rev=1752836&r1=1752835&r2=1752836&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java
Fri Jul 15 13:07:25 2016
@@ -91,8 +91,6 @@ public class UserPreferencesRestTest ext
prefValueAttributes.put(QueryPreferenceValue.SCOPE_ATTRIBUTE, "");
prefValueAttributes.put(QueryPreferenceValue.CATEGORY_ATTRIBUTE,
"queue");
prefValueAttributes.put(QueryPreferenceValue.SELECT_ATTRIBUTE,
"id,name,queueDepthMessages");
- prefValueAttributes.put(QueryPreferenceValue.CURRENT_PAGE_ATTRIBUTE,
7);
-
prefValueAttributes.put(QueryPreferenceValue.REFRESH_INTERVAL_ATTRIBUTE, 1000);
prefAttributes.put(Preference.VALUE_ATTRIBUTE, prefValueAttributes);
String fullUrl = String.format("broker/userpreferences/%s/%s",
prefType, prefName);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
