From 9f905914354fecfb18d5eefb26440fa2f626727b Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Fri, 7 Feb 2020 11:59:36 +0100
Subject: [PATCH] remove direct dependency on java.desktop from the API
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
.../src/main/java/jakarta/xml/bind/JAXB.java | 31 +++++++++++++------
jaxb-api/src/main/java/module-info.java | 1 -
2 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/JAXB.java b/jaxb-api/src/main/java/jakarta/xml/bind/JAXB.java
index fb20f45..42854cd 100644
--- a/jaxb-api/src/main/java/jakarta/xml/bind/JAXB.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/JAXB.java
@@ -16,7 +16,6 @@ import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import java.beans.Introspector;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -302,7 +301,7 @@ public final class JAXB {
* the body. If this object has {@link XmlRootElement}
* on its class definition, that will be used as the root tag name
* and the given object will provide the body. Otherwise,
- * the root tag name is {@link Introspector#decapitalize(String) infered} from
+ * the root tag name is {@link java.beans.Introspector#decapitalize(String) infered} from
* {@link Class#getSimpleName() the short class name}.
* This parameter must not be null.
*
@@ -326,7 +325,7 @@ public final class JAXB {
* the body. If this object has {@link XmlRootElement}
* on its class definition, that will be used as the root tag name
* and the given object will provide the body. Otherwise,
- * the root tag name is {@link Introspector#decapitalize(String) infered} from
+ * the root tag name is {@link java.beans.Introspector#decapitalize(String) infered} from
* {@link Class#getSimpleName() the short class name}.
* This parameter must not be null.
*
@@ -353,7 +352,7 @@ public final class JAXB {
* the body. If this object has {@link XmlRootElement}
* on its class definition, that will be used as the root tag name
* and the given object will provide the body. Otherwise,
- * the root tag name is {@link Introspector#decapitalize(String) infered} from
+ * the root tag name is {@link java.beans.Introspector#decapitalize(String) infered} from
* {@link Class#getSimpleName() the short class name}.
* This parameter must not be null.
*
@@ -377,7 +376,7 @@ public final class JAXB {
* the body. If this object has {@link XmlRootElement}
* on its class definition, that will be used as the root tag name
* and the given object will provide the body. Otherwise,
- * the root tag name is {@link Introspector#decapitalize(String) infered} from
+ * the root tag name is {@link java.beans.Introspector#decapitalize(String) infered} from
* {@link Class#getSimpleName() the short class name}.
* This parameter must not be null.
*
@@ -402,7 +401,7 @@ public final class JAXB {
* the body. If this object has {@link XmlRootElement}
* on its class definition, that will be used as the root tag name
* and the given object will provide the body. Otherwise,
- * the root tag name is {@link Introspector#decapitalize(String) infered} from
+ * the root tag name is {@link java.beans.Introspector#decapitalize(String) infered} from
* {@link Class#getSimpleName() the short class name}.
* This parameter must not be null.
*
@@ -426,7 +425,7 @@ public final class JAXB {
* the body. If this object has {@link XmlRootElement}
* on its class definition, that will be used as the root tag name
* and the given object will provide the body. Otherwise,
- * the root tag name is {@link Introspector#decapitalize(String) infered} from
+ * the root tag name is {@link java.beans.Introspector#decapitalize(String) infered} from
* {@link Class#getSimpleName() the short class name}.
* This parameter must not be null.
*
@@ -450,7 +449,7 @@ public final class JAXB {
* the body. If this object has {@link XmlRootElement}
* on its class definition, that will be used as the root tag name
* and the given object will provide the body. Otherwise,
- * the root tag name is {@link Introspector#decapitalize(String) infered} from
+ * the root tag name is {@link java.beans.Introspector#decapitalize(String) infered} from
* {@link Class#getSimpleName() the short class name}.
* This parameter must not be null.
*
@@ -490,7 +489,7 @@ public final class JAXB {
* the body. If this object has {@link XmlRootElement}
* on its class definition, that will be used as the root tag name
* and the given object will provide the body. Otherwise,
- * the root tag name is {@link Introspector#decapitalize(String) infered} from
+ * the root tag name is {@link java.beans.Introspector#decapitalize(String) infered} from
* {@link Class#getSimpleName() the short class name}.
* This parameter must not be null.
*
@@ -563,7 +562,19 @@ public final class JAXB {
}
private static String inferName(Class clazz) {
- return Introspector.decapitalize(clazz.getSimpleName());
+ // XXX - behaviour of this method must be same as of Introspector.decapitalize
+ // which is not used to avoid dependency on java.desktop
+ String simpleName = clazz.getSimpleName();
+ if (simpleName == null || simpleName.isEmpty()) {
+ return simpleName;
+ }
+ if (simpleName.length() > 1 && Character.isUpperCase(simpleName.charAt(1))
+ && Character.isUpperCase(simpleName.charAt(0))) {
+ return simpleName;
+ }
+ char chars[] = simpleName.toCharArray();
+ chars[0] = Character.toLowerCase(chars[0]);
+ return new String(chars);
}
/**
diff --git a/jaxb-api/src/main/java/module-info.java b/jaxb-api/src/main/java/module-info.java
index d9048ad..5f0e2fd 100644
--- a/jaxb-api/src/main/java/module-info.java
+++ b/jaxb-api/src/main/java/module-info.java
@@ -18,7 +18,6 @@ module jakarta.xml.bind {
requires transitive jakarta.activation;
requires transitive java.xml;
requires java.logging;
- requires java.desktop;
exports jakarta.xml.bind;
exports jakarta.xml.bind.annotation;
--
GitLab