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 2016/04/28 18:22:57 UTC
svn commit: r1741469 [3/3] - in /qpid/java/trunk:
bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/
broker-plugins/management-http/src/main/grammar/
broker-plugins/management-http/src/main/java/org/apache/qpid/server/...
Added: qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/OrderByExpression.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/OrderByExpression.java?rev=1741469&view=auto
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/OrderByExpression.java (added)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/OrderByExpression.java Thu Apr 28 16:22:56 2016
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.qpid.filter;
+
+public class OrderByExpression implements Expression
+{
+ public enum Order
+ { ASC, DESC }
+
+ private final Expression _expression;
+ private final Order _order;
+
+ public OrderByExpression(Expression expression)
+ {
+ this(expression, Order.ASC);
+ }
+
+ public OrderByExpression(Expression expression, Order order)
+ {
+ _expression = expression;
+ _order = order;
+ }
+
+ @Override
+ public Object evaluate(final Object object)
+ {
+ return _expression.evaluate(object);
+ }
+
+ public Order getOrder()
+ {
+ return _order;
+ }
+
+ public boolean isColumnIndex()
+ {
+ return (_expression instanceof ConstantExpression && ((ConstantExpression)_expression).getValue() instanceof Number);
+ }
+
+ public int getColumnIndex()
+ {
+ return ((Number)((ConstantExpression)_expression).getValue()).intValue();
+ }
+}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java?rev=1741469&r1=1741468&r2=1741469&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java Thu Apr 28 16:22:56 2016
@@ -29,7 +29,7 @@ import java.util.UUID;
import javax.servlet.http.HttpServletResponse;
import org.apache.qpid.server.BrokerOptions;
-import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -140,7 +140,7 @@ public class AuthenticationProviderRestT
attributes.put(AuthenticationProvider.ID, UUID.randomUUID());
responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes);
- assertEquals("Update with new ID should fail", RestServlet.SC_UNPROCESSABLE_ENTITY, responseCode);
+ assertEquals("Update with new ID should fail", AbstractServlet.SC_UNPROCESSABLE_ENTITY, responseCode);
}
public void testDeleteOfUsedAuthenticationProviderFails() throws Exception
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BindingRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BindingRestTest.java?rev=1741469&r1=1741468&r2=1741469&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BindingRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BindingRestTest.java Thu Apr 28 16:22:56 2016
@@ -26,7 +26,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
-import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet;
import org.apache.qpid.server.model.Binding;
public class BindingRestTest extends QpidRestTestCase
@@ -128,6 +128,6 @@ public class BindingRestTest extends Qpi
attributes.put(Binding.ARGUMENTS, "blah");
responseCode = getRestTestHelper().submitRequest(bindingUrl, "PUT", attributes);
- assertEquals("Update should be unsupported", RestServlet.SC_UNPROCESSABLE_ENTITY, responseCode);
+ assertEquals("Update should be unsupported", AbstractServlet.SC_UNPROCESSABLE_ENTITY, responseCode);
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1741469&r1=1741468&r2=1741469&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java Thu Apr 28 16:22:56 2016
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Map;
import org.apache.qpid.configuration.CommonProperties;
-import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -139,7 +139,7 @@ public class BrokerRestTest extends Qpid
brokerAttributes.put(entry.getKey(), entry.getValue());
int response = getRestTestHelper().submitRequest("broker", "PUT", brokerAttributes);
assertEquals("Unexpected update response for invalid attribute " + entry.getKey() + "=" + entry.getValue(),
- RestServlet.SC_UNPROCESSABLE_ENTITY, response);
+ AbstractServlet.SC_UNPROCESSABLE_ENTITY, response);
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java?rev=1741469&r1=1741468&r2=1741469&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java Thu Apr 28 16:22:56 2016
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.systest.rest;
-import static org.apache.qpid.server.management.plugin.servlet.rest.RestServlet.SC_UNPROCESSABLE_ENTITY;
+import static org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet.SC_UNPROCESSABLE_ENTITY;
import java.io.File;
import java.io.FileOutputStream;
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java?rev=1741469&r1=1741468&r2=1741469&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java Thu Apr 28 16:22:56 2016
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.qpid.server.management.plugin.HttpManagement;
-import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
public class HttpManagementRestTest extends QpidRestTestCase
@@ -82,12 +82,12 @@ public class HttpManagementRestTest exte
attributes.put(invalidAttribute.getKey(), invalidAttribute.getValue());
int response = getRestTestHelper().submitRequest("plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "PUT", attributes);
assertEquals("Update should fail for attribute " + invalidAttribute.getKey() + " with value " + invalidAttribute.getValue(),
- RestServlet.SC_UNPROCESSABLE_ENTITY, response);
+ AbstractServlet.SC_UNPROCESSABLE_ENTITY, response);
}
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(HttpManagement.TIME_OUT, -1l);
int response = getRestTestHelper().submitRequest("plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "PUT", attributes);
- assertEquals("Update should fail for invalid session timeout", RestServlet.SC_UNPROCESSABLE_ENTITY, response);
+ assertEquals("Update should fail for invalid session timeout", AbstractServlet.SC_UNPROCESSABLE_ENTITY, response);
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java?rev=1741469&r1=1741468&r2=1741469&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java Thu Apr 28 16:22:56 2016
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.systest.rest;
-import static org.apache.qpid.server.management.plugin.servlet.rest.RestServlet.SC_UNPROCESSABLE_ENTITY;
+import static org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet.SC_UNPROCESSABLE_ENTITY;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
Added: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueryRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueryRestTest.java?rev=1741469&view=auto
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueryRestTest.java (added)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueryRestTest.java Thu Apr 28 16:22:56 2016
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.qpid.systest.rest;
+
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet;
+
+public class QueryRestTest extends QpidRestTestCase
+{
+ public void testInvalidOrderBy() throws Exception
+ {
+ getRestTestHelper().submitRequest("querybroker/port?select=id&orderBy=0", "GET", AbstractServlet.SC_UNPROCESSABLE_ENTITY);
+ }
+
+ public void testInvalidSelectSyntax() throws Exception
+ {
+ getRestTestHelper().submitRequest("querybroker/port?select=,,(", "GET", HttpServletResponse.SC_BAD_REQUEST);
+ }
+
+ public void testInvalidWhereSyntax() throws Exception
+ {
+ getRestTestHelper().submitRequest("querybroker/port?where=id in(", "GET", HttpServletResponse.SC_BAD_REQUEST);
+ }
+
+ public void testInvalidWhere() throws Exception
+ {
+ getRestTestHelper().submitRequest("querybroker/port?where=transports>1", "GET", AbstractServlet.SC_UNPROCESSABLE_ENTITY);
+ }
+}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java?rev=1741469&r1=1741468&r2=1741469&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java Thu Apr 28 16:22:56 2016
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.systest.rest;
-import static org.apache.qpid.server.management.plugin.servlet.rest.RestServlet.SC_UNPROCESSABLE_ENTITY;
+import static org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet.SC_UNPROCESSABLE_ENTITY;
import java.io.IOException;
import java.net.URLEncoder;
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1741469&r1=1741468&r2=1741469&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java Thu Apr 28 16:22:56 2016
@@ -32,7 +32,7 @@ import org.apache.qpid.server.logging.Br
import org.apache.qpid.server.logging.BrokerMemoryLogger;
import org.apache.qpid.server.logging.BrokerNameAndLevelLogInclusionRule;
import org.apache.qpid.server.management.plugin.HttpManagement;
-import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet;
import org.apache.qpid.server.model.AccessControlProvider;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
@@ -667,7 +667,7 @@ public class BrokerACLTest extends QpidR
attributes.put(GroupProvider.TYPE, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE);
attributes.put(FileBasedGroupProvider.PATH, "/path/to/file");
responseCode = getRestTestHelper().submitRequest("groupprovider/" + groupProviderName, "PUT", attributes);
- assertEquals("Setting of group provider attributes should be allowed but not supported", RestServlet.SC_UNPROCESSABLE_ENTITY, responseCode);
+ assertEquals("Setting of group provider attributes should be allowed but not supported", AbstractServlet.SC_UNPROCESSABLE_ENTITY, responseCode);
}
public void testSetGroupProviderAttributesDenied() throws Exception
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java?rev=1741469&r1=1741468&r2=1741469&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java Thu Apr 28 16:22:56 2016
@@ -26,7 +26,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
-import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet;
import org.apache.qpid.server.model.Binding;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.Queue;
@@ -145,7 +145,7 @@ public class ExchangeRestACLTest extends
attributes.put(Exchange.ALTERNATE_EXCHANGE, "my-alternate-exchange");
responseCode = getRestTestHelper().submitRequest(_exchangeUrl, "PUT", attributes);
- assertEquals("Exchange 'my-alternate-exchange' does not exist", RestServlet.SC_UNPROCESSABLE_ENTITY, responseCode);
+ assertEquals("Exchange 'my-alternate-exchange' does not exist", AbstractServlet.SC_UNPROCESSABLE_ENTITY, responseCode);
}
public void testSetExchangeAttributesDenied() throws Exception
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org