This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5a519fca58e8559c4774d28ba76652251d462f90
Merge: 0a55a90bf6 8a5af84c41
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Dec 21 15:56:00 2022 +0100
Merge remote-tracking branch 'origin/master' into spring6
.../causeway/applib/services/jaxb/JaxbService.java | 142 ++++++---------------
.../commons/internal/reflection/_ClassCache.java | 21 ++-
.../org/apache/causeway/commons/io/JaxbUtils.java | 49 ++++---
.../beans/CausewayBeanTypeClassifierDefault.java | 5 +-
.../object/viewmodel/ViewModelFacetFactory.java | 6 +-
.../ViewModelFacetForXmlRootElementAnnotation.java | 10 +-
.../bootstrap/GridMarshallerServiceBootstrap.java | 32 ++---
.../runtimeservices/jaxb/JaxbServiceDefault.java | 55 +++-----
.../conneg/ContentNegotiationServiceAbstract.java | 4 +-
9 files changed, 126 insertions(+), 198 deletions(-)
diff --cc
api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java
index 9176eb46e3,f0f29ee976..6abb3b050a
---
a/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/services/jaxb/JaxbService.java
@@@ -18,13 -18,16 +18,16 @@@
*/
package org.apache.causeway.applib.services.jaxb;
- import java.io.StringReader;
- import java.io.StringWriter;
import java.util.Map;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
++import jakarta.xml.bind.JAXBContext;
++import jakarta.xml.bind.Marshaller;
++import jakarta.xml.bind.Unmarshaller;
+
import org.springframework.lang.Nullable;
- import org.apache.causeway.commons.internal.base._Casts;
+ import org.apache.causeway.applib.domain.DomainObjectList;
+ import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.io.JaxbUtils;
diff --cc
commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
index 17d877dd32,7d310367dc..445e1917a6
---
a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
+++
b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
@@@ -28,8 -28,9 +28,9 @@@ import java.util.Optional
import java.util.function.Predicate;
import java.util.stream.Stream;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
++import jakarta.xml.bind.annotation.XmlRootElement;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.lang.Nullable;
diff --cc commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java
index 27c00b6c4a,da513d9471..dfad7ad267
--- a/commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java
+++ b/commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java
@@@ -27,14 -27,12 +27,13 @@@ import java.util.function.Consumer
import java.util.function.UnaryOperator;
import java.util.stream.Collectors;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
- import jakarta.xml.bind.annotation.XmlRootElement;
+
import org.springframework.lang.Nullable;
import org.apache.causeway.commons.functional.Try;
@@@ -75,9 -74,10 +75,10 @@@ public class JaxbUtils
/** uses MOXy */
public void useMoxy() {
-
setDefaultJAXBContextFactory(org.eclipse.persistence.jaxb.JAXBContextFactory.class,
true);
+
//setDefaultJAXBContextFactory(org.eclipse.persistence.jaxb.JAXBContextFactory.class,
true);
}
+ /** clears the system property override */
public static void usePlatformDefault() {
setDefaultJAXBContextFactory(null, true);
}
diff --cc
core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java
index c984fe1135,7ae4302e2a..295d3c07a4
---
a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java
+++
b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifierDefault.java
@@@ -21,8 -21,7 +21,7 @@@ package org.apache.causeway.core.config
import java.io.Serializable;
import java.lang.reflect.Modifier;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
- import jakarta.xml.bind.annotation.XmlRootElement;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
diff --cc
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetFactory.java
index fed8cab0c0,ee401add8a..7931261aa3
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetFactory.java
@@@ -18,9 -18,9 +18,9 @@@
*/
package org.apache.causeway.core.metamodel.facets.object.viewmodel;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
- import jakarta.xml.bind.annotation.XmlRootElement;
+ import org.apache.causeway.commons.internal.reflection._ClassCache;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
diff --cc
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridMarshallerServiceBootstrap.java
index d1b6f4a8b1,ce37d1bd4a..3a0ce19acb
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridMarshallerServiceBootstrap.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridMarshallerServiceBootstrap.java
@@@ -21,11 -21,10 +21,10 @@@ package org.apache.causeway.core.metamo
import java.util.EnumSet;
import java.util.Objects;
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.Marshaller;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
- import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
diff --cc
core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/jaxb/JaxbServiceDefault.java
index 01a4a82a9b,88cd94a59a..08f12a2ef6
---
a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/jaxb/JaxbServiceDefault.java
+++
b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/jaxb/JaxbServiceDefault.java
@@@ -18,16 -18,13 +18,13 @@@
*/
package org.apache.causeway.core.runtimeservices.jaxb;
- import java.util.Map;
-
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.JAXBContext;
- import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
diff --cc
viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
index 4b79274d02,4d533d222d..ba288971a0
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
@@@ -21,9 -21,8 +21,8 @@@ package org.apache.causeway.viewer.rest
import java.util.List;
import java.util.Objects;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
- import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Lists;
