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 2724dcf44 Move StringRanges to root package.
2724dcf44 is described below
commit 2724dcf44f7e3ce55a0efd14d9fddc31cd4c1f94
Author: JamesBognar <[email protected]>
AuthorDate: Sun Jun 26 12:07:41 2022 -0400
Move StringRanges to root package.
---
.../main/java/org/apache/juneau/{http/header => }/StringRange.java | 3 +--
.../main/java/org/apache/juneau/{http/header => }/StringRanges.java | 3 +--
.../src/main/java/org/apache/juneau/http/header/AcceptCharset.java | 1 +
.../src/main/java/org/apache/juneau/http/header/AcceptEncoding.java | 1 +
.../src/main/java/org/apache/juneau/http/header/AcceptLanguage.java | 1 +
.../main/java/org/apache/juneau/http/header/ContentDisposition.java | 1 +
.../src/main/java/org/apache/juneau/http/header/TE.java | 1 +
.../src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java | 2 +-
.../src/test/java/org/apache/juneau/http/StringRange_Test.java | 3 +--
.../src/test/java/org/apache/juneau/http/StringRanges_Test.java | 4 ++--
.../test/java/org/apache/juneau/http/header/AcceptCharset_Test.java | 1 +
.../test/java/org/apache/juneau/http/header/AcceptEncoding_Test.java | 1 +
.../test/java/org/apache/juneau/http/header/AcceptLanguage_Test.java | 1 +
.../org/apache/juneau/http/header/BasicStringRangesHeader_Test.java | 1 +
.../java/org/apache/juneau/http/header/ContentDisposition_Test.java | 1 +
juneau-utest/src/test/java/org/apache/juneau/http/header/TE_Test.java | 1 +
16 files changed, 17 insertions(+), 9 deletions(-)
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/StringRange.java
similarity index 96%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRange.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
index ec6073879..4b66aa882 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/StringRange.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.ObjectUtils.*;
@@ -22,7 +22,6 @@ 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/StringRanges.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/StringRanges.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java
index d7417860f..57fc0ec7f 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/StringRanges.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.ArrayUtils.copyOf;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -21,7 +21,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/AcceptCharset.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptCharset.java
index 22d85bade..b88e3004e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptCharset.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptCharset.java
@@ -14,6 +14,7 @@ package org.apache.juneau.http.header;
import java.util.function.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptEncoding.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptEncoding.java
index 0eb36da77..0daa29fdf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptEncoding.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptEncoding.java
@@ -14,6 +14,7 @@ package org.apache.juneau.http.header;
import java.util.function.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptLanguage.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptLanguage.java
index 9d23c450f..b83ce7720 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptLanguage.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/AcceptLanguage.java
@@ -14,6 +14,7 @@ package org.apache.juneau.http.header;
import java.util.function.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentDisposition.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentDisposition.java
index a1a7bba67..9e9b52e38 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentDisposition.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/ContentDisposition.java
@@ -14,6 +14,7 @@ package org.apache.juneau.http.header;
import java.util.function.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/TE.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/TE.java
index 9fe33f600..71b8a329c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/TE.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/TE.java
@@ -14,6 +14,7 @@ package org.apache.juneau.http.header;
import java.util.function.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
diff --git
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
index 1ecefe80b..36b78cecc 100644
---
a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
+++
b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
@@ -26,8 +26,8 @@ import javax.ws.rs.core.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.*;
+import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.http.header.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
index d192c9244..6be723de8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
@@ -14,8 +14,7 @@ package org.apache.juneau.http;
import static org.junit.runners.MethodSorters.*;
-import org.apache.juneau.http.header.*;
-
+import org.apache.juneau.*;
import static org.apache.juneau.assertions.Assertions.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/StringRanges_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/StringRanges_Test.java
index a336c51aa..967d385ee 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/StringRanges_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/StringRanges_Test.java
@@ -16,9 +16,9 @@ import static org.junit.runners.MethodSorters.*;
import java.util.*;
-import org.apache.juneau.http.header.*;
+import org.apache.juneau.*;
+import static org.apache.juneau.StringRanges.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.header.StringRanges.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptCharset_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptCharset_Test.java
index e33856ea5..eff73e9be 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptCharset_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptCharset_Test.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.testutils.StreamUtils.*;
import java.io.*;
import java.util.function.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptEncoding_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptEncoding_Test.java
index 2ee311f72..57a9d2a85 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptEncoding_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptEncoding_Test.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.testutils.StreamUtils.*;
import java.io.*;
import java.util.function.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptLanguage_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptLanguage_Test.java
index 13be81a92..863edb8f1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptLanguage_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/AcceptLanguage_Test.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.testutils.StreamUtils.*;
import java.io.*;
import java.util.function.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringRangesHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringRangesHeader_Test.java
index 334abc355..1942e2151 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringRangesHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringRangesHeader_Test.java
@@ -18,6 +18,7 @@ import static org.apache.juneau.testutils.StreamUtils.*;
import java.io.*;
import java.util.function.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentDisposition_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentDisposition_Test.java
index ff95f3fb5..42df30a93 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentDisposition_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ContentDisposition_Test.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.testutils.StreamUtils.*;
import java.io.*;
import java.util.function.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/TE_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/TE_Test.java
index 78953d9ae..0c7e686a4 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/TE_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/TE_Test.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.testutils.StreamUtils.*;
import java.io.*;
import java.util.function.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.rest.annotation.*;
