diff --git a/nablarch-jackson-adaptor/pom.xml b/nablarch-jackson-adaptor/pom.xml index 077adff..d751439 100644 --- a/nablarch-jackson-adaptor/pom.xml +++ b/nablarch-jackson-adaptor/pom.xml @@ -19,12 +19,6 @@ jackson-databind 2.10.3 - - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - provided - com.nablarch.framework diff --git a/nablarch-jackson-adaptor/src/main/java/nablarch/integration/jaxrs/jackson/Jackson1BodyConverter.java b/nablarch-jackson-adaptor/src/main/java/nablarch/integration/jaxrs/jackson/Jackson1BodyConverter.java deleted file mode 100644 index 543bb79..0000000 --- a/nablarch-jackson-adaptor/src/main/java/nablarch/integration/jaxrs/jackson/Jackson1BodyConverter.java +++ /dev/null @@ -1,48 +0,0 @@ -package nablarch.integration.jaxrs.jackson; - -import java.io.IOException; -import java.io.Reader; - -import org.codehaus.jackson.map.ObjectMapper; - -import nablarch.fw.jaxrs.BodyConverter; - -/** - * Jackson1.xを使用してリクエスト/レスポンスの変換を行う{@link BodyConverter}実装クラス。 - * - * @author Kiyohito Itoh - */ -public class Jackson1BodyConverter extends JacksonBodyConverterSupport { - - /** {@link ObjectMapper} */ - private final ObjectMapper objectMapper; - - /** - * {@code JacksonBodyConverter}を生成する。 - */ - public Jackson1BodyConverter() { - objectMapper = new ObjectMapper(); - configure(objectMapper); - } - - /** - * {@link ObjectMapper}に対するオプション設定などを行う。 - *

- * このクラスでは特に何も行わないので、オプション設定はサブクラス側で行う必要がある。 - * - * @param objectMapper {@link ObjectMapper} - */ - protected void configure(ObjectMapper objectMapper) { - // nop - } - - @Override - protected Object readValue(Reader src, Class valueType) throws IOException { - return objectMapper.readValue(src, valueType); - } - - @Override - protected String writeValueAsString(Object value) throws IOException { - return objectMapper.writeValueAsString(value); - } -} diff --git a/nablarch-jackson-adaptor/src/test/java/nablarch/integration/jaxrs/jackson/Jackson1BodyConverterTest.java b/nablarch-jackson-adaptor/src/test/java/nablarch/integration/jaxrs/jackson/Jackson1BodyConverterTest.java deleted file mode 100644 index b41d1a5..0000000 --- a/nablarch-jackson-adaptor/src/test/java/nablarch/integration/jaxrs/jackson/Jackson1BodyConverterTest.java +++ /dev/null @@ -1,62 +0,0 @@ -package nablarch.integration.jaxrs.jackson; - -import mockit.Mocked; -import mockit.Expectations; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig.Feature; -import org.codehaus.jackson.map.exc.UnrecognizedPropertyException; -import org.junit.Test; - -/** - * {@link Jackson1BodyConverter}のテストクラス。 - */ -public class Jackson1BodyConverterTest extends JacksonBodyConverterTestSupport { - - @Override - protected Jackson1BodyConverter createSut() { - return new Jackson1BodyConverter(); - } - - @Override - protected Jackson1BodyConverter createSutWithDisableFailOnUnknownProperties() { - return new Jackson1BodyConverter() { - @Override - protected void configure(ObjectMapper objectMapper) { - objectMapper.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES); - } - }; - } - - @Override - protected Jackson1BodyConverter createSutWithEnableWriteEnumsUsingToString() { - return new Jackson1BodyConverter() { - @Override - protected void configure(ObjectMapper objectMapper) { - objectMapper.enable(Feature.WRITE_ENUMS_USING_TO_STRING); - } - }; - } - - @Override - protected Class getUnrecognizedPropertyExceptionClass() { - return UnrecognizedPropertyException.class; - } - - @Test - public void testWrite_json_failed(@Mocked final ObjectMapper mapper) throws Exception { - expectedException.expect(IllegalArgumentException.class); - expectedException.expectMessage("failed to write response."); - - final TestBean bean = new TestBean("aaa",123L, true); - new Expectations() {{ - jaxRsContext.getProducesMediaType(); - result = "application/json;charset=utf-8"; - mapper.writeValueAsString(bean); - result = new JsonMappingException("error"); - }}; - - sut.write(bean, executionContext); - } -} diff --git a/nablarch-jackson-adaptor/src/test/java/nablarch/integration/jaxrs/jackson/JacksonBodyConverterTestSupport.java b/nablarch-jackson-adaptor/src/test/java/nablarch/integration/jaxrs/jackson/JacksonBodyConverterTestSupport.java index 2130223..f2a6580 100644 --- a/nablarch-jackson-adaptor/src/test/java/nablarch/integration/jaxrs/jackson/JacksonBodyConverterTestSupport.java +++ b/nablarch-jackson-adaptor/src/test/java/nablarch/integration/jaxrs/jackson/JacksonBodyConverterTestSupport.java @@ -1,7 +1,7 @@ package nablarch.integration.jaxrs.jackson; -import mockit.Mocked; import mockit.Expectations; +import mockit.Mocked; import nablarch.fw.ExecutionContext; import nablarch.fw.jaxrs.BodyConverterSupport; import nablarch.fw.jaxrs.JaxRsContext; @@ -11,8 +11,6 @@ import nablarch.fw.web.servlet.NablarchHttpServletRequestWrapper; import nablarch.fw.web.servlet.ServletExecutionContext; import nablarch.test.support.log.app.OnMemoryLogWriter; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.SerializationConfig.Feature; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -27,7 +25,9 @@ import java.nio.charset.UnsupportedCharsetException; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail;