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 1f2728437 Minor refactoring.
1f2728437 is described below
commit 1f2728437fe4bbeed26ef04dd6bc2e9e4ca9fab6
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Fri Jul 1 14:05:43 2022 -0400
Minor refactoring.
---
.../src/main/java/org/apache/juneau/internal/ArgUtils.java | 4 ++--
.../src/main/java/org/apache/juneau/internal/FileReaderBuilder.java | 0
.../src/main/java/org/apache/juneau/internal/FileWriterBuilder.java | 0
.../src/main/java/org/apache/juneau/internal/IOUtils.java | 0
.../src/main/java/org/apache/juneau/internal/SystemUtils.java | 0
5 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArgUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/ArgUtils.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArgUtils.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/ArgUtils.java
index b03915c8c..435b25947 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArgUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/ArgUtils.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.internal;
-import static org.apache.juneau.internal.StringUtils.*;
+import java.text.*;
/**
* Method argument utility methods.
@@ -63,7 +63,7 @@ public class ArgUtils {
*/
public static final void assertArg(boolean expression, String msg,
Object...args) throws IllegalArgumentException {
if (! expression)
- throw new IllegalArgumentException(format(msg, args));
+ throw new
IllegalArgumentException(MessageFormat.format(msg, args));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FileReaderBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/FileReaderBuilder.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FileReaderBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/FileReaderBuilder.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FileWriterBuilder.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/FileWriterBuilder.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FileWriterBuilder.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/FileWriterBuilder.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/IOUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/IOUtils.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/IOUtils.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/IOUtils.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SystemUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/SystemUtils.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SystemUtils.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/SystemUtils.java
