Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[issue172] Migrate to a Jakarta namespaced activation API. #177

Merged
merged 1 commit into from
May 25, 2022
Merged

[issue172] Migrate to a Jakarta namespaced activation API. #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions jakarta-xmlbind/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@

<!-- 15-Jan-2022, tatu: as per [modules-base#152] -->
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>2.0.1</version>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>2.1.0</version>
</dependency>

<!-- may also need JAXB impl for tests -->
Expand Down
6 changes: 3 additions & 3 deletions ...va/com/fasterxml/jackson/module/jakarta/xmlbind/JakartaXmlBindAnnotationIntrospector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,16 +717,16 @@ public JsonSerializer<?> findSerializer(Annotated am)
}

/**
* Determines whether the type is assignable to class javax.activation.DataHandler without requiring that class
* Determines whether the type is assignable to class jakarta.activation.DataHandler without requiring that class
* to be on the classpath.
*
* @param type The type.
* @return Whether the type is assignable to class javax.activation.DataHandler
* @return Whether the type is assignable to class jakarta.activation.DataHandler
*/
private boolean isDataHandler(Class<?> type)
{
return type != null && (Object.class != type)
&& (("javax.activation.DataHandler".equals(type.getName()) || isDataHandler(type.getSuperclass())));
&& (("jakarta.activation.DataHandler".equals(type.getName()) || isDataHandler(type.getSuperclass())));
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/com/fasterxml/jackson/module/jakarta/xmlbind/deser/DataHandlerDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import java.io.OutputStream;
import java.io.ByteArrayInputStream;

import javax.activation.DataHandler;
import javax.activation.DataSource;
import jakarta.activation.DataHandler;
import jakarta.activation.DataSource;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/fasterxml/jackson/module/jakarta/xmlbind/ser/DataHandlerSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.io.InputStream;
import java.lang.reflect.Type;

import javax.activation.DataHandler;
import jakarta.activation.DataHandler;

import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.databind.JavaType;
Expand Down