Author: fmeschbe
Date: Thu Feb 20 10:47:23 2014
New Revision: 1570135
URL: http://svn.apache.org/r1570135
Log:
SLING-3403 Provide new parameter API
* RequestParameter.getName(): the name of the request parameter
* SlingHttpServletRequest.getRequestParameterList(): List of request
parameters in HTTP request order
* Adapt SlingHttpServletRequestWrapper and increase API version
Modified:
sling/trunk/bundles/api/ (props changed)
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/package-info.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameter.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/package-info.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/package-info.java
Propchange: sling/trunk/bundles/api/
------------------------------------------------------------------------------
Merged /sling/whiteboard/fmeschbe/parameters/api:r1569230-1570099
Merged /sling/trunk/bundles/api:r1567611-1569227
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java?rev=1570135&r1=1570134&r2=1570135&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
Thu Feb 20 10:47:23 2014
@@ -19,6 +19,7 @@
package org.apache.sling.api;
import java.util.Enumeration;
+import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -34,7 +35,6 @@ import org.apache.sling.api.request.Requ
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-
import aQute.bnd.annotation.ProviderType;
/**
@@ -145,6 +145,18 @@ public interface SlingHttpServletRequest
RequestParameterMap getRequestParameterMap();
/**
+ * Returns the request parameters as instances of the
+ * {@link RequestParameter} interface in the order or the request where the
+ * query string parameters are first and the POST request parameters are
+ * second.
+ *
+ * @return The list of {@link RequestParameter} in request declaration
+ * order.
+ * @since 2.3 (bundle version 2.6)
+ */
+ List<RequestParameter> getRequestParameterList();
+
+ /**
* Returns a <code>RequestDispatcher</code> object that acts as a wrapper
* for the resource located at the given path. A
* <code>RequestDispatcher</code> object can be used to include the
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/package-info.java?rev=1570135&r1=1570134&r2=1570135&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/package-info.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/package-info.java
Thu Feb 20 10:47:23 2014
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.2")
+@Version("2.3")
package org.apache.sling.api;
import aQute.bnd.annotation.Version;
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameter.java?rev=1570135&r1=1570134&r2=1570135&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameter.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/RequestParameter.java
Thu Feb 20 10:47:23 2014
@@ -39,6 +39,12 @@ import aQute.bnd.annotation.ProviderType
public interface RequestParameter {
/**
+ * @return the name of this {@code RequestParameter}
+ * @since 2.4 (bundle version 2.6)
+ */
+ String getName();
+
+ /**
* Determines whether or not this instance represents a simple form field
or
* an uploaded file.
*
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/package-info.java?rev=1570135&r1=1570134&r2=1570135&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/package-info.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/request/package-info.java
Thu Feb 20 10:47:23 2014
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.3")
+@Version("2.4")
package org.apache.sling.api.request;
import aQute.bnd.annotation.Version;
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java?rev=1570135&r1=1570134&r2=1570135&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
Thu Feb 20 10:47:23 2014
@@ -19,6 +19,7 @@
package org.apache.sling.api.wrappers;
import java.util.Enumeration;
+import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -86,6 +87,10 @@ public class SlingHttpServletRequestWrap
return getSlingRequest().getRequestParameterMap();
}
+ public List<RequestParameter> getRequestParameterList() {
+ return getSlingRequest().getRequestParameterList();
+ }
+
public RequestParameter[] getRequestParameters(String name) {
return getSlingRequest().getRequestParameters(name);
}
@@ -109,7 +114,7 @@ public class SlingHttpServletRequestWrap
public ResourceBundle getResourceBundle(String baseName, Locale locale) {
return getSlingRequest().getResourceBundle(baseName, locale);
}
-
+
public String getResponseContentType() {
return getSlingRequest().getResponseContentType();
}
@@ -117,7 +122,7 @@ public class SlingHttpServletRequestWrap
public Enumeration<String> getResponseContentTypes() {
return getSlingRequest().getResponseContentTypes();
}
-
+
public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
return getSlingRequest().adaptTo(type);
}
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/package-info.java?rev=1570135&r1=1570134&r2=1570135&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/package-info.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/wrappers/package-info.java
Thu Feb 20 10:47:23 2014
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.3")
+@Version("2.4")
package org.apache.sling.api.wrappers;
import aQute.bnd.annotation.Version;
