Skip to content

Commit f0c2f60

Browse files
mcvaycmcvayc
committed
Fix whitespace formatting and import order.
1 parent 82a4618 commit f0c2f60

File tree

4 files changed

+48
-36
lines changed

4 files changed

+48
-36
lines changed

‎src/main/java/com/fasterxml/jackson/databind/ext/CoreXMLDeserializers.java

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
* JDK 1.5. Types are directly needed by JAXB, but may be unavailable on some
1717
* limited platforms; hence separate out from basic deserializer factory.
1818
*/
19-
public class CoreXMLDeserializers extends Deserializers.Base {
19+
public class CoreXMLDeserializers extends Deserializers.Base
20+
{
2021
protected final static QName EMPTY_QNAME = QName.valueOf("");
2122

2223
/**
@@ -25,7 +26,6 @@ public class CoreXMLDeserializers extends Deserializers.Base {
2526
* introspection) can be expensive we better reuse the instance.
2627
*/
2728
final static DatatypeFactory _dataTypeFactory;
28-
2929
static {
3030
try {
3131
_dataTypeFactory = DatatypeFactory.newInstance();
@@ -36,7 +36,8 @@ public class CoreXMLDeserializers extends Deserializers.Base {
3636

3737
@Override
3838
public JsonDeserializer<?> findBeanDeserializer(JavaType type,
39-
DeserializationConfig config, BeanDescription beanDesc) {
39+
DeserializationConfig config, BeanDescription beanDesc)
40+
{
4041
Class<?> raw = type.getRawClass();
4142
if (raw == QName.class) {
4243
return new Std(raw, TYPE_QNAME);
@@ -76,7 +77,8 @@ public boolean hasDeserializerFor(DeserializationConfig config, Class<?> valueTy
7677
*
7778
* @since 2.4
7879
*/
79-
public static class Std extends FromStringDeserializer<Object> {
80+
public static class Std extends FromStringDeserializer<Object>
81+
{
8082
private static final long serialVersionUID = 1L;
8183

8284
protected final int _kind;
@@ -88,7 +90,8 @@ public Std(Class<?> raw, int kind) {
8890

8991
@Override
9092
public Object deserialize(JsonParser p, DeserializationContext ctxt)
91-
throws IOException {
93+
throws IOException
94+
{
9295
// GregorianCalendar also allows integer value (timestamp),
9396
// which needs separate handling
9497
if (_kind == TYPE_G_CALENDAR) {
@@ -105,7 +108,9 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt)
105108
return super.deserialize(p, ctxt);
106109
}
107110

108-
private QName _parseQNameObject(JsonParser p, DeserializationContext ctxt) throws IOException {
111+
private QName _parseQNameObject(JsonParser p, DeserializationContext ctxt)
112+
throws IOException
113+
{
109114
JsonNode tree = ctxt.readTree(p);
110115

111116
if (!tree.has("localPart")) {
@@ -133,22 +138,24 @@ private QName _parseQNameObject(JsonParser p, DeserializationContext ctxt) throw
133138

134139
@Override
135140
protected Object _deserialize(String value, DeserializationContext ctxt)
136-
throws IOException {
141+
throws IOException
142+
{
137143
switch (_kind) {
138-
case TYPE_DURATION:
139-
return _dataTypeFactory.newDuration(value);
140-
case TYPE_QNAME:
141-
return QName.valueOf(value);
142-
case TYPE_G_CALENDAR:
143-
Date d;
144-
try {
145-
d = _parseDate(value, ctxt);
146-
} catch (JsonMappingException e) {
147-
// try to parse from native XML Schema 1.0 lexical representation String,
148-
// which includes time-only formats not handled by parseXMLGregorianCalendarFromJacksonFormat(...)
149-
return _dataTypeFactory.newXMLGregorianCalendar(value);
150-
}
151-
return _gregorianFromDate(ctxt, d);
144+
case TYPE_DURATION:
145+
return _dataTypeFactory.newDuration(value);
146+
case TYPE_QNAME:
147+
return QName.valueOf(value);
148+
case TYPE_G_CALENDAR:
149+
Date d;
150+
try {
151+
d = _parseDate(value, ctxt);
152+
}
153+
catch (JsonMappingException e) {
154+
// try to parse from native XML Schema 1.0 lexical representation String,
155+
// which includes time-only formats not handled by parseXMLGregorianCalendarFromJacksonFormat(...)
156+
return _dataTypeFactory.newXMLGregorianCalendar(value);
157+
}
158+
return _gregorianFromDate(ctxt, d);
152159
}
153160
throw new IllegalStateException();
154161
}
@@ -162,7 +169,8 @@ protected Object _deserializeFromEmptyString(DeserializationContext ctxt) throws
162169
}
163170

164171
protected XMLGregorianCalendar _gregorianFromDate(DeserializationContext ctxt,
165-
Date d) {
172+
Date d)
173+
{
166174
if (d == null) {
167175
return null;
168176
}
@@ -174,6 +182,5 @@ protected XMLGregorianCalendar _gregorianFromDate(DeserializationContext ctxt,
174182
}
175183
return _dataTypeFactory.newXMLGregorianCalendar(calendar);
176184
}
177-
178185
}
179186
}

‎src/main/java/com/fasterxml/jackson/databind/ext/CoreXMLSerializers.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.fasterxml.jackson.databind.ext;
22

33
import java.io.IOException;
4-
import java.lang.reflect.Type;
54
import java.util.Calendar;
65

76
import javax.xml.datatype.Duration;
@@ -14,11 +13,11 @@
1413
import com.fasterxml.jackson.databind.*;
1514
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
1615
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
17-
import com.fasterxml.jackson.databind.ser.BeanSerializer;
1816
import com.fasterxml.jackson.databind.ser.ContextualSerializer;
19-
import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
2017
import com.fasterxml.jackson.databind.ser.Serializers;
21-
import com.fasterxml.jackson.databind.ser.std.*;
18+
import com.fasterxml.jackson.databind.ser.std.CalendarSerializer;
19+
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
20+
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
2221

2322
/**
2423
* Provider for serializers of XML types that are part of full JDK 1.5, but
@@ -123,8 +122,8 @@ protected Calendar _convert(XMLGregorianCalendar input) {
123122
}
124123

125124
public static class QNameSerializer
126-
extends StdSerializer<QName>
127-
implements ContextualSerializer
125+
extends StdSerializer<QName>
126+
implements ContextualSerializer
128127
{
129128
private static final long serialVersionUID = 1L;
130129

@@ -136,7 +135,7 @@ public QNameSerializer() {
136135

137136
@Override
138137
public JsonSerializer<?> createContextual(SerializerProvider serializers, BeanProperty property)
139-
throws JsonMappingException
138+
throws JsonMappingException
140139
{
141140
JsonFormat.Value format = findFormatOverrides(serializers, property, handledType());
142141
if (format != null) {
@@ -149,7 +148,9 @@ public JsonSerializer<?> createContextual(SerializerProvider serializers, BeanPr
149148
}
150149

151150
@Override
152-
public void serialize(QName value, JsonGenerator g, SerializerProvider provider) throws IOException {
151+
public void serialize(QName value, JsonGenerator g, SerializerProvider provider)
152+
throws IOException
153+
{
153154
g.writeStartObject();
154155
g.writeObjectField("localPart", value.getLocalPart());
155156
if(!value.getNamespaceURI().isEmpty()) g.writeObjectField("namespaceURI", value.getNamespaceURI());
@@ -159,7 +160,8 @@ public void serialize(QName value, JsonGenerator g, SerializerProvider provider)
159160

160161
@Override
161162
public final void serializeWithType(QName value, JsonGenerator g, SerializerProvider provider,
162-
TypeSerializer typeSer) throws IOException
163+
TypeSerializer typeSer)
164+
throws IOException
163165
{
164166
g.writeObject(value);
165167
}

‎src/test/java/com/fasterxml/jackson/databind/ext/MiscJavaXMLTypesReadWriteTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.fasterxml.jackson.databind.ext;
22

3-
import com.fasterxml.jackson.annotation.JsonFormat;
43
import javax.xml.datatype.*;
54
import javax.xml.namespace.QName;
65
import org.junit.jupiter.api.Test;
76

7+
import com.fasterxml.jackson.annotation.JsonFormat;
88
import com.fasterxml.jackson.databind.*;
99
import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
1010
import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator;
@@ -42,7 +42,8 @@ public void testQNameSer() throws Exception
4242
}
4343

4444
@Test
45-
public void testQNameSerToObject() throws Exception {
45+
public void testQNameSerToObject() throws Exception
46+
{
4647
QName qn = new QName("http://abc", "tag", "prefix");
4748

4849
ObjectMapper mapper = jsonMapperBuilder()

‎src/test/java/com/fasterxml/jackson/databind/ext/QNameAsObjectReadWrite4771Test.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public BeanWithQName(QName qName) {
3333

3434
@ParameterizedTest
3535
@MethodSource("provideAllPerumtationsOfQNameConstructor")
36-
void testQNameWithObjectSerialization(QName originalQName) throws JsonProcessingException {
36+
void testQNameWithObjectSerialization(QName originalQName) throws JsonProcessingException
37+
{
3738
BeanWithQName bean = new BeanWithQName(originalQName);
3839

3940
String json = MAPPER.writeValueAsString(bean);
@@ -45,7 +46,8 @@ void testQNameWithObjectSerialization(QName originalQName) throws JsonProcessing
4546
assertEquals(originalQName.getPrefix(), deserializedQName.getPrefix());
4647
}
4748

48-
static Stream<Arguments> provideAllPerumtationsOfQNameConstructor() {
49+
static Stream<Arguments> provideAllPerumtationsOfQNameConstructor()
50+
{
4951
return Stream.of(
5052
Arguments.of(new QName("test-local-part")),
5153
Arguments.of(new QName("test-namespace-uri", "test-local-part")),

0 commit comments

Comments
 (0)