svn commit: r1215274 - /abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/Preference.java

[jm...@apache.org]

Author: jmsnell
Date: Fri Dec 16 21:05:16 2011
New Revision: 1215274

URL: http://svn.apache.org/viewvc?rev=1215274&view=rev
Log:
Catch up with latest version of the Internet-Draft

Modified:
    abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/Preference.java

Modified: abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/Preference.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/Preference.java?rev=1215274&r1=1215273&r2=1215274&view=diff
==============================================================================
--- abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/Preference.java (original)
+++ abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/Preference.java Fri Dec 16 21:05:16 2011
@@ -47,11 +47,16 @@ import com.google.common.collect.Immutab
  */
 public class Preference implements Serializable {
   
-  public static final String RETURN_NO_CONTENT = "return-no-content";
+  public static final String RETURN_MINIMAL = "return-minimal";
   public static final String RETURN_ACCEPTED = "return-accepted";
-  public static final String RETURN_CONTENT = "return-content";
-  public static final String RETURN_STATUS = "return-status";
+  public static final String RETURN_REPRESENTATION = "return-representation";
   public static final String WAIT = "wait";
+  public static final String STRICT= "strict";
+  public static final String LENIENT = "lenient";
+  
+  public static final Preference PREF_STRICT = new Preference(STRICT);
+  
+  public static final Preference PREF_LENIENT = new Preference(LENIENT);
   
   /** 
    * The "return-no-content" token indicates that the client prefers that
@@ -60,8 +65,8 @@ public class Preference implements Seria
    * status code as defined in Section 10.2.5 of [RFC2616], but other
    * status codes can be used as appropriate.
    */
-  public static final Preference PREF_RETURN_NO_CONTENT = 
-    new Preference(RETURN_NO_CONTENT);
+  public static final Preference PREF_RETURN_MINIMAL = 
+    new Preference(RETURN_MINIMAL);
   
   /**
    * The "return-accepted" token indicates that the client prefers that
@@ -76,8 +81,8 @@ public class Preference implements Seria
    * server include an entity representing the current state of the
    * resource in the response to a successful request.
    */
-  public static final Preference PREF_RETURN_CONTENT =
-    new Preference(RETURN_CONTENT);
+  public static final Preference PREF_RETURN_REPRESENTATION =
+    new Preference(RETURN_REPRESENTATION);
   
   public static Preference WAIT(long millis) {
     return 
@@ -152,14 +157,6 @@ public class Preference implements Seria
     
   }
   
-  /**
-   * The "return-status" token indicates that the client prefers that the
-   * server include an entity describing the status of the request in the
-   * response to a successful request.
-   */
-  public static final Preference PREF_RETURN_STATUS = 
-    new Preference(RETURN_STATUS);
-  
   private static final long serialVersionUID = -6238673046322517740L;
   private final String token;
   private final String value;