[
https://issues.apache.org/jira/browse/CXF-7520?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16331790#comment-16331790
]
ASF GitHub Bot commented on CXF-7520:
-------------------------------------
jimma closed pull request #365: [CXF-7520]:Ensure CXF can build with JDK9
GA(build 9+181)
URL: https://github.com/apache/cxf/pull/365
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/core/src/main/java/org/apache/cxf/common/jaxb/EscapeHandlerInvocationHandler.java
b/core/src/main/java/org/apache/cxf/common/jaxb/EscapeHandlerInvocationHandler.java
new file mode 100644
index 00000000000..64f1385ac46
--- /dev/null
+++
b/core/src/main/java/org/apache/cxf/common/jaxb/EscapeHandlerInvocationHandler.java
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "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.cxf.common.jaxb;
+
+import java.io.Writer;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+public final class EscapeHandlerInvocationHandler implements InvocationHandler
{
+
+ private Object target;
+ public EscapeHandlerInvocationHandler(Object obj) {
+ target = obj;
+ }
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws
Throwable {
+ Object result = null;
+ if (method.getName().equals("escape") && args.length == 5) {
+ if ((Integer)args[1] == 0 && (Integer)args[2] == 0) {
+ Writer writer = (Writer)args[4];
+ writer.write("");
+ return null;
+ }
+ result = method.invoke(target, args);
+ }
+ return result;
+ }
+
+}
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index e33a12188d5..685cb077d9f 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -30,6 +30,7 @@
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.lang.reflect.Type;
@@ -85,6 +86,7 @@
import org.apache.cxf.common.util.ASMHelper.Opcodes;
import org.apache.cxf.common.util.CachedClass;
import org.apache.cxf.common.util.PackageUtils;
+import org.apache.cxf.common.util.ProxyHelper;
import org.apache.cxf.common.util.ReflectionInvokationHandler;
import org.apache.cxf.common.util.ReflectionInvokationHandler.WrapReturn;
import org.apache.cxf.common.util.ReflectionUtil;
@@ -123,6 +125,7 @@
private static final Map<String, String> BUILTIN_DATATYPES_MAP;
private static final Map<String, Class<?>> HOLDER_TYPES_MAP;
private static ClassLoader jaxbXjcLoader;
+ private static Object jaxbEscapeHandler;
static {
BUILTIN_DATATYPES_MAP = new HashMap<>();
@@ -1531,4 +1534,44 @@ public static JAXBBeanInfo getBeanInfo(JAXBContextProxy
context, Class<?> cls) {
return ReflectionInvokationHandler.createProxyWrapper(o,
JAXBBeanInfo.class);
}
+ public static void setMinimumEscapeHandler(Marshaller marshaller) {
+ String postFix = "";
+ if (marshaller.getClass().getName().contains("com.sun.xml.internal")
+ || marshaller.getClass().getName().contains("eclipse")) {
+ //eclipse moxy accepts sun package CharacterEscapeHandler
+ postFix = ".internal";
+ } else if
(marshaller.getClass().getName().contains("com.sun.xml.bind")) {
+ postFix = "";
+ } else {
+ LOG.log(Level.WARNING, "Failed to set MinumEscapeHandler for
unknown jaxb marshaller:"
+ + marshaller);
+ return;
+ }
+ try {
+ Class<?> handlerClass = ClassLoaderUtils.loadClass("com.sun.xml" +
postFix
+ +
".bind.marshaller.MinimumEscapeHandler",
+
marshaller.getClass());
+ Class<?> handlerInterface = ClassLoaderUtils
+ .loadClass("com.sun.xml" + postFix +
".bind.marshaller.CharacterEscapeHandler",
+ marshaller.getClass());
+ Object targetHandler =
ReflectionUtil.getDeclaredField(handlerClass, "theInstance").get(null);
+ Object escapeHandler =
getEscapeHandlerInstance(marshaller.getClass().getClassLoader(),
+ new Class[]
{handlerInterface},
+ new
EscapeHandlerInvocationHandler(targetHandler));
+ marshaller.setProperty("com.sun.xml" + postFix +
".bind.characterEscapeHandler", escapeHandler);
+ } catch (Exception e) {
+ e.printStackTrace();
+ LOG.log(Level.INFO, "Failed to set MinumEscapeHandler to jaxb
marshaller", e);
+ }
+ }
+
+ private static synchronized Object getEscapeHandlerInstance(ClassLoader
loader, Class<?>[] interfaces,
+
InvocationHandler handler) {
+ if (jaxbEscapeHandler == null) {
+ jaxbEscapeHandler = ProxyHelper.getProxy(loader, interfaces,
handler);
+ }
+ return jaxbEscapeHandler;
+ }
+
+
}
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
index 5ca0a3661a8..992e2924bff 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
@@ -130,6 +130,8 @@ public Marshaller createMarshaller(Object elValue,
MessagePartInfo part) {
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT,
Boolean.FALSE);
marshaller.setListener(databinding.getMarshallerListener());
+ JAXBUtils.setMinimumEscapeHandler(marshaller);
+
if (setEventHandler) {
ValidationEventHandler h = veventHandler;
if (veventHandler == null) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index eed47448c84..c9ae400d300 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -627,6 +627,7 @@ protected Marshaller createMarshaller(Object obj, Class<?>
cls, Type genericType
if (marshallerListener != null) {
marshaller.setListener(marshallerListener);
}
+ JAXBUtils.setMinimumEscapeHandler(marshaller);
validateObjectIfNeeded(marshaller, cls, obj);
return marshaller;
}
diff --git
a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
index 02e0ae80427..49dbd953e27 100644
---
a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
+++
b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
@@ -325,15 +325,11 @@ public void testEscapeForwardSlashesAlways() throws
Exception {
@Test
public void testWriteNullValueAsString() throws Exception {
- if (!System.getProperty("java.version").startsWith("9")) {
- doTestWriteNullValue(true);
- }
+ doTestWriteNullValue(true);
}
@Test
public void testWriteNullValueAsNull() throws Exception {
- if (!System.getProperty("java.version").startsWith("9")) {
- doTestWriteNullValue(false);
- }
+ doTestWriteNullValue(false);
}
private void doTestWriteNullValue(boolean nullAsString) throws Exception {
@@ -1952,7 +1948,7 @@ public void writeCharacters(String text) throws
XMLStreamException {
public void writeCharacters(char[] text, int arg1, int arg2) throws
XMLStreamException {
String str = new String(text);
if (StringUtils.isEmpty(str.trim())) {
- super.writeCharacters(null, arg1, arg2);
+ super.writeCharacters(null);
} else {
super.writeCharacters(text, arg1, arg2);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Ensure CXF can build with JDK9 GA(build 9+181)
> ----------------------------------------------
>
> Key: CXF-7520
> URL: https://issues.apache.org/jira/browse/CXF-7520
> Project: CXF
> Issue Type: Bug
> Reporter: Freeman Fang
> Assignee: Freeman Fang
> Priority: Major
> Fix For: 3.2.2
>
>
> a couple of cxf test failied with JDK9 GA due to recent change
> Mainly in JAXB and SAAJ
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
