Some more fixes to move to jakarta namespace
Signed-off-by: Jean-Louis Monteiro <jlmonteiro@tomitribe.com>
diff --git a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/DelegateProvider.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/DelegateProvider.java
index 0210823..f3c9843 100644
--- a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/DelegateProvider.java
+++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/DelegateProvider.java
@@ -82,7 +82,7 @@
try {
ofNullable(Thread.currentThread().getContextClassLoader())
.orElseGet(ClassLoader::getSystemClassLoader)
- .loadClass("javax.ws.rs.core.Feature");
+ .loadClass("jakarta.ws.rs.core.Feature");
return true;
} catch (final NoClassDefFoundError | ClassNotFoundException e) {
return false;
diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jaxrs/jsonb/jaxrs/JsonbJaxrsProvider.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jaxrs/jsonb/jaxrs/JsonbJaxrsProvider.java
index b3e87f5..8613d0d 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jaxrs/jsonb/jaxrs/JsonbJaxrsProvider.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jaxrs/jsonb/jaxrs/JsonbJaxrsProvider.java
@@ -314,7 +314,7 @@
try {
ofNullable(Thread.currentThread().getContextClassLoader())
.orElseGet(ClassLoader::getSystemClassLoader)
- .loadClass("javax.ws.rs.core.Feature");
+ .loadClass("jakarta.ws.rs.core.Feature");
return true;
} catch (final NoClassDefFoundError | ClassNotFoundException e) {
return false;
diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
index acc5c3f..4e32ed9 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
@@ -396,7 +396,7 @@
private Object getBeanManager() {
if (beanManager == null) {
try { // don't trigger CDI if not there
- final Class<?> cdi = tccl().loadClass("javax.enterprise.inject.spi.CDI");
+ final Class<?> cdi = tccl().loadClass("jakarta.enterprise.inject.spi.CDI");
final Object cdiInstance = cdi.getMethod("current").invoke(null);
beanManager = cdi.getMethod("getBeanManager").invoke(cdiInstance);
cdiIntegration = new CDIs(beanManager);
diff --git a/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/SchemaProcessor.java b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/SchemaProcessor.java
index cffa7d0..21d7ed0 100644
--- a/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/SchemaProcessor.java
+++ b/johnzon-jsonschema/src/main/java/org/apache/johnzon/jsonschema/generator/SchemaProcessor.java
@@ -677,7 +677,10 @@
if (Boolean.class == type) {
return false;
}
- if (type.getName().startsWith("java.") || type.getName().startsWith("javax.")) {
+ if (type.getName().startsWith("java.")
+ || type.getName().startsWith("javax.")
+ || type.getName().startsWith("jakarta.")
+ ) {
return null;
}
try {
diff --git a/johnzon-osgi/src/main/java/org/apache/johnzon/osgi/cdi/RegisterCdiExtension.java b/johnzon-osgi/src/main/java/org/apache/johnzon/osgi/cdi/RegisterCdiExtension.java
index a1fd9c4..970ee99 100644
--- a/johnzon-osgi/src/main/java/org/apache/johnzon/osgi/cdi/RegisterCdiExtension.java
+++ b/johnzon-osgi/src/main/java/org/apache/johnzon/osgi/cdi/RegisterCdiExtension.java
@@ -52,7 +52,7 @@
private static boolean tryLoadingCdi() {
try {
- Class.forName("javax.enterprise.inject.spi.Extension");
+ Class.forName("jakarta.enterprise.inject.spi.Extension");
return true;
} catch (ClassNotFoundException cfne) {
return false;
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 9a6ac3e..edf4d31 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -358,7 +358,7 @@
A JAX-RS provider based on JSON-B is provided in the module as well. It is `org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider`.
-IMPORTANT: in JAX-RS 1.0 the provider can throw any exception he wants for an empty incoming stream on reader side. This had been broken in JAX-RS 2.x where it must throw a `javax.ws.rs.core.NoContentException`.
+IMPORTANT: in JAX-RS 1.0 the provider can throw any exception he wants for an empty incoming stream on reader side. This had been broken in JAX-RS 2.x where it must throw a `jakarta.ws.rs.core.NoContentException`.
To ensure you can pick the implementation you can and limit the breaking changes, you can set ̀throwNoContentExceptionOnEmptyStreams` on the provider to switch between both behaviors.
Default will be picked from the current available API. Finally, this behavior only works with `johnzon-core`.
