[sling-org-apache-sling-api] branch master updated: SLING-10031 Move MediaRangeList from Servlets POST to Sling API

[ol...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git


The following commit(s) were added to refs/heads/master by this push:
     new 314c174  SLING-10031 Move MediaRangeList from Servlets POST to Sling API
314c174 is described below

commit 314c1742bc6a5041b1782b512242cdfdeb8e0e0f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jan 5 13:43:20 2021 +0100

    SLING-10031 Move MediaRangeList from Servlets POST to Sling API
    
    move MediaRangeList to package org.apache.sling.api.request.header
---
 .../org/apache/sling/api/request/{ => header}/MediaRangeList.java   | 5 ++++-
 .../org/apache/sling/api/request/{ => header}/package-info.java     | 6 ++----
 src/main/java/org/apache/sling/api/request/package-info.java        | 3 +--
 .../apache/sling/api/request/{ => header}/MediaRangeListTest.java   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/sling/api/request/MediaRangeList.java b/src/main/java/org/apache/sling/api/request/header/MediaRangeList.java
similarity index 99%
rename from src/main/java/org/apache/sling/api/request/MediaRangeList.java
rename to src/main/java/org/apache/sling/api/request/header/MediaRangeList.java
index d58e00a..4674fb0 100644
--- a/src/main/java/org/apache/sling/api/request/MediaRangeList.java
+++ b/src/main/java/org/apache/sling/api/request/header/MediaRangeList.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.api.request;
+package org.apache.sling.api.request.header;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -24,6 +24,7 @@ import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.osgi.annotation.versioning.ConsumerType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,7 +32,9 @@ import org.slf4j.LoggerFactory;
  * Facilitates parsing of the Accept HTTP request header.
  * See <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1">RFC 2616 section 14.1</a>
  */
+@ConsumerType
 public class MediaRangeList extends TreeSet<MediaRangeList.MediaRange> {
+
     public static final String HEADER_ACCEPT = "Accept";
     public static final String PARAM_ACCEPT = ":http-equiv-accept";
     public static final String WILDCARD = "*";
diff --git a/src/main/java/org/apache/sling/api/request/package-info.java b/src/main/java/org/apache/sling/api/request/header/package-info.java
similarity index 93%
copy from src/main/java/org/apache/sling/api/request/package-info.java
copy to src/main/java/org/apache/sling/api/request/header/package-info.java
index c31532f..386b026 100644
--- a/src/main/java/org/apache/sling/api/request/package-info.java
+++ b/src/main/java/org/apache/sling/api/request/header/package-info.java
@@ -16,9 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-@Version("2.5.0")
-package org.apache.sling.api.request;
+@Version("1.0.0")
+package org.apache.sling.api.request.header;
 
 import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/request/package-info.java b/src/main/java/org/apache/sling/api/request/package-info.java
index c31532f..052e56d 100644
--- a/src/main/java/org/apache/sling/api/request/package-info.java
+++ b/src/main/java/org/apache/sling/api/request/package-info.java
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-@Version("2.5.0")
+@Version("2.4.4")
 package org.apache.sling.api.request;
 
 import org.osgi.annotation.versioning.Version;
-
diff --git a/src/test/java/org/apache/sling/api/request/MediaRangeListTest.java b/src/test/java/org/apache/sling/api/request/header/MediaRangeListTest.java
similarity index 98%
rename from src/test/java/org/apache/sling/api/request/MediaRangeListTest.java
rename to src/test/java/org/apache/sling/api/request/header/MediaRangeListTest.java
index 4cf706c..f0c7991 100644
--- a/src/test/java/org/apache/sling/api/request/MediaRangeListTest.java
+++ b/src/test/java/org/apache/sling/api/request/header/MediaRangeListTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.api.request;
+package org.apache.sling.api.request.header;
 
 import junit.framework.TestCase;
 import org.apache.sling.commons.testing.sling.MockSlingHttpServletRequest;