This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 162a704fe Move MediaRanges to root package.
162a704fe is described below
commit 162a704fee2da7d12c4b4655e53eb0d5f5a824cb
Author: JamesBognar <[email protected]>
AuthorDate: Sun Jun 26 12:03:33 2022 -0400
Move MediaRanges to root package.
---
.../src/main/java/org/apache/juneau/{http/header => }/MediaRange.java | 3 +--
.../src/main/java/org/apache/juneau/{http/header => }/MediaRanges.java | 3 +--
.../java/org/apache/juneau/http/header/BasicStringRangesHeader.java | 2 ++
.../src/main/java/org/apache/juneau/http/header/StringRange.java | 1 +
.../src/main/java/org/apache/juneau/http/header/StringRanges.java | 1 +
.../src/main/java/org/apache/juneau/serializer/Serializer.java | 1 -
.../src/test/java/org/apache/juneau/http/MediaRanges_Test.java | 3 +--
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
similarity index 98%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaRange.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
index 0535e78d8..19ab58bec 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http.header;
+package org.apache.juneau;
import static org.apache.juneau.http.HttpParts.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -19,7 +19,6 @@ import java.util.*;
import java.util.function.*;
import org.apache.http.*;
-import org.apache.juneau.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaRanges.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaRanges.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
index d35bb5e5e..5bc763efa 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/MediaRanges.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.http.header;
+package org.apache.juneau;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
@@ -20,7 +20,6 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.http.message.*;
-import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
index a2515cbe4..52f9b7c8e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
@@ -18,6 +18,8 @@ import static org.apache.juneau.internal.StringUtils.*;
import java.util.*;
import java.util.function.*;
+import org.apache.juneau.*;
+
/**
* Category of headers that consist of simple comma-delimited lists of strings
with q-values.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRange.java
index 540183bd9..ec6073879 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRange.java
@@ -22,6 +22,7 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.http.message.*;
+import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRanges.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRanges.java
index 31f4017f0..d7417860f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRanges.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRanges.java
@@ -21,6 +21,7 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.http.message.*;
+import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index fcbeb2669..67fb4461c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -24,7 +24,6 @@ import java.util.function.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.soap.*;
import org.apache.juneau.utils.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_Test.java
index b3a984e76..893f01f11 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_Test.java
@@ -12,14 +12,13 @@
//
***************************************************************************************************************************
package org.apache.juneau.http;
+import static org.apache.juneau.MediaRanges.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.MediaRanges.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
-import org.apache.juneau.http.header.*;
import org.junit.*;
@FixMethodOrder(NAME_ASCENDING)
