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

Patching for Issue 143 #29

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

Patching for Issue 143 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64f3470
Patching for Issue 143
Jan 5, 2016
8814372
Changed in response to the comments given in the pull request.
Jan 7, 2016
64886a5
Using default constructor
Jan 7, 2016
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
3 changes: 1 addition & 2 deletions core/src/main/java/io/confluent/rest/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,7 @@ public void configureBaseApplication(Configurable<?> config) {
public void configureBaseApplication(Configurable<?> config, Map<String, String> metricTags) {
RestConfig restConfig = getConfiguration();

ObjectMapper jsonMapper = getJsonMapper();
JacksonMessageBodyProvider jsonProvider = new JacksonMessageBodyProvider(jsonMapper);
JacksonMessageBodyProvider jsonProvider = new JacksonMessageBodyProvider();
config.register(jsonProvider);
config.register(JsonParseExceptionMapper.class);

Expand Down
6 changes: 5 additions & 1 deletion core/src/main/java/io/confluent/rest/validation/JacksonMessageBodyProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
*/
package io.confluent.rest.validation;

import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;

import javax.validation.ConstraintViolationException;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.Provider;
Expand All @@ -40,7 +42,9 @@
public class JacksonMessageBodyProvider extends JacksonJaxbJsonProvider {

public JacksonMessageBodyProvider() {
setMapper(new ObjectMapper());
ObjectMapper mapper = new ObjectMapper();
mapper.enable(DeserializationFeature.FAIL_ON_READING_DUP_TREE_KEY);
setMapper(mapper);
}

public JacksonMessageBodyProvider(ObjectMapper mapper) {
Expand Down