Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions jsonb-jackson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-spi-service</artifactId>
<version>${spi.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>io.avaje</groupId>
<artifactId>junit</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@

import io.avaje.json.stream.JsonStream;
import io.avaje.jsonb.spi.JsonStreamFactory;
import io.avaje.spi.ServiceProvider;

/**
* Jackson Core based adapter.
* <p>
* Uses jackson code to do the underlying json parsing and generation.
*/
@ServiceProvider
public class JacksonAdapterFactory implements JsonStreamFactory {

@Override
Expand Down
4 changes: 2 additions & 2 deletions jsonb-jackson/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

requires transitive io.avaje.jsonb;
requires transitive com.fasterxml.jackson.core;
requires static io.avaje.spi;

exports io.avaje.jsonb.jackson;

provides io.avaje.jsonb.spi.JsonStreamFactory with io.avaje.jsonb.jackson.JacksonAdapterFactory;
provides io.avaje.jsonb.spi.JsonbExtension with io.avaje.jsonb.jackson.JacksonAdapterFactory;
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
package io.avaje.jsonb.jackson;

import static org.assertj.core.api.Assertions.assertThat;

import java.io.OutputStream;

import org.example.Address;
import org.example.MyComponent;
import org.junit.jupiter.api.Test;

import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.SerializableString;
import com.fasterxml.jackson.core.io.CharacterEscapes;
import io.avaje.jsonb.Jsonb;
import org.example.Address;
import org.example.MyComponent;
import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;
import io.avaje.jsonb.Jsonb;

class JacksonAdapterTest {

Expand All @@ -22,6 +26,13 @@ class JacksonAdapterTest {
public static final JsonFactory HUMAN_READABLE_JSON_FACTORY = JSON_FACTORY.copy()
.setCharacterEscapes(new HumanReadableCharacterEscapes());

@Test
void isJackson() {
var jsonb = Jsonb.instance();
assertThat(jsonb.reader("")).isInstanceOf(JacksonReader.class);
assertThat(jsonb.writer(OutputStream.nullOutputStream())).isInstanceOf(JacksonWriter.class);
}

@Test
void custom_JsonFactory() {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
package io.avaje.jsonb.jackson;

import io.avaje.json.JsonAdapter;
import io.avaje.json.JsonWriter;
import io.avaje.jsonb.JsonType;
import io.avaje.jsonb.Jsonb;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

import java.io.IOException;
import java.io.StringWriter;
import java.util.List;
import java.util.Map;

import static org.assertj.core.api.Assertions.assertThat;
import org.junit.jupiter.api.Test;

import io.avaje.json.JsonAdapter;
import io.avaje.json.JsonWriter;
import io.avaje.jsonb.JsonType;
import io.avaje.jsonb.Jsonb;

class ObjectAdapterTest {

Jsonb jsonb = Jsonb.builder().adapter(new JacksonAdapter()).build();
Jsonb jsonb = Jsonb.instance();

JsonAdapter<Object> objectAdapter = jsonb.adapter(Object.class);

Expand Down