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 6355c1e03 Minor refactoring.
6355c1e03 is described below
commit 6355c1e031ef5b50afd167d6e0f24ee772c0a363
Author: JamesBognar <[email protected]>
AuthorDate: Fri Jul 1 15:05:00 2022 -0400
Minor refactoring.
---
juneau-core/juneau-common/pom.xml | 4 ++++
.../java/org/apache/juneau/internal/AsciiMap.java | 0
.../java/org/apache/juneau/internal/AsciiSet.java | 0
.../org/apache/juneau/internal/StringUtils.java | 22 ++++++++++++++--------
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/juneau-core/juneau-common/pom.xml
b/juneau-core/juneau-common/pom.xml
index 26fa9be2b..d39d5e481 100644
--- a/juneau-core/juneau-common/pom.xml
+++ b/juneau-core/juneau-common/pom.xml
@@ -29,6 +29,10 @@
<packaging>bundle</packaging>
<dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
</dependencies>
<properties>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/AsciiMap.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/AsciiMap.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/AsciiMap.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/AsciiMap.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/AsciiSet.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/AsciiSet.java
similarity index 100%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/AsciiSet.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/AsciiSet.java
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/StringUtils.java
similarity index 95%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
rename to
juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/StringUtils.java
index 89850aed6..eb3089882 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/StringUtils.java
@@ -28,13 +28,11 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.function.*;
import java.util.regex.*;
+import java.util.stream.*;
import java.util.zip.*;
import javax.xml.bind.*;
-import org.apache.juneau.*;
-import org.apache.juneau.reflect.*;
-
/**
* Reusable string utility methods.
*
@@ -844,7 +842,7 @@ public final class StringUtils {
if (state == S4)
l.add(s.substring(mark));
else if (state == S2 || state == S3)
- throw new BasicRuntimeException("Unmatched string
quotes: {0}", s);
+ throw new RuntimeException("Unmatched string quotes:
"+s);
return l.toArray(new String[l.size()]);
}
@@ -2274,17 +2272,25 @@ public final class StringUtils {
private static String convertToReadable(Object o) {
if (o == null)
return null;
- if (o instanceof ClassMeta)
- return ((ClassMeta<?>)o).getFullName();
if (o instanceof Class)
return ((Class<?>)o).getName();
if (o instanceof Method)
- return MethodInfo.of((Method)o).getShortName();
+ return Method.class.cast(o).getName();
if (o.getClass().isArray())
- o = ArrayUtils.toObjectList(o);
+ return arrayAsList(o).stream().map(x ->
convertToReadable(x)).collect(Collectors.joining(", ", "[", "]"));
return o.toString();
}
+ private static List<Object> arrayAsList(Object array) {
+ if (array.getClass().getComponentType().isPrimitive()) {
+ List<Object> l = new
ArrayList<>(Array.getLength(array));
+ for (int i = 0; i < Array.getLength(array); i++)
+ l.add(Array.get(array, i));
+ return l;
+ }
+ return Arrays.asList((Object[])array);
+ }
+
/**
* Converts a string containing a possible multiplier suffix to an
integer.
*
