Skip to content

Commit b4547f8

Browse files
committed
Tinkering with #827 test
1 parent 99fc2ec commit b4547f8

File tree

1 file changed

+11
-22
lines changed

1 file changed

+11
-22
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,50 @@
1-
package com.fasterxml.jackson.databind.seq;
1+
package com.fasterxml.jackson.failing;
22

33
import java.io.IOException;
44
import java.util.HashMap;
55
import java.util.Map;
66

77
import org.junit.Assert;
8-
import org.junit.Test;
98

10-
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
11-
import com.fasterxml.jackson.annotation.PropertyAccessor;
129
import com.fasterxml.jackson.core.JsonGenerator;
1310
import com.fasterxml.jackson.core.JsonProcessingException;
11+
import com.fasterxml.jackson.core.type.TypeReference;
1412
import com.fasterxml.jackson.databind.*;
15-
import com.fasterxml.jackson.databind.SerializerProvider;
1613
import com.fasterxml.jackson.databind.module.SimpleModule;
17-
import com.fasterxml.jackson.databind.type.MapType;
1814

1915
// for [databind#827]
20-
public class PolyMapWriterTest extends BaseMapTest
16+
public class PolyMapWriter827Test extends BaseMapTest
2117
{
2218
static class CustomKey {
2319
String a;
2420
int b;
2521

2622
public String toString() { return "BAD-KEY"; }
2723
}
28-
24+
2925
public class CustomKeySerializer extends JsonSerializer<CustomKey> {
3026
@Override
3127
public void serialize(CustomKey key, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
3228
jsonGenerator.writeFieldName(key.a + "," + key.b);
3329
}
3430
}
35-
36-
@Test
37-
public void testPolyCustomKeySerializer() throws Exception {
31+
32+
public void testPolyCustomKeySerializer() throws Exception
33+
{
3834
ObjectMapper mapper = new ObjectMapper();
39-
mapper.setVisibility(PropertyAccessor.ALL, Visibility.NONE);
40-
mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
4135
mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
42-
43-
SimpleModule module = new SimpleModule("keySerializerModule");
44-
module.addKeySerializer(CustomKey.class, new CustomKeySerializer());
45-
mapper.registerModule(module);
36+
37+
mapper.registerModule(new SimpleModule("keySerializerModule")
38+
.addKeySerializer(CustomKey.class, new CustomKeySerializer()));
4639

4740
Map<CustomKey, String> map = new HashMap<CustomKey, String>();
4841
CustomKey key = new CustomKey();
4942
key.a = "foo";
5043
key.b = 1;
5144
map.put(key, "bar");
5245

53-
final MapType type = mapper.getTypeFactory().constructMapType(
54-
Map.class, CustomKey.class, String.class);
55-
final ObjectWriter writer = mapper.writerFor(type);
46+
final ObjectWriter writer = mapper.writerFor(new TypeReference<Map<CustomKey,String>>() { });
5647
String json = writer.writeValueAsString(map);
57-
5848
Assert.assertEquals("[\"java.util.HashMap\",{\"foo,1\":\"bar\"}]", json);
5949
}
60-
6150
}

0 commit comments

Comments
 (0)