Skip to content

feat: replace Wink JSON and Jackson with Jakarta JSON-P #896

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

Open
berezovskyi wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat: replace Wink JSON and Jackson with Jakarta JSON-P #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98e3bbe
feat: replace Wink JSON and Jackson with Jakarta JSON Processing (JSO…
berezovskyi Feb 14, 2026
7dbb4f9
fix: strong typing and fixes
berezovskyi Feb 14, 2026
d4aa132
Merge branch 'master' into b-jsonp-no-wink
berezovskyi Feb 14, 2026
efb8ef2
Merge branch 'master' into b-jsonp-no-wink
berezovskyi Mar 14, 2026
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
54 changes: 1 addition & 53 deletions bom/lyo-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@
<artifactId>oslc4j-json4j-provider</artifactId>
<version>${v.lyo}</version>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-core-wink</artifactId>
<version>${v.lyo}</version>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-utils</artifactId>
Expand Down Expand Up @@ -341,54 +336,7 @@
<artifactId>jakarta.validation-api</artifactId>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${v.jackson}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- to override swagger jackson deps -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${v.jackson}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${v.jackson}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${v.jackson}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>${v.jackson}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-base</artifactId>
<version>${v.jackson}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
<version>${v.jackson}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${v.jackson}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${v.jackson}</version>
</dependency>

</dependencies>
</dependencyManagement>
</project>
5 changes: 3 additions & 2 deletions client/oslc-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-json4j-provider</artifactId>
<version>${v.lyo}</version>
</dependency>

<!--TEST-->
Expand Down
9 changes: 4 additions & 5 deletions client/oslc-client/src/main/java/org/eclipse/lyo/client/RootServicesHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
*/
package org.eclipse.lyo.client;

import com.fasterxml.jackson.databind.ObjectMapper;
import org.eclipse.lyo.oslc4j.provider.json4j.internal.JSONObject;
import jakarta.json.Json;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriBuilder;
Expand Down Expand Up @@ -343,10 +344,8 @@ public String requestConsumerKey(String consumerName, String consumerSecret)
// trying to be liberal with all possible JSON content types
throw new IllegalStateException("Server returned something else than JSON in the response");
}
ObjectMapper mapper = new ObjectMapper();
Map<String, Object> jsonData = new HashMap<>();
jsonData = mapper.readValue(content, Map.class);
String consumerKey = (String) jsonData.get("key");
JSONObject jsonData = new JSONObject(Json.createReader(content).readObject());
String consumerKey = jsonData.getString("key");
logger.debug(
"Consumer should redirect user to this approval URL, to approve the OAuth consumer: "
+ getConsumerApprovalUrl(consumerKey));
Expand Down
1 change: 0 additions & 1 deletion core/oslc4j-core-build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<module>../oslc-trs</module>
<module>../oslc4j-jena-provider</module>
<module>../shacl</module>
<module>../oslc4j-core-wink</module>
<module>../oslc4j-json4j-provider</module>
<module>../oslc4j-utils</module>
<module>../lyo-core-settings</module>
Expand Down
48 changes: 0 additions & 48 deletions core/oslc4j-core-wink/pom.xml
View file
Open in desktop

This file was deleted.

Loading
Loading