Skip to content

Use a shared ObjectMapper instance #84

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

Merged
mgcuthbert merged 1 commit into from
Apr 18, 2022
Merged

Use a shared ObjectMapper instance #84

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
4 changes: 2 additions & 2 deletions src/integrationTest/java/org/maproulette/client/api/TaskAPIIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import org.maproulette.client.model.ChallengePriority;
import org.maproulette.client.model.Task;
import org.maproulette.client.model.TaskStatus;
import org.maproulette.client.utilities.ObjectMapperSingleton;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;

/**
Expand Down Expand Up @@ -119,7 +119,7 @@ public void updateTest() throws MapRouletteException
.addGeojson(String.format(TestConstants.FEATURE_STRING, 3.1, 4.2, UPDATED_GEOMETRY))
.build();

final ObjectMapper mapper = new ObjectMapper();
final var mapper = ObjectMapperSingleton.getMapper();
final ArrayNode arrayNode = mapper.createArrayNode();
Assertions.assertNotNull(created.get().getGeometries().get(TASK_FEATURES).get(0));
Assertions.assertNotNull(update.getGeometries().get(TASK_FEATURES).get(0));
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/maproulette/client/api/ChallengeAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.maproulette.client.exception.MapRouletteException;
import org.maproulette.client.model.Challenge;
import org.maproulette.client.model.Task;
import org.maproulette.client.utilities.ObjectMapperSingleton;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand All @@ -27,7 +28,7 @@
@RequiredArgsConstructor
public class ChallengeAPI implements IAPI<Challenge>
{
private final ObjectMapper mapper = new ObjectMapper();
private final ObjectMapper mapper = ObjectMapperSingleton.getMapper();
private final IMapRouletteConnection connection;

public ChallengeAPI(final MapRouletteConfiguration configuration)
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/maproulette/client/api/ProjectAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.maproulette.client.exception.MapRouletteException;
import org.maproulette.client.model.Challenge;
import org.maproulette.client.model.Project;
import org.maproulette.client.utilities.ObjectMapperSingleton;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand All @@ -27,7 +28,7 @@
@RequiredArgsConstructor
public class ProjectAPI implements IAPI<Project>
{
private final ObjectMapper mapper = new ObjectMapper();
private final ObjectMapper mapper = ObjectMapperSingleton.getMapper();
private final IMapRouletteConnection connection;

public ProjectAPI(final MapRouletteConfiguration configuration)
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/maproulette/client/api/TaskAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.maproulette.client.connection.Query;
import org.maproulette.client.exception.MapRouletteException;
import org.maproulette.client.model.Task;
import org.maproulette.client.utilities.ObjectMapperSingleton;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand All @@ -26,7 +27,7 @@
@RequiredArgsConstructor
public class TaskAPI implements IAPI<Task>
{
private final ObjectMapper mapper = new ObjectMapper();
private final ObjectMapper mapper = ObjectMapperSingleton.getMapper();
private final IMapRouletteConnection connection;

public TaskAPI(final MapRouletteConfiguration configuration)
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/maproulette/client/api/UserAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.maproulette.client.connection.Query;
import org.maproulette.client.exception.MapRouletteException;
import org.maproulette.client.model.User;
import org.maproulette.client.utilities.ObjectMapperSingleton;

import com.fasterxml.jackson.databind.ObjectMapper;

Expand All @@ -24,7 +25,7 @@
public class UserAPI
{

private final ObjectMapper mapper = new ObjectMapper();
private final ObjectMapper mapper = ObjectMapperSingleton.getMapper();
private final IMapRouletteConnection connection;

public UserAPI(final MapRouletteConfiguration configuration)
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/maproulette/client/model/Task.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.apache.commons.lang.StringUtils;
import org.maproulette.client.exception.MapRouletteException;
import org.maproulette.client.exception.MapRouletteRuntimeException;
import org.maproulette.client.utilities.ObjectMapperSingleton;
import org.maproulette.client.utilities.Utilities;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
Expand Down Expand Up @@ -51,7 +52,7 @@ public static class TaskBuilder
private static final String TASK_FEATURE_PROPERTIES = "properties";
private static final String FEATURE = "feature";
private static final String POINT = "point";
private final ObjectMapper mapper = new ObjectMapper();
private final ObjectMapper mapper = ObjectMapperSingleton.getMapper();
private final Set<PointInformation> points = new HashSet<>();
private ArrayNode geoJson = this.mapper.createArrayNode();

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/maproulette/client/batch/ChallengeBatchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
import org.maproulette.client.connection.MapRouletteConnection;
import org.maproulette.client.connection.Query;
import org.maproulette.client.model.Task;
import org.maproulette.client.utilities.ObjectMapperSingleton;
import org.mockito.ArgumentCaptor;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

/**
* @author mcuthbert
Expand All @@ -38,7 +38,7 @@ public void addTasksTest() throws Exception
challengeBatch.addTasks(multipleTasks);
challengeBatch.flush();

final var mapper = new ObjectMapper();
final var mapper = ObjectMapperSingleton.getMapper();
final var postData = mapper.createArrayNode();
final var tasks = Arrays.asList(this.task("Task1", 12), this.task("Task2", 12),
this.task("Task3", 12), this.task("Task4", 12), this.task("task5", 12));
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/org/maproulette/client/serializer/ProjectSerializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.maproulette.client.model.Project;

import com.fasterxml.jackson.databind.ObjectMapper;
import org.maproulette.client.utilities.ObjectMapperSingleton;

/**
* Tests serialization and deserialization of the {@link Project} object
Expand All @@ -18,7 +17,7 @@ public class ProjectSerializationTest
@Test
public void projectSerializationTest() throws IOException
{
final var mapper = new ObjectMapper();
final var mapper = ObjectMapperSingleton.getMapper();
final var project = Project.builder().name("TestProject").description("TestDescription")
.displayName("TestDisplayName").enabled(true).id(6875L).build();
final var projectJson = mapper.writeValueAsString(project);
Expand All @@ -30,7 +29,7 @@ public void projectSerializationTest() throws IOException
@Test
public void fromJsonTest() throws Exception
{
final var mapper = new ObjectMapper();
final var mapper = ObjectMapperSingleton.getMapper();
final var project = Project.builder().name("TestProject").description("TestDescription")
.displayName("TestDisplayName").enabled(true).id(6875L).build();
final var projectJson = mapper.writeValueAsString(project);
Expand Down
9 changes: 4 additions & 5 deletions src/test/java/org/maproulette/client/serializer/TaskSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
import org.maproulette.client.model.PointInformation;
import org.maproulette.client.model.Task;
import org.maproulette.client.model.TaskStatus;

import com.fasterxml.jackson.databind.ObjectMapper;
import org.maproulette.client.utilities.ObjectMapperSingleton;

/**
* @author mcuthbert
Expand All @@ -22,7 +21,7 @@ public class TaskSerializerTest
public void serializationTest() throws IOException
{
final var testFeatureString = "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[%s, %s]},\"properties\": {\"name\":\"%s\"}}";
final var mapper = new ObjectMapper();
final var mapper = ObjectMapperSingleton.getMapper();
final var pointList = Arrays.asList(new PointInformation(1.0, 2.0),
new PointInformation(5.4, 8.7));

Expand All @@ -41,7 +40,7 @@ public void serializationTest() throws IOException
public void geometriesSerializationTest() throws IOException
{
final var testFeatureString = "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[%s, %s]},\"properties\": {\"name\":\"%s\"}}";
final var mapper = new ObjectMapper();
final var mapper = ObjectMapperSingleton.getMapper();
final var task = Task.builder(343444454, "TestTask").id(12355655)
.instruction("TestInstruction").priority(ChallengePriority.HIGH)
.status(TaskStatus.DELETED)
Expand All @@ -56,7 +55,7 @@ public void geometriesSerializationTest() throws IOException
public void fromJsonTest() throws Exception
{
final var testFeatureString = "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[%s, %s]},\"properties\": {\"name\":\"%s\"}}";
final var mapper = new ObjectMapper();
final var mapper = ObjectMapperSingleton.getMapper();
final var pointList = Arrays.asList(new PointInformation(1.0, 2.0),
new PointInformation(5.4, 8.7));

Expand Down