Skip to content

Commit 1571731

Browse files
committed
Released Restlet Framework 2.3.9
1 parent 48754d3 commit 1571731

File tree

12 files changed

+108
-156
lines changed

12 files changed

+108
-156
lines changed

build/build.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
major-number: 2
77
minor-number: 3
88
# the last figure of the real release number: e.g. 1 in "2.2m1", "2.3rc1", "2.4.1"
9-
release-number:8
9+
release-number:9
1010
# choose among: final, snapshot, rc, milestone
11-
meta.release-type: snapshot
11+
meta.release-type: final
1212
version-minor: ${major-number}.${minor-number}
1313

1414
# Version of JDK required

build/tmpl/text/changes.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
Changes log
44
===========
55

6-
- @version-full@ (@release-date@)
6+
- 2.3.9 (12/19/2016)
77
- Bugs fixed
88
- In IE 10 and seq., request without body are sent with an "undefined" body. Issue #1252.
99
Reported by Etienne Griette.
1010
- Fixed potential NPE when a queue returns null in PipeStream. Issue #1246.
1111
Reported and contributed by Grégoire Juge.
12+
1213
- 2.3.8 (12/10/2016)
1314
- Bugs fixed
1415
- Fixed NullPointerException when requesting a Directory with a query string. Issue #1206.

libraries/com.thoughtworks.xstream_1.4/library.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<distribution id="classic" />
1717
</distributions>
1818
<javadocs>
19-
<link href="http://xstream.codehaus.org/javadoc/" />
19+
<link href="http://x-stream.github.io/javadoc/" />
2020
</javadocs>
2121
</library>

libraries/org.apache.commons.collections_3.2/library.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<distribution id="classic" />
1818
</distributions>
1919
<javadocs>
20-
<link href="http://commons.apache.org/proper/commons-collections/javadocs/api-3.2.1/" />
20+
<link href="http://commons.apache.org/proper/commons-collections/javadocs/api-3.2.2/" />
2121
</javadocs>
2222
</library>

modules/org.restlet.ext.jaxrs/src/org/restlet/ext/jaxrs/AbstractUriBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ public URI buildFromMap(Map<String, ? extends Object> values)
249249
* @throws UriBuilderException
250250
* if a URI cannot be constructed based on the current state of
251251
* the builder.
252-
* @see javax.ws.rs.core.UriBuilder#build(java.util.Map)
252+
* @see javax.ws.rs.core.UriBuilder#buildFromMap(Map)
253253
*/
254254
private URI buildFromMap(final Map<String, ? extends Object> values,
255255
final boolean encode) throws IllegalArgumentException,

modules/org.restlet.ext.jaxrs/src/org/restlet/ext/jaxrs/JaxRsRestlet.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public boolean addClass(Class<?> jaxRsClass)
275275
* @return true, if the provider is ok and added, otherwise false.
276276
* @throws IllegalArgumentException
277277
* if null was given
278-
* @see {@link javax.ws.rs.ext.Provider}
278+
* @see class {@link javax.ws.rs.ext.Provider}
279279
*/
280280
private boolean addDefaultProvider(Object jaxRsProvider) {
281281
try {
@@ -311,7 +311,7 @@ public boolean addSingleton(Object jaxRsProviderOrRootresourceObject)
311311
* @return true, if the provider is ok and added, otherwise false.
312312
* @throws IllegalArgumentException
313313
* if null was given
314-
* @see {@link javax.ws.rs.ext.Provider}
314+
* @see class {@link javax.ws.rs.ext.Provider}
315315
*/
316316
private boolean addSingleton(Object jaxRsProvider, boolean defaultProvider)
317317
throws IllegalArgumentException {
@@ -483,7 +483,7 @@ private Representation convertToRepresentation(Object entity,
483483
* @param o
484484
* @param subResourceLocator
485485
* @param callContext
486-
* @return
486+
* @return ResourceObject
487487
* @throws WebApplicationException
488488
* @throws RequestHandledException
489489
*/

modules/org.restlet.ext.oauth/src/org/restlet/ext/oauth/AccessTokenServerResource.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ protected String getPassword(Form parameters) throws OAuthException {
347347
* @throws OAuthException
348348
* In case the parameter is not set.
349349
*/
350-
protected String getRedirectURI(Form params) throws OAuthException {
351-
return getParameter(params, REDIR_URI);
350+
protected String getRedirectURI(Form parameters) throws OAuthException {
351+
return getParameter(parameters, REDIR_URI);
352352
}
353353

354354
/**
@@ -359,8 +359,8 @@ protected String getRedirectURI(Form params) throws OAuthException {
359359
* @throws OAuthException
360360
* In case the parameter is not set.
361361
*/
362-
protected String getRefreshToken(Form params) throws OAuthException {
363-
return getParameter(params, REFRESH_TOKEN);
362+
protected String getRefreshToken(Form parameters) throws OAuthException {
363+
return getParameter(parameters, REFRESH_TOKEN);
364364
}
365365

366366
/**
@@ -371,8 +371,8 @@ protected String getRefreshToken(Form params) throws OAuthException {
371371
* @throws OAuthException
372372
* In case the parameter is not set.
373373
*/
374-
protected String getUsername(Form params) throws OAuthException {
375-
return getParameter(params, USERNAME);
374+
protected String getUsername(Form parameters) throws OAuthException {
375+
return getParameter(parameters, USERNAME);
376376
}
377377

378378
/**

modules/org.restlet.ext.oauth/src/org/restlet/ext/oauth/AuthorizationServerResource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ protected RedirectionURI getRedirectionURI(Form parameters, Client client) throw
166166
* @return
167167
* @throws OAuthException
168168
*/
169-
protected ResponseType[] getResponseType(Form params) throws OAuthException {
170-
String responseType = params.getFirstValue(RESPONSE_TYPE);
169+
protected ResponseType[] getResponseType(Form parameters) throws OAuthException {
170+
String responseType = parameters.getFirstValue(RESPONSE_TYPE);
171171
if (StringUtils.isNullOrEmpty(responseType)) {
172172
throw new OAuthException(OAuthError.invalid_request, "No \"response_type\" parameter found.", null);
173173
}

modules/org.restlet.ext.oauth/src/org/restlet/ext/oauth/OAuthParameters.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public Reference toReference(String uri) {
181181
/**
182182
* Completes the URI with the OAuth parameters as query parameters.
183183
*
184-
* @param uri
184+
* @param ref
185185
* The URI to complete.
186186
* @return The URI with the set as Oauth parameters as query.
187187
*/

modules/org.restlet/src/org/restlet/engine/header/HeaderUtils.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -693,12 +693,10 @@ public static void addResponseHeaders(Response response,
693693
}
694694

695695
/**
696-
* Copies extension headers into a request.
696+
* Remove the headers that are mapped to the framework's API from the given message's list of headers.
697697
*
698-
* @param headers
699-
* The headers to copy.
700-
* @param request
701-
* The request to update.
698+
* @param message
699+
* The message to update.
702700
*/
703701
public static void keepExtensionHeadersOnly(Message message) {
704702
Series<Header> headers = message.getHeaders();
@@ -719,8 +717,8 @@ public static void keepExtensionHeadersOnly(Message message) {
719717
*
720718
* @param headers
721719
* The headers to copy.
722-
* @param request
723-
* The request to update.
720+
* @param message
721+
* The message to update.
724722
*/
725723
public static void copyExtensionHeaders(Series<Header> headers, Message message) {
726724
if (headers != null) {

0 commit comments

Comments
 (0)