Jaxb2Marshaller.supports(Class clazz) is too eager [SWS-171]

[gregturn]

Martin Vanek opened SWS-171 and commented

When using multiple Jaxb2Marshallers for multiple endpoints, first encountered Jaxb2Marshaller is always used, because it's "support" method accepts every Jaxb class. My proposition for improvement is:

public boolean supports(Class clazz) {
	boolean isJaxbClass = clazz.getAnnotation(XmlRootElement.class) != null
			|| JAXBElement.class.isAssignableFrom(clazz);
	if (isJaxbClass) {
		if (StringUtils.hasLength(getContextPath())) {
			String pckgName = clazz.getPackage().getName();
			StringTokenizer st = new StringTokenizer(getContextPath(), ":");
			while (st.hasMoreTokens()) {
				if (st.nextToken().equals(pckgName)) {
					return true;
				}
			}
		} else if (!ObjectUtils.isEmpty(classesToBeBound)) {
			for (Class clazzToBeBo : classesToBeBound) {
				if (clazzToBeBo.equals(clazz)) {
					return true;
				}
			}
		} else {
			throw new IllegalArgumentException(
					"setting either contextPath or classesToBeBound is required");
		}
	}
	return false;
}

---

Affects: 1.0

[gregturn]

Arjen Poutsma commented

Fixed, though in a slightly different way: using the JAXBIntrospector. This has the added advantage that subclasses of JAXB elements are also supported, and that we use the JAXB2 'native' way to determine whether a class is supported.

Unfortunately, we need to instantiate classes in order to pass them to the JAXBIntrospector. However, we cache the results (supported or not), so instantiation is only done once.

[gregturn]

Arjen Poutsma commented

Closing 1.0.1 issues.