Skip to content

Commit 22d52f2

Browse files
jlouveljlouvel
authored
Merge pull request #1432 from restlet/2.5-webdav-deprecation
Deprecated WebDAV support
2 parents 9e8e8b4 + bc0d50a commit 22d52f2

File tree

7 files changed

+74
-14
lines changed

7 files changed

+74
-14
lines changed

‎org.restlet.gwt/org.restlet.gwt/src/main/java/org/restlet/client/data/Method.java‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public final class Method implements Comparable<Method> {
3535

3636
private static final String BASE_HTTP = "http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html";
3737

38+
@Deprecated
3839
private static final String BASE_WEBDAV = "http://www.webdav.org/specs/rfc2518.html";
3940

4041
/**
@@ -56,7 +57,9 @@ public final class Method implements Comparable<Method> {
5657
* @see <a
5758
* href="http://www.webdav.org/specs/rfc2518.html#METHOD_COPY">WEBDAV
5859
* RFC - 8.8 COPY Method</a>
59-
*/
60+
* @deprecated Will be removed in next version.
61+
*/
62+
@Deprecated
6063
public static final Method COPY = new Method(
6164
"COPY",
6265
"Creates a duplicate of the source resource, identified by the Request-URI, in the destination resource, identified by the URI in the Destination header",
@@ -108,7 +111,9 @@ public final class Method implements Comparable<Method> {
108111
* @see <a
109112
* href="http://www.webdav.org/specs/rfc2518.html#METHOD_LOCK">WEBDAV
110113
* RFC - 8.10 LOCK Method</a>
111-
*/
114+
* @deprecated Will be removed in next version.
115+
*/
116+
@Deprecated
112117
public static final Method LOCK = new Method("LOCK",
113118
"Used to take out a lock of any access type (WebDAV)", BASE_WEBDAV
114119
+ "#METHOD_LOCK", false, false);
@@ -120,7 +125,9 @@ public final class Method implements Comparable<Method> {
120125
* @see <a
121126
* href="http://www.webdav.org/specs/rfc2518.html#METHOD_MKCOL">WEBDAV
122127
* RFC - 8.3 MKCOL Method</a>
123-
*/
128+
* @deprecated Will be removed in next version.
129+
*/
130+
@Deprecated
124131
public static final Method MKCOL = new Method("MKCOL",
125132
"Used to create a new collection (WebDAV)", BASE_WEBDAV
126133
+ "#METHOD_MKCOL", false, true);
@@ -133,7 +140,9 @@ public final class Method implements Comparable<Method> {
133140
* @see <a
134141
* href="http://www.webdav.org/specs/rfc2518.html#METHOD_MOVE">WEBDAV
135142
* RFC - 8.3 MKCOL Method</a>
136-
*/
143+
* @deprecated Will be removed in next version.
144+
*/
145+
@Deprecated
137146
public static final Method MOVE = new Method(
138147
"MOVE",
139148
"Logical equivalent of a copy, followed by consistency maintenance processing, followed by a delete of the source (WebDAV)",
@@ -185,7 +194,9 @@ public final class Method implements Comparable<Method> {
185194
* @see <a
186195
* href="http://www.webdav.org/specs/rfc2518.html#METHOD_PROPFIND">WEBDAV
187196
* RFC - 8.1 PROPFIND</a>
188-
*/
197+
* @deprecated Will be removed in next version.
198+
*/
199+
@Deprecated
189200
public static final Method PROPFIND = new Method(
190201
"PROPFIND",
191202
"Retrieves properties defined on the resource identified by the request URI",
@@ -198,7 +209,9 @@ public final class Method implements Comparable<Method> {
198209
* @see <a
199210
* href="http://www.webdav.org/specs/rfc2518.html#METHOD_PROPPATCH">WEBDAV
200211
* RFC - 8.2 PROPPATCH</a>
201-
*/
212+
* @deprecated Will be removed in next version.
213+
*/
214+
@Deprecated
202215
public static final Method PROPPATCH = new Method(
203216
"PROPPATCH",
204217
"Processes instructions specified in the request body to set and/or remove properties defined on the resource identified by the request URI",
@@ -237,7 +250,9 @@ public final class Method implements Comparable<Method> {
237250
* @see <a
238251
* href="http://www.webdav.org/specs/rfc2518.html#METHOD_UNLOCK">WEBDAV
239252
* RFC - 8.11 UNLOCK Method</a>
240-
*/
253+
* @deprecated Will be removed in next version.
254+
*/
255+
@Deprecated
241256
public static final Method UNLOCK = new Method(
242257
"UNLOCK",
243258
"Removes the lock identified by the lock token from the request URI, and all other resources included in the lock",

‎org.restlet.gwt/org.restlet.gwt/src/main/java/org/restlet/client/data/Status.java‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public final class Status {
2727
+ Engine.MINOR_NUMBER
2828
+ "/gwt/api/";
2929

30+
@Deprecated
3031
private static final String BASE_WEBDAV = "http://www.webdav.org/specs/rfc2518.html";
3132

3233
/**
@@ -67,7 +68,9 @@ public final class Status {
6768
*
6869
* @see <a href="http://www.webdav.org/specs/rfc2518.html#STATUS_424">WEBDAV
6970
* RFC - 10.5 424 Failed Dependency</a>
70-
*/
71+
* @deprecated Will be removed in next version.
72+
*/
73+
@Deprecated
7174
public static final Status CLIENT_ERROR_FAILED_DEPENDENCY = new Status(424);
7275

7376
/**
@@ -106,7 +109,9 @@ public final class Status {
106109
*
107110
* @see <a href="http://www.webdav.org/specs/rfc2518.html#STATUS_423">WEBDAV
108111
* RFC - 10.4 423 Locked</a>
109-
*/
112+
* @deprecated Will be removed in next version.
113+
*/
114+
@Deprecated
110115
public static final Status CLIENT_ERROR_LOCKED = new Status(423);
111116

112117
/**
@@ -241,7 +246,9 @@ public final class Status {
241246
*
242247
* @see <a href="http://www.webdav.org/specs/rfc2518.html#STATUS_422">WEBDAV
243248
* RFC - 10.3 422 Unprocessable Entity</a>
244-
*/
249+
* @deprecated Will be removed in next version.
250+
*/
251+
@Deprecated
245252
public static final Status CLIENT_ERROR_UNPROCESSABLE_ENTITY = new Status(
246253
422);
247254

@@ -327,7 +334,9 @@ public final class Status {
327334
*
328335
* @see <a href="http://www.webdav.org/specs/rfc2518.html#STATUS_102">WEBDAV
329336
* RFC - 10.1 102 Processing</a>
330-
*/
337+
* @deprecated Will be removed in next version.
338+
*/
339+
@Deprecated
331340
public static final Status INFO_PROCESSING = new Status(102);
332341

333342
/**
@@ -462,7 +471,9 @@ public final class Status {
462471
*
463472
* @see <a href="http://www.webdav.org/specs/rfc2518.html#STATUS_507">WEBDAV
464473
* RFC - 10.6 507 Insufficient Storage</a>
465-
*/
474+
* @deprecated Will be removed in next version.
475+
*/
476+
@Deprecated
466477
public static final Status SERVER_ERROR_INSUFFICIENT_STORAGE = new Status(
467478
507);
468479

@@ -544,7 +555,9 @@ public final class Status {
544555
*
545556
* @see <a href="http://www.webdav.org/specs/rfc2518.html#STATUS_207">WEBDAV
546557
* RFC - 10.2 207 Multi-Status</a>
547-
*/
558+
* @deprecated Will be removed in next version.
559+
*/
560+
@Deprecated
548561
public static final Status SUCCESS_MULTI_STATUS = new Status(207);
549562

550563
/**

‎org.restlet.gwt/org.restlet.gwt/src/main/java/org/restlet/client/engine/connector/WebDavProtocolHelper.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
* Protocol helper for the WEBDAV protocol.
1616
*
1717
* @author Thierry Boileau
18-
*
18+
* @deprecated Will be removed in next version.
1919
*/
20+
@Deprecated
2021
public class WebDavProtocolHelper extends ProtocolHelper {
2122

2223
@Override

‎org.restlet.java/org.restlet/src/main/java/org/restlet/data/Method.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public final class Method implements Comparable<Method> {
3434

3535
private static final String BASE_HTTP = "http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html";
3636

37+
@Deprecated
3738
private static final String BASE_WEBDAV = "http://www.webdav.org/specs/rfc2518.html";
3839

3940
/**
@@ -52,7 +53,9 @@ public final class Method implements Comparable<Method> {
5253
*
5354
* @see <a href="http://www.webdav.org/specs/rfc2518.html#METHOD_COPY">WEBDAV
5455
* RFC - 8.8 COPY Method</a>
56+
* @deprecated Will be removed in next version.
5557
*/
58+
@Deprecated
5659
public static final Method COPY = new Method("COPY",
5760
"Creates a duplicate of the source resource, identified by the Request-URI, in the destination resource, identified by the URI in the Destination header",
5861
BASE_WEBDAV + "#METHOD_COPY", false, true);
@@ -99,7 +102,9 @@ public final class Method implements Comparable<Method> {
99102
*
100103
* @see <a href="http://www.webdav.org/specs/rfc2518.html#METHOD_LOCK">WEBDAV
101104
* RFC - 8.10 LOCK Method</a>
105+
* @deprecated Will be removed in next version.
102106
*/
107+
@Deprecated
103108
public static final Method LOCK = new Method("LOCK", "Used to take out a lock of any access type (WebDAV)",
104109
BASE_WEBDAV + "#METHOD_LOCK", false, false);
105110

@@ -109,7 +114,9 @@ public final class Method implements Comparable<Method> {
109114
*
110115
* @see <a href="http://www.webdav.org/specs/rfc2518.html#METHOD_MKCOL">WEBDAV
111116
* RFC - 8.3 MKCOL Method</a>
117+
* @deprecated Will be removed in next version.
112118
*/
119+
@Deprecated
113120
public static final Method MKCOL = new Method("MKCOL", "Used to create a new collection (WebDAV)",
114121
BASE_WEBDAV + "#METHOD_MKCOL", false, true);
115122

@@ -120,7 +127,9 @@ public final class Method implements Comparable<Method> {
120127
*
121128
* @see <a href="http://www.webdav.org/specs/rfc2518.html#METHOD_MOVE">WEBDAV
122129
* RFC - 8.3 MKCOL Method</a>
130+
* @deprecated Will be removed in next version.
123131
*/
132+
@Deprecated
124133
public static final Method MOVE = new Method("MOVE",
125134
"Logical equivalent of a copy, followed by consistency maintenance processing, followed by a delete of the source (WebDAV)",
126135
BASE_WEBDAV + "#METHOD_MOVE", false, false);
@@ -166,7 +175,9 @@ public final class Method implements Comparable<Method> {
166175
* @see <a href=
167176
* "http://www.webdav.org/specs/rfc2518.html#METHOD_PROPFIND">WEBDAV RFC -
168177
* 8.1 PROPFIND</a>
178+
* @deprecated Will be removed in next version.
169179
*/
180+
@Deprecated
170181
public static final Method PROPFIND = new Method("PROPFIND",
171182
"Retrieves properties defined on the resource identified by the request URI",
172183
BASE_WEBDAV + "#METHOD_PROPFIND", true, true);
@@ -178,7 +189,9 @@ public final class Method implements Comparable<Method> {
178189
* @see <a href=
179190
* "http://www.webdav.org/specs/rfc2518.html#METHOD_PROPPATCH">WEBDAV RFC -
180191
* 8.2 PROPPATCH</a>
192+
* @deprecated Will be removed in next version.
181193
*/
194+
@Deprecated
182195
public static final Method PROPPATCH = new Method("PROPPATCH",
183196
"Processes instructions specified in the request body to set and/or remove properties defined on the resource identified by the request URI",
184197
BASE_WEBDAV + "#METHOD_PROPPATCH", false, true);
@@ -210,7 +223,9 @@ public final class Method implements Comparable<Method> {
210223
*
211224
* @see <a href="http://www.webdav.org/specs/rfc2518.html#METHOD_UNLOCK">WEBDAV
212225
* RFC - 8.11 UNLOCK Method</a>
226+
* @deprecated Will be removed in next version.
213227
*/
228+
@Deprecated
214229
public static final Method UNLOCK = new Method("UNLOCK",
215230
"Removes the lock identified by the lock token from the request URI, and all other resources included in the lock",
216231
BASE_WEBDAV + "#METHOD_UNLOCK", false, false);

‎org.restlet.java/org.restlet/src/main/java/org/restlet/data/Status.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public final class Status {
2424
private static final String BASE_RESTLET = "https://javadocs.restlet.talend.com/" + Engine.MAJOR_NUMBER + '.'
2525
+ Engine.MINOR_NUMBER + "/api/";
2626

27+
@Deprecated
2728
private static final String BASE_WEBDAV = "http://www.webdav.org/specs/rfc2518.html";
2829

2930
/**
@@ -62,7 +63,9 @@ public final class Status {
6263
*
6364
* @see <a href="http://www.webdav.org/specs/rfc2518.html#STATUS_424">WEBDAV RFC
6465
* - 10.5 424 Failed Dependency</a>
66+
* @deprecated Will be removed in next version.
6567
*/
68+
@Deprecated
6669
public static final Status CLIENT_ERROR_FAILED_DEPENDENCY = new Status(424);
6770

6871
/**
@@ -100,7 +103,9 @@ public final class Status {
100103
*
101104
* @see <a href="http://www.webdav.org/specs/rfc2518.html#STATUS_423">WEBDAV RFC
102105
* - 10.4 423 Locked</a>
106+
* @deprecated Will be removed in next version.
103107
*/
108+
@Deprecated
104109
public static final Status CLIENT_ERROR_LOCKED = new Status(423);
105110

106111
/**
@@ -229,7 +234,9 @@ public final class Status {
229234
*
230235
* @see <a href="http://www.webdav.org/specs/rfc2518.html#STATUS_422">WEBDAV RFC
231236
* - 10.3 422 Unprocessable Entity</a>
237+
* @deprecated Will be removed in next version.
232238
*/
239+
@Deprecated
233240
public static final Status CLIENT_ERROR_UNPROCESSABLE_ENTITY = new Status(422);
234241

235242
/**
@@ -312,7 +319,9 @@ public final class Status {
312319
*
313320
* @see <a href="http://www.webdav.org/specs/rfc2518.html#STATUS_102">WEBDAV RFC
314321
* - 10.1 102 Processing</a>
322+
* @deprecated Will be removed in next version.
315323
*/
324+
@Deprecated
316325
public static final Status INFO_PROCESSING = new Status(102);
317326

318327
/**
@@ -446,7 +455,9 @@ public final class Status {
446455
*
447456
* @see <a href="http://www.webdav.org/specs/rfc2518.html#STATUS_507">WEBDAV RFC
448457
* - 10.6 507 Insufficient Storage</a>
458+
* @deprecated Will be removed in next version.
449459
*/
460+
@Deprecated
450461
public static final Status SERVER_ERROR_INSUFFICIENT_STORAGE = new Status(507);
451462

452463
/**
@@ -524,7 +535,9 @@ public final class Status {
524535
*
525536
* @see <a href="http://www.webdav.org/specs/rfc2518.html#STATUS_207">WEBDAV RFC
526537
* - 10.2 207 Multi-Status</a>
538+
* @deprecated Will be removed in next version.
527539
*/
540+
@Deprecated
528541
public static final Status SUCCESS_MULTI_STATUS = new Status(207);
529542

530543
/**

‎org.restlet.java/org.restlet/src/main/java/org/restlet/engine/Engine.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,7 @@ public void registerDefaultConverters() {
784784
/**
785785
* Registers the default protocols.
786786
*/
787+
@SuppressWarnings("deprecation")
787788
public void registerDefaultProtocols() {
788789
getRegisteredProtocols().add(new org.restlet.engine.connector.HttpProtocolHelper());
789790
getRegisteredProtocols().add(new org.restlet.engine.connector.WebDavProtocolHelper());

‎org.restlet.java/org.restlet/src/main/java/org/restlet/engine/connector/WebDavProtocolHelper.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
* Protocol helper for the WEBDAV protocol.
1616
*
1717
* @author Thierry Boileau
18+
* @deprecated Will be removed in next version.
1819
*/
20+
@Deprecated
1921
public class WebDavProtocolHelper extends ProtocolHelper {
2022

2123
@Override

0 commit comments

Comments
 (0)