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 2efaa86e99 Utility class cleanup
2efaa86e99 is described below
commit 2efaa86e99a27c26f2d791231f80171ad7e5be38
Author: James Bognar <[email protected]>
AuthorDate: Fri Oct 31 10:58:44 2025 -0400
Utility class cleanup
---
.../java/org/apache/juneau/common}/collections/ControlledArrayList.java | 2 +-
.../src/main/java/org/apache/juneau/common/io}/LocalDir.java | 2 +-
.../src/main/java/org/apache/juneau/common/io}/LocalFile.java | 2 +-
.../src/main/java/org/apache/juneau/cp/BasicFileFinder.java | 1 +
.../juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java | 1 +
.../src/main/java/org/apache/juneau/http/header/HeaderList.java | 1 +
.../src/main/java/org/apache/juneau/http/part/PartList.java | 1 +
.../main/java/org/apache/juneau/rest/debug/BasicDebugEnablement.java | 1 +
.../src/main/java/org/apache/juneau/rest/util}/DefaultClassList.java | 2 +-
.../src/main/java/org/apache/juneau/rest/util}/DefaultSettingsMap.java | 2 +-
.../src/main/java/org/apache/juneau/rest/util}/MethodList.java | 2 +-
.../java/org/apache/juneau/collections/ControlledArrayList_Test.java | 1 +
.../src/test/java/org/apache/juneau/cp/DefaultClassList_Test.java | 2 +-
juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java | 1 +
14 files changed, 14 insertions(+), 7 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ControlledArrayList.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ControlledArrayList.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ControlledArrayList.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ControlledArrayList.java
index 928708e627..13e91fcef0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/ControlledArrayList.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ControlledArrayList.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.collections;
+package org.apache.juneau.common.collections;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/LocalDir.java
similarity index 99%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/LocalDir.java
index 8ebc229e7f..3a946f84df 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/LocalDir.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.cp;
+package org.apache.juneau.common.io;
import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.StringUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalFile.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/LocalFile.java
similarity index 98%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalFile.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/LocalFile.java
index b4ec616102..2fe20c9670 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalFile.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/io/LocalFile.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.cp;
+package org.apache.juneau.common.io;
import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.IOUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
index a4a5c3b5a4..e1f82e93f8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
@@ -29,6 +29,7 @@ import java.util.ResourceBundle.*;
import java.util.concurrent.*;
import java.util.regex.*;
+import org.apache.juneau.common.io.*;
import org.apache.juneau.common.utils.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
index 87650b0017..68b6a795b2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
@@ -26,6 +26,7 @@ import java.util.*;
import java.util.regex.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.io.*;
/**
* Utility class for finding regular or localized files on the classpath and
file system.
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
index 23cbffa5d1..88ed30095f 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
@@ -29,6 +29,7 @@ import java.util.stream.*;
import org.apache.http.*;
import org.apache.http.util.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.collections.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.http.HttpHeaders;
import org.apache.juneau.svl.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
index 5d271193ef..22f963e6ac 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
@@ -29,6 +29,7 @@ import java.util.stream.*;
import org.apache.http.*;
import org.apache.http.util.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.collections.*;
import org.apache.juneau.common.utils.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/BasicDebugEnablement.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/BasicDebugEnablement.java
index 231cd9a0f7..69b143ce1a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/BasicDebugEnablement.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/debug/BasicDebugEnablement.java
@@ -26,6 +26,7 @@ import org.apache.juneau.cp.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.util.*;
import org.apache.juneau.svl.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/DefaultClassList.java
similarity index 98%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/DefaultClassList.java
index 0b87a3dcfb..dc33662efc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/DefaultClassList.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.cp;
+package org.apache.juneau.rest.util;
import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.CollectionUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultSettingsMap.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/DefaultSettingsMap.java
similarity index 98%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultSettingsMap.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/DefaultSettingsMap.java
index 317263b6c3..3ccb556f14 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultSettingsMap.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/DefaultSettingsMap.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.cp;
+package org.apache.juneau.rest.util;
import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/MethodList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/MethodList.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/MethodList.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/MethodList.java
index 3b042b66f9..7e5ab5d5b1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/MethodList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/MethodList.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juneau.cp;
+package org.apache.juneau.rest.util;
import java.lang.reflect.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/collections/ControlledArrayList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/collections/ControlledArrayList_Test.java
index 64d129b855..54479a5119 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/collections/ControlledArrayList_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/collections/ControlledArrayList_Test.java
@@ -20,6 +20,7 @@ import static
org.apache.juneau.common.utils.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.collections.*;
import org.junit.jupiter.api.*;
class ControlledArrayList_Test extends TestBase {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/DefaultClassList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/DefaultClassList_Test.java
index f2228923c3..0113e3bbd3 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/DefaultClassList_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/DefaultClassList_Test.java
@@ -17,8 +17,8 @@
package org.apache.juneau.cp;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.cp.DefaultClassList.*;
import static org.apache.juneau.junit.bct.BctAssertions.*;
+import static org.apache.juneau.rest.util.DefaultClassList.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
index 275852a804..e1c65ef3bf 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
@@ -26,6 +26,7 @@ import java.nio.file.*;
import java.util.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.io.*;
import org.apache.juneau.cp.sub.*;
import org.junit.jupiter.api.*;
