Author: rgodfrey
Date: Mon Jul 6 19:07:43 2015
New Revision: 1689480
URL: http://svn.apache.org/r1689480
Log:
QPID-6626 : [Java Broker] Provide a mechanism by which the supported API
versions can be communicated through the REST API
Added:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/JsonValueServlet.java
(with props)
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1689480&r1=1689479&r2=1689480&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Mon Jul 6 19:07:43 2015
@@ -69,6 +69,7 @@ import org.apache.qpid.server.management
import org.apache.qpid.server.management.plugin.servlet.FileServlet;
import org.apache.qpid.server.management.plugin.servlet.RootServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.ApiDocsServlet;
+import org.apache.qpid.server.management.plugin.servlet.rest.JsonValueServlet;
import
org.apache.qpid.server.management.plugin.servlet.rest.LoggedOnUserPreferencesServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.LogoutServlet;
import
org.apache.qpid.server.management.plugin.servlet.rest.MessageContentServlet;
@@ -504,6 +505,21 @@ public class HttpManagement extends Abst
}
+
+ final ServletHolder versionsServletHolder = new ServletHolder(new
JsonValueServlet(getApiProperties()));
+ root.addServlet(versionsServletHolder,"/api");
+ root.addServlet(versionsServletHolder,"/api/");
+
+ }
+
+ private Map<String, Object> getApiProperties()
+ {
+ return Collections.<String,Object>singletonMap("supportedVersions",
getSupportedRestApiVersions());
+ }
+
+ private List<String> getSupportedRestApiVersions()
+ {
+ return
Collections.singletonList(String.valueOf(BrokerModel.MODEL_MAJOR_VERSION));
}
private void logOperationalListenMessages(Collection<Port<?>> ports)
Added:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/JsonValueServlet.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/JsonValueServlet.java?rev=1689480&view=auto
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/JsonValueServlet.java
(added)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/JsonValueServlet.java
Mon Jul 6 19:07:43 2015
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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.server.management.plugin.servlet.rest;
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class JsonValueServlet extends AbstractServlet
+{
+ private final Object _value;
+
+ public JsonValueServlet(Object value)
+ {
+ _value = value;
+ }
+
+ @Override
+ protected void doGetWithSubjectAndActor(final HttpServletRequest request,
final HttpServletResponse resp)
+ throws ServletException, IOException
+ {
+ sendJsonResponse(_value, request, resp);
+ }
+}
Propchange:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/JsonValueServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
