This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch CXF-8671
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/CXF-8671 by this push:
new 283f69eb36 CXF-8671: Support Jakarta EE 10 (#1201)
283f69eb36 is described below
commit 283f69eb36381e2328e372a30e29747234758c41
Author: Karl von Randow <[email protected]>
AuthorDate: Tue Nov 7 09:58:31 2023 +1300
CXF-8671: Support Jakarta EE 10 (#1201)
* Update dependencies to Jakarta EE 10
* Remove unnecessary dependency on jakarta.xml.bind-api
It didn’t respect the Jakarta EE 10 BOM for some reason, and it doesn’t
(yet?) appear to be necessary
* Servlet API 6.0.0
* Jakarta XML Binding 4.0
* Jakarta Context Dependency Injection 4.0
* Fix Maven dependencies
* Jakarta RESTful Web Services 3.1
* Update Jakarta EE dependencies for codegen-plugins integration tests
* Add missing jakarta.xml.bind-api dependencies for codegen-plugin
maven-invoker-plugin
* Correct RetryAfterHeaderProviderTest not accounting for host daylight time
getRawOffset() returns the offset for standard time, which means these
tests fail when the default timezone is observing daylight time.
[ERROR] Failures:
[ERROR] org.apache.cxf.jaxrs.impl.RetryAfterHeaderProviderTest.test[retry
after Sun Nov 03 08:49:37 2002 is duration of PT24884H49M37S from 2000-01-01
00:00:00.000]
[ERROR] Run 1: RetryAfterHeaderProviderTest.test:73
Expected: is <PT24884H49M37S>
but: was <PT24883H49M37S>
[ERROR] Run 2: RetryAfterHeaderProviderTest.test:73
Expected: is <PT24884H49M37S>
but: was <PT24883H49M37S>
[ERROR] Run 3: RetryAfterHeaderProviderTest.test:73
Expected: is <PT24884H49M37S>
but: was <PT24883H49M37S>
[ERROR] Run 4: RetryAfterHeaderProviderTest.test:73
Expected: is <PT24884H49M37S>
but: was <PT24883H49M37S>
[INFO]
[ERROR] org.apache.cxf.jaxrs.impl.RetryAfterHeaderProviderTest.test[retry
after Sun Nov 3 08:49:37 2002 is duration of PT24884H49M37S from 2000-01-01
00:00:00.000]
[ERROR] Run 1: RetryAfterHeaderProviderTest.test:73
Expected: is <PT24884H49M37S>
but: was <PT24883H49M37S>
[ERROR] Run 2: RetryAfterHeaderProviderTest.test:73
Expected: is <PT24884H49M37S>
but: was <PT24883H49M37S>
[ERROR] Run 3: RetryAfterHeaderProviderTest.test:73
Expected: is <PT24884H49M37S>
but: was <PT24883H49M37S>
[ERROR] Run 4: RetryAfterHeaderProviderTest.test:73
Expected: is <PT24884H49M37S>
but: was <PT24883H49M37S>
* Upgrade saaj-impl
* Upgrade undertow
* Upgrade istack
* Placeholders for bootstrap API
* EntityPart
* Implement RuntimeDelegateImpl
* Partially implement TLS/SSL in SE bootstrap (needs some work on CXF
engines)
* Fix cxf-tools-wadlto-jaxrs test cases
* Update Spring Boot to 3.1.0, Spring LDAP to 3.1.0, Spring Security to
6.1.0
* docs: Fix BUILDING.txt fastinstall line
* Fix compilation and checkstyle issues
* Update Hibernate to 6.2.9.Final
* Update Hibernate to 6.3.1.Final
* Refactor EntityPartBuilderImpl & EntityPartImpl
* Replace JakarteEE 10 BOM with indvidual component versions to simplify
patching and minor updates
* Fixed CDI and Security test cases
* Update Weld to 5.1.2.Final
* Switch JSON-P/JSON-B implementation and fix test cases
---------
Co-authored-by: Andriy Redko <[email protected]>
---
BUILDING.txt | 2 +-
.../ibm/xml/mock/marshaller/MockMarshaller.java | 9 +-
distribution/javadoc/pom.xml | 2 +-
.../pom.xml | 9 +-
.../java/demo/jaxrs/openapi/server/AppConfig.java | 4 +-
.../main/release/samples/jax_rs/sse_client/pom.xml | 6 +-
distribution/src/main/release/samples/pom.xml | 2 +-
.../java/org/apache/cxf/cdi/AbstractCXFBean.java | 5 -
.../main/java/org/apache/cxf/cdi/CdiBusBean.java | 5 +-
.../cxf/cdi/CdiServerConfigurableFactory.java | 2 +-
.../org/apache/cxf/cdi/ContextProducerBean.java | 5 -
.../apache/cxf/cdi/JAXRSCdiResourceExtension.java | 7 +-
.../cxf/cdi/JAXRSCdiResourceExtensionTest.java | 7 +-
integration/spring-boot/autoconfigure/pom.xml | 10 +-
maven-plugins/codegen-plugin/pom.xml | 8 +-
.../src/it/jaxb-xjc-runtime-sources/pom.xml | 8 +-
.../src/it/jdk-cxf-with-toolchain/pom.xml | 8 +-
.../codegen-plugin/src/it/mark-generated/pom.xml | 8 +-
.../src/it/wsdl-artifact-resolution/pom.xml | 8 +-
parent/pom.xml | 57 +++++---
.../jaxrs/bootstrap/ConfigurationBuilderImpl.java | 79 +++++++++++
.../cxf/jaxrs/bootstrap/ConfigurationImpl.java | 37 +++++
.../apache/cxf/jaxrs/bootstrap/InstanceImpl.java | 60 ++++++++
.../cxf/jaxrs/impl/EntityPartBuilderImpl.java | 154 +++++++++++++++++++++
.../org/apache/cxf/jaxrs/impl/EntityPartImpl.java | 103 ++++++++++++++
.../apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java | 84 ++++++++++-
.../impl/tl/ThreadLocalHttpServletRequest.java | 26 ++--
.../impl/tl/ThreadLocalHttpServletResponse.java | 15 --
.../jaxrs/impl/tl/ThreadLocalServletContext.java | 20 ---
.../apache/cxf/jaxrs/impl/ResponseImplTest.java | 25 ++++
.../jaxrs/impl/RetryAfterHeaderProviderTest.java | 17 ++-
.../jaxrs/provider/JAXBElementProviderTest.java | 9 +-
.../http_jaxws_spi/HttpServletRequestAdapter.java | 16 +++
rt/rs/extensions/providers/pom.xml | 18 +--
.../jaxrs/provider/jsrjsonb/JsrJsonbProvider.java | 3 +-
rt/rs/microprofile-client/pom.xml | 10 ++
.../microprofile/client/cdi/RestClientBean.java | 5 -
rt/rs/security/oauth-parent/oauth2/pom.xml | 1 -
.../oauth2/grants/code/JPACodeDataProvider.java | 6 +-
.../apache/cxf/jaxrs/sse/SseBroadcasterImpl.java | 19 ++-
.../server/servlet/NettyHttpServletRequest.java | 28 ++--
.../netty/server/servlet/NettyHttpSession.java | 31 -----
.../netty/server/servlet/NettyServletContext.java | 25 ----
rt/transports/http-undertow/pom.xml | 2 +-
rt/transports/websocket/pom.xml | 10 ++
.../jetty/WebSocketVirtualServletRequest.java | 23 ++-
.../jetty/WebSocketVirtualServletResponse.java | 44 +++---
.../undertow/WebSocketUndertowServletRequest.java | 23 ++-
.../undertow/WebSocketUndertowServletResponse.java | 44 +++---
systests/jaxrs/pom.xml | 11 +-
.../jaxrs/provider/CXFJaxbContextResolver.java | 23 +--
systests/microprofile/pom.xml | 11 --
.../src/test/resources/META-INF/persistence.xml | 4 +-
systests/rs-sse/rs-sse-undertow/pom.xml | 2 +-
.../src/test/resources/wadl/bookstoreDigit.xml | 52 +++----
.../src/test/resources/wadl/bookstoreHyphen.xml | 34 ++---
.../wadl/resourceSchemaNoTargetNamespace.xml | 38 ++---
57 files changed, 869 insertions(+), 415 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index ad84d0efed..2a74253b22 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -29,7 +29,7 @@ Building
$> mvn
This will compile Apache CXF and run all of the tests in the Apache CXF
source
distribution. Alternatively, you can run
- $> mvn -Pfastinstall.
+ $> mvn -Pfastinstall
This will compile Apache CXF without running the tests and takes less
time to build.
Depending on the load of remote Maven repositories, you may have
diff --git a/core/src/test/java/com/ibm/xml/mock/marshaller/MockMarshaller.java
b/core/src/test/java/com/ibm/xml/mock/marshaller/MockMarshaller.java
index dc0f629257..b734922251 100644
--- a/core/src/test/java/com/ibm/xml/mock/marshaller/MockMarshaller.java
+++ b/core/src/test/java/com/ibm/xml/mock/marshaller/MockMarshaller.java
@@ -121,23 +121,20 @@ public class MockMarshaller implements Marshaller {
return null;
}
- @SuppressWarnings("rawtypes")
@Override
- public void setAdapter(XmlAdapter adapter) {
+ public <A extends XmlAdapter<?, ?>> void setAdapter(A adapter) {
// TODO Auto-generated method stub
}
- @SuppressWarnings("rawtypes")
@Override
- public <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter) {
+ public <A extends XmlAdapter<?, ?>> void setAdapter(Class<A> type, A
adapter) {
// TODO Auto-generated method stub
}
- @SuppressWarnings("rawtypes")
@Override
- public <A extends XmlAdapter> A getAdapter(Class<A> type) {
+ public <A extends XmlAdapter<?, ?>> A getAdapter(Class<A> type) {
// TODO Auto-generated method stub
return null;
}
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index a615581551..cdebd80268 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -420,7 +420,7 @@
</dependency>
<dependency>
<groupId>io.undertow</groupId>
- <artifactId>undertow-servlet-jakarta</artifactId>
+ <artifactId>undertow-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git
a/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml
b/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml
index d8be876c84..fb083d8f41 100644
---
a/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml
+++
b/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml
@@ -78,9 +78,12 @@
<artifactId>cxf-rt-rs-service-description-microprofile-openapi</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jsonb</artifactId>
- <classifier>jakarta</classifier>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>yasson</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git
a/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/src/main/java/demo/jaxrs/openapi/server/AppConfig.java
b/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/src/main/java/demo/jaxrs/openapi/server/AppConfig.java
index 0d6c33a914..0a5fb80954 100644
---
a/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/src/main/java/demo/jaxrs/openapi/server/AppConfig.java
+++
b/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/src/main/java/demo/jaxrs/openapi/server/AppConfig.java
@@ -4,7 +4,7 @@ import java.util.Arrays;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.microprofile.openapi.OpenApiFeature;
-import org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider;
+import org.apache.cxf.jaxrs.provider.jsrjsonb.JsrJsonbProvider;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -29,7 +29,7 @@ public class AppConfig {
factory.setFeatures(Arrays.asList(openApiFeature()));
factory.setServiceBean(sampleResource());
factory.setAddress("http://localhost:9000/";);
- factory.setProvider(new JsonbJaxrsProvider<>());
+ factory.setProvider(new JsrJsonbProvider());
return factory.create();
}
}
diff --git a/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml
b/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml
index 4ae2512a21..762e8e2a4f 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml
@@ -44,11 +44,11 @@
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
</dependency>
-
+
<dependency>
<groupId>io.undertow</groupId>
- <artifactId>undertow-servlet-jakarta</artifactId>
- </dependency>
+ <artifactId>undertow-servlet</artifactId>
+ </dependency>
</dependencies>
<profiles>
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index cc733b1efe..ad7c568bda 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -31,7 +31,7 @@
<!-- don't deploy the samples, kind of pointless -->
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.spring.boot.version>3.0.12</cxf.spring.boot.version>
+ <cxf.spring.boot.version>3.1.4</cxf.spring.boot.version>
<cxf.spring.cloud.eureka.version>4.0.3</cxf.spring.cloud.eureka.version>
<cxf.jetty11.version>11.0.17</cxf.jetty11.version>
<cxf.netty.version>4.1.100.Final</cxf.netty.version>
diff --git
a/integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java
b/integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java
index 872a82b6af..c198b38d52 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java
@@ -60,11 +60,6 @@ abstract class AbstractCXFBean<T> implements Bean<T> {
return false;
}
- @Override
- public boolean isNullable() {
- return false;
- }
-
@Override
public Set<InjectionPoint> getInjectionPoints() {
return Collections.emptySet();
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
index 9e952167db..a0705033e4 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
@@ -24,6 +24,7 @@ import java.util.Set;
import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.enterprise.inject.spi.InjectionPoint;
import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.InjectionTargetFactory;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
@@ -35,8 +36,8 @@ final class CdiBusBean extends AbstractCXFBean<
ExtensionManagerBus > {
private final InjectionTarget<ExtensionManagerBus> injectionTarget;
- CdiBusBean(final InjectionTarget<ExtensionManagerBus> injectionTarget) {
- this.injectionTarget = injectionTarget;
+ CdiBusBean(final InjectionTargetFactory<ExtensionManagerBus>
injectionTargetFactory) {
+ this.injectionTarget =
injectionTargetFactory.createInjectionTarget(this);
}
@Override
diff --git
a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiServerConfigurableFactory.java
b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiServerConfigurableFactory.java
index ee6dded54c..846ef24f41 100644
---
a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiServerConfigurableFactory.java
+++
b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiServerConfigurableFactory.java
@@ -67,7 +67,7 @@ public class CdiServerConfigurableFactory implements
ServerConfigurableFactory {
final CreationalContext<?> context =
beanManager.createCreationalContext(bean);
if (!beanManager.isNormalScope(bean.getScope())) {
- beanManager.fireEvent(new
DisposableCreationalContext(context));
+ beanManager.getEvent().fire(new
DisposableCreationalContext(context));
}
return beanManager.getReference(bean, cls, context);
diff --git
a/integration/cdi/src/main/java/org/apache/cxf/cdi/ContextProducerBean.java
b/integration/cdi/src/main/java/org/apache/cxf/cdi/ContextProducerBean.java
index 84ebe9b898..b464e1900e 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/ContextProducerBean.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/ContextProducerBean.java
@@ -64,11 +64,6 @@ public class ContextProducerBean extends
AbstractCXFBean<Object> implements Pass
return createContextValue();
}
- @Override
- public boolean isNullable() {
- return true;
- }
-
@Override
public Set<Type> getTypes() {
Set<Type> types = super.getTypes();
diff --git
a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
index 75403e3a1e..cc0bb96a1f 100644
---
a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
+++
b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
@@ -43,7 +43,6 @@ import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
import jakarta.enterprise.inject.spi.BeforeShutdown;
import jakarta.enterprise.inject.spi.Extension;
-import jakarta.enterprise.inject.spi.InjectionTarget;
import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
import jakarta.enterprise.inject.spi.ProcessBean;
import jakarta.enterprise.inject.spi.ProcessProducerField;
@@ -164,7 +163,7 @@ public class JAXRSCdiResourceExtension implements Extension
{
"jakarta.servlet.http.HttpServletRequest",
"jakarta.servlet.ServletContext"));
}
- beanManager.fireEvent(this);
+ beanManager.getEvent().fire(this);
}
/**
@@ -268,9 +267,7 @@ public class JAXRSCdiResourceExtension implements Extension
{
final AnnotatedType< ExtensionManagerBus > busAnnotatedType =
beanManager.createAnnotatedType(ExtensionManagerBus.class);
- final InjectionTarget<ExtensionManagerBus> busInjectionTarget =
- beanManager.createInjectionTarget(busAnnotatedType);
- event.addBean(new CdiBusBean(busInjectionTarget));
+ event.addBean(new
CdiBusBean(beanManager.getInjectionTargetFactory(busAnnotatedType)));
}
if (applicationBeans.isEmpty() && !serviceBeans.isEmpty()) {
diff --git
a/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
b/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
index f3a82d4332..0a41024b88 100644
---
a/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
+++
b/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
@@ -22,6 +22,7 @@ import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
import jakarta.enterprise.inject.spi.Annotated;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTargetFactory;
import jakarta.enterprise.inject.spi.ProcessBean;
import jakarta.ws.rs.Path;
import org.apache.cxf.Bus;
@@ -49,9 +50,12 @@ public class JAXRSCdiResourceExtensionTest {
private ProcessBean<Bus> processBean;
@Mock
private Annotated annotated;
-
+ @Mock
+ private InjectionTargetFactory<Object> factory;
+
@Test
public void shouldNotAddDefaultApplicationWhenNoResourcesDefined() {
+ when(beanManager.getInjectionTargetFactory(any())).thenReturn(factory);
extension.injectBus(event, beanManager);
verify(event).addBean(any(CdiBusBean.class));
@@ -80,6 +84,7 @@ public class JAXRSCdiResourceExtensionTest {
when(annotated.isAnnotationPresent(Path.class)).thenReturn(true);
extension.collect(processBean, beanManager);
+ when(beanManager.getInjectionTargetFactory(any())).thenReturn(factory);
extension.injectBus(event, beanManager);
verify(event).addBean(any(DefaultApplicationBean.class));
diff --git a/integration/spring-boot/autoconfigure/pom.xml
b/integration/spring-boot/autoconfigure/pom.xml
index 09c17887d8..11b0292a10 100644
--- a/integration/spring-boot/autoconfigure/pom.xml
+++ b/integration/spring-boot/autoconfigure/pom.xml
@@ -115,14 +115,14 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>${cxf.servlet-api.group}</groupId>
- <artifactId>${cxf.servlet-api.artifact}</artifactId>
- <version>${cxf.servlet-api.version}</version>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${cxf.servlet-api.version}</version>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/maven-plugins/codegen-plugin/pom.xml
b/maven-plugins/codegen-plugin/pom.xml
index c608d8ce85..0d8cf97cf4 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -196,10 +196,10 @@
</execution>
</executions>
<dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${cxf.jaxb.version}</version>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${cxf.jaxb.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git
a/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml
b/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml
index 7388dcb99e..ea57f60abb 100644
--- a/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml
@@ -77,9 +77,9 @@
</build>
<profiles>
<profile>
- <id>java9</id>
+ <id>java11</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
@@ -90,7 +90,7 @@
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
- <version>3.0.0</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
@@ -100,7 +100,7 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>3.0.1</version>
+ <version>4.0.0</version>
</dependency>
</dependencies>
</profile>
diff --git a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
index d3a7f21a58..f156353cf8 100644
--- a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
@@ -112,9 +112,9 @@
</build>
</profile>
<profile>
- <id>java9</id>
+ <id>java11</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
@@ -125,7 +125,7 @@
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
- <version>3.0.0</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
@@ -135,7 +135,7 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>3.0.1</version>
+ <version>4.0.0</version>
</dependency>
</dependencies>
</profile>
diff --git a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
index d91b5b619a..b115a62caa 100644
--- a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
@@ -75,9 +75,9 @@
</build>
<profiles>
<profile>
- <id>java9</id>
+ <id>java11</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
@@ -88,7 +88,7 @@
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
- <version>3.0.0</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
@@ -98,7 +98,7 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>3.0.1</version>
+ <version>4.0.0</version>
</dependency>
</dependencies>
</profile>
diff --git
a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
index 9d84c21ef5..7bdc64e0ae 100644
--- a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
@@ -77,9 +77,9 @@
</build>
<profiles>
<profile>
- <id>java9</id>
+ <id>java11</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
@@ -90,7 +90,7 @@
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
- <version>3.0.0</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
@@ -100,7 +100,7 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>3.0.1</version>
+ <version>4.0.0</version>
</dependency>
</dependencies>
</profile>
diff --git a/parent/pom.xml b/parent/pom.xml
index 96736acd4b..14f684129f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -98,7 +98,7 @@
<cxf.atmosphere.version>3.0.3</cxf.atmosphere.version>
<cxf.bcprov.version>1.70</cxf.bcprov.version>
<cxf.brave.version>5.16.0</cxf.brave.version>
- <cxf.cdi.api.version>3.0.0</cxf.cdi.api.version>
+ <cxf.cdi.api.version>4.0.1</cxf.cdi.api.version>
<cxf.classgraph.version>4.8.25</cxf.classgraph.version>
<cxf.classmate.version>1.5.1</cxf.classmate.version>
<cxf.commons-codec.version>1.16.0</cxf.commons-codec.version>
@@ -112,7 +112,7 @@
<cxf.dropwizard3.version>3.2.6</cxf.dropwizard3.version>
<cxf.dropwizard4.version>4.2.21</cxf.dropwizard4.version>
<cxf.ehcache3.version>3.10.8</cxf.ehcache3.version>
- <cxf.el-api.version>3.0.3</cxf.el-api.version>
+ <cxf.el-api.version>5.0.1</cxf.el-api.version>
<cxf.findbugs.version>3.0.2</cxf.findbugs.version>
<cxf.hisrc.basicjaxb.version>2.1.1</cxf.hisrc.basicjaxb.version>
<cxf.geronimo.jta.version>1.1.1</cxf.geronimo.jta.version>
@@ -122,7 +122,7 @@
<cxf.guava.version>32.1.3-jre</cxf.guava.version>
<cxf.hamcrest.version>2.2</cxf.hamcrest.version>
<cxf.hazelcast.version>5.3.5</cxf.hazelcast.version>
- <cxf.hibernate.em.version>6.1.7.Final</cxf.hibernate.em.version>
+ <cxf.hibernate.em.version>6.3.1.Final</cxf.hibernate.em.version>
<cxf.hibernate.validator.version>7.0.5.Final</cxf.hibernate.validator.version>
<cxf.hsqldb.version>2.7.2</cxf.hsqldb.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>
@@ -139,9 +139,10 @@
<cxf.jakarta.activation.version>2.1.2</cxf.jakarta.activation.version>
<cxf.jakarta.mail.version>2.1.2</cxf.jakarta.mail.version>
<cxf.jakarta.injectapi.version>2.0.1</cxf.jakarta.injectapi.version>
+
<cxf.jakarta.interceptorapi.version>2.1.0</cxf.jakarta.interceptorapi.version>
<cxf.jakarta.jwsapi.version>3.0.0</cxf.jakarta.jwsapi.version>
- <cxf.jakarta.soapapi.version>2.0.1</cxf.jakarta.soapapi.version>
- <cxf.jakarta.wsapi.version>3.0.1</cxf.jakarta.wsapi.version>
+ <cxf.jakarta.soapapi.version>3.0.1</cxf.jakarta.soapapi.version>
+ <cxf.jakarta.wsapi.version>4.0.1</cxf.jakarta.wsapi.version>
<cxf.jakarta.jms.version>3.1.0</cxf.jakarta.jms.version>
<cxf.jakarta.transaction.version>2.0.1</cxf.jakarta.transaction.version>
<cxf.jakarta.ejb.version>4.0.1</cxf.jakarta.ejb.version>
@@ -150,13 +151,13 @@
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.javassist.version>3.29.2-GA</cxf.javassist.version>
<cxf.jakarta.annotation-api.version>2.1.1</cxf.jakarta.annotation-api.version>
- <cxf.jakarta.ws.rs.version>3.0.0</cxf.jakarta.ws.rs.version>
- <cxf.jaxb.runtime.version>3.0.2</cxf.jaxb.runtime.version>
- <cxf.jaxb.version>3.0.1</cxf.jaxb.version>
+ <cxf.jakarta.ws.rs.version>3.1.0</cxf.jakarta.ws.rs.version>
+ <cxf.jaxb.runtime.version>4.0.2</cxf.jaxb.runtime.version>
+ <cxf.jaxb.version>4.0.1</cxf.jaxb.version>
<cxf.jaxb.xjc.version>${cxf.jaxb.runtime.version}</cxf.jaxb.xjc.version>
<cxf.jaxen.version>2.0.0</cxf.jaxen.version>
<cxf.jboss.logging.version>3.5.3.Final</cxf.jboss.logging.version>
- <cxf.jboss.weld.version>4.0.3.Final</cxf.jboss.weld.version>
+ <cxf.jboss.weld.version>5.1.2.Final</cxf.jboss.weld.version>
<cxf.jboss.narayana.version>5.13.1.Final</cxf.jboss.narayana.version>
<cxf.jcache.version>1.1.1</cxf.jcache.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
@@ -166,8 +167,8 @@
<cxf.jexl.version>3.3</cxf.jexl.version>
<cxf.joda.time.version>2.10.10</cxf.joda.time.version>
<cxf.johnzon.version>1.2.20</cxf.johnzon.version>
- <cxf.json.api.version>2.0.1</cxf.json.api.version>
- <cxf.json.bind-api.version>2.0.0</cxf.json.bind-api.version>
+ <cxf.json.api.version>2.1.3</cxf.json.api.version>
+ <cxf.json.bind-api.version>3.0.0</cxf.json.bind-api.version>
<cxf.jsr250.api.version>1.0</cxf.jsr250.api.version>
<cxf.junit.version>4.13.2</cxf.junit.version>
<cxf.junit5.version>5.10.0</cxf.junit5.version>
@@ -181,7 +182,7 @@
<cxf.micrometer-tracing.version>1.0.11</cxf.micrometer-tracing.version>
<cxf.microprofile.config.version>3.0.3</cxf.microprofile.config.version>
<cxf.microprofile.rest.client.version>3.0.1</cxf.microprofile.rest.client.version>
-
<cxf.microprofile.openapi.version>3.0</cxf.microprofile.openapi.version>
+
<cxf.microprofile.openapi.version>3.1.1</cxf.microprofile.openapi.version>
<cxf.mina.version>2.2.1</cxf.mina.version>
<cxf.mockito.version>5.6.0</cxf.mockito.version>
<cxf.msv.version>2022.7</cxf.msv.version>
@@ -195,7 +196,8 @@
<cxf.opentelemetry.semconv.version>1.22.0-alpha</cxf.opentelemetry.semconv.version>
<cxf.opentracing.version>0.33.0</cxf.opentracing.version>
<cxf.openwebbeans.version>2.0.27</cxf.openwebbeans.version>
- <cxf.persistence-api.version>3.0.0</cxf.persistence-api.version>
+ <cxf.parsson.version>1.1.5</cxf.parsson.version>
+ <cxf.persistence-api.version>3.1.0</cxf.persistence-api.version>
<cxf.plexus-archiver.version>4.8.0</cxf.plexus-archiver.version>
<cxf.plexus-utils.version>3.5.1</cxf.plexus-utils.version>
<cxf.reactivestreams.version>1.0.4</cxf.reactivestreams.version>
@@ -204,17 +206,17 @@
<cxf.rxjava.version>1.3.8</cxf.rxjava.version>
<cxf.rxjava2.version>2.2.21</cxf.rxjava2.version>
<cxf.rxjava3.version>3.1.8</cxf.rxjava3.version>
- <cxf.saaj-impl.version>2.0.1</cxf.saaj-impl.version>
+ <cxf.saaj-impl.version>3.0.0</cxf.saaj-impl.version>
<cxf.servlet-api.artifact>jakarta.servlet-api</cxf.servlet-api.artifact>
<cxf.servlet-api.group>jakarta.servlet</cxf.servlet-api.group>
- <cxf.servlet-api.version>5.0.0</cxf.servlet-api.version>
+ <cxf.servlet-api.version>6.0.0</cxf.servlet-api.version>
<cxf.slf4j.version>2.0.9</cxf.slf4j.version>
<cxf.snakeyaml.version>2.2</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
- <cxf.spring.boot.version>3.0.12</cxf.spring.boot.version>
- <cxf.spring.ldap.version>3.0.6</cxf.spring.ldap.version>
+ <cxf.spring.boot.version>3.1.4</cxf.spring.boot.version>
+ <cxf.spring.ldap.version>3.1.0</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
- <cxf.spring.security.version>6.0.8</cxf.spring.security.version>
+ <cxf.spring.security.version>6.1.2</cxf.spring.security.version>
<cxf.spring.version>6.0.13</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
<cxf.swagger.ui.version>5.9.0</cxf.swagger.ui.version>
@@ -222,7 +224,8 @@
<cxf.tika.version>2.7.0</cxf.tika.version>
<cxf.tomcat.version>10.1.14</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.8</cxf.tomitribe.http.signature.version>
- <cxf.undertow.version>2.2.20.Final</cxf.undertow.version>
+ <cxf.undertow.version>2.3.5.Final</cxf.undertow.version>
+ <cxf.yasson.version>3.0.3</cxf.yasson.version>
<!-- the Export-Package is the same as the Maven artifact
version (with the Final), but we don't want an import package
with a version
@@ -251,7 +254,7 @@
<cxf.dom4j.bundle.version>2.1.3_1</cxf.dom4j.bundle.version>
<cxf.fastinfoset.bundle.version>1.2.18_1</cxf.fastinfoset.bundle.version>
<cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
- <cxf.istack.bundle.version>3.0.7</cxf.istack.bundle.version>
+ <cxf.istack.bundle.version>4.1.1</cxf.istack.bundle.version>
<cxf.jakarta.angus.mail.version>1.0.0</cxf.jakarta.angus.mail.version>
<cxf.jakarta.angus.activation.version>2.0.1</cxf.jakarta.angus.activation.version>
<cxf.jasypt.bundle.version>1.9.3_1</cxf.jasypt.bundle.version>
@@ -1079,6 +1082,16 @@
<version>${cxf.glassfish.json.version}</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.parsson</groupId>
+ <artifactId>parsson</artifactId>
+ <version>${cxf.parsson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>yasson</artifactId>
+ <version>${cxf.yasson.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
@@ -1238,7 +1251,7 @@
</dependency>
<dependency>
<groupId>io.undertow</groupId>
- <artifactId>undertow-servlet-jakarta</artifactId>
+ <artifactId>undertow-servlet</artifactId>
<version>${cxf.undertow.version}</version>
</dependency>
<dependency>
@@ -1620,7 +1633,7 @@
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-tools</artifactId>
- <version>3.0.11</version>
+ <version>${cxf.istack.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/bootstrap/ConfigurationBuilderImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/bootstrap/ConfigurationBuilderImpl.java
new file mode 100644
index 0000000000..7f890d9147
--- /dev/null
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/bootstrap/ConfigurationBuilderImpl.java
@@ -0,0 +1,79 @@
+/**
+ * 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.jaxrs.bootstrap;
+
+import java.util.AbstractMap.SimpleEntry;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+
+import javax.net.ssl.SSLContext;
+
+import jakarta.ws.rs.SeBootstrap;
+import jakarta.ws.rs.SeBootstrap.Configuration.SSLClientAuthentication;
+
+public class ConfigurationBuilderImpl implements
SeBootstrap.Configuration.Builder {
+ private final Map<String, Map.Entry<Class<?>, Consumer<?>>> supported =
new HashMap<>();
+ private final Map<String, Object> properties = new HashMap<>();
+
+ public ConfigurationBuilderImpl() {
+ supported.put(SeBootstrap.Configuration.PROTOCOL,
+ entry(String.class, this::protocol));
+ supported.put(SeBootstrap.Configuration.HOST,
+ entry(String.class, this::host));
+ supported.put(SeBootstrap.Configuration.PORT,
+ entry(Integer.class, this::port));
+ supported.put(SeBootstrap.Configuration.ROOT_PATH,
+ entry(String.class, this::rootPath));
+ supported.put(SeBootstrap.Configuration.SSL_CONTEXT,
+ entry(SSLContext.class, this::sslContext));
+ supported.put(SeBootstrap.Configuration.SSL_CLIENT_AUTHENTICATION,
+ entry(SSLClientAuthentication.class,
this::sslClientAuthentication));
+ }
+
+ private <T> SimpleEntry<Class<?>, Consumer<?>> entry(Class<T> clazz,
Consumer<T> consumer) {
+ return new SimpleEntry<Class<?>, Consumer<?>>(clazz, consumer);
+ }
+
+ @Override
+ public SeBootstrap.Configuration build() {
+ return new ConfigurationImpl(properties);
+ }
+
+ @Override
+ public SeBootstrap.Configuration.Builder property(String name, Object
value) {
+ properties.put(name, value);
+ return this;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public <T> SeBootstrap.Configuration.Builder from(BiFunction<String,
Class<T>, Optional<T>> propertiesProvider) {
+ for (Map.Entry<String, Map.Entry<Class<?>, Consumer<?>>> entry:
supported.entrySet()) {
+ propertiesProvider
+ .apply(entry.getKey(), (Class<T>)entry.getValue().getKey())
+ .ifPresent((Consumer<T>)entry.getValue().getValue());
+ }
+ return this;
+ }
+
+}
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/bootstrap/ConfigurationImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/bootstrap/ConfigurationImpl.java
new file mode 100644
index 0000000000..543fd1a2c5
--- /dev/null
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/bootstrap/ConfigurationImpl.java
@@ -0,0 +1,37 @@
+/**
+ * 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.jaxrs.bootstrap;
+
+import java.util.Map;
+
+import jakarta.ws.rs.SeBootstrap;
+
+class ConfigurationImpl implements SeBootstrap.Configuration {
+ private final Map<String, Object> properties;
+
+ ConfigurationImpl(Map<String, Object> properties) {
+ this.properties = properties;
+ }
+
+ @Override
+ public Object property(String name) {
+ return properties.get(name);
+ }
+}
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/bootstrap/InstanceImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/bootstrap/InstanceImpl.java
new file mode 100644
index 0000000000..6134813b24
--- /dev/null
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/bootstrap/InstanceImpl.java
@@ -0,0 +1,60 @@
+/**
+ * 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.jaxrs.bootstrap;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import jakarta.ws.rs.SeBootstrap.Configuration;
+import jakarta.ws.rs.SeBootstrap.Instance;
+import org.apache.cxf.endpoint.Server;
+
+public class InstanceImpl implements Instance {
+ private final Server server;
+ private final Configuration configuration;
+
+ public InstanceImpl(Server server, Configuration configuration) {
+ this.server = server;
+ this.configuration = configuration;
+ }
+
+ @Override
+ public Configuration configuration() {
+ return configuration;
+ }
+
+ @Override
+ public CompletionStage<StopResult> stop() {
+ return CompletableFuture
+ .runAsync(() -> server.stop())
+ .thenApply(f -> new StopResult() {
+ @Override
+ public <T> T unwrap(final Class<T> nativeClass) {
+ return nativeClass.cast(Void.class);
+ }
+ });
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> nativeClass) {
+ return nativeClass.cast(Server.class);
+ }
+
+}
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityPartBuilderImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityPartBuilderImpl.java
new file mode 100644
index 0000000000..c5d0e48afe
--- /dev/null
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityPartBuilderImpl.java
@@ -0,0 +1,154 @@
+/**
+ * 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.jaxrs.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Objects;
+
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.EntityPart;
+import jakarta.ws.rs.core.EntityPart.Builder;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import org.apache.cxf.jaxrs.provider.ProviderFactory;
+import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+import org.apache.cxf.message.Message;
+
+public class EntityPartBuilderImpl implements EntityPart.Builder {
+ private final String name;
+ private MediaType mediaType;
+ private MultivaluedMap<String, String> headers = new
MultivaluedHashMap<>();
+ private String fileName;
+ private Object content;
+ private GenericType<?> genericType;
+ private Class<?> type;
+
+ public EntityPartBuilderImpl(final String name) {
+ this.name = name;
+ }
+
+ @Override
+ public Builder mediaType(MediaType mt) throws IllegalArgumentException {
+ this.mediaType = mt;
+ return this;
+ }
+
+ @Override
+ public Builder mediaType(String mts) throws IllegalArgumentException {
+ this.mediaType = MediaType.valueOf(mts);
+ return this;
+ }
+
+ @Override
+ public Builder header(String headerName, String... headerValues) throws
IllegalArgumentException {
+ headers.addAll(headerName, headerValues);
+ return this;
+ }
+
+ @Override
+ public Builder headers(MultivaluedMap<String, String> newHeaders) throws
IllegalArgumentException {
+ headers.clear();
+ headers.putAll(newHeaders);
+ return this;
+ }
+
+ @Override
+ public Builder fileName(String fn) throws IllegalArgumentException {
+ this.fileName = fn;
+ return this;
+ }
+
+ @Override
+ public Builder content(InputStream in) throws IllegalArgumentException {
+ this.content = in;
+ return this;
+ }
+
+ @Override
+ public <T> Builder content(T c, Class<? extends T> t) throws
IllegalArgumentException {
+ this.content = c;
+ this.type = t;
+ this.genericType = null;
+ return this;
+ }
+
+ @Override
+ public <T> Builder content(T c, GenericType<T> t) throws
IllegalArgumentException {
+ this.content = c;
+ this.genericType = t;
+ this.type = null;
+ return this;
+ }
+
+ @Override
+ public EntityPart build() throws IllegalStateException, IOException,
WebApplicationException {
+ final MediaType mt = Objects.requireNonNullElse(mediaType,
MediaType.APPLICATION_OCTET_STREAM_TYPE);
+ final Message message = JAXRSUtils.getCurrentMessage();
+ final ProviderFactory factory =
ServerProviderFactory.getInstance(message);
+
+ if (genericType != null) {
+ try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ writeTo(factory, genericType, mt, message, out);
+ return new EntityPartImpl(factory, name, fileName, new
ByteArrayInputStream(out.toByteArray()),
+ headers, mt);
+ }
+ } else if (type != null) {
+ try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ writeTo(factory, type, mt, message, out);
+ return new EntityPartImpl(factory, name, fileName, new
ByteArrayInputStream(out.toByteArray()),
+ headers, mt);
+ }
+ } else {
+ throw new IllegalStateException("Either type or genericType is
expected for the content");
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private <T> void writeTo(final ProviderFactory providers, final
GenericType<T> t, final MediaType mt,
+ final Message message, final ByteArrayOutputStream out) throws
IOException {
+
+ final MessageBodyWriter<T> writer = (MessageBodyWriter<T>) providers
+ .createMessageBodyWriter(t.getRawType(), t.getType(), null, mt,
message);
+
+ writer.writeTo((T) content, t.getRawType(), t.getType(), null, mt,
cast(headers), out);
+ }
+
+ @SuppressWarnings("unchecked")
+ private <T> void writeTo(final ProviderFactory providers, final Class<T>
t, final MediaType mt,
+ final Message message, final ByteArrayOutputStream out) throws
IOException {
+
+ final MessageBodyWriter<T> writer = (MessageBodyWriter<T>) providers
+ .createMessageBodyWriter(t, null, null, mt, message);
+
+ writer.writeTo((T) content, t, null, null, mt, cast(headers), out);
+ }
+
+ @SuppressWarnings("unchecked")
+ private static <T, U> MultivaluedMap<T, U> cast(MultivaluedMap<?, ?> p) {
+ return (MultivaluedMap<T, U>)p;
+ }
+}
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityPartImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityPartImpl.java
new file mode 100644
index 0000000000..d302768b66
--- /dev/null
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityPartImpl.java
@@ -0,0 +1,103 @@
+/**
+ * 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.jaxrs.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Optional;
+
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.EntityPart;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import org.apache.cxf.jaxrs.provider.ProviderFactory;
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+import org.apache.cxf.message.Message;
+
+public class EntityPartImpl implements EntityPart {
+ private final String name;
+ private final String fileName;
+ private final InputStream content;
+ private final MultivaluedMap<String, String> headers;
+ private final MediaType mediaType;
+ private final ProviderFactory providers;
+
+ EntityPartImpl(final ProviderFactory providers, String name, String
fileName, InputStream content,
+ MultivaluedMap<String, String> headers, MediaType mediaType) {
+ this.providers = providers;
+ this.name = name;
+ this.fileName = fileName;
+ this.content = content;
+ this.headers = headers;
+ this.mediaType = mediaType;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public Optional<String> getFileName() {
+ return Optional.ofNullable(fileName);
+ }
+
+ @Override
+ public InputStream getContent() {
+ return content;
+ }
+
+ @Override
+ public <T> T getContent(Class<T> type)
+ throws IllegalArgumentException, IllegalStateException,
IOException, WebApplicationException {
+ final Message message = JAXRSUtils.getCurrentMessage();
+
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ final MessageBodyReader<T> reader = (MessageBodyReader) providers
+ .createMessageBodyReader(type, null, null, mediaType, message);
+
+ return reader.readFrom(type, null, null, mediaType, headers, content);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public <T> T getContent(GenericType<T> type)
+ throws IllegalArgumentException, IllegalStateException,
IOException, WebApplicationException {
+ final Message message = JAXRSUtils.getCurrentMessage();
+
+ @SuppressWarnings("rawtypes")
+ final MessageBodyReader<T> reader = (MessageBodyReader) providers
+ .createMessageBodyReader(type.getRawType(), type.getType(), null,
mediaType, message);
+
+ return reader.readFrom((Class<T>) type.getRawType(), type.getType(),
null, mediaType, headers, content);
+ }
+
+ @Override
+ public MultivaluedMap<String, String> getHeaders() {
+ return headers;
+ }
+
+ @Override
+ public MediaType getMediaType() {
+ return mediaType;
+ }
+}
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java
index 5cc8a60762..4bd9bb0e5d 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java
@@ -19,13 +19,25 @@
package org.apache.cxf.jaxrs.impl;
+import java.net.URI;
+import java.security.AccessController;
+import java.security.PrivilegedExceptionAction;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import javax.net.ssl.SSLContext;
+
+import jakarta.ws.rs.SeBootstrap.Configuration;
+import jakarta.ws.rs.SeBootstrap.Configuration.Builder;
+import jakarta.ws.rs.SeBootstrap.Configuration.SSLClientAuthentication;
+import jakarta.ws.rs.SeBootstrap.Instance;
import jakarta.ws.rs.core.Application;
import jakarta.ws.rs.core.CacheControl;
import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.EntityPart;
import jakarta.ws.rs.core.EntityTag;
import jakarta.ws.rs.core.Link;
import jakarta.ws.rs.core.MediaType;
@@ -34,15 +46,16 @@ import jakarta.ws.rs.core.Response.ResponseBuilder;
import jakarta.ws.rs.core.UriBuilder;
import jakarta.ws.rs.core.Variant.VariantListBuilder;
import jakarta.ws.rs.ext.RuntimeDelegate;
+import org.apache.cxf.configuration.jsse.TLSServerParameters;
+import org.apache.cxf.configuration.security.ClientAuthentication;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
+import org.apache.cxf.jaxrs.bootstrap.ConfigurationBuilderImpl;
+import org.apache.cxf.jaxrs.bootstrap.InstanceImpl;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
-
-
public class RuntimeDelegateImpl extends RuntimeDelegate {
- protected Map<Class<?>, HeaderDelegate<?>> headerProviders
- = new HashMap<>();
+ protected Map<Class<?>, HeaderDelegate<?>> headerProviders = new
HashMap<>();
public RuntimeDelegateImpl() {
headerProviders.put(MediaType.class, new MediaTypeHeaderProvider());
@@ -118,12 +131,71 @@ public class RuntimeDelegateImpl extends RuntimeDelegate {
return endpointType.cast(server);
}
-
-
@Override
public Link.Builder createLinkBuilder() {
return new LinkBuilderImpl();
}
+ @Override
+ public Builder createConfigurationBuilder() {
+ return new ConfigurationBuilderImpl();
+ }
+
+ @Override
+ public CompletionStage<Instance> bootstrap(Application application,
Configuration configuration) {
+ final JAXRSServerFactoryBean factory =
ResourceUtils.createApplication(application, false, false, false, null);
+ final URI address =
configuration.baseUriBuilder().path(factory.getAddress()).build();
+ factory.setAddress(address.toString());
+ factory.setStart(true);
+
+ if ("https".equalsIgnoreCase(configuration.protocol())) {
+ final TLSServerParameters parameters = new TLSServerParameters();
+
+ final SSLClientAuthentication sslClientAuthentication =
configuration.sslClientAuthentication();
+ if (sslClientAuthentication != null) {
+ final ClientAuthentication clientAuthentication = new
ClientAuthentication();
+
+ if (sslClientAuthentication ==
SSLClientAuthentication.OPTIONAL) {
+ clientAuthentication.setWant(true);
+ } else if (sslClientAuthentication ==
SSLClientAuthentication.MANDATORY) {
+ clientAuthentication.setRequired(true);
+ }
+
+ parameters.setClientAuthentication(clientAuthentication);
+ }
+
+ final SSLContext sslContext = configuration.sslContext();
+ if (sslContext != null) {
+ parameters.setSecureSocketProtocol(sslContext.getProtocol());
+ }
+
+ // TODO: Support SSL context propagation down to HTTP engine
+ }
+
+ return CompletableFuture
+ .supplyAsync(() -> factory.create())
+ .thenApply(s -> new InstanceImpl(s, configuration));
+ }
+
+ @Override
+ public CompletionStage<Instance> bootstrap(Class<? extends Application>
clazz, Configuration configuration) {
+ try {
+ final Application application = AccessController.doPrivileged(
+ new PrivilegedExceptionAction<Application>() {
+ @Override
+ public Application run() throws Exception {
+ return clazz.getDeclaredConstructor().newInstance();
+ }
+ }
+ );
+ return bootstrap(application, configuration);
+ } catch (final Exception ex) {
+ return CompletableFuture.failedStage(ex);
+ }
+ }
+ @Override
+ public EntityPart.Builder createEntityPartBuilder(String partName) throws
IllegalArgumentException {
+ return new EntityPartBuilderImpl(partName);
+ }
}
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
index e8174623db..27b7bdc79d 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
@@ -31,6 +31,7 @@ import java.util.Map;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletInputStream;
@@ -134,11 +135,6 @@ public class ThreadLocalHttpServletRequest extends
AbstractThreadLocalProxy<Http
return get().isRequestedSessionIdFromURL();
}
- @SuppressWarnings("deprecation")
- public boolean isRequestedSessionIdFromUrl() {
- return get().isRequestedSessionIdFromUrl();
- }
-
public boolean isRequestedSessionIdValid() {
return get().isRequestedSessionIdValid();
}
@@ -215,11 +211,6 @@ public class ThreadLocalHttpServletRequest extends
AbstractThreadLocalProxy<Http
return get().getReader();
}
- @SuppressWarnings("deprecation")
- public String getRealPath(String path) {
- return get().getRealPath(path);
- }
-
public String getRemoteAddr() {
return get().getRemoteAddr();
}
@@ -326,4 +317,19 @@ public class ThreadLocalHttpServletRequest extends
AbstractThreadLocalProxy<Http
ServletException {
return get().upgrade(handlerClass);
}
+
+ @Override
+ public String getRequestId() {
+ return get().getRequestId();
+ }
+
+ @Override
+ public String getProtocolRequestId() {
+ return get().getProtocolRequestId();
+ }
+
+ @Override
+ public ServletConnection getServletConnection() {
+ return get().getServletConnection();
+ }
}
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
index 9cf2f944ad..0b886b1aa6 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
@@ -58,20 +58,10 @@ public class ThreadLocalHttpServletResponse extends
AbstractThreadLocalProxy<Htt
return get().encodeRedirectURL(url);
}
- @SuppressWarnings("deprecation")
- public String encodeRedirectUrl(String url) {
- return get().encodeRedirectUrl(url);
- }
-
public String encodeURL(String url) {
return get().encodeURL(url);
}
- @SuppressWarnings("deprecation")
- public String encodeUrl(String url) {
- return get().encodeUrl(url);
- }
-
public void sendError(int sc) throws IOException {
get().sendError(sc);
}
@@ -102,11 +92,6 @@ public class ThreadLocalHttpServletResponse extends
AbstractThreadLocalProxy<Htt
}
- @SuppressWarnings("deprecation")
- public void setStatus(int sc, String sm) {
- get().setStatus(sc, sm);
- }
-
public void flushBuffer() throws IOException {
get().flushBuffer();
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
index 5681cc15ea..5e20491533 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
@@ -110,34 +110,14 @@ public class ThreadLocalServletContext extends
AbstractThreadLocalProxy<ServletC
return get().getServerInfo();
}
- @SuppressWarnings("deprecation")
- public Servlet getServlet(String name) throws ServletException {
- return get().getServlet(name);
- }
-
public String getServletContextName() {
return get().getServletContextName();
}
- @SuppressWarnings("deprecation")
- public Enumeration<String> getServletNames() {
- return get().getServletNames();
- }
-
- @SuppressWarnings("deprecation")
- public Enumeration<Servlet> getServlets() {
- return get().getServlets();
- }
-
public void log(String msg) {
get().log(msg);
}
- @SuppressWarnings("deprecation")
- public void log(Exception exception, String msg) {
- get().log(exception, msg);
- }
-
public void log(String message, Throwable throwable) {
get().log(message, throwable);
}
diff --git
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index 5017d1eeb6..3cb011c922 100644
---
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.CompletionStage;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
@@ -43,9 +44,12 @@ import org.w3c.dom.Document;
import jakarta.activation.DataSource;
import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.SeBootstrap.Configuration;
+import jakarta.ws.rs.SeBootstrap.Instance;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.client.ResponseProcessingException;
import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.EntityPart;
import jakarta.ws.rs.core.EntityTag;
import jakarta.ws.rs.core.GenericEntity;
import jakarta.ws.rs.core.HttpHeaders;
@@ -67,6 +71,7 @@ import jakarta.ws.rs.ext.RuntimeDelegate;
import jakarta.ws.rs.ext.RuntimeDelegate.HeaderDelegate;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.IOUtils;
+import org.apache.cxf.jaxrs.bootstrap.ConfigurationBuilderImpl;
import org.apache.cxf.jaxrs.provider.ProviderFactory;
import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
import org.apache.cxf.jaxrs.resources.Book;
@@ -844,6 +849,26 @@ public class ResponseImplTest {
public Builder createLinkBuilder() {
return original.createLinkBuilder();
}
+
+ @Override
+ public jakarta.ws.rs.SeBootstrap.Configuration.Builder
createConfigurationBuilder() {
+ return new ConfigurationBuilderImpl();
+ }
+
+ @Override
+ public CompletionStage<Instance> bootstrap(Application application,
Configuration configuration) {
+ return original.bootstrap(application, configuration);
+ }
+
+ @Override
+ public CompletionStage<Instance> bootstrap(Class<? extends
Application> clazz, Configuration configuration) {
+ return original.bootstrap(clazz, configuration);
+ }
+
+ @Override
+ public EntityPart.Builder createEntityPartBuilder(String partName)
throws IllegalArgumentException {
+ return original.createEntityPartBuilder(partName);
+ }
}
public static class StringBeanHeaderDelegate implements
HeaderDelegate<StringBean> {
diff --git
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RetryAfterHeaderProviderTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RetryAfterHeaderProviderTest.java
index c49730011f..e7dd914abb 100644
---
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RetryAfterHeaderProviderTest.java
+++
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RetryAfterHeaderProviderTest.java
@@ -19,6 +19,8 @@
package org.apache.cxf.jaxrs.impl;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.Clock;
import java.time.Duration;
import java.time.OffsetDateTime;
@@ -26,6 +28,7 @@ import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Locale;
import java.util.TimeZone;
import org.junit.Test;
@@ -50,9 +53,7 @@ public class RetryAfterHeaderProviderTest {
}
@Parameterized.Parameters(name = "retry after {0} is duration of {1} from
2000-01-01 00:00:00.000")
- public static Collection<Object[]> data() {
- final int offset = TimeZone.getDefault().getRawOffset() / 1000;
-
+ public static Collection<Object[]> data() throws ParseException {
return Arrays.asList(
new Object[] {"", Duration.ZERO},
new Object[] {null, Duration.ZERO},
@@ -61,8 +62,14 @@ public class RetryAfterHeaderProviderTest {
new Object[] {"Sun, 03 Nov 2002 08:49:37 EST",
Duration.ofSeconds(89646577)},
new Object[] {"Sat, 01 Jan 2000 01:00:00 GMT",
Duration.ofSeconds(3600)},
new Object[] {"Sunday, 03-Nov-02 08:49:37 GMT",
Duration.ofSeconds(89628577)},
- new Object[] {"Sun Nov 3 08:49:37 2002",
Duration.ofSeconds(89628577 - offset)},
- new Object[] {"Sun Nov 03 08:49:37 2002",
Duration.ofSeconds(89628577 - offset)},
+ new Object[] {"Sun Nov 3 08:49:37 2002",
Duration.ofSeconds(89628577 - TimeZone.getDefault()
+ .getOffset(
+ new SimpleDateFormat("EEE MMM d HH:mm:ss yyyy", Locale.US)
+ .parse("Sun Nov 3 08:49:37 2002").getTime()) / 1000)},
+ new Object[] {"Sun Nov 03 08:49:37 2002",
Duration.ofSeconds(89628577 - TimeZone.getDefault()
+ .getOffset(
+ new SimpleDateFormat("EEE MMM d HH:mm:ss yyyy", Locale.US)
+ .parse("Sun Nov 03 08:49:37 2002").getTime()) / 1000)},
new Object[] {"Sun, 06 Nov 1994 08:49:37 EST", Duration.ZERO}
);
diff --git
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index d2c9e14a12..40242c0c75 100644
---
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -1453,8 +1453,7 @@ public class JAXBElementProviderTest {
return props;
}
- @SuppressWarnings("rawtypes")
- public <A extends XmlAdapter> A getAdapter(Class<A> type) {
+ public <A extends XmlAdapter<?, ?>> A getAdapter(Class<A> type) {
return null;
}
@@ -1513,13 +1512,11 @@ public class JAXBElementProviderTest {
}
- @SuppressWarnings("rawtypes")
- public void setAdapter(XmlAdapter adapter) {
+ public <A extends XmlAdapter<?, ?>> void setAdapter(A adapter) {
}
- @SuppressWarnings("rawtypes")
- public <A extends XmlAdapter> void setAdapter(Class<A> type, A
adapter) {
+ public <A extends XmlAdapter<?, ?>> void setAdapter(Class<A> type, A
adapter) {
}
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletRequestAdapter.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletRequestAdapter.java
index 74af87b416..45e6c790e7 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletRequestAdapter.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletRequestAdapter.java
@@ -38,6 +38,7 @@ import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.ReadListener;
import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletInputStream;
@@ -452,4 +453,19 @@ class HttpServletRequestAdapter implements
HttpServletRequest {
public <T extends HttpUpgradeHandler> T upgrade(Class<T> cls) throws
IOException, ServletException {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public String getRequestId() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getProtocolRequestId() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public ServletConnection getServletConnection() {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/rt/rs/extensions/providers/pom.xml
b/rt/rs/extensions/providers/pom.xml
index d702bb0b0c..f9df2bab2a 100644
--- a/rt/rs/extensions/providers/pom.xml
+++ b/rt/rs/extensions/providers/pom.xml
@@ -135,22 +135,14 @@
<version>${cxf.mockito.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jsonb</artifactId>
- <classifier>jakarta</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-core</artifactId>
- <classifier>jakarta</classifier>
+ <dependency>
+ <groupId>org.eclipse.parsson</groupId>
+ <artifactId>parsson</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-mapper</artifactId>
- <classifier>jakarta</classifier>
+ <groupId>org.eclipse</groupId>
+ <artifactId>yasson</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
index 61b4cae86f..f8be63e7a5 100644
---
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
+++
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
@@ -29,6 +29,7 @@ import jakarta.annotation.Nullable;
import jakarta.json.JsonException;
import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbException;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.WebApplicationException;
@@ -101,7 +102,7 @@ public class JsrJsonbProvider implements
MessageBodyReader<Object>, MessageBodyW
} else {
return jsonbFor(type).fromJson(entityStream, genericType);
}
- } catch (JsonException ex) {
+ } catch (JsonException | JsonbException ex) {
throw ExceptionUtils.toBadRequestException(ex, null);
}
}
diff --git a/rt/rs/microprofile-client/pom.xml
b/rt/rs/microprofile-client/pom.xml
index 7b156c8778..2e8aed11b2 100644
--- a/rt/rs/microprofile-client/pom.xml
+++ b/rt/rs/microprofile-client/pom.xml
@@ -95,6 +95,16 @@
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${cxf.jakarta.injectapi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <version>${cxf.jakarta.interceptorapi.version}</version>
+ </dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
diff --git
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java
index 8b9fbf7a7a..f6f87f2a00 100644
---
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java
+++
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java
@@ -107,11 +107,6 @@ public class RestClientBean implements Bean<Object>,
PassivationCapable {
return Collections.emptySet();
}
- @Override
- public boolean isNullable() {
- return false;
- }
-
@Override
public Object create(CreationalContext<Object> creationalContext) {
CxfTypeSafeClientBuilder builder = new CxfTypeSafeClientBuilder();
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml
b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 0c00a0e25f..1f32110b2b 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -270,4 +270,3 @@
</plugins>
</build>
</project>
-
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
index d4847ed645..082cacf2bb 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProvider.java
@@ -96,9 +96,11 @@ public class JPACodeDataProvider extends
JPAOAuthDataProvider implements Authori
}
private ServerAuthorizationCodeGrant removeCodeGrant(String code,
EntityManager em) throws OAuthServiceException {
- ServerAuthorizationCodeGrant grant =
em.getReference(ServerAuthorizationCodeGrant.class, code);
+ ServerAuthorizationCodeGrant grant =
em.find(ServerAuthorizationCodeGrant.class, code);
try {
- em.remove(grant);
+ if (grant != null) {
+ em.remove(grant);
+ }
} catch (EntityNotFoundException e) {
}
return grant;
diff --git
a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java
b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java
index 8a76609ed2..de1ea2dd70 100644
--- a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java
+++ b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java
@@ -108,11 +108,7 @@ public final class SseBroadcasterImpl implements
SseBroadcaster {
@Override
public void close() {
- if (closed.compareAndSet(false, true)) {
- subscribers.forEach(subscriber -> {
- subscriber.close();
- });
- }
+ close(true);
}
private void assertNotClosed() {
@@ -120,4 +116,17 @@ public final class SseBroadcasterImpl implements
SseBroadcaster {
throw new IllegalStateException("The SSE broadcaster is already
closed");
}
}
+
+ @Override
+ public void close(boolean cascading) {
+ if (!cascading) {
+ return;
+ }
+
+ if (closed.compareAndSet(false, true)) {
+ subscribers.forEach(subscriber -> {
+ subscriber.close();
+ });
+ }
+ }
}
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
index e4c3f4819f..98827bae86 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
@@ -40,6 +40,7 @@ import javax.net.ssl.SSLSession;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletInputStream;
@@ -450,12 +451,6 @@ public class NettyHttpServletRequest implements
HttpServletRequest {
"Method 'isRequestedSessionIdFromURL' not yet implemented!");
}
- @Override
- public boolean isRequestedSessionIdFromUrl() {
- throw new IllegalStateException(
- "Method 'isRequestedSessionIdFromUrl' not yet implemented!");
- }
-
@Override
public boolean isRequestedSessionIdValid() {
return false;
@@ -467,12 +462,6 @@ public class NettyHttpServletRequest implements
HttpServletRequest {
"Method 'isUserInRole' not yet implemented!");
}
- @Override
- public String getRealPath(String path) {
- throw new IllegalStateException(
- "Method 'getRealPath' not yet implemented!");
- }
-
@Override
public RequestDispatcher getRequestDispatcher(String path) {
throw new IllegalStateException(
@@ -555,4 +544,19 @@ public class NettyHttpServletRequest implements
HttpServletRequest {
throws IOException, ServletException {
throw new IllegalStateException("Method 'upgrade' not yet
implemented!");
}
+
+ @Override
+ public String getRequestId() {
+ throw new IllegalStateException("Method 'getRequestId' not yet
implemented!");
+ }
+
+ @Override
+ public String getProtocolRequestId() {
+ throw new IllegalStateException("Method 'getProtocolRequestId' not yet
implemented!");
+ }
+
+ @Override
+ public ServletConnection getServletConnection() {
+ throw new IllegalStateException("Method 'getServletConnection' not yet
implemented!");
+ }
}
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpSession.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpSession.java
index a22f41eb7c..5b5b79821d 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpSession.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpSession.java
@@ -82,27 +82,6 @@ public class NettyHttpSession implements HttpSession {
return null;
}
- @SuppressWarnings("deprecation")
- @Override
- public jakarta.servlet.http.HttpSessionContext getSessionContext() {
- throw new IllegalStateException(
- "As of Version 2.1, this method is deprecated and has no
replacement.");
- }
-
- @Override
- public Object getValue(String name) {
- return getAttribute(name);
- }
-
- @Override
- public String[] getValueNames() {
- if (attributes == null) {
- return null;
- }
- return attributes.keySet().toArray(
- new String[attributes.keySet().size()]);
- }
-
@Override
public void invalidate() {
if (attributes != null) {
@@ -110,11 +89,6 @@ public class NettyHttpSession implements HttpSession {
}
}
- @Override
- public void putValue(String name, Object value) {
- this.setAttribute(name, value);
- }
-
@Override
public void removeAttribute(String name) {
if (attributes != null) {
@@ -128,11 +102,6 @@ public class NettyHttpSession implements HttpSession {
}
}
- @Override
- public void removeValue(String name) {
- this.removeAttribute(name);
- }
-
@Override
public void setAttribute(String name, Object value) {
if (attributes == null) {
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java
index 58570f162e..3ac36604c2 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java
@@ -130,11 +130,6 @@ public class NettyServletContext implements ServletContext
{
LOG.info(msg);
}
- @Override
- public void log(Exception exception, String msg) {
- LOG.log(Level.SEVERE, msg, exception);
- }
-
@Override
public void log(String message, Throwable throwable) {
LOG.log(Level.SEVERE, message, throwable);
@@ -164,26 +159,6 @@ public class NettyServletContext implements ServletContext
{
this.servletContextName = servletContextName;
}
- @Override
- public Servlet getServlet(String name) throws ServletException {
- throw new IllegalStateException(
- "Deprecated as of Java Servlet API 2.1, with no direct
replacement!");
- }
-
- @SuppressWarnings("rawtypes")
- @Override
- public Enumeration getServletNames() {
- throw new IllegalStateException(
- "Method 'getServletNames' deprecated as of Java Servlet API
2.0, with no replacement.");
- }
-
- @SuppressWarnings("rawtypes")
- @Override
- public Enumeration getServlets() {
- throw new IllegalStateException(
- "Method 'getServlets' deprecated as of Java Servlet API 2.0,
with no replacement.");
- }
-
@Override
public ServletContext getContext(String uripath) {
return this;
diff --git a/rt/transports/http-undertow/pom.xml
b/rt/transports/http-undertow/pom.xml
index f2c8379392..835e30d8b2 100644
--- a/rt/transports/http-undertow/pom.xml
+++ b/rt/transports/http-undertow/pom.xml
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>io.undertow</groupId>
- <artifactId>undertow-servlet-jakarta</artifactId>
+ <artifactId>undertow-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.xnio</groupId>
diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml
index 7b133288b6..8730e097ed 100644
--- a/rt/transports/websocket/pom.xml
+++ b/rt/transports/websocket/pom.xml
@@ -103,6 +103,10 @@
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>jakarta.servlet</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-jakarta-servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -144,6 +148,12 @@
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-server</artifactId>
<version>${cxf.jetty11.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-jakarta-servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletRequest.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletRequest.java
index c9439375f1..c85205c5ac 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletRequest.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletRequest.java
@@ -237,12 +237,6 @@ public class WebSocketVirtualServletRequest implements
HttpServletRequest {
return new BufferedReader(new InputStreamReader(in, UTF_8));
}
- @Override
- public String getRealPath(String path) {
- LOG.log(Level.FINE, "getRealPath");
- return null;
- }
-
@Override
public String getRemoteAddr() {
LOG.log(Level.FINE, "getRemoteAddr");
@@ -513,12 +507,6 @@ public class WebSocketVirtualServletRequest implements
HttpServletRequest {
return false;
}
- @Override
- public boolean isRequestedSessionIdFromUrl() {
- LOG.log(Level.FINE, "isRequestedSessionIdFromUrl");
- return false;
- }
-
@Override
public boolean isRequestedSessionIdValid() {
LOG.log(Level.FINE, "isRequestedSessionIdValid");
@@ -556,4 +544,15 @@ public class WebSocketVirtualServletRequest implements
HttpServletRequest {
public <T extends HttpUpgradeHandler> T upgrade(Class<T> arg0) throws
IOException, ServletException {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public String getRealPath(String path) {
+ return path;
+ }
+
+ @Override
+ public boolean isRequestedSessionIdFromUrl() {
+ LOG.log(Level.FINE, "isRequestedSessionIdFromUrl");
+ return false;
+ }
}
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java
index 6084bdac8b..000047e478 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java
@@ -22,6 +22,8 @@ package org.apache.cxf.transport.websocket.jetty;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.Locale;
import java.util.Map;
@@ -192,14 +194,6 @@ public class WebSocketVirtualServletResponse implements
HttpServletResponse {
return null;
}
- @Override
- public String encodeRedirectUrl(String url) {
- if (LOG.isLoggable(Level.FINE)) {
- LOG.log(Level.FINE, "encodeRedirectUrl({0})", url);
- }
- return null;
- }
-
@Override
public String encodeURL(String url) {
if (LOG.isLoggable(Level.FINE)) {
@@ -208,14 +202,6 @@ public class WebSocketVirtualServletResponse implements
HttpServletResponse {
return null;
}
- @Override
- public String encodeUrl(String url) {
- if (LOG.isLoggable(Level.FINE)) {
- LOG.log(Level.FINE, "encodeUrl({0})", url);
- }
- return null;
- }
-
@Override
public String getHeader(String name) {
if (LOG.isLoggable(Level.FINE)) {
@@ -303,14 +289,6 @@ public class WebSocketVirtualServletResponse implements
HttpServletResponse {
responseHeaders.put(WebSocketUtils.SC_KEY, Integer.toString(sc));
}
- @Override
- public void setStatus(int sc, String sm) {
- if (LOG.isLoggable(Level.FINE)) {
- LOG.log(Level.FINE, "setStatus({0}, {1})", new Object[]{sc, sm});
- }
- responseHeaders.put(WebSocketUtils.SC_KEY, Integer.toString(sc));
- }
-
private ServletOutputStream createOutputStream() {
//REVISIT
// This output buffering is needed as the server side websocket does
@@ -384,4 +362,22 @@ public class WebSocketVirtualServletResponse implements
HttpServletResponse {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public String encodeUrl(String url) {
+ return URLEncoder.encode(url, StandardCharsets.UTF_8);
+ }
+
+ @Override
+ public String encodeRedirectUrl(String url) {
+ return URLEncoder.encode(url, StandardCharsets.UTF_8);
+ }
+
+ @Override
+ public void setStatus(int sc, String sm) {
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "setStatus({0})", sc);
+ }
+ responseHeaders.put(WebSocketUtils.SC_KEY, Integer.toString(sc));
+ }
}
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java
index 7444176468..864ade3132 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java
@@ -260,12 +260,6 @@ public class WebSocketUndertowServletRequest implements
HttpServletRequest {
return new BufferedReader(new InputStreamReader(in, UTF_8));
}
- @Override
- public String getRealPath(String path) {
- LOG.log(Level.FINE, "getRealPath");
- return null;
- }
-
@Override
public String getRemoteAddr() {
LOG.log(Level.FINE, "getRemoteAddr");
@@ -538,12 +532,6 @@ public class WebSocketUndertowServletRequest implements
HttpServletRequest {
return false;
}
- @Override
- public boolean isRequestedSessionIdFromUrl() {
- LOG.log(Level.FINE, "isRequestedSessionIdFromUrl");
- return false;
- }
-
@Override
public boolean isRequestedSessionIdValid() {
LOG.log(Level.FINE, "isRequestedSessionIdValid");
@@ -581,4 +569,15 @@ public class WebSocketUndertowServletRequest implements
HttpServletRequest {
public <T extends HttpUpgradeHandler> T upgrade(Class<T> arg0) throws
IOException, ServletException {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public String getRealPath(String path) {
+ return path;
+ }
+
+ @Override
+ public boolean isRequestedSessionIdFromUrl() {
+ LOG.log(Level.FINE, "isRequestedSessionIdFromUrl");
+ return false;
+ }
}
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java
index 5268bdac73..1e64fbfc88 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java
@@ -22,7 +22,9 @@ package org.apache.cxf.transport.websocket.undertow;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.URLEncoder;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.Locale;
import java.util.Map;
@@ -196,14 +198,6 @@ public class WebSocketUndertowServletResponse implements
HttpServletResponse {
return null;
}
- @Override
- public String encodeRedirectUrl(String url) {
- if (LOG.isLoggable(Level.FINE)) {
- LOG.log(Level.FINE, "encodeRedirectUrl({0})", url);
- }
- return null;
- }
-
@Override
public String encodeURL(String url) {
if (LOG.isLoggable(Level.FINE)) {
@@ -212,14 +206,6 @@ public class WebSocketUndertowServletResponse implements
HttpServletResponse {
return null;
}
- @Override
- public String encodeUrl(String url) {
- if (LOG.isLoggable(Level.FINE)) {
- LOG.log(Level.FINE, "encodeUrl({0})", url);
- }
- return null;
- }
-
@Override
public String getHeader(String name) {
if (LOG.isLoggable(Level.FINE)) {
@@ -307,14 +293,6 @@ public class WebSocketUndertowServletResponse implements
HttpServletResponse {
responseHeaders.put(WebSocketUtils.SC_KEY, Integer.toString(sc));
}
- @Override
- public void setStatus(int sc, String sm) {
- if (LOG.isLoggable(Level.FINE)) {
- LOG.log(Level.FINE, "setStatus({0}, {1})", new Object[]{sc, sm});
- }
- responseHeaders.put(WebSocketUtils.SC_KEY, Integer.toString(sc));
- }
-
private ServletOutputStream createOutputStream() {
//REVISIT
// This output buffering is needed as the server side websocket does
@@ -388,4 +366,22 @@ public class WebSocketUndertowServletResponse implements
HttpServletResponse {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public String encodeUrl(String url) {
+ return URLEncoder.encode(url, StandardCharsets.UTF_8);
+ }
+
+ @Override
+ public String encodeRedirectUrl(String url) {
+ return URLEncoder.encode(url, StandardCharsets.UTF_8);
+ }
+
+ @Override
+ public void setStatus(int sc, String sm) {
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "setStatus({0})", sc);
+ }
+ responseHeaders.put(WebSocketUtils.SC_KEY, Integer.toString(sc));
+ }
}
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index c48ffaef2f..261a347379 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -534,16 +534,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jsonb</artifactId>
- <classifier>jakarta</classifier>
+ <groupId>org.eclipse.parsson</groupId>
+ <artifactId>parsson</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-mapper</artifactId>
- <version>${cxf.johnzon.version}</version>
- <classifier>jakarta</classifier>
+ <groupId>org.eclipse</groupId>
+ <artifactId>yasson</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/CXFJaxbContextResolver.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/CXFJaxbContextResolver.java
index 4a17c01f63..39289efcf8 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/CXFJaxbContextResolver.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/CXFJaxbContextResolver.java
@@ -51,7 +51,6 @@ import jakarta.xml.bind.PropertyException;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.UnmarshallerHandler;
import jakarta.xml.bind.ValidationEventHandler;
-import jakarta.xml.bind.Validator;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import jakarta.xml.bind.attachment.AttachmentMarshaller;
import jakarta.xml.bind.attachment.AttachmentUnmarshaller;
@@ -61,7 +60,7 @@ public class CXFJaxbContextResolver implements
ContextResolver<JAXBContext> {
@SuppressWarnings("rawtypes")
public static class SomeUnmarshaller implements Unmarshaller {
@Override
- public <A extends XmlAdapter> A getAdapter(Class<A> type) {
+ public <A extends XmlAdapter<?, ?>> A getAdapter(Class<A> type) {
return null;
}
@@ -95,17 +94,12 @@ public class CXFJaxbContextResolver implements
ContextResolver<JAXBContext> {
return null;
}
- @Override
- public boolean isValidating() throws JAXBException {
- return false;
- }
-
@Override
public void setAdapter(XmlAdapter adapter) {
}
@Override
- public <A extends XmlAdapter> void setAdapter(Class<A> type, A
adapter) {
+ public <A extends XmlAdapter<?, ?>> void setAdapter(Class<A> type, A
adapter) {
}
@Override
@@ -128,10 +122,6 @@ public class CXFJaxbContextResolver implements
ContextResolver<JAXBContext> {
public void setSchema(Schema schema) {
}
- @Override
- public void setValidating(boolean validating) throws JAXBException {
- }
-
@Override
public Object unmarshal(File f) throws JAXBException {
return null;
@@ -205,7 +195,7 @@ public class CXFJaxbContextResolver implements
ContextResolver<JAXBContext> {
@SuppressWarnings("rawtypes")
public static class SomeMarshaller implements Marshaller {
@Override
- public <A extends XmlAdapter> A getAdapter(Class<A> arg0) {
+ public <A extends XmlAdapter<?, ?>> A getAdapter(Class<A> arg0) {
return null;
}
@@ -284,7 +274,7 @@ public class CXFJaxbContextResolver implements
ContextResolver<JAXBContext> {
}
@Override
- public <A extends XmlAdapter> void setAdapter(Class<A> type, A
adapter) {
+ public <A extends XmlAdapter<?, ?>> void setAdapter(Class<A> type, A
adapter) {
}
@Override
@@ -308,7 +298,6 @@ public class CXFJaxbContextResolver implements
ContextResolver<JAXBContext> {
}
}
- @SuppressWarnings("deprecation")
public static class SomeJaxbContext extends JAXBContext {
@Override
public Marshaller createMarshaller() throws JAXBException {
@@ -320,10 +309,6 @@ public class CXFJaxbContextResolver implements
ContextResolver<JAXBContext> {
return new SomeUnmarshaller();
}
- @Override
- public Validator createValidator() throws JAXBException {
- return null;
- }
}
@Override
diff --git a/systests/microprofile/pom.xml b/systests/microprofile/pom.xml
index 25c8193fe9..00e2a35248 100644
--- a/systests/microprofile/pom.xml
+++ b/systests/microprofile/pom.xml
@@ -55,11 +55,6 @@
<version>${cxf.commons-logging.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>jakarta.ws.rs</groupId>
- <artifactId>jakarta.ws.rs-api</artifactId>
- <version>${cxf.jakarta.ws.rs.version}</version>
- </dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
@@ -85,12 +80,6 @@
<classifier>jakarta</classifier>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>jakarta.json</groupId>
- <artifactId>jakarta.json-api</artifactId>
- <version>${cxf.json.api.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
diff --git a/systests/rs-security/src/test/resources/META-INF/persistence.xml
b/systests/rs-security/src/test/resources/META-INF/persistence.xml
index ddab4c4778..28ae22b719 100644
--- a/systests/rs-security/src/test/resources/META-INF/persistence.xml
+++ b/systests/rs-security/src/test/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";
- version="2.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence
https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd";
+ version="3.1">
<persistence-unit name="test-hibernate-cxf-systests-rs-security"
transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
diff --git a/systests/rs-sse/rs-sse-undertow/pom.xml
b/systests/rs-sse/rs-sse-undertow/pom.xml
index 0bf8e8b188..892f95b200 100644
--- a/systests/rs-sse/rs-sse-undertow/pom.xml
+++ b/systests/rs-sse/rs-sse-undertow/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>io.undertow</groupId>
- <artifactId>undertow-servlet-jakarta</artifactId>
+ <artifactId>undertow-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tools/wadlto/jaxrs/src/test/resources/wadl/bookstoreDigit.xml
b/tools/wadlto/jaxrs/src/test/resources/wadl/bookstoreDigit.xml
index 8c90fb5f15..b7c811ffc1 100644
--- a/tools/wadlto/jaxrs/src/test/resources/wadl/bookstoreDigit.xml
+++ b/tools/wadlto/jaxrs/src/test/resources/wadl/bookstoreDigit.xml
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<application xmlns="http://wadl.dev.java.net/2009/02";
+<wadl:application xmlns:wadl="http://wadl.dev.java.net/2009/02";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
- <doc title="My Application"/>
- <grammars>
+ <wadl:doc title="My Application"/>
+ <wadl:grammars>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<xs:element name="test" type="testCompositeObject"/>
<xs:complexType name="testCompositeObject">
@@ -30,27 +30,27 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- </grammars>
- <resources base="http://localhost:8080/baz";>
- <resource path="1.0/bookstore">
- <method name="PUT">
- <request>
+ </wadl:grammars>
+ <wadl:resources base="http://localhost:8080/baz";>
+ <wadl:resource path="1.0/bookstore">
+ <wadl:method name="PUT">
+ <wadl:request>
+ <wadl:representation mediaType="application/xml"
element="test"/>
+ </wadl:request>
+ <wadl:response>
+ <wadl:representation mediaType="application/xml"
element="test"/>
+ </wadl:response>
+ </wadl:method>
+ </wadl:resource>
+ <wadl:resource path="api/1.0/bookstore">
+ <wadl:method name="PUT">
+ <wadl:request>
+ <wadl:representation mediaType="application/xml"
element="test"/>
+ </wadl:request>
+ <wadl:response>
<representation mediaType="application/xml"
element="test"/>
- </request>
- <response>
- <representation mediaType="application/xml"
element="test"/>
- </response>
- </method>
- </resource>
- <resource path="api/1.0/bookstore">
- <method name="PUT">
- <request>
- <representation mediaType="application/xml"
element="test"/>
- </request>
- <response>
- <representation mediaType="application/xml"
element="test"/>
- </response>
- </method>
- </resource>
- </resources>
-</application>
+ </wadl:response>
+ </wadl:method>
+ </wadl:resource>
+ </wadl:resources>
+</wadl:application>
diff --git a/tools/wadlto/jaxrs/src/test/resources/wadl/bookstoreHyphen.xml
b/tools/wadlto/jaxrs/src/test/resources/wadl/bookstoreHyphen.xml
index f040db08d3..da3172ed30 100644
--- a/tools/wadlto/jaxrs/src/test/resources/wadl/bookstoreHyphen.xml
+++ b/tools/wadlto/jaxrs/src/test/resources/wadl/bookstoreHyphen.xml
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<application xmlns="http://wadl.dev.java.net/2009/02";
+<wadl:application xmlns:wadl="http://wadl.dev.java.net/2009/02";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
- <doc title="My Application"/>
- <grammars>
+ <wadl:doc title="My Application"/>
+ <wadl:grammars>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<xs:element name="test" type="testCompositeObject"/>
<xs:complexType name="testCompositeObject">
@@ -30,17 +30,17 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- </grammars>
- <resources base="http://localhost:8080/baz";>
- <resource path="/book-store">
- <method name="PUT">
- <request>
- <representation mediaType="application/xml"
element="test"/>
- </request>
- <response>
- <representation mediaType="application/xml"
element="test"/>
- </response>
- </method>
- </resource>
- </resources>
-</application>
+ </wadl:grammars>
+ <wadl:resources base="http://localhost:8080/baz";>
+ <wadl:resource path="/book-store">
+ <wadl:method name="PUT">
+ <wadl:request>
+ <wadl:representation mediaType="application/xml"
element="test"/>
+ </wadl:request>
+ <wadl:response>
+ <wadl:representation mediaType="application/xml"
element="test"/>
+ </wadl:response>
+ </wadl:method>
+ </wadl:resource>
+ </wadl:resources>
+</wadl:application>
diff --git
a/tools/wadlto/jaxrs/src/test/resources/wadl/resourceSchemaNoTargetNamespace.xml
b/tools/wadlto/jaxrs/src/test/resources/wadl/resourceSchemaNoTargetNamespace.xml
index 5682e2d8ad..ff70b48e69 100644
---
a/tools/wadlto/jaxrs/src/test/resources/wadl/resourceSchemaNoTargetNamespace.xml
+++
b/tools/wadlto/jaxrs/src/test/resources/wadl/resourceSchemaNoTargetNamespace.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<application xmlns="http://wadl.dev.java.net/2009/02";
+<wadl:application xmlns:wadl="http://wadl.dev.java.net/2009/02";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
- <doc title="My Application"/>
- <grammars>
+ <wadl:doc title="My Application"/>
+ <wadl:grammars>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<xs:element name="test" type="testCompositeObject"/>
<xs:complexType name="testCompositeObject">
@@ -12,19 +12,19 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- </grammars>
- <resources base="http://localhost:8080/baz";>
- <resource path="/">
- <resource path="rest">
- <method name="PUT">
- <request>
- <representation mediaType="application/xml"
element="test"/>
- </request>
- <response>
- <representation mediaType="application/xml"
element="test"/>
- </response>
- </method>
- </resource>
- </resource>
- </resources>
-</application>
+ </wadl:grammars>
+ <wadl:resources base="http://localhost:8080/baz";>
+ <wadl:resource path="/">
+ <wadl:resource path="rest">
+ <wadl:method name="PUT">
+ <wadl:request>
+ <wadl:representation mediaType="application/xml"
element="test"/>
+ </wadl:request>
+ <wadl:response>
+ <wadl:representation mediaType="application/xml"
element="test"/>
+ </wadl:response>
+ </wadl:method>
+ </wadl:resource>
+ </wadl:resource>
+ </wadl:resources>
+</wadl:application>
